feat:上传文件新增子目录

Author: pedro

src/main/java/io/github/talelin/merak/common/configuration/WebConfiguration.java

@@ -42,6 +42,9 @@ public class WebConfiguration implements WebMvcConfigurer {
     @Value("${lin.cms.file.store-dir:assets/}")
     private String dir;
 
+    @Value("${lin.cms.file.serve-path:assets/**}")
+    private String servePath;
+
     /**
      * 跨域
      * 注意： 跨域问题涉及安全性问题，这里提供的是最方便简单的配置，任何host和任何方法都可跨域
@@ -83,8 +86,7 @@ private String getDirServePath() {
         // assets/
         // /usr/local/assets/
         // assets
-        String s = FileUtil.mainName(dir);
-        return s + "/**";
+        return servePath;
     }
 
     /**

src/main/java/io/github/talelin/merak/extension/file/LocalUploader.java

@@ -5,7 +5,12 @@
 
 import javax.annotation.PostConstruct;
 import java.io.BufferedOutputStream;
+import java.io.File;
 import java.io.FileOutputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * 文件上传服务默认实现，上传到本地
@@ -45,9 +50,17 @@ protected FileProperties getFileProperties() {
         return fileProperties;
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     @Override
     protected String getStorePath(String newFilename) {
-        return newFilename;
+        Date now = new Date();
+        String format = new SimpleDateFormat("yyyy/MM/dd").format(now);
+        Path path = Paths.get(fileProperties.getStoreDir(), format).toAbsolutePath();
+        java.io.File file = new File(path.toString());
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        return Paths.get(format, newFilename).toString();
     }
 
     @Override

src/main/java/io/github/talelin/merak/extension/file/config.properties

@@ -13,5 +13,7 @@ lin.cms.file.include=.jpg,.png,.jpeg
 lin.cms.file.domain=http://localhost:5000/
 # \u672C\u5730\u6587\u4EF6\u4FDD\u5B58\u4F4D\u7F6E
 lin.cms.file.store-dir=assets/
+# \u670D\u52A1\u5668\u6587\u4EF6\u8DEF\u5F84
+lin.cms.file.serve-path=assets/**
 # \u5B9E\u73B0
 lin.cms.file.uploader=local

src/main/java/io/github/talelin/merak/service/impl/FileServiceImpl.java

@@ -1,7 +1,6 @@
 package io.github.talelin.merak.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.io.FileUtil;
 import io.github.talelin.merak.bo.FileBO;
 import io.github.talelin.merak.extension.file.FileConstant;
 import io.github.talelin.merak.extension.file.Uploader;
@@ -31,8 +30,8 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileDO> implements
     @Value("${lin.cms.file.domain}")
     private String domain;
 
-    @Value("${lin.cms.file.store-dir:assets/}")
-    private String dir;
+    @Value("${lin.cms.file.serve-path:assets/**}")
+    private String servePath;
 
     /**
      * 为什么不做批量插入
@@ -69,8 +68,8 @@ private FileBO transformDoToBo(FileDO file, String key) {
         FileBO bo = new FileBO();
         BeanUtil.copyProperties(file, bo);
         if (file.getType().equals(FileConstant.LOCAL)) {
-            String s = FileUtil.mainName(dir);
-            bo.setUrl(domain + s + "/" + file.getName());
+            String s = servePath.split("/")[0];
+            bo.setUrl(domain + s + "/" + file.getPath());
         } else {
             bo.setUrl(file.getPath());
         }