Merge branch 'system-zjy' of uskycloud/usky-cloud into master

base-modules/service-file/pom.xml

@@ -72,7 +72,23 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+            <artifactId>common-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>

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

@@ -1,21 +1,58 @@
 package com.ruoyi.file;
 
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 /**
  * 文件服务
  * 
  * @author ruoyi
  */
+//@EnableCustomSwagger2
+//@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+//public class RuoYiFileApplication
+//{
+//    public static void main(String[] args)
+//    {
+//        SpringApplication.run(RuoYiFileApplication.class, args);
+//    }
+//}
+
+
 @EnableCustomSwagger2
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
+@EnableFeignClients(basePackages = {"com.ruoyi"})
+@MapperScan(value = "com.ruoyi.file.mapper")
+@ComponentScan(basePackages = {"com.ruoyi"})
+@SpringBootApplication
 public class RuoYiFileApplication
 {
-    public static void main(String[] args)
-    {
-        SpringApplication.run(RuoYiFileApplication.class, args);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RuoYiFileApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(RuoYiFileApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        LOGGER.info("\n----------------------------------------------------------\n\t" +
+                "Application is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + (null==path?"":path) + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + (null==path?"":path) + "/\n\t" +
+                "Api: \t\thttp://" + ip + ":" + port + (null==path?"":path) + "/swagger-ui/index.html\n\t" +
+                "----------------------------------------------------------");
     }
-}
+}

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

@@ -1,82 +1,82 @@
-package com.ruoyi.file.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import io.minio.MinioClient;
-
-/**
- * Minio 配置信息
- *
- * @author ruoyi
- */
-@Configuration
-@ConfigurationProperties(prefix = "minio")
-public class MinioConfig
-{
-    /**
-     * 服务地址
-     */
-    private String url;
-
-    /**
-     * 用户名
-     */
-    private String accessKey;
-
-    /**
-     * 密码
-     */
-    private String secretKey;
-
-    /**
-     * 存储桶名称
-     */
-    private String bucketName;
-
-    public String getUrl()
-    {
-        return url;
-    }
-
-    public void setUrl(String url)
-    {
-        this.url = url;
-    }
-
-    public String getAccessKey()
-    {
-        return accessKey;
-    }
-
-    public void setAccessKey(String accessKey)
-    {
-        this.accessKey = accessKey;
-    }
-
-    public String getSecretKey()
-    {
-        return secretKey;
-    }
-
-    public void setSecretKey(String secretKey)
-    {
-        this.secretKey = secretKey;
-    }
-
-    public String getBucketName()
-    {
-        return bucketName;
-    }
-
-    public void setBucketName(String bucketName)
-    {
-        this.bucketName = bucketName;
-    }
-
-    @Bean
-    public MinioClient getMinioClient()
-    {
-        return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
-    }
-}
+//package com.ruoyi.file.config;
+//
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import io.minio.MinioClient;
+//
+///**
+// * Minio 配置信息
+// *
+// * @author ruoyi
+// */
+//@Configuration
+//@ConfigurationProperties(prefix = "minio")
+//public class MinioConfig
+//{
+//    /**
+//     * 服务地址
+//     */
+//    private String url;
+//
+//    /**
+//     * 用户名
+//     */
+//    private String accessKey;
+//
+//    /**
+//     * 密码
+//     */
+//    private String secretKey;
+//
+//    /**
+//     * 存储桶名称
+//     */
+//    private String bucketName;
+//
+//    public String getUrl()
+//    {
+//        return url;
+//    }
+//
+//    public void setUrl(String url)
+//    {
+//        this.url = url;
+//    }
+//
+//    public String getAccessKey()
+//    {
+//        return accessKey;
+//    }
+//
+//    public void setAccessKey(String accessKey)
+//    {
+//        this.accessKey = accessKey;
+//    }
+//
+//    public String getSecretKey()
+//    {
+//        return secretKey;
+//    }
+//
+//    public void setSecretKey(String secretKey)
+//    {
+//        this.secretKey = secretKey;
+//    }
+//
+//    public String getBucketName()
+//    {
+//        return bucketName;
+//    }
+//
+//    public void setBucketName(String bucketName)
+//    {
+//        this.bucketName = bucketName;
+//    }
+//
+//    @Bean
+//    public MinioClient getMinioClient()
+//    {
+//        return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
+//    }
+//}

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

@@ -9,7 +9,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * 通用映射配置
- * 
+ *
  * @author ruoyi
  */
 @Configuration
@@ -34,7 +34,7 @@ public class ResourcesConfig implements WebMvcConfigurer
         registry.addResourceHandler(localFilePrefix + "/**")
                 .addResourceLocations("file:" + localFilePath + File.separator);
     }
-    
+
     /**
      * 开启跨域
      */

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

@@ -0,0 +1,61 @@
+package com.ruoyi.file.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.file.service.FileUploadResponse;
+import com.ruoyi.file.service.FilesUpload;
+import com.ruoyi.file.service.FilesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+
+
+@RestController
+//@RequestMapping("/files")
+public class FilesController {
+
+    @Autowired
+    private FilesService filesService;
+
+    @PostMapping("/upload")
+    public R<FileUploadResponse> upload(@RequestParam MultipartFile file) {
+        // 获取上传文件
+        FileUploadResponse response = filesService.upload(file);
+        return R.ok(response);
+    }
+
+    @GetMapping("/download/{filesUUID}")
+    public void download(@PathVariable String filesUUID, HttpServletResponse response) {
+        //下载文件
+        filesService.download(filesUUID, response);
+    }
+
+
+    @DeleteMapping("/delete/{filesUUID}")
+    public R<Void> delete(@PathVariable String filesUUID) {
+        try {
+            filesService.deleteFile(filesUUID);
+            return R.ok();
+        } catch (Exception e) {
+            return R.fail(e.getMessage()); // 删除失败，返回错误信息
+        }
+    }
+
+    @GetMapping("/query")
+    public R<Page<FilesUpload>> queryFiles(
+            @RequestParam(required = false) String filesName,
+            @RequestParam(required = false) LocalDateTime startTime,
+            @RequestParam(required = false) LocalDateTime endTime,
+            @RequestParam(required = false) Boolean isDeleted,
+            @RequestParam(required = false) String fileType,
+            @RequestParam int current,
+            @RequestParam int size) {
+
+        Page<FilesUpload> page = new Page<>(current, size);
+        Page<FilesUpload> resultPage = filesService.queryFiles(filesName, startTime, endTime, isDeleted, fileType, page);
+        return R.ok(resultPage);
+    }
+}

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

@@ -1,47 +1,47 @@
-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());
-        }
-    }
-}
+//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/mapper/FilesMapper.java

@@ -0,0 +1,10 @@
+package com.ruoyi.file.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.file.service.FilesUpload;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FilesMapper extends BaseMapper<FilesUpload> {
+
+}

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

@@ -1,42 +1,42 @@
-package com.ruoyi.file.service;
-
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import com.github.tobato.fastdfs.domain.fdfs.StorePath;
-import com.github.tobato.fastdfs.service.FastFileStorageClient;
-
-/**
- * FastDFS 文件存储
- * 
- * @author ruoyi
- */
-@Service
-public class FastDfsSysFileServiceImpl implements ISysFileService
-{
-    /**
-     * 域名或本机访问地址
-     */
-    @Value("${fdfs.domain}")
-    public String domain;
-
-    @Autowired
-    private FastFileStorageClient storageClient;
-
-    /**
-     * FastDfs文件上传接口
-     * 
-     * @param file 上传的文件
-     * @return 访问地址
-     * @throws Exception
-     */
-    @Override
-    public String uploadFile(MultipartFile file) throws Exception
-    {
-        StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
-                FilenameUtils.getExtension(file.getOriginalFilename()), null);
-        return domain + "/" + storePath.getFullPath();
-    }
-}
+//package com.ruoyi.file.service;
+//
+//import org.apache.commons.io.FilenameUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.stereotype.Service;
+//import org.springframework.web.multipart.MultipartFile;
+//import com.github.tobato.fastdfs.domain.fdfs.StorePath;
+//import com.github.tobato.fastdfs.service.FastFileStorageClient;
+//
+///**
+// * FastDFS 文件存储
+// *
+// * @author ruoyi
+// */
+//@Service
+//public class FastDfsSysFileServiceImpl implements ISysFileService
+//{
+//    /**
+//     * 域名或本机访问地址
+//     */
+//    @Value("${fdfs.domain}")
+//    public String domain;
+//
+//    @Autowired
+//    private FastFileStorageClient storageClient;
+//
+//    /**
+//     * FastDfs文件上传接口
+//     *
+//     * @param file 上传的文件
+//     * @return 访问地址
+//     * @throws Exception
+//     */
+//    @Override
+//    public String uploadFile(MultipartFile file) throws Exception
+//    {
+//        StorePath storePath = storageClient.uploadFile(file.getInputStream(), file.getSize(),
+//                FilenameUtils.getExtension(file.getOriginalFilename()), null);
+//        return domain + "/" + storePath.getFullPath();
+//    }
+//}

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

@@ -0,0 +1,30 @@
+package com.ruoyi.file.service;
+
+import lombok.Data;
+
+@Data
+public class FileUploadResponse {
+    private String name;
+    private String url;
+
+    public FileUploadResponse(String name, String url) {
+        this.name = name;
+        this.url = url;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.ruoyi.file.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+
+public interface FilesService extends IService<FilesUpload> {
+    // 修改返回类型为 FileUploadResponse
+    FileUploadResponse upload(MultipartFile file);
+
+    // 下载文件
+    void download(String filesUUID, HttpServletResponse response);
+
+    // 删除文件
+    void deleteFile(String filesUUID);
+
+    // 查询方法
+    Page<FilesUpload> queryFiles(String filesName, LocalDateTime startTime, LocalDateTime endTime, Boolean isDeleted, String fileType, Page<FilesUpload> page);
+
+}

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

@@ -0,0 +1,260 @@
+package com.ruoyi.file.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.file.mapper.FilesMapper;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.system.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Service
+public class FilesServiceImpl extends ServiceImpl<FilesMapper, FilesUpload> implements FilesService {
+    @Value("${file.path}")
+    private String filesUploadPath;//获取文件路径
+
+    @Value("${file.domain}")
+    private String filesUploadDomain;//文件域名
+
+    @Value("${file.prefix}")
+    private String filesPrefix;//文件前缀
+
+
+
+    @Override
+    public FileUploadResponse upload(MultipartFile file) {
+
+        // 获取当前登录用户昵称（如果可用）
+        String userName = getUserNameFromSecurityContext();
+
+        // 文件夹路径名称
+        String originalFilename = file.getOriginalFilename();
+
+        //文件大小
+        double size = file.getSize() / (1024.0);
+
+        // 获取当前日期时间
+        LocalDateTime now = LocalDateTime.now();
+        String timestamp = now.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
+
+        //文件类型
+        String type = originalFilename.substring(originalFilename.lastIndexOf(".") + 1).toLowerCase();
+
+        // 按照年月创建文件夹
+        String yearMonth = now.format(DateTimeFormatter.ofPattern("yyyyMM"));
+        // 获取每月递增值
+        int monthIncrement = getMonthIncrement(yearMonth);
+        // 新文件名格式：时间戳+每月递增值+文件类型
+        String fileUuid = timestamp + "A" + String.format("%04d", monthIncrement) + "." + type;
+
+        // 将相对路径转化为绝对路径
+        String destPath = filesUploadPath + "/" + yearMonth;
+
+        // 新的文件地址，绝对路径+新的文件名称
+        File uploadFile = new File(destPath + "/" + fileUuid);
+
+        // 判断配置的文件目录是否存在，若不存在则创建一个新的文件目录
+        File parentFile = uploadFile.getParentFile();
+        if (!parentFile.exists()) {
+            parentFile.mkdirs();
+        }
+
+        try {
+            // 存储文件到本地磁盘
+            file.transferTo(uploadFile);
+
+            // 设置文件url
+            String url = filesUploadDomain + filesPrefix + "/" + yearMonth + "/" + fileUuid;
+
+            // 将文件存储到数据库
+            FilesUpload saveFile = new FilesUpload();
+            saveFile.setFilesName(originalFilename);
+            saveFile.setName(fileUuid);
+            saveFile.setPath(destPath);
+            saveFile.setType(type);
+            saveFile.setSize(size); // （单位：KB）
+            saveFile.setUrl(url);
+            saveFile.setEnable(true);
+            saveFile.setIsDelete(0);
+            saveFile.setCreateBy(userName);
+            saveFile.setCreateTime(LocalDateTime.now());
+            saveFile.setUpdateBy(null);
+            saveFile.setUpdateTime(null);
+            // 保存操作
+            save(saveFile);
+
+            // 返回 FileUploadResponse 对象
+            return new FileUploadResponse(fileUuid, url);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 获取每月递增值
+     * @param yearMonth 年月（格式：yyyyMM）
+     * @return 递增值
+     */
+    private int getMonthIncrement(String yearMonth) {
+        // 目标文件夹路径
+        String destPath = filesUploadPath + "/" + yearMonth;
+        File folder = new File(destPath);
+
+        // 如果文件夹不存在，则递增值从1开始
+        if (!folder.exists()) {
+            folder.mkdirs();
+            return 1;
+        }
+
+        // 获取文件夹中已有的文件数量
+        File[] files = folder.listFiles();
+        if (files == null || files.length == 0) {
+            return 1;
+        }
+
+        // 递增值为文件夹中现有文件数量 + 1
+        return files.length + 1;
+    }
+
+    //将文件以流的形式一次性读取到内存，通过响应输出流输出到前端
+    @Override
+    public void download(String filesUUID, HttpServletResponse response) {
+        try {
+
+            // 忽略 favicon.ico 请求
+            if ("favicon.ico".equals(filesUUID)) {
+                // 直接返回，不做任何处理
+                return;
+            }
+
+            // 确保 filesUUID 是文件名，而不是完整的路径
+            // 如果 filesUUID 包含路径分隔符，需要从最后的路径分隔符开始截取文件名
+            String fileName = filesUUID.substring(filesUUID.lastIndexOf('/') + 1);
+
+            // 确保路径拼接时使用正确的分隔符
+            LocalDateTime now = LocalDateTime.now();
+            String yearMonth = now.format(DateTimeFormatter.ofPattern("yyyyMM"));
+            File uploadFile = new File(filesUploadPath + "/" + yearMonth, fileName);
+
+            // 检查文件是否存在
+            if (!uploadFile.exists()) {
+                throw new FileNotFoundException("File not found: " + uploadFile.getAbsolutePath());
+            }
+
+            // 设置响应头
+            String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+            response.addHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encodedFileName);
+            response.setContentType("application/octet-stream");
+
+            // 使用 try-with-resources 确保流正确关闭
+            try (InputStream inputStream = new BufferedInputStream(new FileInputStream(uploadFile));
+                 ServletOutputStream os = response.getOutputStream()) {
+
+                byte[] buffer = new byte[1024];
+                int length;
+                while ((length = inputStream.read(buffer)) != -1) {
+                    os.write(buffer, 0, length);
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void deleteFile(String filesUUID) {
+        try {
+
+            // 根据文件名查询文件信息
+            FilesUpload file = getOne(new QueryWrapper<FilesUpload>().eq("name", filesUUID));
+
+            if (file == null) {
+                throw new RuntimeException("文件不存在，无法删除");
+            }
+
+            // 删除本地文件
+            String filePath = file.getPath() + "/" + file.getName();
+            File localFile = new File(filePath);
+            if (localFile.exists()) {
+                if (!localFile.delete()) {
+                    throw new RuntimeException("文件删除失败");
+                }
+            }
+
+            // 更新数据库记录
+            FilesUpload updateFile = new FilesUpload();
+            updateFile.setId(file.getId());
+            updateFile.setFilesName(file.getFilesName());
+            updateFile.setName(file.getName());
+            updateFile.setPath(file.getPath());
+            updateFile.setType(file.getType());
+            updateFile.setSize(file.getSize());
+            updateFile.setUrl(file.getUrl());
+            updateFile.setEnable(false);
+            updateFile.setIsDelete(1); // 设置为已删除
+            updateFile.setCreateBy(file.getCreateBy());
+            updateFile.setCreateTime(file.getCreateTime()); // 保留原始的 createTime
+            updateFile.setUpdateBy(file.getUpdateBy());
+            updateFile.setUpdateTime(LocalDateTime.now());
+
+            // 提交更新到数据库
+            updateById(updateFile); // 调用 updateById 方法更新数据库记录
+        } catch (Exception e) {
+            throw new RuntimeException("删除文件失败：" + e.getMessage());
+        }
+    }
+
+    @Override
+    public Page<FilesUpload> queryFiles(String filesName, LocalDateTime startTime, LocalDateTime endTime, Boolean isDeleted, String fileType, Page<FilesUpload> page) {
+        QueryWrapper<FilesUpload> queryWrapper = new QueryWrapper<>();
+
+        // 默认查询未删除的文件
+        if (isDeleted == null) {
+            queryWrapper.eq("is_delete", 0);
+        } else {
+            queryWrapper.eq("is_delete", isDeleted ? 1 : 0);
+        }
+
+        if (filesName != null && !filesName.isEmpty()) {
+            queryWrapper.like("files_name", filesName);
+        }
+
+        if (startTime != null && endTime != null) {
+            queryWrapper.ge("create_time", startTime); // 大于等于起始时间
+            queryWrapper.le("create_time", endTime);   // 小于等于结束时间
+        } else if (startTime != null) {
+            queryWrapper.ge("create_time", startTime); // 只有起始时间
+        } else if (endTime != null) {
+            queryWrapper.le("create_time", endTime);   // 只有结束时间
+        }
+
+        if (fileType != null && !fileType.isEmpty()) {
+            queryWrapper.eq("type", fileType);
+        }
+
+        // 按照创建时间倒序排列
+        queryWrapper.orderByDesc("create_time");
+
+        return page(page, queryWrapper);
+    }
+
+    private String getUserNameFromSecurityContext() {
+        try {
+            return SecurityUtils.getUsername();
+        } catch (Exception e) {
+            // 如果无法获取用户信息，记录日志并返回默认值或抛出自定义异常
+            return "未知用户";
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.ruoyi.file.service;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("file_upload")
+public class FilesUpload implements Serializable {
+    private Integer id;//编号
+
+    private String filesName;//文件真实名称
+
+    private String name;//文件名
+
+    private String path;
+
+    private String type;//文件类型
+
+    private Double size;//文件大小
+
+    private String url;//下载链接
+
+    private Boolean enable;//链接是否可用（1：是 0：否）
+
+    private String createBy;//创建者
+
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;//创建时间
+
+    private String updateBy;//更新者
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;//更新时间
+
+    private Integer isDelete;//是否删除（1：是 0：否）
+}

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

@@ -1,20 +1,20 @@
-package com.ruoyi.file.service;
-
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 文件上传接口
- * 
- * @author ruoyi
- */
-public interface ISysFileService
-{
-    /**
-     * 文件上传接口
-     * 
-     * @param file 上传的文件
-     * @return 访问地址
-     * @throws Exception
-     */
-    public String uploadFile(MultipartFile file) throws Exception;
-}
+//package com.ruoyi.file.service;
+//
+//import org.springframework.web.multipart.MultipartFile;
+//
+///**
+// * 文件上传接口
+// *
+// * @author ruoyi
+// */
+//public interface ISysFileService
+//{
+//    /**
+//     * 文件上传接口
+//     *
+//     * @param file 上传的文件
+//     * @return 访问地址
+//     * @throws Exception
+//     */
+//    public String uploadFile(MultipartFile file) throws Exception;
+//}

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,202 +1,202 @@
-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 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;
-
-
-/**
- * 文件上传工具类
- *
- * @author ruoyi
- */
-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)
-    {
-//        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
-//                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
-        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;
-    }
-}
+//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 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;
+//
+//
+///**
+// * 文件上传工具类
+// *
+// * @author ruoyi
+// */
+//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)
+//    {
+////        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+////                FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
+//        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;
+//    }
+//}

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

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

base-modules/service-file/src/main/resources/mapper/file/FilesMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.file.mapper.FilesMapper">
+
+</mapper>