From 0e39f6fa2d67de9d956f3e043f68b7bd7a030db2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 17:55:02 +0800
Subject: [PATCH] remove 移除部署脚本 使用idea功能替代
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 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 c1575ae..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
@@ -3,9 +3,11 @@
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;
@@ -14,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 缂撳瓨鐩戞帶
@@ -32,12 +35,13 @@
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, "瀵嗙爜閿欒娆℃暟"));
}
/**
@@ -86,9 +90,16 @@
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getKeys/{cacheName}")
public R<Collection<String>> getCacheKeys(@PathVariable String cacheName) {
- Iterable<String> iterable = RedisUtils.getClient().getKeys().getKeysByPattern(cacheName + "*");
- Collection<String> cacheKyes = CollUtil.toCollection(iterable);
- return R.ok(cacheKyes);
+ 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.getClient().getKeys().deleteByPattern(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();
}
@@ -135,8 +159,11 @@
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheAll")
public R<Void> clearCacheAll() {
- RedisUtils.getClient().getKeys().deleteByPattern("*");
+ RedisUtils.deleteKeys("*");
return R.ok();
}
+ private boolean isCacheNames(String cacheName) {
+ return !StringUtils.contains(cacheName, ":");
+ }
}
--
Gitblit v1.9.3