Skip to content

T
TrainSys
提交 db5b0632 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 57a623db
隐藏空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 61 行删除
config.xml
浏览文件 @ db5b0632
......@@ -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
浏览文件 @ db5b0632
......@@ -50,6 +50,31 @@
"asynchronousProcess" : false,
"enableTimeout" : false,
"startProcess" : true
}, {
"codeName" : "TIMEREVENT_01",
"height" : 80,
"leftPos" : 150,
"logicName" : "中间定时器捕获事件",
"name" : "中间定时器捕获事件",
"timeout" : -1,
"topPos" : 380,
"wFProcessType" : "TIMEREVENT",
"width" : 100,
"asynchronousProcess" : false,
"enableTimeout" : false
}, {
"codeName" : "END_01",
"height" : 30,
"leftPos" : 740,
"logicName" : "结束事件",
"name" : "结束事件",
"timeout" : -1,
"topPos" : 420,
"wFProcessType" : "END",
"width" : 30,
"asynchronousProcess" : false,
"enableTimeout" : false,
"terminalProcess" : true
}, {
"codeName" : "INTERACTIVE_01",
"formCodeName" : "ApprovalForm",
......@@ -89,19 +114,6 @@
"asynchronousProcess" : false,
"enableTimeout" : false,
"sendInform" : false
}, {
"codeName" : "END_01",
"height" : 30,
"leftPos" : 740,
"logicName" : "结束事件",
"name" : "结束事件",
"timeout" : -1,
"topPos" : 420,
"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
浏览文件 @ db5b0632
......@@ -46,18 +46,21 @@
<flowable:form process-form="startForm" process-mobform="startForm" wfversion="1"/>
</extensionElements>
</startEvent>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid--ab22480a12bdcbd7d86193b3d8ac3d05" name="中间定时器捕获事件">
<documentation>${majortext}</documentation>
</userTask>
<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>
<endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
</endEvent>
<sequenceFlow id="rid-c91853d488ba798d50b6b31e894b7d3e" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
<sequenceFlow id="rid-e6f4c7bfc8f37052c091ce8a57c274b5" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
</sequenceFlow>
<sequenceFlow id="lid-IAACTION-594daddb75dd6f00fad8587412c9ba0f" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-594daddb75dd6f00fad8587412c9ba0f"}]]></conditionExpression>
<sequenceFlow id="lid-IAACTION-ccb119d34884f72542e2549640ab44aa" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-ccb119d34884f72542e2549640ab44aa"}]]></conditionExpression>
<extensionElements>
<flowable:form sequenceFlowForm="WorkFlowEditView_Form" sequenceFlowMobForm="WorkFlowEditView_Form" sequenceFlowView="WFDynaActionView" sequenceFlowMobView="MobWFDynaActionView" nextCondition="ANY" />
</extensionElements>
......@@ -68,17 +71,20 @@
<bpmndi:BPMNShape id="BPMNShape-f2f162e01f7fe7d08374a565e1edb2af" bpmnElement="sid-f2f162e01f7fe7d08374a565e1edb2af">
<omgdi:Bounds x="740" y="70" width="30" height="30" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
<omgdi:Bounds x="910" y="210" width="100" height="80" />
<bpmndi:BPMNShape id="BPMNShape-ab22480a12bdcbd7d86193b3d8ac3d05" bpmnElement="sid-ab22480a12bdcbd7d86193b3d8ac3d05">
<omgdi:Bounds x="150" y="380" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
<omgdi:Bounds x="740" y="420" width="30" height="30" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge-rid-c91853d488ba798d50b6b31e894b7d3e" bpmnElement="rid-c91853d488ba798d50b6b31e894b7d3e">
<bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
<omgdi:Bounds x="910" y="210" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge-rid-e6f4c7bfc8f37052c091ce8a57c274b5" bpmnElement="rid-e6f4c7bfc8f37052c091ce8a57c274b5">
<omgdi:waypoint x="0" y="0" />
<omgdi:waypoint x="0" y="0" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-594daddb75dd6f00fad8587412c9ba0f" bpmnElement="lid-IAACTION-594daddb75dd6f00fad8587412c9ba0f">
<bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-ccb119d34884f72542e2549640ab44aa" bpmnElement="lid-IAACTION-ccb119d34884f72542e2549640ab44aa">
<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/PSSYSAPP.json
浏览文件 @ db5b0632
......@@ -11539,6 +11539,12 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -11556,35 +11562,23 @@
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
......@@ -11593,17 +11587,16 @@
},
"position" : "POPUP"
}, {
"name" : "消息类型-警告信息",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-视图内容区",
......@@ -11612,32 +11605,39 @@
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-无删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg13"
}
} ]
}, {
trainsys-provider/pom.xml
浏览文件 @ db5b0632
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>runtime</id>
<id>trainsys</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ db5b0632
......@@ -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
浏览文件 @ db5b0632
......@@ -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
浏览文件 @ db5b0632
......@@ -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:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或