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

ac28a30d · ibizdev · 4a538f3e · ac28a30d · ac28a30d · ac28a30d
--- 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/PSMODULES/Test/PSDATAENTITIES/BXD2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
@@ -283,6 +283,7 @@
    },
    "defaultMode" : true,
    "enableBackend" : true,
+    "enableCustomized" : true,
    "enableFront" : true,
    "ignoreError" : false,
    "id" : "PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATAIMPS/DataImportTest.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
@@ -1609,6 +1609,84 @@
    "refMode" : "DEMETHOD",
    "refTag" : "FETCH"
  } ],
+  "getAllPSAppSubViewTypeRefs" : [ {
+    "name" : "替换默认编辑视图布局面板",
+    "getPSViewLayoutPanel" : {
+      "codeName" : "Usr1128928261",
+      "controlType" : "VIEWLAYOUTPANEL",
+      "layoutMode" : "FLEX",
+      "logicName" : "替换默认编辑视图布局面板(测试)",
+      "name" : "layoutpanel",
+      "getPSControlParam" : { },
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getRootPSPanelItems" : [ {
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "page_container",
+        "getPSLayout" : {
+          "dir" : "column",
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "文本",
+          "contentType" : "RAW",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "RAWITEM",
+          "name" : "static_text",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "getPSRawItem" : {
+            "caption" : "测试替换默认编辑视图布局",
+            "contentType" : "RAW",
+            "name" : "static_text",
+            "predefinedType" : "STATIC_TEXT",
+            "renderMode" : "TEXT"
+          },
+          "rawContent" : "测试替换默认编辑视图布局",
+          "showCaption" : true
+        } ]
+      }, {
+        "caption" : "容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container",
+        "getPSLayout" : {
+          "layout" : "FLEX"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "控件占位",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "form",
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "showCaption" : true
+        } ]
+      } ],
+      "layoutBodyOnly" : false,
+      "layoutPanel" : true,
+      "useDefaultLayout" : false,
+      "modelid" : "B75263BA-392A-4E3D-AE20-2BA34648E924",
+      "modeltype" : "PSSYSVIEWLAYOUTPANEL"
+    },
+    "typeCode" : "editrepeat",
+    "viewType" : "DEEDITVIEW",
+    "replaceDefault" : true
+  } ],
  "getAllPSAppViews" : [ {
    "modelref" : true,
    "path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr07063055MobListView.json",
@@ -14434,7 +14512,7 @@
        }, {
          "id" : "field9",
          "hidden" : true,
-          "dataType" : 25,
+          "dataType" : 21,
          "getPSAppDEField" : {
            "name" : "FIELD9",
            "codeName" : "Field9"
@@ -14711,7 +14789,7 @@
            "getPSDEFormDetails" : [ {
              "caption" : "属性9",
              "codeName" : "field9",
-              "dataType" : 25,
+              "dataType" : 21,
              "detailStyle" : "DEFAULT",
              "detailType" : "FORMITEM",
              "enableCond" : 3,
@@ -34725,7 +34803,7 @@
            "codeName" : "Default",
            "editorType" : "TEXTAREA_10",
            "name" : "[FIELD9][属性9]",
-            "stringLength" : 100,
+            "stringLength" : 1048576,
            "uIMode" : "DEFAULT"
          },
          "type" : "DEFAULT"
@@ -34736,7 +34814,7 @@
            "codeName" : "MobileDefault",
            "editorType" : "MOBTEXTAREA",
            "name" : "[FIELD9][属性9]移动端默认",
-            "stringLength" : 100,
+            "stringLength" : 1048576,
            "uIMode" : "MOBILEDEFAULT",
            "mobileMode" : true
          },
@@ -34746,8 +34824,8 @@
        "codeName" : "Field9",
        "logicName" : "属性9",
        "name" : "FIELD9",
-        "stdDataType" : 25,
-        "stringLength" : 100
+        "stdDataType" : 21,
+        "stringLength" : 1048576
      }, {
        "getAllPSAppDEFUIModes" : [ {
          "codeName" : "MobileDefault",
@@ -36683,7 +36761,7 @@
            "codeName" : "Field9"
          },
          "sourceType" : "DEFIELD",
-          "stdDataType" : 25,
+          "stdDataType" : 21,
          "type" : "SIMPLE"
        }, {
          "codeName" : "OrgId",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1495,16 +1495,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
@@ -378,6 +378,7 @@
    },
    "defaultMode" : true,
    "enableBackend" : true,
+    "enableCustomized" : true,
    "enableFront" : true,
    "ignoreError" : false
  } ],

--- 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
@@ -11733,16 +11733,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    } ]
  }, {
@@ -11777,16 +11777,16 @@
        "id" : "ViewMsg4"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      }
    } ]
  }, {
@@ -11809,10 +11809,10 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -11821,10 +11821,10 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
      }
    } ]
  }, {
@@ -11837,13 +11837,6 @@
        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
@@ -11857,6 +11850,12 @@
        "modelref" : true,
        "id" : "ViewMsg11"
      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -11864,10 +11863,10 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "消息位置-视图下方",
@@ -11876,11 +11875,12 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    } ]
  }, {
    "codeName" : "VMGroup5",
@@ -11892,16 +11892,16 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
@@ -57092,6 +57092,7 @@
        },
        "defaultMode" : true,
        "enableBackend" : true,
+        "enableCustomized" : true,
        "enableFront" : true,
        "ignoreError" : false
      } ],
--- 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: