Przeglądaj źródła

fix bug

release_toaliyun_real
xiaohanzi 5 lat temu
rodzic
commit
25fd4aa8d4
3 zmienionych plików z 10 dodań i 4 usunięć
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +2
    -2
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Wyświetl plik

@@ -118,7 +118,7 @@ public class ShiroConfig {


// 补发消息 // 补发消息
filterChainDefinitionMap.put("/wxCoupon/updateStokeAndValidDate", "anon"); filterChainDefinitionMap.put("/wxCoupon/updateStokeAndValidDate", "anon");
// static files // static files
filterChainDefinitionMap.put("/css/**", "anon"); filterChainDefinitionMap.put("/css/**", "anon");
filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon");


+ 2
- 2
mallinkAdmin/src/main/resources/application-dev.yml Wyświetl plik

@@ -56,8 +56,8 @@ spring:
# EMAIL # EMAIL
mail: mail:
host: smtp.exmail.qq.com host: smtp.exmail.qq.com
username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==)
password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码
username: ENC(BFVB6iEUCnkWKkyiCcctc1uH9LjBNhFDcsKZYOqQmIZiBfITJCVKkQ==)
password: ENC(pQdhpcVTu0PHMTt+MXZ6VAm8IO5fzCjb) # 授权密码
properties: properties:
mail: mail:
smtp: smtp:


+ 7
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Wyświetl plik

@@ -513,7 +513,7 @@ public class WxFlowServiceImpl implements WxFlowService {
dynamicContentMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); dynamicContentMap.put("contract", (String) getVariableByKey(variables, "settleNumber"));
} }
wxMsgRecord.setDynamicContentMap(dynamicContentMap); wxMsgRecord.setDynamicContentMap(dynamicContentMap);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
// mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());


//发邮件 //发邮件
Map msgReplaceMap = new HashedMap(); Map msgReplaceMap = new HashedMap();
@@ -754,6 +754,12 @@ public class WxFlowServiceImpl implements WxFlowService {
} }
Integer flowType = resultList.get(0).getBusinessType(); Integer flowType = resultList.get(0).getBusinessType();
String processInstanceId = resultList.get(0).getProcessInstanceId(); String processInstanceId = resultList.get(0).getProcessInstanceId();
int rindex = 0;
while (StringUtils.isBlank(processInstanceId)) {
rindex = rindex + 1;
processInstanceId = resultList.get(rindex).getProcessInstanceId();
flowType = resultList.get(rindex).getBusinessType();
}
ProcessInstance pi = null; ProcessInstance pi = null;
try { try {
pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();


Ładowanie…
Anuluj
Zapisz