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/PSMODULES/Test/PSDATAENTITIES/MapData.json

@@ -883,7 +883,7 @@
     } ],
     "codeName" : "Value",
     "dEFType" : 1,
-    "dataType" : "DECIMAL",
+    "dataType" : "INT",
     "importOrder" : 1000,
     "logicName" : "统计数值",
     "name" : "VALUE",
@@ -896,7 +896,7 @@
       "id" : "VALUE"
     },
     "serviceCodeName" : "Value",
-    "stdDataType" : 6,
+    "stdDataType" : 9,
     "valueFormat" : "%1$s"
   }, {
     "getAllPSDEFUIModes" : [ {
@@ -1671,7 +1671,7 @@
         "codeName" : "Value"
       },
       "sourceType" : "DEFIELD",
-      "stdDataType" : 6,
+      "stdDataType" : 9,
       "type" : "SIMPLE"
     }, {
       "logicName" : "提示信息html",

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

@@ -574,7 +574,7 @@
     "codeName" : "Value",
     "logicName" : "统计数值",
     "name" : "VALUE",
-    "stdDataType" : 6
+    "stdDataType" : 9
   }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "MobileDefault",
@@ -1041,7 +1041,7 @@
         "codeName" : "Value"
       },
       "sourceType" : "DEFIELD",
-      "stdDataType" : 6,
+      "stdDataType" : 9,
       "type" : "SIMPLE"
     }, {
       "codeName" : "TooltipHtml",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSFORMS/Main.json

@@ -149,7 +149,7 @@
     }
   }, {
     "id" : "value",
-    "dataType" : 6,
+    "dataType" : 9,
     "getPSAppDEField" : {
       "name" : "VALUE",
       "codeName" : "Value"
@@ -368,7 +368,7 @@
       }, {
         "caption" : "统计数值",
         "codeName" : "value",
-        "dataType" : 6,
+        "dataType" : 9,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,

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

@@ -852,7 +852,7 @@
       }
     }, {
       "id" : "value",
-      "dataType" : 6,
+      "dataType" : 9,
       "getPSAppDEField" : {
         "name" : "VALUE",
         "codeName" : "Value"
@@ -1071,7 +1071,7 @@
         }, {
           "caption" : "统计数值",
           "codeName" : "value",
-          "dataType" : 6,
+          "dataType" : 9,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,

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

@@ -11227,12 +11227,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -11244,6 +11238,12 @@
         "modelref" : true,
         "id" : "ViewMsg5"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
     } ]
   }, {
     "codeName" : "VMGroup7",
@@ -11259,84 +11259,84 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -11348,32 +11348,32 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     }, {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     } ]
   } ],

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json

@@ -5018,7 +5018,7 @@
       "logicName" : "统计数值",
       "name" : "VALUE",
       "orderValue" : 210,
-      "stdDataType" : 6,
+      "stdDataType" : 9,
       "allowEmpty" : true,
       "enableCreate" : true,
       "enableModify" : true,

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: