diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 5ae10dc1e..43c9e2138 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -118,7 +118,7 @@ public class ShiroConfig { // 补发消息 filterChainDefinitionMap.put("/wxCoupon/updateStokeAndValidDate", "anon"); - + // static files filterChainDefinitionMap.put("/css/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon"); diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 845f69474..9830f2e74 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -56,8 +56,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: ENC(BFVB6iEUCnkWKkyiCcctc1uH9LjBNhFDcsKZYOqQmIZiBfITJCVKkQ==) + password: ENC(pQdhpcVTu0PHMTt+MXZ6VAm8IO5fzCjb) # 授权密码 properties: mail: smtp: 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 9bc1b916a..cb2c3a9f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -513,7 +513,7 @@ public class WxFlowServiceImpl implements WxFlowService { dynamicContentMap.put("contract", (String) getVariableByKey(variables, "settleNumber")); } 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(); @@ -754,6 +754,12 @@ public class WxFlowServiceImpl implements WxFlowService { } Integer flowType = resultList.get(0).getBusinessType(); 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; try { pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();