'1'

hzgzpt-admin/src/main/java/com/miaxis/app/controller/report/ReportInfoController.java

@@ -116,7 +116,7 @@ public class ReportInfoController extends BaseController{
     @PostMapping("/image")
     @ApiOperation("上传举报信息")
     public Response<FileVo> uploadImage(MultipartFile multFile) throws IOException {
-        String savePath = AliyunConfig.GZPT_REPORT
+        String savePath = AliyunConfig.GZPT_PATH
                 + new SimpleDateFormat("yyyyMMdd").format(new Date()) + "/report/";
         String fileName = System.currentTimeMillis() + ".jpg";//文件名
         String fileUrl = AliyunUpload.uploadForStream(multFile.getInputStream(), savePath, fileName);

hzgzpt-common/src/main/java/com/miaxis/common/enums/FileUploadTypeEnum.java

@@ -1,6 +1,5 @@
 package com.miaxis.common.enums;
 
-import com.miaxis.common.aliyunOSS.AliyunConfig;
 import com.miaxis.common.utils.file.MimeTypeUtils;
 
 /**
@@ -13,14 +12,14 @@ public enum FileUploadTypeEnum
     OTHERS(99, "/others/", MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, "其他文件");
 
     private final Integer code;
-    private final String filePath;//上传路径
+    private final String contentPath;//目录
     private final String[] suffix;//后缀
     private final String info;
 
-    FileUploadTypeEnum(Integer code, String filePath, String[] suffix, String info)
+    FileUploadTypeEnum(Integer code, String contentPath, String[] suffix, String info)
     {
         this.code = code;
-        this.filePath = filePath;
+        this.contentPath = contentPath;
         this.suffix = suffix;
         this.info = info;
     }
@@ -35,9 +34,9 @@ public enum FileUploadTypeEnum
         return info;
     }
 
-    public String getFilePath()
+    public String getContentPath()
     {
-        return AliyunConfig.GZPT_PATH+this.filePath;
+        return this.contentPath;
     }
 
     public String[] getSuffix()

hzgzpt-service/src/main/java/com/miaxis/file/controller/FileInfoController.java

@@ -1,5 +1,6 @@
 package com.miaxis.file.controller;
 
+import com.miaxis.common.aliyunOSS.AliyunConfig;
 import com.miaxis.common.aliyunOSS.AliyunUpload;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
@@ -20,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,10 +57,13 @@ public class FileInfoController extends BaseController{
         if (!validateFileSuffix(suffix,fileUploadTypeEnum)){
             throw new CustomException("文件类型不合法");
         }
-        String storagefileName = System.currentTimeMillis() + suffix;//文件名
-        String fileUrl = AliyunUpload.uploadForStream(file.getInputStream(), fileUploadTypeEnum.getFilePath(), storagefileName);
+        //存储的文件名
+        String storagefileName = System.currentTimeMillis() + suffix;
+        String savePath = AliyunConfig.GZPT_PATH
+                + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) +fileUploadTypeEnum.getContentPath();
+        String fileUrl = AliyunUpload.uploadForStream(file.getInputStream(), savePath, storagefileName);
         FileInfo fileInfo = new FileInfo();
-        fileInfo.setFilePath(fileUploadTypeEnum.getFilePath());
+        fileInfo.setFilePath(savePath+storagefileName);
         fileInfo.setFileUrl(fileUrl);
         fileInfoService.save(fileInfo);
         return Response.success(fileInfo);