tony001 发布系统代码 [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/PSSYSAPP.hubsubapp.json.css

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.simple.json.css

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/OldWebAppTest/PSSYSAPP.hubsubapp.json.css

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/OldWebAppTest/PSSYSAPP.simple.json.css

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

@@ -1517,16 +1517,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/TemplatePublish/PSSYSAPP.json.css

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

@@ -165,8 +165,8 @@
         } ]
       }, {
         "caption" : "容器",
-        "contentHeight" : 65.0,
-        "height" : 65.0,
+        "contentHeight" : 650.0,
+        "height" : 650.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
         "name" : "view_drbar",
@@ -176,7 +176,7 @@
         },
         "getPSLayoutPos" : {
           "grow" : -1,
-          "height" : 65,
+          "height" : 650,
           "heightMode" : "PX",
           "layout" : "FLEX",
           "shrink" : 0
@@ -275,7 +275,9 @@
             "name" : "divider",
             "getPSLayoutPos" : {
               "grow" : -1,
-              "layout" : "FLEX"
+              "layout" : "FLEX",
+              "spacingLeft" : "INNERMEDIUM",
+              "spacingRight" : "INNERMEDIUM"
             },
             "getPSRawItem" : {
               "contentType" : "DIVIDER",
@@ -339,7 +341,9 @@
             "name" : "divider1",
             "getPSLayoutPos" : {
               "grow" : -1,
-              "layout" : "FLEX"
+              "layout" : "FLEX",
+              "spacingLeft" : "INNERMEDIUM",
+              "spacingRight" : "INNERMEDIUM"
             },
             "getPSRawItem" : {
               "contentType" : "DIVIDER",

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

@@ -172,8 +172,8 @@
         } ]
       }, {
         "caption" : "容器",
-        "contentHeight" : 65.0,
-        "height" : 65.0,
+        "contentHeight" : 650.0,
+        "height" : 650.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
         "name" : "view_drbar",
@@ -183,7 +183,7 @@
         },
         "getPSLayoutPos" : {
           "grow" : -1,
-          "height" : 65,
+          "height" : 650,
           "heightMode" : "PX",
           "layout" : "FLEX",
           "shrink" : 0
@@ -282,7 +282,9 @@
             "name" : "divider",
             "getPSLayoutPos" : {
               "grow" : -1,
-              "layout" : "FLEX"
+              "layout" : "FLEX",
+              "spacingLeft" : "INNERMEDIUM",
+              "spacingRight" : "INNERMEDIUM"
             },
             "getPSRawItem" : {
               "contentType" : "DIVIDER",
@@ -346,7 +348,9 @@
             "name" : "divider1",
             "getPSLayoutPos" : {
               "grow" : -1,
-              "layout" : "FLEX"
+              "layout" : "FLEX",
+              "spacingLeft" : "INNERMEDIUM",
+              "spacingRight" : "INNERMEDIUM"
             },
             "getPSRawItem" : {
               "contentType" : "DIVIDER",

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

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

@@ -12289,16 +12289,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"
       }
     } ]
   }, {
@@ -12327,12 +12327,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12344,6 +12338,12 @@
         "modelref" : true,
         "id" : "ViewMsg5"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
     } ]
   }, {
     "codeName" : "VMGroup7",
@@ -12359,58 +12359,66 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -12418,40 +12426,32 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "关闭模式-本次删除",

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

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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

 /***    START:系统样式表    ***/
+    .big-icon {
+  padding: 0;
+}
+.big-icon .el-button {
+  font-size: 24px;
+}
+.big-icon .el-button .ibiz-icon {
+  max-width: 24px !important;
+  max-height: 24px !important;
+}
+.big-icon .el-button .ibiz-panel-button-content--caption {
+  display: none;
+}
+    .vertical-divider .ibiz-rawitem {
+  border-left: 1px solid getCssVar(color, border);
+  height: 1em;
+}
+.vertical-divider .el-divider {
+  display: none;
+}
     .test2 {
     padding: 1px 0px 0px 0px;
     margin: 0px 0px 0px 0px;

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: