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

f7597407 · ibizdev · a0478175 · f7597407 · f7597407 · f7597407
--- 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/PSAPPCODELISTS/WorkItemType.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json
+{
+  "codeListTag" : "Test__WorkItemType",
+  "codeListType" : "STATIC",
+  "codeName" : "WorkItemType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json",
+  "emptyText" : "未定义",
+  "name" : "工作项类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "Jd",
+    "text" : "阶段",
+    "value" : "JD"
+  }, {
+    "codeName" : "Lcb",
+    "text" : "里程碑",
+    "value" : "LCB"
+  }, {
+    "codeName" : "Qx",
+    "text" : "需求",
+    "value" : "QX"
+  }, {
+    "codeName" : "Rw",
+    "text" : "任务",
+    "value" : "RW"
+  }, {
+    "codeName" : "Bug",
+    "text" : "缺陷",
+    "value" : "BUG"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGRIDS/Main.json
@@ -26,6 +26,23 @@
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
  },
  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "编号",
+    "codeName" : "bh",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "bh",
+    "excelCaption" : "编号",
+    "name" : "bh",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BH",
+      "codeName" : "BH"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
    "align" : "LEFT",
    "cLConvertMode" : "NONE",
    "getCapPSLanguageRes" : {
@@ -52,58 +69,103 @@
  }, {
    "align" : "LEFT",
    "cLConvertMode" : "FRONT",
-    "getCapPSLanguageRes" : {
+    "caption" : "类型",
-      "defaultContent" : "更新人",
+    "codeName" : "type",
-      "lanResTag" : "DEF.LNAME.UPDATEMAN",
-      "lanResType" : "DEF.LNAME",
-      "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-      "refFlag" : true
-    },
-    "caption" : "更新人",
-    "codeName" : "updateman",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "updateman",
+    "dataItemName" : "type",
-    "excelCaption" : "更新人",
+    "excelCaption" : "类型",
-    "name" : "updateman",
+    "name" : "type",
    "noPrivDisplayMode" : 1,
    "getPSAppCodeList" : {
      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json"
    },
    "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
+      "name" : "TYPE",
-      "codeName" : "UpdateMan"
+      "codeName" : "TYPE"
    },
-    "width" : 150,
+    "width" : 100,
    "widthUnit" : "PX",
    "enableSort" : true
  }, {
    "align" : "LEFT",
    "cLConvertMode" : "NONE",
-    "getCapPSLanguageRes" : {
+    "caption" : "负责人",
-      "defaultContent" : "更新时间",
+    "codeName" : "head",
-      "lanResTag" : "DEF.LNAME.UPDATEDATE",
+    "columnType" : "DEFGRIDCOLUMN",
-      "lanResType" : "DEF.LNAME",
+    "dataItemName" : "head",
-      "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEDATE]",
+    "excelCaption" : "负责人",
-      "refFlag" : true
+    "name" : "head",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "HEAD",
+      "codeName" : "HEAD"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "关注人",
+    "codeName" : "follower",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "follower",
+    "excelCaption" : "关注人",
+    "name" : "follower",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "FOLLOWER",
+      "codeName" : "FOLLOWER"
+    },
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "开始时间",
+    "codeName" : "begin",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "begin",
+    "excelCaption" : "开始时间",
+    "name" : "begin",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BEGIN",
+      "codeName" : "BEGIN"
    },
-    "caption" : "更新时间",
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-    "codeName" : "updatedate",
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "截至时间",
+    "codeName" : "end",
    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "updatedate",
+    "dataItemName" : "end",
-    "excelCaption" : "更新时间",
+    "excelCaption" : "截至时间",
-    "name" : "updatedate",
+    "name" : "end",
    "noPrivDisplayMode" : 1,
    "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
+      "name" : "END",
-      "codeName" : "UpdateDate"
+      "codeName" : "END"
    },
    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-    "width" : 150,
+    "width" : 100,
    "widthUnit" : "PX",
    "enableSort" : true
  } ],
  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "bh",
+    "getPSAppDEField" : {
+      "name" : "BH",
+      "codeName" : "BH"
+    }
+  }, {
    "dataType" : 25,
    "name" : "workitemname",
    "getPSAppDEField" : {
@@ -112,18 +174,40 @@
    }
  }, {
    "dataType" : 25,
-    "name" : "updateman",
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "head",
+    "getPSAppDEField" : {
+      "name" : "HEAD",
+      "codeName" : "HEAD"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "follower",
+    "getPSAppDEField" : {
+      "name" : "FOLLOWER",
+      "codeName" : "FOLLOWER"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "begin",
    "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
+      "name" : "BEGIN",
-      "codeName" : "UpdateMan"
+      "codeName" : "BEGIN"
    }
  }, {
    "format" : "YYYY-MM-DD HH:mm:ss",
    "dataType" : 5,
-    "name" : "updatedate",
+    "name" : "end",
    "getPSAppDEField" : {
-      "name" : "UPDATEDATE",
+      "name" : "END",
-      "codeName" : "UpdateDate"
+      "codeName" : "END"
    }
  }, {
    "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMGridView.json
@@ -224,6 +224,23 @@
      "id" : "GRID"
    },
    "getPSDEGridColumns" : [ {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "编号",
+      "codeName" : "bh",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "bh",
+      "excelCaption" : "编号",
+      "name" : "bh",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "BH",
+        "codeName" : "BH"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
      "align" : "LEFT",
      "cLConvertMode" : "NONE",
      "getCapPSLanguageRes" : {
@@ -250,58 +267,103 @@
    }, {
      "align" : "LEFT",
      "cLConvertMode" : "FRONT",
-      "getCapPSLanguageRes" : {
+      "caption" : "类型",
-        "defaultContent" : "更新人",
+      "codeName" : "type",
-        "lanResTag" : "DEF.LNAME.UPDATEMAN",
-        "lanResType" : "DEF.LNAME",
-        "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-        "refFlag" : true
-      },
-      "caption" : "更新人",
-      "codeName" : "updateman",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updateman",
+      "dataItemName" : "type",
-      "excelCaption" : "更新人",
+      "excelCaption" : "类型",
-      "name" : "updateman",
+      "name" : "type",
      "noPrivDisplayMode" : 1,
      "getPSAppCodeList" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json"
      },
      "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
+        "name" : "TYPE",
-        "codeName" : "UpdateMan"
+        "codeName" : "TYPE"
      },
-      "width" : 150,
+      "width" : 100,
      "widthUnit" : "PX",
      "enableSort" : true
    }, {
      "align" : "LEFT",
      "cLConvertMode" : "NONE",
-      "getCapPSLanguageRes" : {
+      "caption" : "负责人",
-        "defaultContent" : "更新时间",
+      "codeName" : "head",
-        "lanResTag" : "DEF.LNAME.UPDATEDATE",
+      "columnType" : "DEFGRIDCOLUMN",
-        "lanResType" : "DEF.LNAME",
+      "dataItemName" : "head",
-        "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEDATE]",
+      "excelCaption" : "负责人",
-        "refFlag" : true
+      "name" : "head",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "HEAD",
+        "codeName" : "HEAD"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "关注人",
+      "codeName" : "follower",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "follower",
+      "excelCaption" : "关注人",
+      "name" : "follower",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "FOLLOWER",
+        "codeName" : "FOLLOWER"
+      },
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "开始时间",
+      "codeName" : "begin",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "begin",
+      "excelCaption" : "开始时间",
+      "name" : "begin",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "BEGIN",
+        "codeName" : "BEGIN"
      },
-      "caption" : "更新时间",
+      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-      "codeName" : "updatedate",
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "截至时间",
+      "codeName" : "end",
      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updatedate",
+      "dataItemName" : "end",
-      "excelCaption" : "更新时间",
+      "excelCaption" : "截至时间",
-      "name" : "updatedate",
+      "name" : "end",
      "noPrivDisplayMode" : 1,
      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
+        "name" : "END",
-        "codeName" : "UpdateDate"
+        "codeName" : "END"
      },
      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
-      "width" : 150,
+      "width" : 100,
      "widthUnit" : "PX",
      "enableSort" : true
    } ],
    "getPSDEGridDataItems" : [ {
+      "dataType" : 25,
+      "name" : "bh",
+      "getPSAppDEField" : {
+        "name" : "BH",
+        "codeName" : "BH"
+      }
+    }, {
      "dataType" : 25,
      "name" : "workitemname",
      "getPSAppDEField" : {
@@ -310,18 +372,40 @@
      }
    }, {
      "dataType" : 25,
-      "name" : "updateman",
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "TYPE"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "head",
+      "getPSAppDEField" : {
+        "name" : "HEAD",
+        "codeName" : "HEAD"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "follower",
+      "getPSAppDEField" : {
+        "name" : "FOLLOWER",
+        "codeName" : "FOLLOWER"
+      }
+    }, {
+      "format" : "YYYY-MM-DD HH:mm:ss",
+      "dataType" : 5,
+      "name" : "begin",
      "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
+        "name" : "BEGIN",
-        "codeName" : "UpdateMan"
+        "codeName" : "BEGIN"
      }
    }, {
      "format" : "YYYY-MM-DD HH:mm:ss",
      "dataType" : 5,
-      "name" : "updatedate",
+      "name" : "end",
      "getPSAppDEField" : {
-        "name" : "UPDATEDATE",
+        "name" : "END",
-        "codeName" : "UpdateDate"
+        "codeName" : "END"
      }
    }, {
      "dataType" : 25,

--- 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
@@ -753,6 +753,36 @@
      "value" : "20"
    } ],
    "enableCache" : true
+  }, {
+    "codeListTag" : "Test__WorkItemType",
+    "codeListType" : "STATIC",
+    "codeName" : "WorkItemType",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/WorkItemType.json",
+    "emptyText" : "未定义",
+    "name" : "工作项类型",
+    "getPSCodeItems" : [ {
+      "codeName" : "Jd",
+      "text" : "阶段",
+      "value" : "JD"
+    }, {
+      "codeName" : "Lcb",
+      "text" : "里程碑",
+      "value" : "LCB"
+    }, {
+      "codeName" : "Qx",
+      "text" : "需求",
+      "value" : "QX"
+    }, {
+      "codeName" : "Rw",
+      "text" : "任务",
+      "value" : "RW"
+    }, {
+      "codeName" : "Bug",
+      "text" : "缺陷",
+      "value" : "BUG"
+    } ],
+    "enableCache" : true
  }, {
    "codeListTag" : "YesNo",
    "codeListType" : "STATIC",
--- 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
+    port: 50000
-    targetPort: 8081
+    targetPort: 50000
-    nodePort: 8081
+    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: