tony001 发布系统代码 [TrainSys，Mob]

a7c5ff78 · ibizdev · 751ab574 · a7c5ff78 · a7c5ff78 · a7c5ff78
--- 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/Mob/PSAPPDEVIEWS/TESTMobListView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobListView.json
@@ -230,6 +230,7 @@
  }, {
    "codeName" : "MobListViewrighttoolbar",
    "controlType" : "TOOLBAR",
+    "logicName" : "移动端列表视图_工具栏",
    "name" : "righttoolbar",
    "getPSAppDataEntity" : {
      "modelref" : true,
@@ -238,9 +239,108 @@
    "getPSControlParam" : {
      "id" : "RIGHTTOOLBAR"
    },
+    "getPSDEToolbarItems" : [ {
+      "caption" : "分组",
+      "itemType" : "ITEMS",
+      "name" : "items1",
+      "getPSDEToolbarItems" : [ {
+        "caption" : "百度",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction1",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "righttoolbar_deuiaction1"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "NONE",
+          "caption" : "百度",
+          "codeName" : "openBaidu",
+          "frontProcessType" : "OPENHTMLPAGE",
+          "fullCodeName" : "openBaidu",
+          "htmlPageUrl" : "https://www.baidu.com/",
+          "name" : "百度",
+          "timeout" : 60000,
+          "uIActionMode" : "FRONT",
+          "uIActionTag" : "openBaidu",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "百度",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "getCapPSLanguageRes" : {
+          "defaultContent" : "新建",
+          "lanResTag" : "TBB.TEXT.*.NEW",
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.NEW]",
+          "refFlag" : true
+        },
+        "caption" : "新建",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction2",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "righttoolbar_deuiaction2"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf0f6@FontAwesome",
+          "cssClass" : "fa fa-file-text-o"
+        },
+        "getPSUIAction" : {
+          "getCapPSLanguageRes" : {
+            "defaultContent" : "新建",
+            "lanResTag" : "TBB.TEXT.*.NEW",
+            "lanResType" : "TBB.TEXT",
+            "name" : "工具栏按钮文本[*.NEW]",
+            "refFlag" : true
+          },
+          "caption" : "新建",
+          "codeName" : "New",
+          "fullCodeName" : "New",
+          "name" : "表格界面_新建操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0f6@FontAwesome",
+            "cssClass" : "fa fa-file-text-o"
+          },
+          "predefinedType" : "GRIDVIEW_NEWACTION",
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "defaultContent" : "新建",
+            "lanResTag" : "TBB.TOOLTIP.*.NEW",
+            "lanResType" : "TBB.TOOLTIP",
+            "name" : "工具栏按钮提示[*.NEW]",
+            "refFlag" : true
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "New",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "新建",
+        "getTooltipPSLanguageRes" : {
+          "defaultContent" : "新建",
+          "lanResTag" : "TBB.TOOLTIP.*.NEW",
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.NEW]",
+          "refFlag" : true
+        },
+        "showCaption" : true,
+        "showIcon" : true
+      } ],
+      "getPSSysImage" : {
+        "cssClass" : "browsers"
+      },
+      "tooltip" : "分组",
+      "showCaption" : false,
+      "showIcon" : true
+    } ],
    "toolbarStyle" : "MOBNAVRIGHTMENU",
    "xDataControlName" : "mdctrl",
-    "modelid" : "ee89289ebf5629f6a6b925d7877e0fd1_righttoolbar",
+    "modelid" : "F92CA681-D0C8-46D0-8BCA-7E45449C4FCE",
    "modeltype" : "PSDETOOLBAR"
  }, {
    "controlType" : "SEARCHBAR",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
@@ -14511,6 +14511,7 @@
      }, {
        "codeName" : "MobListViewrighttoolbar",
        "controlType" : "TOOLBAR",
+        "logicName" : "移动端列表视图_工具栏",
        "name" : "righttoolbar",
        "getPSAppDataEntity" : {
          "modelref" : true,
@@ -14519,9 +14520,108 @@
        "getPSControlParam" : {
          "id" : "RIGHTTOOLBAR"
        },
+        "getPSDEToolbarItems" : [ {
+          "caption" : "分组",
+          "itemType" : "ITEMS",
+          "name" : "items1",
+          "getPSDEToolbarItems" : [ {
+            "caption" : "百度",
+            "groupExtractMode" : "ITEM",
+            "itemType" : "DEUIACTION",
+            "name" : "deuiaction1",
+            "noPrivDisplayMode" : 2,
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "righttoolbar_deuiaction1"
+            },
+            "getPSUIAction" : {
+              "actionTarget" : "NONE",
+              "caption" : "百度",
+              "codeName" : "openBaidu",
+              "frontProcessType" : "OPENHTMLPAGE",
+              "fullCodeName" : "openBaidu",
+              "htmlPageUrl" : "https://www.baidu.com/",
+              "name" : "百度",
+              "timeout" : 60000,
+              "uIActionMode" : "FRONT",
+              "uIActionTag" : "openBaidu",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "百度",
+            "uIActionTarget" : "NONE",
+            "showCaption" : true,
+            "showIcon" : true
+          }, {
+            "getCapPSLanguageRes" : {
+              "defaultContent" : "新建",
+              "lanResTag" : "TBB.TEXT.*.NEW",
+              "lanResType" : "TBB.TEXT",
+              "name" : "工具栏按钮文本[*.NEW]",
+              "refFlag" : true
+            },
+            "caption" : "新建",
+            "groupExtractMode" : "ITEM",
+            "itemType" : "DEUIACTION",
+            "name" : "deuiaction2",
+            "noPrivDisplayMode" : 2,
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "righttoolbar_deuiaction2"
+            },
+            "getPSSysImage" : {
+              "glyph" : "xf0f6@FontAwesome",
+              "cssClass" : "fa fa-file-text-o"
+            },
+            "getPSUIAction" : {
+              "getCapPSLanguageRes" : {
+                "defaultContent" : "新建",
+                "lanResTag" : "TBB.TEXT.*.NEW",
+                "lanResType" : "TBB.TEXT",
+                "name" : "工具栏按钮文本[*.NEW]",
+                "refFlag" : true
+              },
+              "caption" : "新建",
+              "codeName" : "New",
+              "fullCodeName" : "New",
+              "name" : "表格界面_新建操作",
+              "getPSSysImage" : {
+                "glyph" : "xf0f6@FontAwesome",
+                "cssClass" : "fa fa-file-text-o"
+              },
+              "predefinedType" : "GRIDVIEW_NEWACTION",
+              "timeout" : 60000,
+              "getTooltipPSLanguageRes" : {
+                "defaultContent" : "新建",
+                "lanResTag" : "TBB.TOOLTIP.*.NEW",
+                "lanResType" : "TBB.TOOLTIP",
+                "name" : "工具栏按钮提示[*.NEW]",
+                "refFlag" : true
+              },
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "New",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "新建",
+            "getTooltipPSLanguageRes" : {
+              "defaultContent" : "新建",
+              "lanResTag" : "TBB.TOOLTIP.*.NEW",
+              "lanResType" : "TBB.TOOLTIP",
+              "name" : "工具栏按钮提示[*.NEW]",
+              "refFlag" : true
+            },
+            "showCaption" : true,
+            "showIcon" : true
+          } ],
+          "getPSSysImage" : {
+            "cssClass" : "browsers"
+          },
+          "tooltip" : "分组",
+          "showCaption" : false,
+          "showIcon" : true
+        } ],
        "toolbarStyle" : "MOBNAVRIGHTMENU",
        "xDataControlName" : "mdctrl",
-        "modelid" : "ee89289ebf5629f6a6b925d7877e0fd1_righttoolbar",
+        "modelid" : "F92CA681-D0C8-46D0-8BCA-7E45449C4FCE",
        "modeltype" : "PSDETOOLBAR"
      }, {
        "controlType" : "SEARCHBAR",
--- 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: