From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/resources/application-dev.yml | 86 +++++--------------------------------------
1 files changed, 10 insertions(+), 76 deletions(-)
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 50261af..90b1576 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
@@ -83,85 +83,19 @@
########################寰俊鏀粯鐩稿叧閰嶇疆########################
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 #鍟嗘埛鏀粯鍏挜
+ appId: wxcd2b89fd2ff065f8
+ appSecret: 3462fa186da7cb06c544df8d8664b63a
+ mchId: 1229817002
+ mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+ notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
+ keyPath: D:\DouMee\dmkjWxcert\apiclient_cert.p12
- #鏈嶅姟鍟�-------------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
-
-
-#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
upload:
type: ftp
+# 鑵捐鍦板浘apikey
+tencent_key: WE3BZ-HN6WS-ONDOH-62QCV-MNL6F-5NFNE
+
--
Gitblit v1.9.3