lxm1993 部署微服务应用 [TrainSys，网页端]

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "80:80"
+      - "50100:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,6 +55,15 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
+      if [ -e app_Web/.dynamic ]
+      then
+          cd app_Web
+      else
+          cd app_Web/app
+      fi
+      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
+      docker -H $para1 stack deploy --compose-file=swarm.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.bpmn

@@ -41,23 +41,23 @@
             </flowable:field>
         </extensionElements>
 
-     <startEvent id="sid-7b05636dee3e81f1272de444e893ea19" name="开始事件">
+     <startEvent id="sid-cacb9d43bd676e39faf2e4ce7ad3579d" name="开始事件">
           <extensionElements>
             <flowable:form process-form="startForm" wfversion="1"/>
           </extensionElements>
      </startEvent>
-    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" name="审核">
+    <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-4ad1c8a385c1e6881d45a4416b562150" name="审核">
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form process-form="ApprovalForm"  />
          </extensionElements>
     </userTask>
-     <endEvent id="sid-542ea3f4f99dca8171db8812cc80e5bf" name="结束事件">
+     <endEvent id="sid-357b63a68645d86c63eaa30e852f152a" name="结束事件">
      </endEvent>
-      <sequenceFlow id="rid-7747c756cd9b92668d820c905c470c5a" sourceRef="sid-7b05636dee3e81f1272de444e893ea19" targetRef="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" name="">
+      <sequenceFlow id="rid-4ed9f4245efea83b177c30149ec0cc46" sourceRef="sid-cacb9d43bd676e39faf2e4ce7ad3579d" targetRef="tid-20-4ad1c8a385c1e6881d45a4416b562150" name="">
      </sequenceFlow>
-      <sequenceFlow id="lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de" sourceRef="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" targetRef="sid-542ea3f4f99dca8171db8812cc80e5bf" name="审批">
-        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de"}]]></conditionExpression>
+      <sequenceFlow id="lid-IAACTION-d50049e41baf9c7379a3cd72970cc794" sourceRef="tid-20-4ad1c8a385c1e6881d45a4416b562150" targetRef="sid-357b63a68645d86c63eaa30e852f152a" name="审批">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-d50049e41baf9c7379a3cd72970cc794"}]]></conditionExpression>
          <extensionElements>
              <flowable:form nextCondition="ANY"  />
          </extensionElements>
@@ -65,20 +65,20 @@
     </process>
     <bpmndi:BPMNDiagram id="BPMNDiagram_trainsys-workflowwfv1">
         <bpmndi:BPMNPlane id="BPMNPlane_trainsys-workflowwfv1" bpmnElement="trainsys-workflowwfv1">
-                 <bpmndi:BPMNShape id="BPMNShape-7b05636dee3e81f1272de444e893ea19" bpmnElement="sid-7b05636dee3e81f1272de444e893ea19">
+                 <bpmndi:BPMNShape id="BPMNShape-cacb9d43bd676e39faf2e4ce7ad3579d" bpmnElement="sid-cacb9d43bd676e39faf2e4ce7ad3579d">
                      <omgdi:Bounds x="740" y="70" width="30" height="30" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-d3507b7d5e9d34fa8c1db99ad8624a95" bpmnElement="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95">
+                 <bpmndi:BPMNShape id="BPMNShape-4ad1c8a385c1e6881d45a4416b562150" bpmnElement="tid-20-4ad1c8a385c1e6881d45a4416b562150">
                      <omgdi:Bounds x="710" y="220" width="100" height="80" />
                  </bpmndi:BPMNShape>
-                 <bpmndi:BPMNShape id="BPMNShape-542ea3f4f99dca8171db8812cc80e5bf" bpmnElement="sid-542ea3f4f99dca8171db8812cc80e5bf">
+                 <bpmndi:BPMNShape id="BPMNShape-357b63a68645d86c63eaa30e852f152a" bpmnElement="sid-357b63a68645d86c63eaa30e852f152a">
                      <omgdi:Bounds x="740" y="410" width="30" height="30" />
                  </bpmndi:BPMNShape>
-               <bpmndi:BPMNEdge id="BPMNEdge-rid-7747c756cd9b92668d820c905c470c5a" bpmnElement="rid-7747c756cd9b92668d820c905c470c5a">
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-4ed9f4245efea83b177c30149ec0cc46" bpmnElement="rid-4ed9f4245efea83b177c30149ec0cc46">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>
-               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de" bpmnElement="lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de">
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-d50049e41baf9c7379a3cd72970cc794" bpmnElement="lid-IAACTION-d50049e41baf9c7379a3cd72970cc794">
                    <omgdi:waypoint x="0" y="0" />
                    <omgdi:waypoint x="0" y="0" />
                </bpmndi:BPMNEdge>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json

@@ -1029,7 +1029,7 @@
     "mainPSSysSFPub" : true,
     "pubModel" : true
   },
-  "deploySysId" : "TrainSys",
+  "deploySysId" : "trainsys",
   "deploySysTag" : "336d44c339448f6095f53a1fe78eb8d5",
   "engineVer" : 239,
   "logicName" : "TrainSys",