zhanghengfeng 部署微服务接口 [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/PSCHARTS/Usr0303970568.json

@@ -125,6 +125,7 @@
   "getUserParam" : {
     "EC.emphasis" : "{\"show\":true,\"itemStyle\":{\"opacity\":0.8,\"borderWidth\":6,\"borderColor\":\"\"},\"focus\":\"self\",\"scale\":true,\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0,0,0,0.5)\"}",
     "EC.title" : "{\"text\":\"总数：${params.count}\",\"left\":\"center\",\"top\":\"center\",\"textStyle\":{\"fontSize\":\"18px\"}}",
+    "EC.LLLKKK" : "{\"formatter\": \"function (params, ticket, callback) {const newDiv = document.createElement('div');Object.assign(newDiv, { style: 'margin: 0px 0 0;line-height:1;' });const items = Array.isArray(params) ? params : [params];const axisVal = items[0].axisValue;const nodes = items.map((item, index) => {const margin = index === 0 ? '0px 0 0' : '10px 0 0';const { seriesName, marker, data } = item;const yData = data[1];const yValue = data[2] || {};const showValue =  yValue._seriesModelId === 'line_1' ? `${yData}%` : yData;return `<div style='margin: 0px 0 0;line-height:1;'><div style='margin:${margin};line-height:1;'>${marker}<span style='font-size:14px;color:#666;font-weight:400;margin-left:2px'>${seriesName}</span><span style='float:right;margin-left:20px;font-size:14px;color:#666;font-weight:900'>${showValue}</span><div style='clear:both'></div></div><div style='clear:both'></div></div>`;});const newDivContent = `<div style='margin: 0px 0 0;line-height:1;'><div style='font-size:14px;color:#666;font-weight:400;line-height:1;'>${axisVal}</div><div style='margin: 10px 0 0;line-height:1;'>${nodes.join('')}<div style='clear:both'></div></div><div style='clear:both'></div></div><div style='clear:both'></div>`;newDiv.innerHTML = newDivContent;return newDiv;}\"}",
     "EC.legend" : "{\"left\":\"center\",\"bottom\":0,\"orient\":\"horizontal\",\"icon\":\"circle\",\"type\":\"plain\"}",
     "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
   }

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTTestChartView.json

@@ -306,6 +306,7 @@
     "getUserParam" : {
       "EC.emphasis" : "{\"show\":true,\"itemStyle\":{\"opacity\":0.8,\"borderWidth\":6,\"borderColor\":\"\"},\"focus\":\"self\",\"scale\":true,\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0,0,0,0.5)\"}",
       "EC.title" : "{\"text\":\"总数：${params.count}\",\"left\":\"center\",\"top\":\"center\",\"textStyle\":{\"fontSize\":\"18px\"}}",
+      "EC.LLLKKK" : "{\"formatter\": \"function (params, ticket, callback) {const newDiv = document.createElement('div');Object.assign(newDiv, { style: 'margin: 0px 0 0;line-height:1;' });const items = Array.isArray(params) ? params : [params];const axisVal = items[0].axisValue;const nodes = items.map((item, index) => {const margin = index === 0 ? '0px 0 0' : '10px 0 0';const { seriesName, marker, data } = item;const yData = data[1];const yValue = data[2] || {};const showValue =  yValue._seriesModelId === 'line_1' ? `${yData}%` : yData;return `<div style='margin: 0px 0 0;line-height:1;'><div style='margin:${margin};line-height:1;'>${marker}<span style='font-size:14px;color:#666;font-weight:400;margin-left:2px'>${seriesName}</span><span style='float:right;margin-left:20px;font-size:14px;color:#666;font-weight:900'>${showValue}</span><div style='clear:both'></div></div><div style='clear:both'></div></div>`;});const newDivContent = `<div style='margin: 0px 0 0;line-height:1;'><div style='font-size:14px;color:#666;font-weight:400;line-height:1;'>${axisVal}</div><div style='margin: 10px 0 0;line-height:1;'>${nodes.join('')}<div style='clear:both'></div></div><div style='clear:both'></div></div><div style='clear:both'></div>`;newDiv.innerHTML = newDivContent;return newDiv;}\"}",
       "EC.legend" : "{\"left\":\"center\",\"bottom\":0,\"orient\":\"horizontal\",\"icon\":\"circle\",\"type\":\"plain\"}",
       "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
     }

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

@@ -125,6 +125,7 @@
   "getUserParam" : {
     "EC.emphasis" : "{\"show\":true,\"itemStyle\":{\"opacity\":0.8,\"borderWidth\":6,\"borderColor\":\"\"},\"focus\":\"self\",\"scale\":true,\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0,0,0,0.5)\"}",
     "EC.title" : "{\"text\":\"总数：${params.count}\",\"left\":\"center\",\"top\":\"center\",\"textStyle\":{\"fontSize\":\"18px\"}}",
+    "EC.LLLKKK" : "{\"formatter\": \"function (params, ticket, callback) {const newDiv = document.createElement('div');Object.assign(newDiv, { style: 'margin: 0px 0 0;line-height:1;' });const items = Array.isArray(params) ? params : [params];const axisVal = items[0].axisValue;const nodes = items.map((item, index) => {const margin = index === 0 ? '0px 0 0' : '10px 0 0';const { seriesName, marker, data } = item;const yData = data[1];const yValue = data[2] || {};const showValue =  yValue._seriesModelId === 'line_1' ? `${yData}%` : yData;return `<div style='margin: 0px 0 0;line-height:1;'><div style='margin:${margin};line-height:1;'>${marker}<span style='font-size:14px;color:#666;font-weight:400;margin-left:2px'>${seriesName}</span><span style='float:right;margin-left:20px;font-size:14px;color:#666;font-weight:900'>${showValue}</span><div style='clear:both'></div></div><div style='clear:both'></div></div>`;});const newDivContent = `<div style='margin: 0px 0 0;line-height:1;'><div style='font-size:14px;color:#666;font-weight:400;line-height:1;'>${axisVal}</div><div style='margin: 10px 0 0;line-height:1;'>${nodes.join('')}<div style='clear:both'></div></div><div style='clear:both'></div></div><div style='clear:both'></div>`;newDiv.innerHTML = newDivContent;return newDiv;}\"}",
     "EC.legend" : "{\"left\":\"center\",\"bottom\":0,\"orient\":\"horizontal\",\"icon\":\"circle\",\"type\":\"plain\"}",
     "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
   }

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

@@ -306,6 +306,7 @@
     "getUserParam" : {
       "EC.emphasis" : "{\"show\":true,\"itemStyle\":{\"opacity\":0.8,\"borderWidth\":6,\"borderColor\":\"\"},\"focus\":\"self\",\"scale\":true,\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0,0,0,0.5)\"}",
       "EC.title" : "{\"text\":\"总数：${params.count}\",\"left\":\"center\",\"top\":\"center\",\"textStyle\":{\"fontSize\":\"18px\"}}",
+      "EC.LLLKKK" : "{\"formatter\": \"function (params, ticket, callback) {const newDiv = document.createElement('div');Object.assign(newDiv, { style: 'margin: 0px 0 0;line-height:1;' });const items = Array.isArray(params) ? params : [params];const axisVal = items[0].axisValue;const nodes = items.map((item, index) => {const margin = index === 0 ? '0px 0 0' : '10px 0 0';const { seriesName, marker, data } = item;const yData = data[1];const yValue = data[2] || {};const showValue =  yValue._seriesModelId === 'line_1' ? `${yData}%` : yData;return `<div style='margin: 0px 0 0;line-height:1;'><div style='margin:${margin};line-height:1;'>${marker}<span style='font-size:14px;color:#666;font-weight:400;margin-left:2px'>${seriesName}</span><span style='float:right;margin-left:20px;font-size:14px;color:#666;font-weight:900'>${showValue}</span><div style='clear:both'></div></div><div style='clear:both'></div></div>`;});const newDivContent = `<div style='margin: 0px 0 0;line-height:1;'><div style='font-size:14px;color:#666;font-weight:400;line-height:1;'>${axisVal}</div><div style='margin: 10px 0 0;line-height:1;'>${nodes.join('')}<div style='clear:both'></div></div><div style='clear:both'></div></div><div style='clear:both'></div>`;newDiv.innerHTML = newDivContent;return newDiv;}\"}",
       "EC.legend" : "{\"left\":\"center\",\"bottom\":0,\"orient\":\"horizontal\",\"icon\":\"circle\",\"type\":\"plain\"}",
       "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
     }

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

@@ -125,6 +125,7 @@
   "getUserParam" : {
     "EC.emphasis" : "{\"show\":true,\"itemStyle\":{\"opacity\":0.8,\"borderWidth\":6,\"borderColor\":\"\"},\"focus\":\"self\",\"scale\":true,\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0,0,0,0.5)\"}",
     "EC.title" : "{\"text\":\"总数：${params.count}\",\"left\":\"center\",\"top\":\"center\",\"textStyle\":{\"fontSize\":\"18px\"}}",
+    "EC.LLLKKK" : "{\"formatter\": \"function (params, ticket, callback) {const newDiv = document.createElement('div');Object.assign(newDiv, { style: 'margin: 0px 0 0;line-height:1;' });const items = Array.isArray(params) ? params : [params];const axisVal = items[0].axisValue;const nodes = items.map((item, index) => {const margin = index === 0 ? '0px 0 0' : '10px 0 0';const { seriesName, marker, data } = item;const yData = data[1];const yValue = data[2] || {};const showValue =  yValue._seriesModelId === 'line_1' ? `${yData}%` : yData;return `<div style='margin: 0px 0 0;line-height:1;'><div style='margin:${margin};line-height:1;'>${marker}<span style='font-size:14px;color:#666;font-weight:400;margin-left:2px'>${seriesName}</span><span style='float:right;margin-left:20px;font-size:14px;color:#666;font-weight:900'>${showValue}</span><div style='clear:both'></div></div><div style='clear:both'></div></div>`;});const newDivContent = `<div style='margin: 0px 0 0;line-height:1;'><div style='font-size:14px;color:#666;font-weight:400;line-height:1;'>${axisVal}</div><div style='margin: 10px 0 0;line-height:1;'>${nodes.join('')}<div style='clear:both'></div></div><div style='clear:both'></div></div><div style='clear:both'></div>`;newDiv.innerHTML = newDivContent;return newDiv;}\"}",
     "EC.legend" : "{\"left\":\"center\",\"bottom\":0,\"orient\":\"horizontal\",\"icon\":\"circle\",\"type\":\"plain\"}",
     "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
   }

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

@@ -305,6 +305,7 @@
     "getUserParam" : {
       "EC.emphasis" : "{\"show\":true,\"itemStyle\":{\"opacity\":0.8,\"borderWidth\":6,\"borderColor\":\"\"},\"focus\":\"self\",\"scale\":true,\"shadowBlur\":10,\"shadowOffsetX\":0,\"shadowColor\":\"rgba(0,0,0,0.5)\"}",
       "EC.title" : "{\"text\":\"总数：${params.count}\",\"left\":\"center\",\"top\":\"center\",\"textStyle\":{\"fontSize\":\"18px\"}}",
+      "EC.LLLKKK" : "{\"formatter\": \"function (params, ticket, callback) {const newDiv = document.createElement('div');Object.assign(newDiv, { style: 'margin: 0px 0 0;line-height:1;' });const items = Array.isArray(params) ? params : [params];const axisVal = items[0].axisValue;const nodes = items.map((item, index) => {const margin = index === 0 ? '0px 0 0' : '10px 0 0';const { seriesName, marker, data } = item;const yData = data[1];const yValue = data[2] || {};const showValue =  yValue._seriesModelId === 'line_1' ? `${yData}%` : yData;return `<div style='margin: 0px 0 0;line-height:1;'><div style='margin:${margin};line-height:1;'>${marker}<span style='font-size:14px;color:#666;font-weight:400;margin-left:2px'>${seriesName}</span><span style='float:right;margin-left:20px;font-size:14px;color:#666;font-weight:900'>${showValue}</span><div style='clear:both'></div></div><div style='clear:both'></div></div>`;});const newDivContent = `<div style='margin: 0px 0 0;line-height:1;'><div style='font-size:14px;color:#666;font-weight:400;line-height:1;'>${axisVal}</div><div style='margin: 10px 0 0;line-height:1;'>${nodes.join('')}<div style='clear:both'></div></div><div style='clear:both'></div></div><div style='clear:both'></div>`;newDiv.innerHTML = newDivContent;return newDiv;}\"}",
       "EC.legend" : "{\"left\":\"center\",\"bottom\":0,\"orient\":\"horizontal\",\"icon\":\"circle\",\"type\":\"plain\"}",
       "EC.color" : "[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\",\"#5470c6\",\"#91cc75\"]"
     }

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: