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

e176de3b · ibizdev · f9285b4e · e176de3b · e176de3b · e176de3b
--- 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/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Repeat.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Repeat.json
@@ -135,6 +135,7 @@
      "detailType" : "GROUPPANEL",
      "name" : "grouppanel1",
      "getPSDEFormDetails" : [ {
+        "buildInActions" : 7,
        "codeName" : "bookchild1s",
        "getContentPSControl" : {
          "codeName" : "Main",
@@ -569,6 +570,7 @@
      "detailType" : "GROUPPANEL",
      "name" : "grouppanel2",
      "getPSDEFormDetails" : [ {
+        "buildInActions" : 7,
        "codeName" : "bookchild2s",
        "getContentPSControl" : {
          "aggMode" : "NONE",
@@ -954,6 +956,7 @@
      "detailType" : "GROUPPANEL",
      "name" : "grouppanel3",
      "getPSDEFormDetails" : [ {
+        "buildInActions" : 7,
        "codeName" : "bookchild3s",
        "contentType" : "REPEATER",
        "detailStyle" : "DEFAULT",
@@ -1050,6 +1053,7 @@
      "detailType" : "GROUPPANEL",
      "name" : "grouppanel4",
      "getPSDEFormDetails" : [ {
+        "buildInActions" : 7,
        "codeName" : "bookchild4s",
        "contentType" : "REPEATER",
        "detailStyle" : "STYLE2",
@@ -1065,7 +1069,7 @@
          "enableCond" : 3,
          "ignoreInput" : 0,
          "labelPos" : "LEFT",
-          "labelWidth" : 130,
+          "labelWidth" : 30,
          "name" : "repeatgridfield",
          "noPrivDisplayMode" : 1,
          "getPSEditor" : {
@@ -1088,7 +1092,7 @@
          "enableCond" : 3,
          "ignoreInput" : 0,
          "labelPos" : "LEFT",
-          "labelWidth" : 130,
+          "labelWidth" : 200,
          "name" : "repeatgridfield2",
          "noPrivDisplayMode" : 1,
          "getPSEditor" : {
@@ -1104,7 +1108,7 @@
            "colMD" : 24,
            "layout" : "TABLE_24COL"
          },
-          "allowEmpty" : false,
+          "allowEmpty" : true,
          "needCodeListConfig" : true,
          "repeatContent" : true,
          "showCaption" : true
@@ -1205,6 +1209,7 @@
      "detailType" : "GROUPPANEL",
      "name" : "grouppanel5",
      "getPSDEFormDetails" : [ {
+        "buildInActions" : 7,
        "codeName" : "bookchild5s",
        "contentType" : "REPEATER",
        "detailStyle" : "STYLE3",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json
@@ -721,6 +721,7 @@
        "detailType" : "GROUPPANEL",
        "name" : "grouppanel1",
        "getPSDEFormDetails" : [ {
+          "buildInActions" : 7,
          "codeName" : "bookchild1s",
          "getContentPSControl" : {
            "codeName" : "Main",
@@ -1155,6 +1156,7 @@
        "detailType" : "GROUPPANEL",
        "name" : "grouppanel2",
        "getPSDEFormDetails" : [ {
+          "buildInActions" : 7,
          "codeName" : "bookchild2s",
          "getContentPSControl" : {
            "aggMode" : "NONE",
@@ -1540,6 +1542,7 @@
        "detailType" : "GROUPPANEL",
        "name" : "grouppanel3",
        "getPSDEFormDetails" : [ {
+          "buildInActions" : 7,
          "codeName" : "bookchild3s",
          "contentType" : "REPEATER",
          "detailStyle" : "DEFAULT",
@@ -1636,6 +1639,7 @@
        "detailType" : "GROUPPANEL",
        "name" : "grouppanel4",
        "getPSDEFormDetails" : [ {
+          "buildInActions" : 7,
          "codeName" : "bookchild4s",
          "contentType" : "REPEATER",
          "detailStyle" : "STYLE2",
@@ -1651,7 +1655,7 @@
            "enableCond" : 3,
            "ignoreInput" : 0,
            "labelPos" : "LEFT",
-            "labelWidth" : 130,
+            "labelWidth" : 30,
            "name" : "repeatgridfield",
            "noPrivDisplayMode" : 1,
            "getPSEditor" : {
@@ -1674,7 +1678,7 @@
            "enableCond" : 3,
            "ignoreInput" : 0,
            "labelPos" : "LEFT",
-            "labelWidth" : 130,
+            "labelWidth" : 200,
            "name" : "repeatgridfield2",
            "noPrivDisplayMode" : 1,
            "getPSEditor" : {
@@ -1690,7 +1694,7 @@
              "colMD" : 24,
              "layout" : "TABLE_24COL"
            },
-            "allowEmpty" : false,
+            "allowEmpty" : true,
            "needCodeListConfig" : true,
            "repeatContent" : true,
            "showCaption" : true
@@ -1791,6 +1795,7 @@
        "detailType" : "GROUPPANEL",
        "name" : "grouppanel5",
        "getPSDEFormDetails" : [ {
+          "buildInActions" : 7,
          "codeName" : "bookchild5s",
          "contentType" : "REPEATER",
          "detailStyle" : "STYLE3",

--- 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
@@ -13255,12 +13255,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13272,6 +13266,12 @@
        "modelref" : true,
        "id" : "ViewMsg5"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
    } ]
  }, {
    "codeName" : "VMGroup7",
@@ -13315,6 +13315,12 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
+    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13359,12 +13365,6 @@
        "modelref" : true,
        "id" : "ViewMsg8"
      }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -33368,6 +33368,7 @@
            "detailType" : "GROUPPANEL",
            "name" : "grouppanel1",
            "getPSDEFormDetails" : [ {
+              "buildInActions" : 7,
              "codeName" : "bookchild1s",
              "getContentPSControl" : {
                "codeName" : "Main",
@@ -33802,6 +33803,7 @@
            "detailType" : "GROUPPANEL",
            "name" : "grouppanel2",
            "getPSDEFormDetails" : [ {
+              "buildInActions" : 7,
              "codeName" : "bookchild2s",
              "getContentPSControl" : {
                "aggMode" : "NONE",
@@ -34187,6 +34189,7 @@
            "detailType" : "GROUPPANEL",
            "name" : "grouppanel3",
            "getPSDEFormDetails" : [ {
+              "buildInActions" : 7,
              "codeName" : "bookchild3s",
              "contentType" : "REPEATER",
              "detailStyle" : "DEFAULT",
@@ -34283,6 +34286,7 @@
            "detailType" : "GROUPPANEL",
            "name" : "grouppanel4",
            "getPSDEFormDetails" : [ {
+              "buildInActions" : 7,
              "codeName" : "bookchild4s",
              "contentType" : "REPEATER",
              "detailStyle" : "STYLE2",
@@ -34298,7 +34302,7 @@
                "enableCond" : 3,
                "ignoreInput" : 0,
                "labelPos" : "LEFT",
-                "labelWidth" : 130,
+                "labelWidth" : 30,
                "name" : "repeatgridfield",
                "noPrivDisplayMode" : 1,
                "getPSEditor" : {
@@ -34321,7 +34325,7 @@
                "enableCond" : 3,
                "ignoreInput" : 0,
                "labelPos" : "LEFT",
-                "labelWidth" : 130,
+                "labelWidth" : 200,
                "name" : "repeatgridfield2",
                "noPrivDisplayMode" : 1,
                "getPSEditor" : {
@@ -34337,7 +34341,7 @@
                  "colMD" : 24,
                  "layout" : "TABLE_24COL"
                },
-                "allowEmpty" : false,
+                "allowEmpty" : true,
                "needCodeListConfig" : true,
                "repeatContent" : true,
                "showCaption" : true
@@ -34438,6 +34442,7 @@
            "detailType" : "GROUPPANEL",
            "name" : "grouppanel5",
            "getPSDEFormDetails" : [ {
+              "buildInActions" : 7,
              "codeName" : "bookchild5s",
              "contentType" : "REPEATER",
              "detailStyle" : "STYLE3",
--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,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: