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

tony001 部署微服务应用 [TrainSys,Mob]

上级 4fa63e42
......@@ -55,12 +55,36 @@
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
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
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -59,6 +59,9 @@
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/CodeList119.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/FileShortcutSearchType.json"
} ],
"getAllPSDataEntities" : [ {
"modelref" : true,
......
{
"codeListTag" : "Test__FileShortcutSearchType",
"codeListType" : "STATIC",
"codeName" : "FileShortcutSearchType",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/FileShortcutSearchType.json",
"emptyText" : "未定义",
"name" : "文件快捷搜索类型",
"getPSCodeItems" : [ {
"codeName" : "Item_1",
"text" : "全部",
"value" : "1"
}, {
"codeName" : "Item_2",
"text" : "星标",
"value" : "2"
}, {
"codeName" : "Item_3",
"getPSSysCss" : {
"cssName" : "green-span"
},
"text" : "最近访问",
"textCls" : "green-span",
"value" : "3"
} ],
"getPSSystemModule" : {
"modelref" : true,
"path" : "PSMODULES/Test.json"
},
"refFlag" : true,
"systemTag" : "TrainSys",
"codeItemValueNumber" : false,
"enableCache" : true,
"subSysAsCloud" : false,
"subSysCodeList" : false,
"userScope" : false
}
\ No newline at end of file
......@@ -1517,16 +1517,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......
{
"codeListTag" : "Test__FileShortcutSearchType",
"codeListType" : "STATIC",
"codeName" : "FileShortcutSearchType",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileShortcutSearchType.json",
"emptyText" : "未定义",
"name" : "文件快捷搜索类型",
"getPSCodeItems" : [ {
"codeName" : "Item_1",
"text" : "全部",
"value" : "1"
}, {
"codeName" : "Item_2",
"text" : "星标",
"value" : "2"
}, {
"codeName" : "Item_3",
"getPSSysCss" : {
"cssName" : "green-span"
},
"text" : "最近访问",
"textCls" : "green-span",
"value" : "3"
} ],
"enableCache" : true
}
\ No newline at end of file
......@@ -8,12 +8,78 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json"
},
"getPSDEFormItems" : [ {
"id" : "formitem1",
"dataType" : 25
}, {
"id" : "formitem",
"dataType" : 25
} ],
"getPSDEFormPages" : [ {
"caption" : "常规条件",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"caption" : "表单项",
"codeName" : "formitem1",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem1",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem1"
},
"getPSLayoutPos" : {
"colLG" : 2,
"colMD" : 2,
"colSM" : 2,
"colXS" : 2,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true
}, {
"caption" : "表单项",
"codeName" : "formitem",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem",
"noPrivDisplayMode" : 1,
"outputCodeListConfigMode" : 2,
"getPSEditor" : {
"editorType" : "CHECKBOXLIST",
"name" : "formitem",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileShortcutSearchType.json"
}
},
"getPSLayoutPos" : {
"colLG" : 16,
"colLGOffset" : 2,
"colMD" : 16,
"colMDOffset" : 2,
"colSM" : 16,
"colSMOffset" : 2,
"colXS" : 16,
"colXSOffset" : 2,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
......
......@@ -470,12 +470,78 @@
"showBusyIndicator" : true,
"id" : "SEARCHFORM"
},
"getPSDEFormItems" : [ {
"id" : "formitem1",
"dataType" : 25
}, {
"id" : "formitem",
"dataType" : 25
} ],
"getPSDEFormPages" : [ {
"caption" : "常规条件",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"caption" : "表单项",
"codeName" : "formitem1",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem1",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem1"
},
"getPSLayoutPos" : {
"colLG" : 2,
"colMD" : 2,
"colSM" : 2,
"colXS" : 2,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true
}, {
"caption" : "表单项",
"codeName" : "formitem",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem",
"noPrivDisplayMode" : 1,
"outputCodeListConfigMode" : 2,
"getPSEditor" : {
"editorType" : "CHECKBOXLIST",
"name" : "formitem",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileShortcutSearchType.json"
}
},
"getPSLayoutPos" : {
"colLG" : 16,
"colLGOffset" : 2,
"colMD" : 16,
"colMDOffset" : 2,
"colSM" : 16,
"colSMOffset" : 2,
"colXS" : 16,
"colXSOffset" : 2,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
......@@ -558,6 +624,7 @@
"enableQuickSearch" : true,
"enableRowEdit" : false,
"enableSearch" : true,
"expandSearchForm" : true,
"rowEditDefault" : true,
"modelid" : "cca6dca3fa00814d7a2c0802bcd10ad1",
"modeltype" : "PSAPPDEVIEW"
......
......@@ -394,6 +394,32 @@
"value" : "SINGLE"
} ],
"enableCache" : true
}, {
"codeListTag" : "Test__FileShortcutSearchType",
"codeListType" : "STATIC",
"codeName" : "FileShortcutSearchType",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/FileShortcutSearchType.json",
"emptyText" : "未定义",
"name" : "文件快捷搜索类型",
"getPSCodeItems" : [ {
"codeName" : "Item_1",
"text" : "全部",
"value" : "1"
}, {
"codeName" : "Item_2",
"text" : "星标",
"value" : "2"
}, {
"codeName" : "Item_3",
"getPSSysCss" : {
"cssName" : "green-span"
},
"text" : "最近访问",
"textCls" : "green-span",
"value" : "3"
} ],
"enableCache" : true
}, {
"codeListTag" : "Test__FileType",
"codeListType" : "STATIC",
......@@ -12360,16 +12386,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......@@ -12398,16 +12424,16 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-错误信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-警告信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-常规信息",
......@@ -12430,63 +12456,57 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方",
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图方",
"name" : "消息位置-视图方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-弹出",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg10"
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg8"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除-上方-错误",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-警告信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
......@@ -12503,32 +12523,38 @@
"id" : "ViewMsg11"
}
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg11"
}
} ]
}, {
......@@ -435,6 +435,9 @@
}, {
"modelref" : true,
"path" : "PSCODELISTS/CodeList78.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/FileShortcutSearchType.json"
}, {
"modelref" : true,
"path" : "PSCODELISTS/CodeList109.json"
......@@ -1378,6 +1381,9 @@
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/CodeList119.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/FileShortcutSearchType.json"
} ],
"getAllPSDataEntities" : [ {
"modelref" : true,
......
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</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 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- 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"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "50000:50000"
- "8081:8081"
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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册