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

config.xml

@@ -55,12 +55,6 @@
 	  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/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json

@@ -1167,6 +1167,15 @@
     "requestPath" : "/select",
     "builtinMethod" : false
   } ],
+  "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2GridView.json",
+    "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2EditView.json",
+    "viewType" : "DEEDITVIEW"
+  } ],
   "getAllPSDEOPPrivs" : [ {
     "logicName" : "建立",
     "name" : "CREATE"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSGRIDS/Main.json

+{
+  "aggMode" : "NONE",
+  "codeName" : "Main",
+  "columnEnableFilter" : 2,
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSGRIDS/Main.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
+    }
+  },
+  "groupMode" : "NONE",
+  "logicName" : "主表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
+  },
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "子测试实体名称",
+      "lanResTag" : "DEF.LNAME.SUBTEST2NAME",
+      "lanResType" : "DEF.LNAME",
+      "name" : "属性逻辑名称（DEF.LNAME.*）[SUBTEST2NAME]",
+      "refFlag" : true
+    },
+    "caption" : "子测试实体名称",
+    "codeName" : "subtest2name",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "subtest2name",
+    "excelCaption" : "子测试实体名称",
+    "name" : "subtest2name",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2NAME",
+      "codeName" : "SubTest2Name"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "更新人",
+      "lanResTag" : "DEF.LNAME.UPDATEMAN",
+      "lanResType" : "DEF.LNAME",
+      "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
+      "refFlag" : true
+    },
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updateman",
+    "excelCaption" : "更新人",
+    "name" : "updateman",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "更新时间",
+      "lanResTag" : "DEF.LNAME.UPDATEDATE",
+      "lanResType" : "DEF.LNAME",
+      "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEDATE]",
+      "refFlag" : true
+    },
+    "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
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "subtest2name",
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2NAME",
+      "codeName" : "SubTest2Name"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "updatedate",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2ID",
+      "codeName" : "SubTest2Id"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2ID",
+      "codeName" : "SubTest2Id"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "testid",
+    "getPSAppDEField" : {
+      "name" : "TESTID",
+      "codeName" : "TESTId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2NAME",
+      "codeName" : "SubTest2Name"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "子测试实体标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "SUBTEST2ID",
+      "codeName" : "SubTest2Id"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : false,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : false,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "e36a2eb82740f039fb765a3592756113",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSSEARCHFORMS/Default.json

+{
+  "codeName" : "Default",
+  "controlType" : "SEARCHFORM",
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSSEARCHFORMS/Default.json",
+  "logicName" : "默认搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
+  },
+  "getPSDEFormPages" : [ {
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "常规条件",
+      "lanResTag" : "CONTROL.DEFORM.SUBTEST2.DEFAULT.FORMPAGE.FORMPAGE1",
+      "lanResType" : "CONTROL",
+      "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.DEFAULT.FORMPAGE.FORMPAGE1]",
+      "refFlag" : true
+    },
+    "caption" : "常规条件",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "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"
+  },
+  "searchButtonStyle" : "DEFAULT",
+  "tabHeaderPos" : "TOP",
+  "enableAdvanceSearch" : false,
+  "enableAutoSearch" : false,
+  "enableFilterSave" : false,
+  "noTabHeader" : true,
+  "modelid" : "5346757943213e9d1e689f158b892c74",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json

@@ -6212,6 +6212,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
     "viewType" : "DECHARTVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPickupView.json",
+    "viewType" : "DEPICKUPVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTOptionView.json",
@@ -6524,6 +6528,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json",
     "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppTestIndexView.json

@@ -1350,6 +1350,28 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "歌曲"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "子测试实体2表格",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem71",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1214758697"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "子测试实体2表格"
       } ],
       "getPSLayout" : {
         "childColLG" : -1,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppTestIndexView.json

@@ -603,6 +603,16 @@
         "id" : "UsrAppFunc0906889696"
       },
       "tooltip" : "歌曲"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "子测试实体2表格",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem71",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1214758697"
+      },
+      "tooltip" : "子测试实体2表格"
     } ],
     "tooltip" : "数据"
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -4410,6 +4410,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPanelView.json",
       "viewType" : "DEPANELVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc1214758697",
+    "name" : "子测试实体2表格",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2GridView.json",
+      "viewType" : "DEGRIDVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "AppFunc60",
@@ -12098,10 +12108,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-错误信息",
@@ -12110,10 +12120,10 @@
         "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       }
     } ]
   }, {
@@ -12130,10 +12140,10 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
       "name" : "消息位置-视图下方",
@@ -12142,53 +12152,53 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -12196,27 +12206,27 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg11"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     }, {
       "name" : "关闭模式-无删除",
@@ -12225,26 +12235,26 @@
         "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"
       }
     } ]
   } ],
@@ -12657,6 +12667,12 @@
     "viewType" : "DECUSTOMVIEW",
     "resource" : "X6DesingTest",
     "view" : "X6DesignEditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2GridView.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "SubTest2",
+    "view" : "GridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr09053571GridView.json",
@@ -13065,6 +13081,12 @@
     "viewType" : "DECHARTVIEW",
     "resource" : "TEST",
     "view" : "TestChartView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPickupView.json",
+    "viewType" : "DEPICKUPVIEW",
+    "resource" : "TEST",
+    "view" : "PickupView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDPickupView.json",
@@ -13567,6 +13589,12 @@
     "viewType" : "DEDATAVIEW",
     "resource" : "Book",
     "view" : "Usr09211294DataView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2EditView.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "SubTest2",
+    "view" : "EditView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView_modal.json",
@@ -14638,6 +14666,12 @@
     "viewType" : "DEPICKUPGRIDVIEW",
     "resource" : "TreeNode",
     "view" : "PickupGridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "TEST",
+    "view" : "PickupGridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowEditView.json",
@@ -61955,6 +61989,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
         "viewType" : "DECHARTVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPickupView.json",
+        "viewType" : "DEPICKUPVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTOptionView.json",
@@ -62267,6 +62305,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json",
         "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPickupGridView.json",
+        "viewType" : "DEPICKUPGRIDVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4TreeExpView.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSI18NS/DEFAULT.json

@@ -1028,27 +1028,32 @@
     "defaultContent" : "常规条件",
     "lanResTag" : "CONTROL.DEFORM.SUBTEST2.DEFAULT.FORMPAGE.FORMPAGE1",
     "lanResType" : "CONTROL",
-    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.DEFAULT.FORMPAGE.FORMPAGE1]"
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.DEFAULT.FORMPAGE.FORMPAGE1]",
+    "refFlag" : true
   }, {
     "defaultContent" : "基本信息",
     "lanResTag" : "CONTROL.DEFORM.SUBTEST2.MAIN.FORMPAGE.FORMPAGE1",
     "lanResType" : "CONTROL",
-    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.FORMPAGE.FORMPAGE1]"
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.FORMPAGE.FORMPAGE1]",
+    "refFlag" : true
   }, {
     "defaultContent" : "其它",
     "lanResTag" : "CONTROL.DEFORM.SUBTEST2.MAIN.FORMPAGE.FORMPAGE2",
     "lanResType" : "CONTROL",
-    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.FORMPAGE.FORMPAGE2]"
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.FORMPAGE.FORMPAGE2]",
+    "refFlag" : true
   }, {
     "defaultContent" : "子测试实体基本信息",
     "lanResTag" : "CONTROL.DEFORM.SUBTEST2.MAIN.GROUPPANEL.GROUP1",
     "lanResType" : "CONTROL",
-    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.GROUPPANEL.GROUP1]"
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.GROUPPANEL.GROUP1]",
+    "refFlag" : true
   }, {
     "defaultContent" : "操作信息",
     "lanResTag" : "CONTROL.DEFORM.SUBTEST2.MAIN.GROUPPANEL.GROUP2",
     "lanResType" : "CONTROL",
-    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.GROUPPANEL.GROUP2]"
+    "name" : "控件文本（CONTROL.*）[DEFORM.SUBTEST2.MAIN.GROUPPANEL.GROUP2]",
+    "refFlag" : true
   }, {
     "defaultContent" : "常规条件",
     "lanResTag" : "CONTROL.DEFORM.SYS_EMP_EX.DEFAULT.FORMPAGE.FORMPAGE1",
@@ -1950,12 +1955,14 @@
     "defaultContent" : "子测试实体编辑视图",
     "lanResTag" : "PAGE.TITLE.SUBTEST2.EDITVIEW",
     "lanResType" : "PAGE",
-    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST2.EDITVIEW]"
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST2.EDITVIEW]",
+    "refFlag" : true
   }, {
     "defaultContent" : "子测试实体表格视图",
     "lanResTag" : "PAGE.TITLE.SUBTEST2.GRIDVIEW",
     "lanResType" : "PAGE",
-    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST2.GRIDVIEW]"
+    "name" : "界面文本（PAGE.*）[TITLE.SUBTEST2.GRIDVIEW]",
+    "refFlag" : true
   }, {
     "defaultContent" : "子测试实体数据多项选择视图",
     "lanResTag" : "PAGE.TITLE.SUBTEST2.MPICKUPVIEW",

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -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 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - 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"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     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: