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/PSMODULES/Test/PSCODELISTS/TestAll.json

 {
+  "getBKColorPSDEField" : {
+    "name" : "FIELD11",
+    "codeName" : "Field11"
+  },
+  "getClsPSDEField" : {
+    "name" : "FIELD21",
+    "codeName" : "FIELD21"
+  },
   "codeListTag" : "Test__TestAll",
   "codeListType" : "DYNAMIC",
   "codeName" : "TestAll",
+  "getColorPSDEField" : {
+    "name" : "FIELD16",
+    "codeName" : "FIELD16"
+  },
   "customCond" : "{N_TESTNAME_LIKE: \"1\", navParam: \"%srfpersonname%\", size: \"%size%\"}",
   "getDataPSDEField" : {
     "name" : "FIELD8",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPCODELISTS/Test__TestAll.json

 {
+  "getBKColorPSAppDEField" : {
+    "name" : "FIELD11",
+    "codeName" : "Field11"
+  },
+  "getClsPSAppDEField" : {
+    "name" : "FIELD21",
+    "codeName" : "FIELD21"
+  },
   "codeListTag" : "Test__TestAll",
   "codeListType" : "DYNAMIC",
   "codeName" : "Test__TestAll",
+  "getColorPSAppDEField" : {
+    "name" : "FIELD16",
+    "codeName" : "FIELD16"
+  },
   "customCond" : "{N_TESTNAME_LIKE: \"1\", navParam: \"%srfpersonname%\", size: \"%size%\"}",
   "getDataPSAppDEField" : {
     "name" : "FIELD8",

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

 {
+  "getBKColorPSAppDEField" : {
+    "name" : "FIELD11",
+    "codeName" : "Field11"
+  },
+  "getClsPSAppDEField" : {
+    "name" : "FIELD21",
+    "codeName" : "FIELD21"
+  },
   "codeListTag" : "Test__TestAll",
   "codeListType" : "DYNAMIC",
   "codeName" : "Test__TestAll",
+  "getColorPSAppDEField" : {
+    "name" : "FIELD16",
+    "codeName" : "FIELD16"
+  },
   "customCond" : "{N_TESTNAME_LIKE: \"1\", navParam: \"%srfpersonname%\", size: \"%size%\"}",
   "getDataPSAppDEField" : {
     "name" : "FIELD8",

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

@@ -442,9 +442,21 @@
     } ],
     "enableCache" : true
   }, {
+    "getBKColorPSAppDEField" : {
+      "name" : "FIELD11",
+      "codeName" : "Field11"
+    },
+    "getClsPSAppDEField" : {
+      "name" : "FIELD21",
+      "codeName" : "FIELD21"
+    },
     "codeListTag" : "Test__TestAll",
     "codeListType" : "DYNAMIC",
     "codeName" : "Test__TestAll",
+    "getColorPSAppDEField" : {
+      "name" : "FIELD16",
+      "codeName" : "FIELD16"
+    },
     "customCond" : "{N_TESTNAME_LIKE: \"1\", navParam: \"%srfpersonname%\", size: \"%size%\"}",
     "getDataPSAppDEField" : {
       "name" : "FIELD8",
@@ -12911,6 +12923,12 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
+    }, {
       "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12928,12 +12946,6 @@
         "modelref" : true,
         "id" : "ViewMsg7"
       }
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
     } ]
   }, {
     "codeName" : "VMGroup8",
@@ -12952,11 +12964,12 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
@@ -12964,19 +12977,11 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
@@ -12989,6 +12994,13 @@
         "modelref" : true,
         "id" : "ViewMsg9"
       }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",

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: