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/Student/PSGRIDS/StudentMain.json

@@ -81,7 +81,7 @@
       "name" : "ADDRESS",
       "codeName" : "Address"
     },
-    "width" : 100,
+    "width" : 200,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
@@ -98,7 +98,7 @@
       "name" : "RANK",
       "codeName" : "Rank"
     },
-    "width" : 100,
+    "width" : 200,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
@@ -115,7 +115,7 @@
       "name" : "DEPARTMENT",
       "codeName" : "Department"
     },
-    "width" : 100,
+    "width" : 200,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
@@ -132,7 +132,7 @@
       "name" : "NAME",
       "codeName" : "Name"
     },
-    "width" : 100,
+    "width" : 200,
     "widthUnit" : "PX",
     "enableRowEdit" : true,
     "enableSort" : true
@@ -150,7 +150,45 @@
       "name" : "AGE",
       "codeName" : "Age"
     },
-    "width" : 100,
+    "width" : 200,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "开始时间",
+    "codeName" : "start",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "start",
+    "excelCaption" : "开始时间",
+    "name" : "start",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "START",
+      "codeName" : "Start"
+    },
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "width" : 200,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "结束时间",
+    "codeName" : "end",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "end",
+    "excelCaption" : "结束时间",
+    "name" : "end",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "END",
+      "codeName" : "End"
+    },
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "width" : 200,
     "widthUnit" : "PX",
     "enableRowEdit" : true,
     "enableSort" : true
@@ -190,6 +228,22 @@
       "name" : "AGE",
       "codeName" : "Age"
     }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "start",
+    "getPSAppDEField" : {
+      "name" : "START",
+      "codeName" : "Start"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "end",
+    "getPSAppDEField" : {
+      "name" : "END",
+      "codeName" : "End"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfkey",
@@ -251,6 +305,44 @@
       "name" : "age"
     },
     "allowEmpty" : false
+  }, {
+    "caption" : "开始时间",
+    "codeName" : "start",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "start",
+    "getPSAppDEField" : {
+      "name" : "START",
+      "codeName" : "Start"
+    },
+    "getPSEditor" : {
+      "dateTimeFormat" : "YYYY-MM-DD",
+      "editorParams" : {
+        "TIMEFMT" : "YYYY-MM-DD"
+      },
+      "editorType" : "DATEPICKEREX_NOTIME",
+      "name" : "start"
+    },
+    "allowEmpty" : true
+  }, {
+    "caption" : "结束时间",
+    "codeName" : "end",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "end",
+    "getPSAppDEField" : {
+      "name" : "END",
+      "codeName" : "End"
+    },
+    "getPSEditor" : {
+      "dateTimeFormat" : "YYYY-MM-DD",
+      "editorParams" : {
+        "TIMEFMT" : "YYYY-MM-DD"
+      },
+      "editorType" : "DATEPICKEREX_NOTIME",
+      "name" : "end"
+    },
+    "allowEmpty" : false
   }, {
     "caption" : "学生标识",
     "codeName" : "srfkey",

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

@@ -7,7 +7,7 @@
   "codeName" : "WORKITEMKanbanEditView",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMKanbanEditView.json",
   "name" : "WORKITEMKanbanEditView",
-  "openMode" : "DRAWER_RIGHT",
+  "openMode" : "POPOVER",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"

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

@@ -58,7 +58,7 @@
       "logicType" : "PREDEFINED",
       "name" : "打开数据",
       "getOpenDataPSAppView" : {
-        "openMode" : "DRAWER_RIGHT",
+        "openMode" : "POPOVER",
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMKanbanEditView.json",
@@ -66,7 +66,7 @@
         }
       },
       "getPSAppUILogicRefViews" : [ {
-        "openMode" : "DRAWER_RIGHT",
+        "openMode" : "POPOVER",
         "getRefPSAppView" : {
           "modelref" : true,
           "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMKanbanEditView.json",
@@ -79,7 +79,7 @@
   } ],
   "getPSAppViewRefs" : [ {
     "name" : "OPENDATA",
-    "realOpenMode" : "DRAWER_RIGHT",
+    "realOpenMode" : "POPOVER",
     "realTitle" : "看板编辑视图",
     "getRefPSAppView" : {
       "modelref" : true,
@@ -88,7 +88,7 @@
     }
   }, {
     "name" : "EDITDATA",
-    "realOpenMode" : "DRAWER_RIGHT",
+    "realOpenMode" : "POPOVER",
     "realTitle" : "看板编辑视图",
     "getRefPSAppView" : {
       "modelref" : true,

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

@@ -383,7 +383,7 @@
         "name" : "ADDRESS",
         "codeName" : "Address"
       },
-      "width" : 100,
+      "width" : 200,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -400,7 +400,7 @@
         "name" : "RANK",
         "codeName" : "Rank"
       },
-      "width" : 100,
+      "width" : 200,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -417,7 +417,7 @@
         "name" : "DEPARTMENT",
         "codeName" : "Department"
       },
-      "width" : 100,
+      "width" : 200,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -434,7 +434,7 @@
         "name" : "NAME",
         "codeName" : "Name"
       },
-      "width" : 100,
+      "width" : 200,
       "widthUnit" : "PX",
       "enableRowEdit" : true,
       "enableSort" : true
@@ -452,7 +452,45 @@
         "name" : "AGE",
         "codeName" : "Age"
       },
-      "width" : 100,
+      "width" : 200,
+      "widthUnit" : "PX",
+      "enableRowEdit" : true,
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "开始时间",
+      "codeName" : "start",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "start",
+      "excelCaption" : "开始时间",
+      "name" : "start",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "START",
+        "codeName" : "Start"
+      },
+      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+      "width" : 200,
+      "widthUnit" : "PX",
+      "enableRowEdit" : true,
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "结束时间",
+      "codeName" : "end",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "end",
+      "excelCaption" : "结束时间",
+      "name" : "end",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "END",
+        "codeName" : "End"
+      },
+      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+      "width" : 200,
       "widthUnit" : "PX",
       "enableRowEdit" : true,
       "enableSort" : true
@@ -492,6 +530,22 @@
         "name" : "AGE",
         "codeName" : "Age"
       }
+    }, {
+      "format" : "YYYY-MM-DD HH:mm:ss",
+      "dataType" : 5,
+      "name" : "start",
+      "getPSAppDEField" : {
+        "name" : "START",
+        "codeName" : "Start"
+      }
+    }, {
+      "format" : "YYYY-MM-DD HH:mm:ss",
+      "dataType" : 5,
+      "name" : "end",
+      "getPSAppDEField" : {
+        "name" : "END",
+        "codeName" : "End"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfkey",
@@ -553,6 +607,44 @@
         "name" : "age"
       },
       "allowEmpty" : false
+    }, {
+      "caption" : "开始时间",
+      "codeName" : "start",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "start",
+      "getPSAppDEField" : {
+        "name" : "START",
+        "codeName" : "Start"
+      },
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD"
+        },
+        "editorType" : "DATEPICKEREX_NOTIME",
+        "name" : "start"
+      },
+      "allowEmpty" : true
+    }, {
+      "caption" : "结束时间",
+      "codeName" : "end",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "end",
+      "getPSAppDEField" : {
+        "name" : "END",
+        "codeName" : "End"
+      },
+      "getPSEditor" : {
+        "dateTimeFormat" : "YYYY-MM-DD",
+        "editorParams" : {
+          "TIMEFMT" : "YYYY-MM-DD"
+        },
+        "editorType" : "DATEPICKEREX_NOTIME",
+        "name" : "end"
+      },
+      "allowEmpty" : false
     }, {
       "caption" : "学生标识",
       "codeName" : "srfkey",

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

@@ -64796,7 +64796,7 @@
           "logicType" : "PREDEFINED",
           "name" : "打开数据",
           "getOpenDataPSAppView" : {
-            "openMode" : "DRAWER_RIGHT",
+            "openMode" : "POPOVER",
             "getRefPSAppView" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMKanbanEditView.json",
@@ -64804,7 +64804,7 @@
             }
           },
           "getPSAppUILogicRefViews" : [ {
-            "openMode" : "DRAWER_RIGHT",
+            "openMode" : "POPOVER",
             "getRefPSAppView" : {
               "modelref" : true,
               "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMKanbanEditView.json",
@@ -64817,7 +64817,7 @@
       } ],
       "getPSAppViewRefs" : [ {
         "name" : "OPENDATA",
-        "realOpenMode" : "DRAWER_RIGHT",
+        "realOpenMode" : "POPOVER",
         "realTitle" : "看板编辑视图",
         "getRefPSAppView" : {
           "modelref" : true,
@@ -64826,7 +64826,7 @@
         }
       }, {
         "name" : "EDITDATA",
-        "realOpenMode" : "DRAWER_RIGHT",
+        "realOpenMode" : "POPOVER",
         "realTitle" : "看板编辑视图",
         "getRefPSAppView" : {
           "modelref" : 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: