From b70cd48a7295356dc392357e6eb76002bf29771b Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:38:00 +0800
Subject: [PATCH] Merge branch 'div_16'

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 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 d3bd793..10d7243 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -200,6 +200,49 @@
 		out.close();
 	}
 
+	@RequestMapping(value = "insetDynamicInfo")
+	public void insetDynamicInfo(PrintWriter out) {
+		String content= "emoji鍏竴鍎跨鑺傛潵浜哱r\n" + 
+				"鑰佸皯鍎跨浠埌蹇椿璧锋潵鍚э細鐢ㄧ鐪熸啩鎲汉鐢焅r\n" + 
+				"emoji鐢ㄧ瓒h鐐逛汉鐢焑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鐢ㄧ瓒h鐐逛汉鐢焑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();
+		}
+	}
+	
+	
 	/**
 	 * 娓呴櫎缂撳瓨
 	 * 
@@ -228,7 +271,6 @@
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-
 	}
 	
 	@RequestMapping(value = "insetDynamicInfo")

--
Gitblit v1.8.0