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

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

上级 fb375b1a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
index index.html index.htm; index index.html index.htm;
} }
location /trainsys__web { location /sztrainsys__web {
proxy_pass http://gateway.ibizcloud.cn:20086; proxy_pass http://gateway.ibizcloud.cn:20086;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
......
...@@ -7,9 +7,9 @@ services: ...@@ -7,9 +7,9 @@ services:
networks: networks:
- agent_network - agent_network
environment: environment:
- BASEURL=trainsys__web - BASEURL=sztrainsys__web
- APPCODE=web - APPCODE=web
- APICODE=trainsys__web - APICODE=sztrainsys__web
deploy: deploy:
resources: resources:
limits: limits:
......
...@@ -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>
......
...@@ -41,23 +41,23 @@ ...@@ -41,23 +41,23 @@
</flowable:field> </flowable:field>
</extensionElements> </extensionElements>
<startEvent id="sid-cacb9d43bd676e39faf2e4ce7ad3579d" name="开始事件"> <startEvent id="sid-f2f162e01f7fe7d08374a565e1edb2af" name="开始事件">
<extensionElements> <extensionElements>
<flowable:form process-form="startForm" wfversion="1"/> <flowable:form process-form="startForm" wfversion="1"/>
</extensionElements> </extensionElements>
</startEvent> </startEvent>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-4ad1c8a385c1e6881d45a4416b562150" name="审核"> <userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('WfTest',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-0ec5b557aa979a307af5aa9680485404" name="审核">
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements> <extensionElements>
<flowable:form process-form="ApprovalForm" /> <flowable:form process-form="ApprovalForm" />
</extensionElements> </extensionElements>
</userTask> </userTask>
<endEvent id="sid-357b63a68645d86c63eaa30e852f152a" name="结束事件"> <endEvent id="sid-53de4cc0be78ed2c689be324acd60ae7" name="结束事件">
</endEvent> </endEvent>
<sequenceFlow id="rid-4ed9f4245efea83b177c30149ec0cc46" sourceRef="sid-cacb9d43bd676e39faf2e4ce7ad3579d" targetRef="tid-20-4ad1c8a385c1e6881d45a4416b562150" name=""> <sequenceFlow id="rid-8ad1fd932c30ce2e9f7bd7a1afc81bc9" sourceRef="sid-f2f162e01f7fe7d08374a565e1edb2af" targetRef="tid-20-0ec5b557aa979a307af5aa9680485404" name="">
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-IAACTION-d50049e41baf9c7379a3cd72970cc794" sourceRef="tid-20-4ad1c8a385c1e6881d45a4416b562150" targetRef="sid-357b63a68645d86c63eaa30e852f152a" name="审批"> <sequenceFlow id="lid-IAACTION-d5cf88ba520587f519cfbc33f68aa741" sourceRef="tid-20-0ec5b557aa979a307af5aa9680485404" targetRef="sid-53de4cc0be78ed2c689be324acd60ae7" name="审批">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-d50049e41baf9c7379a3cd72970cc794"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-IAACTION-d5cf88ba520587f519cfbc33f68aa741"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form nextCondition="ANY" />
</extensionElements> </extensionElements>
...@@ -65,20 +65,20 @@ ...@@ -65,20 +65,20 @@
</process> </process>
<bpmndi:BPMNDiagram id="BPMNDiagram_trainsys-workflowwfv1"> <bpmndi:BPMNDiagram id="BPMNDiagram_trainsys-workflowwfv1">
<bpmndi:BPMNPlane id="BPMNPlane_trainsys-workflowwfv1" bpmnElement="trainsys-workflowwfv1"> <bpmndi:BPMNPlane id="BPMNPlane_trainsys-workflowwfv1" bpmnElement="trainsys-workflowwfv1">
<bpmndi:BPMNShape id="BPMNShape-cacb9d43bd676e39faf2e4ce7ad3579d" bpmnElement="sid-cacb9d43bd676e39faf2e4ce7ad3579d"> <bpmndi:BPMNShape id="BPMNShape-f2f162e01f7fe7d08374a565e1edb2af" bpmnElement="sid-f2f162e01f7fe7d08374a565e1edb2af">
<omgdi:Bounds x="740" y="70" width="30" height="30" /> <omgdi:Bounds x="740" y="70" width="30" height="30" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-4ad1c8a385c1e6881d45a4416b562150" bpmnElement="tid-20-4ad1c8a385c1e6881d45a4416b562150"> <bpmndi:BPMNShape id="BPMNShape-0ec5b557aa979a307af5aa9680485404" bpmnElement="tid-20-0ec5b557aa979a307af5aa9680485404">
<omgdi:Bounds x="710" y="220" width="100" height="80" /> <omgdi:Bounds x="710" y="220" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-357b63a68645d86c63eaa30e852f152a" bpmnElement="sid-357b63a68645d86c63eaa30e852f152a"> <bpmndi:BPMNShape id="BPMNShape-53de4cc0be78ed2c689be324acd60ae7" bpmnElement="sid-53de4cc0be78ed2c689be324acd60ae7">
<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-4ed9f4245efea83b177c30149ec0cc46" bpmnElement="rid-4ed9f4245efea83b177c30149ec0cc46"> <bpmndi:BPMNEdge id="BPMNEdge-rid-8ad1fd932c30ce2e9f7bd7a1afc81bc9" bpmnElement="rid-8ad1fd932c30ce2e9f7bd7a1afc81bc9">
<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-d50049e41baf9c7379a3cd72970cc794" bpmnElement="lid-IAACTION-d50049e41baf9c7379a3cd72970cc794"> <bpmndi:BPMNEdge id="BPMNEdge-lid-IAACTION-d5cf88ba520587f519cfbc33f68aa741" bpmnElement="lid-IAACTION-d5cf88ba520587f519cfbc33f68aa741">
<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>
......
...@@ -1029,7 +1029,7 @@ ...@@ -1029,7 +1029,7 @@
"mainPSSysSFPub" : true, "mainPSSysSFPub" : true,
"pubModel" : true "pubModel" : true
}, },
"deploySysId" : "trainsys", "deploySysId" : "sztrainsys",
"deploySysTag" : "336d44c339448f6095f53a1fe78eb8d5", "deploySysTag" : "336d44c339448f6095f53a1fe78eb8d5",
"engineVer" : 239, "engineVer" : 239,
"logicName" : "TrainSys", "logicName" : "TrainSys",
......
...@@ -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:
......
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
ibiz: ibiz:
servicehub: servicehub:
id: trainsys id: sztrainsys
# register-naming-service: false # register-naming-service: false
# publish-config: false # publish-config: false
tenant: true tenant: true
......
...@@ -3,7 +3,7 @@ filefolder: c:\SRFEX_FILE ...@@ -3,7 +3,7 @@ filefolder: c:\SRFEX_FILE
fontfolder: /usr/share/fonts fontfolder: /usr/share/fonts
deploysystems: deploysystems:
- gateway - gateway
- trainsys - sztrainsys
systemsettings: systemsettings:
cloudclientutil: cloudclientutil:
serviceurl: lb://ebsx-oldapi serviceurl: lb://ebsx-oldapi
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册