From 5f0481c0676f03586db080a0f80448624ad0b8c9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 18 三月 2022 01:53:38 +0800
Subject: [PATCH] !157 修复执行"查询当前数据库类型"后未关闭数据库链接，导致当前连接池中活跃连接数达到最大连接数的bug Merge pull request !157 from KonBAI/close_dataSource_conn
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 6bbb96e..21fbd20 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,7 +1,7 @@
package com.ruoyi.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,7 +31,7 @@
@ApiOperation("鑾峰彇缂撳瓨鐩戞帶璇︾粏淇℃伅")
@SaCheckPermission("monitor:cache:list")
@GetMapping()
- public AjaxResult<Map<String, Object>> getInfo() throws Exception {
+ 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);
@@ -51,6 +51,6 @@
});
}
result.put("commandStats", pieList);
- return AjaxResult.success(result);
+ return R.ok(result);
}
}
--
Gitblit v1.9.3