Merge branch 'div_15'

yujian

2019-05-14 0328549f475f6a6326cd18958acbf7902eae5053

Merge branch 'div_15'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

 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用童趣装点人生emoji\r\n" + 
                "用童话描绘人生emoji\r\n" + 
                "用童心度过人生 emoji \r\n" + 
                "--------------------- \r\n今天 : 6月1日     ️  星期四\r\n" + 
                "天气 : 晴转多云   15-24℃\r\n" + 
                "各位亲爱的你      早安～\r\n" + 
                "购物省钱返利券App：【邀请链接】\r\n" + 
                "我的邀请码：【邀请码】" ;

		
        dynamicInfoService.insertInviteMaterial(content, null, null, null);

		
		
        String content2= "emoji六一儿童节来了\r\n" + 
                "老少儿童们到快活起来吧：用童真憧憬人生\r\n" + 
                "emoji用童趣装点人生emoji\r\n" + 
                "用童话描绘人生emoji\r\n" + 
                "用童心度过人生 emoji \r\n" + 
                "--------------------- \r\n今天 : 6月1日     ️  星期四\r\n" + 
                "天气 : 晴转多云   15-24℃\r\n" + 
                "各位亲爱的你      早安～\r\n" + 
                "购物省钱返利券App：【邀请链接】\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();

        }

    }

	
	
    /**

     * 清除缓存

     *