tony001 发布系统代码 [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/WORKITEM/PSTREEVIEWS/Usr12264106CustomTreeNodesExpView_TreeView.json

@@ -63,16 +63,16 @@
     "name" : "treeexpbar_load"
   } ],
   "getPSControls" : [ {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树表格节点上下文菜单",
-    "name" : "group_cm",
+    "name" : "item_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "group_cm"
+      "id" : "item_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -89,7 +89,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "group_cm_deuiaction1"
+        "id" : "item_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf0f6@FontAwesome",
@@ -142,7 +142,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "group_cm_deuiaction2"
+        "id" : "item_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "caption" : "删除数据",
@@ -162,16 +162,16 @@
     "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_2_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_3_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树表格节点上下文菜单",
-    "name" : "node_2_cm",
+    "name" : "node_3_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "node_2_cm"
+      "id" : "node_3_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -188,7 +188,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_2_cm_deuiaction1"
+        "id" : "node_3_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf0f6@FontAwesome",
@@ -241,7 +241,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_2_cm_deuiaction2"
+        "id" : "node_3_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "caption" : "删除数据",
@@ -261,16 +261,16 @@
     "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
     "controlType" : "CONTEXTMENU",
-    "logicName" : "树表格节点上下文菜单",
-    "name" : "item_cm",
+    "logicName" : "树表格根节点上下文菜单",
+    "name" : "root_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "item_cm"
+      "id" : "root_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -280,18 +280,18 @@
         "name" : "工具栏按钮文本[*.NEW]",
         "refFlag" : true
       },
-      "caption" : "编辑",
+      "caption" : "新建类别",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
       "name" : "deuiaction1",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "item_cm_deuiaction1"
+        "id" : "root_cm_deuiaction1"
       },
       "getPSSysImage" : {
-        "glyph" : "xf0f6@FontAwesome",
-        "cssClass" : "fa fa-file-text-o"
+        "glyph" : "xf0c9@FontAwesome",
+        "cssClass" : "fa fa-reorder"
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
@@ -322,7 +322,7 @@
         "uIActionTag" : "New",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "编辑",
+      "tooltip" : "新建类别",
       "getTooltipPSLanguageRes" : {
         "defaultContent" : "新建",
         "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -333,45 +333,6 @@
       "showCaption" : true,
       "showIcon" : true
     }, {
-      "caption" : "删除",
-      "groupExtractMode" : "ITEM",
-      "itemType" : "DEUIACTION",
-      "name" : "deuiaction2",
-      "noPrivDisplayMode" : 2,
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "item_cm_deuiaction2"
-      },
-      "getPSUIAction" : {
-        "caption" : "删除数据",
-        "codeName" : "RemoveObject",
-        "fullCodeName" : "RemoveObject",
-        "name" : "删除数据",
-        "predefinedType" : "DATA_REMOVEOBJECT",
-        "timeout" : 60000,
-        "uIActionMode" : "SYS",
-        "uIActionTag" : "RemoveObject",
-        "uIActionType" : "DEUIACTION"
-      },
-      "tooltip" : "删除",
-      "showCaption" : true,
-      "showIcon" : true
-    } ],
-    "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
-    "modeltype" : "PSDETOOLBAR"
-  }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
-    "controlType" : "CONTEXTMENU",
-    "logicName" : "树表格根节点上下文菜单",
-    "name" : "root_cm",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
-    },
-    "getPSControlParam" : {
-      "id" : "root_cm"
-    },
-    "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
         "defaultContent" : "新建",
         "lanResTag" : "TBB.TEXT.*.NEW",
@@ -379,18 +340,18 @@
         "name" : "工具栏按钮文本[*.NEW]",
         "refFlag" : true
       },
-      "caption" : "新建类别",
+      "caption" : "新建分组",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "deuiaction1",
+      "name" : "deuiaction2",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "root_cm_deuiaction1"
+        "id" : "root_cm_deuiaction2"
       },
       "getPSSysImage" : {
-        "glyph" : "xf0c9@FontAwesome",
-        "cssClass" : "fa fa-reorder"
+        "glyph" : "xf101@FontAwesome",
+        "cssClass" : "fa fa-angle-double-right"
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
@@ -421,7 +382,7 @@
         "uIActionTag" : "New",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "新建类别",
+      "tooltip" : "新建分组",
       "getTooltipPSLanguageRes" : {
         "defaultContent" : "新建",
         "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -431,7 +392,22 @@
       },
       "showCaption" : true,
       "showIcon" : true
-    }, {
+    } ],
+    "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+    "modeltype" : "PSDETOOLBAR"
+  }, {
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_2_cm",
+    "controlType" : "CONTEXTMENU",
+    "logicName" : "树表格节点上下文菜单",
+    "name" : "node_2_cm",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+    },
+    "getPSControlParam" : {
+      "id" : "node_2_cm"
+    },
+    "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
         "defaultContent" : "新建",
         "lanResTag" : "TBB.TEXT.*.NEW",
@@ -439,18 +415,18 @@
         "name" : "工具栏按钮文本[*.NEW]",
         "refFlag" : true
       },
-      "caption" : "新建分组",
+      "caption" : "编辑",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "deuiaction2",
+      "name" : "deuiaction1",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "root_cm_deuiaction2"
+        "id" : "node_2_cm_deuiaction1"
       },
       "getPSSysImage" : {
-        "glyph" : "xf101@FontAwesome",
-        "cssClass" : "fa fa-angle-double-right"
+        "glyph" : "xf0f6@FontAwesome",
+        "cssClass" : "fa fa-file-text-o"
       },
       "getPSUIAction" : {
         "getCapPSLanguageRes" : {
@@ -481,7 +457,7 @@
         "uIActionTag" : "New",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "新建分组",
+      "tooltip" : "编辑",
       "getTooltipPSLanguageRes" : {
         "defaultContent" : "新建",
         "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -491,8 +467,32 @@
       },
       "showCaption" : true,
       "showIcon" : true
+    }, {
+      "caption" : "删除",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction2",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "node_2_cm_deuiaction2"
+      },
+      "getPSUIAction" : {
+        "caption" : "删除数据",
+        "codeName" : "RemoveObject",
+        "fullCodeName" : "RemoveObject",
+        "name" : "删除数据",
+        "predefinedType" : "DATA_REMOVEOBJECT",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "RemoveObject",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "删除",
+      "showCaption" : true,
+      "showIcon" : true
     } ],
-    "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+    "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
     "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_cm",
@@ -594,16 +594,16 @@
     "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_3_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_1_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树表格节点上下文菜单",
-    "name" : "node_3_cm",
+    "name" : "node_1_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "node_3_cm"
+      "id" : "node_1_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -620,7 +620,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_3_cm_deuiaction1"
+        "id" : "node_1_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf0f6@FontAwesome",
@@ -673,7 +673,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_3_cm_deuiaction2"
+        "id" : "node_1_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "caption" : "删除数据",
@@ -693,16 +693,16 @@
     "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_1_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树表格节点上下文菜单",
-    "name" : "node_1_cm",
+    "name" : "group_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "node_1_cm"
+      "id" : "group_cm"
     },
     "getPSDEToolbarItems" : [ {
       "getCapPSLanguageRes" : {
@@ -719,7 +719,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_1_cm_deuiaction1"
+        "id" : "group_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf0f6@FontAwesome",
@@ -772,7 +772,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_1_cm_deuiaction2"
+        "id" : "group_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "caption" : "删除数据",
@@ -1183,6 +1183,11 @@
       "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
       "modeltype" : "PSDETOOLBAR"
     },
+    "sortDir" : "ASC",
+    "getSortPSAppDEField" : {
+      "name" : "PX",
+      "codeName" : "PX"
+    },
     "getTextPSAppDEField" : {
       "name" : "WORKITEMNAME",
       "codeName" : "WORKITEMName"
@@ -1333,6 +1338,11 @@
       "glyph" : "xf0c9@FontAwesome",
       "cssClass" : "fa fa-reorder"
     },
+    "sortDir" : "ASC",
+    "getSortPSAppDEField" : {
+      "name" : "PX",
+      "codeName" : "PX"
+    },
     "getTextPSAppDEField" : {
       "name" : "WORKITEMNAME",
       "codeName" : "WORKITEMName"

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

@@ -261,16 +261,16 @@
         "id" : "treeexpbar_tree"
       },
       "getPSControls" : [ {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "树表格节点上下文菜单",
-        "name" : "group_cm",
+        "name" : "item_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "group_cm"
+          "id" : "item_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -287,7 +287,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "group_cm_deuiaction1"
+            "id" : "item_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf0f6@FontAwesome",
@@ -340,7 +340,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "group_cm_deuiaction2"
+            "id" : "item_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "caption" : "删除数据",
@@ -360,16 +360,16 @@
         "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_2_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_3_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "树表格节点上下文菜单",
-        "name" : "node_2_cm",
+        "name" : "node_3_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "node_2_cm"
+          "id" : "node_3_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -386,7 +386,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_2_cm_deuiaction1"
+            "id" : "node_3_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf0f6@FontAwesome",
@@ -439,7 +439,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_2_cm_deuiaction2"
+            "id" : "node_3_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "caption" : "删除数据",
@@ -459,16 +459,16 @@
         "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
         "controlType" : "CONTEXTMENU",
-        "logicName" : "树表格节点上下文菜单",
-        "name" : "item_cm",
+        "logicName" : "树表格根节点上下文菜单",
+        "name" : "root_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "item_cm"
+          "id" : "root_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -478,18 +478,18 @@
             "name" : "工具栏按钮文本[*.NEW]",
             "refFlag" : true
           },
-          "caption" : "编辑",
+          "caption" : "新建类别",
           "groupExtractMode" : "ITEM",
           "itemType" : "DEUIACTION",
           "name" : "deuiaction1",
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "item_cm_deuiaction1"
+            "id" : "root_cm_deuiaction1"
           },
           "getPSSysImage" : {
-            "glyph" : "xf0f6@FontAwesome",
-            "cssClass" : "fa fa-file-text-o"
+            "glyph" : "xf0c9@FontAwesome",
+            "cssClass" : "fa fa-reorder"
           },
           "getPSUIAction" : {
             "getCapPSLanguageRes" : {
@@ -520,7 +520,7 @@
             "uIActionTag" : "New",
             "uIActionType" : "DEUIACTION"
           },
-          "tooltip" : "编辑",
+          "tooltip" : "新建类别",
           "getTooltipPSLanguageRes" : {
             "defaultContent" : "新建",
             "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -531,45 +531,6 @@
           "showCaption" : true,
           "showIcon" : true
         }, {
-          "caption" : "删除",
-          "groupExtractMode" : "ITEM",
-          "itemType" : "DEUIACTION",
-          "name" : "deuiaction2",
-          "noPrivDisplayMode" : 2,
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "item_cm_deuiaction2"
-          },
-          "getPSUIAction" : {
-            "caption" : "删除数据",
-            "codeName" : "RemoveObject",
-            "fullCodeName" : "RemoveObject",
-            "name" : "删除数据",
-            "predefinedType" : "DATA_REMOVEOBJECT",
-            "timeout" : 60000,
-            "uIActionMode" : "SYS",
-            "uIActionTag" : "RemoveObject",
-            "uIActionType" : "DEUIACTION"
-          },
-          "tooltip" : "删除",
-          "showCaption" : true,
-          "showIcon" : true
-        } ],
-        "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
-        "modeltype" : "PSDETOOLBAR"
-      }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
-        "controlType" : "CONTEXTMENU",
-        "logicName" : "树表格根节点上下文菜单",
-        "name" : "root_cm",
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
-        },
-        "getPSControlParam" : {
-          "id" : "root_cm"
-        },
-        "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
             "defaultContent" : "新建",
             "lanResTag" : "TBB.TEXT.*.NEW",
@@ -577,18 +538,18 @@
             "name" : "工具栏按钮文本[*.NEW]",
             "refFlag" : true
           },
-          "caption" : "新建类别",
+          "caption" : "新建分组",
           "groupExtractMode" : "ITEM",
           "itemType" : "DEUIACTION",
-          "name" : "deuiaction1",
+          "name" : "deuiaction2",
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "root_cm_deuiaction1"
+            "id" : "root_cm_deuiaction2"
           },
           "getPSSysImage" : {
-            "glyph" : "xf0c9@FontAwesome",
-            "cssClass" : "fa fa-reorder"
+            "glyph" : "xf101@FontAwesome",
+            "cssClass" : "fa fa-angle-double-right"
           },
           "getPSUIAction" : {
             "getCapPSLanguageRes" : {
@@ -619,7 +580,7 @@
             "uIActionTag" : "New",
             "uIActionType" : "DEUIACTION"
           },
-          "tooltip" : "新建类别",
+          "tooltip" : "新建分组",
           "getTooltipPSLanguageRes" : {
             "defaultContent" : "新建",
             "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -629,7 +590,22 @@
           },
           "showCaption" : true,
           "showIcon" : true
-        }, {
+        } ],
+        "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+        "modeltype" : "PSDETOOLBAR"
+      }, {
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_2_cm",
+        "controlType" : "CONTEXTMENU",
+        "logicName" : "树表格节点上下文菜单",
+        "name" : "node_2_cm",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+        },
+        "getPSControlParam" : {
+          "id" : "node_2_cm"
+        },
+        "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
             "defaultContent" : "新建",
             "lanResTag" : "TBB.TEXT.*.NEW",
@@ -637,18 +613,18 @@
             "name" : "工具栏按钮文本[*.NEW]",
             "refFlag" : true
           },
-          "caption" : "新建分组",
+          "caption" : "编辑",
           "groupExtractMode" : "ITEM",
           "itemType" : "DEUIACTION",
-          "name" : "deuiaction2",
+          "name" : "deuiaction1",
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "root_cm_deuiaction2"
+            "id" : "node_2_cm_deuiaction1"
           },
           "getPSSysImage" : {
-            "glyph" : "xf101@FontAwesome",
-            "cssClass" : "fa fa-angle-double-right"
+            "glyph" : "xf0f6@FontAwesome",
+            "cssClass" : "fa fa-file-text-o"
           },
           "getPSUIAction" : {
             "getCapPSLanguageRes" : {
@@ -679,7 +655,7 @@
             "uIActionTag" : "New",
             "uIActionType" : "DEUIACTION"
           },
-          "tooltip" : "新建分组",
+          "tooltip" : "编辑",
           "getTooltipPSLanguageRes" : {
             "defaultContent" : "新建",
             "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -689,8 +665,32 @@
           },
           "showCaption" : true,
           "showIcon" : true
+        }, {
+          "caption" : "删除",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "deuiaction2",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "node_2_cm_deuiaction2"
+          },
+          "getPSUIAction" : {
+            "caption" : "删除数据",
+            "codeName" : "RemoveObject",
+            "fullCodeName" : "RemoveObject",
+            "name" : "删除数据",
+            "predefinedType" : "DATA_REMOVEOBJECT",
+            "timeout" : 60000,
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "RemoveObject",
+            "uIActionType" : "DEUIACTION"
+          },
+          "tooltip" : "删除",
+          "showCaption" : true,
+          "showIcon" : true
         } ],
-        "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+        "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
         "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_cm",
@@ -792,16 +792,16 @@
         "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_3_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_1_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "树表格节点上下文菜单",
-        "name" : "node_3_cm",
+        "name" : "node_1_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "node_3_cm"
+          "id" : "node_1_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -818,7 +818,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_3_cm_deuiaction1"
+            "id" : "node_1_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf0f6@FontAwesome",
@@ -871,7 +871,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_3_cm_deuiaction2"
+            "id" : "node_1_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "caption" : "删除数据",
@@ -891,16 +891,16 @@
         "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_1_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "树表格节点上下文菜单",
-        "name" : "node_1_cm",
+        "name" : "group_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "node_1_cm"
+          "id" : "group_cm"
         },
         "getPSDEToolbarItems" : [ {
           "getCapPSLanguageRes" : {
@@ -917,7 +917,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_1_cm_deuiaction1"
+            "id" : "group_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf0f6@FontAwesome",
@@ -970,7 +970,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_1_cm_deuiaction2"
+            "id" : "group_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "caption" : "删除数据",
@@ -1381,6 +1381,11 @@
           "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
           "modeltype" : "PSDETOOLBAR"
         },
+        "sortDir" : "ASC",
+        "getSortPSAppDEField" : {
+          "name" : "PX",
+          "codeName" : "PX"
+        },
         "getTextPSAppDEField" : {
           "name" : "WORKITEMNAME",
           "codeName" : "WORKITEMName"
@@ -1531,6 +1536,11 @@
           "glyph" : "xf0c9@FontAwesome",
           "cssClass" : "fa fa-reorder"
         },
+        "sortDir" : "ASC",
+        "getSortPSAppDEField" : {
+          "name" : "PX",
+          "codeName" : "PX"
+        },
         "getTextPSAppDEField" : {
           "name" : "WORKITEMNAME",
           "codeName" : "WORKITEMName"

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

@@ -48025,16 +48025,16 @@
             "id" : "treeexpbar_tree"
           },
           "getPSControls" : [ {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
             "controlType" : "CONTEXTMENU",
             "logicName" : "树表格节点上下文菜单",
-            "name" : "group_cm",
+            "name" : "item_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "group_cm"
+              "id" : "item_cm"
             },
             "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
@@ -48051,7 +48051,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "group_cm_deuiaction1"
+                "id" : "item_cm_deuiaction1"
               },
               "getPSSysImage" : {
                 "glyph" : "xf0f6@FontAwesome",
@@ -48104,7 +48104,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "group_cm_deuiaction2"
+                "id" : "item_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "caption" : "删除数据",
@@ -48124,16 +48124,16 @@
             "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_2_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_3_cm",
             "controlType" : "CONTEXTMENU",
             "logicName" : "树表格节点上下文菜单",
-            "name" : "node_2_cm",
+            "name" : "node_3_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "node_2_cm"
+              "id" : "node_3_cm"
             },
             "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
@@ -48150,7 +48150,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_2_cm_deuiaction1"
+                "id" : "node_3_cm_deuiaction1"
               },
               "getPSSysImage" : {
                 "glyph" : "xf0f6@FontAwesome",
@@ -48203,7 +48203,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_2_cm_deuiaction2"
+                "id" : "node_3_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "caption" : "删除数据",
@@ -48223,16 +48223,16 @@
             "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
             "controlType" : "CONTEXTMENU",
-            "logicName" : "树表格节点上下文菜单",
-            "name" : "item_cm",
+            "logicName" : "树表格根节点上下文菜单",
+            "name" : "root_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "item_cm"
+              "id" : "root_cm"
             },
             "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
@@ -48242,18 +48242,18 @@
                 "name" : "工具栏按钮文本[*.NEW]",
                 "refFlag" : true
               },
-              "caption" : "编辑",
+              "caption" : "新建类别",
               "groupExtractMode" : "ITEM",
               "itemType" : "DEUIACTION",
               "name" : "deuiaction1",
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "item_cm_deuiaction1"
+                "id" : "root_cm_deuiaction1"
               },
               "getPSSysImage" : {
-                "glyph" : "xf0f6@FontAwesome",
-                "cssClass" : "fa fa-file-text-o"
+                "glyph" : "xf0c9@FontAwesome",
+                "cssClass" : "fa fa-reorder"
               },
               "getPSUIAction" : {
                 "getCapPSLanguageRes" : {
@@ -48284,7 +48284,7 @@
                 "uIActionTag" : "New",
                 "uIActionType" : "DEUIACTION"
               },
-              "tooltip" : "编辑",
+              "tooltip" : "新建类别",
               "getTooltipPSLanguageRes" : {
                 "defaultContent" : "新建",
                 "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -48295,45 +48295,6 @@
               "showCaption" : true,
               "showIcon" : true
             }, {
-              "caption" : "删除",
-              "groupExtractMode" : "ITEM",
-              "itemType" : "DEUIACTION",
-              "name" : "deuiaction2",
-              "noPrivDisplayMode" : 2,
-              "getPSAppViewUIAction" : {
-                "modelref" : true,
-                "id" : "item_cm_deuiaction2"
-              },
-              "getPSUIAction" : {
-                "caption" : "删除数据",
-                "codeName" : "RemoveObject",
-                "fullCodeName" : "RemoveObject",
-                "name" : "删除数据",
-                "predefinedType" : "DATA_REMOVEOBJECT",
-                "timeout" : 60000,
-                "uIActionMode" : "SYS",
-                "uIActionTag" : "RemoveObject",
-                "uIActionType" : "DEUIACTION"
-              },
-              "tooltip" : "删除",
-              "showCaption" : true,
-              "showIcon" : true
-            } ],
-            "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
-            "modeltype" : "PSDETOOLBAR"
-          }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewroot_cm",
-            "controlType" : "CONTEXTMENU",
-            "logicName" : "树表格根节点上下文菜单",
-            "name" : "root_cm",
-            "getPSAppDataEntity" : {
-              "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
-            },
-            "getPSControlParam" : {
-              "id" : "root_cm"
-            },
-            "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
                 "defaultContent" : "新建",
                 "lanResTag" : "TBB.TEXT.*.NEW",
@@ -48341,18 +48302,18 @@
                 "name" : "工具栏按钮文本[*.NEW]",
                 "refFlag" : true
               },
-              "caption" : "新建类别",
+              "caption" : "新建分组",
               "groupExtractMode" : "ITEM",
               "itemType" : "DEUIACTION",
-              "name" : "deuiaction1",
+              "name" : "deuiaction2",
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "root_cm_deuiaction1"
+                "id" : "root_cm_deuiaction2"
               },
               "getPSSysImage" : {
-                "glyph" : "xf0c9@FontAwesome",
-                "cssClass" : "fa fa-reorder"
+                "glyph" : "xf101@FontAwesome",
+                "cssClass" : "fa fa-angle-double-right"
               },
               "getPSUIAction" : {
                 "getCapPSLanguageRes" : {
@@ -48383,7 +48344,7 @@
                 "uIActionTag" : "New",
                 "uIActionType" : "DEUIACTION"
               },
-              "tooltip" : "新建类别",
+              "tooltip" : "新建分组",
               "getTooltipPSLanguageRes" : {
                 "defaultContent" : "新建",
                 "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -48393,7 +48354,22 @@
               },
               "showCaption" : true,
               "showIcon" : true
-            }, {
+            } ],
+            "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+            "modeltype" : "PSDETOOLBAR"
+          }, {
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_2_cm",
+            "controlType" : "CONTEXTMENU",
+            "logicName" : "树表格节点上下文菜单",
+            "name" : "node_2_cm",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+            },
+            "getPSControlParam" : {
+              "id" : "node_2_cm"
+            },
+            "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
                 "defaultContent" : "新建",
                 "lanResTag" : "TBB.TEXT.*.NEW",
@@ -48401,18 +48377,18 @@
                 "name" : "工具栏按钮文本[*.NEW]",
                 "refFlag" : true
               },
-              "caption" : "新建分组",
+              "caption" : "编辑",
               "groupExtractMode" : "ITEM",
               "itemType" : "DEUIACTION",
-              "name" : "deuiaction2",
+              "name" : "deuiaction1",
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "root_cm_deuiaction2"
+                "id" : "node_2_cm_deuiaction1"
               },
               "getPSSysImage" : {
-                "glyph" : "xf101@FontAwesome",
-                "cssClass" : "fa fa-angle-double-right"
+                "glyph" : "xf0f6@FontAwesome",
+                "cssClass" : "fa fa-file-text-o"
               },
               "getPSUIAction" : {
                 "getCapPSLanguageRes" : {
@@ -48443,7 +48419,7 @@
                 "uIActionTag" : "New",
                 "uIActionType" : "DEUIACTION"
               },
-              "tooltip" : "新建分组",
+              "tooltip" : "编辑",
               "getTooltipPSLanguageRes" : {
                 "defaultContent" : "新建",
                 "lanResTag" : "TBB.TOOLTIP.*.NEW",
@@ -48453,8 +48429,32 @@
               },
               "showCaption" : true,
               "showIcon" : true
+            }, {
+              "caption" : "删除",
+              "groupExtractMode" : "ITEM",
+              "itemType" : "DEUIACTION",
+              "name" : "deuiaction2",
+              "noPrivDisplayMode" : 2,
+              "getPSAppViewUIAction" : {
+                "modelref" : true,
+                "id" : "node_2_cm_deuiaction2"
+              },
+              "getPSUIAction" : {
+                "caption" : "删除数据",
+                "codeName" : "RemoveObject",
+                "fullCodeName" : "RemoveObject",
+                "name" : "删除数据",
+                "predefinedType" : "DATA_REMOVEOBJECT",
+                "timeout" : 60000,
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "RemoveObject",
+                "uIActionType" : "DEUIACTION"
+              },
+              "tooltip" : "删除",
+              "showCaption" : true,
+              "showIcon" : true
             } ],
-            "modelid" : "D906EBEE-C47F-4990-AA7E-77638D6D6C6B",
+            "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
             "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_cm",
@@ -48556,16 +48556,16 @@
             "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_3_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_1_cm",
             "controlType" : "CONTEXTMENU",
             "logicName" : "树表格节点上下文菜单",
-            "name" : "node_3_cm",
+            "name" : "node_1_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "node_3_cm"
+              "id" : "node_1_cm"
             },
             "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
@@ -48582,7 +48582,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_3_cm_deuiaction1"
+                "id" : "node_1_cm_deuiaction1"
               },
               "getPSSysImage" : {
                 "glyph" : "xf0f6@FontAwesome",
@@ -48635,7 +48635,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_3_cm_deuiaction2"
+                "id" : "node_1_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "caption" : "删除数据",
@@ -48655,16 +48655,16 @@
             "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "codeName" : "Usr12264106CustomTreeGridNodesExpViewnode_1_cm",
+            "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
             "controlType" : "CONTEXTMENU",
             "logicName" : "树表格节点上下文菜单",
-            "name" : "node_1_cm",
+            "name" : "group_cm",
             "getPSAppDataEntity" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
             },
             "getPSControlParam" : {
-              "id" : "node_1_cm"
+              "id" : "group_cm"
             },
             "getPSDEToolbarItems" : [ {
               "getCapPSLanguageRes" : {
@@ -48681,7 +48681,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_1_cm_deuiaction1"
+                "id" : "group_cm_deuiaction1"
               },
               "getPSSysImage" : {
                 "glyph" : "xf0f6@FontAwesome",
@@ -48734,7 +48734,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_1_cm_deuiaction2"
+                "id" : "group_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "caption" : "删除数据",
@@ -49145,6 +49145,11 @@
               "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
               "modeltype" : "PSDETOOLBAR"
             },
+            "sortDir" : "ASC",
+            "getSortPSAppDEField" : {
+              "name" : "PX",
+              "codeName" : "PX"
+            },
             "getTextPSAppDEField" : {
               "name" : "WORKITEMNAME",
               "codeName" : "WORKITEMName"
@@ -49295,6 +49300,11 @@
               "glyph" : "xf0c9@FontAwesome",
               "cssClass" : "fa fa-reorder"
             },
+            "sortDir" : "ASC",
+            "getSortPSAppDEField" : {
+              "name" : "PX",
+              "codeName" : "PX"
+            },
             "getTextPSAppDEField" : {
               "name" : "WORKITEMNAME",
               "codeName" : "WORKITEMName"

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: