Merge branch 'service-file' of uskycloud/usky-cloud into master

base-modules/service-file/pom.xml

@@ -59,13 +59,22 @@
             <groupId>com.usky</groupId>
             <artifactId>service-system-api</artifactId>
         </dependency>
-        
+
+
         <!-- RuoYi Common Swagger -->
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
-        
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -1,48 +1,47 @@
-//package com.ruoyi.file.controller;
-//
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.multipart.MultipartFile;
-//import com.ruoyi.common.core.domain.R;
-//import com.ruoyi.common.core.utils.file.FileUtils;
-//import com.ruoyi.file.service.ISysFileService;
-//import com.ruoyi.system.api.domain.SysFile;
-//
-///**
-// * 文件请求处理
-// *
-// * @author ruoyi
-// */
-//@RestController
-//public class SysFileController
-//{
-//    private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
-//
-//    @Autowired
-//    private ISysFileService sysFileService;
-//
-//    /**
-//     * 文件上传请求
-//     */
-//    @PostMapping("upload")
-//    public R<SysFile> upload(MultipartFile file)
-//    {
-//        try
-//        {
-//            // 上传并返回访问地址
-//            String url = sysFileService.uploadFile(file);
-//            SysFile sysFile = new SysFile();
-//            sysFile.setName(FileUtils.getName(url));
-//            sysFile.setUrl(url);
-//            return R.ok(sysFile);
-//        }
-//        catch (Exception e)
-//        {
-//            log.error("上传文件失败", e);
-//            return R.fail(e.getMessage());
-//        }
-//    }
-//}
+package com.ruoyi.file.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.usky.system.domain.SysFileVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.file.service.ISysFileService;
+import com.ruoyi.common.core.utils.file.FileUtils;
+
+/**
+ * 文件请求处理
+ * @author ruoyi
+ */
+@RestController
+public class SysFileController
+{
+    private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
+
+    @Autowired
+    private ISysFileService sysFileService;
+
+    /**
+     * 文件上传请求
+     */
+    @PostMapping("upload")
+    public R<SysFileVO> upload(MultipartFile file)
+    {
+        try
+        {
+            // 上传并返回访问地址
+            String url = sysFileService.uploadFile(file);
+            SysFileVO sysFile = new SysFileVO();
+            sysFile.setName(FileUtils.getName(url));
+            sysFile.setUrl(url);
+            return R.ok(sysFile);
+        }
+        catch (Exception e)
+        {
+            log.error("上传文件失败", e);
+            return R.fail(e.getMessage());
+        }
+    }
+}

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

@@ -1,50 +1,50 @@
-//package com.ruoyi.file.service;
-//
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Primary;
-//import org.springframework.stereotype.Service;
-//import org.springframework.web.multipart.MultipartFile;
-//import com.ruoyi.file.utils.FileUploadUtils;
-//
-///**
-// * 本地文件存储
-// *
-// * @author ruoyi
-// */
-//@Primary
-//@Service
-//public class LocalSysFileServiceImpl implements ISysFileService
-//{
-//    /**
-//     * 资源映射路径 前缀
-//     */
-//    @Value("${file.prefix}")
-//    public String localFilePrefix;
-//
-//    /**
-//     * 域名或本机访问地址
-//     */
-//    @Value("${file.domain}")
-//    public String domain;
-//
-//    /**
-//     * 上传文件存储在本地的根路径
-//     */
-//    @Value("${file.path}")
-//    private String localFilePath;
-//
-//    /**
-//     * 本地文件上传接口
-//     *
-//     * @param file 上传的文件
-//     * @return 访问地址
-//     * @throws Exception
-//     */
-//    @Override
-//    public String uploadFile(MultipartFile file) throws Exception
-//    {
-//        String name = FileUploadUtils.upload(localFilePath, file);
-//        String url = domain + localFilePrefix + name;
-//        return url;
-//    }
-//}
+package com.ruoyi.file.service;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.file.utils.FileUploadUtils;
+
+/**
+ * 本地文件存储
+ *
+ * @author ruoyi
+ */
+@Primary
+@Service
+public class LocalSysFileServiceImpl implements ISysFileService
+{
+    /**
+     * 资源映射路径 前缀
+     */
+    @Value("${file.prefix}")
+    public String localFilePrefix;
+
+    /**
+     * 域名或本机访问地址
+     */
+    @Value("${file.domain}")
+    public String domain;
+
+    /**
+     * 上传文件存储在本地的根路径
+     */
+    @Value("${file.path}")
+    private String localFilePath;
+
+    /**
+     * 本地文件上传接口
+     *
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    @Override
+    public String uploadFile(MultipartFile file) throws Exception
+    {
+        String name = FileUploadUtils.upload(localFilePath, file);
+        String url = domain + localFilePrefix + name;
+        return url;
+    }
+}

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

@@ -1,11 +1,21 @@
 package com.ruoyi.file.utils;
 
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.util.Date;
 import java.util.Objects;
+
+import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
+import com.ruoyi.common.core.exception.file.InvalidExtensionException;
 import org.apache.commons.io.FilenameUtils;
-import org.springframework.util.MimeTypeUtils;
+import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.file.MimeTypeUtils;
+import com.ruoyi.common.core.utils.uuid.Seq;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -16,175 +26,177 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public class FileUploadUtils
 {
-//    /**
-//     * 默认大小 50M
-//     */
-//    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
-//
-//    /**
-//     * 默认的文件名最大长度 100
-//     */
-//    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
-//
-//    /**
-//     * 根据文件路径上传
-//     *
-//     * @param baseDir 相对应用的基目录
-//     * @param file 上传的文件
-//     * @return 文件名称
-//     * @throws IOException
-//     */
-//    public static final String upload(String baseDir, MultipartFile file) throws IOException
-//    {
-//        try
-//        {
-//            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
-//        }
-//        catch (Exception e)
-//        {
-//            throw new IOException(e.getMessage(), e);
-//        }
-//    }
-//
-//    /**
-//     * 文件上传
-//     *
-//     * @param baseDir 相对应用的基目录
-//     * @param file 上传的文件
-//     * @param allowedExtension 上传文件类型
-//     * @return 返回上传成功的文件名
-//     * @throws FileSizeLimitExceededException 如果超出最大大小
-//     * @throws FileNameLengthLimitExceededException 文件名太长
-//     * @throws IOException 比如读写文件出错时
-//     * @throws InvalidExtensionException 文件校验异常
-//     */
-//    public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
-//            throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
-//            InvalidExtensionException
-//    {
-//        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
-//        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
-//        {
-//            throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
-//        }
-//
-//        assertAllowed(file, allowedExtension);
-//
-//        String fileName = extractFilename(file);
-//
-//        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
-//        file.transferTo(Paths.get(absPath));
-//        return getPathFileName(fileName);
-//    }
-//
-//    /**
-//     * 编码文件名
-//     */
-//    public static final String extractFilename(MultipartFile file)
-//    {
+    /**
+     * 默认大小 50M
+     */
+    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+
+    /**
+     * 默认的文件名最大长度 100
+     */
+    public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+
+    /**
+     * 根据文件路径上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @return 文件名称
+     * @throws IOException
+     */
+    public static final String upload(String baseDir, MultipartFile file) throws IOException
+    {
+        try
+        {
+            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+        }
+        catch (Exception e)
+        {
+            throw new IOException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param baseDir 相对应用的基目录
+     * @param file 上传的文件
+     * @param allowedExtension 上传文件类型
+     * @return 返回上传成功的文件名
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws FileNameLengthLimitExceededException 文件名太长
+     * @throws IOException 比如读写文件出错时
+     * @throws InvalidExtensionException 文件校验异常
+     */
+    public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
+            throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
+            InvalidExtensionException
+    {
+        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
+        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
+        {
+            throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
+        }
+
+        assertAllowed(file, allowedExtension);
+
+        String fileName = extractFilename(file);
+
+        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
+        file.transferTo(Paths.get(absPath));
+        return getPathFileName(fileName);
+    }
+
+    /**
+     * 编码文件名
+     */
+    public static final String extractFilename(MultipartFile file)
+    {
 //        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
 //                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
-//    }
-//
-//    private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
-//    {
-//        File desc = new File(uploadDir + File.separator + fileName);
-//
-//        if (!desc.exists())
-//        {
-//            if (!desc.getParentFile().exists())
-//            {
-//                desc.getParentFile().mkdirs();
-//            }
-//        }
-//        return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
-//    }
-//
-//    private static final String getPathFileName(String fileName) throws IOException
-//    {
-//        String pathFileName = "/" + fileName;
-//        return pathFileName;
-//    }
-//
-//    /**
-//     * 文件大小校验
-//     *
-//     * @param file 上传的文件
-//     * @throws FileSizeLimitExceededException 如果超出最大大小
-//     * @throws InvalidExtensionException 文件校验异常
-//     */
-//    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
-//            throws FileSizeLimitExceededException, InvalidExtensionException
-//    {
-//        long size = file.getSize();
-//        if (size > DEFAULT_MAX_SIZE)
-//        {
-//            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
-//        }
-//
-//        String fileName = file.getOriginalFilename();
-//        String extension = getExtension(file);
-//        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
-//        {
-//            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
-//            {
-//                throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
-//                        fileName);
-//            }
-//            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
-//            {
-//                throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
-//                        fileName);
-//            }
-//            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
-//            {
-//                throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
-//                        fileName);
-//            }
-//            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
-//            {
-//                throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
-//                        fileName);
-//            }
-//            else
-//            {
-//                throw new InvalidExtensionException(allowedExtension, extension, fileName);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 判断MIME类型是否是允许的MIME类型
-//     *
-//     * @param extension 上传文件类型
-//     * @param allowedExtension 允许上传文件类型
-//     * @return true/false
-//     */
-//    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
-//    {
-//        for (String str : allowedExtension)
-//        {
-//            if (str.equalsIgnoreCase(extension))
-//            {
-//                return true;
-//            }
-//        }
-//        return false;
-//    }
-//
-//    /**
-//     * 获取文件名的后缀
-//     *
-//     * @param file 表单文件
-//     * @return 后缀名
-//     */
-//    public static final String getExtension(MultipartFile file)
-//    {
-//        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
-//        if (StringUtils.isEmpty(extension))
-//        {
-//            extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
-//        }
-//        return extension;
-//    }
+        String datePath = DateFormatUtils.format(new Date(), "yyyyMM");
+        return StringUtils.format("{}/{}.{}",datePath , Seq.getId(Seq.uploadSeqType), getExtension(file));
+    }
+
+    private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
+    {
+        File desc = new File(uploadDir + File.separator + fileName);
+
+        if (!desc.exists())
+        {
+            if (!desc.getParentFile().exists())
+            {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc.isAbsolute() ? desc : desc.getAbsoluteFile();
+    }
+
+    private static final String getPathFileName(String fileName) throws IOException
+    {
+        String pathFileName = "/" + fileName;
+        return pathFileName;
+    }
+
+    /**
+     * 文件大小校验
+     *
+     * @param file 上传的文件
+     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws InvalidExtensionException 文件校验异常
+     */
+    public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
+            throws FileSizeLimitExceededException, InvalidExtensionException
+    {
+        long size = file.getSize();
+        if (size > DEFAULT_MAX_SIZE)
+        {
+            throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE/1024/1024);
+        }
+
+        String fileName = file.getOriginalFilename();
+        String extension = getExtension(file);
+        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
+        {
+            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+                        fileName);
+            }
+            else
+            {
+                throw new InvalidExtensionException(allowedExtension, extension, fileName);
+            }
+        }
+    }
+
+    /**
+     * 判断MIME类型是否是允许的MIME类型
+     *
+     * @param extension 上传文件类型
+     * @param allowedExtension 允许上传文件类型
+     * @return true/false
+     */
+    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
+    {
+        for (String str : allowedExtension)
+        {
+            if (str.equalsIgnoreCase(extension))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 获取文件名的后缀
+     *
+     * @param file 表单文件
+     * @return 后缀名
+     */
+    public static final String getExtension(MultipartFile file)
+    {
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        if (StringUtils.isEmpty(extension))
+        {
+            extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
+        }
+        return extension;
+    }
 }