mirror of
https://github.com/ZSCNetSupportDept/WechatTicketSystem.git
synced 2026-02-11 12:49:31 +08:00
remove operator login
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package love.sola.netsupport.api;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import love.sola.netsupport.enums.Attribute;
|
||||
import love.sola.netsupport.enums.ISP;
|
||||
import love.sola.netsupport.pojo.User;
|
||||
import love.sola.netsupport.sql.SQLCore;
|
||||
@@ -44,7 +45,7 @@ public class Register extends HttpServlet {
|
||||
printAuthorizeFailed(request, out);
|
||||
return;
|
||||
}
|
||||
String wechat = (String) session.getAttribute("wechat");
|
||||
String wechat = (String) session.getAttribute(Attribute.WECHAT);
|
||||
if (wechat == null) {
|
||||
printAuthorizeFailed(request, out);
|
||||
return;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package love.sola.netsupport.api;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import love.sola.netsupport.enums.Attribute;
|
||||
import love.sola.netsupport.pojo.Ticket;
|
||||
import love.sola.netsupport.pojo.User;
|
||||
import love.sola.netsupport.sql.SQLCore;
|
||||
@@ -55,7 +56,7 @@ public class TicketQuery extends HttpServlet {
|
||||
if (session == null) {
|
||||
return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
}
|
||||
User u = (User) session.getAttribute("user");
|
||||
User u = (User) session.getAttribute(Attribute.USER);
|
||||
if (u == null) return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
|
||||
Criteria c = s.createCriteria(Ticket.class);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package love.sola.netsupport.api;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import love.sola.netsupport.enums.Attribute;
|
||||
import love.sola.netsupport.pojo.Ticket;
|
||||
import love.sola.netsupport.pojo.User;
|
||||
import love.sola.netsupport.sql.SQLCore;
|
||||
@@ -57,7 +58,7 @@ public class TicketSubmit extends HttpServlet {
|
||||
if (session == null) {
|
||||
return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
}
|
||||
User u = (User) session.getAttribute("user");
|
||||
User u = (User) session.getAttribute(Attribute.USER);
|
||||
if (u == null) return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
|
||||
if (TableTicket.hasOpen(u)) {
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
package love.sola.netsupport.api.admin;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import love.sola.netsupport.api.Response;
|
||||
import love.sola.netsupport.enums.Attribute;
|
||||
import love.sola.netsupport.pojo.Operator;
|
||||
import love.sola.netsupport.sql.SQLCore;
|
||||
import love.sola.netsupport.util.Checker;
|
||||
import love.sola.netsupport.util.Crypto;
|
||||
import love.sola.netsupport.util.ParseUtil;
|
||||
import me.chanjar.weixin.common.session.WxSession;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.annotation.WebServlet;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
|
||||
/**
|
||||
* ***********************************************
|
||||
* Created by Sola on 2015/12/12.
|
||||
* Don't modify this source without my agreement
|
||||
* ***********************************************
|
||||
*/
|
||||
@WebServlet(name = "Login", urlPatterns = "/api/login", loadOnStartup = 31)
|
||||
public class Login extends HttpServlet {
|
||||
|
||||
private Gson gson = SQLCore.gson;
|
||||
|
||||
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
|
||||
doGet(request, response);
|
||||
}
|
||||
|
||||
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
|
||||
request.setCharacterEncoding("utf-8");
|
||||
response.setCharacterEncoding("utf-8");
|
||||
response.addHeader("Content-type", "text/json;charset=utf-8");
|
||||
PrintWriter out = response.getWriter();
|
||||
String json = gson.toJson(login(request));
|
||||
out.println(ParseUtil.parseJsonP(request, json));
|
||||
out.close();
|
||||
}
|
||||
|
||||
private Response login(HttpServletRequest request) {
|
||||
String password = request.getParameter("pass");
|
||||
if (Checker.hasNull(password)) return new Response(Response.ResponseCode.PARAMETER_REQUIRED);
|
||||
|
||||
WxSession session = Checker.isOperator(request);
|
||||
if (session == null) {
|
||||
return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
}
|
||||
Operator operator = (Operator) session.getAttribute(Attribute.OPERATOR);
|
||||
|
||||
if (!Crypto.check(password,operator.getPassword()))
|
||||
return new Response(Response.ResponseCode.WRONG_PASSWORD);
|
||||
else
|
||||
return new Response(Response.ResponseCode.OK, operator);
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,14 @@ package love.sola.netsupport.api.admin;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import love.sola.netsupport.api.Response;
|
||||
import love.sola.netsupport.enums.Attribute;
|
||||
import love.sola.netsupport.pojo.Operator;
|
||||
import love.sola.netsupport.pojo.Ticket;
|
||||
import love.sola.netsupport.sql.SQLCore;
|
||||
import love.sola.netsupport.util.Checker;
|
||||
import love.sola.netsupport.util.ParseUtil;
|
||||
import love.sola.netsupport.wechat.Command;
|
||||
import me.chanjar.weixin.common.session.WxSession;
|
||||
import org.hibernate.HibernateException;
|
||||
import org.hibernate.Session;
|
||||
|
||||
@@ -15,7 +18,6 @@ import javax.servlet.annotation.WebServlet;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
|
||||
@@ -50,13 +52,12 @@ public class TicketUpdate extends HttpServlet {
|
||||
String remark = request.getParameter("remark");
|
||||
String status = request.getParameter("status");
|
||||
if (Checker.hasNull(ticket, remark, status)) return new Response(Response.ResponseCode.PARAMETER_REQUIRED);
|
||||
|
||||
WxSession session = Checker.isAuthorized(request, Command.LOGIN);
|
||||
if (session == null) {
|
||||
return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
}
|
||||
try (Session s = SQLCore.sf.openSession()) {
|
||||
HttpSession httpSession = request.getSession(false);
|
||||
if (!Checker.isOperator(httpSession)) {
|
||||
return new Response(Response.ResponseCode.UNAUTHORIZED);
|
||||
}
|
||||
Operator op = (Operator) httpSession.getAttribute("operator");
|
||||
Operator op = (Operator) session.getAttribute(Attribute.OPERATOR);
|
||||
Ticket t = s.get(Ticket.class, Integer.parseInt(ticket));
|
||||
if (t == null) {
|
||||
return new Response(Response.ResponseCode.TICKET_NOT_FOUND);
|
||||
|
||||
Reference in New Issue
Block a user