Skip to content

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

chitanda 部署微服务应用 [TrainSys，网页端]

上级 1bcc48d2
隐藏空白字符变更
内嵌 并排
正在显示 包含 102 行增加 和 121 行删除
app_Web/swarm.yaml
浏览文件 @ 4697765a
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
trainsys-app-web: trainsys-app-web:
image: dstimage image: dstimage
ports: ports:
- "80:80" - "50100:80"
networks: networks:
- agent_network - agent_network
environment: environment:
......
config.xml
浏览文件 @ 4697765a
...@@ -55,14 +55,34 @@ ...@@ -55,14 +55,34 @@
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 mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
mvn install -Ptrainsys if [ -e app_Web/.dynamic ]
cd trainsys-provider then
sed -i "s#dstimage#$para5#g" pom.xml cd app_Web
sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml else
mvn -Ptrainsys docker:build cd app_Web/app
mvn -Ptrainsys docker:push fi
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth sed -i "s#dstimage#$para5#g" swarm.yaml
if [[ $para3 = all ]];then
mv Dockerfile-ALL Dockerfile
sed -i "s#/api#/trainsys__web#g" src/environments/environment.ts
sed -i "s#outputDir#//outputDir#g" vue.config.js
yarn
ln -s /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C node_modules/.cache
yarn build
else
if [ -e .dynamic ]
then
mv ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web model
else
mv ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web 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
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 4697765a
...@@ -9188,34 +9188,34 @@ ...@@ -9188,34 +9188,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -9447,30 +9447,6 @@ ...@@ -9447,30 +9447,6 @@
"mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b", "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -9504,6 +9480,30 @@ ...@@ -9504,6 +9480,30 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
} ], } ],
"rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b", "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
"uniqueTag" : "Reginfo__A046596b6afb50f9e5b" "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"
...@@ -15181,34 +15181,34 @@ ...@@ -15181,34 +15181,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -15440,30 +15440,6 @@ ...@@ -15440,30 +15440,6 @@
"mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b", "mOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -15497,6 +15473,30 @@ ...@@ -15497,6 +15473,30 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/ToggleRowEdit",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
} ], } ],
"rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b", "rTMOSFilePath" : "pssysapps/Web/psappdataentities/Reginfo/psappdeuagroups/A046596b6afb50f9e5b",
"uniqueTag" : "Reginfo__A046596b6afb50f9e5b" "uniqueTag" : "Reginfo__A046596b6afb50f9e5b"
trainsys-provider/pom.xml
浏览文件 @ 4697765a
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 4697765a
...@@ -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
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 4697765a
...@@ -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
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 4697765a
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: dstimage image: dstimage
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或