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

1bdb85e2 · ibizdev · 72863c53 · 1bdb85e2 · 1bdb85e2 · 1bdb85e2
--- 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/Web/PSAPPDATAENTITIES/FILE/PSTREEGRIDICES/TestTreeGridExView_TreeGrid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/FILE/PSTREEGRIDICES/TestTreeGridExView_TreeGrid.json
@@ -246,6 +246,10 @@
      "getPSAppDEField" : {
        "name" : "CREATEMAN",
        "codeName" : "CreateMan"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "createman"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -255,6 +259,10 @@
      "getPSAppDEField" : {
        "name" : "ICON",
        "codeName" : "ICON"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "pic"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -264,6 +272,10 @@
      "getPSAppDEField" : {
        "name" : "CREATEDATE",
        "codeName" : "CreateDate"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "createdate"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -272,6 +284,10 @@
      "getPSAppDEField" : {
        "name" : "FILEID",
        "codeName" : "FILEId"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "uuid"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -281,6 +297,10 @@
      "getPSAppDEField" : {
        "name" : "FILENAME",
        "codeName" : "FILEName"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "name"
      }
    } ],
    "getTextPSAppDEField" : {
@@ -351,6 +371,10 @@
      "getPSAppDEField" : {
        "name" : "FILENAME",
        "codeName" : "FILEName"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "name"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -359,6 +383,10 @@
      "getPSAppDEField" : {
        "name" : "FILEID",
        "codeName" : "FILEId"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "uuid"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -367,6 +395,10 @@
      "getPSAppDEField" : {
        "name" : "CREATEMAN",
        "codeName" : "CreateMan"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "createman"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -376,6 +408,10 @@
      "getPSAppDEField" : {
        "name" : "CREATEDATE",
        "codeName" : "CreateDate"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "createdate"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -385,6 +421,10 @@
      "getPSAppDEField" : {
        "name" : "ICON",
        "codeName" : "ICON"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "pic"
      }
    } ],
    "getTextPSAppDEField" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGANTTS/Usr12114819GanttView_Gantt.json
@@ -517,6 +517,10 @@
      "getPSAppDEField" : {
        "name" : "BH",
        "codeName" : "BH"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "sn"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -525,6 +529,10 @@
      "getPSAppDEField" : {
        "name" : "BEGIN",
        "codeName" : "BEGIN"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "begin"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -533,6 +541,10 @@
      "getPSAppDEField" : {
        "name" : "WORKITEMNAME",
        "codeName" : "WORKITEMName"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "name"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -541,6 +553,10 @@
      "getPSAppDEField" : {
        "name" : "END",
        "codeName" : "END"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "end"
      }
    } ],
    "getTextPSAppDEField" : {
@@ -734,6 +750,10 @@
      "getPSAppDEField" : {
        "name" : "WORKITEMNAME",
        "codeName" : "WORKITEMName"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "name"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -742,6 +762,10 @@
      "getPSAppDEField" : {
        "name" : "BH",
        "codeName" : "BH"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "sn"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -750,6 +774,10 @@
      "getPSAppDEField" : {
        "name" : "END",
        "codeName" : "END"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "end"
      }
    }, {
      "cLConvertMode" : "NONE",
@@ -758,6 +786,10 @@
      "getPSAppDEField" : {
        "name" : "BEGIN",
        "codeName" : "BEGIN"
+      },
+      "getPSDETreeColumn" : {
+        "modelref" : true,
+        "id" : "begin"
      }
    } ],
    "getTextPSAppDEField" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/FILETestTreeGridExView.json
@@ -307,6 +307,10 @@
        "getPSAppDEField" : {
          "name" : "CREATEMAN",
          "codeName" : "CreateMan"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "createman"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -316,6 +320,10 @@
        "getPSAppDEField" : {
          "name" : "ICON",
          "codeName" : "ICON"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "pic"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -325,6 +333,10 @@
        "getPSAppDEField" : {
          "name" : "CREATEDATE",
          "codeName" : "CreateDate"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "createdate"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -333,6 +345,10 @@
        "getPSAppDEField" : {
          "name" : "FILEID",
          "codeName" : "FILEId"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "uuid"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -342,6 +358,10 @@
        "getPSAppDEField" : {
          "name" : "FILENAME",
          "codeName" : "FILEName"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "name"
        }
      } ],
      "getTextPSAppDEField" : {
@@ -412,6 +432,10 @@
        "getPSAppDEField" : {
          "name" : "FILENAME",
          "codeName" : "FILEName"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "name"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -420,6 +444,10 @@
        "getPSAppDEField" : {
          "name" : "FILEID",
          "codeName" : "FILEId"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "uuid"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -428,6 +456,10 @@
        "getPSAppDEField" : {
          "name" : "CREATEMAN",
          "codeName" : "CreateMan"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "createman"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -437,6 +469,10 @@
        "getPSAppDEField" : {
          "name" : "CREATEDATE",
          "codeName" : "CreateDate"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "createdate"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -446,6 +482,10 @@
        "getPSAppDEField" : {
          "name" : "ICON",
          "codeName" : "ICON"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "pic"
        }
      } ],
      "getTextPSAppDEField" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json
@@ -548,6 +548,10 @@
        "getPSAppDEField" : {
          "name" : "BH",
          "codeName" : "BH"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "sn"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -556,6 +560,10 @@
        "getPSAppDEField" : {
          "name" : "BEGIN",
          "codeName" : "BEGIN"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "begin"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -564,6 +572,10 @@
        "getPSAppDEField" : {
          "name" : "WORKITEMNAME",
          "codeName" : "WORKITEMName"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "name"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -572,6 +584,10 @@
        "getPSAppDEField" : {
          "name" : "END",
          "codeName" : "END"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "end"
        }
      } ],
      "getTextPSAppDEField" : {
@@ -765,6 +781,10 @@
        "getPSAppDEField" : {
          "name" : "WORKITEMNAME",
          "codeName" : "WORKITEMName"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "name"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -773,6 +793,10 @@
        "getPSAppDEField" : {
          "name" : "BH",
          "codeName" : "BH"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "sn"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -781,6 +805,10 @@
        "getPSAppDEField" : {
          "name" : "END",
          "codeName" : "END"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "end"
        }
      }, {
        "cLConvertMode" : "NONE",
@@ -789,6 +817,10 @@
        "getPSAppDEField" : {
          "name" : "BEGIN",
          "codeName" : "BEGIN"
+        },
+        "getPSDETreeColumn" : {
+          "modelref" : true,
+          "id" : "begin"
        }
      } ],
      "getTextPSAppDEField" : {

--- 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
@@ -12333,16 +12333,16 @@
        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -12359,10 +12359,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -12371,10 +12371,10 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-弹出",
@@ -12387,12 +12387,11 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg11"
+      }
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -12401,10 +12400,10 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -12413,10 +12412,10 @@
        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "关闭模式-本次删除-上方-警告",
@@ -12425,11 +12424,12 @@
        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
@@ -12448,16 +12448,16 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    } ]
  }, {
--- 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: