Authored by chenjian

Merge branch '通过Kafak获取数据上报' of http://git.yoho.cn/yoho30/yohobuy-union into 通过Kafak获取数据上报

# Conflicts:
#	web/src/test/java/com/test/KafakTest.java
package com.test;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.test.context.ContextConfiguration;
import org.junit.Test;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
/**
* Created by yoho on 2017/4/17.
*/
@RunWith(SpringJUnit4ClassRunner.class)
@WebAppConfiguration
@ContextConfiguration(locations = {"classpath*:META-INF/spring/mybatis-datasource.xml", "classpath*:META-INF/spring/spring*.xml"})
public class KafakTest {
... ...