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

3fb03609 · ibizdev · e0f7c656 · 3fb03609 · 3fb03609 · 3fb03609
--- 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/liquibase/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/h2_table.xml
@@ -26,25 +26,6 @@
        </createTable>
    </changeSet>

-    <!--输出实体[RAWMATERIAL]数据结构 -->
-    <changeSet author="root" id="tab-rawmaterial-9-2">
-        <createTable tableName="T_RAWMATERIAL">
-                <column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-        </createTable>
-    </changeSet>
-
    <!--输出实体[REGINFO]数据结构 -->
    <changeSet author="root" id="tab-reginfo-28-3">
        <createTable tableName="T_REGINFO">

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json
@@ -174,14 +174,6 @@
    },
    "builtinAction" : true
  } ],
-  "getAllPSDEDBConfigs" : [ {
-    "dBType" : "MYSQL5",
-    "name" : "MYSQL5",
-    "objNameCase" : "DEFAULT",
-    "standardTableName" : "`T_RAWMATERIAL`",
-    "tableName" : "T_RAWMATERIAL",
-    "valid" : true
-  } ],
  "getAllPSDEDBTables" : [ {
    "getAllPSDEFields" : [ {
      "name" : "RAWMATERIALID",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json
@@ -3,11 +3,53 @@
  "codeName" : "Main",
  "columnEnableLink" : 2,
  "controlType" : "GRID",
+  "getCreatePSControlAction" : {
+    "actionName" : "Create",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "create",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Create"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json",
  "getFetchPSControlAction" : {
    "modelref" : true,
    "id" : "fetch"
  },
+  "getGetDraftPSControlAction" : {
+    "actionName" : "GetDraft",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "loaddraft",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "GetDraft"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
  "groupMode" : "NONE",
  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
  "logicName" : "主表格",
@@ -285,14 +327,28 @@
    }
  },
  "sortMode" : "REMOTE",
+  "getUpdatePSControlAction" : {
+    "actionName" : "Update",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "UPDATE",
+    "name" : "update",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    }
+  },
  "hasWFDataItems" : false,
  "enableColFilter" : false,
  "enableCustomized" : true,
  "enableGroup" : false,
  "enablePagingBar" : true,
-  "enableRowEdit" : false,
+  "enableRowEdit" : true,
  "enableRowEditOrder" : false,
-  "enableRowNew" : false,
+  "enableRowNew" : true,
  "forceFit" : false,
  "hideHeader" : false,
  "noSort" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
--- 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
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json.storyboard
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json.storyboard
@@ -544,6 +544,110 @@
    "cpsappsbitemid" : "6e0d863884c12e9319095a59719855e2",
    "psappsbitemrsname" : "书",
    "rstype" : "APPFUNC"
+  }, {
+    "psappsbitemrsid" : "f65368e78be1eb0f8019e64274329b4a",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_新建操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "285ccd75d90c9d75be79d97641b63aa8",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_编辑操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "576c7539e66d5bc106382891582d52ff",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_查看操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "a69ef3e101174957b8c3df54d0b6a505",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_拷贝操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "78a47d1a1b086c05b3ad46cc42077694",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_行编辑开关操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "825c30cba810d447d1fac10e5085642c",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_新建行",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "aeb3149538e996a468f6b32c30fa915c",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_删除操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "a5000a4cea38b93f40b2f452a1c8017e",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_导出操作（Excel）",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "34bbac6ce8cbd7e5989a8992d93ec6f1",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_打印操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "d1a847591e8daaea1d576669f304c549",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_导出数据模型",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "62ccde39ea6439405dd2038e42699aec",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_数据导入栏",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "d0bf578ba3a4c82346ee1b807b48ae87",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_搜索栏",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "7eabc254b65a22a118ec90c1bca4fd46",
+    "ppsappsbitemname" : "学员信息清单",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
+    "psappsbitemrsname" : "表格界面_帮助操作",
+    "rstype" : "UIACTION"
  }, {
    "psappsbitemrsid" : "ab4f0c36d7213dabfc6037264a1cf3ce",
    "ppsappsbitemname" : "学员登记信息编辑视图",

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -34,7 +34,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: