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

@@ -1579,16 +1579,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

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" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+    "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "分组树节点上下文菜单",
-    "name" : "item_cm",
+    "name" : "group_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
     },
     "getPSControlParam" : {
-      "id" : "item_cm"
+      "id" : "group_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "编辑",
@@ -82,14 +82,14 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "item_cm_deuiaction1"
+        "id" : "group_cm_deuiaction1"
       },
       "getPSUIAction" : {
         "actionTarget" : "SINGLEDATA",
         "caption" : "编辑",
-        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
         "frontProcessType" : "OTHER",
-        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
         "name" : "编辑",
         "getPSAppDEUILogic" : {
           "modelref" : true,
@@ -101,11 +101,11 @@
         },
         "timeout" : 60000,
         "uIActionMode" : "FRONT",
-        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
         "uIActionType" : "DEUIACTION",
         "uILogicAttachMode" : "REPLACE",
         "uILogicType" : "DELOGIC",
-        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
+        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click@WORKITEM"
       },
       "tooltip" : "编辑",
       "uIActionTarget" : "SINGLEDATA",
@@ -119,14 +119,14 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "item_cm_deuiaction2"
+        "id" : "group_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "actionTarget" : "SINGLEDATA",
         "caption" : "删除",
-        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
         "frontProcessType" : "OTHER",
-        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
         "name" : "删除",
         "getPSAppDEUILogic" : {
           "modelref" : true,
@@ -138,11 +138,11 @@
         },
         "timeout" : 60000,
         "uIActionMode" : "FRONT",
-        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
         "uIActionType" : "DEUIACTION",
         "uILogicAttachMode" : "REPLACE",
         "uILogicType" : "DELOGIC",
-        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
+        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click@WORKITEM"
       },
       "tooltip" : "删除",
       "uIActionTarget" : "SINGLEDATA",
@@ -152,16 +152,16 @@
     "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "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" : [ {
       "caption" : "编辑",
@@ -171,14 +171,14 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "group_cm_deuiaction1"
+        "id" : "item_cm_deuiaction1"
       },
       "getPSUIAction" : {
         "actionTarget" : "SINGLEDATA",
         "caption" : "编辑",
-        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
+        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
         "frontProcessType" : "OTHER",
-        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
+        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
         "name" : "编辑",
         "getPSAppDEUILogic" : {
           "modelref" : true,
@@ -190,11 +190,11 @@
         },
         "timeout" : 60000,
         "uIActionMode" : "FRONT",
-        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
+        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
         "uIActionType" : "DEUIACTION",
         "uILogicAttachMode" : "REPLACE",
         "uILogicType" : "DELOGIC",
-        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click@WORKITEM"
+        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
       },
       "tooltip" : "编辑",
       "uIActionTarget" : "SINGLEDATA",
@@ -208,14 +208,14 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "group_cm_deuiaction2"
+        "id" : "item_cm_deuiaction2"
       },
       "getPSUIAction" : {
         "actionTarget" : "SINGLEDATA",
         "caption" : "删除",
-        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
+        "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
         "frontProcessType" : "OTHER",
-        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
+        "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
         "name" : "删除",
         "getPSAppDEUILogic" : {
           "modelref" : true,
@@ -227,11 +227,11 @@
         },
         "timeout" : 60000,
         "uIActionMode" : "FRONT",
-        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
+        "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
         "uIActionType" : "DEUIACTION",
         "uILogicAttachMode" : "REPLACE",
         "uILogicType" : "DELOGIC",
-        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click@WORKITEM"
+        "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
       },
       "tooltip" : "删除",
       "uIActionTarget" : "SINGLEDATA",
@@ -1037,6 +1037,44 @@
     "selectFirstOnly" : false,
     "selected" : false,
     "id" : "node_4"
+  }, {
+    "counterMode" : 0,
+    "getIdPSAppDEField" : {
+      "name" : "WORKITEMID",
+      "codeName" : "WORKITEMId"
+    },
+    "maxSize" : -1,
+    "name" : "根节点分组项",
+    "nodeType" : "rootitem",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchTOPQUERY"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "WORKITEMNAME",
+      "codeName" : "WORKITEMName"
+    },
+    "treeNodeType" : "DE",
+    "hasPSDETreeNodeRSs" : false,
+    "appendPNodeId" : false,
+    "disableSelect" : false,
+    "enableCheck" : false,
+    "enableEditData" : false,
+    "enableNewData" : false,
+    "enableQuickCreate" : false,
+    "enableQuickSearch" : false,
+    "enableRemoveData" : false,
+    "enableViewData" : false,
+    "expandFirstOnly" : false,
+    "expanded" : false,
+    "rootNode" : false,
+    "selectFirstOnly" : false,
+    "selected" : false,
+    "id" : "rootitem"
   } ],
   "getPSSysPFPlugin" : {
     "pluginType" : "TREE_RENDER",

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

@@ -261,16 +261,16 @@
         "id" : "treeexpbar_tree"
       },
       "getPSControls" : [ {
-        "codeName" : "Usr12264106CustomTreeGridNodesExpViewitem_cm",
+        "codeName" : "Usr12264106CustomTreeGridNodesExpViewgroup_cm",
         "controlType" : "CONTEXTMENU",
         "logicName" : "分组树节点上下文菜单",
-        "name" : "item_cm",
+        "name" : "group_cm",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
         },
         "getPSControlParam" : {
-          "id" : "item_cm"
+          "id" : "group_cm"
         },
         "getPSDEToolbarItems" : [ {
           "caption" : "编辑",
@@ -280,14 +280,14 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "item_cm_deuiaction1"
+            "id" : "group_cm_deuiaction1"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
             "caption" : "编辑",
-            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
             "frontProcessType" : "OTHER",
-            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
             "name" : "编辑",
             "getPSAppDEUILogic" : {
               "modelref" : true,
@@ -299,11 +299,11 @@
             },
             "timeout" : 60000,
             "uIActionMode" : "FRONT",
-            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
+            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
             "uIActionType" : "DEUIACTION",
             "uILogicAttachMode" : "REPLACE",
             "uILogicType" : "DELOGIC",
-            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
+            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click@WORKITEM"
           },
           "tooltip" : "编辑",
           "uIActionTarget" : "SINGLEDATA",
@@ -317,14 +317,14 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "item_cm_deuiaction2"
+            "id" : "group_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
             "caption" : "删除",
-            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
             "frontProcessType" : "OTHER",
-            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
             "name" : "删除",
             "getPSAppDEUILogic" : {
               "modelref" : true,
@@ -336,11 +336,11 @@
             },
             "timeout" : 60000,
             "uIActionMode" : "FRONT",
-            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
+            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
             "uIActionType" : "DEUIACTION",
             "uILogicAttachMode" : "REPLACE",
             "uILogicType" : "DELOGIC",
-            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
+            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click@WORKITEM"
           },
           "tooltip" : "删除",
           "uIActionTarget" : "SINGLEDATA",
@@ -350,16 +350,16 @@
         "modelid" : "C0E32A1D-908F-4D58-9BA2-B0301B7433D6",
         "modeltype" : "PSDETOOLBAR"
       }, {
-        "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" : [ {
           "caption" : "编辑",
@@ -369,14 +369,14 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "group_cm_deuiaction1"
+            "id" : "item_cm_deuiaction1"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
             "caption" : "编辑",
-            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
+            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
             "frontProcessType" : "OTHER",
-            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
+            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
             "name" : "编辑",
             "getPSAppDEUILogic" : {
               "modelref" : true,
@@ -388,11 +388,11 @@
             },
             "timeout" : 60000,
             "uIActionMode" : "FRONT",
-            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click",
+            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click",
             "uIActionType" : "DEUIACTION",
             "uILogicAttachMode" : "REPLACE",
             "uILogicType" : "DELOGIC",
-            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction1_click@WORKITEM"
+            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction1_click@WORKITEM"
           },
           "tooltip" : "编辑",
           "uIActionTarget" : "SINGLEDATA",
@@ -406,14 +406,14 @@
           "noPrivDisplayMode" : 2,
           "getPSAppViewUIAction" : {
             "modelref" : true,
-            "id" : "group_cm_deuiaction2"
+            "id" : "item_cm_deuiaction2"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
             "caption" : "删除",
-            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
+            "codeName" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
             "frontProcessType" : "OTHER",
-            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
+            "fullCodeName" : "WORKITEM_toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
             "name" : "删除",
             "getPSAppDEUILogic" : {
               "modelref" : true,
@@ -425,11 +425,11 @@
             },
             "timeout" : 60000,
             "uIActionMode" : "FRONT",
-            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click",
+            "uIActionTag" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click",
             "uIActionType" : "DEUIACTION",
             "uILogicAttachMode" : "REPLACE",
             "uILogicType" : "DELOGIC",
-            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewgroup_cm_deuiaction2_click@WORKITEM"
+            "id" : "toolbar_Usr12264106CustomTreeGridNodesExpViewitem_cm_deuiaction2_click@WORKITEM"
           },
           "tooltip" : "删除",
           "uIActionTarget" : "SINGLEDATA",
@@ -1235,6 +1235,44 @@
         "selectFirstOnly" : false,
         "selected" : false,
         "id" : "node_4"
+      }, {
+        "counterMode" : 0,
+        "getIdPSAppDEField" : {
+          "name" : "WORKITEMID",
+          "codeName" : "WORKITEMId"
+        },
+        "maxSize" : -1,
+        "name" : "根节点分组项",
+        "nodeType" : "rootitem",
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchTOPQUERY"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+        },
+        "getTextPSAppDEField" : {
+          "name" : "WORKITEMNAME",
+          "codeName" : "WORKITEMName"
+        },
+        "treeNodeType" : "DE",
+        "hasPSDETreeNodeRSs" : false,
+        "appendPNodeId" : false,
+        "disableSelect" : false,
+        "enableCheck" : false,
+        "enableEditData" : false,
+        "enableNewData" : false,
+        "enableQuickCreate" : false,
+        "enableQuickSearch" : false,
+        "enableRemoveData" : false,
+        "enableViewData" : false,
+        "expandFirstOnly" : false,
+        "expanded" : false,
+        "rootNode" : false,
+        "selectFirstOnly" : false,
+        "selected" : false,
+        "id" : "rootitem"
       } ],
       "getPSSysPFPlugin" : {
         "pluginType" : "TREE_RENDER",

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: