修复上传文件后无法访问问题

base-modules/service-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java

@@ -1,50 +1,50 @@
-//package com.ruoyi.file.config;
-//
-//import java.io.File;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.servlet.config.annotation.CorsRegistry;
-//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-//
-///**
-// * 通用映射配置
-// *
-// * @author ruoyi
-// */
-//@Configuration
-//public class ResourcesConfig implements WebMvcConfigurer
-//{
-//    /**
-//     * 上传文件存储在本地的根路径
-//     */
-//    @Value("${file.path}")
-//    private String localFilePath;
-//
-//    /**
-//     * 资源映射路径 前缀
-//     */
-//    @Value("${file.prefix}")
-//    public String localFilePrefix;
-//
-//    @Override
-//    public void addResourceHandlers(ResourceHandlerRegistry registry)
-//    {
-//        /** 本地文件上传路径 */
-//        registry.addResourceHandler(localFilePrefix + "/**")
-//                .addResourceLocations("file:" + localFilePath + File.separator);
-//    }
-//
-//    /**
-//     * 开启跨域
-//     */
-//    @Override
-//    public void addCorsMappings(CorsRegistry registry) {
-//        // 设置允许跨域的路由
-//        registry.addMapping(localFilePrefix  + "/**")
-//                // 设置允许跨域请求的域名
-//                .allowedOrigins("*")
-//                // 设置允许的方法
-//                .allowedMethods("GET");
-//    }
-//}
+package com.ruoyi.file.config;
+
+import java.io.File;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 通用映射配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+public class ResourcesConfig implements WebMvcConfigurer
+{
+    /**
+     * 上传文件存储在本地的根路径
+     */
+    @Value("${file.path}")
+    private String localFilePath;
+
+    /**
+     * 资源映射路径 前缀
+     */
+    @Value("${file.prefix}")
+    public String localFilePrefix;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry)
+    {
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(localFilePrefix + "/**")
+                .addResourceLocations("file:" + localFilePath + File.separator);
+    }
+
+    /**
+     * 开启跨域
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        // 设置允许跨域的路由
+        registry.addMapping(localFilePrefix  + "/**")
+                // 设置允许跨域请求的域名
+                .allowedOrigins("*")
+                // 设置允许的方法
+                .allowedMethods("GET");
+    }
+}

base-modules/service-file/src/main/java/com/ruoyi/file/service/FilesServiceImpl.java

@@ -1,13 +1,11 @@
 package com.ruoyi.file.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.file.mapper.FileSequenceMapper;
 import com.ruoyi.file.mapper.FilesMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
@@ -16,8 +14,6 @@ import java.io.*;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.UUID;
 
 @Service
 public class FilesServiceImpl extends ServiceImpl<FilesMapper, Files> implements FilesService {
@@ -57,7 +53,8 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, Files> implements
         String fileUuid = timestamp + "A" + String.format("%04d", monthIncrement) + "." + type;
 
         // 将相对路径转化为绝对路径
-        String destPath = new File(filesUploadPath + "/" + yearMonth).getAbsolutePath();
+//        String destPath = new File(filesUploadPath + "/" + yearMonth).getAbsolutePath();//绝对路径
+        String destPath = filesUploadPath + "/" + yearMonth;
 
         // 新的文件地址，绝对路径+新的文件名称
         File uploadFile = new File(destPath + "/" + fileUuid);
@@ -73,7 +70,7 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, Files> implements
             file.transferTo(uploadFile);
 
             // 设置文件url
-            String url = filesUploadDomain + filesPrefix + "/" + fileUuid;
+            String url = filesUploadDomain + filesPrefix + "/" + yearMonth + "/" + fileUuid;
 
             // 将文件存储到数据库
             Files saveFile = new Files();
@@ -149,13 +146,4 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, Files> implements
             e.printStackTrace();
         }
     }
-
-    //通过文件MD5查询文件
-    private Files getFileByMD5(String md5) {
-        //查找数据库是否已经存在一样的图片
-        QueryWrapper<Files> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("md5", md5);
-        List<Files> filesList = list(queryWrapper);
-        return filesList.size() == 0 ? null : filesList.get(0);
-    }
 }

base-modules/service-file/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
   port: 9300
 
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
     name: service-file