From 61866bfaf4de843bd19edc71b71f251183010dff Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Tue, 2 Aug 2022 09:16:52 +0800
Subject: [PATCH] 1

---
 .../main/java/com/hai/config/CommonSysConfig.java    | 12 ++++++------
 .../src/main/resources/dev/commonConfig.properties   |  2 ++
 .../src/main/resources/pre/commonConfig.properties   |  2 ++
 .../main/resources/prod-9401/commonConfig.properties |  2 ++
 .../src/main/resources/prod/commonConfig.properties  |  2 ++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java
index 72fd33c4..9503e86d 100644
--- a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java
+++ b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java
@@ -43,12 +43,12 @@ public class CommonSysConfig {
     private String huiliantongAppNo;
     private String huiliantongAppkey;
     private String huiliantongAppsecret;
+    private String huiliantongDistributorId;
+    private String huiliantongSinopecUrl;
 
     private String HuiLianTongUnionCardUrl;
     private String HuiLianTongUnionCardAccessCode;
     private String HuiLianTongUnionCardSignCode;
-    private String HuiliantongDistributorId;
-    private String HuiliantongSinopecUrl;
 
     private String HltMembershipLevelAccessCode;
     private String HltMembershipLevelSignCode;
@@ -95,19 +95,19 @@ public class CommonSysConfig {
     private String unionRsaKey;
 
     public String getHuiliantongDistributorId() {
-        return HuiliantongDistributorId;
+        return huiliantongDistributorId;
     }
 
     public void setHuiliantongDistributorId(String huiliantongDistributorId) {
-        HuiliantongDistributorId = huiliantongDistributorId;
+        this.huiliantongDistributorId = huiliantongDistributorId;
     }
 
     public String getHuiliantongSinopecUrl() {
-        return HuiliantongSinopecUrl;
+        return huiliantongSinopecUrl;
     }
 
     public void setHuiliantongSinopecUrl(String huiliantongSinopecUrl) {
-        HuiliantongSinopecUrl = huiliantongSinopecUrl;
+        this.huiliantongSinopecUrl = huiliantongSinopecUrl;
     }
 
     public String getShellGroupPartnerId() {
diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties
index 511cd56e..e3d57578 100644
--- a/hai-service/src/main/resources/dev/commonConfig.properties
+++ b/hai-service/src/main/resources/dev/commonConfig.properties
@@ -31,6 +31,8 @@ huiliantongUrl=https://gzapitest.deepermobile.com.cn:441
 huiliantongAppNo=guizhouhltcs
 huiliantongAppkey=g%2BNnjR54YSUWM2iKg%2Fd82A9x9hg2kYV7
 huiliantongAppsecret=FA28E95ACABFA4B2B8E25857437B07F1
+huiliantongDistributorId=test
+huiliantongSinopecUrl=fuelCouponsTest
 
 # ????????
 HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
diff --git a/hai-service/src/main/resources/pre/commonConfig.properties b/hai-service/src/main/resources/pre/commonConfig.properties
index fcab49b3..fa62816e 100644
--- a/hai-service/src/main/resources/pre/commonConfig.properties
+++ b/hai-service/src/main/resources/pre/commonConfig.properties
@@ -27,6 +27,8 @@ huiliantongUrl=https://gzapi.deepermobile.com.cn
 huiliantongAppNo=guizhouhuilt
 huiliantongAppkey=e0ja2Ex%2BmQ2hIPF6x%2BHA%3D
 huiliantongAppsecret=52662415DDCE55C7BA34223BCF53877A
+huiliantongDistributorId=test
+huiliantongSinopecUrl=fuelCouponsTest
 
 HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
 HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE
diff --git a/hai-service/src/main/resources/prod-9401/commonConfig.properties b/hai-service/src/main/resources/prod-9401/commonConfig.properties
index 2fdcb8fe..d8befee0 100644
--- a/hai-service/src/main/resources/prod-9401/commonConfig.properties
+++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties
@@ -29,6 +29,8 @@ huiliantongUrl=https://gzapi.deepermobile.com.cn
 huiliantongAppNo=guizhouhuilt
 huiliantongAppkey=e0ja2Ex%2BmQ2hIPF6x%2BHA%3D
 huiliantongAppsecret=52662415DDCE55C7BA34223BCF53877A
+huiliantongDistributorId=test
+huiliantongSinopecUrl=fuelCoupons
 
 HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
 HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE
diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties
index fcab49b3..880c21c2 100644
--- a/hai-service/src/main/resources/prod/commonConfig.properties
+++ b/hai-service/src/main/resources/prod/commonConfig.properties
@@ -27,6 +27,8 @@ huiliantongUrl=https://gzapi.deepermobile.com.cn
 huiliantongAppNo=guizhouhuilt
 huiliantongAppkey=e0ja2Ex%2BmQ2hIPF6x%2BHA%3D
 huiliantongAppsecret=52662415DDCE55C7BA34223BCF53877A
+huiliantongDistributorId=test
+huiliantongSinopecUrl=fuelCoupons
 
 HuiLianTongUnionCardUrl=http://hltgz.com:4010/api/v2/execute.json
 HuiLianTongUnionCardAccessCode=6FCAE1470CEF465988351BB65ABAA8AE