Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc
This commit is contained in:
@@ -77,6 +77,7 @@ server:
|
|||||||
|
|
||||||
wxpay:
|
wxpay:
|
||||||
appId: wx47134a8f15083734
|
appId: wx47134a8f15083734
|
||||||
|
zmzmappId: wx912aa600132dc965
|
||||||
mchId: 1612860909
|
mchId: 1612860909
|
||||||
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
|
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
|
||||||
notifyUrl: https://testapi.nuttyreading.com/pay/payNotify
|
notifyUrl: https://testapi.nuttyreading.com/pay/payNotify
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ server:
|
|||||||
|
|
||||||
wxpay:
|
wxpay:
|
||||||
appId: wx47134a8f15083734
|
appId: wx47134a8f15083734
|
||||||
|
zmzmappId: wx912aa600132dc965
|
||||||
mchId: 1612860909
|
mchId: 1612860909
|
||||||
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
|
payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
|
||||||
notifyUrl: https://api.nuttyreading.com/pay/payNotify
|
notifyUrl: https://api.nuttyreading.com/pay/payNotify
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
|
|||||||
spring:
|
spring:
|
||||||
# 环境 dev/dev1|test|prod
|
# 环境 dev/dev1|test|prod
|
||||||
profiles:
|
profiles:
|
||||||
active: dev
|
active: dev1
|
||||||
# jackson时间格式化
|
# jackson时间格式化
|
||||||
jackson:
|
jackson:
|
||||||
time-zone: GMT+8
|
time-zone: GMT+8
|
||||||
|
|||||||
Reference in New Issue
Block a user