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

4e72d867 · ibizdev · 7015aef0 · 4e72d867 · 4e72d867 · 4e72d867
--- 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,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/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -7813,6 +7813,12 @@
    "name" : "逻辑测试编辑视图",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TESTDashboardView",
+    "logicName" : "实体数据看板视图",
+    "name" : "实体数据看板视图",
+    "realModelSubType" : "DEPORTALVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr10164963EditView",
    "logicName" : "视图设计",
@@ -7909,6 +7915,12 @@
    "name" : "测试移动端编辑视图",
    "realModelSubType" : "DEMOBEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "TESTIndexView",
+    "logicName" : "实体首页视图",
+    "name" : "实体首页视图",
+    "realModelSubType" : "DEINDEXVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "EditView_drawer",
    "logicName" : "测试实体实体编辑视图_抽屉",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -9506,6 +9506,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCustomGridView.json",
    "viewType" : "DECUSTOMVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTIndexView.json",
+    "viewType" : "DEINDEXVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr01294676TabExpView.json",
@@ -10174,6 +10178,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTNoPageListView.json",
    "viewType" : "DELISTVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTDashboardView.json",
+    "viewType" : "DEPORTALVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTreeExpView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTDashboardView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTDashboardView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTIndexView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTIndexView.json
+{
+  "accUserMode" : 2,
+  "getCapPSLanguageRes" : {
+    "lanResTag" : "DE.LNAME.TEST"
+  },
+  "caption" : "实体首页视图",
+  "codeName" : "TESTTESTIndexView",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTESTIndexView.json",
+  "markOpenDataMode" : "OPENDATA;EDITDATA;DISPLAYOPPERSON;NOTICERELOAD",
+  "name" : "TESTTESTIndexView",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+  },
+  "getPSAppModule" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
+  },
+  "getPSControls" : [ {
+    "getCapPSLanguageRes" : {
+      "lanResTag" : "DE.LNAME.TEST"
+    },
+    "caption" : "实体首页视图",
+    "codeName" : "TESTIndexViewcaptionbar",
+    "controlType" : "CAPTIONBAR",
+    "name" : "captionbar",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { }
+  } ],
+  "getPSDEViewCodeName" : "TESTIndexView",
+  "getPSDEViewId" : "F25F4E65-755F-4674-B589-9F910E12EA40",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Usr1216489644",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "layoutMode" : "Flex",
+    "logicName" : "TEST_INDEX_VIEW",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "layout" : "FLEX"
+    },
+    "getRootPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "page_container",
+      "getPSLayout" : {
+        "dir" : "column",
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "文本",
+        "contentType" : "RAW",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "RAWITEM",
+        "name" : "static_text",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSRawItem" : {
+          "caption" : "实体首页视图",
+          "contentType" : "RAW",
+          "name" : "static_text",
+          "predefinedType" : "STATIC_TEXT",
+          "renderMode" : "TEXT"
+        },
+        "rawContent" : "实体首页视图",
+        "showCaption" : true
+      } ]
+    } ],
+    "layoutBodyOnly" : false,
+    "layoutPanel" : true,
+    "useDefaultLayout" : false,
+    "modelid" : "3D21DC1B-F81B-4128-8168-8E6DC520A9EE",
+    "modeltype" : "PSSYSVIEWLAYOUTPANEL"
+  },
+  "title" : "实体首页视图",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEINDEXVIEW",
+  "enableDP" : true,
+  "modelid" : "0b508a11acfc50d589d5e89daa2a7a53",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04103224ReportView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04103224ReportView.json
@@ -6,6 +6,7 @@
  "caption" : "视图消息报表视图",
  "codeName" : "TESTUsr04103224ReportView",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr04103224ReportView.json",
+  "markOpenDataMode" : "OPENDATA;EDITDATA;DISPLAYOPPERSON;NOTICERELOAD",
  "name" : "TESTUsr04103224ReportView",
  "getPSAppDataEntity" : {
    "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr08071823EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr08071823EditView.json
@@ -6,6 +6,7 @@
  "caption" : "协同编辑",
  "codeName" : "TESTUsr08071823EditView",
  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr08071823EditView.json",
+  "markOpenDataMode" : "OPENDATA;EDITDATA;DISPLAYOPPERSON;NOTICERELOAD",
  "name" : "TESTUsr08071823EditView",
  "getPSAppDataEntity" : {
    "modelref" : true,

--- 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
@@ -6922,25 +6922,6 @@
          "layout" : "TABLE_24COL"
        },
        "tooltip" : "大屏数据看板"
-      }, {
-        "accUserMode" : 2,
-        "caption" : "协同编辑",
-        "itemType" : "MENUITEM",
-        "name" : "menuitem317",
-        "getPSAppFunc" : {
-          "modelref" : true,
-          "id" : "UsrAppFunc0807379083"
-        },
-        "getPSLayout" : {
-          "childColMD" : 24,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "tooltip" : "协同编辑"
      }, {
        "accUserMode" : 2,
        "caption" : "大屏测试",
@@ -7319,6 +7300,98 @@
          "layout" : "TABLE_24COL"
        },
        "tooltip" : "多数据容器测试"
+      }, {
+        "accUserMode" : 0,
+        "caption" : "数据打开模式",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem356",
+        "getPSAppMenuItems" : [ {
+          "accUserMode" : 2,
+          "caption" : "协同编辑",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem317",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc0807379083"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "协同编辑"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "实体首页视图",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem357",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1216117364"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "实体首页视图"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "实体报表视图",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem358",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1216572691"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "实体报表视图"
+        }, {
+          "accUserMode" : 2,
+          "caption" : "实体数据看板视图",
+          "itemType" : "MENUITEM",
+          "name" : "menuitem359",
+          "getPSAppFunc" : {
+            "modelref" : true,
+            "id" : "UsrAppFunc1216470834"
+          },
+          "getPSLayout" : {
+            "childColMD" : 24,
+            "columnCount" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "tooltip" : "实体数据看板视图"
+        } ],
+        "getPSLayout" : {
+          "childColMD" : 24,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "数据打开模式"
      } ],
      "getPSControlHandler" : {
        "enableDEFieldPrivilege" : false,

--- 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
@@ -3338,16 +3338,6 @@
      "id" : "UsrAppFunc0805943373"
    },
    "tooltip" : "大屏数据看板"
-  }, {
-    "accUserMode" : 2,
-    "caption" : "协同编辑",
-    "itemType" : "MENUITEM",
-    "name" : "menuitem317",
-    "getPSAppFunc" : {
-      "modelref" : true,
-      "id" : "UsrAppFunc0807379083"
-    },
-    "tooltip" : "协同编辑"
  }, {
    "accUserMode" : 2,
    "caption" : "大屏测试",
@@ -3537,6 +3527,53 @@
      "id" : "UsrAppFunc1202956177"
    },
    "tooltip" : "多数据容器测试"
+  }, {
+    "accUserMode" : 0,
+    "caption" : "数据打开模式",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem356",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 2,
+      "caption" : "协同编辑",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem317",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc0807379083"
+      },
+      "tooltip" : "协同编辑"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "实体首页视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem357",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1216117364"
+      },
+      "tooltip" : "实体首页视图"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "实体报表视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem358",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1216572691"
+      },
+      "tooltip" : "实体报表视图"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "实体数据看板视图",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem359",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc1216470834"
+      },
+      "tooltip" : "实体数据看板视图"
+    } ],
+    "tooltip" : "数据打开模式"
  } ],
  "name" : "appindex",
  "modelid" : "6A3E233F-FB4A-493B-B3C2-1860D5502904",

--- 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
--- 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: