Merge branch 'feature/junit_test'

pom.xml

@@ -92,7 +92,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <!-- jUnit 5 -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -249,7 +248,15 @@
             <groupId>com.ctrip.framework.apollo</groupId>
             <artifactId>apollo-client</artifactId>
             <version>0.10.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.quantgroup</groupId>
+            <artifactId>commons</artifactId>
+            <version>0.0.5</version>
+            <scope>compile</scope>
         </dependency>
+
         <!-- motan -->
         <dependency>
             <groupId>com.weibo</groupId>
@@ -385,7 +392,6 @@
             <id>test</id>
             <properties>
                 <profiles.activation>test</profiles.activation>
-
             </properties>
             <dependencies>
                 <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 cn.quantgroup.tech.shutdown.DefaultSignalHandler;
 import com.weibo.api.motan.common.MotanConstants;
 import com.weibo.api.motan.util.MotanSwitcherUtil;
 import io.sentry.Sentry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationListener;
+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.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
+import sun.misc.Signal;
 
 @ComponentScan(basePackages = {"cn.quantgroup.sms", "cn.quantgroup.xyqb"})
-@EnableAutoConfiguration
 @SpringBootApplication
 @EnableCaching
-@EnableApolloConfig
-@PropertySource(value = {"classpath:application.properties", "classpath:xyqb.properties"}, ignoreResourceNotFound = true)
-@Configuration
 @EnableAspectJAutoProxy
 @EnableAsync
 @Slf4j
@@ -32,7 +27,6 @@ public class Bootstrap {
 
     public static void main(String[] args) {
         SpringApplication springApplication = new SpringApplication(Bootstrap.class);
-        springApplication.addInitializers(new ApolloPropertySourceInitializer("application", "tech.msg.sdk", "cash.common","tech.service.urls"));
         springApplication.addListeners(new ApplicationListener<ContextRefreshedEvent>() {
             @Override
             public void onApplicationEvent(ContextRefreshedEvent event) {
@@ -41,8 +35,14 @@ public class Bootstrap {
             }
         });
         springApplication.setRegisterShutdownHook(true);
-        springApplication.run(args);
+        ConfigurableApplicationContext run = springApplication.run(args);
         log.info("server start...");
-        Sentry.init("http://13ef5642903a414c910f8d0e0a2c56ee:8b351ad1abf44de3b4c25f39105fb927@172.16.4.89:9000/6");
+        // 启用平滑退出功能
+        Signal.handle(new Signal("INT"), new DefaultSignalHandler(run));
+        // 异常log捕获
+        Environment environment = run.getBean(Environment.class);
+        String dsn = environment.getProperty("dsn");
+        Sentry.init(dsn);
     }
+
 }

src/main/java/cn/quantgroup/xyqb/aspect/accessable/IpValidateAdvisor.java

@@ -8,13 +8,11 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Objects;
 
 /**
  * IP白名单检验
@@ -27,18 +25,12 @@ import java.util.Objects;
 public class IpValidateAdvisor {
     private static final Logger LOGGER = LoggerFactory.getLogger(IpValidateAdvisor.class);
 
-    @Value("${configserver.disable}")
-    private Integer isDebug;
-
     @Pointcut("execution(public * cn.quantgroup.xyqb.controller.external.user.InnerController.*(..)) || @annotation(cn.quantgroup.xyqb.aspect.accessable.IpValidator)")
     private void whiteIpMatch() {
     }
 
     @Around("whiteIpMatch()")
     private Object doWhiteIpMatch(ProceedingJoinPoint pjp) throws Throwable {
-        if(Objects.equals(isDebug, 0)){
-            return pjp.proceed();
-        }
         HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
         // 客户端IP
         String clientIp = IPUtil.getRemoteIP(request);

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

-package cn.quantgroup.xyqb.aspect.captcha;
-
-import cn.quantgroup.xyqb.Constants;
-import cn.quantgroup.xyqb.model.JsonResult;
-import cn.quantgroup.xyqb.thirdparty.jcaptcha.AbstractManageableImageCaptchaService;
-import cn.quantgroup.xyqb.util.IPUtil;
-import com.octo.captcha.service.CaptchaServiceException;
-
-import java.nio.charset.Charset;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-/**
- * 类名称：CaptchaValidateAdvisor
- * 类描述：
- *
- * @author 李宁
- * @version 1.0.0 创建时间：15/11/17 14:49
- */
-@Aspect
-@Component
-public class CaptchaNewValidateAdvisor {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CaptchaNewValidateAdvisor.class);
-    private static final String SUPER_CAPTCHA_ID = UUID.nameUUIDFromBytes("__QG_APPCLIENT_AGENT__".getBytes(Charset.forName("UTF-8"))).toString();
-    private static final String SUPER_CAPTCHA = "__SUPERQG__";
-
-    @Autowired
-    @Qualifier("stringRedisTemplate")
-    private RedisTemplate<String, String> redisTemplate;
-
-    @Autowired
-    @Qualifier("customCaptchaService")
-    private AbstractManageableImageCaptchaService imageCaptchaService;
-
-    /**
-     * 自动化测试忽略验证码
-     */
-    @Value("${xyqb.auth.captcha.autotest.enable:false}")
-    private boolean autoTestCaptchaEnabled;
-
-    private static final String IMAGE_IP_COUNT = "image:ip";
-    private static final String IMAGE_PHONE_COUNT = "image:phone";
-    private static final String IMAGE_DEVICEID_COUNT = "image:deviceId:";
-    private static final Long FIVE_MIN = 24 * 5L;
-
-    /**
-     * 图形验证码切面
-     */
-    @Pointcut("@annotation(cn.quantgroup.xyqb.aspect.captcha.CaptchaNewValidator)")
-    private void needNewCaptchaValidate() {
-    }
-
-    /**
-     * 在受图形验证码保护的接口方法执行前, 执行图形验证码校验
-     * captchaId 图形验证码key
-     * captchaValue 图形验证码value
-     *
-     * @throws Throwable
-     */
-    @Around("needNewCaptchaValidate()")
-    private Object doCapchaValidate(ProceedingJoinPoint pjp) throws Throwable {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        String registerFrom = Optional.ofNullable(request.getParameter("registerFrom")).orElse("");
-        String captchaId = Optional.ofNullable(request.getParameter("captchaId")).orElse("");
-        String captchaValue = request.getParameter("captchaValue");
-        String phoneNo = request.getParameter("phoneNo");
-        String deviceId = Optional.ofNullable(request.getParameter("deviceId")).orElse("");
-        String clientIp = IPUtil.getRemoteIP(request);
-        Long countIP = countByClientId(clientIp, false);
-        Long countPhone = countPhone(phoneNo);
-        Long countDeviceId = countByClientId(deviceId, true);
-        IPUtil.logIp(LOGGER, request);
-        LOGGER.info("使用图形验证码, registerFrom={}, clientIp={},手机号次数:{},设备次数:{},ip次数:{},phone:{}", registerFrom, clientIp,countPhone,countDeviceId,countIP,phoneNo);
-        //if (countIP > Constants.Image_Need_Count || countPhone > Constants.Image_Need_Count || countDeviceId > Constants.Image_Need_Count) {
-        if(true){
-            if (shouldSkipCaptchaValidate(registerFrom, captchaId, captchaValue)) {
-                LOGGER.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, clientIp);
-                return pjp.proceed();
-            }
-            JsonResult result = JsonResult.buildSuccessResult("图形验证码不正确", "");
-            result.setBusinessCode("0002");
-            if (StringUtils.isNotBlank(captchaValue)) {
-                // 忽略用户输入的大小写
-                String captcha = StringUtils.lowerCase(captchaValue);
-                // 验证码校验
-                Boolean validCaptcha = false;
-                try {
-                    validCaptcha = imageCaptchaService.validateResponseForID(Constants.IMAGE_CAPTCHA_KEY + captchaId, captcha);
-                } catch (CaptchaServiceException ex) {
-                    LOGGER.error("验证码校验异常, {}, {}", ex.getMessage(), ex);
-                }
-                if (validCaptcha) {
-                    return pjp.proceed();
-                }
-                return result;
-            }
-            LOGGER.info("使用错误图形验证码, registerFrom={}, clientIp={},手机号次数:{},设备次数:{},ip次数:{},phone:{}", registerFrom, clientIp,countPhone,countDeviceId,countIP,phoneNo);
-            result.setMsg("请输入图形验证码");
-            return result;
-        }
-        return pjp.proceed();
-    }
-
-    private boolean shouldSkipCaptchaValidate(String registerFrom, String captchaId, Object captchaValue) {
-        // 如果启用了超级验证码功能, 检查超级验证码, 超级验证码区分大小写
-        if (autoTestCaptchaEnabled) {
-            return true;
-        }
-        return StringUtils.equals(SUPER_CAPTCHA_ID, String.valueOf(captchaId)) && StringUtils.equals(SUPER_CAPTCHA, String.valueOf(captchaValue));
-    }
-
-    private Long countPhone(String phoneNo) {
-        Long count = 1L;
-        String countString = redisTemplate.opsForValue().get(IMAGE_PHONE_COUNT + phoneNo);
-        if (StringUtils.isBlank(countString)) {
-            redisTemplate.opsForValue().set(IMAGE_PHONE_COUNT + phoneNo, String.valueOf(count),
-                    FIVE_MIN, TimeUnit.SECONDS);
-        } else {
-            count = Long.valueOf(countString) + 1L;
-            redisTemplate.opsForValue().set(IMAGE_PHONE_COUNT + phoneNo, String.valueOf(count),
-                    FIVE_MIN, TimeUnit.SECONDS);
-        }
-        return count;
-    }
-
-    /**
-     * 短信发送限制
-     * @param clientId - 设备ID或IP
-     * @param device - true - 设备，false - IP
-     * @return
-     */
-    private Long countByClientId(String clientId, boolean device) {
-        Long count = 1L;
-        if (StringUtils.isBlank(clientId)) {
-            return count;
-        } else {
-            String key = (device ? IMAGE_DEVICEID_COUNT : IMAGE_IP_COUNT) + clientId;
-            String countString = redisTemplate.opsForValue().get(key);
-            if (StringUtils.isBlank(countString)) {
-                redisTemplate.opsForValue().set(key, String.valueOf(count), FIVE_MIN, TimeUnit.SECONDS);
-            } else {
-                count = Long.valueOf(countString) + 1L;
-                redisTemplate.opsForValue().set(key, String.valueOf(count), FIVE_MIN, TimeUnit.SECONDS);
-            }
-            return count;
-        }
-    }
-
-}

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

-package cn.quantgroup.xyqb.aspect.captcha;
-
-import java.lang.annotation.*;
-
-/**
- * Created by xuran on 2017/8/28.
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-
-public @interface CaptchaNewValidator {
-}

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

 package cn.quantgroup.xyqb.aspect.captcha;
 
-
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.thirdparty.jcaptcha.AbstractManageableImageCaptchaService;
@@ -78,19 +77,16 @@ public class CaptchaValidateAdvisor {
     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
     String registerFrom = Optional.ofNullable(request.getParameter("registerFrom")).orElse("");
     String captchaId = Optional.ofNullable(request.getParameter("captchaId")).orElse("");
-    Object captchaValue = request.getParameter("captchaValue");
-
+    String captchaValue = request.getParameter("captchaValue");
     if (shouldSkipCaptchaValidate(registerFrom, captchaId, captchaValue)) {
       LOGGER.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, IPUtil.getRemoteIP(request));
       return pjp.proceed();
     }
-
     JsonResult result = JsonResult.buildSuccessResult("图形验证码不正确", "");
     result.setBusinessCode("0002");
-    if (captchaValue != null) {
-      String captcha = String.valueOf(captchaValue);
+    if (StringUtils.isNotBlank(captchaValue)) {
       // 忽略用户输入的大小写
-      captcha = StringUtils.lowerCase(captcha);
+      String captcha = StringUtils.lowerCase(captchaValue);
       // 验证码校验
       Boolean validCaptcha = false;
       try {
@@ -98,7 +94,6 @@ public class CaptchaValidateAdvisor {
       } catch (CaptchaServiceException ex) {
         LOGGER.error("验证码校验异常, {}, {}", ex.getMessage(), ex);
       }
-
       if (validCaptcha) {
         return pjp.proceed();
       }

src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java

@@ -112,6 +112,7 @@ public class HttpConfig {
         .register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactory())
         .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
         .register("easy", httpContext -> new BrowserCompatSpec() {
+          @Override
           public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
           }
         }).build();

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

@@ -18,7 +18,6 @@ import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
-import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.*;
 import cn.quantgroup.xyqb.service.user.vo.UserDetailVO;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
@@ -68,8 +67,6 @@ public class MotanUserServiceImpl implements UserMotanService {
   @Autowired
   private IUserRepository userRepository;
   @Autowired
-  private ISmsService smsService;
-  @Autowired
   private ILkbUserService lkbUserService;
   @Autowired
   private IMerchantService merchantService;

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -57,11 +57,11 @@ public class UserQueryLogController {
   @Autowired
   private IAddressService addressService;
 
-  @Value("${xyqb.paycenter.url}")
+  @Value("${payapi.http}")
   private String payCenterUrl;
   @Value("${xyqb.paycenter.id}")
   private String payCenterId;
-  @Value("${xyqb.yunying.url}")
+  @Value("${opapi.http}")
   private String yunyingUrl;
 
 

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -15,7 +15,6 @@ import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
-import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.ILkbUserService;
 import cn.quantgroup.xyqb.service.user.IUserBtRegisterService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
@@ -53,8 +52,6 @@ public class AppController implements IBaseController {
   @Autowired
   private IUserRepository userRepository;
   @Autowired
-  private ISmsService smsService;
-  @Autowired
   private IUserDetailService userDetailService;
   @Autowired
   private IIdCardService idCardService;

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -85,12 +85,9 @@ public class InnerController implements IBaseController {
   @Autowired
   private IUserRegisterService userRegisterService;
 
-  @Value("${xyqb.user.query.url}")
+  @Value("${userqry.http}")
   private String queryUrl;
 
-  @Value("${xyqb.auth.url}")
-  private String hanguguanUrl;
-
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
   static {
@@ -117,8 +114,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", userRet);
   }
 
-  @RequestMapping("/user/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/user/search/uuid")
   public JsonResult findByUuid(String uuid) {
     User user = userService.findByUuidInDb(uuid);
     if (user == null) {
@@ -128,8 +125,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", userRet);
   }
 
-  @RequestMapping("/userInfo/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/userInfo/search/uuid")
   public JsonResult findUserInfoByUuid(@RequestParam(value = "uuid") String uuid) {
     LOGGER.info("需要查询的用户uuidid, uuid:" + uuid);
 
@@ -148,8 +145,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", null);
   }
 
-  @RequestMapping("/userInfo/search/phone")
   @LogHttpCaller
+  @RequestMapping("/userInfo/search/phone")
   public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) {
     LOGGER.info("需要查询的用户phone, phone:" + phone);
 
@@ -168,9 +165,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", null);
   }
 
-
-  @RequestMapping("/user/getPhoneByUserIds")
   @LogHttpCaller
+  @RequestMapping("/user/getPhoneByUserIds")
   public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) {
     LOGGER.info("批量查询用户的手机号列表, userIdsString:" + userIdsString);
     if (StringUtils.isEmpty(userIdsString)) {
@@ -234,7 +230,6 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, userRet);
   }
 
-
   /**
    * 保存用户详细信息
    */
@@ -295,8 +290,8 @@ public class InnerController implements IBaseController {
   /**
    * 根据用户id查询用户的详细信息
    */
-  @RequestMapping("/user_detail/search/userId")
   @LogHttpCaller
+  @RequestMapping("/user_detail/search/userId")
   public JsonResult findUserDetailByUserId(Long userId) {
     UserDetail userDetail = userDetailService.findByUserId(userId);
     if (userDetail != null) {
@@ -305,8 +300,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildErrorStateResult("", null);
   }
 
-  @RequestMapping("/user/search/userId")
   @LogHttpCaller
+  @RequestMapping("/user/search/userId")
   public JsonResult findUserByUserId(Long userId) {
     User user = userService.findById(userId);
     if (user != null) {
@@ -315,8 +310,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildErrorStateResult("", null);
   }
 
-  @RequestMapping("/user_detail/search/phone")
   @LogHttpCaller
+  @RequestMapping("/user_detail/search/phone")
   public JsonResult findUserDetailByPhone(String phoneNo) {
     UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
     if (userDetail != null) {
@@ -331,8 +326,8 @@ public class InnerController implements IBaseController {
    * @param phoneNo
    * @return
    */
-  @RequestMapping("/user_full_info/search/phone")
   @LogHttpCaller
+  @RequestMapping("/user_full_info/search/phone")
   public JsonResult findUserFullInfoByPhone(String phoneNo) {
     if (StringUtils.isBlank(phoneNo)) {
       LOGGER.warn("[findUserFullInfoByPhone]phoneNo为空");
@@ -352,8 +347,8 @@ public class InnerController implements IBaseController {
    * @param uuid
    * @return
    */
-  @RequestMapping("/user_full_info/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/user_full_info/search/uuid")
   public JsonResult findUserFullInfoByUUuid(String uuid) {
     if (StringUtils.isBlank(uuid)) {
       LOGGER.warn("[findUserFullInfoByUUuid]uuid为空");
@@ -376,8 +371,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, null);
   }
 
-  @RequestMapping("/contact/search/user_id")
   @LogHttpCaller
+  @RequestMapping("/contact/search/user_id")
   public JsonResult findContactsByUserId(Long userId) {
     if (null == userId) {
       return JsonResult.buildErrorStateResult(null, null);
@@ -488,8 +483,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj));
   }
 
-  @RequestMapping("/user_ext_info/update")
   @LogHttpCaller
+  @RequestMapping("/user_ext_info/update")
   public JsonResult updateMarryStatus(
           Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
           OccupationEnum occupationEnum, EducationEnum educationEnum, Boolean hasCar,
@@ -566,8 +561,8 @@ public class InnerController implements IBaseController {
     return JSON.parseObject(s, JsonResult.class);
   }
 
-  @RequestMapping("/user_ext_info/search/user_id")
   @LogHttpCaller
+  @RequestMapping("/user_ext_info/search/user_id")
   public JsonResult searchUserExtInfoByUserId(Long userId) {
     if (userId == null) {
       return JsonResult.buildErrorStateResult("userId不能为空", null);
@@ -579,8 +574,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, UserExtInfoRet.getUserExtInfoRet(userExtInfo));
   }
 
-  @RequestMapping("/user/query/openId")
   @LogHttpCaller
+  @RequestMapping("/user/query/openId")
   public JsonResult queryOpenIdByUserId(Long userId) {
     if (userId == null) {
       return JsonResult.buildErrorStateResult("userId不能为空", null);
@@ -791,8 +786,8 @@ public class InnerController implements IBaseController {
     return contactRets;
   }
 
-  @RequestMapping("/user/wechat/phone_no")
   @LogHttpCaller
+  @RequestMapping("/user/wechat/phone_no")
   public JsonResult queryOpenIdByPhoneNo(String phoneNo) {
     if (StringUtils.isBlank(phoneNo)) {
       return JsonResult.buildErrorStateResult("手机号错误", null);
@@ -871,8 +866,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }
 
-  @RequestMapping("/user/spouse/findByUserId")
   @LogHttpCaller
+  @RequestMapping("/user/spouse/findByUserId")
   public JsonResult querySpouse(Long userId) {
     if (userId == null || userId == 0) {
       return JsonResult.buildErrorStateResult("用户不能为空", null);
@@ -942,8 +937,8 @@ public class InnerController implements IBaseController {
   /**
    * 保存用户信息，地址信息，联系人信息
    */
-  @RequestMapping("/user/save_multi")
   @LogHttpCaller
+  @RequestMapping("/user/save_multi")
   public JsonResult saveMulti(
           String registeredFrom,
           String channelId,
@@ -1032,9 +1027,8 @@ public class InnerController implements IBaseController {
   }
 
   //根据日期时间段查询新注册用户信息并返回
-
-  @RequestMapping("/contract/queryRegisterUsers")
   @LogHttpCaller
+  @RequestMapping("/contract/queryRegisterUsers")
   public JsonResult findRegisterUserByTime(String beginTime, String endTime) {
     if (null == beginTime || endTime == null) {
       return JsonResult.buildErrorStateResult(null, null);
@@ -1084,15 +1078,6 @@ public class InnerController implements IBaseController {
     }
     int affectedRows = userDetailService.updateIdCard(name, idNo, phoneNo);
     LOGGER.info("更新用户的信息,name;{},idNo:{},phoneNo:{},操作的理由reason:{},受影响的行数affectedRows:{}", name, idNo, phoneNo, reason, affectedRows);
-    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    builder.put("phoneNo", phoneNo);
-    builder.put("name", name);
-    builder.put("idNo", idNo);
-    builder.put("reason", reason);
-    builder.put("content", content);
-    LOGGER.info("去函谷关修改用户身份证号或姓名");
-    Map<String, String> param = builder.build();
-    httpService.get(hanguguanUrl.concat("/innerapi/updateIdCard"), param);
     return JsonResult.buildSuccessResult("修改用户身份证号或姓名成功", affectedRows);
   }
 
@@ -1117,14 +1102,6 @@ public class InnerController implements IBaseController {
 
     int affectedRows = userService.forbiddenUser(enable, phoneNo);
     LOGGER.info("禁用或者重启用户的理由,reason:{},手机号phoneNo:{},受影响的行数affectedRows:{}", reason, phoneNo, affectedRows);
-    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    builder.put("phoneNo", phoneNo);
-    builder.put("enable", String.valueOf(enable));
-    builder.put("reason", reason);
-    builder.put("content", content);
-    LOGGER.info("去函谷关禁用或者重启用户");
-    Map<String, String> param = builder.build();
-    httpService.get(hanguguanUrl.concat("/innerapi/forbiddenUserOrNot"), param);
     return JsonResult.buildSuccessResult("用户禁用或重启成功成功", affectedRows);
   }
 

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -17,7 +17,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
@@ -25,21 +24,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by 11 on 2017/1/17.
@@ -66,23 +59,26 @@ public class WeChatController implements IBaseController {
   @Autowired
   private IUserService userService;
 
-  // https://passport.xyqb.com/landing?key=xxx&target=cashTarget5&registerFrom=198&channelId=%d
-  @Value("${xyqb-user.ui}")
-  private String userUIAddr;
+  /**
+   * 用户中心UI的http协议头域名
+   * http://passport.xyqb.com
+   */
+  @Value("${passport.http}")
+  private String userUiDomain;
 
-  @Value("${xyqb.user.domain}")
-  private String userDomainStr;
+  /**
+   * 用户中心UI的https协议头域名
+   * https://passport.xyqb.com
+   */
+  @Value("${passport.https}")
+  private String userUiDomainS;
 
-  @Value("${xyqb.domain}")
+  @Value("${api.http}")
   private String xyqbDomainStr;
 
   @Autowired
   private IHttpService httpService;
 
-  //加https地址
-  @Value("${xyqb-user.ui-s}")
-  private String userUIAddrS;
-
   /**
    * 开发者资质认证,有必要吗?
    *
@@ -169,209 +165,72 @@ public class WeChatController implements IBaseController {
    * @return
    */
   @RequestMapping("/receiveCode/extdata/{key}/{extdata}")
-  public void receiveCodeWithExtData(
-      String code, @PathVariable(value = "key") String systemKey,
-      @PathVariable(value = "extdata") String extData, HttpServletResponse response
-  ) {
+  public void receiveCodeWithExtData(String code, @PathVariable(value = "key") String systemKey,
+      @PathVariable(value = "extdata") String extData,  HttpServletResponse response) {
+    Long registerFrom = null;
+    String redirect = null;
+    String schema = null;
     try {
-      String schema = getProtocol();
-      try {
-        extData = new String(Base64.decodeBase64(extData), "UTF-8");
-      } catch (Exception ex) {
-        extData = "";
-      }
-
-      String protocol="http:";
-
-      LOGGER.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData);
-      if (StringUtils.isEmpty(extData)) {
-        // 从code获取token
-        Merchant merchant = merchantService.findMerchantByName(systemKey);
-
-        AccessTokenResponse token = wechatService.getToken(code);
-        if (token == null) {
-          // 让用户登录，不关联微信, 构造不关联微信的url
-          redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
-          return;
-        }
-        WechatUserInfo userInfo =
-            wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
-                token.getOpenId());
-        if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
-          // 让用户登录，不关联微信, 构造不关联微信的url
-          redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
-          return;
-        }
-        WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
-        // welcome 首次登录
-        if (userInfoInDb == null) {
-          // 微信用户首次登录界面, 首先保存userInfo, 跳入到微信注册登录界面
-          if (StringUtils.isNotBlank(userInfo.getNickName())) {
-            String nickName = EmojiUtil.filter(userInfo.getNickName());
-            userInfo.setNickName(nickName);
-          }
-          userInfo = wechatService.saveWechatUserInfo(userInfo);
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo,
-              Constants.Channel.WECHAT,protocol);
-          return;
-        }
-        if (userInfoInDb.getUserId() == null) {
-          // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-              Constants.Channel.WECHAT,protocol);
-          return;
-        }
-        User user = userService.findById(userInfoInDb.getUserId());
-        if (user == null) {
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-              Constants.Channel.WECHAT,protocol);
-          return;
-        }
-        // 已经关联了用户
-        // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl =
-            createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
-        response.setHeader("Location", redirectUrl);
-        response.setStatus(301);
-      } else {
-        HashMap<String, Object> extDataObj;
-        try {
-          extDataObj =
-              JSON.parseObject(extData, new TypeReference<HashMap<String, Object>>() {
-              });
-        } catch (Exception ex) {
-          LOGGER.error("解析extData发生错误", ex);
-          // 从code获取token
-          Merchant merchant = merchantService.findMerchantByName(systemKey);
-
-          AccessTokenResponse token = wechatService.getToken(code);
-          if (token == null) {
-            // 让用户登录，不关联微信, 构造不关联微信的url
-            redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
-            return;
-          }
-          WechatUserInfo userInfo =
-              wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
-                  token.getOpenId());
-          if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
-            // 让用户登录，不关联微信, 构造不关联微信的url
-            redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
-            return;
-          }
-          WechatUserInfo userInfoInDb =
-              wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
-          // welcome 首次登录
-          if (userInfoInDb == null) {
-            // 微信用户首次登录界面, 首先保存userInfo, 跳入到微信注册登录界面
-            if (StringUtils.isNotBlank(userInfo.getNickName())) {
-              String nickName = EmojiUtil.filter(userInfo.getNickName());
-              userInfo.setNickName(nickName);
-            }
-            userInfo = wechatService.saveWechatUserInfo(userInfo);
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo,
-                Constants.Channel.WECHAT,protocol);
-            return;
-          }
-          if (userInfoInDb.getUserId() == null) {
-            // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-                Constants.Channel.WECHAT,protocol);
-            return;
-          }
-          User user = userService.findById(userInfoInDb.getUserId());
-          if (user == null) {
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-                Constants.Channel.WECHAT,protocol);
-            return;
-          }
-          // 已经关联了用户
-          // create session, 登进去，该怎么玩怎么玩。
-          String redirectUrl =
-              createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
-          response.setHeader("Location", redirectUrl);
-          response.setStatus(301);
-          return;
-        }
-
-        protocol = extDataObj.getOrDefault("protocol", "http:").toString();
-        LOGGER.info("从微信登录extData中获得协议信息,protocol:{}", protocol);
-        Long registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString());
-        String redirect = (String) extDataObj.getOrDefault("redirect", "redirect");
-        LOGGER.info("从微信登录,registerFrom:{}, redirect:{}", registerFrom, redirect);
-        Merchant merchant = merchantService.findMerchantByName(systemKey);
-        AccessTokenResponse token = wechatService.getToken(code);
-        if (token == null) {
-          // 让用户登录，不关联微信, 构造不关联微信的url
-          redirectNormalUrl(response, merchant, registerFrom,protocol);
-          return;
-        }
-        WechatUserInfo userInfo =
-            wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
-                token.getOpenId());
-        if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
-          // 让用户登录，不关联微信, 构造不关联微信的url
-          redirectNormalUrl(response, merchant, registerFrom,protocol);
-          return;
-        }
-        WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
-        // welcome 首次登录
-        if (userInfoInDb == null) {
-          // 微信用户首次登录界面, 首先保存userInfo, 跳入到微信注册登录界面
-          if (StringUtils.isNotBlank(userInfo.getNickName())) {
-            String nickName = EmojiUtil.filter(userInfo.getNickName());
-            userInfo.setNickName(nickName);
-          }
-          userInfo = wechatService.saveWechatUserInfo(userInfo);
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom,protocol);
-          return;
-        }
-        if (userInfoInDb.getUserId() == null) {
-          // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom,protocol);
-          return;
-        }
-        User user = userService.findById(userInfoInDb.getUserId());
-        if (user == null) {
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom,protocol);
-          return;
-        }
-        // 已经关联了用户
-        // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl = createUserSession(user, merchant, redirect, schema, registerFrom);
-        LOGGER.info("Location:[{}]",redirectUrl);
-        response.setHeader("Location", redirectUrl);
-        response.setStatus(301);
-      }
+      extData = new String(Base64.decodeBase64(extData), "UTF-8");
     } catch (Exception ex) {
-      LOGGER.error("发生异常", ex);
-      throw ex;
+      extData = "";
     }
+    if (StringUtils.isBlank(extData)) {
+      receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+      return;
+    }
+    LOGGER.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData);
+    HashMap<String, Object> extDataObj;
+    try {
+      extDataObj = JSON.parseObject(extData, new TypeReference<HashMap<String, Object>>(){});
+    } catch (Exception ex) {
+      LOGGER.error("解析extData发生错误", ex);
+      receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+      return;
+    }
+    schema = extDataObj.getOrDefault("protocol", "http:").toString();
+    LOGGER.info("从微信登录extData中获得协议信息,protocol:{}", schema);
+    registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString());
+    redirect = (String) extDataObj.getOrDefault("redirect", "redirect");
+    LOGGER.info("从微信登录,registerFrom:{}, redirect:{}", registerFrom, redirect);
+    receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
   }
 
   /**
-   * 通过redirect_url获取code
-   *
+   * 前端微信跳转页面
+   * @param code
+   * @param systemKey
+   * @param schema
+   * @param registerFrom
+   * @param redirect
    * @param response
-   * @return
    */
-  @RequestMapping("/receiveCode/{key}")
-  public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
-    String schema = request.getScheme();
-    String protocol="http:";
-    LOGGER.info("HTTP协议no redirect:" + schema);
+  private void receiveCodeWithDefault(String code, String systemKey, String schema, Long registerFrom, String redirect, HttpServletResponse response){
+    /*
+     * 预处理（容错）
+     */
+    registerFrom = Optional.ofNullable(registerFrom).orElse(Constants.Channel.WECHAT);
+    redirect = Optional.ofNullable(redirect).orElse("");
+    schema = StringUtils.isBlank(schema) ? getProtocol() : schema;
+    String domain = userUiDomain;
+    if(Objects.equals(schema, "https:")){
+      domain = userUiDomainS;
+    }
+
     // 从code获取token
     Merchant merchant = merchantService.findMerchantByName(systemKey);
-
     AccessTokenResponse token = wechatService.getToken(code);
     if (token == null) {
       // 让用户登录，不关联微信, 构造不关联微信的url
-      redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
+      redirectNormalUrl(response, merchant, registerFrom,domain);
       return;
     }
-    WechatUserInfo userInfo = wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(), token.getOpenId());
+    WechatUserInfo userInfo =
+            wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
+                    token.getOpenId());
     if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
       // 让用户登录，不关联微信, 构造不关联微信的url
-      redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
+      redirectNormalUrl(response, merchant, registerFrom, domain);
       return;
     }
     WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
@@ -383,113 +242,110 @@ public class WeChatController implements IBaseController {
         userInfo.setNickName(nickName);
       }
       userInfo = wechatService.saveWechatUserInfo(userInfo);
-      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, Constants.Channel.WECHAT,protocol);
+      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom, domain);
       return;
     }
     if (userInfoInDb.getUserId() == null) {
       // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT,protocol);
+      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
       return;
     }
     User user = userService.findById(userInfoInDb.getUserId());
     if (user == null) {
-      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT,protocol);
+      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom, domain);
       return;
     }
     // 已经关联了用户
     // create session, 登进去，该怎么玩怎么玩。
-    String redirectUrl = createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
-    LOGGER.info("Location=[{}]", redirectUrl);
+    String redirectUrl = createUserSession(user, merchant, redirect, domain, registerFrom);
     response.setHeader("Location", redirectUrl);
     response.setStatus(301);
   }
 
-  private String createUserSession(User user, Merchant merchant, String redirect, String schema, Long registerFrom) {
-    //String url = "http://passport.xyqb.com";
-    String url = "http://"+userDomainStr;
-    if ("https:".equals(schema)) {
-      url = "https://"+userDomainStr;
+  /**
+   * 通过redirect_url获取code
+   *
+   * @param response
+   * @return
+   */
+  @RequestMapping("/receiveCode/{key}")
+  public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
+    Long registerFrom = null;
+    String redirect = null;
+    String schema = "http:";
+    if(Objects.equals("https:", request.getScheme())){
+      schema = "https:";
     }
+    receiveCodeWithDefault(code, systemKey, schema, registerFrom, redirect, response);
+  }
+
+  private String createUserSession(User user, Merchant merchant, String redirect, String domain, Long registerFrom) {
     if (StringUtils.isEmpty(redirect) || "redirect".equals(redirect)) {
       LOGGER.info("微信登录:redirect为null,走正常流程.");
       if ("baitiao".equals(merchant.getName())) {
-        return loginInWechatWithSessionCreated(user, merchant, "cashTarget5", Constants.Channel.BAITIAO, url, Constants.Channel.WECHAT);
+        return loginInWechatWithSessionCreated(user, merchant, "cashTarget5", Constants.Channel.BAITIAO, domain, Constants.Channel.WECHAT);
       } else if ("wechat-pay".equals(merchant.getName())) {
         AuthBean authBean = sessionService.createSession(Constants.Channel.WECHAT, registerFrom, "", user, merchant);
-        return url + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom + "&channelId=" + Constants.Channel.WECHAT + "&key=" + merchant.getName() + "&target=cashTarget5";
+        return domain + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom + "&channelId=" + Constants.Channel.WECHAT + "&key=" + merchant.getName() + "&target=cashTarget5";
       } else {
-        return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L, url, registerFrom);
+        return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L, domain, registerFrom);
       }
     } else if ("local".equals(redirect)) {
       LOGGER.info("微信登录:redirect不为null,创建session跳到指定前端页面.");
       AuthBean authBean = sessionService.createSession(Constants.Channel.WECHAT, Constants.Channel.WECHAT, "", user, merchant);
-      LOGGER.info("微信登录:跳转地址{}", url + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());
+      LOGGER.info("微信登录:跳转地址{}", domain + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());
       Long channelId = "baitiao".equals(merchant.getName()) ? 222L : 1L;
       String target = "baitiao".equals(merchant.getName()) ? "cashTarget5" : "cashTarget4";
-      return url + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom +
+      return domain + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom +
           "&channelId=" + channelId + "&key=" + merchant.getName() + "&target=" + target + "&isWechat=true";
     }
     return null;
   }
 
-
-  private String loginInWechatWithSessionCreated(User user, Merchant merchant, String target, Long channelId, String url, Long registerFrom) {
+  private String loginInWechatWithSessionCreated(User user, Merchant merchant, String target, Long channelId, String domain, Long registerFrom) {
     AuthBean authBean = sessionService.createSession(channelId, registerFrom, "", user, merchant);
-    return url + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom + "&channelId=" + channelId + "&key=" + merchant.getName() + "&target=" + target;
+    return domain + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom + "&channelId=" + channelId + "&key=" + merchant.getName() + "&target=" + target;
   }
 
-  private void redirectWechatLoginUrlWithoutLogin(HttpServletResponse response, Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String protocol) {
-    String redirectUrl = assembleWechatRedirectUrl(merchant, userInfo, registerFrom,protocol);
+  private void redirectWechatLoginUrlWithoutLogin(HttpServletResponse response, Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String domain) {
+    String redirectUrl = assembleWechatRedirectUrl(merchant, userInfo, registerFrom,domain);
     LOGGER.info("redirectWechatLoginUrlWithoutLogin redirectUrl:[{}]",redirectUrl);
     response.setHeader("Location", redirectUrl);
     response.setStatus(301);
   }
 
-  private void redirectNormalUrl(HttpServletResponse response, Merchant merchant, Long registerFrom,String protocol) {
-    String redirectUrl = assembleNormalRedirectUrl(merchant, registerFrom,protocol);
+  private void redirectNormalUrl(HttpServletResponse response, Merchant merchant, Long registerFrom,String domain) {
+    String redirectUrl = assembleNormalRedirectUrl(merchant, registerFrom,domain);
     LOGGER.info("redirectNormalUrl redirectUrl:[{}]",redirectUrl);
     response.setHeader("Location", redirectUrl);
     response.setStatus(301);
   }
 
-  private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom,String protocol) {
-
-    String domains=userUIAddr;
-    if(protocol!=null&&protocol.equals("https:")){
-      domains=userUIAddrS;
-    }
-
+  private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom,String domain) {
     if ("baitiao".equals(merchant.getName())) {
-      if(registerFrom==58l||registerFrom==198l){
-        return domains + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom="+registerFrom;
+      if(registerFrom == 58L || registerFrom == 198L){
+        return domain + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom="+registerFrom;
       }else{
-        return domains + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom=198";
+        return domain + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom=198";
       }
-
     } else if ("wechat-pay".equals(merchant.getName())) {
-      return domains + "/landing?key=wechat-pay&target=cashTarget5&channelId=1&page=landing/4&registerFrom" + registerFrom;
+      return domain + "/landing?key=wechat-pay&target=cashTarget5&channelId=1&page=landing/4&registerFrom=" + registerFrom;
     } else {
-      return domains + "/landing?key=xyqb&target=cashTarget4&channelId=1&registerFrom=" + registerFrom;
+      return domain + "/landing?key=xyqb&target=cashTarget4&channelId=1&registerFrom=" + registerFrom;
     }
   }
 
-  private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String protocol) {
-    String domains=userUIAddr;
-    if(protocol!=null&&protocol.equals("https:")){
-      domains=userUIAddrS;
-    }
+  private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String domain) {
     if ("baitiao".equals(merchant.getName())) {
-      if(registerFrom==58l||registerFrom==198l){
-
-        return domains + "/landing?key=baitiao&target=cashTarget5&registerFrom=" + registerFrom + "&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
+      if(registerFrom == 58L || registerFrom == 198L){
+        return domain + "/landing?key=baitiao&target=cashTarget5&registerFrom=" + registerFrom + "&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
       }else{
-        return domains + "/landing?key=baitiao&target=cashTarget5&registerFrom=198&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
+        return domain + "/landing?key=baitiao&target=cashTarget5&registerFrom=198&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
       }
-
     } else if ("wechat-pay".equals(merchant.getName())) {
-      return domains + "/landing?key=wechat-pay&target=cashTarget5&page=landing/4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
+      return domain + "/landing?key=wechat-pay&target=cashTarget5&page=landing/4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
     } else {
-      return domains + "/landing?key=xyqb&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
+      return domain + "/landing?key=xyqb&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
     }
   }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java

@@ -2,7 +2,6 @@ package cn.quantgroup.xyqb.controller.internal.sms;
 
 import cn.quantgroup.sms.MsgParams;
 import cn.quantgroup.xyqb.Constants;
-import cn.quantgroup.xyqb.aspect.captcha.CaptchaNewValidator;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaValidator;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.model.JsonResult;
@@ -16,7 +15,6 @@ 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.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -201,7 +199,7 @@ public class SmsController implements IBaseController {
   /**
    * 快速登陆发送验证码新版
    */
-  @CaptchaNewValidator
+  @CaptchaValidator
   @RequestMapping("/send_login_code_voice_new")
   public JsonResult sendLoginCodeVoiceNew(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
       String usage, @RequestParam(required = false) String deviceId) {
@@ -217,7 +215,7 @@ public class SmsController implements IBaseController {
   /**
    * 快速登陆发送短信验证码
    */
-  @CaptchaNewValidator
+  @CaptchaValidator
   @RequestMapping("/send_login_code_new")
   public JsonResult sendLoginSmsCodeNew(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom, @RequestParam(required = false) String deviceId,@RequestParam(required = false,defaultValue = "")String appName) {
     LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
@@ -226,7 +224,7 @@ public class SmsController implements IBaseController {
   /**
    * 快速登陆发送短信验证码
    */
-  @CaptchaNewValidator
+  @CaptchaValidator
   @RequestMapping("/send_login_code_new_forH5")
   public JsonResult sendLoginSmsCodeNewForH5(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom, @RequestParam(required = false) String deviceId,@RequestParam(required = false,defaultValue = "")String appName) {
     LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);

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

@@ -77,25 +77,4 @@ public class UserDetailController implements IBaseController {
     }
   }
 
-  /**
-   * 修复老数据的性别
-   * @return
-   */
-  @RequestMapping("/fix_user_gender")
-  public JsonResult fixUserGender() {
-    String redisLock= "fix_user_gender";
-    Long ret = stringRedisTemplate.opsForValue().increment(redisLock, 1L);
-    if (MAX_COUNTER < ret) { //重复提交
-      return JsonResult.buildSuccessResult("error_multisubmission",null);
-    }
-    try {
-      userDetailService.fixedIdNoAndGender();
-    } catch (Exception e) {
-      LOGGER.error(e.getMessage(), e);
-    } finally {
-      stringRedisTemplate.delete(redisLock);
-    }
-
-    return JsonResult.buildSuccessResult("开始执行",null);
-  }
 }

src/main/java/cn/quantgroup/xyqb/service/auth/impl/UserAuthorizedServiceImpl.java

@@ -9,11 +9,13 @@ import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.Objects;
 
 /**
  * @author xufei on 2018/1/5.
@@ -27,6 +29,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     @Resource
     private IUserAuthorizedRepository userAuthorizedRepository;
 
+    @Cacheable(value = "user_authorized_idno_cache", key = "#idNo", unless = "#result == null", cacheManager = "cacheManager")
     @Override
     public Boolean hasUserAuthorized(String idNo) {
         try {
@@ -35,6 +38,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
             }
         } catch (ParseException e) {
             LOGGER.error("[hasUserAuthorized]参数异常e:{}", e);
+            return Boolean.FALSE;
         }
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByIdNo(idNo);
@@ -62,6 +66,10 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
 
     @Override
     public UserAuthorized createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
+        // 数据检查
+        if(Objects.isNull(userAuthorizedParam) || this.hasUserAuthorized(userAuthorizedParam.getIdNo())){
+            return null;
+        }
         AuthPattern authPatternEnum = AuthPattern.valueOf(userAuthorizedParam.getAuthPattern());
 
         UserAuthorized userAuthorized = new UserAuthorized();
@@ -84,6 +92,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         }
     }
 
+    @Cacheable(value = "user_authorized_uuid_2_id_cache", key = "#userUuid", unless = "#result == null", cacheManager = "cacheManager")
     @Override
     public String getUserAuthorizedId(String userUuid) {
         if (StringUtils.isBlank(userUuid)) {

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -173,6 +173,7 @@ public class HttpServiceImpl implements IHttpService {
         .register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactory())
         .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
         .register("easy", httpContext -> new BrowserCompatSpec() {
+          @Override
           public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
           }
         }).build();

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("10.");
       WHITE_ADDRESS.add(LOCAL_ADDRESS);
     }
   }

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

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

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

-security.sessions=if_required
-spring.aop.proxy-target-class=true
-

src/main/resources/config/dev/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>
-
-    <logger name="com.atomikos" level="warn"/>
-    <logger name="org.springframework" level="warn"/>
-    <logger name="org.hibernate" level="warn"/>
-    <logger name="org.apache" level="warn"/>
-    <logger name="ch.qos.logback" level="warn"/>
-    <logger name="feign" level="debug"/>
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>
\ No newline at end of file

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

-security.sessions=if_required
-spring.aop.proxy-target-class=true
-

src/main/resources/config/release01/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_user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
-        </layout>
-    </appender>
-
-    <logger name="com.atomikos" level="warn"/>
-    <logger name="org.springframework" level="warn"/>
-    <logger name="org.hibernate" level="warn"/>
-    <logger name="org.apache" level="warn"/>
-    <logger name="ch.qos.logback" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="FILE"/>
-    </root>
-
-</configuration>
\ No newline at end of file

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

-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_user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
-        </layout>
-    </appender>
-
-    <logger name="com.atomikos" level="warn"/>
-    <logger name="org.springframework" level="warn"/>
-    <logger name="org.hibernate" level="warn"/>
-    <logger name="org.apache" level="warn"/>
-    <logger name="ch.qos.logback" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="FILE"/>
-        <!-- <appender-ref ref="STDOUT"/>-->
-    </root>
-
-</configuration>
\ No newline at end of file

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

-configserver.disable=1
-configserver.system=xyqb-user
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.104: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.103
-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.192.251: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.206:8999
-xyqb.api.url=http://192.168.192.206: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.12.40:8080
-wechat.appid=wxcdf6077af8127559
-wechat.secret=16eaec16084d0d9c52d4114f359cc72c
-
-#xyqb-user-域名
-xyqb.user.domain=passport.xyqb.com
-xyqb.user.query.url=http://userqry.xyqb.com
-
-xyqb.domain = http://192.168.4.153:7003
-
-#马甲包
-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.24
-register.rabbitmq.connection.port=5672
-register.rabbitmq.connection.user=qa
-register.rabbitmq.connection.password=qatest
\ No newline at end of file

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

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