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

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

上级 323f98cf
...@@ -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>
......
...@@ -2819,6 +2819,23 @@ ...@@ -2819,6 +2819,23 @@
"queryCodeExp" : "t1.`DATE`", "queryCodeExp" : "t1.`DATE`",
"standardColumnName" : "`DATE`" "standardColumnName" : "`DATE`"
} ], } ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_DATE_GTANDEQ",
"name" : "N_DATE_GTANDEQ",
"stdDataType" : 5,
"valueOP" : "GTANDEQ"
}, {
"codeName" : "N_DATE_IN",
"name" : "N_DATE_IN",
"stdDataType" : 5,
"valueOP" : "IN",
"array" : true
}, {
"codeName" : "N_DATE_LTANDEQ",
"name" : "N_DATE_LTANDEQ",
"stdDataType" : 5,
"valueOP" : "LTANDEQ"
} ],
"getAllPSDEFUIModes" : [ { "getAllPSDEFUIModes" : [ {
"codeName" : "Default", "codeName" : "Default",
"name" : "[DATE][日期]", "name" : "[DATE][日期]",
...@@ -2893,23 +2910,6 @@ ...@@ -2893,23 +2910,6 @@
"queryCodeExp" : "t1.`TIME`", "queryCodeExp" : "t1.`TIME`",
"standardColumnName" : "`TIME`" "standardColumnName" : "`TIME`"
} ], } ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_TIME_GTANDEQ",
"name" : "N_TIME_GTANDEQ",
"stdDataType" : 5,
"valueOP" : "GTANDEQ"
}, {
"codeName" : "N_TIME_IN",
"name" : "N_TIME_IN",
"stdDataType" : 5,
"valueOP" : "IN",
"array" : true
}, {
"codeName" : "N_TIME_LTANDEQ",
"name" : "N_TIME_LTANDEQ",
"stdDataType" : 5,
"valueOP" : "LTANDEQ"
} ],
"getAllPSDEFUIModes" : [ { "getAllPSDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
"name" : "[TIME][时间]移动端默认", "name" : "[TIME][时间]移动端默认",
...@@ -6408,76 +6408,76 @@ ...@@ -6408,76 +6408,76 @@
"stdDataType" : 25, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"logicName" : "测试实体标识", "jsonFormat" : "yyyy-MM-dd",
"name" : "N_TESTID_EQ", "logicName" : "日期",
"name" : "N_DATE_GTANDEQ",
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"modelref" : true, "modelref" : true,
"id" : "N_TESTID_EQ" "id" : "N_DATE_GTANDEQ"
}, },
"getPSDEField" : { "getPSDEField" : {
"name" : "TESTID", "name" : "DATE",
"codeName" : "TESTId" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"logicName" : "测试实体名称", "logicName" : "日期",
"name" : "N_TESTNAME_LIKE", "name" : "N_DATE_IN",
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"modelref" : true, "modelref" : true,
"id" : "N_TESTNAME_LIKE" "id" : "N_DATE_IN"
}, },
"getPSDEField" : { "getPSDEField" : {
"name" : "TESTNAME", "name" : "DATE",
"codeName" : "TESTName" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLES"
}, { }, {
"jsonFormat" : "HH:mm:ss", "jsonFormat" : "yyyy-MM-dd",
"logicName" : "时间", "logicName" : "日期",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"modelref" : true, "modelref" : true,
"id" : "N_TIME_GTANDEQ" "id" : "N_DATE_LTANDEQ"
}, },
"getPSDEField" : { "getPSDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"logicName" : "时间", "logicName" : "测试实体标识",
"name" : "N_TIME_IN", "name" : "N_TESTID_EQ",
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"modelref" : true, "modelref" : true,
"id" : "N_TIME_IN" "id" : "N_TESTID_EQ"
}, },
"getPSDEField" : { "getPSDEField" : {
"name" : "TIME", "name" : "TESTID",
"codeName" : "Time" "codeName" : "TESTId"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLES" "type" : "SIMPLE"
}, { }, {
"jsonFormat" : "HH:mm:ss", "logicName" : "测试实体名称",
"logicName" : "时间", "name" : "N_TESTNAME_LIKE",
"name" : "N_TIME_LTANDEQ",
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"modelref" : true, "modelref" : true,
"id" : "N_TIME_LTANDEQ" "id" : "N_TESTNAME_LIKE"
}, },
"getPSDEField" : { "getPSDEField" : {
"name" : "TIME", "name" : "TESTNAME",
"codeName" : "Time" "codeName" : "TESTName"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"logicName" : "类型", "logicName" : "类型",
......
...@@ -4245,61 +4245,61 @@ ...@@ -4245,61 +4245,61 @@
"stdDataType" : 25, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTID_EQ", "codeName" : "N_DATE_GTANDEQ",
"logicName" : "测试实体标识", "jsonFormat" : "yyyy-MM-dd",
"name" : "N_TESTID_EQ", "logicName" : "日期",
"name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTID", "name" : "DATE",
"codeName" : "TESTId" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTNAME_LIKE", "codeName" : "N_DATE_IN",
"logicName" : "测试实体名称", "logicName" : "日期",
"name" : "N_TESTNAME_LIKE", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTNAME", "name" : "DATE",
"codeName" : "TESTName" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLES"
}, { }, {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"jsonFormat" : "HH:mm:ss", "jsonFormat" : "yyyy-MM-dd",
"logicName" : "时间", "logicName" : "日期",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_IN", "codeName" : "N_TESTID_EQ",
"logicName" : "时间", "logicName" : "测试实体标识",
"name" : "N_TIME_IN", "name" : "N_TESTID_EQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTID",
"codeName" : "Time" "codeName" : "TESTId"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLES" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_TESTNAME_LIKE",
"jsonFormat" : "HH:mm:ss", "logicName" : "测试实体名称",
"logicName" : "时间", "name" : "N_TESTNAME_LIKE",
"name" : "N_TIME_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTNAME",
"codeName" : "Time" "codeName" : "TESTName"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TYPE_EQ", "codeName" : "N_TYPE_EQ",
......
...@@ -4245,61 +4245,61 @@ ...@@ -4245,61 +4245,61 @@
"stdDataType" : 25, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTID_EQ", "codeName" : "N_DATE_GTANDEQ",
"logicName" : "测试实体标识", "jsonFormat" : "yyyy-MM-dd",
"name" : "N_TESTID_EQ", "logicName" : "日期",
"name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTID", "name" : "DATE",
"codeName" : "TESTId" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTNAME_LIKE", "codeName" : "N_DATE_IN",
"logicName" : "测试实体名称", "logicName" : "日期",
"name" : "N_TESTNAME_LIKE", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTNAME", "name" : "DATE",
"codeName" : "TESTName" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLES"
}, { }, {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"jsonFormat" : "HH:mm:ss", "jsonFormat" : "yyyy-MM-dd",
"logicName" : "时间", "logicName" : "日期",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_IN", "codeName" : "N_TESTID_EQ",
"logicName" : "时间", "logicName" : "测试实体标识",
"name" : "N_TIME_IN", "name" : "N_TESTID_EQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTID",
"codeName" : "Time" "codeName" : "TESTId"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLES" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_TESTNAME_LIKE",
"jsonFormat" : "HH:mm:ss", "logicName" : "测试实体名称",
"logicName" : "时间", "name" : "N_TESTNAME_LIKE",
"name" : "N_TIME_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTNAME",
"codeName" : "Time" "codeName" : "TESTName"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TYPE_EQ", "codeName" : "N_TYPE_EQ",
......
...@@ -1075,11 +1075,11 @@ ...@@ -1075,11 +1075,11 @@
"codeName" : "TESTName" "codeName" : "TESTName"
} }
}, { }, {
"id" : "time", "id" : "date",
"dataType" : 5, "dataType" : 5,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"id" : "testid", "id" : "testid",
...@@ -1141,38 +1141,38 @@ ...@@ -1141,38 +1141,38 @@
"showCaption" : true "showCaption" : true
}, { }, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "时间", "caption" : "日期",
"codeName" : "time", "codeName" : "date",
"dataType" : 5, "dataType" : 5,
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"itemWidth" : 220.0, "itemWidth" : 230.0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSEditor" : { "getPSEditor" : {
"dateTimeFormat" : "HH:mm:ss", "dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : { "editorParams" : {
"TIMEFMT" : "HH:mm:ss" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATEPICKEREX_NODAY", "editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 90.0, "editorWidth" : 100.0,
"name" : "time" "name" : "date"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
} ], } ],
......
...@@ -4245,61 +4245,61 @@ ...@@ -4245,61 +4245,61 @@
"stdDataType" : 25, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTID_EQ", "codeName" : "N_DATE_GTANDEQ",
"logicName" : "测试实体标识", "jsonFormat" : "yyyy-MM-dd",
"name" : "N_TESTID_EQ", "logicName" : "日期",
"name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTID", "name" : "DATE",
"codeName" : "TESTId" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTNAME_LIKE", "codeName" : "N_DATE_IN",
"logicName" : "测试实体名称", "logicName" : "日期",
"name" : "N_TESTNAME_LIKE", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTNAME", "name" : "DATE",
"codeName" : "TESTName" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLES"
}, { }, {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"jsonFormat" : "HH:mm:ss", "jsonFormat" : "yyyy-MM-dd",
"logicName" : "时间", "logicName" : "日期",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_IN", "codeName" : "N_TESTID_EQ",
"logicName" : "时间", "logicName" : "测试实体标识",
"name" : "N_TIME_IN", "name" : "N_TESTID_EQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTID",
"codeName" : "Time" "codeName" : "TESTId"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLES" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_TESTNAME_LIKE",
"jsonFormat" : "HH:mm:ss", "logicName" : "测试实体名称",
"logicName" : "时间", "name" : "N_TESTNAME_LIKE",
"name" : "N_TIME_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTNAME",
"codeName" : "Time" "codeName" : "TESTName"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TYPE_EQ", "codeName" : "N_TYPE_EQ",
......
...@@ -120,11 +120,11 @@ ...@@ -120,11 +120,11 @@
"codeName" : "TESTName" "codeName" : "TESTName"
} }
}, { }, {
"id" : "time", "id" : "date",
"dataType" : 5, "dataType" : 5,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"id" : "testid", "id" : "testid",
...@@ -186,38 +186,38 @@ ...@@ -186,38 +186,38 @@
"showCaption" : true "showCaption" : true
}, { }, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "时间", "caption" : "日期",
"codeName" : "time", "codeName" : "date",
"dataType" : 5, "dataType" : 5,
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"itemWidth" : 220.0, "itemWidth" : 230.0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSEditor" : { "getPSEditor" : {
"dateTimeFormat" : "HH:mm:ss", "dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : { "editorParams" : {
"TIMEFMT" : "HH:mm:ss" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATEPICKEREX_NODAY", "editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 90.0, "editorWidth" : 100.0,
"name" : "time" "name" : "date"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
} ], } ],
......
...@@ -1293,41 +1293,20 @@ ...@@ -1293,41 +1293,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "更新时间", "caption" : "日期",
"codeName" : "updatedate", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "date",
"excelCaption" : "更新时间", "excelCaption" : "日期",
"name" : "updatedate", "name" : "date",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
},
"caption" : "时间",
"codeName" : "time",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time",
"excelCaption" : "时间",
"name" : "time",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -1347,20 +1326,12 @@ ...@@ -1347,20 +1326,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
......
...@@ -77,41 +77,20 @@ ...@@ -77,41 +77,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "更新时间", "caption" : "日期",
"codeName" : "updatedate", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "date",
"excelCaption" : "更新时间", "excelCaption" : "日期",
"name" : "updatedate", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "DATE",
"codeName" : "UpdateDate" "codeName" : "Date"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
},
"caption" : "时间",
"codeName" : "time",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time",
"excelCaption" : "时间",
"name" : "time",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TIME",
"codeName" : "Time"
},
"valueFormat" : "HH:mm:ss",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -131,20 +110,12 @@ ...@@ -131,20 +110,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
......
...@@ -205,44 +205,19 @@ ...@@ -205,44 +205,19 @@
"hidden" : false, "hidden" : false,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "联系人", "caption" : "日期(In)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"itemWidth" : 100.0,
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "item11", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "DATE", "name" : "DATE",
"codeName" : "Date" "codeName" : "Date"
}, },
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"name" : "item11"
},
"allowEmpty" : true,
"emptyCaption" : false,
"hidden" : false,
"showCaption" : false
}, {
"caption" : "时间(In)",
"dataType" : 5,
"itemType" : "FILTER",
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "N_TIME_IN",
"getPSAppDEField" : {
"name" : "TIME",
"codeName" : "Time"
},
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_IN", "codeName" : "N_DATE_IN",
"name" : "N_TIME_IN", "name" : "N_DATE_IN",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "IN", "valueOP" : "IN",
"array" : true "array" : true
...@@ -253,63 +228,63 @@ ...@@ -253,63 +228,63 @@
"TIMEFMT" : "YYYY-MM-DD" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATERANGE_NOTIME", "editorType" : "DATERANGE_NOTIME",
"name" : "N_TIME_IN", "name" : "N_DATE_IN",
"getPSEditorItems" : [ { "getPSEditorItems" : [ {
"name" : "N_TIME_GTANDEQ" "name" : "N_DATE_GTANDEQ"
}, { }, {
"name" : "N_TIME_LTANDEQ" "name" : "N_DATE_LTANDEQ"
} ] } ]
}, },
"valueItemName" : "N_TIME_GTANDEQ;N_TIME_LTANDEQ", "valueItemName" : "N_DATE_GTANDEQ;N_DATE_LTANDEQ",
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
"hidden" : false, "hidden" : false,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "时间(<=)", "caption" : "日期(>=)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "N_TIME_LTANDEQ", "name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_DATE_GTANDEQ",
"name" : "N_TIME_LTANDEQ", "name" : "N_DATE_GTANDEQ",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "LTANDEQ" "valueOP" : "GTANDEQ"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "HIDDEN", "editorType" : "HIDDEN",
"name" : "N_TIME_LTANDEQ" "name" : "N_DATE_GTANDEQ"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
"hidden" : true, "hidden" : true,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "时间(>=)", "caption" : "日期(<=)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "GTANDEQ" "valueOP" : "LTANDEQ"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "HIDDEN", "editorType" : "HIDDEN",
"name" : "N_TIME_GTANDEQ" "name" : "N_DATE_LTANDEQ"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
......
...@@ -1196,11 +1196,11 @@ ...@@ -1196,11 +1196,11 @@
"codeName" : "TESTName" "codeName" : "TESTName"
} }
}, { }, {
"id" : "time", "id" : "date",
"dataType" : 5, "dataType" : 5,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"id" : "testid", "id" : "testid",
...@@ -1262,38 +1262,38 @@ ...@@ -1262,38 +1262,38 @@
"showCaption" : true "showCaption" : true
}, { }, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "时间", "caption" : "日期",
"codeName" : "time", "codeName" : "date",
"dataType" : 5, "dataType" : 5,
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"itemWidth" : 220.0, "itemWidth" : 230.0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSEditor" : { "getPSEditor" : {
"dateTimeFormat" : "HH:mm:ss", "dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : { "editorParams" : {
"TIMEFMT" : "HH:mm:ss" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATEPICKEREX_NODAY", "editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 90.0, "editorWidth" : 100.0,
"name" : "time" "name" : "date"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
} ], } ],
......
...@@ -509,44 +509,19 @@ ...@@ -509,44 +509,19 @@
"hidden" : false, "hidden" : false,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "联系人", "caption" : "日期(In)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"itemWidth" : 100.0,
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "item11", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "DATE", "name" : "DATE",
"codeName" : "Date" "codeName" : "Date"
}, },
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"name" : "item11"
},
"allowEmpty" : true,
"emptyCaption" : false,
"hidden" : false,
"showCaption" : false
}, {
"caption" : "时间(In)",
"dataType" : 5,
"itemType" : "FILTER",
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "N_TIME_IN",
"getPSAppDEField" : {
"name" : "TIME",
"codeName" : "Time"
},
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_IN", "codeName" : "N_DATE_IN",
"name" : "N_TIME_IN", "name" : "N_DATE_IN",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "IN", "valueOP" : "IN",
"array" : true "array" : true
...@@ -557,63 +532,63 @@ ...@@ -557,63 +532,63 @@
"TIMEFMT" : "YYYY-MM-DD" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATERANGE_NOTIME", "editorType" : "DATERANGE_NOTIME",
"name" : "N_TIME_IN", "name" : "N_DATE_IN",
"getPSEditorItems" : [ { "getPSEditorItems" : [ {
"name" : "N_TIME_GTANDEQ" "name" : "N_DATE_GTANDEQ"
}, { }, {
"name" : "N_TIME_LTANDEQ" "name" : "N_DATE_LTANDEQ"
} ] } ]
}, },
"valueItemName" : "N_TIME_GTANDEQ;N_TIME_LTANDEQ", "valueItemName" : "N_DATE_GTANDEQ;N_DATE_LTANDEQ",
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
"hidden" : false, "hidden" : false,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "时间(<=)", "caption" : "日期(>=)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "N_TIME_LTANDEQ", "name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_DATE_GTANDEQ",
"name" : "N_TIME_LTANDEQ", "name" : "N_DATE_GTANDEQ",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "LTANDEQ" "valueOP" : "GTANDEQ"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "HIDDEN", "editorType" : "HIDDEN",
"name" : "N_TIME_LTANDEQ" "name" : "N_DATE_GTANDEQ"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
"hidden" : true, "hidden" : true,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "时间(>=)", "caption" : "日期(<=)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "GTANDEQ" "valueOP" : "LTANDEQ"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "HIDDEN", "editorType" : "HIDDEN",
"name" : "N_TIME_GTANDEQ" "name" : "N_DATE_LTANDEQ"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
...@@ -1213,41 +1188,20 @@ ...@@ -1213,41 +1188,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
},
"caption" : "更新时间",
"codeName" : "updatedate",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate",
"excelCaption" : "更新时间",
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
}, },
"caption" : "时间", "caption" : "日期",
"codeName" : "time", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time", "dataItemName" : "date",
"excelCaption" : "时间", "excelCaption" : "日期",
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -1267,20 +1221,12 @@ ...@@ -1267,20 +1221,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
......
...@@ -466,41 +466,20 @@ ...@@ -466,41 +466,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "更新时间", "caption" : "日期",
"codeName" : "updatedate", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "date",
"excelCaption" : "更新时间", "excelCaption" : "日期",
"name" : "updatedate", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "DATE",
"codeName" : "UpdateDate" "codeName" : "Date"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
},
"caption" : "时间",
"codeName" : "time",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time",
"excelCaption" : "时间",
"name" : "time",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TIME",
"codeName" : "Time"
},
"valueFormat" : "HH:mm:ss",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -520,20 +499,12 @@ ...@@ -520,20 +499,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
......
...@@ -748,11 +748,11 @@ ...@@ -748,11 +748,11 @@
"codeName" : "TESTName" "codeName" : "TESTName"
} }
}, { }, {
"id" : "time", "id" : "date",
"dataType" : 5, "dataType" : 5,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"id" : "testid", "id" : "testid",
...@@ -814,38 +814,38 @@ ...@@ -814,38 +814,38 @@
"showCaption" : true "showCaption" : true
}, { }, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "时间", "caption" : "日期",
"codeName" : "time", "codeName" : "date",
"dataType" : 5, "dataType" : 5,
"detailStyle" : "DEFAULT", "detailStyle" : "DEFAULT",
"detailType" : "FORMITEM", "detailType" : "FORMITEM",
"enableCond" : 3, "enableCond" : 3,
"ignoreInput" : 0, "ignoreInput" : 0,
"itemWidth" : 220.0, "itemWidth" : 230.0,
"labelPos" : "LEFT", "labelPos" : "LEFT",
"labelWidth" : 130, "labelWidth" : 130,
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSEditor" : { "getPSEditor" : {
"dateTimeFormat" : "HH:mm:ss", "dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : { "editorParams" : {
"TIMEFMT" : "HH:mm:ss" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATEPICKEREX_NODAY", "editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 90.0, "editorWidth" : 100.0,
"name" : "time" "name" : "date"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"allowEmpty" : true, "allowEmpty" : true,
"showCaption" : true "showCaption" : true
} ], } ],
......
...@@ -458,41 +458,20 @@ ...@@ -458,41 +458,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "更新时间", "caption" : "日期",
"codeName" : "updatedate", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "date",
"excelCaption" : "更新时间", "excelCaption" : "日期",
"name" : "updatedate", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "DATE",
"codeName" : "UpdateDate" "codeName" : "Date"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
},
"caption" : "时间",
"codeName" : "time",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time",
"excelCaption" : "时间",
"name" : "time",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TIME",
"codeName" : "Time"
},
"valueFormat" : "HH:mm:ss",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -512,20 +491,12 @@ ...@@ -512,20 +491,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
......
...@@ -1414,41 +1414,20 @@ ...@@ -1414,41 +1414,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
}, },
"caption" : "更新时间", "caption" : "日期",
"codeName" : "updatedate", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "date",
"excelCaption" : "更新时间", "excelCaption" : "日期",
"name" : "updatedate", "name" : "date",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
},
"caption" : "时间",
"codeName" : "time",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time",
"excelCaption" : "时间",
"name" : "time",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -1468,20 +1447,12 @@ ...@@ -1468,20 +1447,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
......
...@@ -65136,44 +65136,19 @@ ...@@ -65136,44 +65136,19 @@
"hidden" : false, "hidden" : false,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "联系人", "caption" : "日期(In)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"itemWidth" : 100.0,
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "item11", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "DATE", "name" : "DATE",
"codeName" : "Date" "codeName" : "Date"
}, },
"getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD",
"editorParams" : {
"TIMEFMT" : "YYYY-MM-DD"
},
"editorType" : "DATEPICKEREX_NOTIME",
"editorWidth" : 100.0,
"name" : "item11"
},
"allowEmpty" : true,
"emptyCaption" : false,
"hidden" : false,
"showCaption" : false
}, {
"caption" : "时间(In)",
"dataType" : 5,
"itemType" : "FILTER",
"labelPos" : "NONE",
"labelWidth" : 0,
"name" : "N_TIME_IN",
"getPSAppDEField" : {
"name" : "TIME",
"codeName" : "Time"
},
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_IN", "codeName" : "N_DATE_IN",
"name" : "N_TIME_IN", "name" : "N_DATE_IN",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "IN", "valueOP" : "IN",
"array" : true "array" : true
...@@ -65184,63 +65159,63 @@ ...@@ -65184,63 +65159,63 @@
"TIMEFMT" : "YYYY-MM-DD" "TIMEFMT" : "YYYY-MM-DD"
}, },
"editorType" : "DATERANGE_NOTIME", "editorType" : "DATERANGE_NOTIME",
"name" : "N_TIME_IN", "name" : "N_DATE_IN",
"getPSEditorItems" : [ { "getPSEditorItems" : [ {
"name" : "N_TIME_GTANDEQ" "name" : "N_DATE_GTANDEQ"
}, { }, {
"name" : "N_TIME_LTANDEQ" "name" : "N_DATE_LTANDEQ"
} ] } ]
}, },
"valueItemName" : "N_TIME_GTANDEQ;N_TIME_LTANDEQ", "valueItemName" : "N_DATE_GTANDEQ;N_DATE_LTANDEQ",
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
"hidden" : false, "hidden" : false,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "时间(<=)", "caption" : "日期(>=)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "N_TIME_LTANDEQ", "name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_DATE_GTANDEQ",
"name" : "N_TIME_LTANDEQ", "name" : "N_DATE_GTANDEQ",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "LTANDEQ" "valueOP" : "GTANDEQ"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "HIDDEN", "editorType" : "HIDDEN",
"name" : "N_TIME_LTANDEQ" "name" : "N_DATE_GTANDEQ"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
"hidden" : true, "hidden" : true,
"showCaption" : false "showCaption" : false
}, { }, {
"caption" : "时间(>=)", "caption" : "日期(<=)",
"dataType" : 5, "dataType" : 5,
"itemType" : "FILTER", "itemType" : "FILTER",
"labelPos" : "NONE", "labelPos" : "NONE",
"labelWidth" : 0, "labelWidth" : 0,
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"getPSDEFSearchMode" : { "getPSDEFSearchMode" : {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"stdDataType" : 5, "stdDataType" : 5,
"valueOP" : "GTANDEQ" "valueOP" : "LTANDEQ"
}, },
"getPSEditor" : { "getPSEditor" : {
"editorType" : "HIDDEN", "editorType" : "HIDDEN",
"name" : "N_TIME_GTANDEQ" "name" : "N_DATE_LTANDEQ"
}, },
"allowEmpty" : true, "allowEmpty" : true,
"emptyCaption" : false, "emptyCaption" : false,
...@@ -65840,41 +65815,20 @@ ...@@ -65840,41 +65815,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
},
"caption" : "更新时间",
"codeName" : "updatedate",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate",
"excelCaption" : "更新时间",
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
}, },
"caption" : "时间", "caption" : "日期",
"codeName" : "time", "codeName" : "date",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time", "dataItemName" : "date",
"excelCaption" : "时间", "excelCaption" : "日期",
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -65894,20 +65848,12 @@ ...@@ -65894,20 +65848,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
...@@ -68059,41 +68005,20 @@ ...@@ -68059,41 +68005,20 @@
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE" "lanResTag" : "DEF.LNAME.DATE"
},
"caption" : "更新时间",
"codeName" : "updatedate",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate",
"excelCaption" : "更新时间",
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss", "caption" : "日期",
"width" : 150, "codeName" : "date",
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.TIME"
},
"caption" : "时间",
"codeName" : "time",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "time", "dataItemName" : "date",
"excelCaption" : "时间", "excelCaption" : "日期",
"name" : "time", "name" : "date",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"valueFormat" : "HH:mm:ss", "valueFormat" : "YYYY-MM-DD",
"width" : 100, "width" : 100,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableSort" : true "enableSort" : true
...@@ -68113,20 +68038,12 @@ ...@@ -68113,20 +68038,12 @@
"codeName" : "UpdateMan" "codeName" : "UpdateMan"
} }
}, { }, {
"format" : "YYYY-MM-DD HH:mm:ss", "format" : "YYYY-MM-DD",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"format" : "HH:mm:ss",
"dataType" : 5, "dataType" : 5,
"name" : "time", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
...@@ -98522,61 +98439,61 @@ ...@@ -98522,61 +98439,61 @@
"stdDataType" : 25, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTID_EQ", "codeName" : "N_DATE_GTANDEQ",
"logicName" : "测试实体标识", "jsonFormat" : "yyyy-MM-dd",
"name" : "N_TESTID_EQ", "logicName" : "日期",
"name" : "N_DATE_GTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTID", "name" : "DATE",
"codeName" : "TESTId" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TESTNAME_LIKE", "codeName" : "N_DATE_IN",
"logicName" : "测试实体名称", "logicName" : "日期",
"name" : "N_TESTNAME_LIKE", "name" : "N_DATE_IN",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TESTNAME", "name" : "DATE",
"codeName" : "TESTName" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLES"
}, { }, {
"codeName" : "N_TIME_GTANDEQ", "codeName" : "N_DATE_LTANDEQ",
"jsonFormat" : "HH:mm:ss", "jsonFormat" : "yyyy-MM-dd",
"logicName" : "时间", "logicName" : "日期",
"name" : "N_TIME_GTANDEQ", "name" : "N_DATE_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "DATE",
"codeName" : "Time" "codeName" : "Date"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 5,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_IN", "codeName" : "N_TESTID_EQ",
"logicName" : "时间", "logicName" : "测试实体标识",
"name" : "N_TIME_IN", "name" : "N_TESTID_EQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTID",
"codeName" : "Time" "codeName" : "TESTId"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLES" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TIME_LTANDEQ", "codeName" : "N_TESTNAME_LIKE",
"jsonFormat" : "HH:mm:ss", "logicName" : "测试实体名称",
"logicName" : "时间", "name" : "N_TESTNAME_LIKE",
"name" : "N_TIME_LTANDEQ",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "TIME", "name" : "TESTNAME",
"codeName" : "Time" "codeName" : "TESTName"
}, },
"sourceType" : "DEFSEARCHMODE", "sourceType" : "DEFSEARCHMODE",
"stdDataType" : 5, "stdDataType" : 25,
"type" : "SIMPLE" "type" : "SIMPLE"
}, { }, {
"codeName" : "N_TYPE_EQ", "codeName" : "N_TYPE_EQ",
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册