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/TreeNode/PSTREEVIEWS/RefreshTree.json

@@ -62,16 +62,16 @@
     "name" : "treeexpbar_load"
   } ],
   "getPSControls" : [ {
-    "codeName" : "TreeRefreshTestdefaultexpand_cm",
+    "codeName" : "TreeRefreshTestexpandnode_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "defaultexpand_cm",
+    "name" : "expandnode_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "defaultexpand_cm"
+      "id" : "expandnode_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -81,7 +81,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "defaultexpand_cm_deuiaction1"
+        "id" : "expandnode_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -113,7 +113,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "defaultexpand_cm_deuiaction2"
+        "id" : "expandnode_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -152,7 +152,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "defaultexpand_cm_deuiaction3"
+        "id" : "expandnode_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -344,16 +344,16 @@
     "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "TreeRefreshTestexpandnode_cm",
+    "codeName" : "TreeRefreshTestrootnode_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "expandnode_cm",
+    "name" : "rootnode_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "expandnode_cm"
+      "id" : "rootnode_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -363,7 +363,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "expandnode_cm_deuiaction1"
+        "id" : "rootnode_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -395,7 +395,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "expandnode_cm_deuiaction2"
+        "id" : "rootnode_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -434,7 +434,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "expandnode_cm_deuiaction3"
+        "id" : "rootnode_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -485,16 +485,16 @@
     "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "TreeRefreshTestrootnode_cm",
+    "codeName" : "TreeRefreshTestdefaultexpand_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "rootnode_cm",
+    "name" : "defaultexpand_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "rootnode_cm"
+      "id" : "defaultexpand_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -504,7 +504,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "rootnode_cm_deuiaction1"
+        "id" : "defaultexpand_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -536,7 +536,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "rootnode_cm_deuiaction2"
+        "id" : "defaultexpand_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -575,7 +575,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "rootnode_cm_deuiaction3"
+        "id" : "defaultexpand_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -656,6 +656,38 @@
       "id" : "childNode"
     },
     "name" : "默认展开子节点 - 子节点数据",
+    "getParentPSAppDEField" : {
+      "name" : "PTREENODEID",
+      "codeName" : "Ptreenodeid"
+    },
+    "getParentPSDER1N" : {
+      "codeName" : "TreeNode",
+      "dERType" : "DER1N",
+      "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json",
+      "fKeyName" : "F7C67C7EB8CBF195CB",
+      "logicName" : "自关系",
+      "getMajorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "masterOrder" : -1,
+      "masterRS" : 0,
+      "minorCodeName" : "TreeNodes",
+      "getMinorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "name" : "DER1N_TREENODE_TREENODE_PTREENODEID",
+      "orderValue" : 100,
+      "getPSPickupDEField" : {
+        "name" : "PTREENODEID",
+        "codeName" : "Ptreenodeid"
+      },
+      "pickupDEFName" : "PTREENODEID",
+      "removeActionType" : -1,
+      "removeOrder" : 0,
+      "enableFKey" : true
+    },
     "getParentPSDETreeNode" : {
       "modelref" : true,
       "id" : "expandNode"
@@ -712,6 +744,38 @@
       "id" : "childNode"
     },
     "name" : "子节点数据 - 子节点数据",
+    "getParentPSAppDEField" : {
+      "name" : "PTREENODEID",
+      "codeName" : "Ptreenodeid"
+    },
+    "getParentPSDER1N" : {
+      "codeName" : "TreeNode",
+      "dERType" : "DER1N",
+      "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json",
+      "fKeyName" : "F7C67C7EB8CBF195CB",
+      "logicName" : "自关系",
+      "getMajorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "masterOrder" : -1,
+      "masterRS" : 0,
+      "minorCodeName" : "TreeNodes",
+      "getMinorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "name" : "DER1N_TREENODE_TREENODE_PTREENODEID",
+      "orderValue" : 100,
+      "getPSPickupDEField" : {
+        "name" : "PTREENODEID",
+        "codeName" : "Ptreenodeid"
+      },
+      "pickupDEFName" : "PTREENODEID",
+      "removeActionType" : -1,
+      "removeOrder" : 0,
+      "enableFKey" : true
+    },
     "getParentPSDETreeNode" : {
       "modelref" : true,
       "id" : "childNode"
@@ -721,9 +785,9 @@
   }, {
     "getChildPSDETreeNode" : {
       "modelref" : true,
-      "id" : "ROOT"
+      "id" : "defaultExpand"
     },
-    "name" : "默认根节点 - 默认根节点",
+    "name" : "默认根节点 - 默认展开",
     "getParentPSDETreeNode" : {
       "modelref" : true,
       "id" : "ROOT"

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

@@ -235,16 +235,16 @@
         "id" : "treeexpbar_tree"
       },
       "getPSControls" : [ {
-        "codeName" : "TreeRefreshTestdefaultexpand_cm",
+        "codeName" : "TreeRefreshTestexpandnode_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "刷新测试上下文菜单",
-        "name" : "defaultexpand_cm",
+        "name" : "expandnode_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
         },
         "getPSControlParam" : {
-          "id" : "defaultexpand_cm"
+          "id" : "expandnode_cm"
         },
         "getPSDEToolbarItems" : [ {
           "caption" : "刷新全部",
@@ -254,7 +254,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "defaultexpand_cm_deuiaction1"
+            "id" : "expandnode_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -286,7 +286,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "defaultexpand_cm_deuiaction2"
+            "id" : "expandnode_cm_deuiaction2"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -325,7 +325,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "defaultexpand_cm_deuiaction3"
+            "id" : "expandnode_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf044@FontAwesome",
@@ -517,16 +517,16 @@
         "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "TreeRefreshTestexpandnode_cm",
+        "codeName" : "TreeRefreshTestrootnode_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "刷新测试上下文菜单",
-        "name" : "expandnode_cm",
+        "name" : "rootnode_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
         },
         "getPSControlParam" : {
-          "id" : "expandnode_cm"
+          "id" : "rootnode_cm"
         },
         "getPSDEToolbarItems" : [ {
           "caption" : "刷新全部",
@@ -536,7 +536,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "expandnode_cm_deuiaction1"
+            "id" : "rootnode_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -568,7 +568,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "expandnode_cm_deuiaction2"
+            "id" : "rootnode_cm_deuiaction2"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -607,7 +607,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "expandnode_cm_deuiaction3"
+            "id" : "rootnode_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf044@FontAwesome",
@@ -658,16 +658,16 @@
         "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "codeName" : "TreeRefreshTestrootnode_cm",
+        "codeName" : "TreeRefreshTestdefaultexpand_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "刷新测试上下文菜单",
-        "name" : "rootnode_cm",
+        "name" : "defaultexpand_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
         },
         "getPSControlParam" : {
-          "id" : "rootnode_cm"
+          "id" : "defaultexpand_cm"
         },
         "getPSDEToolbarItems" : [ {
           "caption" : "刷新全部",
@@ -677,7 +677,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "rootnode_cm_deuiaction1"
+            "id" : "defaultexpand_cm_deuiaction1"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -709,7 +709,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "rootnode_cm_deuiaction2"
+            "id" : "defaultexpand_cm_deuiaction2"
           },
           "getPSSysImage" : {
             "glyph" : "xf021@FontAwesome",
@@ -748,7 +748,7 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "rootnode_cm_deuiaction3"
+            "id" : "defaultexpand_cm_deuiaction3"
           },
           "getPSSysImage" : {
             "glyph" : "xf044@FontAwesome",
@@ -829,6 +829,38 @@
           "id" : "childNode"
         },
         "name" : "默认展开子节点 - 子节点数据",
+        "getParentPSAppDEField" : {
+          "name" : "PTREENODEID",
+          "codeName" : "Ptreenodeid"
+        },
+        "getParentPSDER1N" : {
+          "codeName" : "TreeNode",
+          "dERType" : "DER1N",
+          "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json",
+          "fKeyName" : "F7C67C7EB8CBF195CB",
+          "logicName" : "自关系",
+          "getMajorPSDataEntity" : {
+            "modelref" : true,
+            "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+          },
+          "masterOrder" : -1,
+          "masterRS" : 0,
+          "minorCodeName" : "TreeNodes",
+          "getMinorPSDataEntity" : {
+            "modelref" : true,
+            "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+          },
+          "name" : "DER1N_TREENODE_TREENODE_PTREENODEID",
+          "orderValue" : 100,
+          "getPSPickupDEField" : {
+            "name" : "PTREENODEID",
+            "codeName" : "Ptreenodeid"
+          },
+          "pickupDEFName" : "PTREENODEID",
+          "removeActionType" : -1,
+          "removeOrder" : 0,
+          "enableFKey" : true
+        },
         "getParentPSDETreeNode" : {
           "modelref" : true,
           "id" : "expandNode"
@@ -885,6 +917,38 @@
           "id" : "childNode"
         },
         "name" : "子节点数据 - 子节点数据",
+        "getParentPSAppDEField" : {
+          "name" : "PTREENODEID",
+          "codeName" : "Ptreenodeid"
+        },
+        "getParentPSDER1N" : {
+          "codeName" : "TreeNode",
+          "dERType" : "DER1N",
+          "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json",
+          "fKeyName" : "F7C67C7EB8CBF195CB",
+          "logicName" : "自关系",
+          "getMajorPSDataEntity" : {
+            "modelref" : true,
+            "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+          },
+          "masterOrder" : -1,
+          "masterRS" : 0,
+          "minorCodeName" : "TreeNodes",
+          "getMinorPSDataEntity" : {
+            "modelref" : true,
+            "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+          },
+          "name" : "DER1N_TREENODE_TREENODE_PTREENODEID",
+          "orderValue" : 100,
+          "getPSPickupDEField" : {
+            "name" : "PTREENODEID",
+            "codeName" : "Ptreenodeid"
+          },
+          "pickupDEFName" : "PTREENODEID",
+          "removeActionType" : -1,
+          "removeOrder" : 0,
+          "enableFKey" : true
+        },
         "getParentPSDETreeNode" : {
           "modelref" : true,
           "id" : "childNode"
@@ -894,9 +958,9 @@
       }, {
         "getChildPSDETreeNode" : {
           "modelref" : true,
-          "id" : "ROOT"
+          "id" : "defaultExpand"
         },
-        "name" : "默认根节点 - 默认根节点",
+        "name" : "默认根节点 - 默认展开",
         "getParentPSDETreeNode" : {
           "modelref" : true,
           "id" : "ROOT"

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

@@ -9583,16 +9583,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -9621,16 +9621,16 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -9643,11 +9643,23 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg8"
       }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
@@ -9668,13 +9680,6 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
@@ -9682,26 +9687,21 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     }, {
       "name" : "关闭模式-无删除",
@@ -9710,10 +9710,10 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     } ]
   }, {

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: