fangzhihao 发布系统代码 [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/common/PSDATAENTITIES/Student.json

@@ -2581,6 +2581,12 @@
     "name" : "大屏数据看板",
     "realModelSubType" : "DEPORTALVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr08142283CustomView",
+    "logicName" : "装饰器5",
+    "name" : "装饰器5",
+    "realModelSubType" : "DECUSTOMVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr08139902CustomView",
     "logicName" : "边框11",
@@ -2599,6 +2605,12 @@
     "name" : "大屏进度条",
     "realModelSubType" : "DEPANELVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr08145967CustomView",
+    "logicName" : "装饰器3",
+    "name" : "装饰器3",
+    "realModelSubType" : "DECUSTOMVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "Usr08132390CustomView",
     "logicName" : "大屏小组件展示视图",

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

@@ -2702,6 +2702,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08070298CustomView.json",
     "viewType" : "DECUSTOMVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08145967CustomView.json",
+    "viewType" : "DECUSTOMVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08080936ChartView.json",
@@ -2766,6 +2770,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08086126GridView.json",
     "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08142283CustomView.json",
+    "viewType" : "DECUSTOMVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView3.json",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSDASHBOARDS/ScreenBorderDashboardView_Dashboard.json

@@ -1335,7 +1335,6 @@
     }, {
       "codeName" : "ScreenBorderDashboardViewdashboard_container5",
       "controlType" : "PORTLET",
-      "height" : 350.0,
       "name" : "dashboard_container5",
       "getPSAppDataEntity" : {
         "modelref" : true,
@@ -1346,7 +1345,6 @@
         "id" : "dashboard_container5"
       },
       "getPSControlParam" : {
-        "height" : 350.0,
         "autoLoad" : true,
         "showBusyIndicator" : true
       },
@@ -1357,8 +1355,6 @@
       },
       "getPSLayoutPos" : {
         "colMD" : 24,
-        "height" : 350,
-        "heightMode" : "PX",
         "layout" : "TABLE_24COL"
       },
       "getPSControls" : [ {
@@ -1557,7 +1553,7 @@
           "modeltype" : "PSAPPDEVIEW"
         },
         "portletType" : "VIEW",
-        "title" : "CustomDecoration5",
+        "title" : "CustomDecoration1",
         "showTitleBar" : true,
         "modelid" : "1037600B-C603-437C-BD37-FCDAA85630CA",
         "modeltype" : "PSSYSDBPART"
@@ -1662,6 +1658,129 @@
         "modelid" : "EC841952-B150-47E1-AB24-A5CFE9D68B8F",
         "modeltype" : "PSSYSDBPART"
       }, {
+        "codeName" : "zsq3",
+        "controlType" : "PORTLET",
+        "height" : 300.0,
+        "name" : "dashboard_sysportlet18",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+        },
+        "getPSControlHandler" : {
+          "enableDEFieldPrivilege" : false,
+          "id" : "dashboard_sysportlet18"
+        },
+        "getPSControlParam" : {
+          "autoLoad" : true,
+          "showBusyIndicator" : true
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 6,
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPortletPSAppView" : {
+          "accUserMode" : 2,
+          "caption" : "学生",
+          "codeName" : "studentUsr08145967CustomView",
+          "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08145967CustomView.json",
+          "name" : "studentUsr08145967CustomView",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+          },
+          "getPSAppModule" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
+          },
+          "getPSDEViewCodeName" : "Usr08145967CustomView",
+          "getPSDEViewId" : "80CBB269-324E-4852-84B1-BE592D69558A",
+          "getPSViewLayoutPanel" : {
+            "codeName" : "Usr0814604884",
+            "controlType" : "VIEWLAYOUTPANEL",
+            "layoutMode" : "FLEX",
+            "logicName" : "装饰器3布局面板",
+            "name" : "layoutpanel",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+            },
+            "getPSControlParam" : { },
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getRootPSPanelItems" : [ {
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CONTAINER",
+              "name" : "page_container",
+              "getPSLayout" : {
+                "dir" : "column",
+                "layout" : "FLEX"
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              }
+            } ],
+            "layoutBodyOnly" : false,
+            "layoutPanel" : true,
+            "useDefaultLayout" : false,
+            "viewProxyMode" : true,
+            "modelid" : "4320CEB8-AD71-4154-9DB9-2CE3770A8592",
+            "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+            "getPSControls" : [ {
+              "caption" : "学生",
+              "codeName" : "Usr08145967CustomViewcaptionbar",
+              "controlType" : "CAPTIONBAR",
+              "name" : "captionbar",
+              "getPSAppDataEntity" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+              },
+              "getPSControlParam" : { }
+            } ]
+          },
+          "title" : "装饰器3",
+          "viewStyle" : "DEFAULT",
+          "viewType" : "DECUSTOMVIEW",
+          "enableDP" : true,
+          "modelid" : "22ce5703fc76d9bfb7a6e11c0408fa58",
+          "modeltype" : "PSAPPDEVIEW"
+        },
+        "portletType" : "VIEW",
+        "title" : "CustomDecoration3",
+        "showTitleBar" : true,
+        "modelid" : "60377A11-B4F7-40F6-88DD-FB4D2B7DB357",
+        "modeltype" : "PSSYSDBPART"
+      } ],
+      "portletType" : "CONTAINER",
+      "showTitleBar" : false
+    }, {
+      "codeName" : "ScreenBorderDashboardViewdashboard_container6",
+      "controlType" : "PORTLET",
+      "name" : "dashboard_container6",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      },
+      "getPSControlHandler" : {
+        "enableDEFieldPrivilege" : false,
+        "id" : "dashboard_container6"
+      },
+      "getPSControlParam" : {
+        "autoLoad" : true,
+        "showBusyIndicator" : true
+      },
+      "getPSLayout" : {
+        "childColMD" : 24,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSControls" : [ {
         "codeName" : "zsq4",
         "controlStyle" : "SCREEN",
         "controlType" : "PORTLET",
@@ -1761,35 +1880,102 @@
         "showTitleBar" : true,
         "modelid" : "807828F2-1D44-4F42-A80A-0E8633826D9F",
         "modeltype" : "PSSYSDBPART"
-      } ],
-      "portletType" : "CONTAINER",
-      "showTitleBar" : false
       }, {
-      "codeName" : "ScreenBorderDashboardViewdashboard_container6",
+        "codeName" : "zsq5",
         "controlType" : "PORTLET",
-      "name" : "dashboard_container6",
+        "height" : 300.0,
+        "name" : "dashboard_sysportlet19",
         "getPSAppDataEntity" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
         },
         "getPSControlHandler" : {
           "enableDEFieldPrivilege" : false,
-        "id" : "dashboard_container6"
+          "id" : "dashboard_sysportlet19"
         },
         "getPSControlParam" : {
           "autoLoad" : true,
           "showBusyIndicator" : true
         },
-      "getPSLayout" : {
-        "childColMD" : 24,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
         "getPSLayoutPos" : {
+          "colLG" : 6,
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
+        "getPortletPSAppView" : {
+          "accUserMode" : 2,
+          "caption" : "学生",
+          "codeName" : "studentUsr08142283CustomView",
+          "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08142283CustomView.json",
+          "name" : "studentUsr08142283CustomView",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+          },
+          "getPSAppModule" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
+          },
+          "getPSDEViewCodeName" : "Usr08142283CustomView",
+          "getPSDEViewId" : "6390E9AE-F556-40D1-B640-6A7B51D31DDB",
+          "getPSViewLayoutPanel" : {
+            "codeName" : "Usr0814771236",
+            "controlType" : "VIEWLAYOUTPANEL",
+            "layoutMode" : "FLEX",
+            "logicName" : "装饰器5布局面板",
+            "name" : "layoutpanel",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+            },
+            "getPSControlParam" : { },
+            "getPSLayout" : {
+              "layout" : "FLEX"
+            },
+            "getRootPSPanelItems" : [ {
+              "itemStyle" : "DEFAULT",
+              "itemType" : "CONTAINER",
+              "name" : "page_container",
+              "getPSLayout" : {
+                "dir" : "column",
+                "layout" : "FLEX"
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "layout" : "FLEX"
+              }
+            } ],
+            "layoutBodyOnly" : false,
+            "layoutPanel" : true,
+            "useDefaultLayout" : false,
+            "viewProxyMode" : true,
+            "modelid" : "DE0E1DB1-AFD9-467C-AD7C-1F85406E42DB",
+            "modeltype" : "PSSYSVIEWLAYOUTPANEL",
             "getPSControls" : [ {
+              "caption" : "学生",
+              "codeName" : "Usr08142283CustomViewcaptionbar",
+              "controlType" : "CAPTIONBAR",
+              "name" : "captionbar",
+              "getPSAppDataEntity" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+              },
+              "getPSControlParam" : { }
+            } ]
+          },
+          "title" : "装饰器5",
+          "viewStyle" : "DEFAULT",
+          "viewType" : "DECUSTOMVIEW",
+          "enableDP" : true,
+          "modelid" : "6909a00e94336799932a3726c1ad8fb4",
+          "modeltype" : "PSAPPDEVIEW"
+        },
+        "portletType" : "VIEW",
+        "title" : "CustomDecoration5",
+        "showTitleBar" : true,
+        "modelid" : "47B2A2B0-8EFD-4844-85C0-B8ABD0585CA2",
+        "modeltype" : "PSSYSDBPART"
+      }, {
         "codeName" : "zsq6",
         "controlStyle" : "SCREEN",
         "controlType" : "PORTLET",

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

+{
+  "accUserMode" : 2,
+  "caption" : "学生",
+  "codeName" : "studentUsr08142283CustomView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08142283CustomView.json",
+  "name" : "studentUsr08142283CustomView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
+  },
+  "getPSDEViewCodeName" : "Usr08142283CustomView",
+  "getPSDEViewId" : "6390E9AE-F556-40D1-B640-6A7B51D31DDB",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0814771236",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "装饰器5布局面板",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "dir" : "column",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      }
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "DE0E1DB1-AFD9-467C-AD7C-1F85406E42DB",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+    "getPSControls" : [ {
+      "caption" : "学生",
+      "codeName" : "Usr08142283CustomViewcaptionbar",
+      "controlType" : "CAPTIONBAR",
+      "name" : "captionbar",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      },
+      "getPSControlParam" : { }
+    } ]
+  },
+  "title" : "装饰器5",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECUSTOMVIEW",
+  "enableDP" : true,
+  "modelid" : "6909a00e94336799932a3726c1ad8fb4",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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

+{
+  "accUserMode" : 2,
+  "caption" : "学生",
+  "codeName" : "studentUsr08145967CustomView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr08145967CustomView.json",
+  "name" : "studentUsr08145967CustomView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/common.json"
+  },
+  "getPSDEViewCodeName" : "Usr08145967CustomView",
+  "getPSDEViewId" : "80CBB269-324E-4852-84B1-BE592D69558A",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr0814604884",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "FLEX",
+    "logicName" : "装饰器3布局面板",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "dir" : "column",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      }
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "viewProxyMode" : true,
+    "modelid" : "4320CEB8-AD71-4154-9DB9-2CE3770A8592",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
+    "getPSControls" : [ {
+      "caption" : "学生",
+      "codeName" : "Usr08145967CustomViewcaptionbar",
+      "controlType" : "CAPTIONBAR",
+      "name" : "captionbar",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      },
+      "getPSControlParam" : { }
+    } ]
+  },
+  "title" : "装饰器3",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DECUSTOMVIEW",
+  "enableDP" : true,
+  "modelid" : "22ce5703fc76d9bfb7a6e11c0408fa58",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

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: