Jelajahi Sumber

修改文件名称

Gaokun Wang 2 minggu lalu
induk
melakukan
f60004a6ad

+ 3 - 3
eco-common/com-core/src/main/java/org/eco/vip/core/constant/ConfigConstants.java

@@ -22,16 +22,16 @@ public class ConfigConstants {
     /**
      * 默认文件引擎
      */
-    public static final String FILE_ENGINE_KE = "default.file.engine";
+    public static final String FILE_ENGINE_KE = "default.files.engine";
 
     /**
      * 本地文件路径 windows
      */
-    public static final String LOCAL_FILE_PATH_WINDOWS_KEY = "local.file.path.windows";
+    public static final String LOCAL_FILE_PATH_WINDOWS_KEY = "local.files.path.windows";
 
     /**
      * 本地文件路径 unix
      */
-    public static final String LOCAL_FILE_PATH_UNIX_KEY = "local.file.path.unix";
+    public static final String LOCAL_FILE_PATH_UNIX_KEY = "local.files.path.unix";
 
 }

+ 2 - 2
eco-common/com-core/src/main/java/org/eco/vip/core/utils/FileLocalUtils.java

@@ -43,13 +43,13 @@ public class FileLocalUtils {
         if (SystemUtils.getOsInfo().isWindows()) {
             String windowsPath = config.getConfValue(ConfigConstants.LOCAL_FILE_PATH_WINDOWS_KEY);
             if (StrUtils.isBlank(windowsPath)) {
-                throw new BusinessException("本地文件路径 windows未配置: local.file.path.windows");
+                throw new BusinessException("系统配置管理(本地文件路径 windows未配置: local.files.path.windows)");
             }
             uploadPath = windowsPath;
         } else {
             String unixPath = config.getConfValue(ConfigConstants.LOCAL_FILE_PATH_UNIX_KEY);
             if (StrUtils.isBlank(unixPath)) {
-                throw new BusinessException("本地文件路径 unix未配置: local.file.path.unix");
+                throw new BusinessException("系统配置管理(本地文件路径 unix未配置: local.files.path.unix)");
             }
             uploadPath = unixPath;
         }

+ 9 - 9
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/file/FileController.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/files/FilesController.java

@@ -3,7 +3,7 @@
  *
  */
 
-package org.eco.vip.nexus.core.controller.file;
+package org.eco.vip.nexus.core.controller.files;
 
 
 import jakarta.annotation.Resource;
@@ -11,9 +11,9 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.eco.vip.core.constant.ConfigConstants;
 import org.eco.vip.core.pojo.CommonResult;
-import org.eco.vip.nexus.core.domain.file.pojo.FileBO;
+import org.eco.vip.nexus.core.domain.files.pojo.FilesBO;
 import org.eco.vip.nexus.core.service.config.IConfigService;
-import org.eco.vip.nexus.core.service.file.IFileService;
+import org.eco.vip.nexus.core.service.files.IFilesService;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,7 +27,7 @@ import java.io.IOException;
 import static org.eco.vip.core.pojo.CommonResult.success;
 
 /**
- * @description FileController
+ * @description FilesController
  *
  * @author GaoKunW
  * @date 2025/7/22 11:07
@@ -35,22 +35,22 @@ import static org.eco.vip.core.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/system/file")
 @Validated
-public class FileController {
+public class FilesController {
 
     @Resource
     private IConfigService configService;
 
     @Resource
-    private IFileService fileService;
+    private IFilesService fileService;
 
     @PostMapping("/upload")
-    public CommonResult<String> upload(@RequestPart("file") MultipartFile file) {
+    public CommonResult<String> upload(@RequestPart("files") MultipartFile file) {
         return success(fileService.upload(configService.getConfValue(ConfigConstants.FILE_ENGINE_KE), file));
     }
 
     @PostMapping(value = "/download", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-    public CommonResult<Valid> download(@Valid FileBO fileBO, HttpServletResponse response) throws IOException {
-        fileService.download(fileBO.getFileId(), response);
+    public CommonResult<Valid> download(@Valid FilesBO filesBO, HttpServletResponse response) throws IOException {
+        fileService.download(filesBO.getFileId(), response);
         return success();
     }
 }

+ 3 - 3
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/file/File.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/files/Files.java

@@ -3,7 +3,7 @@
  *
  */
 
-package org.eco.vip.nexus.core.domain.file;
+package org.eco.vip.nexus.core.domain.files;
 
 
 import com.mybatisflex.annotation.Id;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 import org.eco.vip.orm.domain.BaseEntity;
 
 /**
- * @description File
+ * @description Files
  *
  * @author GaoKunW
  * @date 2025/7/22 10:54
@@ -21,7 +21,7 @@ import org.eco.vip.orm.domain.BaseEntity;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Table("system_file_t")
-public class File extends BaseEntity {
+public class Files extends BaseEntity {
 
     /**
      * 唯一标识

+ 5 - 5
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/file/pojo/FileBO.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/files/pojo/FilesBO.java

@@ -3,25 +3,25 @@
  *
  */
 
-package org.eco.vip.nexus.core.domain.file.pojo;
+package org.eco.vip.nexus.core.domain.files.pojo;
 
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.eco.vip.nexus.core.domain.file.File;
+import org.eco.vip.nexus.core.domain.files.Files;
 import org.eco.vip.orm.domain.BaseBO;
 
 /**
- * @description FileBO
+ * @description FilesBO
  *
  * @author GaoKunW
  * @date 2025/7/22 10:59
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = File.class, reverseConvertGenerate = false)
-public class FileBO extends BaseBO {
+@AutoMapper(target = Files.class, reverseConvertGenerate = false)
+public class FilesBO extends BaseBO {
     /**
      * 唯一标识
      */

+ 5 - 5
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/file/pojo/FileVO.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/files/pojo/FilesVO.java

@@ -3,25 +3,25 @@
  *
  */
 
-package org.eco.vip.nexus.core.domain.file.pojo;
+package org.eco.vip.nexus.core.domain.files.pojo;
 
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.eco.vip.nexus.core.domain.file.File;
+import org.eco.vip.nexus.core.domain.files.Files;
 import org.eco.vip.orm.domain.BaseEntity;
 
 /**
- * @description FileVO
+ * @description FilesVO
  *
  * @author GaoKunW
  * @date 2025/7/22 10:58
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = File.class, reverseConvertGenerate = false)
-public class FileVO extends BaseEntity {
+@AutoMapper(target = Files.class, reverseConvertGenerate = false)
+public class FilesVO extends BaseEntity {
 
     /**
      * 唯一标识

+ 3 - 3
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/mapper/FileMapper.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/mapper/FilesMapper.java

@@ -8,14 +8,14 @@ package org.eco.vip.nexus.core.mapper;
 
 import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.eco.vip.nexus.core.domain.file.File;
+import org.eco.vip.nexus.core.domain.files.Files;
 
 /**
- * @description FileMapper
+ * @description FilesMapper
  *
  * @author GaoKunW
  * @date 2025/7/22 11:09
  */
 @Mapper
-public interface FileMapper extends BaseMapper<File> {
+public interface FilesMapper extends BaseMapper<Files> {
 }

+ 48 - 47
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/file/FileService.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/files/FilesService.java

@@ -3,7 +3,7 @@
  *
  */
 
-package org.eco.vip.nexus.core.service.file;
+package org.eco.vip.nexus.core.service.files;
 
 
 import cn.hutool.core.io.FileUtil;
@@ -22,15 +22,16 @@ import org.eco.vip.core.utils.ImgUtils;
 import org.eco.vip.core.utils.IoUtils;
 import org.eco.vip.core.utils.MapstructUtils;
 import org.eco.vip.core.utils.StrUtils;
-import org.eco.vip.nexus.core.domain.file.File;
-import org.eco.vip.nexus.core.domain.file.pojo.FileBO;
-import org.eco.vip.nexus.core.domain.file.pojo.FileVO;
-import org.eco.vip.nexus.core.mapper.FileMapper;
+import org.eco.vip.nexus.core.domain.files.Files;
+import org.eco.vip.nexus.core.domain.files.pojo.FilesBO;
+import org.eco.vip.nexus.core.domain.files.pojo.FilesVO;
+import org.eco.vip.nexus.core.mapper.FilesMapper;
 import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.service.BaseService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
@@ -38,51 +39,51 @@ import java.util.UUID;
 import static org.eco.vip.nexus.core.domain.file.table.FileTableDef.FILE;
 
 /**
- * @description FileService
+ * @description FilesService
  *
  * @author GaoKunW
  * @date 2025/7/22 11:10
  */
 @Service
 @Slf4j
-public class FileService extends BaseService<FileMapper, File> implements IFileService {
+public class FilesService extends BaseService<FilesMapper, Files> implements IFilesService {
 
     @Resource
-    private FileMapper fileMapper;
+    private FilesMapper filesMapper;
 
-    private QueryWrapper buildQueryWrapper(FileBO fileBO) {
+    private QueryWrapper buildQueryWrapper(FilesBO filesBO) {
         return super.buildBaseQueryWrapper()
-                .and(FILE.FILE_ID.eq(fileBO.getFileId()))
-                .and(FILE.ENGINE.eq(fileBO.getEngine()))
-                .and(FILE.BUCKET.eq(fileBO.getBucket()))
-                .and(FILE.FILE_NAME.eq(fileBO.getFileName()))
-                .and(FILE.ORIGINAL_NAME.eq(fileBO.getOriginalName()))
-                .and(FILE.STATUS.eq(fileBO.getStatus()));
+                .and(FILE.FILE_ID.eq(filesBO.getFileId()))
+                .and(FILE.ENGINE.eq(filesBO.getEngine()))
+                .and(FILE.BUCKET.eq(filesBO.getBucket()))
+                .and(FILE.FILE_NAME.eq(filesBO.getFileName()))
+                .and(FILE.ORIGINAL_NAME.eq(filesBO.getOriginalName()))
+                .and(FILE.STATUS.eq(filesBO.getStatus()));
     }
 
     @Override
-    public PageResult<FileVO> selectPage(FileBO fileBO) {
-        QueryWrapper queryWrapper = buildQueryWrapper(fileBO);
-        Page<FileVO> page = fileMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, FileVO.class);
+    public PageResult<FilesVO> selectPage(FilesBO filesBO) {
+        QueryWrapper queryWrapper = buildQueryWrapper(filesBO);
+        Page<FilesVO> page = filesMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, FilesVO.class);
         return PageResult.build(page);
     }
 
     @Override
-    public List<FileVO> selectList(FileBO fileBO) {
-        QueryWrapper queryWrapper = buildQueryWrapper(fileBO);
-        return fileMapper.selectListWithRelationsByQueryAs(queryWrapper, FileVO.class);
+    public List<FilesVO> selectList(FilesBO filesBO) {
+        QueryWrapper queryWrapper = buildQueryWrapper(filesBO);
+        return filesMapper.selectListWithRelationsByQueryAs(queryWrapper, FilesVO.class);
     }
 
     @Override
-    public boolean insert(FileBO fileBO) {
-        File file = MapstructUtils.convert(fileBO, File.class);
-        return this.save(file);
+    public boolean insert(FilesBO filesBO) {
+        Files files = MapstructUtils.convert(filesBO, Files.class);
+        return this.save(files);
     }
 
     @Override
-    public boolean update(FileBO fileBO) {
-        File file = MapstructUtils.convert(fileBO, File.class);
-        return this.updateById(file);
+    public boolean update(FilesBO filesBO) {
+        Files files = MapstructUtils.convert(filesBO, Files.class);
+        return this.updateById(files);
     }
 
     @Override
@@ -96,15 +97,15 @@ public class FileService extends BaseService<FileMapper, File> implements IFileS
     }
 
     @Override
-    public FileVO selectById(String id) {
+    public FilesVO selectById(String id) {
         QueryWrapper queryWrapper = query().where(FILE.FILE_ID.eq(id).when(StrUtils.isNotBlank(id))).and(FILE.FILE_ID.isNull().when(StrUtils.isBlank(id)));
-        return this.getOneAs(queryWrapper, FileVO.class);
+        return this.getOneAs(queryWrapper, FilesVO.class);
     }
 
     @Override
-    public List<FileVO> selectByUrl(List<String> urls) {
+    public List<FilesVO> selectByUrl(List<String> urls) {
         QueryWrapper queryWrapper = query().where(FILE.DOWNLOAD_URL.in(urls));
-        return fileMapper.selectListWithRelationsByQueryAs(queryWrapper, FileVO.class);
+        return filesMapper.selectListWithRelationsByQueryAs(queryWrapper, FilesVO.class);
     }
 
     @Override
@@ -132,36 +133,36 @@ public class FileService extends BaseService<FileMapper, File> implements IFileS
     private String storageFile(String engine, MultipartFile file) {
         String key = UUID.randomUUID().toString().replace("-", "");
         String storageUrl = FileLocalUtils.storageFileWithReturnUrl("LocalBucket", key, file);
-        File fileInfo = new File();
-        fileInfo.setFileId(key);
-        fileInfo.setEngine(engine);
-        fileInfo.setBucket("LocalBucket");
-        fileInfo.setOriginalName(file.getOriginalFilename());
-        fileInfo.setDownloadUrl(storageUrl);
+        Files filesInfo = new Files();
+        filesInfo.setFileId(key);
+        filesInfo.setEngine(engine);
+        filesInfo.setBucket("LocalBucket");
+        filesInfo.setOriginalName(file.getOriginalFilename());
+        filesInfo.setDownloadUrl(storageUrl);
         String suffix = ObjectUtil.isNotEmpty(file.getOriginalFilename()) ? StrUtil.subAfter(file.getOriginalFilename(),
                 StrUtil.DOT, true) : null;
-        fileInfo.setFileSuffix(suffix);
-        fileInfo.setSizeKb(12);
-        fileInfo.setSizeInfo(FileUtils.readableFileSize(file.getSize()));
-        fileInfo.setFileName(ObjectUtil.isNotEmpty(fileInfo.getFileSuffix()) ? key + StrUtil.DOT + fileInfo.getFileSuffix() : null);
+        filesInfo.setFileSuffix(suffix);
+        filesInfo.setSizeKb(12);
+        filesInfo.setSizeInfo(FileUtils.readableFileSize(file.getSize()));
+        filesInfo.setFileName(ObjectUtil.isNotEmpty(filesInfo.getFileSuffix()) ? key + StrUtil.DOT + filesInfo.getFileSuffix() : null);
         if (ObjectUtil.isNotEmpty(suffix)) {
             if (isPic(suffix)) {
                 try {
-                    fileInfo.setThumbnail(ImgUtils.toBase64DataUri(ImgUtils.scale(ImgUtils.toImage(file.getBytes()),
+                    filesInfo.setThumbnail(ImgUtils.toBase64DataUri(ImgUtils.scale(ImgUtils.toImage(file.getBytes()),
                             100, 100, null), suffix));
                 } catch (Exception ignored) {
                 }
             }
         }
-        fileInfo.setStorageUrl(storageUrl);
+        filesInfo.setStorageUrl(storageUrl);
 
-        this.save(fileInfo);
+        this.save(filesInfo);
         return "";
     }
 
-    private void unifiedDownload(FileBO fileBO, HttpServletResponse response, boolean isDownloadAuth) {
-        FileVO fileVO = this.selectById(fileBO.getFileId());
-        java.io.File file = FileUtils.file(fileVO.getStorageUrl());
+    private void unifiedDownload(FilesBO filesBO, HttpServletResponse response, boolean isDownloadAuth) {
+        FilesVO filesVO = this.selectById(filesBO.getFileId());
+        File file = FileUtils.file(filesVO.getStorageUrl());
         if (!FileUtil.exist(file)) {
             return;
         }

+ 17 - 17
eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/file/IFileService.java → eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/files/IFilesService.java

@@ -3,14 +3,14 @@
  *
  */
 
-package org.eco.vip.nexus.core.service.file;
+package org.eco.vip.nexus.core.service.files;
 
 
 import jakarta.servlet.http.HttpServletResponse;
 import org.eco.vip.core.pojo.PageResult;
-import org.eco.vip.nexus.core.domain.file.File;
-import org.eco.vip.nexus.core.domain.file.pojo.FileBO;
-import org.eco.vip.nexus.core.domain.file.pojo.FileVO;
+import org.eco.vip.nexus.core.domain.files.Files;
+import org.eco.vip.nexus.core.domain.files.pojo.FilesBO;
+import org.eco.vip.nexus.core.domain.files.pojo.FilesVO;
 import org.eco.vip.orm.service.IBaseService;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,40 +18,40 @@ import java.io.IOException;
 import java.util.List;
 
 /**
- * @description IFileService
+ * @description IFilesService
  *
  * @author GaoKunW
  * @date 2025/7/22 11:10
  */
-public interface IFileService extends IBaseService<File> {
+public interface IFilesService extends IBaseService<Files> {
 
     /**
      * @description: 分页查询
-     * @param fileBO 参数
+     * @param filesBO 参数
      * @return PageResult<OrgVO>
      **/
-    PageResult<FileVO> selectPage(FileBO fileBO);
+    PageResult<FilesVO> selectPage(FilesBO filesBO);
 
     /**
      * @description: 查询
-     * @param fileBO 参数
-     * @return List<FileVO>
+     * @param filesBO 参数
+     * @return List<FilesVO>
      **/
-    List<FileVO> selectList(FileBO fileBO);
+    List<FilesVO> selectList(FilesBO filesBO);
 
     /**
      * @description: 新增
-     * @param fileBO 参数
+     * @param filesBO 参数
      * @return boolean 是否成功
      **/
-    boolean insert(FileBO fileBO);
+    boolean insert(FilesBO filesBO);
 
     /**
      * @description: 更新
-     * @param fileBO 参数
+     * @param filesBO 参数
      * @return boolean 是否成功
      **/
-    boolean update(FileBO fileBO);
+    boolean update(FilesBO filesBO);
 
     /**
      * @description: 删除
@@ -73,7 +73,7 @@ public interface IFileService extends IBaseService<File> {
      * @param id ID
      * @return 信息
      */
-    FileVO selectById(String id);
+    FilesVO selectById(String id);
 
     /**
      * 根据url查询信息
@@ -81,7 +81,7 @@ public interface IFileService extends IBaseService<File> {
      * @param urls urls
      * @return 信息
      */
-    List<FileVO> selectByUrl(List<String> urls);
+    List<FilesVO> selectByUrl(List<String> urls);
 
     /**
      * MultipartFile文件上传,返回文件id

+ 1 - 1
eco-start/src/main/resources/logback-spring.xml

@@ -79,7 +79,7 @@
         <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
             <!-- 正在记录的日志文件的路径及文件名 -->
-            <file>${LOG_PATH}/log_all.log</file>
+            <files>${LOG_PATH}/log_all.log</files>
 
             <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
             <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">