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

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

上级 2efc73fd
......@@ -55,6 +55,12 @@
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
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -1339,9 +1339,11 @@
"getPSDEViewId" : "1C1AD3BB-6BF3-43ED-AFB6-AFA71E22569F",
"getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number1"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number2"
}, {
"id" : "field_text_dynamic2",
"viewFieldName" : "number"
......@@ -1414,76 +1416,128 @@
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计参训人次"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"caption" : "图片背景容器",
"itemStyle" : "STYLE2",
"itemType" : "CONTAINER",
"name" : "container_image",
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
}
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{\"number\":10}"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "DEACTION",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata2",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic1",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计培训时长"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计参训人次"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"viewFieldName" : "number1"
} ],
"getPSSysImage" : {
"imagePath" : "/assets/images/year-total.png"
},
"predefinedType" : "CONTAINER_IMAGE"
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"caption" : "本年度累计参训人次",
"contentType" : "RAW",
"name" : "static_text1",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "本年度累计参训人次",
"showCaption" : true
}, {
"caption" : "图片背景容器",
"itemStyle" : "STYLE2",
"itemType" : "CONTAINER",
"name" : "container_image1",
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic1",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计培训时长"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic1",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"viewFieldName" : "number2"
} ],
"getPSSysImage" : {
"imagePath" : "/assets/images/year-total.png"
},
"predefinedType" : "CONTAINER_IMAGE"
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text2",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
}
},
"getPSRawItem" : {
"caption" : "本年度累计培训时长",
"contentType" : "RAW",
"name" : "static_text2",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "本年度累计培训时长",
"showCaption" : true
} ],
"predefinedType" : "CONTAINER_SINGLEDATA"
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number1: '28734', number2: '22847'}"
} ]
}, {
"caption" : "面板容器",
......
......@@ -1497,9 +1497,11 @@
"getPSDEViewId" : "1C1AD3BB-6BF3-43ED-AFB6-AFA71E22569F",
"getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number1"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number2"
}, {
"id" : "field_text_dynamic2",
"viewFieldName" : "number"
......@@ -1572,76 +1574,128 @@
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计参训人次"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"caption" : "图片背景容器",
"itemStyle" : "STYLE2",
"itemType" : "CONTAINER",
"name" : "container_image",
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
}
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{\"number\":10}"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "DEACTION",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata2",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic1",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计培训时长"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计参训人次"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"viewFieldName" : "number1"
} ],
"getPSSysImage" : {
"imagePath" : "/assets/images/year-total.png"
},
"predefinedType" : "CONTAINER_IMAGE"
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"caption" : "本年度累计参训人次",
"contentType" : "RAW",
"name" : "static_text1",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "本年度累计参训人次",
"showCaption" : true
}, {
"caption" : "图片背景容器",
"itemStyle" : "STYLE2",
"itemType" : "CONTAINER",
"name" : "container_image1",
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic1",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计培训时长"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic1",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"viewFieldName" : "number2"
} ],
"getPSSysImage" : {
"imagePath" : "/assets/images/year-total.png"
},
"predefinedType" : "CONTAINER_IMAGE"
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text2",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
}
},
"getPSRawItem" : {
"caption" : "本年度累计培训时长",
"contentType" : "RAW",
"name" : "static_text2",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "本年度累计培训时长",
"showCaption" : true
} ],
"predefinedType" : "CONTAINER_SINGLEDATA"
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number1: '28734', number2: '22847'}"
} ]
}, {
"caption" : "面板容器",
......
......@@ -16,9 +16,11 @@
"getPSDEViewId" : "1C1AD3BB-6BF3-43ED-AFB6-AFA71E22569F",
"getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ {
"id" : "field_text_dynamic"
"id" : "field_text_dynamic",
"viewFieldName" : "number1"
}, {
"id" : "field_text_dynamic1"
"id" : "field_text_dynamic1",
"viewFieldName" : "number2"
}, {
"id" : "field_text_dynamic2",
"viewFieldName" : "number"
......@@ -91,76 +93,128 @@
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计参训人次"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"caption" : "图片背景容器",
"itemStyle" : "STYLE2",
"itemType" : "CONTAINER",
"name" : "container_image",
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
}
} ],
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{\"number\":10}"
}, {
"caption" : "单项数据容器",
"dataRegionType" : "SINGLEDATA",
"dataSourceType" : "DEACTION",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_singledata2",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic1",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计培训时长"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计参训人次"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"viewFieldName" : "number1"
} ],
"getPSSysImage" : {
"imagePath" : "/assets/images/year-total.png"
},
"predefinedType" : "CONTAINER_IMAGE"
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"caption" : "本年度累计参训人次",
"contentType" : "RAW",
"name" : "static_text1",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "本年度累计参训人次",
"showCaption" : true
}, {
"caption" : "图片背景容器",
"itemStyle" : "STYLE2",
"itemType" : "CONTAINER",
"name" : "container_image1",
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSPanelItems" : [ {
"caption" : "文本(动态)",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "field_text_dynamic1",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"getPSEditor" : {
"editorParams" : {
"SHOWMODEL" : "model3",
"CAPTION" : "本年度累计培训时长"
},
"editorStyle" : "SCREEN_PANEL_ATTRIBUTE",
"editorType" : "SPAN",
"name" : "field_text_dynamic1",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"viewFieldName" : "number2"
} ],
"getPSSysImage" : {
"imagePath" : "/assets/images/year-total.png"
},
"predefinedType" : "CONTAINER_IMAGE"
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text2",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
}
},
"getPSRawItem" : {
"caption" : "本年度累计培训时长",
"contentType" : "RAW",
"name" : "static_text2",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "本年度累计培训时长",
"showCaption" : true
} ],
"predefinedType" : "CONTAINER_SINGLEDATA"
"predefinedType" : "CONTAINER_SINGLEDATA",
"scriptCode" : "{number1: '28734', number2: '22847'}"
} ]
}, {
"caption" : "面板容器",
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册