reactor:优化file

droid-cybre · Apr 23, 2023 · 7f64609 · 7f64609
1 parent db2d7b1
commit 7f64609
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/FileUtil.java b/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/FileUtil.java
@@ -42,18 +42,18 @@ public class FileUtil {
         EXT_MAP.put("video", ".mp4,.MP4,.AVI,.mov,.rmvb,.rm,.FLV,.mp4,.3GP,.flv");
     }
 
-    public static Boolean checkFileExt(String code,String fileSuffix) {
+    public static Boolean checkFileExt(String code,String fileExt) {
         String extValue = EXT_MAP.get(code);
         List<String> extList = Arrays.asList(extValue.split(Constant.COMMA));
-        return extList.contains(fileSuffix);
+        return extList.contains(fileExt);
     }
 
     /**
      * 获取文件后缀
      * @param fileName
      * @return
      */
-    public static String getFileSuffix(String fileName) {
+    public static String getFileExt(String fileName) {
         return fileName.substring(fileName.lastIndexOf(Constant.DOT));
     }
 

diff --git a/...laokou-common-oss/src/main/java/org/laokou/common/oss/support/AbstractStorageService.java b/...laokou-common-oss/src/main/java/org/laokou/common/oss/support/AbstractStorageService.java
@@ -49,8 +49,8 @@ public String upload(int limitRead, long size, String fileName, InputStream inpu
      * @param fileName
      * @return
      */
-    public String getFileSuffix(String fileName) {
-        return FileUtil.getFileSuffix(fileName);
+    public String getFileExt(String fileName) {
+        return FileUtil.getFileExt(fileName);
     }
 
 }
diff --git a/...laokou-common-oss/src/main/java/org/laokou/common/oss/support/AmazonS3StorageService.java b/...laokou-common-oss/src/main/java/org/laokou/common/oss/support/AmazonS3StorageService.java
@@ -70,7 +70,7 @@ public String getUrl(AmazonS3 amazonS3,String fileName) {
 
     @Override
     public String getFileName(String fileName) {
-        return DateUtil.format(LocalDateTime.now(),DateUtil.YYYYMMDDHHMMSS) + getFileSuffix(fileName);
+        return DateUtil.format(LocalDateTime.now(),DateUtil.YYYYMMDDHHMMSS) + getFileExt(fileName);
     }
 
     @Override

diff --git a/...-common/laokou-common-oss/src/main/java/org/laokou/common/oss/support/StorageService.java b/...-common/laokou-common-oss/src/main/java/org/laokou/common/oss/support/StorageService.java
@@ -69,5 +69,5 @@ public interface StorageService<O> {
      * @param fileName
      * @return
      */
-    String getFileSuffix(String fileName);
+    String getFileExt(String fileName);
 }
diff --git a/...a/org/laokou/admin/server/application/service/impl/SysResourceApplicationServiceImpl.java b/...a/org/laokou/admin/server/application/service/impl/SysResourceApplicationServiceImpl.java
@@ -122,7 +122,7 @@ public void downLoadResource(Long id, HttpServletResponse response) throws IOExc
         SysResourceVO resource = sysResourceService.getResourceById(id);
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-disposition", "attachment;filename=" + System.currentTimeMillis() + FileUtil.getFileSuffix(resource.getUrl()));
+        response.setHeader("Content-disposition", "attachment;filename=" + System.currentTimeMillis() + FileUtil.getFileExt(resource.getUrl()));
         InputStream inputStream = FileUtil.getInputStream(resource.getUrl());
         ServletOutputStream outputStream = response.getOutputStream();
         IOUtils.write(inputStream.readAllBytes(),outputStream);
@@ -204,8 +204,8 @@ public UploadVO uploadResource(String code, MultipartFile file, String md5) {
         String contentType = file.getContentType();
         // 判断类型
         String fileName = file.getOriginalFilename();
-        String fileSuffix = FileUtil.getFileSuffix(fileName);
-        if (!FileUtil.checkFileExt(code,fileSuffix)) {
+        String fileExt = FileUtil.getFileExt(fileName);
+        if (!FileUtil.checkFileExt(code,fileExt)) {
             throw new CustomException("格式不正确，请重新上传资源");
         }
         return ossTemplate.upload(size,md5,fileName,contentType,inputStream);