From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 73 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
index 0fda9c3..74585fc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -1,17 +1,22 @@
package com.ruoyi.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.CacheUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.system.domain.SysCache;
import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.connection.RedisServerCommands;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.redisson.spring.data.connection.RedissonConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 缂撳瓨鐩戞帶
@@ -23,19 +28,20 @@
@RequestMapping("/monitor/cache")
public class CacheController {
- private final RedisTemplate<String, String> redisTemplate;
+ private final RedissonConnectionFactory connectionFactory;
private final static List<SysCache> CACHES = new ArrayList<>();
static {
CACHES.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "鐢ㄦ埛淇℃伅"));
CACHES.add(new SysCache(CacheConstants.ONLINE_TOKEN_KEY, "鍦ㄧ嚎鐢ㄦ埛"));
- CACHES.add(new SysCache(CacheConstants.LOGIN_ERROR, "鐧婚檰閿欒"));
- CACHES.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "閰嶇疆淇℃伅"));
- CACHES.add(new SysCache(CacheConstants.SYS_DICT_KEY, "鏁版嵁瀛楀吀"));
+ CACHES.add(new SysCache(CacheNames.SYS_CONFIG, "閰嶇疆淇℃伅"));
+ CACHES.add(new SysCache(CacheNames.SYS_DICT, "鏁版嵁瀛楀吀"));
CACHES.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "楠岃瘉鐮�"));
CACHES.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "闃查噸鎻愪氦"));
CACHES.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "闄愭祦澶勭悊"));
+ CACHES.add(new SysCache(CacheNames.SYS_OSS_CONFIG, "OSS閰嶇疆"));
+ CACHES.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
}
/**
@@ -44,9 +50,10 @@
@SaCheckPermission("monitor:cache:list")
@GetMapping()
public R<Map<String, Object>> getInfo() throws Exception {
- Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::info);
- Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
- Object dbSize = redisTemplate.execute((RedisCallback<Object>) RedisServerCommands::dbSize);
+ RedisConnection connection = connectionFactory.getConnection();
+ Properties info = connection.info();
+ Properties commandStats = connection.info("commandstats");
+ Long dbSize = connection.dbSize();
Map<String, Object> result = new HashMap<>(3);
result.put("info", info);
@@ -82,9 +89,17 @@
*/
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getKeys/{cacheName}")
- public R<Set<String>> getCacheKeys(@PathVariable String cacheName) {
- Set<String> cacheKyes = redisTemplate.keys(cacheName + "*");
- return R.ok(cacheKyes);
+ public R<Collection<String>> getCacheKeys(@PathVariable String cacheName) {
+ Collection<String> cacheKeys = new HashSet<>(0);
+ if (isCacheNames(cacheName)) {
+ Set<Object> keys = CacheUtils.keys(cacheName);
+ if (CollUtil.isNotEmpty(keys)) {
+ cacheKeys = keys.stream().map(Object::toString).collect(Collectors.toList());
+ }
+ } else {
+ cacheKeys = RedisUtils.keys(cacheName + "*");
+ }
+ return R.ok(cacheKeys);
}
/**
@@ -96,8 +111,13 @@
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getValue/{cacheName}/{cacheKey}")
public R<SysCache> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) {
- String cacheValue = redisTemplate.opsForValue().get(cacheKey);
- SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
+ Object cacheValue;
+ if (isCacheNames(cacheName)) {
+ cacheValue = CacheUtils.get(cacheName, cacheKey);
+ } else {
+ cacheValue = RedisUtils.getCacheObject(cacheKey);
+ }
+ SysCache sysCache = new SysCache(cacheName, cacheKey, JsonUtils.toJsonString(cacheValue));
return R.ok(sysCache);
}
@@ -109,8 +129,11 @@
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheName/{cacheName}")
public R<Void> clearCacheName(@PathVariable String cacheName) {
- Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
- redisTemplate.delete(cacheKeys);
+ if (isCacheNames(cacheName)) {
+ CacheUtils.clear(cacheName);
+ } else {
+ RedisUtils.deleteKeys(cacheName + "*");
+ }
return R.ok();
}
@@ -120,9 +143,13 @@
* @param cacheKey key鍚�
*/
@SaCheckPermission("monitor:cache:list")
- @DeleteMapping("/clearCacheKey/{cacheKey}")
- public R<Void> clearCacheKey(@PathVariable String cacheKey) {
- redisTemplate.delete(cacheKey);
+ @DeleteMapping("/clearCacheKey/{cacheName}/{cacheKey}")
+ public R<Void> clearCacheKey(@PathVariable String cacheName, @PathVariable String cacheKey) {
+ if (isCacheNames(cacheName)) {
+ CacheUtils.evict(cacheName, cacheKey);
+ } else {
+ RedisUtils.deleteObject(cacheKey);
+ }
return R.ok();
}
@@ -132,9 +159,11 @@
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheAll")
public R<Void> clearCacheAll() {
- Collection<String> cacheKeys = redisTemplate.keys("*");
- redisTemplate.delete(cacheKeys);
+ RedisUtils.deleteKeys("*");
return R.ok();
}
+ private boolean isCacheNames(String cacheName) {
+ return !StringUtils.contains(cacheName, ":");
+ }
}
--
Gitblit v1.9.3