|
|
|
@@ -41,11 +41,11 @@ public class WechatLoginController extends BaseController { |
|
|
|
@ApiOperation(value = "微信网页登录回调", notes = "请配置此callback到网页redirect_uri") |
|
|
|
@GetMapping("callback") |
|
|
|
@ResponseBody |
|
|
|
public ResultData getAccessToken(String code, String state, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
public void getAccessToken(String code, String state, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
log.debug("[" + getIpAddr() + "] WechatLoginController::getAccessToken"); |
|
|
|
String host = request.getHeader("host"); |
|
|
|
log.debug("code: " + code); |
|
|
|
ResultData r = new ResultData(); |
|
|
|
//ResultData r = new ResultData(); |
|
|
|
try { |
|
|
|
WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code); |
|
|
|
log.debug("accessToken: " + accessToken.getAccessToken() + ", openId: " + accessToken.getOpenId() + ", unionId: " + accessToken.getUnionId()); |
|
|
|
@@ -76,11 +76,11 @@ public class WechatLoginController extends BaseController { |
|
|
|
unameCookie.setMaxAge(60); |
|
|
|
response.addCookie(openIdCookie); |
|
|
|
log.debug("https://" + host + "/#/"); |
|
|
|
r.data = info; |
|
|
|
//r.data = info; |
|
|
|
response.sendRedirect("https://" + host + "/#/layout"); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(e.getMessage()); |
|
|
|
return new ResultData(ResultData.ERROR, "用户名或者密码错误"); |
|
|
|
//return new ResultData(ResultData.ERROR, "用户名或者密码错误"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
// 跳转选择界面 |
|
|
|
@@ -91,17 +91,17 @@ public class WechatLoginController extends BaseController { |
|
|
|
// 跳转登录页面 |
|
|
|
try { |
|
|
|
response.sendRedirect("https://" + host + "/#/"); |
|
|
|
return new ResultData(ResultData.ERROR, "用户名或者密码错误"); |
|
|
|
//return new ResultData(ResultData.ERROR, "用户名或者密码错误"); |
|
|
|
} catch (Exception e) { |
|
|
|
log.error(e.getMessage()); |
|
|
|
return new ResultData(ResultData.ERROR, "用户名或者密码错误"); |
|
|
|
//return new ResultData(ResultData.ERROR, "用户名或者密码错误"); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return r; |
|
|
|
//return r; |
|
|
|
} catch (WxErrorException e) { |
|
|
|
log.error(e.getMessage()); |
|
|
|
return new ResultData(); |
|
|
|
//return new ResultData(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|