From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 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 8764e7b..a7913e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -18,6 +18,7 @@
 import javax.script.ScriptEngineManager;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
@@ -43,6 +44,8 @@
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.LogManager;
+import com.yeshi.fanli.log.LogType;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
@@ -203,7 +206,7 @@
 
 	@RequestMapping(value = "testConfig")
 	public void getTestConfig(PrintWriter pw) {
-		pw.print(configService.get("test"));
+		pw.print(configService.getValue("test", SystemEnum.blks));
 	}
 
 	@RequestMapping(value = "testDaTaoKe")
@@ -318,7 +321,7 @@
 			e.printStackTrace();
 		}
 	}
-
+
 	@RequestMapping(value = "getWaitingThreadsCount")
 	public void getWaitingThreadsCount(PrintWriter out) {
 		out.print(Constant.waitingThreadSet.size());
@@ -327,7 +330,7 @@
 	@RequestMapping(value = "getBinFaRedisKey")
 	public void getPinFaRedisKey(PrintWriter out) {
 		JSONArray array = new JSONArray();
-		Jedis jedis = jedisPool.getResource();
+		Jedis jedis = redisManager.getJedis();
 		try {
 			Set<String> sets = jedis.keys("rs-*");
 			for (Iterator<String> its = sets.iterator(); its.hasNext();)
@@ -412,9 +415,10 @@
 		data.put("waiters", jedisPool.getNumWaiters());
 		out.print(data.toString());
 	}
-	
-	
-	
-	
-	
+
+	@RequestMapping("log")
+	public void log(PrintWriter out) {
+		LogManager.getLogger(LogType.taobaoAuth).info("123123123");
+	}
+
 }

--
Gitblit v1.8.0