Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 cloud-server-management/src/main/webapp/static/js/common/web-upload-object.js

@@ -13,7 +13,7 @@
      this.pictureId = pictureId;
      this.uploadBtnId = pictureId + "BtnId";
      this.uploadPreId = pictureId + "PreId";
      this.uploadUrl = Feng.ctxPath + '/upload/image';
      this.uploadUrl = Feng.ctxPath + '/mgr/uploadImg';
      this.fileSizeLimit = 100 * 1024 * 1024;
      this.picWidth = 800;
      this.picHeight = 800;
@@ -50,7 +50,8 @@
            disableGlobalDnd : true,
            duplicate : true,
            server : this.uploadUrl,
            fileSingleSizeLimit : this.fileSizeLimit
            fileSingleSizeLimit : this.fileSizeLimit,
            compress:false
         });
         return webUploader;
      },