Merge branch 'div_13'

yujian

2019-05-14 43f0aa96ce329a23145d5e58abe912907b55fc68

Merge branch 'div_13'

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

 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);



@@ -221,4 +230,48 @@
        }



    }

	
    @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);

		
		
        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");

    }



	
    @RequestMapping(value = "insertShop")

    public void insertShop(PrintWriter out) {

        try {

            dynamicInfoService.insertShopInfo();

            dynamicInfoService.insertTimeHotSale();

            dynamicInfoService.insertTimeRecommend();

        } catch (Exception e) {

            e.printStackTrace();

        }

    }

	
	
}