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

d0fc50e5 · ibizdev · 0e2bdfbc · d0fc50e5 · d0fc50e5 · d0fc50e5
--- 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/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1519,16 +1519,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ],
    "uniqueTag" : "VMGroup2"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr09211294DataView_DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/Usr09211294DataView_DataView.json
@@ -216,6 +216,9 @@
  },
  "getItemPSLayoutPanel" : {
    "getAllPSPanelFields" : [ {
+      "id" : "field_text_dynamic2",
+      "viewFieldName" : "BOOKNAME"
+    }, {
      "id" : "field_text_dynamic",
      "viewFieldName" : "BOOKNAME"
    }, {
@@ -309,6 +312,23 @@
        },
        "rawContent" : "测试h1-----",
        "showCaption" : true
+      }, {
+        "caption" : "文本(动态)",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_text_dynamic2",
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "name" : "field_text_dynamic2",
+          "predefinedType" : "FIELD_TEXT_DYNAMIC"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "viewFieldName" : "BOOKNAME",
+        "hidden" : false,
+        "showCaption" : false
      }, {
        "caption" : "图片",
        "contentType" : "IMAGE",
@@ -461,15 +481,15 @@
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
  },
  "getPSDEDataViewDataItems" : [ {
-    "dataType" : 25,
-    "name" : "bookname"
-  }, {
    "dataType" : 25,
    "getFrontPSCodeList" : {
      "modelref" : true,
      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__CodeList44.json"
    },
    "name" : "type"
+  }, {
+    "dataType" : 25,
+    "name" : "bookname"
  }, {
    "dataType" : 25,
    "name" : "srfkey",
@@ -500,16 +520,6 @@
    }
  } ],
  "getPSDEDataViewItems" : [ {
-    "caption" : "书名称",
-    "dataItemName" : "bookname",
-    "itemType" : "DATAITEM",
-    "name" : "BOOKNAME",
-    "getPSAppDEField" : {
-      "name" : "BOOKNAME",
-      "codeName" : "BookName"
-    },
-    "enableSort" : true
-  }, {
    "cLConvertMode" : "FRONT",
    "caption" : "类型",
    "dataItemName" : "type",
@@ -524,6 +534,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__CodeList44.json"
    },
    "enableSort" : true
+  }, {
+    "caption" : "书名称",
+    "dataItemName" : "bookname",
+    "itemType" : "DATAITEM",
+    "name" : "BOOKNAME",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    },
+    "enableSort" : true
  } ],
  "pagingSize" : 1000,
  "getRemovePSControlAction" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0921642315.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSPANELS/Usr0921642315.json
 {
  "getAllPSPanelFields" : [ {
+    "id" : "field_text_dynamic2",
+    "viewFieldName" : "BOOKNAME"
+  }, {
    "id" : "field_text_dynamic",
    "viewFieldName" : "BOOKNAME"
  }, {
@@ -92,6 +95,23 @@
      },
      "rawContent" : "测试h1-----",
      "showCaption" : true
+    }, {
+      "caption" : "文本(动态)",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field_text_dynamic2",
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "field_text_dynamic2",
+        "predefinedType" : "FIELD_TEXT_DYNAMIC"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "viewFieldName" : "BOOKNAME",
+      "hidden" : false,
+      "showCaption" : false
    }, {
      "caption" : "图片",
      "contentType" : "IMAGE",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr09211294DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr09211294DataView.json
@@ -743,6 +743,9 @@
    },
    "getItemPSLayoutPanel" : {
      "getAllPSPanelFields" : [ {
+        "id" : "field_text_dynamic2",
+        "viewFieldName" : "BOOKNAME"
+      }, {
        "id" : "field_text_dynamic",
        "viewFieldName" : "BOOKNAME"
      }, {
@@ -836,6 +839,23 @@
          },
          "rawContent" : "测试h1-----",
          "showCaption" : true
+        }, {
+          "caption" : "文本(动态)",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "FIELD",
+          "name" : "field_text_dynamic2",
+          "getPSEditor" : {
+            "editorType" : "TEXTBOX",
+            "name" : "field_text_dynamic2",
+            "predefinedType" : "FIELD_TEXT_DYNAMIC"
+          },
+          "getPSLayoutPos" : {
+            "grow" : -1,
+            "layout" : "FLEX"
+          },
+          "viewFieldName" : "BOOKNAME",
+          "hidden" : false,
+          "showCaption" : false
        }, {
          "caption" : "图片",
          "contentType" : "IMAGE",
@@ -1062,15 +1082,15 @@
      "id" : "DATAVIEW"
    },
    "getPSDEDataViewDataItems" : [ {
-      "dataType" : 25,
-      "name" : "bookname"
-    }, {
      "dataType" : 25,
      "getFrontPSCodeList" : {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__CodeList44.json"
      },
      "name" : "type"
+    }, {
+      "dataType" : 25,
+      "name" : "bookname"
    }, {
      "dataType" : 25,
      "name" : "srfkey",
@@ -1101,16 +1121,6 @@
      }
    } ],
    "getPSDEDataViewItems" : [ {
-      "caption" : "书名称",
-      "dataItemName" : "bookname",
-      "itemType" : "DATAITEM",
-      "name" : "BOOKNAME",
-      "getPSAppDEField" : {
-        "name" : "BOOKNAME",
-        "codeName" : "BookName"
-      },
-      "enableSort" : true
-    }, {
      "cLConvertMode" : "FRONT",
      "caption" : "类型",
      "dataItemName" : "type",
@@ -1125,6 +1135,16 @@
        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__CodeList44.json"
      },
      "enableSort" : true
+    }, {
+      "caption" : "书名称",
+      "dataItemName" : "bookname",
+      "itemType" : "DATAITEM",
+      "name" : "BOOKNAME",
+      "getPSAppDEField" : {
+        "name" : "BOOKNAME",
+        "codeName" : "BookName"
+      },
+      "enableSort" : true
    } ],
    "pagingSize" : 1000,
    "getRemovePSControlAction" : {

--- 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
@@ -16828,16 +16828,16 @@
    "codeName" : "VMGroup2",
    "name" : "视图消息组2",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
      }
    }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
      }
    } ],
    "uniqueTag" : "VMGroup2"
@@ -16869,12 +16869,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -16886,6 +16880,12 @@
        "modelref" : true,
        "id" : "ViewMsg6"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
    } ],
    "uniqueTag" : "VMGroup3"
  }, {
@@ -16903,10 +16903,10 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
      }
    }, {
      "name" : "消息位置-弹出",
@@ -16915,10 +16915,10 @@
        "id" : "ViewMsg10"
      }
    }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -16932,41 +16932,23 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
    }, {
@@ -16982,16 +16964,34 @@
        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
    } ],
    "uniqueTag" : "VMGroup8"
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -17000,10 +17000,10 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    } ],
    "uniqueTag" : "VMGroup5"
@@ -17011,16 +17011,16 @@
    "codeName" : "VMGroup6",
    "name" : "视图消息动态模式测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
      }
    }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
      }
    } ],
    "uniqueTag" : "VMGroup6"
--- 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: