Merge branch 'master' into feature/junit_test

# Conflicts:
#	pom.xml
#	src/main/java/cn/quantgroup/xyqb/Bootstrap.java

提交单元测试用例

pom.xml

@@ -256,11 +256,6 @@
             <version>0.0.5</version>
             <scope>compile</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>cn.quantgroup</groupId>-->
-        <!--<artifactId>quantgroup-config-sdk</artifactId>-->
-        <!--<version>1.0.3-SNAPSHOT</version>-->
-        <!--</dependency>-->
 
         <!-- motan -->
         <dependency>

src/main/java/cn/quantgroup/xyqb/Bootstrap.java

 package cn.quantgroup.xyqb;
 
 import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
-import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
 import com.weibo.api.motan.common.MotanConstants;
 import com.weibo.api.motan.util.MotanSwitcherUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +13,6 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.scheduling.annotation.EnableAsync;
 import cn.quantgroup.tech.shutdown.DefaultSignalHandler;
@@ -24,7 +22,7 @@ import sun.misc.Signal;
 @EnableAutoConfiguration
 @SpringBootApplication
 @EnableCaching
-@EnableApolloConfig
+@EnableApolloConfig(value ={"application", "tech.msg.sdk", "tech.sleuth", "tech.common", "tech.service.urls", "cash.common"})
 @Configuration
 @EnableAspectJAutoProxy
 @EnableAsync
@@ -33,7 +31,6 @@ public class Bootstrap {
 
     public static void main(String[] args) {
         SpringApplication springApplication = new SpringApplication(Bootstrap.class);
-        springApplication.addInitializers(new ApolloPropertySourceInitializer("application", "tech.msg.sdk", "tech.sleuth", "tech.common", "cash.common"));
         springApplication.addListeners(new ApplicationListener<ContextRefreshedEvent>() {
             @Override
             public void onApplicationEvent(ContextRefreshedEvent event) {

src/main/resources/META-INF/app.properties

 app.id=xyqb-user2
-namespace=application
+namespace=application,tech.msg.sdk,tech.sleuth,tech.common,tech.service.urls,cash.common
\ No newline at end of file

src/test/java/user/TestUserLogin.java

@@ -6,14 +6,10 @@ import cn.quantgroup.xyqb.controller.external.user.InnerController;
 import cn.quantgroup.xyqb.controller.internal.user.UserController;
 import cn.quantgroup.xyqb.model.AuthBean;
 import cn.quantgroup.xyqb.model.JsonResult;
-import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
-import com.weibo.api.motan.common.MotanConstants;
-import com.weibo.api.motan.util.MotanSwitcherUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -24,14 +20,9 @@ import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
 
 
 import java.io.IOException;

src/test/java/userService/TestUserService.java

 package userService;
 
 import cn.quantgroup.xyqb.Bootstrap;
-import cn.quantgroup.xyqb.controller.internal.user.UserController;
 import cn.quantgroup.xyqb.entity.Address;
-import cn.quantgroup.xyqb.entity.Contact;
 import cn.quantgroup.xyqb.service.user.IAddressService;
 import cn.quantgroup.xyqb.service.user.IContactService;
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
+import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestContextManager;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Collection;
@@ -34,6 +29,7 @@ import java.util.List;
 /**
  * Created by xuran on 2017/12/26.
  */
+@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
 @SpringBootTest(classes = Bootstrap.class )
 @Slf4j
 @Rollback