From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 12 十二月 2023 18:26:17 +0800 Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner --- server/services/src/main/resources/application-dev.yml | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml index 1217ac8..980bff6 100644 --- a/server/services/src/main/resources/application-dev.yml +++ b/server/services/src/main/resources/application-dev.yml @@ -29,8 +29,7 @@ password: 111111 debug_model: true -# 鏄惁闇�瑕侀獙璇佺爜 -captcha_check: false + # Swagger閰嶇疆 swagger: host: @@ -44,14 +43,24 @@ ########################寰俊鏀粯鐩稿叧閰嶇疆######################## wx: pay: - appId: wxcd2b89fd2ff065f8 + appId: wx48fd8faa35cc8277 + mchId: 1661770902 + apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT + serialNumer: 368B835A194384FD583B83B77977B84127D2F655 + notifyUrl: http://xiaopiqiu2.natapp1.cc/api/wxPayNotify + refundNotifyUrl: http://xiaopiqiu2.natapp1.cc/api/wxRefundNotify +# notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify + keyPath: D://apiclient_cert.p12 + privateCertPath: D://apiclient_cert.pem + privateKeyPath: D://apiclient_key.pem + existsSub: 1 appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24 - mchId: 1229817002 - mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM -# notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify - notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify -# keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12 - keyPath: /usr/local/apiclient_cert.p12 + subAppId: wxcd2b89fd2ff065f8 + subAppSecret: 49c4a52f9ad87ba98307972664fe33b3 + subMchId: 1661772003 + subMchKey: EVM8E15TKXE0OEMJFC0V6UFVIOZ5CSQS + # mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM + typeId: gybike ########################mqtt鐩稿叧閰嶇疆######################## mqtt: host: tcp://175.27.187.84:1883 -- Gitblit v1.9.3