消息集成

SLN/%PUBPRJ%-core/src/main/resources/msgtempl/systemMsgTempl.json.ftl

@@ -12,7 +12,7 @@ TARGET=PSSYSTEM
   [
     <#list sys.getAllPSSysMsgTempls() as msgTempl>
     {
-      "tid":"${msgTempl.getCodeName()}",
+      "tid":"${sys.codeName?lower_case}-${msgTempl.getCodeName()?lower_case}",
       "template_name":"${msgTempl.getName()}",
       "content":"${msgTempl.getContent()}"
     }

SLN/%PUBPRJ%-core/src/main/resources/workflow/%ITEM%.bpmn.ftl

@@ -208,7 +208,7 @@ TARGET=PSWFVERSION
          <#if WFProcess.isSendInform()>
             <#assign msgTempl=WFProcess.getPSSysMsgTempl()>
             <extensionElements>
-                <flowable:formProperty id="${msgTempl.getCodeName()}"  name="${msgTempl.getName()}" variable="${assignGroupCond}" type="${WFProcess.getMsgType()}" />
+                <flowable:formProperty id="${sys.codeName?lower_case}-${msgTempl.getCodeName()?lower_case}"  name="${msgTempl.getName()}" variable="${assignGroupCond}" type="${WFProcess.getMsgType()}" />
             </extensionElements>
          </#if>
         <#--<#if assignGroupCond!="">-->

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/job/PermissionSyncJob.java.ftl

@@ -65,7 +65,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     <#if hasMsgTemplate>
     @Autowired
     @Lazy
-    private ${pub.getPKGCodeName()}.util.client.IBZNotifyFeignClient noticeFeignClient;
+    private ${pub.getPKGCodeName()}.util.client.IBZNotifyFeignClient notifyFeignClient;
     </#if>
 
     @Override
@@ -114,12 +114,10 @@ public class PermissionSyncJob implements ApplicationRunner {
             InputStream msgTemplate= this.getClass().getResourceAsStream("/msgtempl/systemMsgTempl.json"); //获取当前系统所有实体资源能力
             String strMsgTemplate = IOUtils.toString(msgTemplate,"UTF-8");
             JSONObject template= new JSONObject();
-            template.put("system",systemId);
             template.put("template",JSONArray.parseArray(strMsgTemplate));
             //数值代码表：email(2)、sms(4)、wechat(32)、dingtalk(64)
             template.put("templtypes", 102);
-//            template.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
-            if(noticeFeignClient.createMsgTemplate(template)){
+            if(notifyFeignClient.createMsgTemplate(template)){
                 log.info("推送消息模板成功");
             }else{
                 log.error("推送消息模板失败");