lxm1993 部署微服务接口 [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.json

@@ -2199,7 +2199,7 @@
       "invokeMethod" : "newTreeNode",
       "getInvokeParam" : {
         "modelref" : true,
-        "id" : "type"
+        "id" : "input"
       },
       "leftPos" : 535,
       "logicNodeType" : "VIEWCTRLINVOKE",
@@ -2223,27 +2223,65 @@
         }
       } ],
       "getPSDEUILogicNodeParams" : [ {
+        "dstFieldName" : "test_field",
+        "getDstPSDEUILogicParam" : {
+          "modelref" : true,
+          "id" : "defaultValue"
+        },
+        "name" : "context[srfusername] ==> defaultValue[test_field]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcFieldName" : "srfusername",
+        "getSrcPSDEUILogicParam" : {
+          "modelref" : true,
+          "id" : "context"
+        },
+        "srcValueType" : "SRCDLPARAM"
+      }, {
+        "dstFieldName" : "nodeType",
         "getDstPSDEUILogicParam" : {
           "modelref" : true,
-          "id" : "type"
+          "id" : "input"
         },
-        "name" : "直接值[item] ==> type",
+        "name" : "直接值[item] ==> input[nodeType]",
         "paramAction" : "SETPARAMVALUE",
         "srcValue" : "item",
         "srcValueType" : "SRCVALUE"
+      }, {
+        "dstFieldName" : "defaultValue",
+        "getDstPSDEUILogicParam" : {
+          "modelref" : true,
+          "id" : "input"
+        },
+        "name" : "defaultValue ==> input[defaultValue]",
+        "paramAction" : "SETPARAMVALUE",
+        "getSrcPSDEUILogicParam" : {
+          "modelref" : true,
+          "id" : "defaultValue"
+        },
+        "srcValueType" : "SRCDLPARAM"
       } ],
       "topPos" : 208
     } ],
     "getPSDEUILogicParams" : [ {
+      "codeName" : "defaultValue",
+      "logicName" : "默认值",
+      "name" : "默认值",
+      "entityParam" : true
+    }, {
+      "codeName" : "input",
+      "logicName" : "新建节点参数",
+      "name" : "新建节点参数",
+      "entityParam" : true
+    }, {
       "codeName" : "treeexpbar_tree",
       "logicName" : "树分页导航树部件",
       "name" : "树分页导航树部件",
       "ctrlParam" : true
     }, {
-      "codeName" : "type",
-      "logicName" : "新建节点类型",
-      "name" : "新建节点类型",
-      "entityParam" : true
+      "codeName" : "context",
+      "logicName" : "上下文对象",
+      "name" : "上下文对象",
+      "navContextParam" : true
     }, {
       "codeName" : "Default",
       "logicName" : "传入变量",

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

@@ -12491,10 +12491,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-错误信息",
@@ -12503,10 +12503,10 @@
         "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       }
     } ]
   }, {
@@ -12523,10 +12523,10 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
       "name" : "消息位置-弹出",
@@ -12535,10 +12535,10 @@
         "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -12551,16 +12551,10 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
@@ -12569,23 +12563,17 @@
         "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
@@ -12601,15 +12589,27 @@
         "id" : "ViewMsg4"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "关闭模式-无删除",
@@ -12618,26 +12618,26 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],
@@ -71417,7 +71417,7 @@
           "invokeMethod" : "newTreeNode",
           "getInvokeParam" : {
             "modelref" : true,
-            "id" : "type"
+            "id" : "input"
           },
           "leftPos" : 535,
           "logicNodeType" : "VIEWCTRLINVOKE",
@@ -71441,27 +71441,65 @@
             }
           } ],
           "getPSDEUILogicNodeParams" : [ {
+            "dstFieldName" : "test_field",
+            "getDstPSDEUILogicParam" : {
+              "modelref" : true,
+              "id" : "defaultValue"
+            },
+            "name" : "context[srfusername] ==> defaultValue[test_field]",
+            "paramAction" : "SETPARAMVALUE",
+            "srcFieldName" : "srfusername",
+            "getSrcPSDEUILogicParam" : {
+              "modelref" : true,
+              "id" : "context"
+            },
+            "srcValueType" : "SRCDLPARAM"
+          }, {
+            "dstFieldName" : "nodeType",
             "getDstPSDEUILogicParam" : {
               "modelref" : true,
-              "id" : "type"
+              "id" : "input"
             },
-            "name" : "直接值[item] ==> type",
+            "name" : "直接值[item] ==> input[nodeType]",
             "paramAction" : "SETPARAMVALUE",
             "srcValue" : "item",
             "srcValueType" : "SRCVALUE"
+          }, {
+            "dstFieldName" : "defaultValue",
+            "getDstPSDEUILogicParam" : {
+              "modelref" : true,
+              "id" : "input"
+            },
+            "name" : "defaultValue ==> input[defaultValue]",
+            "paramAction" : "SETPARAMVALUE",
+            "getSrcPSDEUILogicParam" : {
+              "modelref" : true,
+              "id" : "defaultValue"
+            },
+            "srcValueType" : "SRCDLPARAM"
           } ],
           "topPos" : 208
         } ],
         "getPSDEUILogicParams" : [ {
+          "codeName" : "defaultValue",
+          "logicName" : "默认值",
+          "name" : "默认值",
+          "entityParam" : true
+        }, {
+          "codeName" : "input",
+          "logicName" : "新建节点参数",
+          "name" : "新建节点参数",
+          "entityParam" : true
+        }, {
           "codeName" : "treeexpbar_tree",
           "logicName" : "树分页导航树部件",
           "name" : "树分页导航树部件",
           "ctrlParam" : true
         }, {
-          "codeName" : "type",
-          "logicName" : "新建节点类型",
-          "name" : "新建节点类型",
-          "entityParam" : true
+          "codeName" : "context",
+          "logicName" : "上下文对象",
+          "name" : "上下文对象",
+          "navContextParam" : true
         }, {
           "codeName" : "Default",
           "logicName" : "传入变量",

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: