| @@ -72,8 +72,8 @@ public class WechatLoginController extends BaseController { | |||||
| @ResponseBody | @ResponseBody | ||||
| public void 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"); | log.debug("[" + getIpAddr() + "] WechatLoginController::getAccessToken"); | ||||
| String contextpath = request.getContextPath(); | |||||
| log.debug("host: " + contextpath); | |||||
| String host = request.getHeader("host"); | |||||
| log.debug("host: " + host); | |||||
| log.debug("code: " + code); | log.debug("code: " + code); | ||||
| try { | try { | ||||
| WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code); | WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code); | ||||
| @@ -113,11 +113,7 @@ public class WechatLoginController extends BaseController { | |||||
| unameCookie.setMaxAge(60); | unameCookie.setMaxAge(60); | ||||
| response.addCookie(openIdCookie); | response.addCookie(openIdCookie); | ||||
| log.debug(contextpath + "/#/"); | |||||
| response.setStatus(302);//或者303,兼容http1.1 | |||||
| response.setHeader("location", request.getContextPath()+"/#/logout"); | |||||
| RequestDispatcher view = request.getRequestDispatcher("/#/layout"); | |||||
| view.forward(request, response); | |||||
| response.sendRedirect("https://" + host + "/#/layout"); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log.error(e.getMessage()); | log.error(e.getMessage()); | ||||
| } | } | ||||
| @@ -137,13 +133,15 @@ public class WechatLoginController extends BaseController { | |||||
| } | } | ||||
| String usersStr = JSON.toJSONString(users); | String usersStr = JSON.toJSONString(users); | ||||
| try { | try { | ||||
| /* | |||||
| response.setStatus(302);//或者303,兼容http1.1 | response.setStatus(302);//或者303,兼容http1.1 | ||||
| response.setHeader("location", request.getContextPath()+"/#/loginselect"); | response.setHeader("location", request.getContextPath()+"/#/loginselect"); | ||||
| request.setAttribute("key", key); | request.setAttribute("key", key); | ||||
| request.setAttribute("list", usersStr); | request.setAttribute("list", usersStr); | ||||
| RequestDispatcher view = request.getRequestDispatcher("/#/layout"); | RequestDispatcher view = request.getRequestDispatcher("/#/layout"); | ||||
| view.forward(request, response); | view.forward(request, response); | ||||
| // response.sendRedirect(contextpath + "/#/loginselect?key=" + key + "&list=" + usersStr); | |||||
| */ | |||||
| response.sendRedirect("https://" + host + "/#/loginselect?key=" + key + "&list=" + usersStr); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log.error(e.getMessage()); | log.error(e.getMessage()); | ||||
| } | } | ||||
| @@ -151,7 +149,7 @@ public class WechatLoginController extends BaseController { | |||||
| } else { | } else { | ||||
| // 跳转登录页面 | // 跳转登录页面 | ||||
| try { | try { | ||||
| response.sendRedirect(contextpath + "/#/login"); | |||||
| response.sendRedirect("https://" + host + "/#/login"); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log.error(e.getMessage()); | log.error(e.getMessage()); | ||||
| } | } | ||||