Merge branch 'master' into dev-msg

admin

2019-01-15 5797fc7e8267d634ee64fd27cdea2a834091681e

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -294,7 +294,7 @@
         String contentType = file.getContentType();

         String type = contentType.substring(contentType.indexOf("/") + 1);

         // 上传文件相对位置

         String fileUrl="/img/admin/test/" + UUID.randomUUID().toString().replace("-", "") + "." + type;

         String fileUrl="/img/admin/" + UUID.randomUUID().toString().replace("-", "") + "." + type;

         

         String uploadPath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();