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

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

上级 e284c221
......@@ -55,12 +55,6 @@
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>
......
......@@ -4605,6 +4605,28 @@
"uILogicAttachMode" : "REPLACE",
"uILogicType" : "DELOGIC",
"id" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click@Book"
}, {
"actionTarget" : "SINGLEDATA",
"caption" : "复制表单id",
"codeName" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"frontProcessType" : "OTHER",
"fullCodeName" : "Book_toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"name" : "复制表单id",
"getPSAppDEUILogic" : {
"modelref" : true,
"id" : "copyFormId"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"uIActionType" : "DEUIACTION",
"uILogicAttachMode" : "REPLACE",
"uILogicType" : "DELOGIC",
"id" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click@Book"
} ],
"getAllPSAppDEUILogics" : [ {
"codeName" : "copyFormId",
......
......@@ -76,17 +76,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field11"
"name" : "field14"
}, {
"name" : "field17"
}, {
"name" : "field13"
}, {
"name" : "type"
}, {
"name" : "field8"
}, {
"name" : "field14"
}, {
"name" : "field13"
"name" : "field11"
} ]
} ],
"getPSDEFormItemVRs" : [ {
......@@ -583,7 +583,6 @@
"getPSDEFormDetails" : [ {
"caption" : "颜色选择器",
"codeName" : "formitem11",
"contentWidth" : 600.0,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
......@@ -599,11 +598,8 @@
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL",
"width" : 600,
"widthMode" : "PX"
"layout" : "TABLE_24COL"
},
"width" : 600.0,
"allowEmpty" : true,
"showCaption" : true
}, {
......@@ -1069,30 +1065,6 @@
},
"allowEmpty" : true,
"showCaption" : true
}, {
"codeName" : "rawitem1",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"htmlContent" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"content" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"contentType" : "HTML",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"getPSSysImage" : {
"cssClass" : "fa-solid fa-file-zipper"
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"caption" : "步进器",
"codeName" : "formitem3",
......@@ -1101,7 +1073,7 @@
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "BOTTOM",
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem3",
"noPrivDisplayMode" : 1,
......@@ -1133,8 +1105,8 @@
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem4",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
......@@ -1154,7 +1126,8 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "滑动输入条",
"codeName" : "formitem5",
......@@ -3041,6 +3014,30 @@
"detailType" : "GROUPPANEL",
"name" : "grouppanel8",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem1",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"htmlContent" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"content" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"contentType" : "HTML",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"getPSSysImage" : {
"cssClass" : "fa-solid fa-file-zipper"
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
......
......@@ -185,17 +185,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field11"
"name" : "field14"
}, {
"name" : "field17"
}, {
"name" : "field13"
}, {
"name" : "type"
}, {
"name" : "field8"
}, {
"name" : "field14"
}, {
"name" : "field13"
"name" : "field11"
} ]
} ],
"getPSDEFormItemVRs" : [ {
......@@ -692,7 +692,6 @@
"getPSDEFormDetails" : [ {
"caption" : "颜色选择器",
"codeName" : "formitem11",
"contentWidth" : 600.0,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
......@@ -708,11 +707,8 @@
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL",
"width" : 600,
"widthMode" : "PX"
"layout" : "TABLE_24COL"
},
"width" : 600.0,
"allowEmpty" : true,
"showCaption" : true
}, {
......@@ -1178,30 +1174,6 @@
},
"allowEmpty" : true,
"showCaption" : true
}, {
"codeName" : "rawitem1",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"htmlContent" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"content" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"contentType" : "HTML",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"getPSSysImage" : {
"cssClass" : "fa-solid fa-file-zipper"
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"caption" : "步进器",
"codeName" : "formitem3",
......@@ -1210,7 +1182,7 @@
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "BOTTOM",
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem3",
"noPrivDisplayMode" : 1,
......@@ -1242,8 +1214,8 @@
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem4",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
......@@ -1263,7 +1235,8 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "滑动输入条",
"codeName" : "formitem5",
......@@ -3150,6 +3123,30 @@
"detailType" : "GROUPPANEL",
"name" : "grouppanel8",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem1",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"htmlContent" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"content" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"contentType" : "HTML",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"getPSSysImage" : {
"cssClass" : "fa-solid fa-file-zipper"
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
......
......@@ -774,17 +774,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field11"
"name" : "field14"
}, {
"name" : "field17"
}, {
"name" : "field13"
}, {
"name" : "type"
}, {
"name" : "field8"
}, {
"name" : "field14"
}, {
"name" : "field13"
"name" : "field11"
} ]
} ],
"getPSDEFormItemVRs" : [ {
......@@ -1281,7 +1281,6 @@
"getPSDEFormDetails" : [ {
"caption" : "颜色选择器",
"codeName" : "formitem11",
"contentWidth" : 600.0,
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
......@@ -1297,11 +1296,8 @@
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL",
"width" : 600,
"widthMode" : "PX"
"layout" : "TABLE_24COL"
},
"width" : 600.0,
"allowEmpty" : true,
"showCaption" : true
}, {
......@@ -1767,30 +1763,6 @@
},
"allowEmpty" : true,
"showCaption" : true
}, {
"codeName" : "rawitem1",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"htmlContent" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"content" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"contentType" : "HTML",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"getPSSysImage" : {
"cssClass" : "fa-solid fa-file-zipper"
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"caption" : "步进器",
"codeName" : "formitem3",
......@@ -1799,7 +1771,7 @@
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "BOTTOM",
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem3",
"noPrivDisplayMode" : 1,
......@@ -1831,8 +1803,8 @@
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem4",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
......@@ -1852,7 +1824,8 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "滑动输入条",
"codeName" : "formitem5",
......@@ -3739,6 +3712,30 @@
"detailType" : "GROUPPANEL",
"name" : "grouppanel8",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem1",
"contentType" : "HTML",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"htmlContent" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"name" : "rawitem1",
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSRawItem" : {
"content" : "<p>&lt;p&gt;测试p标签&lt;p/&gt;</p>",
"contentType" : "HTML",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"getPSSysImage" : {
"cssClass" : "fa-solid fa-file-zipper"
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
......
......@@ -260,6 +260,47 @@
"getPSControlParam" : {
"id" : "TOOLBAR"
},
"getPSDEToolbarItems" : [ {
"caption" : "复制表单id",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction1",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_deuiaction1"
},
"getPSSysImage" : {
"rawContent" : "<?xml version=\"1.0\" standalone=\"no\"?><!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\"><svg viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg' height='1em' width='1em' focusable='false' > <g id='copy2020/after-copy' stroke-width='1' fill-rule='evenodd'> <g id='5666232' transform='translate(2 -.27)' fill-rule='nonzero' > <path d='M5.6 8.47v-1.2h4.174v1.2H5.6zm0 3v-1.2h4.174v1.2H5.6zm-4.4-10v10.075H0L.003 2.27c0-1.088.895-2 1.997-2h7.585v1.2H1.2zm1.8.8h9a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1v-12a1 1 0 0 1 1-1zm.2 1.2v11.6h8.6V3.47H3.2z' id='copy2020' ></path> </g> </g> </svg>"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEDATA",
"caption" : "复制表单id",
"codeName" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"frontProcessType" : "OTHER",
"fullCodeName" : "Book_toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"name" : "复制表单id",
"getPSAppDEUILogic" : {
"modelref" : true,
"id" : "copyFormId"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"uIActionType" : "DEUIACTION",
"uILogicAttachMode" : "REPLACE",
"uILogicType" : "DELOGIC",
"id" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click@Book"
},
"tooltip" : "复制表单id",
"uIActionTarget" : "SINGLEDATA",
"showCaption" : true,
"showIcon" : true
} ],
"xDataControlName" : "form",
"modelid" : "442ECC2A-CB9D-47D7-8B93-B32760241048",
"modeltype" : "PSDETOOLBAR"
......
......@@ -55082,6 +55082,28 @@
"uILogicAttachMode" : "REPLACE",
"uILogicType" : "DELOGIC",
"id" : "toolbar_Usr4GridViewtoolbar_deuiaction1_click@Book"
}, {
"actionTarget" : "SINGLEDATA",
"caption" : "复制表单id",
"codeName" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"frontProcessType" : "OTHER",
"fullCodeName" : "Book_toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"name" : "复制表单id",
"getPSAppDEUILogic" : {
"modelref" : true,
"id" : "copyFormId"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click",
"uIActionType" : "DEUIACTION",
"uILogicAttachMode" : "REPLACE",
"uILogicType" : "DELOGIC",
"id" : "toolbar_UsrTestFormLYEditViewtoolbar_deuiaction1_click@Book"
} ],
"getAllPSAppDEUILogics" : [ {
"codeName" : "copyFormId",
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册