ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整部分接口定义，优化代码结构

Browse Source
This commit is contained in:
dftre 2024-09-30 10:02:42 +08:00
parent 7fd4b6614a
commit 0de54fb3ed
14 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java → ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheKeys.java vendored
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.interceptor.cache;
package com.ruoyi.common.service.cache;
import java.util.Set;

2
ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java → ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheNoTimeOut.java vendored
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.interceptor.cache;
package com.ruoyi.common.service.cache;
public interface CacheNoTimeOut {

2
ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java → ruoyi-common/src/main/java/com/ruoyi/common/service/cache/CacheTimeOut.java vendored
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.interceptor.cache;
package com.ruoyi.common.service.cache;
import java.util.concurrent.TimeUnit;

26
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/DiskFileService.java → ruoyi-common/src/main/java/com/ruoyi/common/service/file/DiskFileService.java
View File

@ -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;
/**
* 磁盘文件操作实现类

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileService.java → ruoyi-common/src/main/java/com/ruoyi/common/service/file/FileService.java
View File

@ -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;
//默认上传下载
/**
* 文件操作接口

2
ruoyi-common/src/main/java/com/ruoyi/common/interceptor/mybatis/CreateSqlSessionFactory.java → ruoyi-common/src/main/java/com/ruoyi/common/service/mybatis/CreateSqlSessionFactory.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.interceptor.mybatis;
package com.ruoyi.common.service.mybatis;
import javax.sql.DataSource;

4
ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java
View File

@ -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 {

1
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileOperateUtils.java
View File

@ -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;

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
View File

@ -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;

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SqlSessionFactoryConfig.java
View File

@ -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

2
ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/service/MinioFileService.java
View File

@ -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;

4
ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java
View File

@ -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;
/**

4
ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java
View File

@ -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)

2
ruoyi-plugins/ruoyi-mybatis-plus/src/main/java/com/ruoyi/mybatisplus/config/MybatisPlusConfig.java
View File

@ -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;