| @@ -81,12 +81,12 @@ public class WechatLoginController extends BaseController { | |||||
| log.debug("code: " + code); | log.debug("code: " + code); | ||||
| try { | try { | ||||
| WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code); | WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code); | ||||
| log.debug("accessToken: " + accessToken.getAccessToken() + ", openId: " + accessToken.getOpenId() + ", unionId: " + accessToken.getUnionId()); | |||||
| log.info("accessToken: " + accessToken.getAccessToken() + ", openId: " + accessToken.getOpenId() + ", unionId: " + accessToken.getUnionId()); | |||||
| // 获取 用户信息 | // 获取 用户信息 | ||||
| WxMpUser mpUser = wxMpService.oauth2getUserInfo(accessToken, null); | WxMpUser mpUser = wxMpService.oauth2getUserInfo(accessToken, null); | ||||
| if(mpUser != null) { | if(mpUser != null) { | ||||
| log.debug(mpUser.toString()); | |||||
| log.info(mpUser.toString()); | |||||
| } | } | ||||
| // check user openid 是否是已授权用户 | // check user openid 是否是已授权用户 | ||||
| @@ -139,12 +139,14 @@ public class WechatLoginController extends BaseController { | |||||
| } | } | ||||
| Object codeObj = ret.get("code"); | Object codeObj = ret.get("code"); | ||||
| if(codeObj == null) { | if(codeObj == null) { | ||||
| log.info("用户登录成功,切换主页"); | |||||
| try { | try { | ||||
| response.sendRedirect("https://" + host + "/#/layout"); | response.sendRedirect("https://" + host + "/#/layout"); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log.error(e.getMessage()); | log.error(e.getMessage()); | ||||
| } | } | ||||
| } else { | } else { | ||||
| log.info("用户登录失败-3,返回登录"); | |||||
| try { | try { | ||||
| String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); | String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); | ||||
| response.sendRedirect("https://" + host + "/#/login?errcode=" + errCode); | response.sendRedirect("https://" + host + "/#/login?errcode=" + errCode); | ||||
| @@ -153,6 +155,7 @@ public class WechatLoginController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| } else { | } else { | ||||
| log.info("用户登录失败-2,返回登录"); | |||||
| try { | try { | ||||
| String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); | String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); | ||||
| response.sendRedirect("https://" + host + "/#/login?errcode="+errCode); | response.sendRedirect("https://" + host + "/#/login?errcode="+errCode); | ||||
| @@ -184,6 +187,7 @@ public class WechatLoginController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| } else { | } else { | ||||
| log.info("用户登录失败-1,返回登录"); | |||||
| // 跳转登录页面 | // 跳转登录页面 | ||||
| Map<String, Object> ret = new HashMap<>(); | Map<String, Object> ret = new HashMap<>(); | ||||
| ret.put("code", ErrorCode.WECHAT_LOGIN_NOT_BIND.getCode()); | ret.put("code", ErrorCode.WECHAT_LOGIN_NOT_BIND.getCode()); | ||||