Merge branch 'develop' into feature/easter_eggs

* develop:
  fix bypass
  add bypasswechat debug api
This commit is contained in:
Sola
2015-12-18 02:22:28 +08:00

View File

@@ -79,6 +79,10 @@ 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) {
session.setAttribute(Attribute.WECHAT, request.getParameter("bypasswechat"));
} }
return new Response(Response.ResponseCode.OK, sid); return new Response(Response.ResponseCode.OK, sid);