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

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

上级 c70973f7
...@@ -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>
......
...@@ -1582,16 +1582,16 @@ ...@@ -1582,16 +1582,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
......
...@@ -13428,16 +13428,16 @@ ...@@ -13428,16 +13428,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
...@@ -13466,10 +13466,10 @@ ...@@ -13466,10 +13466,10 @@
"codeName" : "VMGroup3", "codeName" : "VMGroup3",
"name" : "视图消息类型测试", "name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-常规信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg4" "id" : "ViewMsg5"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-错误信息",
...@@ -13478,10 +13478,10 @@ ...@@ -13478,10 +13478,10 @@
"id" : "ViewMsg6" "id" : "ViewMsg6"
} }
}, { }, {
"name" : "消息类型-警告信息", "name" : "消息类型-常规信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg4"
} }
} ] } ]
}, { }, {
...@@ -13498,39 +13498,53 @@ ...@@ -13498,39 +13498,53 @@
"codeName" : "VMGroup4", "codeName" : "VMGroup4",
"name" : "视图消息位置测试", "name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg8" "id" : "ViewMsg9"
} }
}, { }, {
"name" : "消息位置-弹出", "name" : "消息位置-视图上方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg10" "id" : "ViewMsg7"
} }
}, { }, {
"name" : "消息位置-视图方", "name" : "消息位置-视图方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg7" "id" : "ViewMsg8"
} }
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息位置-弹出",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg10"
} }
} ] } ]
}, { }, {
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除-上方-错误", "name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg11"
} }
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -13538,16 +13552,16 @@ ...@@ -13538,16 +13552,16 @@
"id" : "ViewMsg9" "id" : "ViewMsg9"
} }
}, { }, {
"name" : "关闭模式-本次删除-上方-警告", "name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg12"
} }
}, { }, {
"name" : "消息位置-视图下方", "name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg8" "id" : "ViewMsg13"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-错误信息",
...@@ -13557,62 +13571,48 @@ ...@@ -13557,62 +13571,48 @@
}, },
"position" : "POPUP" "position" : "POPUP"
}, { }, {
"name" : "消息类型-警告信息", "name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg11" "id" : "ViewMsg8"
} }
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
"name" : "视图消息关闭模式", "name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除", "name" : "关闭模式-默认删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg12"
} }
}, { }, {
"name" : "关闭模式-删除", "name" : "关闭模式-本次删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg11" "id" : "ViewMsg13"
} }
}, { }, {
"name" : "关闭模式-默认删除", "name" : "关闭模式-删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg11"
} }
} ] } ]
}, { }, {
"codeName" : "VMGroup6", "codeName" : "VMGroup6",
"name" : "视图消息动态模式测试", "name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-实体数据集", "name" : "动态模式-静态内容",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg14" "id" : "ViewMsg15"
} }
}, { }, {
"name" : "动态模式-静态内容", "name" : "动态模式-实体数据集",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg15" "id" : "ViewMsg14"
} }
} ] } ]
} ], } ],
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册