Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

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

@@ -356,7 +356,7 @@
         String type = contentType.substring(contentType.indexOf("/") + 1);

         

         // 上传文件相对位置

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

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

         

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