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

剥离redis依赖

Browse Source
This commit is contained in:
D 2024-04-24 14:22:15 +08:00
parent 1c768d6607
commit b48206dc80
22 changed files with 302 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -17,7 +17,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<spring-boot.version>3.2.4</spring-boot.version>
<spring-boot.version>3.2.5</spring-boot.version>
<druid.version>1.2.21</druid.version>
<shardingsphere.version>4.1.1</shardingsphere.version>
<dynamic.version>3.5.2</dynamic.version>

2
ruoyi-admin/pom.xml
View File

@ -71,7 +71,7 @@
<artifactId>ruoyi-mybatis-jpa</artifactId>
</dependency>
<!-- minio -->
<!-- 中间件 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-middleware-starter</artifactId>

31
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
View File

@ -1,15 +1,10 @@
package com.ruoyi.web.controller.monitor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.springframework.cache.Cache.ValueWrapper;
import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@ -52,32 +47,6 @@ public class CacheController
caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
}
@Operation(summary = "获取缓存信息")
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping()
public AjaxResult getInfo() throws Exception
{
Map<String, Object> result = new HashMap<>(3);
if (CacheUtils.getCacheManager() instanceof RedisCacheManager)
{
Properties info = (Properties) CacheUtils.getRedisTemplate().execute((RedisCallback<Object>) connection -> connection.info());
Properties commandStats = (Properties) CacheUtils.getRedisTemplate().execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
Object dbSize = CacheUtils.getRedisTemplate().execute((RedisCallback<Object>) connection -> connection.dbSize());
result.put("info", info);
result.put("dbSize", dbSize);
List<Map<String, String>> pieList = new ArrayList<>();
commandStats.stringPropertyNames().forEach(key -> {
Map<String, String> data = new HashMap<>(2);
String property = commandStats.getProperty(key);
data.put("name", StringUtils.removeStart(key, "cmdstat_"));
data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
pieList.add(data);
});
result.put("commandStats", pieList);
}
return AjaxResult.success(result);
}
@Operation(summary = "获取缓存名列表")
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")

31
ruoyi-admin/src/main/resources/application-middleware.yml Normal file
View File

@ -0,0 +1,31 @@
spring:
data:
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
password:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# Minio配置
minio:
url: http://localhost:9000
accessKey: minioadmin
secretKey: minioadmin
bucketName: ruoyi

6
ruoyi-admin/src/main/resources/application-minio.yml
View File

@ -1,6 +0,0 @@
# Minio配置
minio:
url: http://localhost:9000
accessKey: minioadmin
secretKey: minioadmin
bucketName: ruoyi

27
ruoyi-admin/src/main/resources/application.yml
View File

@ -49,7 +49,7 @@ user:
spring:
cache:
# 指定缓存类型 jcache 本地缓存 redis 缓存
type: jcache
type: redis
redis:
# 指定存活时间（ms）
time-to-live: 86400000
@ -65,7 +65,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid,mybatis,oauth,pay,minio
active: druid,mybatis,oauth,pay,middleware
# 文件上传
servlet:
multipart:
@ -78,29 +78,6 @@ spring:
restart:
# 热部署开关
enabled: true
data:
# redis 配置
redis:
# 地址
host: localhost
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
password:
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# token配置
token:

6
ruoyi-common/pom.xml
View File

@ -111,12 +111,6 @@
<version>2.3.0.1</version>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!-- pool 对象池 -->
<dependency>
<groupId>org.apache.commons</groupId>

14
ruoyi-common/src/main/java/com/ruoyi/common/core/cache/CacheSpecialUtils.java vendored Normal file
View File

@ -0,0 +1,14 @@
package com.ruoyi.common.core.cache;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.cache.Cache;
public interface CacheSpecialUtils {
public Set<String> getKeys(Cache cache);
default public <T> void set(String string, T value, long timeout, TimeUnit unit){}
default public <T> void set(String string, T value){};
}

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

@ -1,34 +1,19 @@
package com.ruoyi.common.utils;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.ehcache.core.EhcacheBase;
import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
import org.ehcache.impl.internal.store.heap.OnHeapStore;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.jcache.JCacheCache;
import org.springframework.cache.transaction.TransactionAwareCacheDecorator;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.lang.Nullable;
import org.springframework.util.ObjectUtils;
import com.ruoyi.common.core.cache.CacheSpecialUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
public class CacheUtils {
/**
* 使用redis时对redis进行单独特殊操作需要使用
*
* @param <K>
* @param <V>
* @return
*/
public static <K, V> RedisTemplate<K, V> getRedisTemplate() {
return SpringUtils.getBean("redisTemplate");
}
/**
* 获取CacheManager
@ -58,38 +43,8 @@ public class CacheUtils {
@SuppressWarnings(value = { "unchecked", "rawtypes" })
public static Set<String> getkeys(String cacheName) {
Cache cache = getCacheManager().getCache(cacheName);
Set<String> keyset = new HashSet<>();
if (cache instanceof JCacheCache) {
try {
JCacheCache jehcache = (JCacheCache) cache;
// org.ehcache.jsr107.Eh107Cache 不公开
Object nativeCache = jehcache.getNativeCache();
Class<?> nativeCacheClass = nativeCache.getClass();
Field ehCacheField = nativeCacheClass.getDeclaredField("ehCache");
ehCacheField.setAccessible(true);
EhcacheBase ehcache = (EhcacheBase) ehCacheField.get(nativeCache);
Field storeField = EhcacheBase.class.getDeclaredField("store");
storeField.setAccessible(true);
OnHeapStore store = (OnHeapStore) storeField.get(ehcache);
Field mapField = OnHeapStore.class.getDeclaredField("map");
mapField.setAccessible(true);
// org.ehcache.impl.internal.store.heap.Backend 不公开
Object map = mapField.get(store);
Class<?> mapClass = map.getClass();
Field realMapField = mapClass.getDeclaredField("realMap");
realMapField.setAccessible(true);
ConcurrentHashMap<String, ?> realMap = (ConcurrentHashMap<String, ?>) realMapField.get(map);
keyset = realMap.keySet();
} catch (Exception e) {
}
} else if (cache instanceof TransactionAwareCacheDecorator) {
Set<Object> keysets = getRedisTemplate().keys(cache.getName() + "*");
for (Object s : keysets) {
keyset.add(StringUtils.replace(s.toString(), cache.getName() + ":", ""));
}
}
return keyset;
CacheSpecialUtils cacheGetKets = SpringUtils.getBean(CacheSpecialUtils.class);
return cacheGetKets.getKeys(cache);
}
/**
@ -118,6 +73,10 @@ public class CacheUtils {
}
}
public static boolean hasKey(String cacheName, String key){
return ObjectUtils.isEmpty(get(cacheName, key));
}
/**
* 根据cacheName,key和缓存过期时间进行缓存数据,使用各种不同缓存可以单独进行操作
*
@ -134,10 +93,11 @@ public class CacheUtils {
JCacheCache ehcache = (JCacheCache) cache;
ehcache.put(key, value);
} else if (cache instanceof TransactionAwareCacheDecorator) {
CacheSpecialUtils cacheSet = SpringUtils.getBean(CacheSpecialUtils.class);
if (timeout != 0 && unit != null) {
getRedisTemplate().opsForValue().set(cacheName + ":" + key, value, timeout, unit);
cacheSet.set(cacheName + ":" + key, value, timeout, unit);
} else {
getRedisTemplate().opsForValue().set(cacheName + ":" + key, value);
cacheSet.set(cacheName + ":" + key, value);
}
} else {
cache.put(key, value);

53
ruoyi-framework/src/main/java/com/ruoyi/framework/config/Ehcache3Config.java
View File

@ -1,5 +1,8 @@
package com.ruoyi.framework.config;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.cache.CacheManager;
@ -8,19 +11,61 @@ import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.CreatedExpiryPolicy;
import javax.cache.expiry.Duration;
import org.ehcache.core.EhcacheBase;
import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
import org.ehcache.impl.internal.store.heap.OnHeapStore;
import org.ehcache.jsr107.EhcacheCachingProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cache.Cache;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cache.jcache.JCacheCache;
import org.springframework.cache.jcache.JCacheCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.core.cache.CacheSpecialUtils;
@Configuration
@EnableCaching
@ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "jcache", matchIfMissing = false)
public class Ehcache3Config {
@Bean
public CacheManager ehcacheManager() {
@SuppressWarnings(value = { "unchecked", "rawtypes" })
public CacheSpecialUtils cacheGetKets() {
return new CacheSpecialUtils() {
@Override
public Set<String> getKeys(Cache cache) {
Set<String> keyset = new HashSet<>();
try {
JCacheCache jehcache = (JCacheCache) cache;
// org.ehcache.jsr107.Eh107Cache 不公开
Object nativeCache = jehcache.getNativeCache();
Class<?> nativeCacheClass = nativeCache.getClass();
Field ehCacheField = nativeCacheClass.getDeclaredField("ehCache");
ehCacheField.setAccessible(true);
EhcacheBase ehcache = (EhcacheBase) ehCacheField.get(nativeCache);
Field storeField = EhcacheBase.class.getDeclaredField("store");
storeField.setAccessible(true);
OnHeapStore store = (OnHeapStore) storeField.get(ehcache);
Field mapField = OnHeapStore.class.getDeclaredField("map");
mapField.setAccessible(true);
// org.ehcache.impl.internal.store.heap.Backend 不公开
Object map = mapField.get(store);
Class<?> mapClass = map.getClass();
Field realMapField = mapClass.getDeclaredField("realMap");
realMapField.setAccessible(true);
ConcurrentHashMap<String, ?> realMap = (ConcurrentHashMap<String, ?>) realMapField.get(map);
keyset = realMap.keySet();
} catch (Exception e) {
}
return keyset;
}
};
}
@Bean
public JCacheCacheManager ehcacheManager() {
EhcacheCachingProvider cachingProvider = (EhcacheCachingProvider) Caching.getCachingProvider();
CacheManager cacheManager = (CacheManager) cachingProvider.getCacheManager();
@ -30,7 +75,7 @@ public class Ehcache3Config {
mutableConfiguration.setManagementEnabled(true); // 启用管理功能（可选）
mutableConfiguration.setStatisticsEnabled(true); // 启用统计功能（可选）
// 设置缓存过期策略（以 timeToIdle 为例，根据实际需求调整）
mutableConfiguration.setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.HOURS,1)));
mutableConfiguration.setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.HOURS, 1)));
cacheManager.createCache("temp_cache", mutableConfiguration);
cacheManager.createCache("eternal_cache", mutableConfiguration);
@ -42,7 +87,9 @@ public class Ehcache3Config {
cacheManager.createCache("rate_limit", mutableConfiguration);
cacheManager.createCache("pwd_err_cnt", mutableConfiguration);
return cacheManager;
JCacheCacheManager jCacheCacheManager = new JCacheCacheManager(cacheManager);
return jCacheCacheManager;
}
}

15
ruoyi-middleware/pom.xml
View File

@ -13,6 +13,7 @@
<properties>
<ruoyi.version>3.8.7.3.2</ruoyi.version>
<minio.version>8.2.1</minio.version>
<spring-boot.version>3.2.5</spring-boot.version>
</properties>
<description>
@ -20,13 +21,6 @@
</description>
<dependencyManagement>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- Minio 文件存储 -->
<dependency>
<groupId>io.minio</groupId>
@ -40,6 +34,12 @@
<version>${ruoyi.version}</version>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-middleware-redis</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-middleware-starter</artifactId>
@ -51,6 +51,7 @@
<modules>
<module>ruoyi-middleware-minio</module>
<module>ruoyi-middleware-redis</module>
<module>ruoyi-middleware-starter</module>
</modules>
<packaging>pom</packaging>

1
ruoyi-middleware/ruoyi-middleware-minio/src/main/java/com/ruoyi/middleware/minio/utils/FileUploadMinioUtils.java
View File

@ -10,7 +10,6 @@ import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.middleware.minio.config.MinioConfig;
import com.ruoyi.middleware.minio.utils.MinioUtil;
public class FileUploadMinioUtils extends FileUploadUtils {
/**

33
ruoyi-middleware/ruoyi-middleware-redis/pom.xml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi-middleware</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.8.7.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-middleware-redis</artifactId>
<description>
中间件
</description>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
</dependencies>
</project>

2
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java → ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/aspectj/RateLimiterAspect.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.framework.aspectj;
package com.ruoyi.middleware.redis.aspectj;
import java.lang.reflect.Method;
import java.util.Collections;

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java → ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/FastJson2JsonRedisSerializer.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.framework.config;
package com.ruoyi.middleware.redis.config;
import java.nio.charset.Charset;

58
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java → ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/RedisConfig.java
View File

@ -1,8 +1,12 @@
package com.ruoyi.framework.config;
package com.ruoyi.middleware.redis.config;
import java.time.Duration;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurer;
import org.springframework.context.annotation.Bean;
@ -16,6 +20,9 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import com.ruoyi.common.core.cache.CacheSpecialUtils;
import com.ruoyi.common.utils.StringUtils;
/**
* redis配置
*
@ -23,37 +30,58 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
*/
@Configuration
@ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "redis", matchIfMissing = false)
public class RedisConfig implements CachingConfigurer
{
public class RedisConfig implements CachingConfigurer {
@Bean
@Primary
public CacheManager cacheManager(RedisConnectionFactory connectionFactory)
{
public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
RedisCacheConfiguration config = instanceConfig(3600 * 24 * 15L);
return RedisCacheManager.builder(connectionFactory).cacheDefaults(config).transactionAware().build();
}
@Bean
public CacheManager cacheManager30m(RedisConnectionFactory connectionFactory)
{
public CacheManager cacheManager30m(RedisConnectionFactory connectionFactory) {
RedisCacheConfiguration config = instanceConfig(1800L);
return RedisCacheManager.builder(connectionFactory).cacheDefaults(config).transactionAware().build();
}
@Bean
public CacheSpecialUtils cacheGetKets(RedisTemplate<Object, Object> redisTemplate) {
return new CacheSpecialUtils() {
@Override
public Set<String> getKeys(Cache cache) {
Set<String> keyset = new HashSet<>();
Set<Object> keysets = redisTemplate.keys(cache.getName() + "*");
for (Object s : keysets) {
keyset.add(StringUtils.replace(s.toString(), cache.getName() + ":", ""));
}
return keyset;
}
@Override
public <T> void set(String cacheName, T value, long timeout, TimeUnit unit){
redisTemplate.opsForValue().set(cacheName, value, timeout, unit);
}
public <T> void set(String cacheName, T value){
redisTemplate.opsForValue().set(cacheName, value);
};
};
}
@SuppressWarnings(value = { "unchecked", "rawtypes" })
private RedisCacheConfiguration instanceConfig(Long ttl)
{
private RedisCacheConfiguration instanceConfig(Long ttl) {
FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
return RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofSeconds(ttl)).disableCachingNullValues()
.computePrefixWith(name -> name + ":")
.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
.serializeKeysWith(
RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer));
}
@Bean
@SuppressWarnings(value = { "unchecked", "rawtypes" })
public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
{
public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<Object, Object> template = new RedisTemplate<>();
template.setConnectionFactory(connectionFactory);
@ -72,8 +100,7 @@ public class RedisConfig implements CachingConfigurer
}
@Bean
public DefaultRedisScript<Long> limitScript()
{
public DefaultRedisScript<Long> limitScript() {
DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
redisScript.setScriptText(limitScriptText());
redisScript.setResultType(Long.class);
@ -83,8 +110,7 @@ public class RedisConfig implements CachingConfigurer
/**
* 限流脚本
*/
private String limitScriptText()
{
private String limitScriptText() {
return "local key = KEYS[1]\n" +
"local count = tonumber(ARGV[1])\n" +
"local time = tonumber(ARGV[2])\n" +

64
ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/controller/RedisCacheController.java Normal file
View File

@ -0,0 +1,64 @@
package com.ruoyi.middleware.redis.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
/**
* 缓存监控
*
* @author ruoyi
*/
@Tag(name = "缓存监控")
@RestController
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "redis", matchIfMissing = false)
@RequestMapping("/monitor/cache")
public class RedisCacheController {
@Autowired
private RedisTemplate redisTemplate;
@Operation(summary = "获取缓存信息")
@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
@GetMapping()
public AjaxResult getInfo() throws Exception {
Map<String, Object> result = new HashMap<>(3);
Properties info = (Properties) redisTemplate
.execute((RedisCallback<Object>) connection -> connection.commands().info());
Properties commandStats = (Properties) redisTemplate
.execute((RedisCallback<Object>) connection -> connection.commands().info("commandstats"));
Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.commands().dbSize());
result.put("info", info);
result.put("dbSize", dbSize);
List<Map<String, String>> pieList = new ArrayList<>();
commandStats.stringPropertyNames().forEach(key -> {
Map<String, String> data = new HashMap<>(2);
String property = commandStats.getProperty(key);
data.put("name", StringUtils.removeStart(key, "cmdstat_"));
data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
pieList.add(data);
});
result.put("commandStats", pieList);
return AjaxResult.success(result);
}
}

5
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java → ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.redis;
package com.ruoyi.middleware.redis.utils;
import java.util.Collection;
import java.util.Iterator;
@ -6,7 +6,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
@ -20,6 +22,7 @@ import org.springframework.stereotype.Component;
**/
@SuppressWarnings(value = { "unchecked", "rawtypes" })
@Component
@ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "redis", matchIfMissing = false)
public class RedisCache
{
@Autowired

5
ruoyi-middleware/ruoyi-middleware-starter/pom.xml
View File

@ -27,6 +27,11 @@
<artifactId>ruoyi-middleware-minio</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-middleware-redis</artifactId>
</dependency>
</dependencies>
</project>

8
ruoyi-oauth/pom.xml
View File

@ -20,14 +20,6 @@
</description>
<dependencyManagement>
<dependencies>
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 第三方认证通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>

67
ruoyi-oauth/ruoyi-oauth-phone/src/main/java/com/ruoyi/oauth/phone/service/Impl/DySmsServiceImpl.java
View File

@ -11,8 +11,8 @@ import org.springframework.stereotype.Service;
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CacheUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
import com.ruoyi.oauth.common.enums.OauthVerificationUse;
@ -34,32 +34,32 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
@Autowired
private DySmsUtil dySmsUtil;
@Autowired
private RedisCache redisCache;
@Autowired
private ISysUserService userService;
@Autowired
private UserDetailsServiceImpl userDetailsServiceImpl;
@Autowired
private TokenService tokenService;
private static final String CACHE_NAME = "phone_codes";
private static final Logger log = LoggerFactory.getLogger(DySmsServiceImpl.class);
public boolean beforeSendCode(String phone, OauthVerificationUse use) throws Exception {//1.查验手机号是否存在，分辨登录和删除用户以及注册用户
boolean havePhoneFlag= userService.selectUserByPhone(phone) != null;
if((use.equals(OauthVerificationUse.LOGIN ) || use.equals(OauthVerificationUse.DISABLE )||use.equals(OauthVerificationUse.RESET_PASSWORD) )&& !havePhoneFlag){
throw new ServiceException("该手机号未绑定用户");
}else if((use.equals(OauthVerificationUse.REGISTER ) ||use.equals(OauthVerificationUse.RESET_PHONE))&& havePhoneFlag){
throw new ServiceException("该手机号已绑定用户");
}
return true;
public boolean beforeSendCode(String phone, OauthVerificationUse use) throws Exception {// 1.查验手机号是否存在，分辨登录和删除用户以及注册用户
boolean havePhoneFlag = userService.selectUserByPhone(phone) != null;
if ((use.equals(OauthVerificationUse.LOGIN) || use.equals(OauthVerificationUse.DISABLE)
|| use.equals(OauthVerificationUse.RESET_PASSWORD)) && !havePhoneFlag) {
throw new ServiceException("该手机号未绑定用户");
} else if ((use.equals(OauthVerificationUse.REGISTER) || use.equals(OauthVerificationUse.RESET_PHONE))
&& havePhoneFlag) {
throw new ServiceException("该手机号已绑定用户");
}
return true;
}
@Override
public boolean sendCode(String phone, String code, OauthVerificationUse use) throws Exception {//1.查验手机号是否存在，分辨登录和删除用户以及注册用户
//限制短信一分钟只能发送一次短信
String cacheKey = "phone_codes_" + use.getValue() + "_" + phone;
if(redisCache.hasKey(cacheKey)){
public boolean sendCode(String phone, String code, OauthVerificationUse use) throws Exception {// 1.查验手机号是否存在，分辨登录和删除用户以及注册用户
// 限制短信一分钟只能发送一次短信
if (CacheUtils.hasKey(CACHE_NAME, phone + use.getValue())) {
throw new ServiceException("请在1分钟后再发送短信");
}
@ -67,7 +67,7 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
JSONObject templateParams = new JSONObject();
templateParams.put("code", code);
dySmsUtil.sendSms(DySmsTemplate.Test_TEMPLATE_CODE, templateParams, phone);
redisCache.setCacheObject("phone_codes_" + use.getValue() + "_" + phone, code, 1, TimeUnit.MINUTES);
CacheUtils.put(CACHE_NAME, phone + use.getValue(), code, 1, TimeUnit.MINUTES);
log.info("发送手机验证码成功:{ phone: " + phone + " code:" + code + "}");
return true;
} catch (Exception e) {
@ -76,40 +76,38 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
}
}
@Override
public String checkCode(String phone, String code, OauthVerificationUse use) throws Exception{
String cacheKey = "phone_codes_" + use.getValue() + "_" + phone;
String cachedCode = redisCache.getCacheObject(cacheKey); // 从缓存中获取验证码
boolean havePhoneFlag= userService.selectUserByPhone(phone) != null;
if(use.equals(OauthVerificationUse.LOGIN ) && havePhoneFlag){//登录校验
public String checkCode(String phone, String code, OauthVerificationUse use) throws Exception {
String cachedCode = CacheUtils.get(use.getValue(), use.getValue() + phone, String.class); // 从缓存中获取验证码
boolean havePhoneFlag = userService.selectUserByPhone(phone) != null;
if (use.equals(OauthVerificationUse.LOGIN) && havePhoneFlag) {// 登录校验
if (code.equals(cachedCode)) {
SysUser sysUser = userService.selectUserByPhone(phone);
LoginUser loginUser = (LoginUser) userDetailsServiceImpl.createLoginUser(sysUser);
return tokenService.createToken(loginUser);
// return true;
// return true;
} else {
throw new ServiceException("验证码错误");
}
}else if(use.equals(OauthVerificationUse.REGISTER )&& !havePhoneFlag){//注册校验
} else if (use.equals(OauthVerificationUse.REGISTER) && !havePhoneFlag) {// 注册校验
if (code.equals(cachedCode)) {
return Boolean.toString(true);
} else {
throw new ServiceException("验证码错误");
}
}else if(use.equals(OauthVerificationUse.DISABLE )&& havePhoneFlag){//注销校验
} else if (use.equals(OauthVerificationUse.DISABLE) && havePhoneFlag) {// 注销校验
if (code.equals(cachedCode)) {
return Boolean.toString(true);
} else {
throw new ServiceException("验证码错误");
}
}else if(use.equals(OauthVerificationUse.RESET_PASSWORD )&& havePhoneFlag){//重置密码校验
} else if (use.equals(OauthVerificationUse.RESET_PASSWORD) && havePhoneFlag) {// 重置密码校验
if (code.equals(cachedCode)) {
return Boolean.toString(true);
} else {
throw new ServiceException("验证码错误");
}
}else if(use.equals(OauthVerificationUse.RESET_PHONE )&& !havePhoneFlag){//重置账号校验
} else if (use.equals(OauthVerificationUse.RESET_PHONE) && !havePhoneFlag) {// 重置账号校验
if (code.equals(cachedCode)) {
return Boolean.toString(true);
} else {
@ -134,7 +132,7 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
@Override
public String doLogin(String phone) {
String verify = redisCache.getCacheObject("phone_codes_login" + phone);
String verify = CacheUtils.get(CACHE_NAME, phone + OauthVerificationUse.LOGIN, String.class);
if (verify != null) {
throw new ServiceException("该手机号验证码未过期");
}
@ -147,7 +145,8 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
JSONObject templateParams = new JSONObject();
templateParams.put("code", code);
dySmsUtil.sendSms(DySmsTemplate.Test_TEMPLATE_CODE, templateParams, phone);
redisCache.setCacheObject("phone_codes_login" + phone, code, 1, TimeUnit.MINUTES);
CacheUtils.put(CACHE_NAME, phone + OauthVerificationUse.LOGIN, code, 1,
TimeUnit.MINUTES);
} catch (Exception e) {
e.printStackTrace();
}
@ -155,7 +154,7 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
}
public String doLoginVerify(String phone, String code) {
String verify = redisCache.getCacheObject("phone_codes_login" + phone);
String verify = CacheUtils.get(CACHE_NAME, phone + OauthVerificationUse.LOGIN, String.class);
if (code.equals(verify)) {
SysUser sysUser = userService.selectUserByPhone(phone);
LoginUser loginUser = (LoginUser) userDetailsServiceImpl.createLoginUser(sysUser);
@ -167,14 +166,14 @@ public class DySmsServiceImpl implements DySmsService, OauthVerificationCodeServ
public String doRegister(String phone) {
String code = generateRandomString(6);
redisCache.setCacheObject("phone_codes_register" + phone, code, 1, TimeUnit.MINUTES);
String verify = redisCache.getCacheObject("phone_codes_register" + phone);
CacheUtils.put(CACHE_NAME, phone + OauthVerificationUse.REGISTER, code, 1, TimeUnit.MINUTES);
String verify = CacheUtils.get("phone_codes_register", phone, String.class);
if (verify != null) {
throw new ServiceException("该手机号验证码未过期");
} else {
try {
dySmsUtil.sendSms(null, null, phone);
redisCache.setCacheObject("phone_codes_register" + phone, code, 1, TimeUnit.MINUTES);
CacheUtils.put(CACHE_NAME, phone + OauthVerificationUse.REGISTER, code, 1, TimeUnit.MINUTES);
} catch (Exception e) {
e.printStackTrace();
}

7
ruoyi-pay/pom.xml
View File

@ -20,13 +20,6 @@
</description>
<dependencyManagement>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- 支付基础模块 -->
<dependency>
<groupId>com.ruoyi</groupId>