tony001 部署微服务接口 [TrainSys，默认服务接口]

config.xml

@@ -55,6 +55,12 @@
 	  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/PSGANTTS/Usr12114819GanttView_Gantt.json

@@ -10,6 +10,111 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
   },
+  "getPSDETreeNodeRSs" : [ {
+    "getChildPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "top"
+    },
+    "name" : "默认根节点 - 顶层节点",
+    "getParentPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "ROOT"
+    },
+    "parentValueLevel" : 1,
+    "searchMode" : 3
+  }, {
+    "getChildPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "node"
+    },
+    "name" : "顶层节点 - 工作项节点",
+    "getParentPSAppDEField" : {
+      "name" : "PWORKITEMID",
+      "codeName" : "Pworkitemid"
+    },
+    "getParentPSDER1N" : {
+      "codeName" : "WORKITEM",
+      "dERType" : "DER1N",
+      "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDERS/DER1N_WORKITEM_WORKITEM_PWORKITEMID.json",
+      "fKeyName" : "F4AFCBB73015D37081",
+      "logicName" : "名称",
+      "getMajorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+      },
+      "masterOrder" : -1,
+      "masterRS" : 0,
+      "minorCodeName" : "WORKITEMs",
+      "getMinorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+      },
+      "minorServiceCodeName" : "WORKITEMs",
+      "name" : "DER1N_WORKITEM_WORKITEM_PWORKITEMID",
+      "orderValue" : 100,
+      "getPSPickupDEField" : {
+        "name" : "PWORKITEMID",
+        "codeName" : "Pworkitemid"
+      },
+      "pickupDEFName" : "PWORKITEMID",
+      "removeActionType" : -1,
+      "removeOrder" : 0,
+      "serviceCodeName" : "WORKITEM",
+      "enableFKey" : true
+    },
+    "getParentPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "top"
+    },
+    "parentValueLevel" : 1,
+    "searchMode" : 3
+  }, {
+    "getChildPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "node"
+    },
+    "name" : "工作项节点 - 工作项节点",
+    "getParentPSAppDEField" : {
+      "name" : "PWORKITEMID",
+      "codeName" : "Pworkitemid"
+    },
+    "getParentPSDER1N" : {
+      "codeName" : "WORKITEM",
+      "dERType" : "DER1N",
+      "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDERS/DER1N_WORKITEM_WORKITEM_PWORKITEMID.json",
+      "fKeyName" : "F4AFCBB73015D37081",
+      "logicName" : "名称",
+      "getMajorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+      },
+      "masterOrder" : -1,
+      "masterRS" : 0,
+      "minorCodeName" : "WORKITEMs",
+      "getMinorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+      },
+      "minorServiceCodeName" : "WORKITEMs",
+      "name" : "DER1N_WORKITEM_WORKITEM_PWORKITEMID",
+      "orderValue" : 100,
+      "getPSPickupDEField" : {
+        "name" : "PWORKITEMID",
+        "codeName" : "Pworkitemid"
+      },
+      "pickupDEFName" : "PWORKITEMID",
+      "removeActionType" : -1,
+      "removeOrder" : 0,
+      "serviceCodeName" : "WORKITEM",
+      "enableFKey" : true
+    },
+    "getParentPSDETreeNode" : {
+      "modelref" : true,
+      "id" : "node"
+    },
+    "parentValueLevel" : 1,
+    "searchMode" : 3
+  } ],
   "getPSDETreeNodes" : [ {
     "counterMode" : 0,
     "name" : "默认根节点",
@@ -17,7 +122,7 @@
     "nodeValue" : "root",
     "text" : "默认根节点",
     "treeNodeType" : "STATIC",
-    "hasPSDETreeNodeRSs" : false,
+    "hasPSDETreeNodeRSs" : true,
     "appendPNodeId" : false,
     "disableSelect" : false,
     "enableCheck" : false,
@@ -33,6 +138,82 @@
     "selectFirstOnly" : false,
     "selected" : false,
     "id" : "ROOT"
+  }, {
+    "counterMode" : 0,
+    "getIdPSAppDEField" : {
+      "name" : "WORKITEMID",
+      "codeName" : "WORKITEMId"
+    },
+    "maxSize" : -1,
+    "name" : "工作项节点",
+    "nodeType" : "node",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "WORKITEMNAME",
+      "codeName" : "WORKITEMName"
+    },
+    "treeNodeType" : "DE",
+    "hasPSDETreeNodeRSs" : true,
+    "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" : "node"
+  }, {
+    "counterMode" : 0,
+    "getIdPSAppDEField" : {
+      "name" : "WORKITEMID",
+      "codeName" : "WORKITEMId"
+    },
+    "maxSize" : -1,
+    "name" : "顶层节点",
+    "nodeType" : "top",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchTOPQUERY"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "WORKITEMNAME",
+      "codeName" : "WORKITEMName"
+    },
+    "treeNodeType" : "DE",
+    "hasPSDETreeNodeRSs" : true,
+    "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" : "top"
   } ],
   "prevDataItemName" : "prev",
   "sNDataItemName" : "sn",

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

@@ -41,6 +41,111 @@
       "showBusyIndicator" : true,
       "id" : "GANTT"
     },
+    "getPSDETreeNodeRSs" : [ {
+      "getChildPSDETreeNode" : {
+        "modelref" : true,
+        "id" : "top"
+      },
+      "name" : "默认根节点 - 顶层节点",
+      "getParentPSDETreeNode" : {
+        "modelref" : true,
+        "id" : "ROOT"
+      },
+      "parentValueLevel" : 1,
+      "searchMode" : 3
+    }, {
+      "getChildPSDETreeNode" : {
+        "modelref" : true,
+        "id" : "node"
+      },
+      "name" : "顶层节点 - 工作项节点",
+      "getParentPSAppDEField" : {
+        "name" : "PWORKITEMID",
+        "codeName" : "Pworkitemid"
+      },
+      "getParentPSDER1N" : {
+        "codeName" : "WORKITEM",
+        "dERType" : "DER1N",
+        "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDERS/DER1N_WORKITEM_WORKITEM_PWORKITEMID.json",
+        "fKeyName" : "F4AFCBB73015D37081",
+        "logicName" : "名称",
+        "getMajorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+        },
+        "masterOrder" : -1,
+        "masterRS" : 0,
+        "minorCodeName" : "WORKITEMs",
+        "getMinorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+        },
+        "minorServiceCodeName" : "WORKITEMs",
+        "name" : "DER1N_WORKITEM_WORKITEM_PWORKITEMID",
+        "orderValue" : 100,
+        "getPSPickupDEField" : {
+          "name" : "PWORKITEMID",
+          "codeName" : "Pworkitemid"
+        },
+        "pickupDEFName" : "PWORKITEMID",
+        "removeActionType" : -1,
+        "removeOrder" : 0,
+        "serviceCodeName" : "WORKITEM",
+        "enableFKey" : true
+      },
+      "getParentPSDETreeNode" : {
+        "modelref" : true,
+        "id" : "top"
+      },
+      "parentValueLevel" : 1,
+      "searchMode" : 3
+    }, {
+      "getChildPSDETreeNode" : {
+        "modelref" : true,
+        "id" : "node"
+      },
+      "name" : "工作项节点 - 工作项节点",
+      "getParentPSAppDEField" : {
+        "name" : "PWORKITEMID",
+        "codeName" : "Pworkitemid"
+      },
+      "getParentPSDER1N" : {
+        "codeName" : "WORKITEM",
+        "dERType" : "DER1N",
+        "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDERS/DER1N_WORKITEM_WORKITEM_PWORKITEMID.json",
+        "fKeyName" : "F4AFCBB73015D37081",
+        "logicName" : "名称",
+        "getMajorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+        },
+        "masterOrder" : -1,
+        "masterRS" : 0,
+        "minorCodeName" : "WORKITEMs",
+        "getMinorPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
+        },
+        "minorServiceCodeName" : "WORKITEMs",
+        "name" : "DER1N_WORKITEM_WORKITEM_PWORKITEMID",
+        "orderValue" : 100,
+        "getPSPickupDEField" : {
+          "name" : "PWORKITEMID",
+          "codeName" : "Pworkitemid"
+        },
+        "pickupDEFName" : "PWORKITEMID",
+        "removeActionType" : -1,
+        "removeOrder" : 0,
+        "serviceCodeName" : "WORKITEM",
+        "enableFKey" : true
+      },
+      "getParentPSDETreeNode" : {
+        "modelref" : true,
+        "id" : "node"
+      },
+      "parentValueLevel" : 1,
+      "searchMode" : 3
+    } ],
     "getPSDETreeNodes" : [ {
       "counterMode" : 0,
       "name" : "默认根节点",
@@ -48,7 +153,7 @@
       "nodeValue" : "root",
       "text" : "默认根节点",
       "treeNodeType" : "STATIC",
-      "hasPSDETreeNodeRSs" : false,
+      "hasPSDETreeNodeRSs" : true,
       "appendPNodeId" : false,
       "disableSelect" : false,
       "enableCheck" : false,
@@ -64,6 +169,82 @@
       "selectFirstOnly" : false,
       "selected" : false,
       "id" : "ROOT"
+    }, {
+      "counterMode" : 0,
+      "getIdPSAppDEField" : {
+        "name" : "WORKITEMID",
+        "codeName" : "WORKITEMId"
+      },
+      "maxSize" : -1,
+      "name" : "工作项节点",
+      "nodeType" : "node",
+      "getPSAppDEDataSet" : {
+        "modelref" : true,
+        "id" : "FetchDefault"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+      },
+      "getTextPSAppDEField" : {
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
+      },
+      "treeNodeType" : "DE",
+      "hasPSDETreeNodeRSs" : true,
+      "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" : "node"
+    }, {
+      "counterMode" : 0,
+      "getIdPSAppDEField" : {
+        "name" : "WORKITEMID",
+        "codeName" : "WORKITEMId"
+      },
+      "maxSize" : -1,
+      "name" : "顶层节点",
+      "nodeType" : "top",
+      "getPSAppDEDataSet" : {
+        "modelref" : true,
+        "id" : "FetchTOPQUERY"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
+      },
+      "getTextPSAppDEField" : {
+        "name" : "WORKITEMNAME",
+        "codeName" : "WORKITEMName"
+      },
+      "treeNodeType" : "DE",
+      "hasPSDETreeNodeRSs" : true,
+      "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" : "top"
     } ],
     "prevDataItemName" : "prev",
     "sNDataItemName" : "sn",

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>runtime</id>
+            <id>trainsys</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 8081
+EXPOSE 50000
 
 ADD trainsys-provider.jar /trainsys-provider.jar

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

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

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

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