From 3dedb52664dfa4101589698db52ea9cb9493efa9 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:53:53 +0800
Subject: [PATCH] Merge branch 'div-new' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index d4a296d..f218bf3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -5,7 +5,6 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
@@ -450,8 +449,17 @@
if (goods == null)
out.println("鍟嗗搧宸蹭笅鏋�");
else
- out.println("<html><head><meta charset=utf-8></head><body>"
- + String.format("cat_name:%s <br> cat_leaf_name:%s", goods.getRootCategoryName(), goods.getLeafName())
- + "</body></html>");
+ out.println(
+ "<html><head><meta charset=utf-8></head><body>" + String.format("cat_name:%s <br> cat_leaf_name:%s",
+ goods.getRootCategoryName(), goods.getLeafName()) + "</body></html>");
+ }
+
+ @RequestMapping("getJedisInfo")
+ public void getJedisInfo(PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("active", jedisPool.getNumActive());
+ data.put("idle", jedisPool.getNumIdle());
+ data.put("waiters", jedisPool.getNumWaiters());
+ out.print(data.toString());
}
}
--
Gitblit v1.8.0