lxm1993 发布系统代码 [TrainSys，网页端]

10a7bd14 · ibizdev · db959a98 · 10a7bd14 · 10a7bd14 · 10a7bd14
--- a/config.xml
+++ b/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>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/City/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/City/PSGRIDS/Main.json
@@ -110,6 +110,25 @@
    "width" : 150,
    "widthUnit" : "PX",
    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "人数",
+    "codeName" : "num",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "num",
+    "excelCaption" : "人数",
+    "mOSFilePath" : "psdegridcols/num",
+    "name" : "num",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "NUM",
+      "codeName" : "Num"
+    },
+    "rTMOSFilePath" : "psdegridcols/num",
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
  } ],
  "getPSDEGridDataItems" : [ {
    "dataType" : 25,
@@ -133,6 +152,13 @@
      "name" : "UPDATEDATE",
      "codeName" : "UpdateDate"
    }
+  }, {
+    "dataType" : 9,
+    "name" : "num",
+    "getPSAppDEField" : {
+      "name" : "NUM",
+      "codeName" : "Num"
+    }
  }, {
    "dataType" : 25,
    "name" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/cityGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/cityGridView.json
@@ -593,6 +593,25 @@
      "width" : 150,
      "widthUnit" : "PX",
      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "人数",
+      "codeName" : "num",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "num",
+      "excelCaption" : "人数",
+      "mOSFilePath" : "psdegridcols/num",
+      "name" : "num",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "NUM",
+        "codeName" : "Num"
+      },
+      "rTMOSFilePath" : "psdegridcols/num",
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
    } ],
    "getPSDEGridDataItems" : [ {
      "dataType" : 25,
@@ -616,6 +635,13 @@
        "name" : "UPDATEDATE",
        "codeName" : "UpdateDate"
      }
+    }, {
+      "dataType" : 9,
+      "name" : "num",
+      "getPSAppDEField" : {
+        "name" : "NUM",
+        "codeName" : "Num"
+      }
    }, {
      "dataType" : 25,
      "name" : "srfkey",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneTabExpView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneTabExpView.json
@@ -38,11 +38,11 @@
      }
    }, {
      "name" : "EXPITEM:tabviewpanel2",
-      "realTitle" : "手机编辑视图",
+      "realTitle" : "学生表格视图",
      "getRefPSAppView" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json",
-        "viewType" : "DEEDITVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
+        "viewType" : "DEGRIDVIEW"
      }
    } ],
    "getPSControlParam" : { },
@@ -2222,13 +2222,13 @@
        "modeltype" : "PSAPPDEVIEW"
      }
    }, {
-      "caption" : "表单",
+      "caption" : "表格2",
      "codeName" : "TabExpViewtabviewpanel2",
      "controlType" : "TABVIEWPANEL",
      "getEmbeddedPSAppDEView" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json",
-        "viewType" : "DEEDITVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
+        "viewType" : "DEGRIDVIEW"
      },
      "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psviewpanels/TabExpViewtabviewpanel2",
      "name" : "tabviewpanel2",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json
@@ -3951,7 +3951,6 @@
    "useDefaultLayout" : true
  },
  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentEditView",
-  "refFlag" : false,
  "title" : "学生编辑视图",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEEDITVIEW",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json
@@ -1629,7 +1629,6 @@
    "useDefaultLayout" : true
  },
  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/studentGridView",
-  "refFlag" : false,
  "title" : "学生表格视图",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEGRIDVIEW",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.hubsubapp.json
@@ -632,11 +632,11 @@
      }
    }, {
      "name" : "EXPITEM:tabviewpanel2",
-      "realTitle" : "手机编辑视图",
+      "realTitle" : "学生表格视图",
      "getRefPSAppView" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json",
-        "viewType" : "DEEDITVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
+        "viewType" : "DEGRIDVIEW"
      }
    } ],
    "getPSControlParam" : { },
@@ -662,13 +662,13 @@
      "modelid" : "ce6b7952d59604f041810a73b43824dc_tabviewpanel",
      "modeltype" : "PSVIEWPANEL"
    }, {
-      "caption" : "表单",
+      "caption" : "表格2",
      "codeName" : "TabExpViewtabviewpanel2",
      "controlType" : "TABVIEWPANEL",
      "getEmbeddedPSAppDEView" : {
        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr2EditView.json",
-        "viewType" : "DEEDITVIEW"
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentGridView.json",
+        "viewType" : "DEGRIDVIEW"
      },
      "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psviewpanels/TabExpViewtabviewpanel2",
      "name" : "tabviewpanel2",

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/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
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/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

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/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: