zhangzihan 发布系统代码 [TrainSys，网页端]

e499c39c · ibizdev · e75b0cb3 · e499c39c · e499c39c · e499c39c
--- a/config.xml
+++ b/config.xml
@@ -55,12 +55,6 @@
 	  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
@@ -51,25 +51,6 @@
        </createTable>
    </changeSet>

-    <!--输出实体[RAWMATERIAL]数据结构 -->
-    <changeSet author="root" id="tab-rawmaterial-9-3">
-        <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-33-4">
        <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/PSAPPDEVIEWS/phonePhoneView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.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
@@ -804,6 +804,110 @@
    "cpsappsbitemid" : "973712c6e750fdbcf0a644ac0a2c7915",
    "psappsbitemrsname" : "学员信息管理",
    "rstype" : "APPFUNC"
+  }, {
+    "psappsbitemrsid" : "2469874f7090b5bc5ef29e240a73cd45",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_新建操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "9a93e94f16effcd77a55733a3bea9b9a",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_编辑操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "213028ca9c058db026b063d5fa1d0e7a",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_查看操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "b52a884c406c2c23a415d988590a9a17",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_拷贝操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "39686c689036018c55e7a44a5bdffdfa",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_行编辑开关操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "b617cce7b2b04805b939f6868d469efd",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_新建行",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "53322b61ce738611ba629cda0e1c02e5",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_删除操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "d70d45c570d015493f56cc75e91a4243",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_导出操作（Excel）",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "7fdbcdbc02c42af84081ef70ea82e73e",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_打印操作",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "106fdfd466e0100edb866252e18a8d69",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_导出数据模型",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "dec2921a07e3c1e6708e5e8b116c0bf6",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_数据导入栏",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "16c8bfaf27ed8fbd2bcfd3321d4a3c22",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_搜索栏",
+    "rstype" : "UIACTION"
+  }, {
+    "psappsbitemrsid" : "3dae26f73534746d2af0e1ae2771ef57",
+    "ppsappsbitemname" : "手机表格视图",
+    "rstag" : "SYS",
+    "rstag2" : "系统预定义",
+    "ppsappsbitemid" : "fbb993bd633a80e403f0e3769d366ba4",
+    "psappsbitemrsname" : "表格界面_帮助操作",
+    "rstype" : "UIACTION"
  }, {
    "psappsbitemrsid" : "ea3e89afc69162984ee14ee794b5c5de",
    "ppsappsbitemname" : "手机编辑视图",

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

    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</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 50000
+EXPOSE 8081

 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,32 +22,7 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
        imagePullPolicy: Always
        ports:
-        - 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"      
+        - containerPort: 8081

 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
    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,23 +3,9 @@ services:
  trainsys-provider:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
    ports:
-      - "50000:50000"
+      - "8081:8081"
    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: