Browse Source

modify url config

java110 3 years ago
parent
commit
6d946088a0
34 changed files with 122 additions and 52 deletions
  1. 35 0
      java110-utils/src/main/java/com/java110/utils/cache/UrlCache.java
  2. 4 0
      java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java
  3. 2 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java
  4. 2 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java
  5. 2 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
  6. 1 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt
  7. 2 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java
  8. 2 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java
  9. 2 1
      service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java
  10. 8 7
      service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java
  11. 2 1
      service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayBackCitySMOImpl.java
  12. 2 1
      service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java
  13. 3 2
      service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java
  14. 2 1
      service-common/src/main/java/com/java110/common/cmd/equipmentAccount/ListEquipmentAccountCmd.java
  15. 2 1
      service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
  16. 2 1
      service-common/src/main/java/com/java110/common/cmd/machine/UnlicensedCarMachineQrCodeUrl.java
  17. 3 2
      service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java
  18. 2 1
      service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java
  19. 3 2
      service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java
  20. 3 2
      service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java
  21. 3 2
      service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineApprovalApplyRoomDiscountAdapt.java
  22. 2 1
      service-job/src/main/java/com/java110/job/adapt/hcGov/visit/ExamineVisitAdapt.java
  23. 2 1
      service-job/src/main/java/com/java110/job/adapt/notice/MachineNoticeAdapt.java
  24. 2 1
      service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
  25. 2 1
      service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovation.java
  26. 2 1
      service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java
  27. 2 1
      service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java
  28. 2 1
      service-job/src/main/java/com/java110/job/task/fee/FeeDueReminderTemplate.java
  29. 4 3
      service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
  30. 2 1
      service-user/src/main/java/com/java110/user/api/StaffApi.java
  31. 8 7
      springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java
  32. 2 1
      springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayBackCitySMOImpl.java
  33. 2 1
      springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayInGoOutSMOImpl.java
  34. 3 2
      springboot/src/main/java/com/java110/boot/smo/staff/impl/StaffAuthSMOImpl.java

+ 35 - 0
java110-utils/src/main/java/com/java110/utils/cache/UrlCache.java

@@ -0,0 +1,35 @@
+package com.java110.utils.cache;
+
+import com.java110.utils.constant.MappingConstant;
+
+/**
+ * 系统平台url 地址
+ *
+ */
+public class UrlCache {
+
+    /**
+     * 获取业主端域名
+     * @return
+     */
+    public static String getOwnerUrl(){
+
+        return MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+
+    }
+    /**
+     * 获取员工地址
+     * @return
+     */
+    public static String getPropertyPhoneUrl(){
+        return MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
+    }
+
+    /**
+     * 获取 商城手机端地址
+     * @return
+     */
+    public static String getMallAppUrl(){
+        return MappingCache.getValue(MappingConstant.URL_DOMAIN,"MALL_URL");
+    }
+}

+ 4 - 0
java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java

@@ -26,6 +26,10 @@ public final class MappingConstant {
     // 微信商户
     public static final String WECHAT_STORE_DOMAIN ="WECHAT_STORE";
 
+
+    // 商城公众号
+    public static final String MALL_WECHAT_DOMAIN ="MALL_WECHAT";
+
     public  static final String KEY_LOG_ON_OFF = "LOG_ON_OFF";
 
     public  static final String KEY_COST_TIME_ON_OFF = "COST_TIME_ON_OFF";

+ 2 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java

@@ -23,6 +23,7 @@ import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.utils.cache.CommonCache;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.exception.CmdException;
@@ -93,7 +94,7 @@ public class AliPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String communityId = reqJson.getString("communityId");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/app/payment/notify/common/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl()+ "/app/payment/notify/common/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 2 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java

@@ -14,6 +14,7 @@ import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.*;
@@ -107,7 +108,7 @@ public class ChinaUmsPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String tradeType = reqJson.getString("tradeType");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/app/payment/notify/chinaums/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/chinaums/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 2 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java

@@ -15,6 +15,7 @@ import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.*;
@@ -105,7 +106,7 @@ public class FuiouPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String tradeType = reqJson.getString("tradeType");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/app/payment/notify/wechat/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/wechat/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 1 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt

@@ -115,7 +115,7 @@ public class IcbcPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String tradeType = reqJson.getString("tradeType");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/app/payment/notify/icbc/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/icbc/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 2 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java

@@ -13,6 +13,7 @@ import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.*;
@@ -87,7 +88,7 @@ public class PinganPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String tradeType = reqJson.getString("tradeType");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/app/payment/notify/wechat/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/wechat/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 2 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java

@@ -15,6 +15,7 @@ import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.Assert;
@@ -88,7 +89,7 @@ public class PlutusPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String tradeType = reqJson.getString("tradeType");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")+"/app/payment/notify/wechat/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl()+"/app/payment/notify/wechat/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 2 - 1
service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java

@@ -16,6 +16,7 @@ import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.po.onlinePay.OnlinePayPo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.Assert;
@@ -91,7 +92,7 @@ public class WechatPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         String appId = context.getReqHeaders().get("app-id");
         String userId = context.getReqHeaders().get("user-id");
         String tradeType = reqJson.getString("tradeType");
-        String notifyUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")+"/app/payment/notify/wechat/992020011134400001";
+        String notifyUrl = UrlCache.getOwnerUrl()+"/app/payment/notify/wechat/992020011134400001";
 
         String openId = reqJson.getString("openId");
 

+ 8 - 7
service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java

@@ -2,6 +2,7 @@ package com.java110.api.properties;
 
 
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.StringUtil;
@@ -120,7 +121,7 @@ public class WechatAuthProperties {
     public String getWxNotifyUrl() {
         String wxNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "wxNotifyUrl");
         if (!StringUtil.isEmpty(wxNotifyUrlCache)) {
-            return wxNotifyUrlCache;
+            return UrlCache.getOwnerUrl()+wxNotifyUrlCache;
         }
         return wxNotifyUrl;
     }
@@ -130,7 +131,7 @@ public class WechatAuthProperties {
     }
 
     public String getWechatAppId() {
-        String wechatAppIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "wechatAppId");
+        String wechatAppIdCache = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "wechatAppId");
         if (!StringUtil.isEmpty(wechatAppIdCache)) {
             return wechatAppIdCache;
         }
@@ -142,7 +143,7 @@ public class WechatAuthProperties {
     }
 
     public String getWechatAppSecret() {
-        String wechatAppSecretCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "wechatAppSecret");
+        String wechatAppSecretCache = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "wechatAppSecret");
         if (!StringUtil.isEmpty(wechatAppSecretCache)) {
             return wechatAppSecretCache;
         }
@@ -164,7 +165,7 @@ public class WechatAuthProperties {
     public String getRentingNotifyUrl() {
         String rentingNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "rentingNotifyUrl");
         if (!StringUtil.isEmpty(rentingNotifyUrlCache)) {
-            return rentingNotifyUrlCache;
+            return UrlCache.getMallAppUrl()+rentingNotifyUrlCache;
         }
         return rentingNotifyUrl;
     }
@@ -176,7 +177,7 @@ public class WechatAuthProperties {
     public String getOweFeeNotifyUrl() {
         String oweFeeNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "oweFeeNotifyUrl");
         if (!StringUtil.isEmpty(oweFeeNotifyUrlCache)) {
-            return oweFeeNotifyUrlCache;
+            return UrlCache.getOwnerUrl()+oweFeeNotifyUrlCache;
         }
         return oweFeeNotifyUrl;
     }
@@ -188,7 +189,7 @@ public class WechatAuthProperties {
     public String getGoodsNotifyUrl() {
         String goodsNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "goodsNotifyUrl");
         if (!StringUtil.isEmpty(goodsNotifyUrlCache)) {
-            return goodsNotifyUrlCache;
+            return UrlCache.getMallAppUrl()+goodsNotifyUrlCache;
         }
         return goodsNotifyUrl;
     }
@@ -200,7 +201,7 @@ public class WechatAuthProperties {
     public String getTempCarFeeNotifyUrl() {
         String tempCarFeeNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "tempCarFeeNotifyUrl");
         if (!StringUtil.isEmpty(tempCarFeeNotifyUrlCache)) {
-            return tempCarFeeNotifyUrlCache;
+            return UrlCache.getOwnerUrl()+ tempCarFeeNotifyUrlCache;
         }
         return tempCarFeeNotifyUrl;
     }

+ 2 - 1
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayBackCitySMOImpl.java

@@ -6,6 +6,7 @@ import com.java110.api.properties.WechatAuthProperties;
 import com.java110.api.smo.AppAbstractComponentSMO;
 import com.java110.api.smo.payment.IToPayBackCitySMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
@@ -51,7 +52,7 @@ public class ToPayBackCitySMOImpl extends AppAbstractComponentSMO implements ITo
 
         ResponseEntity responseEntity = null;
 
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")
+        String ownerUrl = UrlCache.getOwnerUrl()
                 + "/#/pages/reportInfoBack/reportInfoBack?communityId="
                 + paramIn.getString( "communityId" ) ;
         Map result = new HashMap(  );

+ 2 - 1
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java

@@ -9,6 +9,7 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
@@ -59,7 +60,7 @@ public class ToPayInGoOutSMOImpl extends AppAbstractComponentSMO implements IToP
         ResponseEntity responseEntity = null;
 
 
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")
+        String ownerUrl = UrlCache.getOwnerUrl()
                 + "/#/pages/reportInfoDetail/reportInfoDetail?settingId=" +
                 paramIn.getString("settingId") +
                 "&communityId=" + paramIn.getString("communityId");

+ 3 - 2
service-api/src/main/java/com/java110/api/smo/staff/impl/StaffAuthSMOImpl.java

@@ -12,6 +12,7 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.WechatConstant;
@@ -109,7 +110,7 @@ public class StaffAuthSMOImpl extends DefaultAbstractComponentSMO implements ISt
 
         ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
                 "/staff/updateStaffAppAuth", HttpMethod.POST);
-        url = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        url = UrlCache.getOwnerUrl();
         if(url.contains("/#/")){
             if(url.contains("?")){
                 url += ("&wAppId="+smallWeChatDto.getAppId());
@@ -148,7 +149,7 @@ public class StaffAuthSMOImpl extends DefaultAbstractComponentSMO implements ISt
         }
 
         String openUrl = "";
-        String url = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        String url = UrlCache.getOwnerUrl();
         url = url
                 + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
                 + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())

+ 2 - 1
service-common/src/main/java/com/java110/common/cmd/equipmentAccount/ListEquipmentAccountCmd.java

@@ -25,6 +25,7 @@ import com.java110.dto.machineType.MachineTypeDto;
 import com.java110.intf.common.IMachineTypeV1InnerServiceSMO;
 import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -74,7 +75,7 @@ public class ListEquipmentAccountCmd extends Cmd {
         int count = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccountsCount(equipmentAccountDto);
 
         List<EquipmentAccountDto> equipmentAccountDtos = null;
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        String ownerUrl = UrlCache.getOwnerUrl();
 
 
         if (count > 0) {

+ 2 - 1
service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java

@@ -29,6 +29,7 @@ import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -78,7 +79,7 @@ public class GetCarMachineQrCodeUrl extends Cmd {
         smallWeChatDto.setObjId(reqJson.getString("communityId"));
         smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
         List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        String ownerUrl = UrlCache.getOwnerUrl();
         ownerUrl += ("/#/pages/fee/tempParkingFee?paId=" + getPaIds(reqJson)+"&communityId="+reqJson.getString("communityId"));
         if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
             ownerUrl += ("&appId=" + smallWeChatDtos.get(0).getAppId());

+ 2 - 1
service-common/src/main/java/com/java110/common/cmd/machine/UnlicensedCarMachineQrCodeUrl.java

@@ -25,6 +25,7 @@ import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -74,7 +75,7 @@ public class UnlicensedCarMachineQrCodeUrl extends Cmd {
         smallWeChatDto.setObjId(reqJson.getString("communityId"));
         smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
         List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        String ownerUrl = UrlCache.getOwnerUrl();
         ownerUrl += ("/#/pages/unlicensedCarIn/unlicensedCarIn?communityId=" +
                 reqJson.getString("communityId") + "&machineId=" +
                 reqJson.getString("machineId"));

+ 3 - 2
service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.systemInfo.SystemInfoDto;
 import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
@@ -70,8 +71,8 @@ public class ListSystemInfoCmd extends Cmd {
 
         if (count > 0) {
             systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
-            systemInfoDtos.get(0).setOwnerUrl(MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL"));
-            systemInfoDtos.get(0).setPropertyUrl(MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL"));
+            systemInfoDtos.get(0).setOwnerUrl(UrlCache.getOwnerUrl());
+            systemInfoDtos.get(0).setPropertyUrl(UrlCache.getPropertyPhoneUrl());
         } else {
             systemInfoDtos = new ArrayList<>();
         }

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java

@@ -31,6 +31,7 @@ import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.po.owner.RepairUserPo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.ImageUtils;
 import com.java110.utils.util.StringUtil;
@@ -484,7 +485,7 @@ public class MachineDistributeLeaflets extends DatabusAdaptImpl {
                 data.setRemark(new Content("您的报修已受理,请保持电话畅通,以便维修人员及时跟您取得联系!感谢您的使用!"));
                 templateMessage.setData(data);
                 //获取业主公众号地址
-                String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+                String wechatUrl = UrlCache.getOwnerUrl();
                 if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {
                     wechatUrl += ("&wAppId=" + weChatDto.getAppId());
                 } else {

+ 3 - 2
service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java

@@ -28,6 +28,7 @@ import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.po.fee.PayFeePo;
 import com.java110.po.owner.RepairUserPo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -346,7 +347,7 @@ public class MachineReturnRepairAdapt extends DatabusAdaptImpl {
                 data.setRemark(new Content("请点击查看详情,对我们的工作进行评价,以便提供更优质的服务,感谢您的配合和使用,祝您生活愉快,阖家欢乐!"));
                 templateMessage.setData(data);
                 //获取业主公众号地址
-                String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+                String wechatUrl = UrlCache.getOwnerUrl();
                 templateMessage.setUrl(wechatUrl);
                 logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
                 ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
@@ -417,7 +418,7 @@ public class MachineReturnRepairAdapt extends DatabusAdaptImpl {
             data.setRemark(new Content("请您及时缴费,感谢您的配合和使用,祝您生活愉快,阖家欢乐!"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 3 - 2
service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java

@@ -28,6 +28,7 @@ import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
@@ -265,7 +266,7 @@ public class MachineAdoptApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setRemark(new Content("空置房申请验房已通过,系统已为您安排下一步审核流程,请耐心等待!"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
@@ -342,7 +343,7 @@ public class MachineAdoptApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setRemark(new Content("感谢您的使用,如有疑问请联系相关物业人员。"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 3 - 2
service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineApprovalApplyRoomDiscountAdapt.java

@@ -23,6 +23,7 @@ import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
@@ -184,7 +185,7 @@ public class MachineApprovalApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setRemark(new Content("感谢您的使用!"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
@@ -261,7 +262,7 @@ public class MachineApprovalApplyRoomDiscountAdapt extends DatabusAdaptImpl {
             data.setRemark(new Content("感谢您的使用,如有疑问请联系相关物业人员。"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/hcGov/visit/ExamineVisitAdapt.java

@@ -30,6 +30,7 @@ import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.owner.VisitPo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -223,7 +224,7 @@ public class ExamineVisitAdapt extends DatabusAdaptImpl {
             }
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/notice/MachineNoticeAdapt.java

@@ -28,6 +28,7 @@ import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.po.notice.NoticePo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
@@ -265,7 +266,7 @@ public class MachineNoticeAdapt extends DatabusAdaptImpl {
                 data.setRemark(new Content("如有疑问请联系相关物业人员"));
                 templateMessage.setData(data);
                 //获取业主公众号地址
-                String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+                String wechatUrl = UrlCache.getOwnerUrl();
                 if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {
                     wechatUrl += ("&wAppId=" + weChatDto.getAppId());
                 } else {

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java

@@ -44,6 +44,7 @@ import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.po.fee.PayFeeDetailPo;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.Assert;
@@ -512,7 +513,7 @@ public class MachinePaymentNoticeAdapt extends DatabusAdaptImpl {
             data.setRemark(new Content("感谢您的使用,如有疑问请联系相关物业人员"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             if(wechatUrl.contains("?")){
                 wechatUrl += ( "&wAppId="+smallWeChatDtos.get(0).getAppId());
             }else{

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovation.java

@@ -19,6 +19,7 @@ import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
@@ -157,7 +158,7 @@ public class MachineRoomRenovation extends DatabusAdaptImpl {
             data.setRemark(new Content("如有其它问题,请联系" + communityDtos.get(0).getName() + "客服,联系电话" + tel + ",感谢您的使用。"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineRoomRenovationDetail.java

@@ -25,6 +25,7 @@ import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.intf.user.IRoomRenovationsInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
@@ -212,7 +213,7 @@ public class MachineRoomRenovationDetail extends DatabusAdaptImpl {
             data.setRemark(new Content("如有任何疑问,请咨询" + communityDto.getName() + "客服部,咨询电话:" + tel + "。"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 2 - 1
service-job/src/main/java/com/java110/job/adapt/roomRenovation/MachineSaveRoomRenovation.java

@@ -24,6 +24,7 @@ import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
 import com.java110.intf.user.*;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
@@ -296,7 +297,7 @@ public class MachineSaveRoomRenovation extends DatabusAdaptImpl {
             data.setRemark(new Content("物业联系电话:" + tel + ",请到物业管理处或通过手机缴纳装修押金!"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 2 - 1
service-job/src/main/java/com/java110/job/task/fee/FeeDueReminderTemplate.java

@@ -36,6 +36,7 @@ import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
@@ -328,7 +329,7 @@ public class FeeDueReminderTemplate extends TaskSystemQuartz {
             data.setRemark(new Content("请您及时续费,以免影响您的正常使用!"));
             templateMessage.setData(data);
             //获取业主公众号地址
-            String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+            String wechatUrl = UrlCache.getOwnerUrl();
             templateMessage.setUrl(wechatUrl);
             logger.info("发送模板消息内容:{}", JSON.toJSONString(templateMessage));
             ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);

+ 4 - 3
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java

@@ -39,6 +39,7 @@ import com.java110.po.transactionLog.TransactionLogPo;
 import com.java110.po.wechatSubscribe.WechatSubscribePo;
 import com.java110.service.smo.ISaveSystemErrorSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.DateUtil;
@@ -363,7 +364,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
         if (wechatSubscribeDtos == null || wechatSubscribeDtos.size() < 1) {
             return;
         }
-        String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        String wechatUrl = UrlCache.getOwnerUrl();
         Miniprogram miniprogram = null;
         if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) {
             miniprogram = new Miniprogram();
@@ -477,7 +478,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
                         data.setRemark(new Content("如有疑问请联系相关物业人员"));
                         templateMessage.setData(data);
                         //获取业主公众号地址
-                        String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+                        String wechatUrl = UrlCache.getOwnerUrl();
                         if (!StringUtil.isEmpty(wechatUrl) && wechatUrl.contains("?")) {
                             wechatUrl += ("&wAppId=" + weChatDto.getAppId());
                         } else {
@@ -547,7 +548,7 @@ public class WeChatPushMessageTemplate extends TaskSystemQuartz {
     }
 
     private void doSend(List<OwnerAppUserDto> ownerAppUserDtos, NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
-        String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
+        String wechatUrl = UrlCache.getOwnerUrl() + "/#/pages/notice/detail/detail?noticeId=";
         ResponseEntity<String> responseEntity = null;
         String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.SEND_TEMPLATE_URL);
         if (StringUtil.isEmpty(sendTemplate)) {

+ 2 - 1
service-user/src/main/java/com/java110/user/api/StaffApi.java

@@ -11,6 +11,7 @@ import com.java110.user.bmo.staffAppAuth.IGetStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.ISaveStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.IUpdateStaffAppAuthBMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -142,7 +143,7 @@ public class StaffApi {
         smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
         smallWeChatDto.setWechatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
         List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")
+        String ownerUrl = UrlCache.getOwnerUrl()
                 + "/app/staffAuth?storeId=" + storeId + "&staffId=" + userId
                 + "&communityId=" + communityId + "&appId=" + AppDto.WECHAT_OWNER_APP_ID;
 

+ 8 - 7
springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java

@@ -2,6 +2,7 @@ package com.java110.boot.properties;
 
 
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.WechatConstant;
 import com.java110.utils.util.StringUtil;
@@ -120,7 +121,7 @@ public class WechatAuthProperties {
     public String getWxNotifyUrl() {
         String wxNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "wxNotifyUrl");
         if (!StringUtil.isEmpty(wxNotifyUrlCache)) {
-            return wxNotifyUrlCache;
+            return UrlCache.getOwnerUrl()+wxNotifyUrlCache;
         }
         return wxNotifyUrl;
     }
@@ -130,7 +131,7 @@ public class WechatAuthProperties {
     }
 
     public String getWechatAppId() {
-        String wechatAppIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "wechatAppId");
+        String wechatAppIdCache = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "wechatAppId");
         if (!StringUtil.isEmpty(wechatAppIdCache)) {
             return wechatAppIdCache;
         }
@@ -142,7 +143,7 @@ public class WechatAuthProperties {
     }
 
     public String getWechatAppSecret() {
-        String wechatAppSecretCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "wechatAppSecret");
+        String wechatAppSecretCache = MappingCache.getValue(MappingConstant.MALL_WECHAT_DOMAIN, "wechatAppSecret");
         if (!StringUtil.isEmpty(wechatAppSecretCache)) {
             return wechatAppSecretCache;
         }
@@ -164,7 +165,7 @@ public class WechatAuthProperties {
     public String getRentingNotifyUrl() {
         String rentingNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "rentingNotifyUrl");
         if (!StringUtil.isEmpty(rentingNotifyUrlCache)) {
-            return rentingNotifyUrlCache;
+            return UrlCache.getMallAppUrl()+rentingNotifyUrlCache;
         }
         return rentingNotifyUrl;
     }
@@ -176,7 +177,7 @@ public class WechatAuthProperties {
     public String getOweFeeNotifyUrl() {
         String oweFeeNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "oweFeeNotifyUrl");
         if (!StringUtil.isEmpty(oweFeeNotifyUrlCache)) {
-            return oweFeeNotifyUrlCache;
+            return UrlCache.getOwnerUrl()+oweFeeNotifyUrlCache;
         }
         return oweFeeNotifyUrl;
     }
@@ -188,7 +189,7 @@ public class WechatAuthProperties {
     public String getGoodsNotifyUrl() {
         String goodsNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "goodsNotifyUrl");
         if (!StringUtil.isEmpty(goodsNotifyUrlCache)) {
-            return goodsNotifyUrlCache;
+            return UrlCache.getMallAppUrl()+goodsNotifyUrlCache;
         }
         return goodsNotifyUrl;
     }
@@ -200,7 +201,7 @@ public class WechatAuthProperties {
     public String getTempCarFeeNotifyUrl() {
         String tempCarFeeNotifyUrlCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "tempCarFeeNotifyUrl");
         if (!StringUtil.isEmpty(tempCarFeeNotifyUrlCache)) {
-            return tempCarFeeNotifyUrlCache;
+            return UrlCache.getOwnerUrl()+tempCarFeeNotifyUrlCache;
         }
         return tempCarFeeNotifyUrl;
     }

+ 2 - 1
springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayBackCitySMOImpl.java

@@ -7,6 +7,7 @@ import com.java110.boot.smo.payment.IToPayBackCitySMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.log.LoggerFactory;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
@@ -51,7 +52,7 @@ public class ToPayBackCitySMOImpl extends AppAbstractComponentSMO implements ITo
 
         ResponseEntity responseEntity = null;
 
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")
+        String ownerUrl = UrlCache.getOwnerUrl()
                 + "/#/pages/reportInfoBack/reportInfoBack?communityId="
                 + paramIn.getString( "communityId" ) ;
         Map result = new HashMap(  );

+ 2 - 1
springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayInGoOutSMOImpl.java

@@ -9,6 +9,7 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
@@ -59,7 +60,7 @@ public class ToPayInGoOutSMOImpl extends AppAbstractComponentSMO implements IToP
         ResponseEntity responseEntity = null;
 
 
-        String ownerUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL")
+        String ownerUrl = UrlCache.getOwnerUrl()
                 + "/#/pages/reportInfoDetail/reportInfoDetail?settingId=" +
                 paramIn.getString("settingId") +
                 "&communityId=" + paramIn.getString("communityId");

+ 3 - 2
springboot/src/main/java/com/java110/boot/smo/staff/impl/StaffAuthSMOImpl.java

@@ -12,6 +12,7 @@ import com.java110.core.log.LoggerFactory;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.WechatConstant;
@@ -109,7 +110,7 @@ public class StaffAuthSMOImpl extends DefaultAbstractComponentSMO implements ISt
 
         ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, paramAuth.toJSONString(),
                 "/staff/updateStaffAppAuth", HttpMethod.POST);
-        url = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        url = UrlCache.getOwnerUrl();
         if(url.contains("/#/")){
             if(url.contains("?")){
                 url += ("&wAppId="+smallWeChatDto.getAppId());
@@ -148,7 +149,7 @@ public class StaffAuthSMOImpl extends DefaultAbstractComponentSMO implements ISt
         }
 
         String openUrl = "";
-        String url = MappingCache.getValue(MappingConstant.URL_DOMAIN,"OWNER_WECHAT_URL");
+        String url = UrlCache.getOwnerUrl();
         url = url
                 + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
                 + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())