Merge branch 'feature/apollo' into feature/junit_test

# Conflicts:
#	src/main/resources/config/test/logback.xml

pom.xml

@@ -225,12 +225,16 @@
             <artifactId>poi</artifactId>
             <version>3.10-FINAL</version>
         </dependency>
-
         <dependency>
-            <groupId>cn.quantgroup</groupId>
-            <artifactId>quantgroup-config-sdk</artifactId>
-            <version>1.0.3-SNAPSHOT</version>
+            <groupId>com.ctrip.framework.apollo</groupId>
+            <artifactId>apollo-client</artifactId>
+            <version>0.10.0</version>
         </dependency>
+        <!--<dependency>-->
+        <!--<groupId>cn.quantgroup</groupId>-->
+        <!--<artifactId>quantgroup-config-sdk</artifactId>-->
+        <!--<version>1.0.3-SNAPSHOT</version>-->
+        <!--</dependency>-->
 
         <!-- motan -->
         <dependency>
@@ -303,8 +307,11 @@
             <artifactId>spring-security-web</artifactId>
             <version>${org.springframework.security.version}</version>
         </dependency>
-        <!-- 兼容旧 Spring Session 配置-->
-
+        <dependency>
+            <groupId>cn.quantgroup</groupId>
+            <artifactId>quantgroup-sms-sdk</artifactId>
+            <version>3.0</version>
+        </dependency>
 
     </dependencies>
 
@@ -330,13 +337,6 @@
             <properties>
                 <profiles.activation>product</profiles.activation>
             </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>cn.quantgroup</groupId>
-                    <artifactId>quantgroup-sms-sdk</artifactId>
-                    <version>2.0.0</version>
-                </dependency>
-            </dependencies>
             <build>
                 <resources>
                     <resource>
@@ -352,14 +352,6 @@
             <properties>
                 <profiles.activation>dev</profiles.activation>
             </properties>
-            <dependencies>
-
-                <dependency>
-                    <groupId>cn.quantgroup</groupId>
-                    <artifactId>quantgroup-sms-sdk</artifactId>
-                    <version>2.0.0.3-SNAPSHOT</version>
-                </dependency>
-            </dependencies>
             <build>
                 <resources>
                     <resource>
@@ -374,9 +366,9 @@
             <id>test</id>
             <properties>
                 <profiles.activation>test</profiles.activation>
+
             </properties>
             <dependencies>
-
                 <dependency>
                     <groupId>cn.quantgroup</groupId>
                     <artifactId>quantgroup-sms-sdk</artifactId>

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;
@@ -15,28 +17,33 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-@ComponentScan(basePackages = {"cn.quantgroup.xyqb", "cn.quantgroup.cloudconfig"})
+@ComponentScan(basePackages = {"cn.quantgroup.sms", "cn.quantgroup.xyqb"})
+
 @EnableAutoConfiguration
 @SpringBootApplication
-@PropertySource(value = {"classpath:application.properties", "classpath:xyqb.properties"}, ignoreResourceNotFound = true)
 @EnableCaching
+//@EnableApolloConfig({"application", "tech.msg.sdk", "cash.common"})
+@EnableApolloConfig
+@PropertySource(value = {"classpath:application.properties", "classpath:xyqb.properties"}, ignoreResourceNotFound = true)
 @Configuration
 @EnableAspectJAutoProxy
 @EnableAsync
 @Slf4j
 public class Bootstrap {
 
-  public static void main(String[] args) {
-    SpringApplication springApplication = new SpringApplication(Bootstrap.class);
-    springApplication.addListeners(new ApplicationListener<ContextRefreshedEvent>() {
-      @Override
-      public void onApplicationEvent(ContextRefreshedEvent event) {
-        MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true);
-        log.info("注册zookeeper成功");
-      }
-    });
-    springApplication.setRegisterShutdownHook(true);
-    springApplication.run(args);
-    log.info("server start...");
-  }
+    public static void main(String[] args) {
+        SpringApplication springApplication = new SpringApplication(Bootstrap.class);
+        springApplication.addInitializers(new ApolloPropertySourceInitializer("application", "tech.msg.sdk", "cash.common"));
+
+        springApplication.addListeners(new ApplicationListener<ContextRefreshedEvent>() {
+            @Override
+            public void onApplicationEvent(ContextRefreshedEvent event) {
+                MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true);
+                log.info("注册zookeeper成功");
+            }
+        });
+        springApplication.setRegisterShutdownHook(true);
+        springApplication.run(args);
+        log.info("server start...");
+    }
 }

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaFiniteValidateAdvisor.java

@@ -84,7 +84,7 @@ public class CaptchaFiniteValidateAdvisor {
     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
     Map<String, String> phonePasswordMap = getHeaderParam(request);
     if(phonePasswordMap == null || phonePasswordMap.isEmpty()){
-      return false;
+      return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
     }
     // 当前用户手机号
     String phoneNo = phonePasswordMap.get("phoneNo");

src/main/java/cn/quantgroup/xyqb/config/data/JpaConfig.java

@@ -4,7 +4,6 @@ package cn.quantgroup.xyqb.config.data;
  * Created by Miraculous on 2016/11/16.
  */
 
-import cn.quantgroup.cloudconfig.SafeValue;
 import cn.quantgroup.xyqb.util.ApplicationContextHolder;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
@@ -33,13 +32,13 @@ import java.util.Properties;
 @EnableTransactionManagement
 public class JpaConfig {
 
-  @SafeValue("xyqb.data.mysql.jdbc-url")
+  @Value("${xyqb.data.mysql.jdbc-url}")
   private String xyqbJdbcUrl;
 
-  @SafeValue("xyqb.data.mysql.password")
+  @Value("${xyqb.data.mysql.password}")
   private String password;
 
-  @SafeValue("xyqb.data.mysql.user")
+  @Value("${xyqb.data.mysql.user}")
   private String user;
 
   @Value("${xyqb.data.mysql.max-pool-size}")

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -716,7 +716,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     context.setChannelId(null);
     context.setCreatedFrom(user.getRegisteredFrom());
     context.setAppChannel("");
-    if(user.getRegisteredFrom() == 222L) {
+    if(Objects.equals(user.getRegisteredFrom(), 222L)) {
       UserBtRegister userBtRegister =null;
       try{
         userBtRegister=userBtRegisterService.findByUserId(user.getId());

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

@@ -102,7 +102,7 @@ public class AuthInfoController implements IBaseController {
     context.setChannelId(null);
     context.setCreatedFrom(user.getRegisteredFrom());
     context.setAppChannel("");
-    if(user.getRegisteredFrom() == 222L) {
+    if(Objects.equals(user.getRegisteredFrom(), 222L)) {
       UserBtRegister userBtRegister =null;
       try{
         userBtRegister=userBtRegisterService.findByUserId(user.getId());

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -42,6 +42,7 @@ import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Http服务接口：用户注册、登录、重置密码
@@ -465,12 +466,10 @@ public class UserController implements IBaseController {
     WechatUserInfo userInfo = wechatService.findWechatUserInfoFromDb(openId);
     LOGGER.info("微信关联openId,user:[{}],openId:[{}],wechatUserInfo:[{}]",user,openId,userInfo);
 
-    // 已经绑定过了
-    if (userInfo != null && StringUtils.isNotEmpty(userInfo.getPhoneNo())) {
-      return JsonResult.buildSuccessResult(null, null);
+    if (Objects.isNull(userInfo) && !Objects.isNull(userId)) {
+      userInfo = wechatService.queryOpenIdByUserId(userId);
     }
-    // 前置绑定微信出错
-    if (userInfo == null) {
+    if (userInfo == null || StringUtils.isNotEmpty(userInfo.getPhoneNo())) {
       return JsonResult.buildSuccessResult(null, null);
     }
     // 未绑定信用钱包用户

src/main/java/cn/quantgroup/xyqb/filter/CrosFilter.java

@@ -18,8 +18,8 @@ import java.util.Set;
  * 支持跨域
  */
 @Component
-@Order(Ordered.HIGHEST_PRECEDENCE)
 @Configuration
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class CrosFilter implements Filter {
 
   private static final Set<String> DISALLOWED_METHOD = new HashSet<>();

src/main/java/cn/quantgroup/xyqb/service/register/handler/impl/BaseUserRegisterHandler.java

@@ -17,6 +17,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -60,11 +61,11 @@ public class BaseUserRegisterHandler extends AbstractUserRegisterHandler {
         user.setEnable(true);
         user.setPhoneNo(userRegisterParam.getPhoneNo());
         Long registerFrom = userRegisterParam.getRegisterFrom();
-        if (null == registerFrom) {
+        if (Objects.isNull(registerFrom)) {
             registerFrom = 1L;
         }
         Long channelId = userRegisterParam.getChannelId();
-        if (channelId == 222L) {
+        if (Objects.equals(channelId, 222L)) {
             user.setRegisteredFrom(channelId);
         } else {
             user.setRegisteredFrom(registerFrom);

src/main/java/cn/quantgroup/xyqb/service/register/handler/impl/BtUserRegisterHandler.java

@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
+import java.util.Objects;
 
 /**
  * Created by liqing on 2017/12/4 0004.
@@ -31,7 +32,7 @@ public class BtUserRegisterHandler extends AbstractUserRegisterHandler {
         Long channelId = userRegisterParam.getChannelId();
         User user = userRegisterParam.getUser();
         Long btRegisterChannelId = userRegisterParam.getBtRegisterChannelId();
-        if(null != user && channelId == 222L){
+        if(!Objects.isNull(user) && Objects.equals(channelId, 222L)){
             UserBtRegister userBtRegister = new UserBtRegister();
             userBtRegister.setUserId(user.getId());
             if(null == btRegisterChannelId){
@@ -45,7 +46,7 @@ public class BtUserRegisterHandler extends AbstractUserRegisterHandler {
             userBtRegister.setUpdatedAt(currentTime);
             userBtRegisterService.save(userBtRegister);
         }
-        if (successor != null){
+        if (!Objects.isNull(successor)){
             return successor.handleRegister(userRegisterParam);
         }
         return userRegisterParam.getUser();

src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java

@@ -3,8 +3,11 @@ package cn.quantgroup.xyqb.service.sms.impl;
 import cn.quantgroup.sms.MsgParams;
 import cn.quantgroup.sms.SmsSender;
 import cn.quantgroup.xyqb.Constants;
-import cn.quantgroup.xyqb.model.sms.SmsResult;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
+import lombok.Synchronized;
+import java.util.Collections;
+
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,41 +17,47 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
+import javax.annotation.PostConstruct;
 
 /**
  * @author mengfan.feng
  * @time 2015-07-25 18:47
  */
 @Service
+@Slf4j
 public class SmsServiceImpl implements ISmsService {
-
   private static final Logger LOGGER = LoggerFactory.getLogger(SmsServiceImpl.class);
 
+
   private static final int SMS_VERIFICATION_MAXLEN = 4;
   private static final String SMS_VERIFY_PREFIX = "sms:verify:";
-  private static final SmsSender smsSender = new SmsSender();
-  @Value("${sms.is.debug}")
-  private boolean isDebug;
-  @Autowired
-  @Qualifier("stringRedisTemplate")
-  private RedisTemplate<String, String> stringRedisTemplate;
 
-  @Override
-  public SmsSender getSmsSender() {
-    if (null == smsSender) {
-      return smsSender;
+    private static SmsSender smsSender =null;
+    @Value("${sms.is.debug}")
+    private Boolean isDebug;
+    @Autowired
+    @Qualifier("stringRedisTemplate")
+    private RedisTemplate<String, String> stringRedisTemplate;
+
+    @Override
+    @Synchronized
+    public SmsSender getSmsSender() {
+        if(null==smsSender){
+            smsSender=new SmsSender();
+        }
+        return smsSender;
     }
-    return this.smsSender;
-  }
+
+
 
   @Override
   public void sendAfterRegister(String phoneNo) {
     try {
-      MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", "24", Collections.emptyList());
-      smsSender.sendMsg(msgParams);
+      MsgParams msgParams =
+          new MsgParams(Collections.singletonList(2), phoneNo, "1", "24", Collections.emptyList());
+      getSmsSender().sendMsg(msgParams);
       //smsSender.sendAndForget(new SendAndForgetMsg(Collections.emptyList(), "24", "1", phoneNo));
-      LOGGER.info("注册完成，发送短信, phoneNo:{}", phoneNo);
+      log.info("注册完成，发送短信, phoneNo:{}", phoneNo);
     } catch (Exception e) {
       e.printStackTrace();
     }
@@ -57,12 +66,13 @@ public class SmsServiceImpl implements ISmsService {
   @Override
   public void sendAfterRegister(String phoneNo, String contentId) {
     try {
-      if(StringUtils.isBlank(contentId)){
+      if (StringUtils.isBlank(contentId)) {
         contentId = "24";
       }
-      MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", contentId, Collections.emptyList());
-      smsSender.sendMsg(msgParams);
-      LOGGER.info("注册完成，发送短信, phoneNo:{}", phoneNo);
+      MsgParams msgParams = new MsgParams(Collections.singletonList(2), phoneNo, "1", contentId,
+          Collections.emptyList());
+      getSmsSender().sendMsg(msgParams);
+      log.info("注册完成，发送短信, phoneNo:{}", phoneNo);
     } catch (Exception e) {
       e.printStackTrace();
     }
@@ -70,13 +80,10 @@ public class SmsServiceImpl implements ISmsService {
 
   /**
    * 检查验证码是否正确
-   *
-   * @param phoneNo
-   * @param smsVerificationCode
-   * @return
    */
   @Override
-  public boolean validRegisterOrResetPasswdVerificationCode(String phoneNo, String smsVerificationCode) {
+  public boolean validRegisterOrResetPasswdVerificationCode(String phoneNo,
+      String smsVerificationCode) {
     //if (StringUtils.isEmpty(smsVerificationCode) || smsVerificationCode.length() != SMS_VERIFICATION_MAXLEN) {
     //  return false;
     //}
@@ -86,9 +93,9 @@ public class SmsServiceImpl implements ISmsService {
       return false;
     }
     String[] arr = randomCode.split(":");
-    String unqiueId = arr[0];
+    String uniqueId = arr[0];
     String code = arr[1];
-    return confirmSms(smsVerificationCode, unqiueId, code);
+    return confirmSms(smsVerificationCode, uniqueId, code);
   }
 
   @Override
@@ -107,8 +114,6 @@ public class SmsServiceImpl implements ISmsService {
     return confirmSms(verificationCode, uniqueId, code);
   }
 
-
-
   private boolean confirmSms(String smsVerificationCode, String unqiueId, String code) {
     try {
       MsgParams message = new MsgParams(Collections.singletonList(2), unqiueId);
@@ -116,14 +121,11 @@ public class SmsServiceImpl implements ISmsService {
       getSmsSender().confirmMsg(message);
       //getSmsSender().confirmMsg(messageVoice);
       //smsSender.confirmSmsResult("1", unqiueId);
-      LOGGER.info("confirmMsg send success, uniqueId={}", unqiueId);
+      log.info("confirmMsg send success, uniqueId={}", unqiueId);
     } catch (Exception e) {
-      LOGGER.info("短信验证向短信中心确认失效");
-    }
-    if (StringUtils.equals(code, smsVerificationCode)) {
-      return true;
+      log.info("短信验证向短信中心确认失效");
     }
-    return false;
+    return StringUtils.equals(code, smsVerificationCode);
   }
 
 }

src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java

 package cn.quantgroup.xyqb.service.wechat.impl;
 
-import cn.quantgroup.cloudconfig.SafeValue;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
 import cn.quantgroup.xyqb.model.webchat.AccessTokenResponse;
 import cn.quantgroup.xyqb.repository.IWeChatUserRepository;
@@ -10,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,9 +28,9 @@ public class WechatServiceImpl implements IWechatService {
   @Autowired
   @Qualifier("stringRedisTemplate")
   private RedisTemplate<String, String> redisTemplate;
-  @SafeValue("wechat.appid")
+  @Value("${wechat.appid}")
   private String appId;
-  @SafeValue("wechat.secret")
+  @Value("${wechat.secret}")
   private String secret;
   @Autowired
   private IWeChatUserRepository weChatUserRepository;

src/main/java/cn/quantgroup/xyqb/util/ApplicationContextHolder.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
 /**

src/main/java/cn/quantgroup/xyqb/util/IPUtil.java

@@ -32,6 +32,7 @@ public class IPUtil {
     String jvmTest = System.getProperty("test");
     if(Boolean.valueOf(jvmTest)){
       WHITE_ADDRESS.add("192.168.");
+      WHITE_ADDRESS.add(LOCAL_ADDRESS);
     }
   }
 

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

+app.id=xyqb-user2
+namespace=application
\ No newline at end of file

src/main/resources/config/dev/application.properties

-server.port=8082
 security.sessions=if_required
 spring.aop.proxy-target-class=true
+

src/main/resources/config/dev/xyqb.properties

-config.accessable=false
-configserver.disable=1
-configserver.system=xyqb-user
-
-#xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.153:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-
-xyqb.data.mysql.password=qatest
-
-xyqb.data.mysql.user=qa
-xyqb.data.mysql.max-pool-size=20
-
-# CORS
-xyqb.filter.allowedOrigin=*
-xyqb.filter.allowedHeaders=Origin, No-Cache, x-auth-token, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type,Authorization
-
-xyqb.data.redis.defaultExpiration=3600
-
-# redis
-xyqb.redis.master.host=192.168.4.153
-xyqb.redis.master.port=6379
-xyqb.redis.master.name=
-xyqb.redis.sentinel1.host=
-xyqb.redis.sentinel1.port=0
-xyqb.redis.sentinel2.host=
-xyqb.redis.sentinel2.port=0
-xyqb.redis.sentinel3.host=
-xyqb.redis.sentinel3.port=0
-
-# 短信平台配置
-sms.is.debug=1
-
-# LKB client
-lkb.client.url=http://192.168.4.193:8082/LKBClient/openapi
-lkb.client.user.register.app=/new/register/registerApp.json
-lkb.client.user.update=/new/register/updateUser.json
-lkb.client.user.push=/user/push.json
-
-
-# LKB import
-lkb.import.url=http://spider.quantgroup.cn
-
-# LKB
-lkb.url=http://192.168.192.251:8081/LKB
-
-# xyqb
-xyqb.url=http://192.168.192.163:8999
-
-xyqb.api.url=http://192.168.192.163:9004
-
-# 图形验证码
-# 是否启用超级验证码 "__SUPERQG__", 用于测试环境自动化测试, 线上环境可忽略此参数
-xyqb.auth.captcha.super.enable=1
-
-#首参数校验
-xyqb.fplock.limit.byhour=3
-xyqb.fplock.limit.byday=5
-
-
-#sdk
-model.quantgroup.url=http://model.quantgroup.cn
-
-xyqb.auth.url=http://192.168.192.206:9001
-
-usersys.url=http://localhost:9001
-
-xyqb-user.ui=http://192.168.100.36:7043
-xyqb-user.ui-s=https://192.168.100.36:7043
-wechat.appid=wxcdf6077af8127559
-wechat.secret=16eaec16084d0d9c52d4114f359cc72c
-
-#motan protocol
-protocol.name=motan
-protocol.contentLength=1048576
-protocol.isDefault=true
-#motan registry center
-registry.protocol=zookeeper
-registry.address=192.168.4.22:2181
-motan.port=8086
-motan.user.group=userGroup
-motan.user.module=user-motan-rpc
-motan.application=xyqbUserMotan
-
-#xyqb-user-域名
-xyqb.user.domain=passport.xyqb.com
-xyqb.user.query.url=http://192.168.11.40:8081
-xyqb.domain = http://192.168.4.153:7003
-
-xyqb.paycenter.url=http://192.168.4.26:7006
-xyqb.paycenter.id=3
-#内部运营系统
-xyqb.yunying.url=http://192.168.4.26:7047
-#马甲包
-loanvest.rabbitmq.connection.virtual-host=/loan_order
-#loanvest.rabbitmq.stateMsgQueue=loan_vest_msg_queue
-loanvest.rabbitmq.queue=loan_user_queue
-loanvest.rabbitmq.exchange=loan_vest_exchange
-loanvest.rabbitmq.connection.host=192.168.4.46
-loanvest.rabbitmq.connection.port=5672
-loanvest.rabbitmq.connection.user=qa
-loanvest.rabbitmq.connection.password=qatest
-
-#用户注册广播
-register.rabbitmq.connection.virtual-host=/user_register
-register.rabbitmq.queue=user_register_queue
-register.rabbitmq.exchange=user_register_exchange
-register.rabbitmq.connection.host=192.168.4.153
-register.rabbitmq.connection.port=5672
-register.rabbitmq.connection.user=qa
-register.rabbitmq.connection.password=qatest
\ No newline at end of file

src/main/resources/config/release01/application.properties

-server.port=9001
 security.sessions=if_required
-server.session-timeout=86400
 spring.aop.proxy-target-class=true
+

src/main/resources/config/release01/xyqb.properties

-configserver.disable=0
-configserver.system=xyqb-user
-xyqb.data.mysql.max-pool-size=1000
-# CORS
-xyqb.filter.allowedOrigin=*
-xyqb.filter.allowedHeaders=Origin, No-Cache, x-auth-token, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type,Authorization
-xyqb.data.redis.defaultExpiration=3600
-# redis
-xyqb.redis.master.host=172.16.1.179
-xyqb.redis.master.port=6373
-xyqb.redis.master.name=mymaster
-xyqb.redis.sentinel1.host=172.16.1.179
-xyqb.redis.sentinel1.port=26373
-xyqb.redis.sentinel2.host=172.16.1.180
-xyqb.redis.sentinel2.port=26373
-xyqb.redis.sentinel3.host=172.16.1.181
-xyqb.redis.sentinel3.port=26373
-# 短信平台配置
-sms.is.debug=0
-# LKB client
-lkb.client.url=http://openapi.quantgroup.cn/LKBClient/openapi
-lkb.client.user.register.app=/new/register/registerApp.json
-lkb.client.user.update=/new/register/updateUser.json
-lkb.client.user.push=/user/push.json
-# LKB import
-lkb.import.url=http://spider.quantgroup.cn
-# LKB
-lkb.url=http://58.xyqb.com/LKB
-# xyqb
-xyqb.url=https://m.xyqb.com
-xyqb.api.url=http://api.xyqb.com
-#sdk
-model.quantgroup.url=http://model.quantgroup.cn
-xyqb.auth.url=http://auth.xyqb.com
-xyqb-user.ui=http://passport.xyqb.com
-xyqb-user.ui-s=https://passport.xyqb.com
-#motan protocol
-protocol.name=motan
-protocol.contentLength=1048576
-protocol.isDefault=true
-#motan registry center
-registry.protocol=zookeeper
-registry.address=172.16.1.63:2181,172.16.1.64:2181,172.16.1.65:2181
-motan.port=8082
-motan.user.group=userGroup
-motan.user.module=user-motan-rpc
-motan.application=xyqbUserMotan
-
-#xyqb-user-域名
-xyqb.user.domain=passport.xyqb.com
-
-xyqb.user.query.url=http://userqry.xyqb.com
-
-xyqb.domain = http://api.xyqb.com
-
-xyqb.paycenter.url=http://payapi.xyqb.com/
-xyqb.paycenter.id=3
-#内部运营系统
-xyqb.yunying.url=https://opapi.xyqb.com
-
-#马甲包
-loanvest.rabbitmq.connection.virtual-host=/loan_order
-loanvest.rabbitmq.queue=loan_user_queue
-#loanvest.rabbitmq.stateMsgQueue=loan_vest_msg_queue
-loanvest.rabbitmq.exchange=loan_vest_exchange
-loanvest.rabbitmq.connection.host=172.16.1.242
-loanvest.rabbitmq.connection.port=56720
-loanvest.rabbitmq.connection.user=rabbit_admin
-loanvest.rabbitmq.connection.password=abc1234
-
-
-#用户注册广播
-register.rabbitmq.connection.virtual-host=/user_register
-register.rabbitmq.queue=user_register_queue
-register.rabbitmq.exchange=user_register_exchange
-register.rabbitmq.connection.host=172.16.1.242
-register.rabbitmq.connection.port=56720
-register.rabbitmq.connection.user=rabbit_admin
-register.rabbitmq.connection.password=abc1234
\ No newline at end of file

src/main/resources/config/test/application.properties

-server.port=9001
 security.sessions=if_required
 spring.aop.proxy-target-class=true
+

src/main/resources/config/test/logback.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
+
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
             <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
         </layout>
     </appender>
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <file>/home/quant_group/logs/xyqb_user1.log</file>
+        <file>/home/quant_group/logs/xyqb_user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/quant_group/logs/xyqb_user1.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
@@ -25,6 +25,7 @@
 
     <root level="info">
         <appender-ref ref="FILE"/>
+        <!-- <appender-ref ref="STDOUT"/>-->
     </root>
 
 </configuration>
\ No newline at end of file

src/test/java/user/TestUserLogin.java

@@ -4,25 +4,49 @@ import cn.quantgroup.xyqb.Bootstrap;
 import cn.quantgroup.xyqb.Constants;
 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;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+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;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by 11 on 2017/1/3.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Bootstrap.class)
-@WebAppConfiguration
+@SpringBootTest(classes = Bootstrap.class )
+@Slf4j
 public class TestUserLogin {
 
-  private MockHttpServletRequest request;
+  private MockHttpServletRequest request = new MockHttpServletRequest();;
 
   @Autowired
   private UserController userController;
@@ -44,26 +68,33 @@ public class TestUserLogin {
     System.out.println("-------------result:"+addressByUserId);
 
   }
+
+    /**
+     * 用户密码登陆接口
+     */
   @Test
   public void testUserLogin() {
     Long code = 1L;
     String format = String.format(Constants.ZERO_FILL_TEMPLATE, code);
     System.out.println("-----------format:"+format);
     //访问xyqb-user拿到登录token
-        /*Long channelId = 1L;
+        Long channelId = 1L;
         String appChannel = "3";
         Long createFrom = 152L;
         //String userId = "8c02a7b8-815f-4ba0-b39c-a9e6e52904de";
         //测试userId为空的情况
         String userId = "";
-        request.addHeader("authorization", "Basic ");
-        JsonResult jsonResult = userController.login(channelId, appChannel, createFrom, userId, request);
+        request.addHeader("x-original-client-ip", "172.16.0.1");
+        request.addHeader("authorization", "Basic MTg1MTMzNDE4MDg6MTIzNDU2");
+        JsonResult jsonResult = userController.login(channelId, appChannel, createFrom, userId,"xyqb", request,"xyqb","aaa");
         AuthBean authBean = (AuthBean) jsonResult.getData();
         String token = authBean.getToken();
         System.out.println("user token:" + token);
         //用获取到的token请求xyqb的receive_token
-        CloseableHttpClient httpClient = HttpClient.httpClient();
-        HttpPost post = new HttpPost("http://localhost:9004/ex/login/receive_token");
+
+        CloseableHttpClient httpClient =  HttpClients.createDefault();
+      HttpPost post = new HttpPost("http://localhost:9004/ex/login/receive_token");
+
         List<NameValuePair> pairList = new ArrayList<>();
         pairList.add(new BasicNameValuePair("token", token));
         HttpEntity entity = null;
@@ -79,7 +110,7 @@ public class TestUserLogin {
             result = EntityUtils.toString(response.getEntity());
         } catch (IOException e) {
             e.printStackTrace();
-        }*/
+        }
   }
 
 }

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

+app.id=xyqb-user2
+namespace=application
\ No newline at end of file