Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app_web/src/components/disk-file-upload/disk-file-upload.vue

app_web/src/components/disk-image-upload/disk-image-upload.vue

@@ -7,7 +7,6 @@
                 list-type="picture-card"
                 :action="getAction()"
                 :headers="myHeaders"
-                :limit="limit"
                 :before-upload="beforeUpload"
                 :http-request="customImageUpload">
             <i class="el-icon-plus"></i>
@@ -131,21 +130,6 @@ export default class DiskImageUplaod extends Vue {
      */
     @Prop({default: false}) public showOcrview?: boolean;
 
-    /**
-     * 单文件大小
-     *
-     * @type {number}
-     * @memberof DiskImageUplaod
-     */
-    @Prop({default: 1}) public size!: number;
-
-    /**
-     * 文件上传个数
-     *
-     * @type {number}
-     * @memberof DiskImageUplaod
-     */
-    @Prop({default: 5}) public limit!: number;
 
     /**
      * 表单是否处于编辑状态（有真实主键,srfuf='1';srfuf='0'时处于新建未保存）
@@ -401,12 +385,6 @@ export default class DiskImageUplaod extends Vue {
             Message.error(_this.$t('components.diskImageUpload.uploadImageFailure1'));
             return false;
         }
-        // 文件大小
-        const isSize = file.size / 1024 / 1024 < this.size;
-        if (!isSize) {
-            Message.error(_this.$t('components.diskImageUpload.uploadFailure')+this.size.toString()+"M!");
-            return false;
-        }
     }
 
     /**

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzlite/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzlite/
+      mvn clean package -Pweb
+      cd ibzlite-app/ibzlite-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzlite-app/ibzlite-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30010
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

ibzlite-app/ibzlite-app-web/src/main/docker/ibzlite-app-web.yaml

@@ -3,9 +3,22 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "8080:8080"
+      - "30010:30010"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30010
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: