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 |   30 +++++++++++++++++++++++-------
 1 files changed, 23 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 44ced57..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,28 @@
 ########################寰俊鏀粯鐩稿叧閰嶇疆########################
 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
+    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:
+#    appId: wx0115b948d647e9b2
+#    appSecret: 4b5b97d6770f1fc6b09a7019804739a7
+#    mchId: 1739990831
+#    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
+#    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:
@@ -62,4 +78,4 @@
 
 
 ########################瀹氭椂寮�鍚厤缃�########################
-timing: true
\ No newline at end of file
+timing: false
\ No newline at end of file

--
Gitblit v1.9.3