Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git...

Administrator

2018-10-30 510ada3ccff31a61dd85c534f9d3a0abb7a36c20

Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git into dev1

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -1374,7 +1374,7 @@
            Map<String, String> map = hongBaoManageService.convertMap();

            String proportion = map.get("hongbao_goods_proportion");

            String fcRate = map.get("hongbao_fc_ratio");

            if (!StringUtil.isNullOrEmpty(imei) || StringUtil.isNullOrEmpty(idfa)) {

            if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {

                TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);

                if (result != null && result.getTaoBaoGoodsBriefs() != null) {

                    // 筛选


 fanli/src/main/java/com/yeshi/fanli/job/TestJob.java

@@ -1,24 +1,11 @@
package com.yeshi.fanli.job;



import javax.annotation.Resource;

import org.springframework.stereotype.Component;



import org.quartz.Job;

import org.quartz.JobExecutionContext;

import org.quartz.JobExecutionException;

@Component

public class TestJob {



import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;



//从淘宝爬去订单更新

public class TestJob implements Job {



    @Resource

    private ConfigService configService;



    @Override

    public void execute(JobExecutionContext arg0) throws JobExecutionException {

        System.out.println("执行任务");

        LogHelper.test("-执行任务-");

        configService.get("123");

    public TestJob() {

        System.out.println("TestJob");

    }

}


 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -14,9 +14,9 @@
    public static boolean IS_TASK = false;



    // 外网环境

    public static boolean IS_OUTNET = false;

    public static boolean IS_OUTNET = true;



    public static boolean IS_TEST = true;

    public static boolean IS_TEST = false;



    public static int PAGE_SIZE = 20;

    public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 微信任务类型编号


 fanli/src/main/resource/druid.properties

@@ -1,13 +1,25 @@
druid.driverClassName=com.mysql.jdbc.Driver

#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan

#druid.url=jdbc:mysql://127.0.0.1:3306/ec_quan

#本地测试

druid.url=jdbc:mysql://127.0.0.1:3306/ec_quan

druid.username=root

druid.password=Yeshi2016@

druid.password=hexiaohui



#外网正式

#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

#druid.username=root

#druid.password=Yeshi2016@



#外网本地测试

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan

#druid.username=root

#druid.password=Yeshi2016@











#druid.username=root

#druid.password=hexiaohui

druid.password=hexiaohui

#Yeshi2016@

druid.initialSize=10

druid.minIdle=6


 fanli/src/main/webapp/WEB-INF/spitter-servlet.xml

@@ -15,7 +15,8 @@
        ">



    <!-- 启动自动扫描该包下所有的Bean(例如@Controller) -->

    <context:component-scan base-package="com" />



    <context:component-scan base-package="com.yeshi.fanli.controller" />



    <!-- 定义视图解析器 -->

    <bean


 fanli/src/test/java/org/fanli/AppTest.java

@@ -1,7 +1,5 @@
package org.fanli;



import org.yeshi.utils.CMQUtil;



import junit.framework.Test;

import junit.framework.TestCase;

import junit.framework.TestSuite;

@@ -32,6 +30,6 @@
     */

    public void testApp() {

        assertTrue(true);

        CMQUtil.getInstance(null, null);

	
    }

}


 fanli/src/test/java/org/fanli/TaoKeTest.java

New file
@@ -0,0 +1,25 @@
package org.fanli;



import org.junit.Test;



import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



public class TaoKeTest {



    @Test

    public void test1() {

        TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 20, "", "A12CD85A-95B3-42B2-A042-5B42BF1A7094");

        System.out.println(result);

    }



    @Test

    public void test2() {

        System.out.println("测试合并");

    }



    @Test

    public void test3() {

        System.out.println("测试合并222");

    }

}