lxm1993 部署微服务接口 [TrainSys，默认服务接口]

config.xml

@@ -55,6 +55,12 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mvn clean package -Ptrainsys
+      mvn install -Ptrainsys
+      cd trainsys-provider
+      mvn -Ptrainsys docker:build
+      mvn -Ptrainsys docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json

@@ -50,19 +50,6 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "startProcess" : true
-  }, {
-    "codeName" : "END_01",
-    "height" : 30,
-    "leftPos" : 740,
-    "logicName" : "结束事件",
-    "name" : "结束事件",
-    "timeout" : -1,
-    "topPos" : 410,
-    "wFProcessType" : "END",
-    "width" : 30,
-    "asynchronousProcess" : false,
-    "enableTimeout" : false,
-    "terminalProcess" : true
   }, {
     "codeName" : "INTERACTIVE_01",
     "formCodeName" : "ApprovalForm",
@@ -102,6 +89,19 @@
     "asynchronousProcess" : false,
     "enableTimeout" : false,
     "sendInform" : false
+  }, {
+    "codeName" : "END_01",
+    "height" : 30,
+    "leftPos" : 740,
+    "logicName" : "结束事件",
+    "name" : "结束事件",
+    "timeout" : -1,
+    "topPos" : 410,
+    "wFProcessType" : "END",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "terminalProcess" : true
   } ],
   "getStartPSWFProcess" : {
     "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json.bpmn

@@ -46,18 +46,18 @@
             <flowable:form process-form="startForm" process-mobform="startForm"  wfversion="1"/>
           </extensionElements>
      </startEvent>
-     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
-     </endEvent>
     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-0ec5b557aa979a307af5aa9680485404" name="审核">
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form procfunc="reassign" process-form="ApprovalForm" process-mobform="ApprovalForm" process-util3form="WorkFlowEditView_Form" process-util3formname="工作流编辑_表单" process-mobutil3form="WorkFlowEditView_Form" process-mobutil3formname="工作流编辑_表单"  />
          </extensionElements>
     </userTask>
-      <sequenceFlow id="rid-35b4ab83a15f9a4de653622656f63992" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
+     <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
+     </endEvent>
+      <sequenceFlow id="rid-48a62261e9ea11f75c1aee137f211a2f" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION-201b2cf75734ee2c713479c19d03aa75" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-201b2cf75734ee2c713479c19d03aa75"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION-8cddc66d335c051a329d80df85bf6f5f" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-8cddc66d335c051a329d80df85bf6f5f"}]]></conditionExpression>
          <extensionElements>
              <flowable:form sequenceFlowForm="WorkFlowEditView_Form" sequenceFlowMobForm="WorkFlowEditView_Form" sequenceFlowView="WFDynaActionView" sequenceFlowMobView="MobWFDynaActionView" nextCondition="ANY"  />
          </extensionElements>
@@ -68,17 +68,17 @@
                  <bpmndi:BPMNShape id="BPMNShape-f2f162e01f7fe7d08374a565e1edb2af" bpmnElement="sid-f2f162e01f7fe7d08374a565e1edb2af">
                      <omgdi:Bounds x="740" y="70" width="30" height="30" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
-                     <omgdi:Bounds x="740" y="410" width="30" height="30" />
-                 </bpmndi:BPMNShape>
                  <bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
                      <omgdi:Bounds x="710" y="220" width="100" height="80" />
                  </bpmndi:BPMNShape>
-               <bpmndi:BPMNEdge id="BPMNEdge-rid-35b4ab83a15f9a4de653622656f63992" bpmnElement="rid-35b4ab83a15f9a4de653622656f63992">
+                 <bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
+                     <omgdi:Bounds x="740" y="410" width="30" height="30" />
+                 </bpmndi:BPMNShape>
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-48a62261e9ea11f75c1aee137f211a2f" bpmnElement="rid-48a62261e9ea11f75c1aee137f211a2f">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-201b2cf75734ee2c713479c19d03aa75" bpmnElement="lid-IAACTION-201b2cf75734ee2c713479c19d03aa75">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-8cddc66d335c051a329d80df85bf6f5f" bpmnElement="lid-IAACTION-8cddc66d335c051a329d80df85bf6f5f">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowDoneEditView.json

@@ -299,63 +299,31 @@
       "name" : "tbitem8",
       "spanMode" : false
     }, {
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TEXT.*.STARTWF",
-        "lanResType" : "TBB.TEXT",
-        "name" : "工具栏按钮文本[*.STARTWF]",
-        "refFlag" : true
-      },
-      "caption" : "开始流程",
+      "caption" : "开始事件",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "tbitem9",
+      "name" : "tbitem9_saveandstart",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "toolbar_tbitem9"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf04b@FontAwesome",
-        "cssClass" : "fa fa-play"
+        "id" : "toolbar_tbitem9_saveandstart"
       },
       "getPSUIAction" : {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TEXT.*.STARTWF",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.STARTWF]",
-          "refFlag" : true
-        },
-        "caption" : "开始流程",
+        "caption" : "开始事件",
         "codeName" : "SaveAndStart",
         "fullCodeName" : "SaveAndStart",
-        "name" : "编辑界面_保存并开始流程操作",
-        "getPSSysImage" : {
-          "glyph" : "xf04b@FontAwesome",
-          "cssClass" : "fa fa-play"
+        "name" : "开始事件",
+        "getNextPSUIAction" : {
+          "modelref" : true,
+          "id" : "WFStartWizard@WorkFlowWfv1"
         },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.STARTWF]",
-          "refFlag" : true
-        },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndStart",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "开始流程",
-      "getTooltipPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-        "lanResType" : "TBB.TOOLTIP",
-        "name" : "工具栏按钮提示[*.STARTWF]",
-        "refFlag" : true
-      },
+      "tooltip" : "开始事件",
       "showCaption" : true,
       "showIcon" : true
     }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowEditView.json

@@ -299,63 +299,31 @@
       "name" : "tbitem8",
       "spanMode" : false
     }, {
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TEXT.*.STARTWF",
-        "lanResType" : "TBB.TEXT",
-        "name" : "工具栏按钮文本[*.STARTWF]",
-        "refFlag" : true
-      },
-      "caption" : "开始流程",
+      "caption" : "开始事件",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "tbitem9",
+      "name" : "tbitem9_saveandstart",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "toolbar_tbitem9"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf04b@FontAwesome",
-        "cssClass" : "fa fa-play"
+        "id" : "toolbar_tbitem9_saveandstart"
       },
       "getPSUIAction" : {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TEXT.*.STARTWF",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.STARTWF]",
-          "refFlag" : true
-        },
-        "caption" : "开始流程",
+        "caption" : "开始事件",
         "codeName" : "SaveAndStart",
         "fullCodeName" : "SaveAndStart",
-        "name" : "编辑界面_保存并开始流程操作",
-        "getPSSysImage" : {
-          "glyph" : "xf04b@FontAwesome",
-          "cssClass" : "fa fa-play"
+        "name" : "开始事件",
+        "getNextPSUIAction" : {
+          "modelref" : true,
+          "id" : "WFStartWizard@WorkFlowWfv1"
         },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.STARTWF]",
-          "refFlag" : true
-        },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndStart",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "开始流程",
-      "getTooltipPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-        "lanResType" : "TBB.TOOLTIP",
-        "name" : "工具栏按钮提示[*.STARTWF]",
-        "refFlag" : true
-      },
+      "tooltip" : "开始事件",
       "showCaption" : true,
       "showIcon" : true
     }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowStartedEditView.json

@@ -299,63 +299,31 @@
       "name" : "tbitem8",
       "spanMode" : false
     }, {
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TEXT.*.STARTWF",
-        "lanResType" : "TBB.TEXT",
-        "name" : "工具栏按钮文本[*.STARTWF]",
-        "refFlag" : true
-      },
-      "caption" : "开始流程",
+      "caption" : "开始事件",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "tbitem9",
+      "name" : "tbitem9_saveandstart",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "toolbar_tbitem9"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf04b@FontAwesome",
-        "cssClass" : "fa fa-play"
+        "id" : "toolbar_tbitem9_saveandstart"
       },
       "getPSUIAction" : {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TEXT.*.STARTWF",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.STARTWF]",
-          "refFlag" : true
-        },
-        "caption" : "开始流程",
+        "caption" : "开始事件",
         "codeName" : "SaveAndStart",
         "fullCodeName" : "SaveAndStart",
-        "name" : "编辑界面_保存并开始流程操作",
-        "getPSSysImage" : {
-          "glyph" : "xf04b@FontAwesome",
-          "cssClass" : "fa fa-play"
+        "name" : "开始事件",
+        "getNextPSUIAction" : {
+          "modelref" : true,
+          "id" : "WFStartWizard@WorkFlowWfv1"
         },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.STARTWF]",
-          "refFlag" : true
-        },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndStart",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "开始流程",
-      "getTooltipPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-        "lanResType" : "TBB.TOOLTIP",
-        "name" : "工具栏按钮提示[*.STARTWF]",
-        "refFlag" : true
-      },
+      "tooltip" : "开始事件",
       "showCaption" : true,
       "showIcon" : true
     }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowWorkFlowEditView.json

@@ -113,63 +113,31 @@
       "showCaption" : true,
       "showIcon" : true
     }, {
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TEXT.*.STARTWF",
-        "lanResType" : "TBB.TEXT",
-        "name" : "工具栏按钮文本[*.STARTWF]",
-        "refFlag" : true
-      },
-      "caption" : "开始流程",
+      "caption" : "开始事件",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "deuiaction2",
+      "name" : "deuiaction2_saveandstart",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "toolbar_deuiaction2"
-      },
-      "getPSSysImage" : {
-        "glyph" : "xf04b@FontAwesome",
-        "cssClass" : "fa fa-play"
+        "id" : "toolbar_deuiaction2_saveandstart"
       },
       "getPSUIAction" : {
-        "getCapPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TEXT.*.STARTWF",
-          "lanResType" : "TBB.TEXT",
-          "name" : "工具栏按钮文本[*.STARTWF]",
-          "refFlag" : true
-        },
-        "caption" : "开始流程",
+        "caption" : "开始事件",
         "codeName" : "SaveAndStart",
         "fullCodeName" : "SaveAndStart",
-        "name" : "编辑界面_保存并开始流程操作",
-        "getPSSysImage" : {
-          "glyph" : "xf04b@FontAwesome",
-          "cssClass" : "fa fa-play"
+        "name" : "开始事件",
+        "getNextPSUIAction" : {
+          "modelref" : true,
+          "id" : "WFStartWizard@WorkFlowWfv1"
         },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
-        "getTooltipPSLanguageRes" : {
-          "defaultContent" : "启动流程",
-          "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-          "lanResType" : "TBB.TOOLTIP",
-          "name" : "工具栏按钮提示[*.STARTWF]",
-          "refFlag" : true
-        },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndStart",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "开始流程",
-      "getTooltipPSLanguageRes" : {
-        "defaultContent" : "启动流程",
-        "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
-        "lanResType" : "TBB.TOOLTIP",
-        "name" : "工具栏按钮提示[*.STARTWF]",
-        "refFlag" : true
-      },
+      "tooltip" : "开始事件",
       "showCaption" : true,
       "showIcon" : true
     }, {

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>runtime</id>
+            <id>trainsys</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 8081
+EXPOSE 50000
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,7 +22,32 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8081
+        - containerPort: 50000
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.240.140"      
+        - name: SERVER_PORT
+          value: "50000"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.240.140:8848"
+        - name: SPRING_REDIS_HOST
+          value: "127.0.0.1"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_LAB01_d23cc850e"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "f9Df4556"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_LAB01_d23cc850e"
+        - name: NACOS
+          value: "172.16.240.140:8848"      
 
 ---
 apiVersion: v1
@@ -35,9 +60,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 50000
+    targetPort: 50000
+    nodePort: 50000
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,9 +3,23 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "8081:8081"
+      - "50000:50000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
+      - SERVER_PORT=50000
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
+      - SPRING_REDIS_HOST=127.0.0.1
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
+      - SPRING_DATASOURCE_PASSWORD=f9Df4556
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
+      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: