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/Mob/PSSYSAPP.hubsubapp.json

@@ -382,5 +382,6 @@
     "uniqueTag" : "TEST__Ab435229a7cfc670d67"
   } ],
   "getAllPSDEDRControls" : [ ],
+  "getAllPSControls" : [ ],
   "id" : "PSSYSAPPS/Mob/PSSYSAPP.json"
 }
\ No newline at end of file

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

@@ -2,5 +2,6 @@
   "name" : "应用",
   "getAllPSAppDEUIActionGroups" : [ ],
   "getAllPSDEDRControls" : [ ],
+  "getAllPSControls" : [ ],
   "id" : "PSSYSAPPS/OldWebAppTest/PSSYSAPP.json"
 }
\ No newline at end of file

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

@@ -459,5 +459,6 @@
     "uniqueTag" : "Student__Usr0423242168"
   } ],
   "getAllPSDEDRControls" : [ ],
+  "getAllPSControls" : [ ],
   "id" : "PSSYSAPPS/TemplatePublish/PSSYSAPP.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSTREEVIEWS/FileTreeView_TreeView.json

@@ -63,16 +63,16 @@
     "name" : "treeexpbar_load"
   } ],
   "getPSControls" : [ {
-    "codeName" : "FileExpViewnode_file_cm",
+    "codeName" : "FileExpViewfolder_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树节点上下文菜单测试",
-    "name" : "node_file_cm",
+    "name" : "folder_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
     },
     "getPSControlParam" : {
-      "id" : "node_file_cm"
+      "id" : "folder_cm"
     },
     "getPSDEToolbarItems" : [ {
       "actionLevel" : 200,
@@ -83,7 +83,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_file_cm_deuiaction1"
+        "id" : "folder_cm_deuiaction1"
       },
       "getPSUIAction" : {
         "actionLevel" : 200,
@@ -121,7 +121,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "node_file_cm_deuiaction3"
+        "id" : "folder_cm_deuiaction3"
       },
       "getPSUIAction" : {
         "actionLevel" : 50,
@@ -202,7 +202,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node_file_cm_deuiaction2"
+          "id" : "folder_cm_deuiaction2"
         },
         "getPSUIAction" : {
           "actionTarget" : "NONE",
@@ -245,7 +245,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node_file_cm_deuiaction4"
+          "id" : "folder_cm_deuiaction4"
         },
         "getPSUIAction" : {
           "actionTarget" : "SINGLEKEY",
@@ -282,16 +282,16 @@
     "modelid" : "0E53AD66-35B9-471D-96A2-EF2333CF2DF8",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "FileExpViewfolder_cm",
+    "codeName" : "FileExpViewnode_file_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "树节点上下文菜单测试",
-    "name" : "folder_cm",
+    "name" : "node_file_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
     },
     "getPSControlParam" : {
-      "id" : "folder_cm"
+      "id" : "node_file_cm"
     },
     "getPSDEToolbarItems" : [ {
       "actionLevel" : 200,
@@ -302,7 +302,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "folder_cm_deuiaction1"
+        "id" : "node_file_cm_deuiaction1"
       },
       "getPSUIAction" : {
         "actionLevel" : 200,
@@ -340,7 +340,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "folder_cm_deuiaction3"
+        "id" : "node_file_cm_deuiaction3"
       },
       "getPSUIAction" : {
         "actionLevel" : 50,
@@ -421,7 +421,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "folder_cm_deuiaction2"
+          "id" : "node_file_cm_deuiaction2"
         },
         "getPSUIAction" : {
           "actionTarget" : "NONE",
@@ -464,7 +464,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "folder_cm_deuiaction4"
+          "id" : "node_file_cm_deuiaction4"
         },
         "getPSUIAction" : {
           "actionTarget" : "SINGLEKEY",

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

@@ -316,16 +316,16 @@
           "id" : "treeexpbar_tree"
         },
         "getPSControls" : [ {
-          "codeName" : "FileExpViewnode_file_cm",
+          "codeName" : "FileExpViewfolder_cm",
           "controlType" : "CONTEXTMENU",
           "logicName" : "树节点上下文菜单测试",
-          "name" : "node_file_cm",
+          "name" : "folder_cm",
           "getPSAppDataEntity" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
           },
           "getPSControlParam" : {
-            "id" : "node_file_cm"
+            "id" : "folder_cm"
           },
           "getPSDEToolbarItems" : [ {
             "actionLevel" : 200,
@@ -336,7 +336,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node_file_cm_deuiaction1"
+              "id" : "folder_cm_deuiaction1"
             },
             "getPSUIAction" : {
               "actionLevel" : 200,
@@ -374,7 +374,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "node_file_cm_deuiaction3"
+              "id" : "folder_cm_deuiaction3"
             },
             "getPSUIAction" : {
               "actionLevel" : 50,
@@ -455,7 +455,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_file_cm_deuiaction2"
+                "id" : "folder_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "actionTarget" : "NONE",
@@ -498,7 +498,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "node_file_cm_deuiaction4"
+                "id" : "folder_cm_deuiaction4"
               },
               "getPSUIAction" : {
                 "actionTarget" : "SINGLEKEY",
@@ -535,16 +535,16 @@
           "modelid" : "0E53AD66-35B9-471D-96A2-EF2333CF2DF8",
           "modeltype" : "PSDETOOLBAR"
         }, {
-          "codeName" : "FileExpViewfolder_cm",
+          "codeName" : "FileExpViewnode_file_cm",
           "controlType" : "CONTEXTMENU",
           "logicName" : "树节点上下文菜单测试",
-          "name" : "folder_cm",
+          "name" : "node_file_cm",
           "getPSAppDataEntity" : {
             "modelref" : true,
             "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
           },
           "getPSControlParam" : {
-            "id" : "folder_cm"
+            "id" : "node_file_cm"
           },
           "getPSDEToolbarItems" : [ {
             "actionLevel" : 200,
@@ -555,7 +555,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "folder_cm_deuiaction1"
+              "id" : "node_file_cm_deuiaction1"
             },
             "getPSUIAction" : {
               "actionLevel" : 200,
@@ -593,7 +593,7 @@
             "noPrivDisplayMode" : 2,
             "getPSAppViewUIAction" : {
               "modelref" : true,
-              "id" : "folder_cm_deuiaction3"
+              "id" : "node_file_cm_deuiaction3"
             },
             "getPSUIAction" : {
               "actionLevel" : 50,
@@ -674,7 +674,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "folder_cm_deuiaction2"
+                "id" : "node_file_cm_deuiaction2"
               },
               "getPSUIAction" : {
                 "actionTarget" : "NONE",
@@ -717,7 +717,7 @@
               "noPrivDisplayMode" : 2,
               "getPSAppViewUIAction" : {
                 "modelref" : true,
-                "id" : "folder_cm_deuiaction4"
+                "id" : "node_file_cm_deuiaction4"
               },
               "getPSUIAction" : {
                 "actionTarget" : "SINGLEKEY",

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

@@ -147,16 +147,16 @@
       "id" : "TREE"
     },
     "getPSControls" : [ {
-      "codeName" : "FileTreeViewnode_file_cm",
+      "codeName" : "FileTreeViewfolder_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树节点上下文菜单测试",
-      "name" : "node_file_cm",
+      "name" : "folder_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
       },
       "getPSControlParam" : {
-        "id" : "node_file_cm"
+        "id" : "folder_cm"
       },
       "getPSDEToolbarItems" : [ {
         "actionLevel" : 200,
@@ -167,7 +167,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node_file_cm_deuiaction1"
+          "id" : "folder_cm_deuiaction1"
         },
         "getPSUIAction" : {
           "actionLevel" : 200,
@@ -205,7 +205,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "node_file_cm_deuiaction3"
+          "id" : "folder_cm_deuiaction3"
         },
         "getPSUIAction" : {
           "actionLevel" : 50,
@@ -286,7 +286,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_file_cm_deuiaction2"
+            "id" : "folder_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "actionTarget" : "NONE",
@@ -329,7 +329,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "node_file_cm_deuiaction4"
+            "id" : "folder_cm_deuiaction4"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEKEY",
@@ -366,16 +366,16 @@
       "modelid" : "0E53AD66-35B9-471D-96A2-EF2333CF2DF8",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "codeName" : "FileTreeViewfolder_cm",
+      "codeName" : "FileTreeViewnode_file_cm",
       "controlType" : "CONTEXTMENU",
       "logicName" : "树节点上下文菜单测试",
-      "name" : "folder_cm",
+      "name" : "node_file_cm",
       "getPSAppDataEntity" : {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE.json"
       },
       "getPSControlParam" : {
-        "id" : "folder_cm"
+        "id" : "node_file_cm"
       },
       "getPSDEToolbarItems" : [ {
         "actionLevel" : 200,
@@ -386,7 +386,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "folder_cm_deuiaction1"
+          "id" : "node_file_cm_deuiaction1"
         },
         "getPSUIAction" : {
           "actionLevel" : 200,
@@ -424,7 +424,7 @@
         "noPrivDisplayMode" : 2,
         "getPSAppViewUIAction" : {
           "modelref" : true,
-          "id" : "folder_cm_deuiaction3"
+          "id" : "node_file_cm_deuiaction3"
         },
         "getPSUIAction" : {
           "actionLevel" : 50,
@@ -505,7 +505,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "folder_cm_deuiaction2"
+            "id" : "node_file_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "actionTarget" : "NONE",
@@ -548,7 +548,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "folder_cm_deuiaction4"
+            "id" : "node_file_cm_deuiaction4"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEKEY",

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

@@ -462,6 +462,20 @@
         "itemType" : "MENUITEM",
         "name" : "menuitem280",
         "getPSAppMenuItems" : [ {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator5",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
+        }, {
           "accUserMode" : 0,
           "caption" : "顶部",
           "itemType" : "MENUITEM",
@@ -499,6 +513,48 @@
             "layout" : "TABLE_24COL"
           },
           "tooltip" : "居中"
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator10",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator12",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator11",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
         }, {
           "accUserMode" : 0,
           "caption" : "树导航",
@@ -518,6 +574,34 @@
             "layout" : "TABLE_24COL"
           },
           "tooltip" : "树导航"
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator8",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator4",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
         }, {
           "accUserMode" : 4,
           "accessKey" : "MODULE_ONE",
@@ -553,6 +637,34 @@
             "layout" : "TABLE_24COL"
           },
           "tooltip" : "测试模型发布菜单项"
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator9",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
+        }, {
+          "accUserMode" : 0,
+          "itemType" : "SEPERATOR",
+          "name" : "seperator13",
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "seperator" : true
         } ],
         "getPSLayout" : {
           "childColMD" : 24,
@@ -6935,6 +7047,34 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "多数据容器仅数据"
+      }, {
+        "accUserMode" : 0,
+        "itemType" : "SEPERATOR",
+        "name" : "seperator6",
+        "getPSLayout" : {
+          "childColMD" : 24,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "seperator" : true
+      }, {
+        "accUserMode" : 0,
+        "itemType" : "SEPERATOR",
+        "name" : "seperator7",
+        "getPSLayout" : {
+          "childColMD" : 24,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "seperator" : true
       } ],
       "getPSControlHandler" : {
         "enableDEFieldPrivilege" : false,

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

@@ -9,6 +9,11 @@
     "itemType" : "MENUITEM",
     "name" : "menuitem280",
     "getPSAppMenuItems" : [ {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator5",
+      "seperator" : true
+    }, {
       "accUserMode" : 0,
       "caption" : "顶部",
       "itemType" : "MENUITEM",
@@ -28,6 +33,21 @@
         "id" : "UsrAppFunc0513512805"
       },
       "tooltip" : "居中"
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator10",
+      "seperator" : true
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator12",
+      "seperator" : true
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator11",
+      "seperator" : true
     }, {
       "accUserMode" : 0,
       "caption" : "树导航",
@@ -38,6 +58,16 @@
         "id" : "UsrAppFunc0513243587"
       },
       "tooltip" : "树导航"
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator8",
+      "seperator" : true
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator4",
+      "seperator" : true
     }, {
       "accUserMode" : 4,
       "accessKey" : "MODULE_ONE",
@@ -55,6 +85,16 @@
       "itemType" : "MENUITEM",
       "name" : "menuitem323",
       "tooltip" : "测试模型发布菜单项"
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator9",
+      "seperator" : true
+    }, {
+      "accUserMode" : 0,
+      "itemType" : "SEPERATOR",
+      "name" : "seperator13",
+      "seperator" : true
     } ],
     "getPSSysImage" : {
       "cssClass" : "fa-solid fa-file-zipper"
@@ -3359,6 +3399,16 @@
       "id" : "UsrAppFunc0906968520"
     },
     "tooltip" : "多数据容器仅数据"
+  }, {
+    "accUserMode" : 0,
+    "itemType" : "SEPERATOR",
+    "name" : "seperator6",
+    "seperator" : true
+  }, {
+    "accUserMode" : 0,
+    "itemType" : "SEPERATOR",
+    "name" : "seperator7",
+    "seperator" : true
   } ],
   "name" : "appindex",
   "modelid" : "6A3E233F-FB4A-493B-B3C2-1860D5502904",

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

@@ -2233,6 +2233,7 @@
     "uniqueTag" : "WorkFlow__Usr0710265893"
   } ],
   "getAllPSDEDRControls" : [ ],
+  "getAllPSControls" : [ ],
   "getUserParam" : {
     "globalConfig.grid.editShowMode" : "cell",
     "ABC" : "ABCX",

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: