From bc015c00c215d51ec9a8a86396af84678f184b6f Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Thu, 2 Feb 2023 18:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/prod/config.properties      | 14 +++++++++++++-
 .../src/main/resources/dev/commonConfig.properties |  3 +--
 .../src/main/resources/pre/commonConfig.properties |  2 --
 .../resources/prod-9401/commonConfig.properties    |  2 --
 .../main/resources/prod/commonConfig.properties    |  2 --
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/hai-order/src/main/resources/prod/config.properties b/hai-order/src/main/resources/prod/config.properties
index 5034a9fd..ffe2e9d2 100644
--- a/hai-order/src/main/resources/prod/config.properties
+++ b/hai-order/src/main/resources/prod/config.properties
@@ -1 +1,13 @@
-fileUrl=/home/filesystem
+wxAppId=wx01898d5209357d68
+wxAppSecret=5c52d0526fcdb425075f6d51381d5c03
+
+wxPayMchAppId=wx637bd6f7314daa46
+wxPayMchId=1289663601
+wxPayApiKey=Skufk5oi85wDFGl888i6wsRSTkdd5df5
+wxPayUnifiedOrderUrl=https://api.mch.weixin.qq.com/pay/unifiedorder
+
+wxPayNotifyUrl=https://hsg.dctpay.com/order/payNotify/wechatPay
+unionPayNotifyUrl=https://hsg.dctpay.com/order/payNotify/unionPay
+
+fileUrl=/home/filesystem/
+cmsPath=/home/filesystem/
diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties
index bfb1fe7c..10618478 100644
--- a/hai-service/src/main/resources/dev/commonConfig.properties
+++ b/hai-service/src/main/resources/dev/commonConfig.properties
@@ -62,14 +62,13 @@ unionPayChannelid=D01X00000801226
 unionPayMerid=83169055983W000
 unionPayTermid=XS000103
 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
-unionPayTelNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://mtest.eycard.cn/
 unionStagingPayOrgId=ORG000000000001
 unionStagingPayOrgMerCode=890000000123679
 unionStagingPayOrgTermNo=W0616228
 unionStagingPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
-unionStagingPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/stagingNotify
+unionStagingPayNotifyUrl=https://hsgcs.dctpay.com/order/unionPay/stagingNotify
 
 # ??????
 wx_cert=/home/project/wx_cert/
diff --git a/hai-service/src/main/resources/pre/commonConfig.properties b/hai-service/src/main/resources/pre/commonConfig.properties
index 15f3ac1f..559b52e7 100644
--- a/hai-service/src/main/resources/pre/commonConfig.properties
+++ b/hai-service/src/main/resources/pre/commonConfig.properties
@@ -50,8 +50,6 @@ unionPayChannelid=D01X00000801226
 unionPayMerid=83169055983W000
 unionPayTermid=XS000103
 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
-unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
-unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://cashier.eycard.cn:8663/
 unionStagingPayOrgId=ORG000000000009
diff --git a/hai-service/src/main/resources/prod-9401/commonConfig.properties b/hai-service/src/main/resources/prod-9401/commonConfig.properties
index f9923ae2..39948a84 100644
--- a/hai-service/src/main/resources/prod-9401/commonConfig.properties
+++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties
@@ -55,8 +55,6 @@ unionPayChannelid=D01X00000801226
 unionPayMerid=83169055983W000
 unionPayTermid=XS000103
 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
-unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
-unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://cashier.eycard.cn:8663/
 unionStagingPayOrgId=ORG000000000009
diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties
index 2260665d..2d31b572 100644
--- a/hai-service/src/main/resources/prod/commonConfig.properties
+++ b/hai-service/src/main/resources/prod/commonConfig.properties
@@ -53,8 +53,6 @@ unionPayChannelid=D01X00000801226
 unionPayMerid=83169055983W000
 unionPayTermid=XS000103
 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
-unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
-unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://cashier.eycard.cn:8663/
 unionStagingPayOrgId=ORG000000000009