From cfa85717f52d3818280ae00ac83b178d71ce9c6a Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 1 Nov 2021 10:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cweb/controller/HighTestController.java  | 2 +-
 hai-service/src/main/resources/pre/commonConfig.properties | 7 +++++++
 .../src/main/resources/prod-9401/commonConfig.properties   | 7 +++++++
 .../src/main/resources/prod/commonConfig.properties        | 7 +++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
index dc6d7268..b63839df 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
@@ -258,7 +258,7 @@ public class HighTestController {
 
     @RequestMapping(value = "/unionPay", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "银联支付")
+    @ApiOperation(value = "银联支付") 
     public ResponseData unionPay(@RequestParam(name = "merchantId", required = true) Long merchantId) {
         try {
             return ResponseMsgUtil.success(UnionPayConfig.upPreOrder("HF"+System.currentTimeMillis(), new BigDecimal("1"), "test"));
diff --git a/hai-service/src/main/resources/pre/commonConfig.properties b/hai-service/src/main/resources/pre/commonConfig.properties
index ff6f43c6..167aed49 100644
--- a/hai-service/src/main/resources/pre/commonConfig.properties
+++ b/hai-service/src/main/resources/pre/commonConfig.properties
@@ -19,6 +19,13 @@ HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
 HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE
 HuiLianTongUnionCardSignCode=F8E91A3C
 
+unionPayUrl=https://notify-test.eycard.cn:7443/WorthTech_Access_AppPaySystemV2/apppayacc
+unionPayChannelid=D01X66666666761
+unionPayMerid=531000012972390
+unionPayTermid=W1489519
+unionPaySignKey=sa72ivadl84273dlj2kdaia2idiadik5
+unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
+
 wx_cert=/home/project/wx_cert/
 
 TelApiKey=2d01f6b520254b1a80f6b167832cea18
diff --git a/hai-service/src/main/resources/prod-9401/commonConfig.properties b/hai-service/src/main/resources/prod-9401/commonConfig.properties
index 3917af6a..ed2624ec 100644
--- a/hai-service/src/main/resources/prod-9401/commonConfig.properties
+++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties
@@ -19,6 +19,13 @@ HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
 HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE
 HuiLianTongUnionCardSignCode=F8E91A3C
 
+unionPayUrl=https://notify-test.eycard.cn:7443/WorthTech_Access_AppPaySystemV2/apppayacc
+unionPayChannelid=D01X66666666761
+unionPayMerid=531000012972390
+unionPayTermid=W1489519
+unionPaySignKey=sa72ivadl84273dlj2kdaia2idiadik5
+unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
+
 wx_cert=/home/project/wx_cert/
 
 TelApiKey=2d01f6b520254b1a80f6b167832cea18
diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties
index 3917af6a..ed2624ec 100644
--- a/hai-service/src/main/resources/prod/commonConfig.properties
+++ b/hai-service/src/main/resources/prod/commonConfig.properties
@@ -19,6 +19,13 @@ HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
 HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE
 HuiLianTongUnionCardSignCode=F8E91A3C
 
+unionPayUrl=https://notify-test.eycard.cn:7443/WorthTech_Access_AppPaySystemV2/apppayacc
+unionPayChannelid=D01X66666666761
+unionPayMerid=531000012972390
+unionPayTermid=W1489519
+unionPaySignKey=sa72ivadl84273dlj2kdaia2idiadik5
+unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
+
 wx_cert=/home/project/wx_cert/
 
 TelApiKey=2d01f6b520254b1a80f6b167832cea18