From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 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 fc51d6f..ab3dd74 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -38,6 +38,8 @@
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.Constant;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -63,6 +65,13 @@
private HelpCenterMapper helpCenterMapper;
@Resource
private Scheduler scheduler;
+
+ @Resource
+ private DynamicInfoService dynamicInfoService;
+
+ @Resource
+ private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
+
@Resource
private EhCacheCacheManager ehCacheCacheManager;
@@ -104,9 +113,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);
@@ -190,7 +199,8 @@
out.print("<script>yestv.finishPage();</script>");
out.close();
}
-
+
+
/**
* 娓呴櫎缂撳瓨
*
@@ -216,10 +226,52 @@
pw.print(els.get(i).html().replace("var brandData =", "").trim().split("};")[0] + "}");
}
}
-
} catch (IOException e) {
e.printStackTrace();
}
-
}
+
+ @RequestMapping(value = "insetDynamicInfo")
+ public void insetDynamicInfo(PrintWriter out) {
+ String content= "emoji鍏竴鍎跨鑺傛潵浜哱r\n" +
+ "鑰佸皯鍎跨浠埌蹇椿璧锋潵鍚э細鐢ㄧ鐪熸啩鎲汉鐢焅r\n" +
+ "emoji鐢ㄧ瓒ｈ鐐逛汉鐢焑moji\r\n" +
+ "鐢ㄧ璇濇弿缁樹汉鐢焑moji\r\n" +
+ "鐢ㄧ蹇冨害杩囦汉鐢� emoji \r\n" +
+ "--------------------- \r\n浠婂ぉ : 6鏈�1鏃� 锔� 鏄熸湡鍥沑r\n" +
+ "澶╂皵 : 鏅磋浆澶氫簯 15-24鈩僜r\n" +
+ "鍚勪綅浜茬埍鐨勪綘 鏃╁畨锝瀄r\n" +
+ "璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ�慭r\n" +
+ "鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆�" ;
+
+ dynamicInfoService.insertInviteMaterial(content, null, null, null);
+
+
+ String content2= "emoji鍏竴鍎跨鑺傛潵浜哱r\n" +
+ "鑰佸皯鍎跨浠埌蹇椿璧锋潵鍚э細鐢ㄧ鐪熸啩鎲汉鐢焅r\n" +
+ "emoji鐢ㄧ瓒ｈ鐐逛汉鐢焑moji\r\n" +
+ "鐢ㄧ璇濇弿缁樹汉鐢焑moji\r\n" +
+ "鐢ㄧ蹇冨害杩囦汉鐢� emoji \r\n" +
+ "--------------------- \r\n浠婂ぉ : 6鏈�1鏃� 锔� 鏄熸湡鍥沑r\n" +
+ "澶╂皵 : 鏅磋浆澶氫簯 15-24鈩僜r\n" +
+ "鍚勪綅浜茬埍鐨勪綘 鏃╁畨锝瀄r\n" +
+ "璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ�慭r\n" +
+ "鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆�" ;
+
+ dynamicInfoService.insertInviteMaterial(content2, "http://ec-1255749512.file.myqcloud.com/img/invite/53420a05de1644bd947fa23800ab0131.jpeg", null, null);
+ }
+
+
+ @RequestMapping(value = "insertShop")
+ public void insertShop(PrintWriter out) {
+ try {
+ dynamicInfoService.insertShopInfo();
+ dynamicInfoService.insertTimeHotSale();
+ dynamicInfoService.insertTimeRecommend();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
}
--
Gitblit v1.8.0