get protocol

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

@@ -5,7 +5,6 @@ import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
-import cn.quantgroup.xyqb.event.UserinfoChangedEvent;
 import cn.quantgroup.xyqb.model.AuthBean;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.webchat.AccessTokenResponse;
@@ -244,62 +243,11 @@ public class WeChatController implements IBaseController {
   ) {
     try {
       String schema = getProtocol();
-      try {
-        extData = new String(Base64.decodeBase64(extData), "UTF-8");
-      } catch (Exception ex) {
-        extData = "";
-      }
+      extData = getExtData(extData);
 
       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);
-          return;
-        }
-        WechatUserInfo userInfo =
-          wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
-            token.getOpenId());
-        if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
-          // 让用户登录，不关联微信, 构造不关联微信的url
-          redirectNormalUrl(response, merchant, Constants.Channel.WECHAT);
-          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);
-          return;
-        }
-        if (userInfoInDb.getUserId() == null) {
-          // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-            Constants.Channel.WECHAT);
-          return;
-        }
-        User user = userService.findById(userInfoInDb.getUserId());
-        if (user == null) {
-          redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-            Constants.Channel.WECHAT);
-          return;
-        }
-        // 已经关联了用户
-        // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl =
-          createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
-        response.setHeader("Location", redirectUrl);
-        response.setStatus(301);
+        normalLogin(code, systemKey, response, schema);
       } else {
         HashMap<String, Object> extDataObj;
         try {
@@ -309,56 +257,31 @@ public class WeChatController implements IBaseController {
         } 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);
+          normalLogin(code, systemKey, response, schema);
           return;
         }
-          WechatUserInfo userInfo =
-            wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
-              token.getOpenId());
-          if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
-            // 让用户登录，不关联微信, 构造不关联微信的url
-            redirectNormalUrl(response, merchant, Constants.Channel.WECHAT);
-            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);
+        selfDefinedLogin(code, systemKey, response, schema, extDataObj);
       }
-            userInfo = wechatService.saveWechatUserInfo(userInfo);
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo,
-              Constants.Channel.WECHAT);
-            return;
+    } catch (Exception ex) {
+      LOGGER.error("发生异常", ex);
+      throw ex;
     }
-          if (userInfoInDb.getUserId() == null) {
-            // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-              Constants.Channel.WECHAT);
-            return;
+
+
+
   }
-          User user = userService.findById(userInfoInDb.getUserId());
-          if (user == null) {
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
-              Constants.Channel.WECHAT);
-            return;
+
+  private String getExtData(@PathVariable(value = "extdata") String extData) {
+    try {
+      extData = new String(Base64.decodeBase64(extData), "UTF-8");
+    } catch (Exception ex) {
+      extData = "";
     }
-          // 已经关联了用户
-          // create session, 登进去，该怎么玩怎么玩。
-          String redirectUrl =
-            createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
-          response.setHeader("Location", redirectUrl);
-          response.setStatus(301);
-          return;
+    return extData;
   }
+
+  private boolean selfDefinedLogin(String code, String systemKey,
+    HttpServletResponse response, String schema, HashMap<String, Object> extDataObj) {
     Long registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString());
     String redirect = (String) extDataObj.getOrDefault("redirect", "redirect");
     LOGGER.info("从微信登录,registerFrom:{}, redirect:{}", registerFrom, redirect);
@@ -367,7 +290,7 @@ public class WeChatController implements IBaseController {
     if (token == null) {
       // 让用户登录，不关联微信, 构造不关联微信的url
       redirectNormalUrl(response, merchant, registerFrom);
-          return;
+      return true;
     }
     WechatUserInfo userInfo =
       wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(),
@@ -375,7 +298,7 @@ public class WeChatController implements IBaseController {
     if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
       // 让用户登录，不关联微信, 构造不关联微信的url
       redirectNormalUrl(response, merchant, registerFrom);
-          return;
+      return true;
     }
     WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
     // welcome 首次登录
@@ -387,44 +310,28 @@ public class WeChatController implements IBaseController {
       }
       userInfo = wechatService.saveWechatUserInfo(userInfo);
       redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom);
-          return;
+      return true;
     }
     if (userInfoInDb.getUserId() == null) {
       // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
       redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom);
-          return;
+      return true;
     }
     User user = userService.findById(userInfoInDb.getUserId());
     if (user == null) {
       redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom);
-          return;
+      return true;
     }
     // 已经关联了用户
     // create session, 登进去，该怎么玩怎么玩。
     String redirectUrl = createUserSession(user, merchant, redirect, schema, registerFrom);
     response.setHeader("Location", redirectUrl);
     response.setStatus(301);
-      }
-    } catch (Exception ex) {
-      LOGGER.error("发生异常", ex);
-      throw ex;
+    return false;
   }
 
-
-
-  }
-
-
-  /**
-     * 通过redirect_url获取code
-     *
-     * @param response
-     * @return
-     */
-    @RequestMapping("/receiveCode/{key}")
-    public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
-        String schema = request.getScheme();
-        LOGGER.info("HTTP协议no redirect:" + schema);
+  private boolean normalLogin(String code, String systemKey,
+    HttpServletResponse response, String schema) {
     // 从code获取token
     Merchant merchant = merchantService.findMerchantByName(systemKey);
 
@@ -432,49 +339,67 @@ public class WeChatController implements IBaseController {
     if (token == null) {
       // 让用户登录，不关联微信, 构造不关联微信的url
       redirectNormalUrl(response, merchant, Constants.Channel.WECHAT);
-            return;
+      return true;
     }
-        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);
-            return;
+      return true;
     }
     WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
     // welcome 首次登录
     if (userInfoInDb == null) {
       // 微信用户首次登录界面, 首先保存userInfo, 跳入到微信注册登录界面
-            if(StringUtils.isNotBlank(userInfo.getNickName())) {
+      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);
-            return;
+      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo,
+        Constants.Channel.WECHAT);
+      return true;
     }
     if (userInfoInDb.getUserId() == null) {
       // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT);
-            return;
+      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
+        Constants.Channel.WECHAT);
+      return true;
     }
     User user = userService.findById(userInfoInDb.getUserId());
     if (user == null) {
-            redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT);
-            return;
+      redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
+        Constants.Channel.WECHAT);
+      return true;
     }
     // 已经关联了用户
     // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl = createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
+    String redirectUrl =
+      createUserSession(user, merchant, "", schema, Constants.Channel.WECHAT);
     response.setHeader("Location", redirectUrl);
     response.setStatus(301);
+    return false;
+  }
+
+  /**
+     * 通过redirect_url获取code
+     *
+     * @param response
+     * @return
+     */
+    @RequestMapping("/receiveCode/{key}")
+    public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
+        String schema = request.getScheme();
+        LOGGER.info("HTTP协议no redirect:" + schema);
+        // 从code获取token
+      normalLogin(code, systemKey, response, schema);
     }
 
     private String createUserSession(User user, Merchant merchant, String redirect, String schema, Long registerFrom) {
         //TODO 临时紧急上线修改的.下次上线的时候修复一下,不能这样写.
-        String url = "http://passport.xyqb.com";
-        if("https:".equals(schema)) {
-            url = "https://passport.xyqb.com";
-        }
+        String url = schema + "//passport.xyqb.com";
         if(StringUtils.isEmpty(redirect) || "redirect".equals(redirect)) {
             LOGGER.info("微信登录:redirect为null,走正常流程.");
             if ("baitiao".equals(merchant.getName())) {