chitanda 部署微服务接口 [TrainSys，默认服务接口]

10de9967 · ibizdev · 2b176077 · 10de9967 · 10de9967 · 10de9967
--- a/config.xml
+++ b/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>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1209,16 +1209,16 @@
    "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ],
    "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
@@ -37,46 +37,6 @@
    }
  } ],
  "getPSDEFormItemVRs" : [ {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule6",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-      "name" : "field5值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "SYSVALUERULE",
-          "dEFName" : "FIELD5",
-          "name" : "[系统值规则]脚本值规则测试",
-          "getPSSysValueRule" : {
-            "codeName" : "ValueRule20",
-            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-            "mOSFilePath" : "pssysvaluerules/ValueRule20",
-            "name" : "脚本值规则测试",
-            "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-            "ruleInfo" : "脚本校验",
-            "ruleType" : "SCRIPT",
-            "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "ruleInfo" : "脚本校验"
-        } ],
-        "ruleInfo" : "脚本校验"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-      "ruleInfo" : "脚本校验",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field5",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
    "checkMode" : 3,
    "name" : "表单项值规则",
    "getPSDEFValueRule" : {
@@ -391,6 +351,46 @@
    },
    "getPSDEFormItemName" : "field",
    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule6",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+      "name" : "field5值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "SYSVALUERULE",
+          "dEFName" : "FIELD5",
+          "name" : "[系统值规则]脚本值规则测试",
+          "getPSSysValueRule" : {
+            "codeName" : "ValueRule20",
+            "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+            "mOSFilePath" : "pssysvaluerules/ValueRule20",
+            "name" : "脚本值规则测试",
+            "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+            "ruleInfo" : "脚本校验",
+            "ruleType" : "SCRIPT",
+            "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "ruleInfo" : "脚本校验"
+        } ],
+        "ruleInfo" : "脚本校验"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+      "ruleInfo" : "脚本校验",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field5",
+    "valueRuleType" : "DEFVALUERULE"
  } ],
  "getPSDEFormItems" : [ {
    "id" : "srfupdatedate",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
@@ -166,46 +166,6 @@
      "id" : "FORM"
    },
    "getPSDEFormItemVRs" : [ {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule6",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-        "name" : "field5值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "SYSVALUERULE",
-            "dEFName" : "FIELD5",
-            "name" : "[系统值规则]脚本值规则测试",
-            "getPSSysValueRule" : {
-              "codeName" : "ValueRule20",
-              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-              "mOSFilePath" : "pssysvaluerules/ValueRule20",
-              "name" : "脚本值规则测试",
-              "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-              "ruleInfo" : "脚本校验",
-              "ruleType" : "SCRIPT",
-              "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-              "enableBackend" : true,
-              "enableFront" : true
-            },
-            "ruleInfo" : "脚本校验"
-          } ],
-          "ruleInfo" : "脚本校验"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-        "ruleInfo" : "脚本校验",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field5",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
      "checkMode" : 3,
      "name" : "表单项值规则",
      "getPSDEFValueRule" : {
@@ -520,6 +480,46 @@
      },
      "getPSDEFormItemName" : "field",
      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule6",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+        "name" : "field5值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "SYSVALUERULE",
+            "dEFName" : "FIELD5",
+            "name" : "[系统值规则]脚本值规则测试",
+            "getPSSysValueRule" : {
+              "codeName" : "ValueRule20",
+              "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+              "mOSFilePath" : "pssysvaluerules/ValueRule20",
+              "name" : "脚本值规则测试",
+              "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+              "ruleInfo" : "脚本校验",
+              "ruleType" : "SCRIPT",
+              "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+              "enableBackend" : true,
+              "enableFront" : true
+            },
+            "ruleInfo" : "脚本校验"
+          } ],
+          "ruleInfo" : "脚本校验"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+        "ruleInfo" : "脚本校验",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field5",
+      "valueRuleType" : "DEFVALUERULE"
    } ],
    "getPSDEFormItems" : [ {
      "id" : "srfupdatedate",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -2239,16 +2239,16 @@
    "mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ],
    "rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
@@ -16825,46 +16825,6 @@
          "id" : "FORM"
        },
        "getPSDEFormItemVRs" : [ {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule6",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-            "name" : "field5值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condType" : "SYSVALUERULE",
-                "dEFName" : "FIELD5",
-                "name" : "[系统值规则]脚本值规则测试",
-                "getPSSysValueRule" : {
-                  "codeName" : "ValueRule20",
-                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
-                  "mOSFilePath" : "pssysvaluerules/ValueRule20",
-                  "name" : "脚本值规则测试",
-                  "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
-                  "ruleInfo" : "脚本校验",
-                  "ruleType" : "SCRIPT",
-                  "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
-                  "enableBackend" : true,
-                  "enableFront" : true
-                },
-                "ruleInfo" : "脚本校验"
-              } ],
-              "ruleInfo" : "脚本校验"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
-            "ruleInfo" : "脚本校验",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field5",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
          "checkMode" : 3,
          "name" : "表单项值规则",
          "getPSDEFValueRule" : {
@@ -17179,6 +17139,46 @@
          },
          "getPSDEFormItemName" : "field",
          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule6",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+            "name" : "field5值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condType" : "SYSVALUERULE",
+                "dEFName" : "FIELD5",
+                "name" : "[系统值规则]脚本值规则测试",
+                "getPSSysValueRule" : {
+                  "codeName" : "ValueRule20",
+                  "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
+                  "mOSFilePath" : "pssysvaluerules/ValueRule20",
+                  "name" : "脚本值规则测试",
+                  "rTMOSFilePath" : "pssysvaluerules/ValueRule20",
+                  "ruleInfo" : "脚本校验",
+                  "ruleType" : "SCRIPT",
+                  "scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
+                  "enableBackend" : true,
+                  "enableFront" : true
+                },
+                "ruleInfo" : "脚本校验"
+              } ],
+              "ruleInfo" : "脚本校验"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
+            "ruleInfo" : "脚本校验",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field5",
+          "valueRuleType" : "DEFVALUERULE"
        } ],
        "getPSDEFormItems" : [ {
          "id" : "srfupdatedate",

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>runtime</id>
+            <id>trainsys</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/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
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/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

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/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: