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

0d8dc867 · ibizdev · f1c208fe · 0d8dc867 · 0d8dc867 · 0d8dc867
--- 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/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -6300,6 +6300,10 @@
    }
  } ],
  "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+    "viewType" : "DEEDITVIEW2"
+  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
    "viewType" : "DEEDITVIEW"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppTestIndexView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppTestIndexView.json
@@ -1737,6 +1737,91 @@
        "layout" : "TABLE_24COL"
      },
      "tooltip" : "N对N"
+    }, {
+      "accUserMode" : 0,
+      "caption" : "计数器",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem78",
+      "getPSAppMenuItems" : [ {
+        "accUserMode" : 2,
+        "caption" : "左右关系",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem79",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc0118314491"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "左右关系"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "分页关系",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem80",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc27"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "分页关系"
+      }, {
+        "accUserMode" : 2,
+        "caption" : "树节点",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem81",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc57"
+        },
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "树节点"
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "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/AppTestIndexView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppTestIndexView.json
@@ -760,6 +760,43 @@
      "tooltip" : "关联表"
    } ],
    "tooltip" : "N对N"
+  }, {
+    "accUserMode" : 0,
+    "caption" : "计数器",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem78",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 2,
+      "caption" : "左右关系",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem79",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc0118314491"
+      },
+      "tooltip" : "左右关系"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "分页关系",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem80",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc27"
+      },
+      "tooltip" : "分页关系"
+    }, {
+      "accUserMode" : 2,
+      "caption" : "树节点",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem81",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "AppFunc57"
+      },
+      "tooltip" : "树节点"
+    } ],
+    "tooltip" : "计数器"
  } ],
  "name" : "apptestindexview",
  "modelid" : "89E33DEF-F919-4067-A6F1-4FBB67232FC6",

--- 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
@@ -1255,6 +1255,113 @@
    "uniqueTag" : "WorkFlow__Usr0710265893"
  } ],
  "getAllPSDEDRControls" : [ {
+    "codeName" : "Default",
+    "controlType" : "DRBAR",
+    "editItemCaption" : "测试实体",
+    "name" : "drbar",
+    "getPSAppCounterRef" : {
+      "modelref" : true,
+      "id" : "c0738c9dec0bd355f3062df0532aeb37"
+    },
+    "getPSAppCounterRefs" : [ {
+      "getPSAppCounter" : {
+        "codeName" : "Custom",
+        "counterType" : "DEDR",
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCOUNTERS/Custom.json",
+        "getGetPSAppDEAction" : {
+          "modelref" : true,
+          "id" : "Counter"
+        },
+        "name" : "自定义计数器",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+        },
+        "timer" : 1000
+      },
+      "refMode" : {
+        "srfdeid" : "TEST"
+      },
+      "tag" : "c0738c9dec0bd355f3062df0532aeb37",
+      "id" : "c0738c9dec0bd355f3062df0532aeb37"
+    } ],
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    },
+    "getPSControlHandler" : {
+      "enableDEFieldPrivilege" : false,
+      "id" : "drbar"
+    },
+    "getPSControlParam" : {
+      "autoLoad" : true,
+      "showBusyIndicator" : true,
+      "id" : "DRBAR"
+    },
+    "getPSDEDRBarGroups" : [ {
+      "caption" : "详细信息",
+      "name" : "详细信息",
+      "hidden" : false,
+      "id" : "DRGroup"
+    } ],
+    "getPSDEDRCtrlItems" : [ {
+      "caption" : "测试实体实体表格视图",
+      "counterId" : "num1",
+      "name" : "dritem1",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGridView.json",
+        "viewType" : "DEGRIDVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "模拟表格视图",
+      "counterId" : "num2",
+      "name" : "dritem2",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTCustomGridView.json",
+        "viewType" : "DECUSTOMVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "书实体数据视图测试",
+      "counterId" : "num3",
+      "name" : "dritem3",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",
+        "viewType" : "DEDATAVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    }, {
+      "caption" : "测试实体实体编辑视图(简单表单)",
+      "counterId" : "num4",
+      "name" : "dritem4",
+      "getPSAppView" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
+        "viewType" : "DEEDITVIEW"
+      },
+      "getPSDEDRBarGroup" : {
+        "modelref" : true,
+        "id" : "DRGroup"
+      }
+    } ],
+    "uniqueTag" : "TESTEditView2__drbar",
+    "showTitle" : true,
+    "modelid" : "385f739a768b73a1e3a307bfeafb80b7",
+    "modeltype" : "PSDEDRBAR"
+  }, {
    "codeName" : "TabExpViewtabexppanel",
    "controlType" : "TABEXPPANEL",
    "name" : "tabexppanel",

--- 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
@@ -4705,6 +4705,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDGridTestArrangePView.json",
      "viewType" : "DEGRIDVIEW"
    }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "UsrAppFunc0118314491",
+    "name" : "测试实体实体编辑视图（左右关系）",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+      "viewType" : "DEEDITVIEW2"
+    }
  }, {
    "appFuncType" : "APPVIEW",
    "codeName" : "AppFunc73",
@@ -13219,6 +13229,12 @@
    "enableRemove" : false
  } ],
  "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+    "viewType" : "DEEDITVIEW2",
+    "resource" : "TEST",
+    "view" : "EditView2"
+  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
    "viewType" : "DEEDITVIEW",
@@ -65882,6 +65898,10 @@
        }
      } ],
      "getAllPSAppViews" : [ {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
+        "viewType" : "DEEDITVIEW2"
+      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPluginEditView.json",
        "viewType" : "DEEDITVIEW"
--- 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: