From 0de54fb3edb3bd06ab0188f935c4407b1b0aec18 Mon Sep 17 00:00:00 2001 From: dftre <3066417822@qq.com> Date: Mon, 30 Sep 2024 10:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cache/CacheKeys.java | 2 +- .../cache/CacheNoTimeOut.java | 2 +- .../cache/CacheTimeOut.java | 2 +- .../file/DiskFileService.java | 26 ++++++++++++------- .../{utils => service}/file/FileService.java | 6 ++--- .../mybatis/CreateSqlSessionFactory.java | 2 +- .../com/ruoyi/common/utils/CacheUtils.java | 4 +-- .../common/utils/file/FileOperateUtils.java | 1 + .../ruoyi/framework/config/MyBatisConfig.java | 2 +- .../config/SqlSessionFactoryConfig.java | 2 +- .../minio/service/MinioFileService.java | 2 +- .../middleware/redis/utils/RedisCache.java | 4 +-- .../ruoyi/ehcache/config/Ehcache3Cache.java | 4 +-- .../mybatisplus/config/MybatisPlusConfig.java | 2 +- 14 files changed, 34 insertions(+), 27 deletions(-) rename ruoyi-common/src/main/java/com/ruoyi/common/{interceptor => service}/cache/CacheKeys.java (77%) rename ruoyi-common/src/main/java/com/ruoyi/common/{interceptor => service}/cache/CacheNoTimeOut.java (74%) rename ruoyi-common/src/main/java/com/ruoyi/common/{interceptor => service}/cache/CacheTimeOut.java (84%) rename ruoyi-common/src/main/java/com/ruoyi/common/{utils => service}/file/DiskFileService.java (91%) rename ruoyi-common/src/main/java/com/ruoyi/common/{utils => service}/file/FileService.java (98%) rename ruoyi-common/src/main/java/com/ruoyi/common/{interceptor => service}/mybatis/CreateSqlSessionFactory.java (86%) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java b/ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheKeys.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java rename to ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheKeys.java index 4348576..989825e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheKeys.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.interceptor.cache; +package com.ruoyi.common.service.cache; import java.util.Set; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java b/ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheNoTimeOut.java similarity index 74% rename from ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java rename to ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheNoTimeOut.java index ab4e5ec..825178c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheNoTimeOut.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.interceptor.cache; +package com.ruoyi.common.service.cache; public interface CacheNoTimeOut { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java b/ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheTimeOut.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java rename to ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheTimeOut.java index 3f1efaa..58d9a74 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheTimeOut.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.interceptor.cache; +package com.ruoyi.common.service.cache; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java b/ruoyi-common/src/main/java/com/ruoyi/common/service/file/DiskFileService.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java rename to ruoyi-common/src/main/java/com/ruoyi/common/service/file/DiskFileService.java index f3564d3..ad73270 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/service/file/DiskFileService.java @@ -1,21 +1,27 @@ -package com.ruoyi.common.utils.file; +package com.ruoyi.common.service.file; + +import static com.ruoyi.common.utils.file.FileUtils.*; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Paths; +import java.util.Objects; + +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.file.FileOperateUtils; +import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.sign.Md5Utils; import com.ruoyi.common.utils.uuid.UUID; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import java.io.*; -import java.nio.file.Paths; -import java.util.Objects; - -import static com.ruoyi.common.utils.file.FileUtils.getAbsoluteFile; -import static com.ruoyi.common.utils.file.FileUtils.getPathFileName; /** * 磁盘文件操作实现类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java b/ruoyi-common/src/main/java/com/ruoyi/common/service/file/FileService.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java rename to ruoyi-common/src/main/java/com/ruoyi/common/service/file/FileService.java index e452b1d..a6f6580 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/service/file/FileService.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.utils.file; - -import org.springframework.web.multipart.MultipartFile; +package com.ruoyi.common.service.file; import java.io.IOException; import java.io.InputStream; +import org.springframework.web.multipart.MultipartFile; + //默认上传下载 /** * 文件操作接口 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/mybatis/CreateSqlSessionFactory.java b/ruoyi-common/src/main/java/com/ruoyi/common/service/mybatis/CreateSqlSessionFactory.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/interceptor/mybatis/CreateSqlSessionFactory.java rename to ruoyi-common/src/main/java/com/ruoyi/common/service/mybatis/CreateSqlSessionFactory.java index de0de2e..cee120c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/mybatis/CreateSqlSessionFactory.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/service/mybatis/CreateSqlSessionFactory.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.interceptor.mybatis; +package com.ruoyi.common.service.mybatis; import javax.sql.DataSource; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java index fa4edd3..ab0e0b6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java @@ -10,8 +10,8 @@ import org.springframework.cache.transaction.TransactionAwareCacheDecorator; import org.springframework.lang.Nullable; import org.springframework.util.ObjectUtils; -import com.ruoyi.common.interceptor.cache.CacheKeys; -import com.ruoyi.common.interceptor.cache.CacheTimeOut; +import com.ruoyi.common.service.cache.CacheKeys; +import com.ruoyi.common.service.cache.CacheTimeOut; import com.ruoyi.common.utils.spring.SpringUtils; public class CacheUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java index 4d7c8be..f93586a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java @@ -9,6 +9,7 @@ import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.CacheConstants; +import com.ruoyi.common.service.file.FileService; import com.ruoyi.common.utils.CacheUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sign.Md5Utils; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index 686a373..d5e3aba 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -16,7 +16,7 @@ import org.springframework.core.io.DefaultResourceLoader; import com.github.pagehelper.PageInterceptor; import com.github.pagehelper.autoconfigure.PageHelperStandardProperties; -import com.ruoyi.common.interceptor.mybatis.CreateSqlSessionFactory; +import com.ruoyi.common.service.mybatis.CreateSqlSessionFactory; import com.ruoyi.common.utils.MybatisUtils; import com.ruoyi.common.utils.StringUtils; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java index 77af5a5..6fb3827 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import com.atomikos.util.IntraVmObjectRegistry; -import com.ruoyi.common.interceptor.mybatis.CreateSqlSessionFactory; +import com.ruoyi.common.service.mybatis.CreateSqlSessionFactory; import com.ruoyi.framework.datasource.DynamicSqlSessionTemplate; @Configuration diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java index b661f6e..0bca673 100644 --- a/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java @@ -9,9 +9,9 @@ import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.service.file.FileService; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileOperateUtils; -import com.ruoyi.common.utils.file.FileService; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.middleware.minio.config.MinioConfig; import com.ruoyi.middleware.minio.domain.MinioFileVO; diff --git a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java index 89b6b4f..6065253 100644 --- a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java +++ b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java @@ -17,8 +17,8 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; -import com.ruoyi.common.interceptor.cache.CacheKeys; -import com.ruoyi.common.interceptor.cache.CacheTimeOut; +import com.ruoyi.common.service.cache.CacheKeys; +import com.ruoyi.common.service.cache.CacheTimeOut; import com.ruoyi.common.utils.StringUtils; /** diff --git a/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java index bb865ff..47330cc 100644 --- a/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java +++ b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java @@ -14,8 +14,8 @@ import org.springframework.cache.jcache.JCacheCache; import org.springframework.cache.jcache.JCacheCacheManager; import org.springframework.stereotype.Component; -import com.ruoyi.common.interceptor.cache.CacheKeys; -import com.ruoyi.common.interceptor.cache.CacheNoTimeOut; +import com.ruoyi.common.service.cache.CacheKeys; +import com.ruoyi.common.service.cache.CacheNoTimeOut; @Component @ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "jcache", matchIfMissing = false) diff --git a/ruoyi-plugins/ruoyi-mybatis-plus/src/main/java/com/ruoyi/mybatisplus/config/MybatisPlusConfig.java b/ruoyi-plugins/ruoyi-mybatis-plus/src/main/java/com/ruoyi/mybatisplus/config/MybatisPlusConfig.java index 2c1a43a..c944cf3 100644 --- a/ruoyi-plugins/ruoyi-mybatis-plus/src/main/java/com/ruoyi/mybatisplus/config/MybatisPlusConfig.java +++ b/ruoyi-plugins/ruoyi-mybatis-plus/src/main/java/com/ruoyi/mybatisplus/config/MybatisPlusConfig.java @@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.github.pagehelper.PageInterceptor; import com.github.pagehelper.autoconfigure.PageHelperStandardProperties; -import com.ruoyi.common.interceptor.mybatis.CreateSqlSessionFactory; +import com.ruoyi.common.service.mybatis.CreateSqlSessionFactory; import com.ruoyi.common.utils.MybatisUtils; import com.ruoyi.common.utils.StringUtils;