From f6ce3fd74c60cb204372b01bc68467c0ed180da7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 15:25:44 +0800
Subject: [PATCH] Merge branch 'master_develop' into div_develop
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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 348de81..c1e14c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -6,7 +6,6 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -18,6 +17,7 @@
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;
@@ -28,30 +28,22 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
-import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.entity.dynamic.DynamicInfo;
-import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
-import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
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.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.util.BeanUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.db.MongoDBManager;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -80,6 +72,12 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
+
+ @Resource
+ private EhCacheCacheManager ehCacheCacheManager;
+
+ @Resource
+ private ConfigService configService;
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -202,7 +200,6 @@
out.close();
}
-
@RequestMapping(value = "insetDynamicInfo")
public void insetDynamicInfo(PrintWriter out) {
String content= "emoji鍏竴鍎跨鑺傛潵浜哱r\n" +
@@ -216,7 +213,7 @@
"璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ�慭r\n" +
"鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆�" ;
- dynamicInfoService.insertInviteMaterial(content, null);
+ dynamicInfoService.insertInviteMaterial(content, null, null, null);
String content2= "emoji鍏竴鍎跨鑺傛潵浜哱r\n" +
@@ -230,7 +227,7 @@
"璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ�慭r\n" +
"鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆�" ;
- dynamicInfoService.insertInviteMaterial(content2, "http://ec-1255749512.file.myqcloud.com/img/invite/53420a05de1644bd947fa23800ab0131.jpeg");
+ dynamicInfoService.insertInviteMaterial(content2, "http://ec-1255749512.file.myqcloud.com/img/invite/53420a05de1644bd947fa23800ab0131.jpeg", null, null);
}
@@ -246,4 +243,35 @@
}
+ /**
+ * 娓呴櫎缂撳瓨
+ *
+ * @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