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

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

上级 aecc710d
...@@ -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>
......
...@@ -966,6 +966,9 @@ ...@@ -966,6 +966,9 @@
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05202892IndexView_DR.json" "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05202892IndexView_DR.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05221370EditView2_DR.json"
} ], } ],
"getAllPSDEDataSets" : [ { "getAllPSDEDataSets" : [ {
"codeName" : "CodeListSet", "codeName" : "CodeListSet",
...@@ -7026,6 +7029,12 @@ ...@@ -7026,6 +7029,12 @@
"name" : "布局闪烁确认-分页导航1", "name" : "布局闪烁确认-分页导航1",
"realModelSubType" : "DETABEXPVIEW", "realModelSubType" : "DETABEXPVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr05221370EditView2",
"logicName" : " 计数器实体编辑视图(左右关系)",
"name" : " 计数器实体编辑视图(左右关系)",
"realModelSubType" : "DEEDITVIEW2",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "backUIActionTest", "codeName" : "backUIActionTest",
"logicName" : "后台调用测试", "logicName" : "后台调用测试",
...@@ -7595,6 +7604,13 @@ ...@@ -7595,6 +7604,13 @@
"name" : "代码表选择类编辑器测试_表单", "name" : "代码表选择类编辑器测试_表单",
"realModelSubType" : "EDITFORM", "realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM" "realModelType" : "PSDEFORM"
}, {
"codeName" : "Usr05221370EditView2_Form",
"logicName" : " 计数器实体编辑视图(左右关系)_表单",
"modelTag2" : "0",
"name" : " 计数器实体编辑视图(左右关系)_表单",
"realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM"
}, { }, {
"codeName" : "IndexMain", "codeName" : "IndexMain",
"logicName" : "实体首页主表单", "logicName" : "实体首页主表单",
......
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
"name" : "edit2测试锚点_关系界面组", "name" : "edit2测试锚点_关系界面组",
"getPSDEDRDetails" : [ { "getPSDEDRDetails" : [ {
"caption" : "表格测试修改1", "caption" : "表格测试修改1",
"counterId" : "num1",
"detailType" : "DRITEM", "detailType" : "DRITEM",
"enableMode" : "COUNT_GT_ZERO",
"name" : "test4", "name" : "test4",
"orderValue" : 100, "orderValue" : 100,
"getPSDEDRItem" : { "getPSDEDRItem" : {
......
{
"codeName" : "Usr05221370EditView2_DR",
"dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05221370EditView2_DR.json",
"formCaption" : "测试实体",
"name" : " 计数器实体编辑视图(左右关系)_关系界面组",
"getPSDEDRDetails" : [ {
"caption" : "cc",
"counterId" : "num1",
"detailType" : "DRITEM",
"enableMode" : "COUNT_GT_ZERO",
"name" : "cc",
"orderValue" : 100,
"originCaption" : "cc",
"getPSDEDRItem" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0402822494.json"
}
} ]
}
\ No newline at end of file
{ {
"codeName" : "UsrDRItem0402822494", "codeName" : "UsrDRItem0402822494",
"counterId" : "num1",
"counterMode" : 1,
"dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0402822494.json", "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0402822494.json",
"enableMode" : "COUNT_GT_ZERO",
"itemType" : "CUSTOM", "itemType" : "CUSTOM",
"name" : "表格测试修改1", "name" : "表格测试修改1",
"parentDataJO" : { "parentDataJO" : {
......
...@@ -9380,6 +9380,10 @@ ...@@ -9380,6 +9380,10 @@
"ungroup" : true "ungroup" : true
} ], } ],
"getAllPSAppViews" : [ { "getAllPSAppViews" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
"viewType" : "DEEDITVIEW2"
}, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
"viewType" : "DEEDITVIEW2" "viewType" : "DEEDITVIEW2"
......
{
"codeName" : "Usr05221370EditView2_Form",
"controlType" : "FORM",
"getCreatePSControlAction" : {
"modelref" : true,
"id" : "create",
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Usr05221370EditView2_Form.json",
"getGetDraftFromPSControlAction" : {
"modelref" : true,
"id" : "loaddraftfrom",
"actionName" : "GETDRAFTFROM",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraftfrom",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"getGetDraftPSControlAction" : {
"modelref" : true,
"id" : "loaddraft",
"actionName" : "GetDraft",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraft",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"getGetPSControlAction" : {
"modelref" : true,
"id" : "load",
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"logicName" : " 计数器实体编辑视图(左右关系)_表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSDEFormItems" : [ {
"id" : "srfupdatedate",
"hidden" : true,
"dataType" : 5,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"id" : "srforikey",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfkey",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
}, {
"id" : "srfmajortext",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"id" : "srftempmode",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfuf",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfdeid",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfsourcekey",
"hidden" : true,
"dataType" : 25
}, {
"id" : "testname",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"id" : "createman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
}
}, {
"id" : "createdate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
}
}, {
"id" : "updateman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"id" : "updatedate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"id" : "testid",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "基本信息",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"caption" : "测试实体基本信息",
"codeName" : "group1",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group1",
"getPSDEFormDetails" : [ {
"caption" : "测试实体名称",
"codeName" : "testname",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "testname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 50,
"minLength" : 3,
"name" : "testname"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
}, {
"caption" : "测试实体标识",
"codeName" : "testid",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "testid",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "testid"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
}, {
"caption" : "其它",
"codeName" : "formpage2",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage2",
"getPSDEFormDetails" : [ {
"caption" : "操作信息",
"codeName" : "group2",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group2",
"getPSDEFormDetails" : [ {
"caption" : "建立人",
"codeName" : "createman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "建立时间",
"codeName" : "createdate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createdate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createdate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updateman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updateman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updatedate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getRemovePSControlAction" : {
"modelref" : true,
"id" : "remove",
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"tabHeaderPos" : "TOP",
"getUpdatePSControlAction" : {
"modelref" : true,
"id" : "update",
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"noTabHeader" : false,
"modelid" : "CD042D21-47A9-40E1-A892-D6D0B4232097",
"modeltype" : "PSDEFORM_EDITFORM"
}
\ No newline at end of file
...@@ -542,6 +542,8 @@ ...@@ -542,6 +542,8 @@
} ], } ],
"getPSDEDRCtrlItems" : [ { "getPSDEDRCtrlItems" : [ {
"caption" : "表格测试修改1", "caption" : "表格测试修改1",
"counterId" : "num1",
"enableMode" : "COUNT_GT_ZERO",
"name" : "test4", "name" : "test4",
"getPSAppView" : { "getPSAppView" : {
"modelref" : true, "modelref" : true,
......
{
"accUserMode" : 2,
"caption" : " 计数器实体编辑视图(左右关系)",
"codeName" : "TESTUsr05221370EditView2",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
"name" : "TESTUsr05221370EditView2",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSAppModule" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "EditView2",
"name" : "engine"
} ],
"getPSControls" : [ {
"codeName" : "Usr05221370EditView2toolbar",
"controlType" : "TOOLBAR",
"logicName" : " 计数器实体编辑视图(左右关系)_工具栏",
"name" : "toolbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : {
"id" : "TOOLBAR"
},
"xDataControlName" : "form",
"modelid" : "EC25E8B2-BD1A-4885-89A7-A5CF3129013E",
"modeltype" : "PSDETOOLBAR"
}, {
"codeName" : "Usr05221370EditView2_Form",
"controlType" : "FORM",
"getCreatePSControlAction" : {
"modelref" : true,
"id" : "create",
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Usr05221370EditView2_Form.json",
"getGetDraftFromPSControlAction" : {
"modelref" : true,
"id" : "loaddraftfrom",
"actionName" : "GETDRAFTFROM",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraftfrom",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"getGetDraftPSControlAction" : {
"modelref" : true,
"id" : "loaddraft",
"actionName" : "GetDraft",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraft",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"getGetPSControlAction" : {
"modelref" : true,
"id" : "load",
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"logicName" : " 计数器实体编辑视图(左右关系)_表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlHandler" : {
"getPSHandlerActions" : [ {
"actionName" : "GetDraft",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraft",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "GETDRAFTFROM",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraftfrom",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
}, {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
} ],
"enableDEFieldPrivilege" : false,
"id" : "编辑表单处理器"
},
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "FORM"
},
"getPSDEFormItems" : [ {
"id" : "srfupdatedate",
"hidden" : true,
"dataType" : 5,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"id" : "srforikey",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfkey",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
}, {
"id" : "srfmajortext",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"id" : "srftempmode",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfuf",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfdeid",
"hidden" : true,
"dataType" : 25
}, {
"id" : "srfsourcekey",
"hidden" : true,
"dataType" : 25
}, {
"id" : "testname",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"id" : "createman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
}
}, {
"id" : "createdate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
}
}, {
"id" : "updateman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"id" : "updatedate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"id" : "testid",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "基本信息",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"caption" : "测试实体基本信息",
"codeName" : "group1",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group1",
"getPSDEFormDetails" : [ {
"caption" : "测试实体名称",
"codeName" : "testname",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "testname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 50,
"minLength" : 3,
"name" : "testname"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
}, {
"caption" : "测试实体标识",
"codeName" : "testid",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "testid",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "testid"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
}, {
"caption" : "其它",
"codeName" : "formpage2",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage2",
"getPSDEFormDetails" : [ {
"caption" : "操作信息",
"codeName" : "group2",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group2",
"getPSDEFormDetails" : [ {
"caption" : "建立人",
"codeName" : "createman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "建立时间",
"codeName" : "createdate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createdate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createdate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updateman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updateman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updatedate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getRemovePSControlAction" : {
"modelref" : true,
"id" : "remove",
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"tabHeaderPos" : "TOP",
"getUpdatePSControlAction" : {
"modelref" : true,
"id" : "update",
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"noTabHeader" : false,
"name" : "form",
"modelid" : "CD042D21-47A9-40E1-A892-D6D0B4232097",
"modeltype" : "PSDEFORM_EDITFORM"
}, {
"codeName" : "Usr05221370EditView2_DR",
"controlType" : "DRBAR",
"editItemCaption" : "测试实体",
"name" : "drbar",
"getPSAppCounterRef" : {
"modelref" : true,
"id" : "c0738c9dec0bd355f3062df0532aeb37"
},
"getPSAppCounterRefs" : [ {
"getPSAppCounter" : {
"codeName" : "Test__Custom",
"counterType" : "DEDR",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/Test__Custom.json",
"getGetPSAppDEAction" : {
"modelref" : true,
"id" : "Counter"
},
"name" : "自定义计数器",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSSysPFPlugin" : {
"pluginType" : "APPCOUNTER",
"pluginCode" : "index2CustomCounterId"
},
"timer" : 10000,
"uniqueTag" : "Test__Custom"
},
"refMode" : {
"srfdeid" : "TEST"
},
"tag" : "c0738c9dec0bd355f3062df0532aeb37",
"id" : "c0738c9dec0bd355f3062df0532aeb37"
} ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
"id" : "drbar"
},
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "DRBAR"
},
"getPSDEDRBarGroups" : [ {
"caption" : "详细信息",
"name" : "详细信息",
"hidden" : false,
"id" : "DRGroup"
} ],
"getPSDEDRCtrlItems" : [ {
"caption" : "cc",
"counterId" : "num1",
"enableMode" : "COUNT_GT_ZERO",
"name" : "cc",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr03221685GridView.json",
"viewType" : "DEGRIDVIEW"
},
"getPSDEDRBarGroup" : {
"modelref" : true,
"id" : "DRGroup"
}
} ],
"uniqueTag" : "TESTUsr05221370EditView2__drbar",
"showTitle" : true,
"modelid" : "F84C19DE-C4F1-4FD2-838E-688B29404C24",
"modeltype" : "PSDEDRBAR"
}, {
"codeName" : "Usr05221370EditView2datainfobar",
"controlType" : "DATAINFOBAR",
"name" : "datainfobar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : {
"id" : "datainfobar"
}
}, {
"caption" : " 计数器实体编辑视图(左右关系)",
"codeName" : "Usr05221370EditView2captionbar",
"controlType" : "CAPTIONBAR",
"name" : "captionbar",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { }
} ],
"getPSDEViewCodeName" : "Usr05221370EditView2",
"getPSDEViewId" : "D8C25806-636F-45FE-80BD-7AE5E3AC01CC",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEEDITVIEW2",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : " 计数器实体编辑视图(左右关系)",
"viewStyle" : "DEFAULT",
"viewType" : "DEEDITVIEW2",
"xDataControlName" : "form",
"enableDP" : true,
"showDataInfoBar" : true,
"modelid" : "008897d4d562e688afb8e4360af12b1f",
"modeltype" : "PSAPPDEVIEW"
}
\ No newline at end of file
...@@ -25015,6 +25015,12 @@ ...@@ -25015,6 +25015,12 @@
"enableRemove" : true "enableRemove" : true
} ], } ],
"getAllPSAppViews" : [ { "getAllPSAppViews" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
"viewType" : "DEEDITVIEW2",
"resource" : "TEST",
"view" : "Usr05221370EditView2"
}, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json",
"viewType" : "DEGRIDVIEW", "viewType" : "DEGRIDVIEW",
...@@ -108671,6 +108677,10 @@ ...@@ -108671,6 +108677,10 @@
"ungroup" : true "ungroup" : true
} ], } ],
"getAllPSAppViews" : [ { "getAllPSAppViews" : [ {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
"viewType" : "DEEDITVIEW2"
}, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
"viewType" : "DEEDITVIEW2" "viewType" : "DEEDITVIEW2"
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册