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

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>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSFORMS/TestMobEditView_Form.json

@@ -428,7 +428,7 @@
             "needCodeListConfig" : true,
             "showCaption" : false
           }, {
-            "caption" : "测试实体名称(%)",
+            "caption" : "标题（名称）",
             "dataType" : 25,
             "itemType" : "FILTER",
             "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/testSearchBar.json

@@ -100,7 +100,7 @@
     "needCodeListConfig" : true,
     "showCaption" : false
   }, {
-    "caption" : "测试实体名称(%)",
+    "caption" : "标题（名称）",
     "dataType" : 25,
     "itemType" : "FILTER",
     "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditView3.json

@@ -531,7 +531,7 @@
               "needCodeListConfig" : true,
               "showCaption" : false
             }, {
-              "caption" : "测试实体名称(%)",
+              "caption" : "标题（名称）",
               "dataType" : 25,
               "itemType" : "FILTER",
               "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobEditViewLayoutPart.json

@@ -735,7 +735,7 @@
                 "needCodeListConfig" : true,
                 "showCaption" : false
               }, {
-                "caption" : "测试实体名称(%)",
+                "caption" : "标题（名称）",
                 "dataType" : 25,
                 "itemType" : "FILTER",
                 "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView.json

@@ -526,7 +526,7 @@
               "needCodeListConfig" : true,
               "showCaption" : false
             }, {
-              "caption" : "测试实体名称(%)",
+              "caption" : "标题（名称）",
               "dataType" : 25,
               "itemType" : "FILTER",
               "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json

@@ -526,7 +526,7 @@
               "needCodeListConfig" : true,
               "showCaption" : false
             }, {
-              "caption" : "测试实体名称(%)",
+              "caption" : "标题（名称）",
               "dataType" : 25,
               "itemType" : "FILTER",
               "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobEditView9.json

@@ -531,7 +531,7 @@
               "needCodeListConfig" : true,
               "showCaption" : false
             }, {
-              "caption" : "测试实体名称(%)",
+              "caption" : "标题（名称）",
               "dataType" : 25,
               "itemType" : "FILTER",
               "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -697,7 +697,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",
@@ -992,7 +992,7 @@
           "needCodeListConfig" : true,
           "showCaption" : false
         }, {
-          "caption" : "测试实体名称(%)",
+          "caption" : "标题（名称）",
           "dataType" : 25,
           "itemType" : "FILTER",
           "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupView.json

@@ -169,7 +169,7 @@
           "needCodeListConfig" : true,
           "showCaption" : false
         }, {
-          "caption" : "测试实体名称(%)",
+          "caption" : "标题（名称）",
           "dataType" : 25,
           "itemType" : "FILTER",
           "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobTreeView.json

@@ -123,7 +123,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTTestMobEditView.json

@@ -531,7 +531,7 @@
               "needCodeListConfig" : true,
               "showCaption" : false
             }, {
-              "caption" : "测试实体名称(%)",
+              "caption" : "标题（名称）",
               "dataType" : 25,
               "itemType" : "FILTER",
               "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTTestMobMDView.json

@@ -146,7 +146,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/testSearchBar.json

@@ -100,7 +100,7 @@
     "needCodeListConfig" : true,
     "showCaption" : false
   }, {
-    "caption" : "测试实体名称(%)",
+    "caption" : "标题（名称）",
     "dataType" : 25,
     "itemType" : "FILTER",
     "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -698,7 +698,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",
@@ -994,7 +994,7 @@
           "needCodeListConfig" : true,
           "showCaption" : false
         }, {
-          "caption" : "测试实体名称(%)",
+          "caption" : "标题（名称）",
           "dataType" : 25,
           "itemType" : "FILTER",
           "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTMobPickupView.json

@@ -171,7 +171,7 @@
           "needCodeListConfig" : true,
           "showCaption" : false
         }, {
-          "caption" : "测试实体名称(%)",
+          "caption" : "标题（名称）",
           "dataType" : 25,
           "itemType" : "FILTER",
           "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTTestMobMDView.json

@@ -147,7 +147,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1613,16 +1613,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"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHBARS/testSearchBar.json

@@ -100,7 +100,7 @@
     "needCodeListConfig" : true,
     "showCaption" : false
   }, {
-    "caption" : "测试实体名称(%)",
+    "caption" : "标题（名称）",
     "dataType" : 25,
     "itemType" : "FILTER",
     "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr09053571GridView.json

@@ -1521,7 +1521,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridExpView.json

@@ -147,7 +147,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -703,7 +703,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",
@@ -999,7 +999,7 @@
           "needCodeListConfig" : true,
           "showCaption" : false
         }, {
-          "caption" : "测试实体名称(%)",
+          "caption" : "标题（名称）",
           "dataType" : 25,
           "itemType" : "FILTER",
           "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMobPickupView.json

@@ -171,7 +171,7 @@
           "needCodeListConfig" : true,
           "showCaption" : false
         }, {
-          "caption" : "测试实体名称(%)",
+          "caption" : "标题（名称）",
           "dataType" : 25,
           "itemType" : "FILTER",
           "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTSearchBarTest.json

@@ -601,7 +601,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestMobMDView.json

@@ -147,7 +147,7 @@
       "needCodeListConfig" : true,
       "showCaption" : false
     }, {
-      "caption" : "测试实体名称(%)",
+      "caption" : "标题（名称）",
       "dataType" : 25,
       "itemType" : "FILTER",
       "labelPos" : "NONE",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -13529,16 +13529,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"
       }
     } ]
   }, {
@@ -13567,16 +13567,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       }
     }, {
       "name" : "消息类型-警告信息",
@@ -13605,32 +13605,39 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
@@ -13640,10 +13647,10 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
     }, {
@@ -13670,13 +13677,6 @@
         "modelref" : true,
         "id" : "ViewMsg8"
       }
-    }, {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -13704,16 +13704,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

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

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

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: