提交 ed26d43f 编写于 作者: ibizdev's avatar ibizdev

lxm1993 发布系统代码 [TrainSys,网页端]

上级 f563141c
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/ git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -58,6 +58,14 @@ ...@@ -58,6 +58,14 @@
"modelref" : true, "modelref" : true,
"id" : "IAACTION" "id" : "IAACTION"
} ], } ],
"getPSWFProcessRoles" : [ {
"name" : "流程测试",
"getPSWFRole" : {
"modelref" : true,
"path" : "PSWFROLES/WfTest.json"
},
"wFProcessRoleType" : "WFROLE"
} ],
"timeout" : -1, "timeout" : -1,
"topPos" : 220, "topPos" : 220,
"wFProcessType" : "INTERACTIVE", "wFProcessType" : "INTERACTIVE",
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<process id="trainsys-workflowwfv1" isClosed="false" isExecutable="true" name="测试流程(WorkFlow) v1" processType="None"> <process id="trainsys-workflowwfv1" isClosed="false" isExecutable="true" name="测试流程(WorkFlow) v1" processType="None">
<extensionElements> <extensionElements>
<flowable:eventListener delegateExpression="${processInstanceListener}" /> <flowable:eventListener delegateExpression="${processInstanceListener}" />
<flowable:field name="refgroups">
<flowable:string>WfTest|流程测试|SYSUSERROLE</flowable:string>
</flowable:field>
<flowable:field name="bookings"> <flowable:field name="bookings">
<flowable:string>workflow</flowable:string> <flowable:string>workflow</flowable:string>
</flowable:field> </flowable:field>
...@@ -40,7 +43,7 @@ ...@@ -40,7 +43,7 @@
<flowable:form process-form="startForm" wfversion="1"/> <flowable:form process-form="startForm" wfversion="1"/>
</extensionElements> </extensionElements>
</startEvent> </startEvent>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${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-d3507b7d5e9d34fa8c1db99ad8624a95" name="审核">
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements> <extensionElements>
<flowable:form process-form="ApprovalForm" /> <flowable:form process-form="ApprovalForm" />
...@@ -48,10 +51,10 @@ ...@@ -48,10 +51,10 @@
</userTask> </userTask>
<endEvent id="sid-542ea3f4f99dca8171db8812cc80e5bf" name="结束事件"> <endEvent id="sid-542ea3f4f99dca8171db8812cc80e5bf" name="结束事件">
</endEvent> </endEvent>
<sequenceFlow id="rid-84a90397cda177fe4e8bfcbc2f47fb71" sourceRef="sid-7b05636dee3e81f1272de444e893ea19" targetRef="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" name=""> <sequenceFlow id="rid-7747c756cd9b92668d820c905c470c5a" sourceRef="sid-7b05636dee3e81f1272de444e893ea19" targetRef="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" name="">
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-IAACTION-3f0f88a114fca27b7d2dc28654f21494" sourceRef="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" targetRef="sid-542ea3f4f99dca8171db8812cc80e5bf" name="审批"> <sequenceFlow id="lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de" sourceRef="tid-20-d3507b7d5e9d34fa8c1db99ad8624a95" targetRef="sid-542ea3f4f99dca8171db8812cc80e5bf" name="审批">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-3f0f88a114fca27b7d2dc28654f21494"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
...@@ -68,11 +71,11 @@ ...@@ -68,11 +71,11 @@
<bpmndi:BPMNShape id="BPMNShape-542ea3f4f99dca8171db8812cc80e5bf" bpmnElement="sid-542ea3f4f99dca8171db8812cc80e5bf"> <bpmndi:BPMNShape id="BPMNShape-542ea3f4f99dca8171db8812cc80e5bf" bpmnElement="sid-542ea3f4f99dca8171db8812cc80e5bf">
<omgdi:Bounds x="740" y="410" width="30" height="30" /> <omgdi:Bounds x="740" y="410" width="30" height="30" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge-rid-84a90397cda177fe4e8bfcbc2f47fb71" bpmnElement="rid-84a90397cda177fe4e8bfcbc2f47fb71"> <bpmndi:BPMNEdge id="BPMNEdge-rid-7747c756cd9b92668d820c905c470c5a" bpmnElement="rid-7747c756cd9b92668d820c905c470c5a">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-3f0f88a114fca27b7d2dc28654f21494" bpmnElement="lid-IAACTION-3f0f88a114fca27b7d2dc28654f21494"> <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de" bpmnElement="lid-IAACTION-2a5dec1a97c122d80c8b1c68af3344de">
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" /> <omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
......
...@@ -1000,6 +1000,10 @@ ...@@ -1000,6 +1000,10 @@
"dynaModelFilePath" : "PSMODULES/common.json", "dynaModelFilePath" : "PSMODULES/common.json",
"name" : "公共模块" "name" : "公共模块"
} ], } ],
"getAllPSWFRoles" : [ {
"modelref" : true,
"path" : "PSWFROLES/WfTest.json"
} ],
"getAllPSWorkflows" : [ { "getAllPSWorkflows" : [ {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json" "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
......
{
"codeName" : "WfTest",
"dynaModelFilePath" : "PSWFROLES/WfTest.json",
"name" : "流程测试",
"uniqueTag" : "WfTest",
"wFRoleType" : "SYSUSERROLE"
}
\ No newline at end of file
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000 EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar ADD trainsys-provider.jar /trainsys-provider.jar
...@@ -22,32 +22,7 @@ spec: ...@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 50000 - containerPort: 8081
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 apiVersion: v1
...@@ -60,9 +35,9 @@ spec: ...@@ -60,9 +35,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 50000 port: 8081
targetPort: 50000 targetPort: 8081
nodePort: 50000 nodePort: 8081
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "50000:50000" - "8081:8081"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册