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

b613a20c · ibizdev · 6ce65ac1 · b613a20c · b613a20c · b613a20c
--- 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/TESTGRID/PSFORMS/TestEditView_Form.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSFORMS/TestEditView_Form.json
@@ -258,16 +258,13 @@
        "getPSEditor" : {
          "editorParams" : {
            "max" : "200",
+            "precision" : "6",
            "readonly" : "true",
            "showpercentage" : "true"
          },
-          "editorStyle" : "PROGRESSPERCENTAGE",
          "editorType" : "SLIDER",
          "name" : "formitem",
-          "getPSSysPFPlugin" : {
-            "pluginType" : "EDITOR_CUSTOMSTYLE",
-            "pluginCode" : "PROGRESSPERCENTAGE"
-          },
+          "precision" : 6,
          "stepValue" : 1.0,
          "readOnly" : true
        },
@@ -275,6 +272,9 @@
          "colMD" : 24,
          "layout" : "TABLE_24COL"
        },
+        "getPSSysCss" : {
+          "cssName" : "slider-progress-percentage"
+        },
        "allowEmpty" : true,
        "showCaption" : true
      } ],

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDTestEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDTestEditView.json
@@ -376,16 +376,13 @@
          "getPSEditor" : {
            "editorParams" : {
              "max" : "200",
+              "precision" : "6",
              "readonly" : "true",
              "showpercentage" : "true"
            },
-            "editorStyle" : "PROGRESSPERCENTAGE",
            "editorType" : "SLIDER",
            "name" : "formitem",
-            "getPSSysPFPlugin" : {
-              "pluginType" : "EDITOR_CUSTOMSTYLE",
-              "pluginCode" : "PROGRESSPERCENTAGE"
-            },
+            "precision" : 6,
            "stepValue" : 1.0,
            "readOnly" : true
          },
@@ -393,6 +390,9 @@
            "colMD" : 24,
            "layout" : "TABLE_24COL"
          },
+          "getPSSysCss" : {
+            "cssName" : "slider-progress-percentage"
+          },
          "allowEmpty" : true,
          "showCaption" : true
        } ],

--- 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
@@ -2492,17 +2492,6 @@
    },
    "pluginCode" : "ORGSELECT",
    "styleCode" : "ORGSELECT"
-  }, {
-    "codeName" : "PROGRESSPERCENTAGE",
-    "containerType" : "FORMITEM",
-    "editorType" : "SLIDER",
-    "name" : "进度百分比显示",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "PROGRESSPERCENTAGE"
-    },
-    "pluginCode" : "PROGRESSPERCENTAGE",
-    "styleCode" : "PROGRESSPERCENTAGE"
  }, {
    "codeName" : "editorTest",
    "containerType" : "FORMITEM",
@@ -5087,15 +5076,6 @@
    "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
    "pluginType" : "AC_ITEM",
    "refMode" : "DEACMODE"
-  }, {
-    "name" : "滑动输入进度百分比显示",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "PROGRESSPERCENTAGE"
-    },
-    "pluginCode" : "PROGRESSPERCENTAGE",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
  }, {
    "name" : "看板分组插件",
    "getPSSysPFPlugin" : {
@@ -12336,10 +12316,10 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    }, {
      "name" : "消息类型-错误信息",
@@ -12348,10 +12328,10 @@
        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    } ]
  }, {
@@ -12368,6 +12348,18 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
      "name" : "消息位置-视图上方",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12379,11 +12371,28 @@
        "modelref" : true,
        "id" : "ViewMsg10"
      }
+    } ]
+  }, {
+    "codeName" : "VMGroup8",
+    "name" : "【静态测试】",
+    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -12391,11 +12400,7 @@
        "modelref" : true,
        "id" : "ViewMsg9"
      }
-    } ]
-  }, {
-    "codeName" : "VMGroup8",
-    "name" : "【静态测试】",
-    "getPSAppViewMsgGroupDetails" : [ {
+    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -12421,31 +12426,6 @@
        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
    } ]
  }, {
    "codeName" : "VMGroup5",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
@@ -284,15 +284,6 @@
    "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
    "pluginType" : "AC_ITEM",
    "refMode" : "DEACMODE"
-  }, {
-    "name" : "滑动输入进度百分比显示",
-    "getPSSysPFPlugin" : {
-      "pluginType" : "EDITOR_CUSTOMSTYLE",
-      "pluginCode" : "PROGRESSPERCENTAGE"
-    },
-    "pluginCode" : "PROGRESSPERCENTAGE",
-    "pluginType" : "EDITOR_CUSTOMSTYLE",
-    "refMode" : "EDITORSTYPE"
  }, {
    "name" : "看板分组插件",
    "getPSSysPFPlugin" : {

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