mirror of
https://github.com/ZSCNetSupportDept/WechatTicketSystem.git
synced 2025-10-30 09:56:18 +08:00
oauth2 v2 update
This commit is contained in:
@@ -5,15 +5,14 @@ import love.sola.netsupport.enums.Access;
|
||||
import love.sola.netsupport.enums.Attribute;
|
||||
import love.sola.netsupport.pojo.Operator;
|
||||
import love.sola.netsupport.pojo.User;
|
||||
import love.sola.netsupport.session.WechatSession;
|
||||
import love.sola.netsupport.session.WxSession;
|
||||
import love.sola.netsupport.sql.SQLCore;
|
||||
import love.sola.netsupport.sql.TableOperator;
|
||||
import love.sola.netsupport.sql.TableUser;
|
||||
import love.sola.netsupport.util.Crypto;
|
||||
import love.sola.netsupport.util.ParseUtil;
|
||||
import love.sola.netsupport.util.RSAUtil;
|
||||
import love.sola.netsupport.wechat.Command;
|
||||
import love.sola.netsupport.wechat.WechatSession;
|
||||
import me.chanjar.weixin.common.session.WxSession;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.annotation.WebServlet;
|
||||
@@ -45,8 +44,7 @@ public class Login extends HttpServlet {
|
||||
response.addHeader("Content-type", "application/json;charset=utf-8");
|
||||
response.addHeader("Access-Control-Allow-Origin", "*");
|
||||
PrintWriter out = response.getWriter();
|
||||
String json = gson.toJson(login(request));
|
||||
out.println(ParseUtil.parseJsonP(request, json));
|
||||
out.println(gson.toJson(login(request)));
|
||||
out.close();
|
||||
}
|
||||
|
||||
@@ -65,8 +63,7 @@ public class Login extends HttpServlet {
|
||||
return Error.WRONG_PASSWORD;
|
||||
}
|
||||
|
||||
String sid = WechatSession.genId();
|
||||
WxSession session = WechatSession.get(sid, true);
|
||||
WxSession session = WechatSession.create();
|
||||
if (bypass) {
|
||||
session.setAttribute(Attribute.AUTHORIZED, Command.fromId(Integer.parseInt(request.getParameter("bypass"))));
|
||||
} else {
|
||||
@@ -84,7 +81,7 @@ public class Login extends HttpServlet {
|
||||
if (request.getParameter("bypasswechat") != null) {
|
||||
session.setAttribute(Attribute.WECHAT, request.getParameter("bypasswechat"));
|
||||
}
|
||||
return sid;
|
||||
return session.getId();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Error.INTERNAL_ERROR;
|
||||
|
||||
Reference in New Issue
Block a user