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

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

上级 2a2e4933
...@@ -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>
......
...@@ -1876,11 +1876,12 @@ ...@@ -1876,11 +1876,12 @@
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -1889,10 +1890,11 @@ ...@@ -1889,10 +1890,11 @@
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
...@@ -1923,7 +1925,7 @@ ...@@ -1923,7 +1925,7 @@
} ], } ],
"codeName" : "Department", "codeName" : "Department",
"dEFType" : 1, "dEFType" : 1,
"dataType" : "TEXT", "dataType" : "SSCODELIST",
"importOrder" : 1000, "importOrder" : 1000,
"length" : 100, "length" : 100,
"logicName" : "单位", "logicName" : "单位",
...@@ -1963,11 +1965,12 @@ ...@@ -1963,11 +1965,12 @@
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -1976,10 +1979,11 @@ ...@@ -1976,10 +1979,11 @@
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
...@@ -2010,7 +2014,7 @@ ...@@ -2010,7 +2014,7 @@
} ], } ],
"codeName" : "Rank", "codeName" : "Rank",
"dEFType" : 1, "dEFType" : 1,
"dataType" : "TEXT", "dataType" : "SSCODELIST",
"importOrder" : 1000, "importOrder" : 1000,
"length" : 100, "length" : 100,
"logicName" : "职级", "logicName" : "职级",
......
...@@ -1020,11 +1020,12 @@ ...@@ -1020,11 +1020,12 @@
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -1033,10 +1034,11 @@ ...@@ -1033,10 +1034,11 @@
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
...@@ -1051,11 +1053,12 @@ ...@@ -1051,11 +1053,12 @@
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -1064,10 +1067,11 @@ ...@@ -1064,10 +1067,11 @@
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
......
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -361,9 +361,13 @@ ...@@ -361,9 +361,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -373,7 +377,7 @@ ...@@ -373,7 +377,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -466,9 +466,13 @@ ...@@ -466,9 +466,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -478,7 +482,7 @@ ...@@ -478,7 +482,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -1020,11 +1020,12 @@ ...@@ -1020,11 +1020,12 @@
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -1033,10 +1034,11 @@ ...@@ -1033,10 +1034,11 @@
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
...@@ -1051,11 +1053,12 @@ ...@@ -1051,11 +1053,12 @@
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -1064,10 +1067,11 @@ ...@@ -1064,10 +1067,11 @@
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
......
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -361,9 +361,13 @@ ...@@ -361,9 +361,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -373,7 +377,7 @@ ...@@ -373,7 +377,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -455,9 +455,13 @@ ...@@ -455,9 +455,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -467,7 +471,7 @@ ...@@ -467,7 +471,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -115,8 +115,13 @@ ...@@ -115,8 +115,13 @@
"dataItemName" : "rank", "dataItemName" : "rank",
"excelCaption" : "职级", "excelCaption" : "职级",
"getFilterPSEditor" : { "getFilterPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "n_rank_eq" "name" : "n_rank_eq",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"name" : "rank", "name" : "rank",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
...@@ -179,8 +184,13 @@ ...@@ -179,8 +184,13 @@
"dataItemName" : "department", "dataItemName" : "department",
"excelCaption" : "单位", "excelCaption" : "单位",
"getFilterPSEditor" : { "getFilterPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "n_department_eq" "name" : "n_department_eq",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/common__UsrCodeList0807000730.json"
},
"singleSelect" : true
}, },
"name" : "department", "name" : "department",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
......
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -466,9 +466,13 @@ ...@@ -466,9 +466,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -478,7 +482,7 @@ ...@@ -478,7 +482,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -1028,7 +1028,7 @@ ...@@ -1028,7 +1028,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -1038,9 +1038,13 @@ ...@@ -1038,9 +1038,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -1050,7 +1054,7 @@ ...@@ -1050,7 +1054,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -1098,7 +1098,7 @@ ...@@ -1098,7 +1098,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -1108,9 +1108,13 @@ ...@@ -1108,9 +1108,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -1120,7 +1124,7 @@ ...@@ -1120,7 +1124,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -526,9 +526,13 @@ ...@@ -526,9 +526,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -538,7 +542,7 @@ ...@@ -538,7 +542,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 3, "ignoreInput" : 0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "rank", "name" : "rank",
...@@ -630,9 +630,13 @@ ...@@ -630,9 +630,13 @@
"codeName" : "Rank" "codeName" : "Rank"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"maxLength" : 100, "name" : "rank",
"name" : "rank" "getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colLG" : 12, "colLG" : 12,
...@@ -642,7 +646,7 @@ ...@@ -642,7 +646,7 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"convertToCodeItemText" : true, "needCodeListConfig" : true,
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "地址", "caption" : "地址",
......
...@@ -432,8 +432,13 @@ ...@@ -432,8 +432,13 @@
"dataItemName" : "rank", "dataItemName" : "rank",
"excelCaption" : "职级", "excelCaption" : "职级",
"getFilterPSEditor" : { "getFilterPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "n_rank_eq" "name" : "n_rank_eq",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__Rank.json"
},
"singleSelect" : true
}, },
"name" : "rank", "name" : "rank",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
...@@ -496,8 +501,13 @@ ...@@ -496,8 +501,13 @@
"dataItemName" : "department", "dataItemName" : "department",
"excelCaption" : "单位", "excelCaption" : "单位",
"getFilterPSEditor" : { "getFilterPSEditor" : {
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "n_department_eq" "name" : "n_department_eq",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/common__UsrCodeList0807000730.json"
},
"singleSelect" : true
}, },
"name" : "department", "name" : "department",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
......
...@@ -140830,11 +140830,12 @@ ...@@ -140830,11 +140830,12 @@
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[DEPARTMENT][单位]移动端默认", "name" : "[DEPARTMENT][单位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -140843,10 +140844,11 @@ ...@@ -140843,10 +140844,11 @@
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[DEPARTMENT][单位]", "name" : "[DEPARTMENT][单位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
...@@ -140861,11 +140863,12 @@ ...@@ -140861,11 +140863,12 @@
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"editorType" : "MOBTEXT", "editorType" : "MOBDROPDOWNLIST",
"name" : "[RANK][职位]移动端默认", "name" : "[RANK][职位]移动端默认",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "MOBILEDEFAULT", "uIMode" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true,
"needCodeListConfig" : true
}, },
"type" : "MOBILEDEFAULT", "type" : "MOBILEDEFAULT",
"mobileMode" : true "mobileMode" : true
...@@ -140874,10 +140877,11 @@ ...@@ -140874,10 +140877,11 @@
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"getPSDEFFormItem" : { "getPSDEFFormItem" : {
"codeName" : "Default", "codeName" : "Default",
"editorType" : "TEXTBOX", "editorType" : "DROPDOWNLIST",
"name" : "[RANK][职位]", "name" : "[RANK][职位]",
"stringLength" : 100, "stringLength" : 100,
"uIMode" : "DEFAULT" "uIMode" : "DEFAULT",
"needCodeListConfig" : true
}, },
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
...@@ -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
...@@ -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
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册