From d351c59b38f772fb4fcfcb1a16b3fe40098da4f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 14 八月 2022 01:50:32 +0800
Subject: [PATCH] update 优化 缓存列表管理 适配 spring-cache 缓存的数据
---
ruoyi-ui/src/api/monitor/cache.js | 114 +++++++++++++++++++-------------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 49 ++++++++++++---
ruoyi-ui/src/views/monitor/cache/list.vue | 2
3 files changed, 96 insertions(+), 69 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 b42248e..5490837 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,12 +1,14 @@
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.oss.constant.OssConstant;
import com.ruoyi.system.domain.SysCache;
import lombok.RequiredArgsConstructor;
import org.redisson.spring.data.connection.RedissonConnectionFactory;
@@ -14,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 缂撳瓨鐩戞帶
@@ -31,13 +34,13 @@
static {
CACHES.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "鐢ㄦ埛淇℃伅"));
- CACHES.add(new SysCache(CacheConstants.ONLINE_TOKEN_KEY, "鍦ㄧ嚎鐢ㄦ埛"));
- CACHES.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "閰嶇疆淇℃伅"));
- CACHES.add(new SysCache(CacheConstants.SYS_DICT_KEY, "鏁版嵁瀛楀吀"));
+ CACHES.add(new SysCache(CacheNames.ONLINE_TOKEN, "鍦ㄧ嚎鐢ㄦ埛"));
+ 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(OssConstant.SYS_OSS_KEY, "OSS閰嶇疆"));
+ CACHES.add(new SysCache(CacheNames.SYS_OSS_CONFIG, "OSS閰嶇疆"));
CACHES.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
}
@@ -87,7 +90,15 @@
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getKeys/{cacheName}")
public R<Collection<String>> getCacheKeys(@PathVariable String cacheName) {
- Collection<String> cacheKeys = RedisUtils.keys(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);
}
@@ -100,7 +111,12 @@
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getValue/{cacheName}/{cacheKey}")
public R<SysCache> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) {
- Object cacheValue = RedisUtils.getCacheObject(cacheKey);
+ 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);
}
@@ -113,7 +129,11 @@
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheName/{cacheName}")
public R<Void> clearCacheName(@PathVariable String cacheName) {
- RedisUtils.deleteKeys(cacheName + "*");
+ if (isCacheNames(cacheName)) {
+ CacheUtils.clear(cacheName);
+ } else {
+ RedisUtils.deleteKeys(cacheName + "*");
+ }
return R.ok();
}
@@ -123,9 +143,13 @@
* @param cacheKey key鍚�
*/
@SaCheckPermission("monitor:cache:list")
- @DeleteMapping("/clearCacheKey/{cacheKey}")
- public R<Void> clearCacheKey(@PathVariable String cacheKey) {
- RedisUtils.deleteObject(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();
}
@@ -139,4 +163,7 @@
return R.ok();
}
+ private boolean isCacheNames(String cacheName) {
+ return !StringUtils.contains(cacheName, ":");
+ }
}
diff --git a/ruoyi-ui/src/api/monitor/cache.js b/ruoyi-ui/src/api/monitor/cache.js
index e1f2c87..5cf0517 100644
--- a/ruoyi-ui/src/api/monitor/cache.js
+++ b/ruoyi-ui/src/api/monitor/cache.js
@@ -1,57 +1,57 @@
-import request from '@/utils/request'
-
-// 鏌ヨ缂撳瓨璇︾粏
-export function getCache() {
- return request({
- url: '/monitor/cache',
- method: 'get'
- })
-}
-
-// 鏌ヨ缂撳瓨鍚嶇О鍒楄〃
-export function listCacheName() {
- return request({
- url: '/monitor/cache/getNames',
- method: 'get'
- })
-}
-
-// 鏌ヨ缂撳瓨閿悕鍒楄〃
-export function listCacheKey(cacheName) {
- return request({
- url: '/monitor/cache/getKeys/' + cacheName,
- method: 'get'
- })
-}
-
-// 鏌ヨ缂撳瓨鍐呭
-export function getCacheValue(cacheName, cacheKey) {
- return request({
- url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey,
- method: 'get'
- })
-}
-
-// 娓呯悊鎸囧畾鍚嶇О缂撳瓨
-export function clearCacheName(cacheName) {
- return request({
- url: '/monitor/cache/clearCacheName/' + cacheName,
- method: 'delete'
- })
-}
-
-// 娓呯悊鎸囧畾閿悕缂撳瓨
-export function clearCacheKey(cacheKey) {
- return request({
- url: '/monitor/cache/clearCacheKey/' + cacheKey,
- method: 'delete'
- })
-}
-
-// 娓呯悊鍏ㄩ儴缂撳瓨
-export function clearCacheAll() {
- return request({
- url: '/monitor/cache/clearCacheAll',
- method: 'delete'
- })
-}
+import request from '@/utils/request'
+
+// 鏌ヨ缂撳瓨璇︾粏
+export function getCache() {
+ return request({
+ url: '/monitor/cache',
+ method: 'get'
+ })
+}
+
+// 鏌ヨ缂撳瓨鍚嶇О鍒楄〃
+export function listCacheName() {
+ return request({
+ url: '/monitor/cache/getNames',
+ method: 'get'
+ })
+}
+
+// 鏌ヨ缂撳瓨閿悕鍒楄〃
+export function listCacheKey(cacheName) {
+ return request({
+ url: '/monitor/cache/getKeys/' + cacheName,
+ method: 'get'
+ })
+}
+
+// 鏌ヨ缂撳瓨鍐呭
+export function getCacheValue(cacheName, cacheKey) {
+ return request({
+ url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey,
+ method: 'get'
+ })
+}
+
+// 娓呯悊鎸囧畾鍚嶇О缂撳瓨
+export function clearCacheName(cacheName) {
+ return request({
+ url: '/monitor/cache/clearCacheName/' + cacheName,
+ method: 'delete'
+ })
+}
+
+// 娓呯悊鎸囧畾閿悕缂撳瓨
+export function clearCacheKey(cacheName, cacheKey) {
+ return request({
+ url: '/monitor/cache/clearCacheKey/'+ cacheName + "/" + cacheKey,
+ method: 'delete'
+ })
+}
+
+// 娓呯悊鍏ㄩ儴缂撳瓨
+export function clearCacheAll() {
+ return request({
+ url: '/monitor/cache/clearCacheAll',
+ method: 'delete'
+ })
+}
diff --git a/ruoyi-ui/src/views/monitor/cache/list.vue b/ruoyi-ui/src/views/monitor/cache/list.vue
index a1e7955..94307ab 100644
--- a/ruoyi-ui/src/views/monitor/cache/list.vue
+++ b/ruoyi-ui/src/views/monitor/cache/list.vue
@@ -211,7 +211,7 @@
},
/** 娓呯悊鎸囧畾閿悕缂撳瓨 */
handleClearCacheKey(cacheKey) {
- clearCacheKey(cacheKey).then(response => {
+ clearCacheKey(this.nowCacheName, cacheKey).then(response => {
this.$modal.msgSuccess("娓呯悊缂撳瓨閿悕[" + cacheKey + "]鎴愬姛");
this.getCacheKeys();
});
--
Gitblit v1.9.3