redis服务器配置信息查看完成

75752602 · Skyeye云 · 3c7b7a08 · 75752602 · 75752602 · 75752602
6 changed file
--- a/skyeye-service/src/main/java/com/skyeye/authority/service/impl/SysRedisMonitorServiceImpl.java
+++ b/skyeye-service/src/main/java/com/skyeye/authority/service/impl/SysRedisMonitorServiceImpl.java
@@ -41,6 +41,7 @@ public class SysRedisMonitorServiceImpl implements SysRedisMonitorService{
 		String info = jedisClient.getRedisInfo();
 		List<Map<String, Object>> beans = JSONArray.fromObject(info);
 		outputObject.setBeans(beans);
+		outputObject.settotal(beans.size());
 	}

 	/**

--- a/skyeye-service/src/main/java/com/skyeye/jedis/impl/JedisClientCluster.java
+++ b/skyeye-service/src/main/java/com/skyeye/jedis/impl/JedisClientCluster.java
@@ -118,6 +118,7 @@ public class JedisClientCluster implements JedisClient, JedisClientClusterServic
 					Client client = jedis.getClient();
 					client.info();
 					String info = client.getBulkReply();
+					jedis.close();
 					List<Map<String, Object>> ridList = new ArrayList<>();
 					Map<String, Object> redisMation = new HashMap<>();
 					String[] strs = info.split("\n");
@@ -140,8 +141,6 @@ public class JedisClientCluster implements JedisClient, JedisClientClusterServic
 			}
 			return JSONArray.fromObject(ridMationList).toString();
 		} finally {
-			// 返还到连接池
-			jedis.close();
 		}
 	}


--- a/skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css
+++ b/skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css
@@ -3008,6 +3008,11 @@ body .layer-ext-winconfirm {
    align-items: Center;
 }

+.padding-l-r-10{
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
 /* 样式1 */
 .iphone {
    box-shadow: inset 0 0 3px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px #999, 0 0 30px 0px rgba(0, 0, 0, 0.7);
@@ -3192,6 +3197,25 @@ body .layer-ext-winconfirm {

 /*** 小程序页面管理end ***/

+/*** 带滚动条的表格end ***/
+.custom-table tbody{
+	display:block;
+    height:400px;
+    overflow-y:scroll;
+    overflow-x: hidden; 
+}
+
+.custom-table thead,tbody tr{
+	display:table;
+    width:100%;
+    table-layout:fixed;
+}
+
+.custom-table thead{
+	width: calc(100% - 0.5em);
+}
+/*** 带滚动条的表格end ***/
+
 /*** 代码生成器样式start ***/
 .cm-s-eclipse{height: 100% !important;}
 .cm-s-eclipse span.cm-meta { color: #FF1717; }

--- a/skyeye-web/src/main/webapp/js/sysredis/redismonitorlist.js
+++ b/skyeye-web/src/main/webapp/js/sysredis/redismonitorlist.js
+
+layui.config({
+	base: basePath, 
+	version: skyeyeVersion
+}).define(['table', 'jquery', 'winui', 'form'], function (exports) {
+	
+	winui.renderColor();
+	var $ = layui.$,
+	form = layui.form,
+	table = layui.table;
+	
+	initRedieInfoMation();
+	
+	//redis服务器配置信息
+	function initRedieInfoMation(){
+		showGrid({
+		 	id: "bar",
+		 	url: reqBasePath + "redis001",
+		 	params: {},
+		 	pagination: false,
+		 	template: getFileContent('tpl/sysredis/redisTemplate.tpl'),
+		 	ajaxSendLoadBefore: function(hdb){},
+		 	ajaxSendAfter:function(json){
+	 			$("#bar tbody").scroll(function(){
+	 		        $("#bar tbody").scrollTop($(this).scrollTop());
+	 		    }); 
+		 	}
+	    });
+	}
+	
+	
+    exports('redismonitorlist', {});
+});
--- a/skyeye-web/src/main/webapp/tpl/sysredis/redisTemplate.tpl
+++ b/skyeye-web/src/main/webapp/tpl/sysredis/redisTemplate.tpl
+{{#each rows}}
+	<div class="layui-col-xs6 padding-l-r-10">
+		<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+			<legend>{{ip}}</legend>
+		</fieldset>
+		<table class="layui-table custom-table">
+			<thead>
+				<tr>
+					<th>键</th>
+					<th>值</th>
+				</tr>
+			</thead>
+			<tbody>
+				{{#each mation}}
+					<tr>
+						<td>{{key}}</td>
+						<td>{{value}}</td>
+					</tr>
+				{{/each}}
+			</tbody>
+		</table>
+	</div>
+{{/each}}
\ No newline at end of file
--- a/skyeye-web/src/main/webapp/tpl/sysredis/redismonitorlist.html
+++ b/skyeye-web/src/main/webapp/tpl/sysredis/redismonitorlist.html
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/font-awesome-4.7.0/css/font-awesome.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+	<div class="winui-tab" lay-filter="winuitab" style="height:100%">
+		<div class="winui-tab-left">
+			<div class="winui-tab-title">Redis服务器信息</div>
+			<div class="winui-scroll-y" style="height:auto;position:absolute;top:50px;bottom:0;">
+				<ul class="winui-tab-nav">
+					<li class="winui-this"><i class="fa fa-bar-chart fa-fw"></i>redis服务器信息</li>
+					<li><i class="fa fa-line-chart fa-fw"></i>Line</li>
+					<li><i class="fa fa-area-chart fa-fw"></i>Area</li>
+					<li><i class="fa fa-pie-chart fa-fw"></i>Pie</li>
+				</ul>
+			</div>
+		</div>
+		<div class="winui-tab-right">
+			<div class="winui-scroll-y">
+				<div class="winui-tab-content">
+					<div class="winui-tab-item layui-show">
+						<div id="bar" style="width:100%;height:100%;">
+							
+						</div>
+					</div>
+					<div class="winui-tab-item">
+						<div id="line" style="width:100%;height:100%;">2</div>
+					</div>
+					<div class="winui-tab-item">
+						<div id="area" style="width:100%;height:100%;">3</div>
+					</div>
+					<div class="winui-tab-item">
+						<div id="pie" style="width:100%;height:100%;">4</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/sysredis/'}).use('redismonitorlist');
+    </script>
+</body>
+</html>
\ No newline at end of file