Skip to content

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

fangzhihao 发布系统代码 [TrainSys，网页端]

上级 44c85b29
显示空白字符变更
内嵌 并排
正在显示 包含 693 行增加 和 84 行删除
config.xml
浏览文件 @ 6aaf799d
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
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
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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 6aaf799d
...@@ -1579,16 +1579,16 @@ ...@@ -1579,16 +1579,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
}, { }, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/UsrTestFormLYEditView_Form.json
浏览文件 @ 6aaf799d
...@@ -69,15 +69,15 @@ ...@@ -69,15 +69,15 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}, },
"getPSDEFormItemUpdates" : [ { "getPSDEFormItemUpdates" : [ {
"codeName" : "fiemItemCodeName",
"name" : "fiemItem",
"scriptCode" : "console.log('表单项值更新');\r\nif (data && data['bookname']) {\r\n data['formitem66'] = Number(data['bookname'].length);\r\n}",
"customCode" : true
}, {
"codeName" : "formitem1", "codeName" : "formitem1",
"name" : "formitem1", "name" : "formitem1",
"scriptCode" : "console.log('表单项值更新1');\r\nif (data && data['bookname1']) {\r\n data['formitem661'] = Number(data['bookname1'].length);\r\n}", "scriptCode" : "console.log('表单项值更新1');\r\nif (data && data['bookname1']) {\r\n data['formitem661'] = Number(data['bookname1'].length);\r\n}",
"customCode" : true "customCode" : true
}, {
"codeName" : "fiemItemCodeName",
"name" : "fiemItem",
"scriptCode" : "console.log('表单项值更新');\r\nif (data && data['bookname']) {\r\n data['formitem66'] = Number(data['bookname'].length);\r\n}",
"customCode" : true
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
...@@ -165,6 +165,18 @@ ...@@ -165,6 +165,18 @@
}, { }, {
"id" : "formitem21", "id" : "formitem21",
"dataType" : 25 "dataType" : 25
}, {
"id" : "formitem4",
"dataType" : 25
}, {
"id" : "formitem5",
"dataType" : 25
}, {
"id" : "formitem6",
"dataType" : 25
}, {
"id" : "formitem7",
"dataType" : 25
}, { }, {
"id" : "bookid", "id" : "bookid",
"hidden" : true, "hidden" : true,
...@@ -714,6 +726,321 @@ ...@@ -714,6 +726,321 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"infoGroupMode" : false "infoGroupMode" : false
}, {
"codeName" : "formpage3",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage3",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel3",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel3",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel4",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel4",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel5",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel5",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem1",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem1",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem2",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem2",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem3",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem3",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem3",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem4",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem4",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem4",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
} ],
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"dir" : "row-reverse",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : false
}, {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel6",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel6",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel7",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel7",
"getPSDEFormDetails" : [ {
"caption" : "超小",
"codeName" : "formitem4",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem4",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem4"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
}, {
"caption" : "小型",
"codeName" : "formitem5",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem5",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem5"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
}, {
"caption" : "中型",
"codeName" : "formitem6",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem6",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem6"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
}, {
"caption" : "大型",
"codeName" : "formitem7",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem7",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem7"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
} ],
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
}, {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel8",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel8",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem5",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem5",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem5",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
} ],
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"dir" : "row-reverse",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsrTestFormLYEditView.json
浏览文件 @ 6aaf799d
...@@ -187,15 +187,15 @@ ...@@ -187,15 +187,15 @@
"id" : "FORM" "id" : "FORM"
}, },
"getPSDEFormItemUpdates" : [ { "getPSDEFormItemUpdates" : [ {
"codeName" : "fiemItemCodeName",
"name" : "fiemItem",
"scriptCode" : "console.log('表单项值更新');\r\nif (data && data['bookname']) {\r\n data['formitem66'] = Number(data['bookname'].length);\r\n}",
"customCode" : true
}, {
"codeName" : "formitem1", "codeName" : "formitem1",
"name" : "formitem1", "name" : "formitem1",
"scriptCode" : "console.log('表单项值更新1');\r\nif (data && data['bookname1']) {\r\n data['formitem661'] = Number(data['bookname1'].length);\r\n}", "scriptCode" : "console.log('表单项值更新1');\r\nif (data && data['bookname1']) {\r\n data['formitem661'] = Number(data['bookname1'].length);\r\n}",
"customCode" : true "customCode" : true
}, {
"codeName" : "fiemItemCodeName",
"name" : "fiemItem",
"scriptCode" : "console.log('表单项值更新');\r\nif (data && data['bookname']) {\r\n data['formitem66'] = Number(data['bookname'].length);\r\n}",
"customCode" : true
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
...@@ -283,6 +283,18 @@ ...@@ -283,6 +283,18 @@
}, { }, {
"id" : "formitem21", "id" : "formitem21",
"dataType" : 25 "dataType" : 25
}, {
"id" : "formitem4",
"dataType" : 25
}, {
"id" : "formitem5",
"dataType" : 25
}, {
"id" : "formitem6",
"dataType" : 25
}, {
"id" : "formitem7",
"dataType" : 25
}, { }, {
"id" : "bookid", "id" : "bookid",
"hidden" : true, "hidden" : true,
...@@ -832,6 +844,321 @@ ...@@ -832,6 +844,321 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"infoGroupMode" : false "infoGroupMode" : false
}, {
"codeName" : "formpage3",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage3",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel3",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel3",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel4",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel4",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel5",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel5",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem1",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem1",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem1",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem2",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem2",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem2",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem3",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem3",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem3",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
}, {
"codeName" : "rawitem4",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem4",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem4",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
} ],
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"dir" : "row-reverse",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : false
}, {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel6",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel6",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel7",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel7",
"getPSDEFormDetails" : [ {
"caption" : "超小",
"codeName" : "formitem4",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem4",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem4"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
}, {
"caption" : "小型",
"codeName" : "formitem5",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem5",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem5"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
}, {
"caption" : "中型",
"codeName" : "formitem6",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem6",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem6"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
}, {
"caption" : "大型",
"codeName" : "formitem7",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "formitem7",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "formitem7"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"allowEmpty" : true
} ],
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
}, {
"actionGroupExtractMode" : "ITEM",
"codeName" : "grouppanel8",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel8",
"getPSDEFormDetails" : [ {
"codeName" : "rawitem5",
"contentType" : "RAW",
"detailStyle" : "DEFAULT",
"detailType" : "RAWITEM",
"name" : "rawitem5",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 60,
"widthMode" : "PX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "rawitem5",
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0
},
"rawItemHeight" : -1.0,
"rawItemWidth" : -1.0,
"showCaption" : true
} ],
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"dir" : "row-reverse",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 6aaf799d
...@@ -12724,16 +12724,16 @@ ...@@ -12724,16 +12724,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
}, { }, {
...@@ -12762,12 +12762,6 @@ ...@@ -12762,12 +12762,6 @@
"codeName" : "VMGroup3", "codeName" : "VMGroup3",
"name" : "视图消息类型测试", "name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-错误信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -12779,6 +12773,12 @@ ...@@ -12779,6 +12773,12 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg4" "id" : "ViewMsg4"
} }
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup7", "codeName" : "VMGroup7",
...@@ -12806,32 +12806,32 @@ ...@@ -12806,32 +12806,32 @@
"id" : "ViewMsg10" "id" : "ViewMsg10"
} }
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息位置-视图上方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg7"
} }
}, { }, {
"name" : "消息位置-视图上方", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg7" "id" : "ViewMsg9"
} }
} ] } ]
}, { }, {
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区", "name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg12"
} }
}, { }, {
"name" : "关闭模式-默认删除-上方-错误", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg9"
} }
}, { }, {
"name" : "关闭模式-本次删除-上方-警告", "name" : "关闭模式-本次删除-上方-警告",
trainsys-provider/pom.xml
浏览文件 @ 6aaf799d
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 6aaf799d
...@@ -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
浏览文件 @ 6aaf799d
...@@ -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
浏览文件 @ 6aaf799d
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或