Merge branch 'master' into develop

* master:
  fix bypass
This commit is contained in:
Sola
2015-12-18 02:18:30 +08:00

View File

@@ -79,6 +79,7 @@ public class Login extends HttpServlet {
if (request.getParameter("bypassuser") != null) { if (request.getParameter("bypassuser") != null) {
User u = TableUser.getById(Long.parseLong(request.getParameter("bypassuser"))); User u = TableUser.getById(Long.parseLong(request.getParameter("bypassuser")));
session.setAttribute(Attribute.USER, u); session.setAttribute(Attribute.USER, u);
session.setAttribute(Attribute.WECHAT, u.getWechatId());
} }
if (request.getParameter("bypasswechat") != null) { if (request.getParameter("bypasswechat") != null) {
session.setAttribute(Attribute.WECHAT, request.getParameter("bypasswechat")); session.setAttribute(Attribute.WECHAT, request.getParameter("bypasswechat"));