From 07d0a24ad81abeb81fb81f2fab190fdca9770bed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 11:03:01 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 140 ++++++++++++++++++++++++++++++----------------
1 files changed, 92 insertions(+), 48 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 1724dc2..e292df4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -12,6 +12,9 @@
import java.util.UUID;
import javax.annotation.Resource;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
import javax.servlet.http.HttpServletRequest;
import org.jsoup.Jsoup;
@@ -71,13 +74,12 @@
private HelpCenterMapper helpCenterMapper;
@Resource
private Scheduler scheduler;
-
+
@Resource
private DynamicInfoService dynamicInfoService;
-
+
@Resource
- private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
+ private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
private EhCacheCacheManager ehCacheCacheManager;
@@ -85,12 +87,9 @@
@Resource
private ConfigService configService;
-
@Resource
private InviteMaterialService inviteMaterialService;
-
-
-
+
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
long startTime = System.currentTimeMillis();
@@ -125,9 +124,9 @@
long startDTime = System.currentTimeMillis();
/*
- * try { //ImageUtil.drawGoodsShareImg(new FileInputStream(new File(destPath)),
- * portrait, goods, shareImgPath); } catch (FileNotFoundException e) {
- * e.printStackTrace(); }
+ * try { //ImageUtil.drawGoodsShareImg(new FileInputStream(new
+ * File(destPath)), portrait, goods, shareImgPath); } catch
+ * (FileNotFoundException e) { e.printStackTrace(); }
*/
System.out.println(System.currentTimeMillis() - startDTime);
@@ -211,8 +210,7 @@
out.print("<script>yestv.finishPage();</script>");
out.close();
}
-
-
+
/**
* 娓呴櫎缂撳瓨
*
@@ -223,6 +221,11 @@
ehCacheCacheManager.getCacheManager().clearAll();
}
+ @RequestMapping(value = "removeRedisCache")
+ public void removeRedisCache(String key, PrintWriter out) {
+ redisManager.removeCommonString(key);
+ }
+
@RequestMapping(value = "testConfig")
public void getTestConfig(PrintWriter pw) {
pw.print(configService.get("test"));
@@ -230,45 +233,53 @@
@RequestMapping(value = "testDaTaoKe")
public void getTestDaTaoKe(PrintWriter pw) {
+ Document doc = null;
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] + "}");
+ doc = Jsoup.connect("http://www.dataoke.com/ddq").get();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+ Elements els = doc.getElementsByTag("script");
+ for (int i = 0; i < els.size(); i++) {
+ String content = els.get(i).html();
+ if (content.indexOf("var dataDef") > -1) {
+ ScriptEngineManager manager = new ScriptEngineManager();
+ ScriptEngine engine = manager.getEngineByName("javascript");
+ try {
+ String js = "function getData(){return JSON.stringify(dataDef);}" + content;
+ engine.eval(js);
+ if (engine instanceof Invocable) {
+ Invocable in = (Invocable) engine;
+ pw.print(in.invokeFunction("getData"));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
- } catch (IOException e) {
- e.printStackTrace();
}
}
-
- @RequestMapping(value = "insetDynamicInfoInvite")
- public void insetDynamicInfo(String content, String url,PrintWriter out) {
- dynamicInfoService.insertInviteMaterial(content, url, null, null);
- }
-
@RequestMapping(value = "insertShop")
public void insertShop(PrintWriter out) {
- try {
- dynamicInfoService.insertShopInfo();
- dynamicInfoService.insertTimeHotSale();
- dynamicInfoService.insertTimeRecommend();
+ try {
+ dynamicInfoService.insertShopInfo();
+ dynamicInfoService.insertTimeHotSale();
+ dynamicInfoService.insertTimeRecommend();
} catch (Exception e) {
e.printStackTrace();
}
}
-
+
/**
* 鎻掑叆閭�璇风礌鏉�
+ *
* @param out
*/
@RequestMapping(value = "uploadInviteMaterial")
public void uploadInviteMaterial(PrintWriter out) {
try {
List<InviteMaterial> list = new ArrayList<InviteMaterial>();
-
+
// 鍥剧墖鏂囦欢
File file = new File("E:\\Invite\\Picture");
File[] files = file.listFiles();
@@ -276,22 +287,22 @@
String name = filePic.getName();
String prefix = name.substring(name.lastIndexOf(".") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String filePath = "/resource/invite/everyday/" + UUID.randomUUID().toString().replace("-", "") + "." + prefix;
+ String filePath = "/resource/invite/everyday/" + UUID.randomUUID().toString().replace("-", "") + "."
+ + prefix;
String fileUrl = COSManager.getInstance().uploadFile(filePic, filePath).getUrl();
-
+
System.out.println("FileName:" + name);
- System.out.println("url:"+ fileUrl);
-
+ System.out.println("url:" + fileUrl);
+
InviteMaterial inviteMaterial = new InviteMaterial();
inviteMaterial.setState(0);
inviteMaterial.setPicture(fileUrl);
list.add(inviteMaterial);
}
-
List<String> listTxt = new ArrayList<String>();
- File textfile = new File("E:\\Invite\\content.txt");//Text鏂囦欢
+ File textfile = new File("E:\\Invite\\content.txt");// Text鏂囦欢
BufferedReader br = new BufferedReader(new FileReader(textfile));// 鏋勯�犱竴涓狟ufferedReader绫绘潵璇诲彇鏂囦欢
String s = "";
while ((s = br.readLine()) != null) {// 浣跨敤readLine鏂规硶锛屼竴娆¤涓�琛�
@@ -305,9 +316,9 @@
if (list.size() == 0 || listTxt.size() == 0 || listTxt.size() < list.size()) {
return;
}
-
+
for (int i = 0; i < list.size(); i++) {
- InviteMaterial invite = list.get(0);
+ InviteMaterial invite = list.get(i);
invite.setText(listTxt.get(i));
inviteMaterialService.insert(invite);
}
@@ -317,17 +328,17 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鎻掑叆閭�璇风礌鏉�
+ *
* @param out
*/
@RequestMapping(value = "uploadInviteMaterial2")
public void uploadInviteMaterial2(PrintWriter out) {
try {
List<InviteMaterial> list = new ArrayList<InviteMaterial>();
- File picfile = new File("E:\\Invite\\pic.txt");//Text鏂囦欢
+ File picfile = new File("E:\\Invite\\pic.txt");// Text鏂囦欢
BufferedReader brp = new BufferedReader(new FileReader(picfile));// 鏋勯�犱竴涓狟ufferedReader绫绘潵璇诲彇鏂囦欢
String fileUrl = "";
while ((fileUrl = brp.readLine()) != null) {// 浣跨敤readLine鏂规硶锛屼竴娆¤涓�琛�
@@ -335,15 +346,15 @@
continue;
}
InviteMaterial inviteMaterial = new InviteMaterial();
+ inviteMaterial.setId(UUID.randomUUID().toString().replace("-", ""));
inviteMaterial.setState(0);
inviteMaterial.setPicture(fileUrl);
list.add(inviteMaterial);
}
brp.close();
-
-
+
List<String> listTxt = new ArrayList<String>();
- File textfile = new File("E:\\Invite\\content.txt");//Text鏂囦欢
+ File textfile = new File("E:\\Invite\\content.txt");// Text鏂囦欢
BufferedReader br = new BufferedReader(new FileReader(textfile));// 鏋勯�犱竴涓狟ufferedReader绫绘潵璇诲彇鏂囦欢
String s = "";
while ((s = br.readLine()) != null) {// 浣跨敤readLine鏂规硶锛屼竴娆¤涓�琛�
@@ -357,9 +368,9 @@
if (list.size() == 0 || listTxt.size() == 0 || listTxt.size() < list.size()) {
return;
}
-
+
for (int i = 0; i < list.size(); i++) {
- InviteMaterial invite = list.get(0);
+ InviteMaterial invite = list.get(i);
invite.setText(listTxt.get(i));
inviteMaterialService.insert(invite);
}
@@ -369,4 +380,37 @@
e.printStackTrace();
}
}
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "saveInvite")
+ public void saveInvite(InviteMaterial inviteMaterial, PrintWriter out) {
+ try {
+ inviteMaterial.setState(0);
+ inviteMaterialService.insert(inviteMaterial);
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("涓婁紶澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "insertTimeInvite")
+ public void insertTimeInvite(PrintWriter out) {
+ try {
+ dynamicInfoService.insertTimeInvite();
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0