feats

src/main/java/com/yunzhi/marketing/controller/CommonController.java

@@ -56,23 +56,31 @@ public class CommonController extends BaseController {
     @PostMapping("/{plat}/image")
     public ResponseBean uploadImage(@PathVariable String plat, @RequestParam("file") MultipartFile multipartFile) {
         try {
-            // 本地保存的文件夹
-            String format = sdf.format(new Date());
-            File folder = new File(FILE_PATH + format);
-            if(!folder.isDirectory()) {
-                folder.mkdirs();
-            }
-            // 新文件夹
-            String oldName = multipartFile.getOriginalFilename();
-            String newName = UUID.randomUUID().toString() +
-                    oldName.substring(oldName.lastIndexOf("."));
-
-            // 文件保存操作
-            multipartFile.transferTo(new File(folder, newName));
-            return ResponseBean.success("/file/"+ format + newName);
+            String folder = FILE_PATH + sdf.format(new Date());
+            String img = AliOSSUtils.putObject(multipartFile, folder);
+            return ResponseBean.success(img);
         } catch (IOException e) {
             return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
+
+//        try {
+//            // 本地保存的文件夹
+//            String format = sdf.format(new Date());
+//            File folder = new File(FILE_PATH + format);
+//            if(!folder.isDirectory()) {
+//                folder.mkdirs();
+//            }
+//            // 新文件夹
+//            String oldName = multipartFile.getOriginalFilename();
+//            String newName = UUID.randomUUID().toString() +
+//                    oldName.substring(oldName.lastIndexOf("."));
+//
+//            // 文件保存操作
+//            multipartFile.transferTo(new File(folder, newName));
+//            return ResponseBean.success("/file/"+ format + newName);
+//        } catch (IOException e) {
+//            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+//        }
     }
 
 
@@ -152,20 +160,9 @@ public class CommonController extends BaseController {
         Map<String, String> result = new HashMap<>();
 
         try {
-            // 本地保存的文件夹
-            String format = sdf.format(new Date());
-            File folder = new File(FILE_PATH + format);
-            if(!folder.isDirectory()) {
-                folder.mkdirs();
-            }
-            // 新文件夹
-            String oldName = multipartFile.getOriginalFilename();
-            String newName = UUID.randomUUID().toString() +
-                    oldName.substring(oldName.lastIndexOf("."));
-
-            // 文件保存操作
-            multipartFile.transferTo(new File(folder, newName));
-            String img = "/file/"+ format + newName;
+            String folder = FILE_PATH + sdf.format(new Date());
+            String img = AliOSSUtils.putObject(multipartFile, folder);
+
             result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
             result.put("status", "done");
             result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");
@@ -177,6 +174,35 @@ public class CommonController extends BaseController {
         }
 
         return result;
+
+//        Map<String, String> result = new HashMap<>();
+//
+//        try {
+//            // 本地保存的文件夹
+//            String format = sdf.format(new Date());
+//            File folder = new File(FILE_PATH + format);
+//            if(!folder.isDirectory()) {
+//                folder.mkdirs();
+//            }
+//            // 新文件夹
+//            String oldName = multipartFile.getOriginalFilename();
+//            String newName = UUID.randomUUID().toString() +
+//                    oldName.substring(oldName.lastIndexOf("."));
+//
+//            // 文件保存操作
+//            multipartFile.transferTo(new File(folder, newName));
+//            String img = "/file/"+ format + newName;
+//            result.put("name", StringUtils.ifNull(multipartFile.getOriginalFilename(), multipartFile.getName()));
+//            result.put("status", "done");
+//            result.put("thumbUrl", img + "?x-oss-process=style/thumbnail");
+//            result.put("url", img);
+//
+//        } catch (IOException e) {
+//            result.put("status", "error");
+//            result.put("message", e.getMessage());
+//        }
+
+//        return result;
     }
 
     @PostMapping("{plat}/captcha")

src/main/resources/application-dev.yml

@@ -92,4 +92,4 @@ fadada:
   redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"
 # file path
 file:
-  path: D:\images\
+  path: /images/

src/main/resources/application-prod.yml

@@ -97,4 +97,4 @@ fadada:
   redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
 # file path
 file:
-  path: /yunpan/dev/files/
+  path: /images/