From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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 c144ab7..794c422 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.math.BigDecimal;
@@ -10,9 +11,13 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.select.Elements;
import org.quartz.JobExecutionContext;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.HttpUtil;
@@ -32,6 +37,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -57,6 +63,12 @@
private HelpCenterMapper helpCenterMapper;
@Resource
private Scheduler scheduler;
+
+ @Resource
+ private EhCacheCacheManager ehCacheCacheManager;
+
+ @Resource
+ private ConfigService configService;
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -115,7 +127,7 @@
@RequestMapping(value = "testactivity")
public void test2(PrintWriter out) {
List<RecommendActivity> list = activityService.getRecommendActivityList(1, Constant.PAGE_SIZE);
- long count = activityService.getRecommendActivityCount();
+ long count = activityService.getRecommendActivityCount(null);
JSONObject data = new JSONObject();
data.put("data", getGson().toJson(list));
data.put("count", count);
@@ -172,10 +184,41 @@
e.printStackTrace();
}
}
-
+
@RequestMapping(value = "testhtml")
public void testhtml(PrintWriter out) {
out.print("<script>yestv.finishPage();</script>");
out.close();
}
+
+ /**
+ * 娓呴櫎缂撳瓨
+ *
+ * @param out
+ */
+ @RequestMapping(value = "removeCache")
+ public void removeCache(PrintWriter out) {
+ ehCacheCacheManager.getCacheManager().clearAll();
+ }
+
+ @RequestMapping(value = "testConfig")
+ public void getTestConfig(PrintWriter pw) {
+ pw.print(configService.get("test"));
+ }
+
+ @RequestMapping(value = "testDaTaoKe")
+ public void getTestDaTaoKe(PrintWriter pw) {
+ try {
+ Document doc = Jsoup.connect("http://www.dataoke.com/brandFeature").get();
+ Elements els = doc.getElementsByTag("script");
+ for (int i = 0; i < els.size(); i++) {
+ if (els.get(i).html().contains("var brandData")) {
+ pw.print(els.get(i).html().replace("var brandData =", "").trim().split("};")[0] + "}");
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
}
--
Gitblit v1.8.0