From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/resources/application-dev.yml | 104 ++++++++++++++-------------------------------------
1 files changed, 29 insertions(+), 75 deletions(-)
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 50261af..d31d65f 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://192.168.0.211:3306/jinkuai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.211:3306/gtzxinglijicun?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
password: Doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -62,6 +62,12 @@
des_pwd: 123456SDFKDJF
+
+jpush:
+ appKey: bb8fd4bd06c8dcb004f4ee1e
+ masterSecret: 569a75763aa5a59377c46fbb
+ apnsProduction: false
+
knife4j:
enable: true
basic:
@@ -83,85 +89,33 @@
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
pay:
- #鏈嶅姟鍟�---------start------- 鍙傛暟璇﹁В鍦板潃 https://pay.weixin.qq.com/doc/v3/partner/4013080340
- mchId: 1700071922 #鏈嶅姟鍟嗗湪寰俊鏀粯渚х殑鍞竴韬唤鏍囪瘑
- appId: wx6cc1087ca79db7f6 #鏈嶅姟鍟嗗湪寰俊寮�鏀惧钩鍙帮紙绉诲姩搴旂敤锛夋垨鍏紬骞冲彴锛堝叕浼楀彿/灏忕▼搴忥級涓婄敵璇风殑涓�涓敮涓�鏍囪瘑
- apiV3Key: 0a056faa107c2b2944b9d6a9aa6d4142 #7tG4Vk9Zp2L8dXw5Jq0N3hR6yE1sF3cB
- serialNumer: 6696086F6EFB8D6A4F821BD47DDBAF75C3BC1209 #38495CE0137D90E4DC4F64F7ECDE035A35470BE3 #鏈嶅姟鍟嗚瘉涔﹀簭鍒楀彿
- payPublicKeyId: PUB_KEY_ID_0117000719222024112700219100000508 #鍟嗘埛/骞冲彴鏀粯鍏挜id
- #mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
- notifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxPayNotify
- refundNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxRefundNotify
- keyPath: D://jinkuaiPayFile/apiclient_cert.p12
- privateCertPath: D://jinkuaiPayFile/apiclient_cert.pem
- privateKeyPath: D://jinkuaiPayFile/apiclient_key.pem
- pubKeyPath: D://jinkuaiPayFile/pub_key.pem #鍟嗘埛鏀粯鍏挜
-
- #鏈嶅姟鍟�-------------end---
-
- #鍟嗘埛淇℃伅
- wechatSerialNumer: 12C0F0DD0F3D2B565B45586D3FEA225EBF723BEC
- wechatPayPublicKeyId: PUB_KEY_ID_0117233260692025072500181939000603 #鍟嗘埛/骞冲彴鏀粯鍏挜id
- wechatPubKeyPath: D://jinkuaiPayFile/shanghu/pub_key.pem #鍟嗘埛鏀粯鍏挜
- wechatPrivateKeyPath: D://jinkuaiPayFile/shanghu/apiclient_key.pem #鍟嗘埛绉侀挜
- wechatNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wechat/transferNotify #鍟嗘埛杞处鍥炶皟鍦板潃
- wechatApiV3Key: 7tG4Vk9Zp2L8dXw5Jq0N3hR6yE1sF3cB
-
- existsSub: 1
- appSecret:
- #瀛愬晢鎴�------------start----
- subMchId: 1723326069 #瀛愬晢鎴峰彿
- subAppId: wx332441ae5b12be7d #灏忕▼搴廼d
- subAppSecret: add86d6406f5c14501ac5bbb1a60e004 #灏忕▼搴忕閽�
- #瀛愬晢鎴�------------end----
- # mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- typeId: jinkuai
+ appId: wxb1b59320e803dc6c
+ appSecret: eb93785c7bca3f0ff0364b0e26bfeb59
+ mchId: 1629568742 #鍟嗘埛鍙�
+ apiV3Key: NJTLJSTZYXZRGScaiwubuzichanbu666 #apiV3Key
+ serialNumer: 25D19D18217F4588841E5CD1AA0D1533DE8AF84A #鍟嗘埛璇佷功搴忓垪鍙�
+ privateKeyPath: pay/pro/wx/apiclient_key.pem
+ v3NotifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayV3Notify
+ v3RefundNotifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxRefundV3Notify
-#wx:
-# pay:
-# #鏈嶅姟鍟�---------start-------
-# appId: wx48fd8faa35cc8277
-# mchId: 1661770902
-# apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT
-# serialNumer: 368B835A194384FD583B83B77977B84127D2F655
-# mchKey: W97N53Q71326D6JZ2E9HY5M4VT4BAC8S
-# notifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxPayNotify
-# refundNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wxRefundNotify
-## notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
-## refundNotifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxRefundNotify
-# #keyPath: /usr/local/aliConfig/bike/apiclient_cert.p12
-# #privateCertPath: /usr/local/aliConfig/bike/apiclient_cert.pem
-# #privateKeyPath: /usr/local/aliConfig/bike/apiclient_key.pem
-# keyPath: /usr/local/zhengshu/apiclient_cert.p12 #d://apiclient_cert.p12
-# privateCertPath: /usr/local/zhengshu/apiclient_cert.pem #d://apiclient_cert.pem
-# privateKeyPath: /usr/local/zhengshu/apiclient_key.pem #d://apiclient_key.pem
-#
-#
-# #鍟嗘埛淇℃伅
-# wechatSerialNumer: 3C9A32FB6CD453FAAAF97F9737ECAEA9D6625727
-# wechatPayPublicKeyId: 47E172124E73E8098A565E971064C20ACDE7C911 # PUB_KEY_ID_0116617720032025071800291849000801 #鍟嗘埛/骞冲彴鏀粯鍏挜id
-# wechatPubKeyPath: /usr/local/zhengshu/pub_key.pem #d://pub_key.pem #鍟嗘埛鏀粯鍏挜
-# #wechatPlatformPubKeyPath: d:/wechatpay_47E172124E73E8098A565E971064C20ACDE7C911.pem #骞冲彴鏀粯鍏挜
-# wechatPrivateKeyPath: /usr/local/zhengshu/wechatApiclient_key.pem #d://wechatApiclient_key.pem #鍟嗘埛绉侀挜
-# wechatNotifyUrl: https://test.doumee.cn/jinkuai_admin/web/wechat/transferNotify #鍟嗘埛杞处鍥炶皟鍦板潃
-# #wechatApiV3Key: V4PRKUBTK2BKNKJAD9NSI9YFG2Q0EOT1 #鍟嗘埛APIV3Key
-#
-#
-# #鏈嶅姟鍟�-------------end---
-# existsSub: 1
-# appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
-# #瀛愬晢鎴�------------start----
-# subAppId: wxcd2b89fd2ff065f8 #wxcd2b89fd2ff065f8
-# subAppSecret: 3462fa186da7cb06c544df8d8664b63a #3336812504c830b1c3c5243f9ece407a
-# subMchId: 1661772003
-# subMchKey: EVM8E15TKXE0OEMJFC0V6UFVIOZ5CSQS
-# #瀛愬晢鎴�------------end----
-# # mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
-# typeId: gybike
+alipay:
+ pay:
+ appId: 2021006147660139
+ privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEeqqkZztBHfK+vpyBi6ejgDTHZuZ3yiuXds+lRBbMo/g24F5trH+oLHW0gMhSxihFfQBBIpVBXDsPQK4ZkhDWTaOBktnU1UMRoOEiaaZU6EiWy10ePFUmpdXpkCQEp7rc88OwI90p58S3+L+Ckak60WqNwJBdB5YGBaUunryBA78U4zW1KNY7JvoRnZDcFMQiczikwUzhO7EAi0yVrVpsVsc9s87mcS4uOJKx4qb2E83r9RJ1z30db+cIIZRiLP2oNZBLYzgKpOouE+uIgxhQzlh6cOASNZQulXuUjoT/+Y9w4njfl4TmKIXWcJFKIMc6kMiux9tTncpp0TqRwk1tAgMBAAECggEALkSYtJheusnbpRFr95G0i2sggqh3s1PXihZ/dXKgT9Z5GCsj8X3Cng7CNRxykBN73kk+axhCv56Bhej8Vqcv8ddcnqG/TEBgR+Fzws/QTIRau6/uILWic7RvuE2qPbJl7aw1s9/uL/UVPSGFr7CvgltYVUM4e7/Sk1529JCK4XJfoXP5tKJ3OaXssvaFnCKEU8IGQkjRG+lUZJhAHVtClGHtgrhevgRhy2zre5wp2qSa8d/MqrPruSYS02hn9b5Nl6i2PlUS6dGlJ4lrxYTG22ukYYoxAPNPS7gnvmveXonWP7b5tPhKRpZjnoySojz3WECUlhz/v8wM1cDrpq+GQQKBgQDsc7y2rlx4f77a7ORfb5/qWHCOJs1cIzggj0kJ7TgFGe71kbCQ5nywD/Fe5V9OwbW+DCxOME+SrrHeiK4axWiu5si/1JlurJoxNy+4k4ywk3ZA3Nv2aBhlPqfkwDhJ0z7Mgsq2c/YgnVddmSvKZoC39wA77ovks4GDxaBOt8N7PQKBgQDUuPGgzkwcgb60UdaxfMbacrPsW26vDxaE4ceuXo2m8KDiCIqkF2y9r6AdWMTgGGSJwOsk7+FP+21VdRivCg9HcOLWngveUc6xDIuqKHVpemMo3SdCF4Wqf96rRc3VOBr5cfIdWxeorZf5umMyKnIAjAFETOOrK7eLTTmjyLD98QKBgB82S+Plcklpu3zUpnS+nGJn2Du7fYI7F+6cW2zXBn0N5lA+Mgt+kVkAUcFQD9uqkF4M51BO6kIXk10nt6vLAT2NM1S3MKW+XQBAI6l+uKSaYpK/VL3bEdVThwAYK5X7L5/5Z97bwdKeUmkFjhVCoJ0oGrzOiWLgGymUzct2UHSVAoGBAMb+7Cs+Ub0pMrmFBY6r52pbey1Uq0pglvRgMmhQU7sjx50r2GaA81zPer15WVM5/nNPYaoALYqg7jrPe/PjOT/fvpR+7SNg7DZ8QftANfYiY7jKifst/gDt9ePLPS6FedZ4XcJQgOVu34jicAFx64vPbS/zrddm4iEScSVijRBBAoGAXCheERsx8+n16Us/DttXFUa1nc7+D8WR6buM1QMZgQCVF2qp3XtM+FusCKL4+q1+dtag8svLjJFp9QbaAXqX8Zk7rn8wUHbDloPTPy9XWgrPowyL9MPU+e/Rq8Hr6TWPDBd4TU64YzIEfBQYpJXfZbXhVYmK3o7xHXKB1x4vvEM=
+ appCertPath: pay/pro/appCertPublicKey.crt
+ alipayPublicCertPath: pay/pro/alipayCertPublicKey_RSA2.crt
+ rootCertPath: pay/pro/alipayRootCert.crt
upload:
type: ftp
+# 鑵捐鍦板浘apikey
+tencent_key:
+
+# 楂樺痉鍦板浘apikey
+geocode_map_key: 9a6c1f0eff2e5aa91989ca9d4c21e262
+
+
--
Gitblit v1.9.3