Merge pull request #19 from TaleLin/fix/file-extension

pedro · web-flow · commit ab8a733b922f · 2020-04-11T04:31:54.000-05:00
Fix/file extension
diff --git a/src/main/java/io/github/talelin/merak/common/configuration/CommonConfiguration.java b/src/main/java/io/github/talelin/merak/common/configuration/CommonConfiguration.java
@@ -5,7 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import io.github.talelin.autoconfigure.bean.RouteMetaCollector;
-import io.github.talelin.merak.extensions.file.FileProperties;
+import io.github.talelin.merak.extension.file.FileProperties;
 import io.github.talelin.merak.common.interceptor.RequestLogInterceptor;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/src/main/java/io/github/talelin/merak/common/configuration/WebConfiguration.java b/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;
     }
 
     /**
diff --git a/src/main/java/io/github/talelin/merak/extension/file/AbstractUploader.java b/src/main/java/io/github/talelin/merak/extension/file/AbstractUploader.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import io.github.talelin.autoconfigure.exception.*;
 import org.springframework.util.MultiValueMap;
diff --git a/src/main/java/io/github/talelin/merak/extension/file/File.java b/src/main/java/io/github/talelin/merak/extension/file/File.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import lombok.*;
 
diff --git a/src/main/java/io/github/talelin/merak/extension/file/FileConstant.java b/src/main/java/io/github/talelin/merak/extension/file/FileConstant.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 /**
  * 文件相关常量值
diff --git a/src/main/java/io/github/talelin/merak/extension/file/FileProperties.java b/src/main/java/io/github/talelin/merak/extension/file/FileProperties.java
@@ -1,12 +1,12 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
 @Component
 @ConfigurationProperties(prefix = "lin.cms.file")
-@PropertySource(value = "classpath:io/github/talelin/merak/extensions/file/config.properties", encoding = "UTF-8")
+@PropertySource(value = "classpath:io/github/talelin/merak/extension/file/config.properties", encoding = "UTF-8")
 public class FileProperties {
 
     private static final String[] DEFAULT_EMPTY_ARRAY = new String[0];
diff --git a/src/main/java/io/github/talelin/merak/extension/file/FileUtil.java b/src/main/java/io/github/talelin/merak/extension/file/FileUtil.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import org.springframework.util.DigestUtils;
 import org.springframework.util.unit.DataSize;
diff --git a/src/main/java/io/github/talelin/merak/extension/file/LocalUploader.java b/src/main/java/io/github/talelin/merak/extension/file/LocalUploader.java
@@ -1,11 +1,16 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
 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
diff --git a/src/main/java/io/github/talelin/merak/extension/file/PreHandler.java b/src/main/java/io/github/talelin/merak/extension/file/PreHandler.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 /**
  * 文件前预处理器
diff --git a/src/main/java/io/github/talelin/merak/extension/file/QiniuUploader.java b/src/main/java/io/github/talelin/merak/extension/file/QiniuUploader.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Response;
diff --git a/src/main/java/io/github/talelin/merak/extension/file/Uploader.java b/src/main/java/io/github/talelin/merak/extension/file/Uploader.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/io/github/talelin/merak/extension/file/UploaderFactory.java b/src/main/java/io/github/talelin/merak/extension/file/UploaderFactory.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.extensions.file;
+package io.github.talelin.merak.extension.file;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/io/github/talelin/merak/extension/file/config.properties b/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
diff --git a/src/main/java/io/github/talelin/merak/module/message/MessageConstant.java b/src/main/java/io/github/talelin/merak/module/message/MessageConstant.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.modules.message;
+package io.github.talelin.merak.module.message;
 
 /**
  * websocket 模块常量
diff --git a/src/main/java/io/github/talelin/merak/module/message/MessageWebSocketHandler.java b/src/main/java/io/github/talelin/merak/module/message/MessageWebSocketHandler.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.modules.message;
+package io.github.talelin.merak.module.message;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.socket.*;
diff --git a/src/main/java/io/github/talelin/merak/module/message/WebSocketInterceptor.java b/src/main/java/io/github/talelin/merak/module/message/WebSocketInterceptor.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.modules.message;
+package io.github.talelin.merak.module.message;
 
 import com.auth0.jwt.exceptions.*;
 import com.auth0.jwt.interfaces.Claim;
@@ -18,7 +18,7 @@
 import java.nio.charset.Charset;
 import java.util.Map;
 
-import static io.github.talelin.merak.modules.message.MessageConstant.USER_KEY;
+import static io.github.talelin.merak.module.message.MessageConstant.USER_KEY;
 
 @SuppressWarnings("Duplicates")
 public class WebSocketInterceptor implements HandshakeInterceptor {
diff --git a/src/main/java/io/github/talelin/merak/module/message/WebsocketConfiguration.java b/src/main/java/io/github/talelin/merak/module/message/WebsocketConfiguration.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.modules.message;
+package io.github.talelin.merak.module.message;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/src/main/java/io/github/talelin/merak/module/message/WsHandler.java b/src/main/java/io/github/talelin/merak/module/message/WsHandler.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.modules.message;
+package io.github.talelin.merak.module.message;
 
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
diff --git a/src/main/java/io/github/talelin/merak/module/message/WsHandlerImpl.java b/src/main/java/io/github/talelin/merak/module/message/WsHandlerImpl.java
@@ -1,4 +1,4 @@
-package io.github.talelin.merak.modules.message;
+package io.github.talelin.merak.module.message;
 
 import io.github.talelin.merak.model.UserDO;
 import io.github.talelin.merak.service.GroupService;
@@ -7,8 +7,6 @@
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import static io.github.talelin.merak.modules.message.MessageConstant.USER_KEY;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -57,10 +55,10 @@ public void sendMessage(Long userId, TextMessage message) throws IOException {
                 return false;
             }
             Map<String, Object> attributes = session.getAttributes();
-            if (!attributes.containsKey(USER_KEY)) {
+            if (!attributes.containsKey(MessageConstant.USER_KEY)) {
                 return false;
             }
-            UserDO user = (UserDO) attributes.get(USER_KEY);
+            UserDO user = (UserDO) attributes.get(MessageConstant.USER_KEY);
             return user.getId().equals(userId);
         }).findFirst();
         if (userSession.isPresent()) {
@@ -108,9 +106,9 @@ public void broadCastToGroup(Long groupId, TextMessage message) throws IOExcepti
             if (!session.isOpen())
                 continue;
             Map<String, Object> attributes = session.getAttributes();
-            if (!attributes.containsKey(USER_KEY))
+            if (!attributes.containsKey(MessageConstant.USER_KEY))
                 continue;
-            UserDO user = (UserDO) attributes.get(USER_KEY);
+            UserDO user = (UserDO) attributes.get(MessageConstant.USER_KEY);
             boolean matched = userIds.stream().anyMatch(id -> id.equals(user.getId()));
             if (!matched)
                 continue;
diff --git a/src/main/java/io/github/talelin/merak/service/impl/FileServiceImpl.java b/src/main/java/io/github/talelin/merak/service/impl/FileServiceImpl.java
@@ -1,10 +1,9 @@
 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.extensions.file.FileConstant;
-import io.github.talelin.merak.extensions.file.Uploader;
+import io.github.talelin.merak.extension.file.FileConstant;
+import io.github.talelin.merak.extension.file.Uploader;
 import io.github.talelin.merak.mapper.FileMapper;
 import io.github.talelin.merak.model.FileDO;
 import io.github.talelin.merak.service.FileService;
@@ -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());
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.github.talelin.merak.extensions.file;`
	`1`	`+package io.github.talelin.merak.extension.file;`
`2`	`2`
`3`	`3`	`import io.github.talelin.autoconfigure.exception.*;`
`4`	`4`	`import org.springframework.util.MultiValueMap;`