From d295f1f7706e51b158cb7252b6ac633b1f9a1982 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 五月 2026 09:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/resources/application-dev.yml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/server/dmmall_service/src/main/resources/application-dev.yml b/server/dmmall_service/src/main/resources/application-dev.yml
index 9966b10..51155a9 100644
--- a/server/dmmall_service/src/main/resources/application-dev.yml
+++ b/server/dmmall_service/src/main/resources/application-dev.yml
@@ -48,12 +48,18 @@
########################寰俊鏀粯鐩稿叧閰嶇疆########################
wx:
pay:
- appId: wxcd2b89fd2ff065f8
- appSecret: 3462fa186da7cb06c544df8d8664b63a
- mchId: 1229817002
- mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
- notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
- keyPath: /usr/local/apiclient_cert.p12 #D:\DouMee\dmkjWxcert\apiclient_cert.p12 #
+ appId: wx6264b4f3a697cbe8
+ appSecret: 23734577e8978138c946b727f0394027
+ mchId: 1629568742
+ mchKey: NJTLJSTZYXZRGScaiwubuzichanbu666
+ notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify
+ keyPath: D:\DouMee\gtxljcWxcert\apiclient_cert.p12
+# appId: wxcd2b89fd2ff065f8
+# appSecret: 3462fa186da7cb06c544df8d8664b63a
+# mchId: 1229817002
+# mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+# notifyUrl: https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
+# keyPath: /usr/local/apiclient_cert.p12 #D:\DouMee\dmkjWxcert\apiclient_cert.p12 #
#wx:
# pay:
@@ -64,6 +70,7 @@
# notifyUrl: http://xiaopiqiu2.natapp1.cc/web/api/wxPayNotify #https://test.doumee.cn/dmmall_web_api/web/api/wxPayNotify
# keyPath: D:\DouMee\1739990831_20260306_cert #D:\DouMee\dmkjWxcert\apiclient_cert.p12 #
+
tencent:
map:
remoteHost: https://apis.map.qq.com
@@ -71,4 +78,4 @@
########################瀹氭椂寮�鍚厤缃�########################
-timing: true
\ No newline at end of file
+timing: false
\ No newline at end of file
--
Gitblit v1.9.3