ibiz4j 部署微服务接口

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzwf/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzwf/
+      mvn clean package -Papi
+      cd ibzwf-provider/ibzwf-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzwf-core/src/main/resources/liquibase/h2_table.xml

-!!!!模版产生代码错误:----
-Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
-----
-
-----
-FTL stack trace ("~" means nesting-related):
-	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
-----
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+
+
+    <!--输出实体[WF_GROUP]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group-26-1">
+        <createTable tableName="IBZWFGROUP">
\ No newline at end of file
+                <column name="GROUPID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
+                </column>
+                <column name="GROUPNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="GROUPSCOPE" remarks="" type="VARCHAR(100)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+
+
+    <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-50-2">
+        <createTable tableName="IBZWFMEMBER">
+                <column name="MEMBERID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
+                </column>
+                <column name="MEMBERNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="GROUPID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="USERID" remarks="" type="VARCHAR(100)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+    <!--输出实体[WF_DEFINITION]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-wf_definition-63-3">
+        <createTable tableName="IBZWFDEFINITION">
+                <column name="DEFINITIONKEY" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_WF_DEFINITION_DEFINITIONKEY"/>
+                </column>
+                <column name="DEFINITIONNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MODELVERSION" remarks="" type="INT">
+                </column>
+                <column name="MODELENABLE" remarks="" type="INT">
+                </column>
+                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="BPMNFILE" remarks="" type="VARCHAR(1000)">
+                </column>
+                <column name="DEPLOYKEY" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="WEBSERVICEIDS" remarks="" type="VARCHAR(200)">
+                </column>
+                <column name="MOBILESERVICEIDS" remarks="" type="VARCHAR(200)">
+                </column>
+        </createTable>
+    </changeSet>
+
+
+
+
+
+
+
+
+    <!--输出实体[WF_PSSYSTEM]数据结构 -->
+
+
+
+
+
+
+
+        <!--输出实体[WF_GROUP]外键关系 -->
+        <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-50-5">
+       <addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
+    </changeSet>
+        <!--输出实体[WF_DEFINITION]外键关系 -->
+        <!--输出实体[WF_PSSYSTEM]外键关系 -->
+
+</databaseChangeLog>

ibzwf-core/src/main/resources/msgtempl/systemMsgTempl.json

   [
     {
-      "tid":"ibzwf-newtodo",
+      "tid":"newtodo",
       "template_name":"待办提醒",
       "content":"{objectname}"
     }

ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40003
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -3,9 +3,22 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40003:40003"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40003
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzwf-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -65,10 +65,7 @@ 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);
             if(notifyFeignClient.createMsgTemplate(template)){
                 log.info("推送消息模板成功");
             }else{