From 5d25009fa71b6c6436f457cc33f3a90587799121 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 19 May 2022 11:50:48 +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 --- .../java/com/cweb/controller/HighGasController.java | 4 ++-- .../src/main/java/com/hai/config/CommonSysConfig.java | 11 +++++++++++ .../src/main/resources/dev/commonConfig.properties | 1 + .../src/main/resources/pre/commonConfig.properties | 2 ++ .../main/resources/prod-9401/commonConfig.properties | 2 ++ .../src/main/resources/prod/commonConfig.properties | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java index 009f22d1..06d6afeb 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java @@ -227,8 +227,8 @@ public class HighGasController { param.put("gasId", store.getStoreKey()); param.put("gasName", store.getStoreName()); param.put("gasAddress", store.getAddress()); - param.put("gasLogoBig", store.getStoreLogo()); - param.put("gasLogoSmall", store.getStoreLogo()); + param.put("gasLogoBig", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo()); + param.put("gasLogoSmall", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo()); param.put("gasAddressLatitude", store.getLatitude()); param.put("gasAddressLongitude", store.getLatitude()); // 距离 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 011939e4..1efcef06 100644 --- a/hai-service/src/main/java/com/hai/config/CommonSysConfig.java +++ b/hai-service/src/main/java/com/hai/config/CommonSysConfig.java @@ -9,6 +9,9 @@ import org.springframework.stereotype.Component; @PropertySource("classpath:/commonConfig.properties") public class CommonSysConfig { + // 嗨森逛域名 + private String hsgDomainName; + private String tuanYouUrl; private String tuanYouAppKey; private String tuanYouAppSecret; @@ -425,4 +428,12 @@ public class CommonSysConfig { public void setCzAppSecret(String czAppSecret) { CzAppSecret = czAppSecret; } + + public String getHsgDomainName() { + return hsgDomainName; + } + + public void setHsgDomainName(String hsgDomainName) { + this.hsgDomainName = hsgDomainName; + } } diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties index 9842dcac..0d75b5d3 100644 --- a/hai-service/src/main/resources/dev/commonConfig.properties +++ b/hai-service/src/main/resources/dev/commonConfig.properties @@ -1,3 +1,4 @@ +hsgDomainName=https://hsgcs.dctpay.com # ???? tuanYouUrl=https://test05-motorcade-hcs.czb365.com tuanYouAppKey=231599775566496 diff --git a/hai-service/src/main/resources/pre/commonConfig.properties b/hai-service/src/main/resources/pre/commonConfig.properties index a21ce8f3..7903c7bc 100644 --- a/hai-service/src/main/resources/pre/commonConfig.properties +++ b/hai-service/src/main/resources/pre/commonConfig.properties @@ -1,3 +1,5 @@ +hsgDomainName=https://hsgcs.dctpay.com + tuanYouUrl=https://hcs.czb365.com tuanYouAppKey=210091174083104 tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45 diff --git a/hai-service/src/main/resources/prod-9401/commonConfig.properties b/hai-service/src/main/resources/prod-9401/commonConfig.properties index b526eb7d..ec9dae3e 100644 --- a/hai-service/src/main/resources/prod-9401/commonConfig.properties +++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties @@ -1,3 +1,5 @@ +hsgDomainName=https://hsg.dctpay.com + tuanYouUrl=https://hcs.czb365.com tuanYouAppKey=210091174083104 tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45 diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties index 6f0a617c..bd799df7 100644 --- a/hai-service/src/main/resources/prod/commonConfig.properties +++ b/hai-service/src/main/resources/prod/commonConfig.properties @@ -1,3 +1,5 @@ +hsgDomainName=https://hsg.dctpay.com + tuanYouUrl=https://hcs.czb365.com tuanYouAppKey=210091174083104 tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45