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

47d3d50c · ibizdev · 8d50350b · 47d3d50c · 47d3d50c · 47d3d50c
--- a/app_Web/swarm.yaml
+++ b/app_Web/swarm.yaml
@@ -3,7 +3,7 @@ services:
  trainsys-app-web:
    image: dstimage
    ports:
-      - "50100:80"
+      - "80:80"
    networks:
      - agent_network
    environment:

--- a/config.xml
+++ b/config.xml
@@ -55,14 +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
-      sed -i "s#dstimage#$para5#g" pom.xml 
-      sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml 
-      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/Phone/PSDASHBOARDS/Dashboard.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSLISTS/Mob.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSLISTS/Mob.json
@@ -16,7 +16,136 @@
  },
  "groupMode" : "NONE",
  "height" : 300.0,
+  "getItemPSLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "field1"
+    }, {
+      "id" : "field2"
+    }, {
+      "id" : "field3"
+    }, {
+      "id" : "field4"
+    }, {
+      "id" : "field5"
+    } ],
+    "codeName" : "Dashboard_sysportlet2_list_itempanel",
+    "controlType" : "PANEL",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Dashboard_sysportlet2_list_itempanel.json",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "表格布局面板(测试)",
+    "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssysviewpanels/Dashboard_sysportlet2_list_itempanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneDashboardView/psappviewctrls/dashboard_sysportlet2_list_itempanel",
+    "getRootPSPanelItems" : [ {
+      "caption" : "标题",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field1",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "field1",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "标题2",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field2",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "field2",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "标题3",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field3",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "field3",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "标题4",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field4",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "field4",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "标题5",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "FIELD",
+      "name" : "field5",
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "field5",
+        "enableLinkView" : false
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "hidden" : false,
+      "showCaption" : false
+    }, {
+      "caption" : "首页菜单",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CTRLPOS",
+      "name" : "appmenu",
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "showCaption" : true
+    } ],
+    "layoutPanel" : true,
+    "name" : "dashboard_sysportlet2_list_itempanel",
+    "modelid" : "0BB26AC5-B544-453F-938C-44F5A073D7C2",
+    "modeltype" : "PSSYSVIEWPANEL"
+  },
  "logicName" : "MOB",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/psdelists/Mob",
  "getPSAppDataEntity" : {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
@@ -37,6 +166,7 @@
    }
  } ],
  "pagingSize" : 1000,
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneDashboardView/psappviewctrls/dashboard_sysportlet2_list",
  "getRemovePSControlAction" : {
    "modelref" : true,
    "id" : "remove"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Dashboard_sysportlet2_list_itempanel.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Dashboard_sysportlet2_list_itempanel.json
+{
+  "getAllPSPanelFields" : [ {
+    "id" : "field1"
+  }, {
+    "id" : "field2"
+  }, {
+    "id" : "field3"
+  }, {
+    "id" : "field4"
+  }, {
+    "id" : "field5"
+  } ],
+  "codeName" : "Dashboard_sysportlet2_list_itempanel",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSPANELS/Dashboard_sysportlet2_list_itempanel.json",
+  "layoutMode" : "TABLE_24COL",
+  "logicName" : "表格布局面板(测试)",
+  "mOSFilePath" : "psmodules/common/psdataentities/PHONE/pssysviewpanels/Dashboard_sysportlet2_list_itempanel",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+  },
+  "getPSLayout" : {
+    "childColLG" : -1,
+    "childColMD" : 24,
+    "childColSM" : -1,
+    "childColXS" : -1,
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "rTMOSFilePath" : "pssysapps/Web/psappdeviews/phoneDashboardView/psappviewctrls/dashboard_sysportlet2_list_itempanel",
+  "getRootPSPanelItems" : [ {
+    "caption" : "标题",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "FIELD",
+    "name" : "field1",
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "field1",
+      "enableLinkView" : false
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "hidden" : false,
+    "showCaption" : false
+  }, {
+    "caption" : "标题2",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "FIELD",
+    "name" : "field2",
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "field2",
+      "enableLinkView" : false
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "hidden" : false,
+    "showCaption" : false
+  }, {
+    "caption" : "标题3",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "FIELD",
+    "name" : "field3",
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "field3",
+      "enableLinkView" : false
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "hidden" : false,
+    "showCaption" : false
+  }, {
+    "caption" : "标题4",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "FIELD",
+    "name" : "field4",
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "field4",
+      "enableLinkView" : false
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "hidden" : false,
+    "showCaption" : false
+  }, {
+    "caption" : "标题5",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "FIELD",
+    "name" : "field5",
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "field5",
+      "enableLinkView" : false
+    },
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "hidden" : false,
+    "showCaption" : false
+  }, {
+    "caption" : "首页菜单",
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CTRLPOS",
+    "name" : "appmenu",
+    "getPSLayoutPos" : {
+      "colMD" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "showCaption" : true
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "0BB26AC5-B544-453F-938C-44F5A073D7C2",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneDashboardView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneDashboardView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
@@ -451,6 +451,28 @@
          "layout" : "TABLE_24COL"
        },
        "tooltip" : "分页编辑"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "数据看板视图",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem37",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc39"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "数据看板视图"
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
@@ -198,6 +198,16 @@
        "tooltip" : "分页导航"
      } ],
      "tooltip" : "分页编辑"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "数据看板视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem37",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc39"
+      },
+      "tooltip" : "数据看板视图"
    } ],
    "tooltip" : "单数据视图"
  }, {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -1595,6 +1595,18 @@
      "viewType" : "DEGRIDVIEW"
    },
    "rTMOSFilePath" : "pssysapps/Web/psappfuncs/AppFunc3"
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "AppFunc39",
+    "mOSFilePath" : "pssysapps/Web/psappfuncs/AppFunc39",
+    "name" : "数据看板视图",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneDashboardView.json",
+      "viewType" : "DEPORTALVIEW"
+    },
+    "rTMOSFilePath" : "pssysapps/Web/psappfuncs/AppFunc39"
  } ],
  "getAllPSAppLans" : [ {
    "modelref" : true,
@@ -2910,6 +2922,28 @@
              "layout" : "TABLE_24COL"
            },
            "tooltip" : "分页编辑"
+          }, {
+            "accUserMode" : 2,
+            "caption" : "数据看板视图",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem37",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "AppFunc39"
+            },
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "数据看板视图"
          } ],
          "getPSLayout" : {
            "childColLG" : -1,

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -34,7 +34,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: dstimage
    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: