Merge remote-tracking branch 'origin/wjl'

# Conflicts:
#	src/main/resources/weChatConfig.properties
This commit is contained in:
wangjinlei
2023-10-09 15:49:04 +08:00

View File

@@ -1,48 +1,23 @@
wxpay: # APP ID
wxpay.appId:wx47134a8f15083734
# ?? ID
wxpay.mchId:1612860909
# ?? URL
wxpay.payUrl:https://api.mch.weixin.qq.com/v3/pay/transactions/app
# ???? # ????
wxpay.appId: wx47134a8f15083734 wxpay.notifyUrl:https://testapi.nuttyreading.com/pay/payNotify
# ?? url
wxpay.refundNotifyUrl:http://pjm6m9.natappfree.cc/pay/refundNotify
# key pem
wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
#wxpay.keyPemPath:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
# ??? # ???
wxpay.mchId: 1612860909 wxpay.serialNo:679AECB2F7AC4183033F713828892BA640E4EEE3
# API v3 ?? # API v3 key
wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF wxpay.apiV3Key:4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
# v3 - url # ????
wxpay.baseUrl: https://api.mch.weixin.qq.com/v3 wxpay.wechatPayCertificateUrl:/usr/local/hs/peanut_book/target/classes/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
#po9k1ezoyexk.ngrok.xiaomiqiu123.top # ???????? # wxpay.wechatPayCertificateUrl:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
#wxpay.notifyUrl: http://101.201.146.165:9100 # ?? url
wxpay.privateKeyUrl:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
wxpay.notifyUrl: http://59.110.212.44:9200/pb/pay/payNotify #wxpay.privateKeyUrl:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
# ??????
wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
# ???? /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
wxpay.keyPemPath:C:/Users/Cauchy/IdeaProjects/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
#wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
#???????
wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
#???????
wxpay.domain: https://api.mch.weixin.qq.com
#wxpay:
##????
#wxpay.appId: wx47134a8f15083734
##???
#wxpay.mchId: 1612860909
## APIv3??
#wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
## ????V3-url??
#wxpay.baseUrl: https://api.mch.weixin.qq.com/v3
##po9k1ezoyexk.ngrok.xiaomiqiu123.top ?????? ??ok ????????????
#
##wxpay.notifyUrl: http://101.201.146.165:9100
#
#wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
#
## ??????, pjm6m9.natappfree.cc ???????
#wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
## ????,resources? /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
#
#wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
##???????
#wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
##???????
#wxpay.domain: https://api.mch.weixin.qq.com