zhanghengfeng 发布系统代码 [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/TemplatePublish/PSAPPDATAENTITIES/Book/PSFORMS/Main_2.json

@@ -759,7 +759,7 @@
             "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "aggMode" : "PAGE",
+            "aggMode" : "NONE",
             "codeName" : "Main",
             "columnEnableFilter" : 2,
             "columnEnableLink" : 2,
@@ -1019,7 +1019,6 @@
               "widthUnit" : "PX",
               "enableSort" : true
             }, {
-              "aggMode" : "SUM",
               "align" : "LEFT",
               "cLConvertMode" : "NONE",
               "caption" : "年龄",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json

 {
-  "aggMode" : "PAGE",
+  "aggMode" : "NONE",
   "codeName" : "Main",
   "columnEnableFilter" : 2,
   "columnEnableLink" : 2,
@@ -169,7 +169,6 @@
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
-    "aggMode" : "SUM",
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
     "caption" : "年龄",

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

@@ -225,7 +225,7 @@
     "modelid" : "58C6B778-4F25-4735-A269-07D4AD7F7A22",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "aggMode" : "PAGE",
+    "aggMode" : "NONE",
     "codeName" : "Main",
     "columnEnableFilter" : 2,
     "columnEnableLink" : 2,
@@ -482,7 +482,6 @@
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
-      "aggMode" : "SUM",
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
       "caption" : "年龄",

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

@@ -125,7 +125,7 @@
       "id" : "GRIDEXPBAR"
     },
     "getPSControls" : [ {
-      "aggMode" : "PAGE",
+      "aggMode" : "NONE",
       "codeName" : "Main",
       "columnEnableFilter" : 2,
       "columnEnableLink" : 2,
@@ -350,7 +350,6 @@
         "widthUnit" : "PX",
         "enableSort" : true
       }, {
-        "aggMode" : "SUM",
         "align" : "LEFT",
         "cLConvertMode" : "NONE",
         "caption" : "年龄",

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

@@ -457,7 +457,7 @@
       "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "aggMode" : "PAGE",
+      "aggMode" : "NONE",
       "codeName" : "Main",
       "columnEnableFilter" : 2,
       "columnEnableLink" : 2,
@@ -717,7 +717,6 @@
         "widthUnit" : "PX",
         "enableSort" : true
       }, {
-        "aggMode" : "SUM",
         "align" : "LEFT",
         "cLConvertMode" : "NONE",
         "caption" : "年龄",

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

@@ -1726,7 +1726,7 @@
                 "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
                 "modeltype" : "PSDETOOLBAR"
               }, {
-                "aggMode" : "PAGE",
+                "aggMode" : "NONE",
                 "codeName" : "Main",
                 "columnEnableFilter" : 2,
                 "columnEnableLink" : 2,
@@ -1986,7 +1986,6 @@
                   "widthUnit" : "PX",
                   "enableSort" : true
                 }, {
-                  "aggMode" : "SUM",
                   "align" : "LEFT",
                   "cLConvertMode" : "NONE",
                   "caption" : "年龄",

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

@@ -870,7 +870,7 @@
               "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
               "modeltype" : "PSDETOOLBAR"
             }, {
-              "aggMode" : "PAGE",
+              "aggMode" : "NONE",
               "codeName" : "Main",
               "columnEnableFilter" : 2,
               "columnEnableLink" : 2,
@@ -1130,7 +1130,6 @@
                 "widthUnit" : "PX",
                 "enableSort" : true
               }, {
-                "aggMode" : "SUM",
                 "align" : "LEFT",
                 "cLConvertMode" : "NONE",
                 "caption" : "年龄",

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

@@ -843,7 +843,7 @@
                   "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
                   "modeltype" : "PSDETOOLBAR"
                 }, {
-                  "aggMode" : "PAGE",
+                  "aggMode" : "NONE",
                   "codeName" : "Main",
                   "columnEnableFilter" : 2,
                   "columnEnableLink" : 2,
@@ -1103,7 +1103,6 @@
                     "widthUnit" : "PX",
                     "enableSort" : true
                   }, {
-                    "aggMode" : "SUM",
                     "align" : "LEFT",
                     "cLConvertMode" : "NONE",
                     "caption" : "年龄",
@@ -2004,7 +2003,7 @@
                   "id" : "GRIDEXPBAR"
                 },
                 "getPSControls" : [ {
-                  "aggMode" : "PAGE",
+                  "aggMode" : "NONE",
                   "codeName" : "Main",
                   "columnEnableFilter" : 2,
                   "columnEnableLink" : 2,
@@ -2229,7 +2228,6 @@
                     "widthUnit" : "PX",
                     "enableSort" : true
                   }, {
-                    "aggMode" : "SUM",
                     "align" : "LEFT",
                     "cLConvertMode" : "NONE",
                     "caption" : "年龄",

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

@@ -758,7 +758,7 @@
             "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
             "modeltype" : "PSDETOOLBAR"
           }, {
-            "aggMode" : "PAGE",
+            "aggMode" : "NONE",
             "codeName" : "Main",
             "columnEnableFilter" : 2,
             "columnEnableLink" : 2,
@@ -1018,7 +1018,6 @@
               "widthUnit" : "PX",
               "enableSort" : true
             }, {
-              "aggMode" : "SUM",
               "align" : "LEFT",
               "cLConvertMode" : "NONE",
               "caption" : "年龄",

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

@@ -1059,7 +1059,7 @@
               "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
               "modeltype" : "PSDETOOLBAR"
             }, {
-              "aggMode" : "PAGE",
+              "aggMode" : "NONE",
               "codeName" : "Main",
               "columnEnableFilter" : 2,
               "columnEnableLink" : 2,
@@ -1319,7 +1319,6 @@
                 "widthUnit" : "PX",
                 "enableSort" : true
               }, {
-                "aggMode" : "SUM",
                 "align" : "LEFT",
                 "cLConvertMode" : "NONE",
                 "caption" : "年龄",

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

 {
-  "aggMode" : "PAGE",
+  "aggMode" : "NONE",
   "codeName" : "Main",
   "columnEnableFilter" : 2,
   "columnEnableLink" : 2,
@@ -169,7 +169,6 @@
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
-    "aggMode" : "SUM",
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
     "caption" : "年龄",

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

@@ -225,7 +225,7 @@
     "modelid" : "58C6B778-4F25-4735-A269-07D4AD7F7A22",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "aggMode" : "PAGE",
+    "aggMode" : "NONE",
     "codeName" : "Main",
     "columnEnableFilter" : 2,
     "columnEnableLink" : 2,
@@ -482,7 +482,6 @@
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
-      "aggMode" : "SUM",
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
       "caption" : "年龄",

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

@@ -124,7 +124,7 @@
       "id" : "GRIDEXPBAR"
     },
     "getPSControls" : [ {
-      "aggMode" : "PAGE",
+      "aggMode" : "NONE",
       "codeName" : "Main",
       "columnEnableFilter" : 2,
       "columnEnableLink" : 2,
@@ -349,7 +349,6 @@
         "widthUnit" : "PX",
         "enableSort" : true
       }, {
-        "aggMode" : "SUM",
         "align" : "LEFT",
         "cLConvertMode" : "NONE",
         "caption" : "年龄",

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

@@ -69,7 +69,7 @@
       "id" : "GRIDEXPBAR"
     },
     "getPSControls" : [ {
-      "aggMode" : "PAGE",
+      "aggMode" : "NONE",
       "codeName" : "Main",
       "columnEnableFilter" : 2,
       "columnEnableLink" : 2,
@@ -294,7 +294,6 @@
         "widthUnit" : "PX",
         "enableSort" : true
       }, {
-        "aggMode" : "SUM",
         "align" : "LEFT",
         "cLConvertMode" : "NONE",
         "caption" : "年龄",

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

@@ -456,7 +456,7 @@
       "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
       "modeltype" : "PSDETOOLBAR"
     }, {
-      "aggMode" : "PAGE",
+      "aggMode" : "NONE",
       "codeName" : "Main",
       "columnEnableFilter" : 2,
       "columnEnableLink" : 2,
@@ -716,7 +716,6 @@
         "widthUnit" : "PX",
         "enableSort" : true
       }, {
-        "aggMode" : "SUM",
         "align" : "LEFT",
         "cLConvertMode" : "NONE",
         "caption" : "年龄",

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

@@ -1177,7 +1177,7 @@
                 "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
                 "modeltype" : "PSDETOOLBAR"
               }, {
-                "aggMode" : "PAGE",
+                "aggMode" : "NONE",
                 "codeName" : "Main",
                 "columnEnableFilter" : 2,
                 "columnEnableLink" : 2,
@@ -1437,7 +1437,6 @@
                   "widthUnit" : "PX",
                   "enableSort" : true
                 }, {
-                  "aggMode" : "SUM",
                   "align" : "LEFT",
                   "cLConvertMode" : "NONE",
                   "caption" : "年龄",

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

@@ -1514,7 +1514,7 @@
                     "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
                     "modeltype" : "PSDETOOLBAR"
                   }, {
-                    "aggMode" : "PAGE",
+                    "aggMode" : "NONE",
                     "codeName" : "Main",
                     "columnEnableFilter" : 2,
                     "columnEnableLink" : 2,
@@ -1774,7 +1774,6 @@
                       "widthUnit" : "PX",
                       "enableSort" : true
                     }, {
-                      "aggMode" : "SUM",
                       "align" : "LEFT",
                       "cLConvertMode" : "NONE",
                       "caption" : "年龄",
@@ -2675,7 +2674,7 @@
                     "id" : "GRIDEXPBAR"
                   },
                   "getPSControls" : [ {
-                    "aggMode" : "PAGE",
+                    "aggMode" : "NONE",
                     "codeName" : "Main",
                     "columnEnableFilter" : 2,
                     "columnEnableLink" : 2,
@@ -2900,7 +2899,6 @@
                       "widthUnit" : "PX",
                       "enableSort" : true
                     }, {
-                      "aggMode" : "SUM",
                       "align" : "LEFT",
                       "cLConvertMode" : "NONE",
                       "caption" : "年龄",

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

@@ -1725,7 +1725,7 @@
                 "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
                 "modeltype" : "PSDETOOLBAR"
               }, {
-                "aggMode" : "PAGE",
+                "aggMode" : "NONE",
                 "codeName" : "Main",
                 "columnEnableFilter" : 2,
                 "columnEnableLink" : 2,
@@ -1985,7 +1985,6 @@
                   "widthUnit" : "PX",
                   "enableSort" : true
                 }, {
-                  "aggMode" : "SUM",
                   "align" : "LEFT",
                   "cLConvertMode" : "NONE",
                   "caption" : "年龄",

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

@@ -868,7 +868,7 @@
               "modelid" : "542628D5-63B8-40D7-AF62-4488412CA41D",
               "modeltype" : "PSDETOOLBAR"
             }, {
-              "aggMode" : "PAGE",
+              "aggMode" : "NONE",
               "codeName" : "Main",
               "columnEnableFilter" : 2,
               "columnEnableLink" : 2,
@@ -1128,7 +1128,6 @@
                 "widthUnit" : "PX",
                 "enableSort" : true
               }, {
-                "aggMode" : "SUM",
                 "align" : "LEFT",
                 "cLConvertMode" : "NONE",
                 "caption" : "年龄",

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: