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

834f5a32 · ibizdev · 0e5f8602 · 834f5a32 · 834f5a32 · 834f5a32
--- 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/Mob/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
@@ -17003,10 +17003,10 @@
          "name" : "[NUMBER1][数值1]",
          "getPSDEFFormItem" : {
            "codeName" : "Default",
-            "editorType" : "DATEPICKEREX_NOTIME",
+            "editorType" : "TEXTBOX",
            "name" : "[NUMBER1][数值1]",
-            "uIMode" : "DEFAULT",
-            "valueFormat" : "%1$tY-%1$tm-%1$td"
+            "stringLength" : 100,
+            "uIMode" : "DEFAULT"
          },
          "type" : "DEFAULT"
        }, {
@@ -17014,10 +17014,10 @@
          "name" : "[NUMBER1][数值1]移动端默认",
          "getPSDEFFormItem" : {
            "codeName" : "MobileDefault",
-            "editorType" : "MOBDATE",
+            "editorType" : "MOBTEXT",
            "name" : "[NUMBER1][数值1]移动端默认",
+            "stringLength" : 100,
            "uIMode" : "MOBILEDEFAULT",
-            "valueFormat" : "%1$tY-%1$tm-%1$td",
            "mobileMode" : true
          },
          "type" : "MOBILEDEFAULT",
@@ -17026,8 +17026,8 @@
        "codeName" : "Number1",
        "logicName" : "数值1",
        "name" : "NUMBER1",
-        "stdDataType" : 5,
-        "valueFormat" : "YYYY-MM-DD"
+        "stdDataType" : 25,
+        "stringLength" : 100
      }, {
        "getAllPSAppDEFUIModes" : [ {
          "codeName" : "MobileDefault",
@@ -17093,10 +17093,10 @@
          "name" : "[NUMBER4][数值4]",
          "getPSDEFFormItem" : {
            "codeName" : "Default",
-            "editorType" : "DATEPICKEREX_NOTIME",
+            "editorType" : "TEXTBOX",
            "name" : "[NUMBER4][数值4]",
-            "uIMode" : "DEFAULT",
-            "valueFormat" : "%1$tY-%1$tm-%1$td"
+            "stringLength" : 100,
+            "uIMode" : "DEFAULT"
          },
          "type" : "DEFAULT"
        }, {
@@ -17104,10 +17104,10 @@
          "name" : "[NUMBER4][数值4]移动端默认",
          "getPSDEFFormItem" : {
            "codeName" : "MobileDefault",
-            "editorType" : "MOBDATE",
+            "editorType" : "MOBTEXT",
            "name" : "[NUMBER4][数值4]移动端默认",
+            "stringLength" : 100,
            "uIMode" : "MOBILEDEFAULT",
-            "valueFormat" : "%1$tY-%1$tm-%1$td",
            "mobileMode" : true
          },
          "type" : "MOBILEDEFAULT",
@@ -17116,8 +17116,8 @@
        "codeName" : "Number4",
        "logicName" : "数值4",
        "name" : "NUMBER4",
-        "stdDataType" : 5,
-        "valueFormat" : "YYYY-MM-DD"
+        "stdDataType" : 25,
+        "stringLength" : 100
      }, {
        "getAllPSAppDEFUIModes" : [ {
          "codeName" : "MobileDefault",
@@ -18459,7 +18459,6 @@
          "type" : "SIMPLE"
        }, {
          "codeName" : "Number1",
-          "jsonFormat" : "yyyy-MM-dd",
          "logicName" : "数值1",
          "name" : "Number1",
          "getPSAppDEField" : {
@@ -18467,7 +18466,7 @@
            "codeName" : "Number1"
          },
          "sourceType" : "DEFIELD",
-          "stdDataType" : 5,
+          "stdDataType" : 25,
          "type" : "SIMPLE"
        }, {
          "codeName" : "Number2",
@@ -18493,7 +18492,6 @@
          "type" : "SIMPLE"
        }, {
          "codeName" : "Number4",
-          "jsonFormat" : "yyyy-MM-dd",
          "logicName" : "数值4",
          "name" : "Number4",
          "getPSAppDEField" : {
@@ -18501,7 +18499,7 @@
            "codeName" : "Number4"
          },
          "sourceType" : "DEFIELD",
-          "stdDataType" : 5,
+          "stdDataType" : 25,
          "type" : "SIMPLE"
        }, {
          "codeName" : "Order",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -4060,7 +4060,7 @@
    "uIActionType" : "DEUIACTION",
    "id" : "PermissionUpdate@Book"
  }, {
-    "actionTarget" : "SINGLEKEY",
+    "actionTarget" : "NONE",
    "caption" : "打开多数据卡片",
    "codeName" : "dkdsjkp",
    "getFrontPSAppView" : {
@@ -4102,7 +4102,7 @@
    "uIActionType" : "DEUIACTION",
    "id" : "opendsjbd@Book"
  }, {
-    "actionTarget" : "SINGLEKEY",
+    "actionTarget" : "NONE",
    "caption" : "打开多数据列表",
    "codeName" : "opendsjlb",
    "getFrontPSAppView" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815070416.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr0815070416.json
@@ -65,7 +65,7 @@
      "detailType" : "DEUIACTION",
      "name" : "u3624d39",
      "getPSUIAction" : {
-        "actionTarget" : "SINGLEKEY",
+        "actionTarget" : "NONE",
        "caption" : "打开多数据列表",
        "codeName" : "opendsjlb",
        "getFrontPSAppView" : {
@@ -94,7 +94,7 @@
      "detailType" : "DEUIACTION",
      "name" : "u7820387",
      "getPSUIAction" : {
-        "actionTarget" : "SINGLEKEY",
+        "actionTarget" : "NONE",
        "caption" : "打开多数据卡片",
        "codeName" : "dkdsjkp",
        "getFrontPSAppView" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView.json
@@ -276,7 +276,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u3624d39",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据列表",
          "codeName" : "opendsjlb",
          "getFrontPSAppView" : {
@@ -305,7 +305,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u7820387",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据卡片",
          "codeName" : "dkdsjkp",
          "getFrontPSAppView" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView9.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDataView9.json
@@ -290,7 +290,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u3624d39",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据列表",
          "codeName" : "opendsjlb",
          "getFrontPSAppView" : {
@@ -319,7 +319,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u7820387",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据卡片",
          "codeName" : "dkdsjkp",
          "getFrontPSAppView" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookDefaultDataView.json
@@ -255,7 +255,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u3624d39",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据列表",
          "codeName" : "opendsjlb",
          "getFrontPSAppView" : {
@@ -284,7 +284,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u7820387",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据卡片",
          "codeName" : "dkdsjkp",
          "getFrontPSAppView" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json
@@ -276,7 +276,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u3624d39",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据列表",
          "codeName" : "opendsjlb",
          "getFrontPSAppView" : {
@@ -305,7 +305,7 @@
        "detailType" : "DEUIACTION",
        "name" : "u7820387",
        "getPSUIAction" : {
-          "actionTarget" : "SINGLEKEY",
+          "actionTarget" : "NONE",
          "caption" : "打开多数据卡片",
          "codeName" : "dkdsjkp",
          "getFrontPSAppView" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr4GridView.json
@@ -238,7 +238,7 @@
        "id" : "toolbar_tbitem1_opendsjlb"
      },
      "getPSUIAction" : {
-        "actionTarget" : "SINGLEKEY",
+        "actionTarget" : "NONE",
        "caption" : "打开多数据列表",
        "codeName" : "opendsjlb",
        "getFrontPSAppView" : {
@@ -260,7 +260,7 @@
        "id" : "opendsjlb@Book"
      },
      "tooltip" : "打开多数据列表",
-      "uIActionTarget" : "SINGLEKEY",
+      "uIActionTarget" : "NONE",
      "showCaption" : true,
      "showIcon" : true
    }, {
@@ -274,7 +274,7 @@
        "id" : "toolbar_tbitem1_dkdsjkp"
      },
      "getPSUIAction" : {
-        "actionTarget" : "SINGLEKEY",
+        "actionTarget" : "NONE",
        "caption" : "打开多数据卡片",
        "codeName" : "dkdsjkp",
        "getFrontPSAppView" : {
@@ -296,7 +296,7 @@
        "id" : "dkdsjkp@Book"
      },
      "tooltip" : "打开多数据卡片",
-      "uIActionTarget" : "SINGLEKEY",
+      "uIActionTarget" : "NONE",
      "showCaption" : true,
      "showIcon" : true
    }, {

--- 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
@@ -3628,12 +3628,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      }
-    }, {
      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -3645,33 +3639,39 @@
        "modelref" : true,
        "id" : "ViewMsg5"
      }
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      }
    } ]
  }, {
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
      }
    } ]
  }, {
@@ -3700,16 +3700,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    } ]
  } ],
@@ -37158,7 +37158,7 @@
        "uIActionType" : "DEUIACTION",
        "id" : "PermissionUpdate@Book"
      }, {
-        "actionTarget" : "SINGLEKEY",
+        "actionTarget" : "NONE",
        "caption" : "打开多数据卡片",
        "codeName" : "dkdsjkp",
        "getFrontPSAppView" : {
@@ -37200,7 +37200,7 @@
        "uIActionType" : "DEUIACTION",
        "id" : "opendsjbd@Book"
      }, {
-        "actionTarget" : "SINGLEKEY",
+        "actionTarget" : "NONE",
        "caption" : "打开多数据列表",
        "codeName" : "opendsjlb",
        "getFrontPSAppView" : {
--- 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: