Просмотр исходного кода

审批流去掉主页配置

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
24fa602537
14 измененных файлов: 18 добавлений и 62 удалений
  1. +1
    -4
      mallinkAdmin/src/main/resources/application-dev.yml
  2. +1
    -4
      mallinkAdmin/src/main/resources/application-prod.yml
  3. +1
    -4
      mallinkAdmin/src/main/resources/application-test.yml
  4. +0
    -3
      mallinkAdmin/src/main/resources/application.yml
  5. +1
    -4
      mallinkBApi/src/main/resources/application-dev.yml
  6. +1
    -4
      mallinkBApi/src/main/resources/application-prod.yml
  7. +1
    -4
      mallinkBApi/src/main/resources/application-test.yml
  8. +1
    -4
      mallinkBApi/src/main/resources/application.yml
  9. +1
    -5
      mallinkCApi/src/main/resources/application-dev.yml
  10. +1
    -4
      mallinkCApi/src/main/resources/application-prod.yml
  11. +1
    -4
      mallinkCApi/src/main/resources/application-test.yml
  12. +1
    -4
      mallinkCApi/src/main/resources/application.yml
  13. +6
    -14
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  14. +1
    -0
      mallinkService/src/main/java/com/iformall/utils/Constant.java

+ 1
- 4
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
path: ./logs/admin

+ 1
- 4
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
path: ./logs/admin

+ 1
- 4
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
path: ./logs/admin

+ 0
- 3
mallinkAdmin/src/main/resources/application.yml Просмотреть файл

@@ -55,6 +55,3 @@ pay:


version: @project.version@

#admin主页地址
admin-page: http://admin.malls.iformall.com

+ 1
- 4
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
path: ./logs/b

+ 1
- 4
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
path: ./logs/b

+ 1
- 4
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
path: ./logs/b

+ 1
- 4
mallinkBApi/src/main/resources/application.yml Просмотреть файл

@@ -44,7 +44,4 @@ pay:
real: true


version: @project.version@

#admin主页地址
admin-page: http://admin.malls.iformall.com
version: @project.version@

+ 1
- 5
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
path: ./logs/c

+ 1
- 4
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
path: ./logs/c

+ 1
- 4
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
path: ./logs/c

+ 1
- 4
mallinkCApi/src/main/resources/application.yml Просмотреть файл

@@ -44,7 +44,4 @@ pay:
real: true


version: @project.version@

#admin主页地址
admin-page: http://admin.malls.iformall.com
version: @project.version@

+ 6
- 14
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<String,String> 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<MallUserInfo> 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;
}
}

+ 1
- 0
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";
}

Загрузка…
Отмена
Сохранить