From be7766b5f0dec84d537af9811e50f46ab3dfdb2a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 10:03:56 +0800
Subject: [PATCH] update 同步ruoyi
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 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 b394412..26e62be 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,13 +3,14 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.constant.CacheConstants;
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.RedisUtils;
+import com.ruoyi.oss.constant.OssConstant;
import com.ruoyi.system.domain.SysCache;
-import io.swagger.v3.oas.annotations.tags.Tag;
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.*;
@@ -19,13 +20,12 @@
*
* @author Lion Li
*/
-@Tag(name ="缂撳瓨鐩戞帶", description = "缂撳瓨鐩戞帶绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/cache")
public class CacheController {
- private final RedisTemplate<String, String> redisTemplate;
+ private final RedissonConnectionFactory connectionFactory;
private final static List<SysCache> CACHES = new ArrayList<>();
@@ -38,14 +38,20 @@
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(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
}
+ /**
+ * 鑾峰彇缂撳瓨鐩戞帶鍒楄〃
+ */
@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);
@@ -65,47 +71,72 @@
return R.ok(result);
}
+ /**
+ * 鑾峰彇缂撳瓨鐩戞帶缂撳瓨鍚嶅垪琛�
+ */
@SaCheckPermission("monitor:cache:list")
@GetMapping("/getNames")
public R<List<SysCache>> cache() {
return R.ok(CACHES);
}
+ /**
+ * 鑾峰彇缂撳瓨鐩戞帶Key鍒楄〃
+ *
+ * @param cacheName 缂撳瓨鍚�
+ */
@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 = RedisUtils.keys(cacheName + "*");
+ return R.ok(cacheKeys);
}
+ /**
+ * 鑾峰彇缂撳瓨鐩戞帶缂撳瓨鍊艰鎯�
+ *
+ * @param cacheName 缂撳瓨鍚�
+ * @param cacheKey 缂撳瓨key
+ */
@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 = RedisUtils.getCacheObject(cacheKey);
+ SysCache sysCache = new SysCache(cacheName, cacheKey, JsonUtils.toJsonString(cacheValue));
return R.ok(sysCache);
}
+ /**
+ * 娓呯悊缂撳瓨鐩戞帶缂撳瓨鍚�
+ *
+ * @param cacheName 缂撳瓨鍚�
+ */
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheName/{cacheName}")
public R<Void> clearCacheName(@PathVariable String cacheName) {
- Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
- redisTemplate.delete(cacheKeys);
+ RedisUtils.deleteKeys(cacheName + "*");
return R.ok();
}
+ /**
+ * 娓呯悊缂撳瓨鐩戞帶Key
+ *
+ * @param cacheKey key鍚�
+ */
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheKey/{cacheKey}")
public R<Void> clearCacheKey(@PathVariable String cacheKey) {
- redisTemplate.delete(cacheKey);
+ RedisUtils.deleteObject(cacheKey);
return R.ok();
}
+ /**
+ * 娓呯悊鍏ㄩ儴缂撳瓨鐩戞帶
+ */
@SaCheckPermission("monitor:cache:list")
@DeleteMapping("/clearCacheAll")
public R<Void> clearCacheAll() {
- Collection<String> cacheKeys = redisTemplate.keys("*");
- redisTemplate.delete(cacheKeys);
+ RedisUtils.deleteKeys("*");
return R.ok();
}
--
Gitblit v1.9.3