fangzhihao 部署微服务接口 [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/Mob/PSAPPDATAENTITIES/TEST.json

@@ -5235,6 +5235,30 @@
       "modelref" : true,
       "id" : "Begin"
     }
+  }, {
+    "codeName" : "filterSwitching",
+    "defaultParamName" : "Default",
+    "logicName" : "过滤搜索栏切换",
+    "name" : "过滤搜索栏切换",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
   }, {
     "codeName" : "filterTrigger",
     "defaultParamName" : "Default",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json

@@ -5245,6 +5245,30 @@
       "modelref" : true,
       "id" : "Begin"
     }
+  }, {
+    "codeName" : "filterSwitching",
+    "defaultParamName" : "Default",
+    "logicName" : "过滤搜索栏切换",
+    "name" : "过滤搜索栏切换",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
   }, {
     "codeName" : "filterTrigger",
     "defaultParamName" : "Default",

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

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

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

@@ -6341,6 +6341,30 @@
       "modelref" : true,
       "id" : "Begin"
     }
+  }, {
+    "codeName" : "filterSwitching",
+    "defaultParamName" : "Default",
+    "logicName" : "过滤搜索栏切换",
+    "name" : "过滤搜索栏切换",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "leftPos" : 200,
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "topPos" : 200,
+      "parallelOutput" : true
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
   }, {
     "codeName" : "filterTrigger",
     "defaultParamName" : "Default",

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

@@ -218,7 +218,7 @@
         "contentWidth" : 20.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "view_searchform",
+        "name" : "filter_searchbar",
         "getPSLayout" : {
           "layout" : "FLEX"
         },

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

@@ -101,7 +101,7 @@
     },
     "getPSControlParam" : {
       "ctrlParams" : {
-        "TELEPORTTAG" : "\"#a0001\""
+        "TELEPORTTAG" : "#a0001"
       },
       "id" : "TOOLBAR"
     },

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

@@ -800,7 +800,7 @@
             },
             "getPSControlParam" : {
               "ctrlParams" : {
-                "TELEPORTTAG" : "\"#a0001\""
+                "TELEPORTTAG" : "#a0001"
               },
               "id" : "TOOLBAR"
             },

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

@@ -16808,16 +16808,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "uniqueTag" : "VMGroup2"
@@ -16849,10 +16849,10 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -16861,10 +16861,10 @@
         "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     } ],
     "uniqueTag" : "VMGroup3"
@@ -16883,10 +16883,10 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -16895,16 +16895,16 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     } ],
     "uniqueTag" : "VMGroup4"
@@ -16912,42 +16912,37 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
@@ -16956,34 +16951,39 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
     } ],
     "uniqueTag" : "VMGroup8"
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     } ],
     "uniqueTag" : "VMGroup5"
@@ -16991,16 +16991,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ],
     "uniqueTag" : "VMGroup6"
@@ -52779,7 +52779,7 @@
             "contentWidth" : 20.0,
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "view_searchform",
+            "name" : "filter_searchbar",
             "getPSLayout" : {
               "layout" : "FLEX"
             },
@@ -67549,6 +67549,30 @@
           "modelref" : true,
           "id" : "Begin"
         }
+      }, {
+        "codeName" : "filterSwitching",
+        "defaultParamName" : "Default",
+        "logicName" : "过滤搜索栏切换",
+        "name" : "过滤搜索栏切换",
+        "getPSDEUILogicNodes" : [ {
+          "codeName" : "Begin",
+          "leftPos" : 200,
+          "logicNodeType" : "BEGIN",
+          "name" : "开始",
+          "topPos" : 200,
+          "parallelOutput" : true
+        } ],
+        "getPSDEUILogicParams" : [ {
+          "codeName" : "Default",
+          "logicName" : "传入变量",
+          "name" : "传入变量",
+          "default" : true,
+          "entityParam" : true
+        } ],
+        "getStartPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "Begin"
+        }
       }, {
         "codeName" : "filterTrigger",
         "defaultParamName" : "Default",

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: