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

tony001 部署微服务接口 [TrainSys,默认服务接口]

上级 d7193109
......@@ -55,36 +55,12 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mkdir -p /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5
if [ -e app_Mob/.dynamic ]
then
cd app_Mob
else
cd app_Mob/app
fi
sed -i "s#dstimage#$para5#g" swarm.yaml
if [[ $para3 = all ]];then
mv Dockerfile-ALL Dockerfile
set +e
sed -i "s#/api#/sztrainsys__mob#g" src/environments/environment.ts
sed -i "s#outputDir#//outputDir#g" vue.config.js
set -e
yarn
ln -s /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5 node_modules/.cache
yarn build
else
if [ -e .dynamic ]
then
mv ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
else
mv ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
fi
sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
mv Dockerfile-MODEL Dockerfile
fi
docker build -t $para5 .
docker push $para5
docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
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>
......
......@@ -511,6 +511,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "MOBTEXT",
......@@ -526,7 +554,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -615,6 +615,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "MOBTEXT",
......@@ -630,7 +658,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -514,6 +514,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -529,7 +557,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -618,6 +618,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -633,7 +661,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -604,6 +604,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -619,7 +647,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -796,6 +796,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -811,7 +839,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -514,6 +514,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -529,7 +557,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -617,6 +617,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -632,7 +660,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -603,6 +603,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -618,7 +646,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -621,6 +621,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -636,7 +664,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -615,6 +615,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -630,7 +658,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -914,6 +914,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -929,7 +957,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -1328,6 +1328,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -1343,7 +1371,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......
......@@ -36732,6 +36732,34 @@
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "TEXTBOX",
......@@ -36747,7 +36775,7 @@
"id" : "group1"
},
"showMoreMode" : 1,
"allowEmpty" : true,
"allowEmpty" : false,
"showCaption" : true
} ],
"getPSLayout" : {
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>runtime</id>
<id>trainsys</id>
<build>
<resources>
<resource>
......
......@@ -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
......@@ -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
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册