diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 6c09d6704..445a98188 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -95,7 +95,4 @@ logging: level: tk.mybatis: debug com.iformall: debug - path: ./logs/admin - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/admin \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index baf400316..65e4a613e 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -89,7 +89,4 @@ logging: level: tk.mybatis: debug com.iformall.mapper: debug - path: ./logs/admin - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/admin \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index b92f7d23e..62dca6087 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -88,7 +88,4 @@ logging: level: tk.mybatis: debug com.iformall: debug - path: ./logs/admin - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/admin \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index f97a83cb1..b7a2d6448 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -55,6 +55,3 @@ pay: version: @project.version@ - -#admin主页地址 -admin-page: http://admin.malls.iformall.com diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index d2c02eb15..9313311da 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -65,7 +65,4 @@ logging: level: tk.mybatis: debug com.iformall.mapper: debug - path: ./logs/b - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/b \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 58cefebb9..12e579a99 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -59,7 +59,4 @@ logging: level: tk.mybatis: debug com.iformall.mapper: debug - path: ./logs/b - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/b \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index afcb77b5c..13c973402 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -59,7 +59,4 @@ logging: level: tk.mybatis: debug com.iformall: debug - path: ./logs/b - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/b \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index f0528886c..0e4588f52 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -44,7 +44,4 @@ pay: real: true -version: @project.version@ - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file +version: @project.version@ \ No newline at end of file diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 8b45181e4..ea2d43c65 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -65,8 +65,4 @@ logging: level: tk.mybatis: debug com.iformall.mapper: debug - path: ./logs/c - - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/c \ No newline at end of file diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index ade7c72ee..d93753e5d 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -61,7 +61,4 @@ logging: level: tk.mybatis: debug com.iformall: debug - path: ./logs/c - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/c \ No newline at end of file diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index 059954206..7121e560b 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -59,7 +59,4 @@ logging: level: tk.mybatis: debug com.iformall: debug - path: ./logs/c - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file + path: ./logs/c \ No newline at end of file diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index 3c00dbc81..bf31b2046 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -44,7 +44,4 @@ pay: real: true -version: @project.version@ - -#admin主页地址 -admin-page: http://admin.malls.iformall.com \ No newline at end of file +version: @project.version@ \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index dd40698c5..bbaa21245 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.enums.EnumMsgModelType; import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.exception.MallinkException; import com.iformall.service.*; +import com.iformall.utils.Constant; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.flowable.bpmn.model.BpmnModel; @@ -55,8 +56,6 @@ public class WxFlowServiceImpl implements WxFlowService { private MallUserInfoService mallUserInfoService; @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; - @Value("${admin-page}") - private String adminPage; /** * 获取流程key,1合同 2账单 @@ -116,7 +115,7 @@ public class WxFlowServiceImpl implements WxFlowService { for (MallUserInfo mallUserInfo:mallUserInfoList) { Map content = new HashedMap(); content.put("userName",mallUserInfo.getName()); - content.put("page",adminPage); + content.put("page", Constant.adminPage); content.put("modelName","代办通知"); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); @@ -214,7 +213,7 @@ public class WxFlowServiceImpl implements WxFlowService { List mallUserInfoList = getUserByProcessInstanceId(processInstanceId); for (MallUserInfo mallUserInfo:mallUserInfoList) { msgReplaceMap.put("userName",mallUserInfo.getName()); - msgReplaceMap.put("page",adminPage); + msgReplaceMap.put("page",Constant.adminPage); msgReplaceMap.put("modelName","代办通知"); assignee += mallUserInfo.getName()+" "; @@ -225,7 +224,7 @@ public class WxFlowServiceImpl implements WxFlowService { // 给发起人发送短信 msgReplaceMap = new HashedMap(); msgReplaceMap.put("userName",userName); - msgReplaceMap.put("page",adminPage); + msgReplaceMap.put("page",Constant.adminPage); msgReplaceMap.put("modelName","审批通知"); msgReplaceMap.put("contract",businessId+""); msgReplaceMap.put("toUserName",assignee.trim()); @@ -238,7 +237,7 @@ public class WxFlowServiceImpl implements WxFlowService { msgReplaceMap = new HashedMap(); msgReplaceMap.put("modelName","通过审批通知"); msgReplaceMap.put("contract",businessId+""); - msgReplaceMap.put("page",adminPage); + msgReplaceMap.put("page",Constant.adminPage); wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setPhone(starter.getPhone()); @@ -286,7 +285,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgValidationcode.setType(EnumMsgModelType.FLOW.getCode()); msgReplaceMap.put("modelName","驳回通知"); msgReplaceMap.put("contract",businessId+""); - msgReplaceMap.put("page",adminPage); + msgReplaceMap.put("page",Constant.adminPage); wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setPhone(starter.getPhone()); @@ -402,11 +401,4 @@ public class WxFlowServiceImpl implements WxFlowService { } } - public String getAdminPage() { - return adminPage; - } - - public void setAdminPage(String adminPage) { - this.adminPage = adminPage; - } } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index b8fd16abf..bdbce4d5b 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -4,4 +4,5 @@ public class Constant { public static final String fileDirectory = "./uploads/"; public static final String importMemPrev = "importmem/"; + public static final String adminPage = "http://admin.malls.iformall.com"; }