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/PSDATAENTITIES/MapData.json

@@ -741,8 +741,7 @@
     "serviceCodeName" : "Tooltip",
     "stdDataType" : 21,
     "stringLength" : 1000,
-    "valueFormat" : "%1$s",
-    "queryColumn" : false
+    "valueFormat" : "%1$s"
   }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "DATATYPE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Area/PSDEDQCODES/MYSQL5.json

@@ -7,9 +7,6 @@
     "name" : "查询条件"
   } ],
   "getPSDEDataQueryCodeExps" : [ {
-    "expression" : "t1.`TOOLTIP`",
-    "name" : "TOOLTIP"
-  }, {
     "expression" : "t1.`AREACODE`",
     "name" : "AREACODE"
   }, {
@@ -33,6 +30,9 @@
   }, {
     "expression" : "t1.`MAPDATANAME`",
     "name" : "MAPDATANAME"
+  }, {
+    "expression" : "t1.`TOOLTIP`",
+    "name" : "TOOLTIP"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -43,6 +43,6 @@
     "expression" : "t1.`VALUE`",
     "name" : "VALUE"
   } ],
-  "queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
+  "queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Area/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -2,9 +2,6 @@
   "dBType" : "MYSQL5",
   "name" : "MySQL5",
   "getPSDEDataQueryCodeExps" : [ {
-    "expression" : "t1.`TOOLTIP`",
-    "name" : "TOOLTIP"
-  }, {
     "expression" : "t1.`AREACODE`",
     "name" : "AREACODE"
   }, {
@@ -28,6 +25,9 @@
   }, {
     "expression" : "t1.`MAPDATANAME`",
     "name" : "MAPDATANAME"
+  }, {
+    "expression" : "t1.`TOOLTIP`",
+    "name" : "TOOLTIP"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -38,6 +38,6 @@
     "expression" : "t1.`VALUE`",
     "name" : "VALUE"
   } ],
-  "queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
+  "queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Point/PSDEDQCODES/MYSQL5.json

@@ -7,9 +7,6 @@
     "name" : "查询条件"
   } ],
   "getPSDEDataQueryCodeExps" : [ {
-    "expression" : "t1.`TOOLTIP`",
-    "name" : "TOOLTIP"
-  }, {
     "expression" : "t1.`AREACODE`",
     "name" : "AREACODE"
   }, {
@@ -33,6 +30,9 @@
   }, {
     "expression" : "t1.`MAPDATANAME`",
     "name" : "MAPDATANAME"
+  }, {
+    "expression" : "t1.`TOOLTIP`",
+    "name" : "TOOLTIP"
   }, {
     "expression" : "t1.`UPDATEDATE`",
     "name" : "UPDATEDATE"
@@ -43,6 +43,6 @@
     "expression" : "t1.`VALUE`",
     "name" : "VALUE"
   } ],
-  "queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
+  "queryCode" : "SELECT\nt1.`AREACODE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DATATYPE`,\nt1.`LATITUDE`,\nt1.`LONGITUDE`,\nt1.`MAPDATAID`,\nt1.`MAPDATANAME`,\nt1.`TOOLTIP`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`,\nt1.`VALUE`\nFROM `T_MAPDATA` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEDATAQUERIES/Point/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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: