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/Web/PSAPPDATAENTITIES/TESTGRID/PSLISTS/Test_List.json

@@ -50,6 +50,13 @@
   },
   "groupMode" : "NONE",
   "getItemPSLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "updateman",
+      "viewFieldName" : "UPDATEMAN"
+    }, {
+      "id" : "updatedate",
+      "viewFieldName" : "UPDATEDATE"
+    } ],
     "codeName" : "Usr0130806471",
     "controlType" : "PANEL",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json",
@@ -96,14 +103,57 @@
           "layout" : "FLEX"
         },
         "getPSRawItem" : {
-          "caption" : "list文本内容",
+          "caption" : "管理人员：",
           "contentType" : "RAW",
           "name" : "static_text",
           "predefinedType" : "STATIC_TEXT",
           "renderMode" : "TEXT"
         },
-        "rawContent" : "list文本内容",
+        "rawContent" : "管理人员：",
         "showCaption" : true
+      }, {
+        "caption" : "文本(动态)",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "updateman",
+        "getPSControlRenders" : [ {
+          "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+          "name" : "logic6",
+          "renderType" : "LAYOUTPANEL_MODEL"
+        } ],
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "updateman",
+          "predefinedType" : "FIELD_TEXT_DYNAMIC",
+          "renderMode" : "TEXT_DYNAMIC",
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "viewFieldName" : "UPDATEMAN",
+        "hidden" : false,
+        "showCaption" : false
+      }, {
+        "caption" : "文本(动态)",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "updatedate",
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "updatedate",
+          "predefinedType" : "FIELD_TEXT_DYNAMIC",
+          "renderMode" : "TEXT_DYNAMIC",
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "viewFieldName" : "UPDATEDATE",
+        "hidden" : false,
+        "showCaption" : false
       } ]
     } ],
     "name" : "list1_itempanel",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json

 {
+  "getAllPSPanelFields" : [ {
+    "id" : "updateman",
+    "viewFieldName" : "UPDATEMAN"
+  }, {
+    "id" : "updatedate",
+    "viewFieldName" : "UPDATEDATE"
+  } ],
   "codeName" : "Usr0130806471",
   "controlType" : "PANEL",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json",
@@ -44,14 +51,57 @@
         "layout" : "FLEX"
       },
       "getPSRawItem" : {
-        "caption" : "list文本内容",
+        "caption" : "管理人员：",
         "contentType" : "RAW",
         "name" : "static_text",
         "predefinedType" : "STATIC_TEXT",
         "renderMode" : "TEXT"
       },
-      "rawContent" : "list文本内容",
+      "rawContent" : "管理人员：",
       "showCaption" : true
+    }, {
+      "caption" : "文本(动态)",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "updateman",
+      "getPSControlRenders" : [ {
+        "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+        "name" : "logic6",
+        "renderType" : "LAYOUTPANEL_MODEL"
+      } ],
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "updateman",
+        "predefinedType" : "FIELD_TEXT_DYNAMIC",
+        "renderMode" : "TEXT_DYNAMIC",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "viewFieldName" : "UPDATEMAN",
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "文本(动态)",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "updatedate",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "updatedate",
+        "predefinedType" : "FIELD_TEXT_DYNAMIC",
+        "renderMode" : "TEXT_DYNAMIC",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "viewFieldName" : "UPDATEDATE",
+      "hidden" : false,
+      "showCaption" : false
     } ]
   } ],
   "modelid" : "8E23E5F9-258B-4FF0-BB9D-43F6A4C3E45C",

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

@@ -478,6 +478,13 @@
       },
       "groupMode" : "NONE",
       "getItemPSLayoutPanel" : {
+        "getAllPSPanelFields" : [ {
+          "id" : "updateman",
+          "viewFieldName" : "UPDATEMAN"
+        }, {
+          "id" : "updatedate",
+          "viewFieldName" : "UPDATEDATE"
+        } ],
         "codeName" : "Usr0130806471",
         "controlType" : "PANEL",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json",
@@ -524,14 +531,57 @@
               "layout" : "FLEX"
             },
             "getPSRawItem" : {
-              "caption" : "list文本内容",
+              "caption" : "管理人员：",
               "contentType" : "RAW",
               "name" : "static_text",
               "predefinedType" : "STATIC_TEXT",
               "renderMode" : "TEXT"
             },
-            "rawContent" : "list文本内容",
+            "rawContent" : "管理人员：",
             "showCaption" : true
+          }, {
+            "caption" : "文本(动态)",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "updateman",
+            "getPSControlRenders" : [ {
+              "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+              "name" : "logic6",
+              "renderType" : "LAYOUTPANEL_MODEL"
+            } ],
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "updateman",
+              "predefinedType" : "FIELD_TEXT_DYNAMIC",
+              "renderMode" : "TEXT_DYNAMIC",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "viewFieldName" : "UPDATEMAN",
+            "hidden" : false,
+            "showCaption" : false
+          }, {
+            "caption" : "文本(动态)",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "updatedate",
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "updatedate",
+              "predefinedType" : "FIELD_TEXT_DYNAMIC",
+              "renderMode" : "TEXT_DYNAMIC",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "viewFieldName" : "UPDATEDATE",
+            "hidden" : false,
+            "showCaption" : false
           } ]
         } ],
         "name" : "list_itempanel",
@@ -728,6 +778,13 @@
       },
       "groupMode" : "NONE",
       "getItemPSLayoutPanel" : {
+        "getAllPSPanelFields" : [ {
+          "id" : "updateman",
+          "viewFieldName" : "UPDATEMAN"
+        }, {
+          "id" : "updatedate",
+          "viewFieldName" : "UPDATEDATE"
+        } ],
         "codeName" : "Usr0130806471",
         "controlType" : "PANEL",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSPANELS/Usr0130806471.json",
@@ -774,14 +831,57 @@
               "layout" : "FLEX"
             },
             "getPSRawItem" : {
-              "caption" : "list文本内容",
+              "caption" : "管理人员：",
               "contentType" : "RAW",
               "name" : "static_text",
               "predefinedType" : "STATIC_TEXT",
               "renderMode" : "TEXT"
             },
-            "rawContent" : "list文本内容",
+            "rawContent" : "管理人员：",
             "showCaption" : true
+          }, {
+            "caption" : "文本(动态)",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "updateman",
+            "getPSControlRenders" : [ {
+              "layoutPanelModel" : "`<span class='${util?.confirm?.ns?.b()}'>管理员</span>`",
+              "name" : "logic6",
+              "renderType" : "LAYOUTPANEL_MODEL"
+            } ],
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "updateman",
+              "predefinedType" : "FIELD_TEXT_DYNAMIC",
+              "renderMode" : "TEXT_DYNAMIC",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "viewFieldName" : "UPDATEMAN",
+            "hidden" : false,
+            "showCaption" : false
+          }, {
+            "caption" : "文本(动态)",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "updatedate",
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "updatedate",
+              "predefinedType" : "FIELD_TEXT_DYNAMIC",
+              "renderMode" : "TEXT_DYNAMIC",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "viewFieldName" : "UPDATEDATE",
+            "hidden" : false,
+            "showCaption" : false
           } ]
         } ],
         "name" : "list1_itempanel",

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: