| @@ -43,6 +43,7 @@ public class WechatLoginController extends BaseController { | |||||
| @ResponseBody | @ResponseBody | ||||
| public ResultData getAccessToken(String code, String state, HttpServletRequest request, HttpServletResponse response) { | public ResultData getAccessToken(String code, String state, HttpServletRequest request, HttpServletResponse response) { | ||||
| log.debug("[" + getIpAddr() + "] WechatLoginController::getAccessToken"); | log.debug("[" + getIpAddr() + "] WechatLoginController::getAccessToken"); | ||||
| String host = request.getHeader("host"); | |||||
| log.debug("code: " + code); | log.debug("code: " + code); | ||||
| ResultData r = new ResultData(); | ResultData r = new ResultData(); | ||||
| try { | try { | ||||
| @@ -74,8 +75,9 @@ public class WechatLoginController extends BaseController { | |||||
| Cookie unameCookie = new Cookie("uname", info.getUsername()); | Cookie unameCookie = new Cookie("uname", info.getUsername()); | ||||
| unameCookie.setMaxAge(60); | unameCookie.setMaxAge(60); | ||||
| response.addCookie(openIdCookie); | response.addCookie(openIdCookie); | ||||
| log.debug(request.getContextPath() + "/#/"); | |||||
| response.sendRedirect("https://" + request.getContextPath() + "/#/"); | |||||
| log.debug("https://" + host + "/#/"); | |||||
| r.data = info; | |||||
| response.sendRedirect("https://" + host + "/#/layout"); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log.error(e.getMessage()); | log.error(e.getMessage()); | ||||
| return new ResultData(ResultData.ERROR, "用户名或者密码错误"); | return new ResultData(ResultData.ERROR, "用户名或者密码错误"); | ||||
| @@ -86,18 +88,15 @@ public class WechatLoginController extends BaseController { | |||||
| } | } | ||||
| } else { | } else { | ||||
| Map<String, String> map = new HashMap<String, String>(); | |||||
| map.put("accessToken", accessToken.getAccessToken()); | |||||
| map.put("openId", accessToken.getOpenId()); | |||||
| //map.put("unionId", accessToken.getUnionId()); | |||||
| // r.data = map; | |||||
| // 跳转登录页面 | // 跳转登录页面 | ||||
| try { | try { | ||||
| response.sendRedirect(request.getContextPath() + "/#/"); | |||||
| response.sendRedirect("https://" + host + "/#/"); | |||||
| return new ResultData(ResultData.ERROR, "用户名或者密码错误"); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log.error(e.getMessage()); | log.error(e.getMessage()); | ||||
| return new ResultData(ResultData.ERROR, "用户名或者密码错误"); | return new ResultData(ResultData.ERROR, "用户名或者密码错误"); | ||||
| } | } | ||||
| } | } | ||||
| return r; | return r; | ||||
| } catch (WxErrorException e) { | } catch (WxErrorException e) { | ||||