Skip to content

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

lxm1993 部署微服务接口 [TrainSys，默认服务接口]

上级 21480d04
隐藏空白字符变更
内嵌 并排
正在显示 包含 388 行增加 和 54 行删除
config.xml
浏览文件 @ 9715dc77
......@@ -55,6 +55,12 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData.json
浏览文件 @ 9715dc77
......@@ -201,6 +201,9 @@
}, {
"name" : "VALUE",
"codeName" : "Value"
}, {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
}, {
"name" : "MAPDATAID",
"codeName" : "MapDataId"
......@@ -963,6 +966,74 @@
"viewLevel" : 0,
"phisicalDEField" : false,
"uIAssistDEField" : true
}, {
"getAllPSDEFDTColumns" : [ {
"columnName" : "PAREACODE",
"dBType" : "MYSQL5",
"name" : "PAREACODE",
"queryCodeExp" : "t1.`PAREACODE`",
"standardColumnName" : "`PAREACODE`"
} ],
"getAllPSDEFSearchModes" : [ {
"codeName" : "N_PAREACODE_EQ",
"name" : "N_PAREACODE_EQ",
"stdDataType" : 9,
"valueOP" : "EQ"
} ],
"getAllPSDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[PAREACODE][父区域编码]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[PAREACODE][父区域编码]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
"codeName" : "MobileDefault",
"name" : "[PAREACODE][父区域编码]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[PAREACODE][父区域编码]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
} ],
"getAllPSDEFValueRules" : [ {
"codeName" : "Default",
"name" : "默认规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组"
},
"ruleInfo" : "默认规则",
"checkDefault" : true,
"defaultMode" : true,
"enableBackend" : true,
"enableFront" : true
} ],
"codeName" : "PAreaCode",
"dEFType" : 1,
"dataType" : "INT",
"importOrder" : 1000,
"logicName" : "父区域编码",
"name" : "PAREACODE",
"getPSDEDBTable" : {
"modelref" : true,
"id" : "Table"
},
"getPSSysDBColumn" : {
"modelref" : true,
"id" : "PAREACODE"
},
"serviceCodeName" : "PAreaCode",
"stdDataType" : 9,
"valueFormat" : "%1$s"
}, {
"getAllPSDEFDTColumns" : [ {
"columnName" : "MAPDATAID",
......@@ -1684,6 +1755,16 @@
"stdDataType" : 25,
"stringLength" : 100,
"type" : "SIMPLE"
}, {
"logicName" : "父区域编码",
"name" : "PAreaCode",
"getPSDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, {
"jsonFormat" : "yyyy-MM-dd HH:mm:ss",
"logicName" : "建立时间",
......@@ -1821,6 +1902,20 @@
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"logicName" : "父区域编码",
"name" : "N_PAREACODE_EQ",
"getPSDEFSearchMode" : {
"modelref" : true,
"id" : "N_PAREACODE_EQ"
},
"getPSDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 9,
"type" : "SIMPLE"
} ],
"sourceType" : "DE",
"type" : "DEFILTER",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Area/PSDEDQCODES/MYSQL5.json
浏览文件 @ 9715dc77
......@@ -30,6 +30,9 @@
}, {
"expression" : "t1.`MAPDATANAME`",
"name" : "MAPDATANAME"
}, {
"expression" : "t1.`PAREACODE`",
"name" : "PAREACODE"
}, {
"expression" : "t1.`TOOLTIP`",
"name" : "TOOLTIP"
......@@ -43,6 +46,6 @@
"expression" : "t1.`VALUE`",
"name" : "VALUE"
} ],
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`PAREACODE`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Area/PSDEDQCODES/MYSQL5.json"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json
浏览文件 @ 9715dc77
......@@ -25,6 +25,9 @@
}, {
"expression" : "t1.`MAPDATANAME`",
"name" : "MAPDATANAME"
}, {
"expression" : "t1.`PAREACODE`",
"name" : "PAREACODE"
}, {
"expression" : "t1.`TOOLTIP`",
"name" : "TOOLTIP"
......@@ -38,6 +41,6 @@
"expression" : "t1.`VALUE`",
"name" : "VALUE"
} ],
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`PAREACODE`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Point/PSDEDQCODES/MYSQL5.json
浏览文件 @ 9715dc77
......@@ -30,6 +30,9 @@
}, {
"expression" : "t1.`MAPDATANAME`",
"name" : "MAPDATANAME"
}, {
"expression" : "t1.`PAREACODE`",
"name" : "PAREACODE"
}, {
"expression" : "t1.`TOOLTIP`",
"name" : "TOOLTIP"
......@@ -43,6 +46,6 @@
"expression" : "t1.`VALUE`",
"name" : "VALUE"
} ],
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`PAREACODE`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Point/PSDEDQCODES/MYSQL5.json"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
浏览文件 @ 9715dc77
......@@ -25,6 +25,9 @@
}, {
"expression" : "t1.`MAPDATANAME`",
"name" : "MAPDATANAME"
}, {
"expression" : "t1.`PAREACODE`",
"name" : "PAREACODE"
}, {
"expression" : "t1.`TOOLTIP`",
"name" : "TOOLTIP"
......@@ -38,6 +41,6 @@
"expression" : "t1.`VALUE`",
"name" : "VALUE"
} ],
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`PAREACODE`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
"id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json
浏览文件 @ 9715dc77
......@@ -610,6 +610,34 @@
"name" : "TOOLTIPHTML",
"stdDataType" : 25,
"stringLength" : 100
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "Default",
"name" : "[PAREACODE][父区域编码]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTBOX",
"name" : "[PAREACODE][父区域编码]",
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
}, {
"codeName" : "MobileDefault",
"name" : "[PAREACODE][父区域编码]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXT",
"name" : "[PAREACODE][父区域编码]移动端默认",
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
} ],
"codeName" : "PAreaCode",
"logicName" : "父区域编码",
"name" : "PAREACODE",
"stdDataType" : 9
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "Default",
......@@ -1054,6 +1082,17 @@
"sourceType" : "DEFIELD",
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "PAreaCode",
"logicName" : "父区域编码",
"name" : "PAreaCode",
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"sourceType" : "DEFIELD",
"stdDataType" : 9,
"type" : "SIMPLE"
}, {
"codeName" : "CreateDate",
"jsonFormat" : "yyyy-MM-dd HH:mm:ss",
......@@ -1177,6 +1216,17 @@
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"type" : "SIMPLE"
}, {
"codeName" : "N_PAREACODE_EQ",
"logicName" : "父区域编码",
"name" : "N_PAREACODE_EQ",
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 9,
"type" : "SIMPLE"
} ],
"sourceType" : "DE",
"type" : "DEFILTER"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSFORMS/Main.json
浏览文件 @ 9715dc77
......@@ -133,6 +133,13 @@
"name" : "LONGITUDE",
"codeName" : "Longitude"
}
}, {
"id" : "pareacode",
"dataType" : 9,
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
}
}, {
"id" : "areacode",
"dataType" : 9,
......@@ -313,6 +320,32 @@
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "父区域编码",
"codeName" : "pareacode",
"dataType" : 9,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "pareacode",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "pareacode"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "区域编码",
"codeName" : "areacode",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSGRIDS/Main.json
浏览文件 @ 9715dc77
......@@ -146,6 +146,23 @@
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "父区域编码",
"codeName" : "pareacode",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "pareacode",
"excelCaption" : "父区域编码",
"name" : "pareacode",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"width" : 100,
"widthUnit" : "PX",
"enableSort" : true
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
......@@ -190,6 +207,13 @@
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"dataType" : 9,
"name" : "pareacode",
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
}
}, {
"dataType" : 25,
"name" : "srfkey",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSMAPS/Map.json
浏览文件 @ 9715dc77
......@@ -10,7 +10,7 @@
},
"getPSSysMapItems" : [ {
"borderWidth" : 0,
"customCond" : "{\"SRFNAVPARAM.n_areacode_eq\": \"%srfareacode%\"}",
"customCond" : "{\"SRFNAVPARAM.n_pareacode_eq\": \"%srfareacode%\"}",
"getIdPSAppDEField" : {
"name" : "MAPDATAID",
"codeName" : "MapDataId"
......@@ -52,7 +52,7 @@
"id" : "point"
}, {
"borderWidth" : 0,
"customCond" : "{\"SRFNAVPARAM.n_areacode_eq\": \"%srfareacode%\"}",
"customCond" : "{\"SRFNAVPARAM.n_pareacode_eq\": \"%srfareacode%\"}",
"getDataPSAppDEField" : {
"name" : "VALUE",
"codeName" : "Value"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataCustomView.json
浏览文件 @ 9715dc77
......@@ -95,7 +95,7 @@
},
"getPSSysMapItems" : [ {
"borderWidth" : 0,
"customCond" : "{\"SRFNAVPARAM.n_areacode_eq\": \"%srfareacode%\"}",
"customCond" : "{\"SRFNAVPARAM.n_pareacode_eq\": \"%srfareacode%\"}",
"getIdPSAppDEField" : {
"name" : "MAPDATAID",
"codeName" : "MapDataId"
......@@ -137,7 +137,7 @@
"id" : "point"
}, {
"borderWidth" : 0,
"customCond" : "{\"SRFNAVPARAM.n_areacode_eq\": \"%srfareacode%\"}",
"customCond" : "{\"SRFNAVPARAM.n_pareacode_eq\": \"%srfareacode%\"}",
"getDataPSAppDEField" : {
"name" : "VALUE",
"codeName" : "Value"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataEditView.json
浏览文件 @ 9715dc77
......@@ -836,6 +836,13 @@
"name" : "LONGITUDE",
"codeName" : "Longitude"
}
}, {
"id" : "pareacode",
"dataType" : 9,
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
}
}, {
"id" : "areacode",
"dataType" : 9,
......@@ -1016,6 +1023,32 @@
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "父区域编码",
"codeName" : "pareacode",
"dataType" : 9,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "pareacode",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"name" : "pareacode"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "区域编码",
"codeName" : "areacode",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataGridView.json
浏览文件 @ 9715dc77
......@@ -344,6 +344,23 @@
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "父区域编码",
"codeName" : "pareacode",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "pareacode",
"excelCaption" : "父区域编码",
"name" : "pareacode",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
},
"width" : 100,
"widthUnit" : "PX",
"enableSort" : true
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
......@@ -388,6 +405,13 @@
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"dataType" : 9,
"name" : "pareacode",
"getPSAppDEField" : {
"name" : "PAREACODE",
"codeName" : "PAreaCode"
}
}, {
"dataType" : 25,
"name" : "srfkey",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 9715dc77
......@@ -11259,44 +11259,57 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-弹出",
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg10"
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-视图上方",
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除-上方-警告",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图下方",
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-错误信息",
......@@ -11306,10 +11319,10 @@
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg8"
}
}, {
"name" : "消息类型-常规信息",
......@@ -11319,61 +11332,48 @@
},
"position" : "POPUP"
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg11"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-无删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-实体数据集",
"name" : "动态模式-静态内容",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg14"
"id" : "ViewMsg15"
}
}, {
"name" : "动态模式-静态内容",
"name" : "动态模式-实体数据集",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg15"
"id" : "ViewMsg14"
}
} ]
} ],
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
浏览文件 @ 9715dc77
......@@ -1697,6 +1697,12 @@
"name" : "MAPDATANAME",
"stdDataType" : 25,
"nullable" : true
}, {
"codeName" : "PAREACODE",
"logicName" : "父区域编码",
"name" : "PAREACODE",
"stdDataType" : 9,
"nullable" : true
}, {
"codeName" : "TOOLTIP",
"length" : 100,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
浏览文件 @ 9715dc77
......@@ -5037,6 +5037,18 @@
"enableModify" : true,
"keyField" : false,
"majorField" : false
}, {
"codeName" : "PAreaCode",
"codeName2" : "PAreaCode",
"logicName" : "父区域编码",
"name" : "PAREACODE",
"orderValue" : 230,
"stdDataType" : 9,
"allowEmpty" : true,
"enableCreate" : true,
"enableModify" : true,
"keyField" : false,
"majorField" : false
}, {
"codeName" : "MapDataId",
"codeName2" : "MapDataId",
......
trainsys-provider/pom.xml
浏览文件 @ 9715dc77
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>runtime</id>
<id>trainsys</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 9715dc77
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 8081
EXPOSE 50000
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 9715dc77
......@@ -22,7 +22,32 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 8081
- containerPort: 50000
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
---
apiVersion: v1
......@@ -35,9 +60,9 @@ spec:
type: NodePort
ports:
- name: http
port: 8081
targetPort: 8081
nodePort: 8081
port: 50000
targetPort: 50000
nodePort: 50000
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 9715dc77
......@@ -3,9 +3,23 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "8081:8081"
- "50000:50000"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或