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

200ca68c · ibizdev · e6b87bef · 200ca68c · 200ca68c · 200ca68c
--- 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/PSAPPDEVIEWS/TESTUsr05152429EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05152429EditView.json
@@ -186,6 +186,10 @@
          "modelref" : true,
          "id" : "toolbar_deuiaction3"
        },
+        "getPSSysImage" : {
+          "glyph" : "xf0c9@FontAwesome",
+          "cssClass" : "fa fa-reorder"
+        },
        "getPSUIAction" : {
          "actionTarget" : "NONE",
          "caption" : "视图部件调用",
@@ -211,7 +215,7 @@
        "tooltip" : "树状",
        "uIActionTarget" : "NONE",
        "showCaption" : true,
-        "showIcon" : true
+        "showIcon" : false
      }, {
        "caption" : "平铺",
        "groupExtractMode" : "ITEM",
@@ -222,6 +226,10 @@
          "modelref" : true,
          "id" : "toolbar_deuiaction4"
        },
+        "getPSSysImage" : {
+          "imagePath" : "./tree.svg",
+          "rawContent" : "<svg viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\" height=\"1em\" width=\"1em\" preserveAspectRatio=\"xMidYMid meet\" focusable=\"false\"><g stroke-width=\"1\" fill-rule=\"evenodd\"><path d=\"M7.353 6.926V4.992H5.937V1h4.158v3.992H8.553v1.934H14.395v4.153h1.479v3.993h-4.158V11.08h1.479V8.125H8.553v2.933h1.542v3.993H5.937v-3.993h1.416V8.126H2.679v2.933h1.479v3.993H0v-3.993h1.479V6.926H7.353zm-.216-4.727v1.594h1.758V2.199H7.137zM1.2 12.26v1.592h1.758v-1.593H1.2zm11.716.02v1.594h1.758V12.28h-1.758zm-5.779-.02v1.592h1.758v-1.593H7.137z\"></path></g></svg>"
+        },
        "getPSUIAction" : {
          "actionTarget" : "NONE",
          "caption" : "向导新建",
@@ -247,7 +255,7 @@
        "tooltip" : "平铺",
        "uIActionTarget" : "NONE",
        "showCaption" : true,
-        "showIcon" : true
+        "showIcon" : false
      } ],
      "getPSSysPFPlugin" : {
        "pluginType" : "TOOLBAR_ITEM",

--- 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
@@ -86747,6 +86747,10 @@
              "modelref" : true,
              "id" : "toolbar_deuiaction3"
            },
+            "getPSSysImage" : {
+              "glyph" : "xf0c9@FontAwesome",
+              "cssClass" : "fa fa-reorder"
+            },
            "getPSUIAction" : {
              "actionTarget" : "NONE",
              "caption" : "视图部件调用",
@@ -86772,7 +86776,7 @@
            "tooltip" : "树状",
            "uIActionTarget" : "NONE",
            "showCaption" : true,
-            "showIcon" : true
+            "showIcon" : false
          }, {
            "caption" : "平铺",
            "groupExtractMode" : "ITEM",
@@ -86783,6 +86787,10 @@
              "modelref" : true,
              "id" : "toolbar_deuiaction4"
            },
+            "getPSSysImage" : {
+              "imagePath" : "./tree.svg",
+              "rawContent" : "<svg viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\" height=\"1em\" width=\"1em\" preserveAspectRatio=\"xMidYMid meet\" focusable=\"false\"><g stroke-width=\"1\" fill-rule=\"evenodd\"><path d=\"M7.353 6.926V4.992H5.937V1h4.158v3.992H8.553v1.934H14.395v4.153h1.479v3.993h-4.158V11.08h1.479V8.125H8.553v2.933h1.542v3.993H5.937v-3.993h1.416V8.126H2.679v2.933h1.479v3.993H0v-3.993h1.479V6.926H7.353zm-.216-4.727v1.594h1.758V2.199H7.137zM1.2 12.26v1.592h1.758v-1.593H1.2zm11.716.02v1.594h1.758V12.28h-1.758zm-5.779-.02v1.592h1.758v-1.593H7.137z\"></path></g></svg>"
+            },
            "getPSUIAction" : {
              "actionTarget" : "NONE",
              "caption" : "向导新建",
@@ -86808,7 +86816,7 @@
            "tooltip" : "平铺",
            "uIActionTarget" : "NONE",
            "showCaption" : true,
-            "showIcon" : true
+            "showIcon" : false
          } ],
          "getPSSysPFPlugin" : {
            "pluginType" : "TOOLBAR_ITEM",
--- 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: