diff --git a/.gitignore b/.gitignore index f875c8e..67f58ca 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,4 @@ out/ .DS_Store .classpath /target -/src/main/webapp/META-INF/context.xml .project \ No newline at end of file diff --git a/pom.xml b/pom.xml index c101a5b..08c5ace 100644 --- a/pom.xml +++ b/pom.xml @@ -1,162 +1,168 @@ - - 4.0.0 - WechatTicketSystem - love.sola.netsupport - WechatTicketSystem - 1.4-SNAPSHOT - war + + 4.0.0 + WechatTicketSystem + love.sola.netsupport + WechatTicketSystem + 1.4-SNAPSHOT + war - - UTF-8 - 1.8 - 1.8 - 1.8 - + + UTF-8 + 1.8 + 1.8 + 1.8 + - - scm:svn:http://127.0.0.1/dummy - scm:svn:https://127.0.0.1/dummy - HEAD - http://127.0.0.1/dummy - + + scm:svn:http://127.0.0.1/dummy + scm:svn:https://127.0.0.1/dummy + HEAD + http://127.0.0.1/dummy + - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.4 - - {0,number,0000} - - buildNumber0 - - false - false - unknown - - - - validate - - create - - - - - - ${project.artifactId}##${buildNumber} - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + 1.8 + 1.8 + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + {0,number,0000} + + buildNumber0 + + false + false + unknown + + + + validate + + create + + + + + + ${project.artifactId}##${buildNumber} + - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - org.projectlombok - lombok - 1.16.6 - provided - - - junit - junit - 4.12 - test - - - org.slf4j - slf4j-simple - 1.7.12 - - - com.google.guava - guava - 19.0-rc2 - - - com.google.code.gson - gson - 2.4 - - - org.apache.commons - commons-io - 1.3.2 - - - org.apache.commons - commons-lang3 - 3.4 - - - commons-net - commons-net - 3.3 - - - me.chanjar - weixin-java-mp - 1.3.3 - - - com.mchange - c3p0 - 0.9.5.1 - - - mysql - mysql-connector-java - 5.1.37 - - - org.hibernate - hibernate-core - 5.0.3.Final - - - org.hibernate - hibernate-entitymanager - 5.0.3.Final - - - org.hibernate - hibernate-c3p0 - 5.0.3.Final - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - 1.0.0.Final - - - org.hibernate - hibernate-envers - 5.0.3.Final - - - de.svenkubiak - jBCrypt - 0.4 - - - org.yaml - snakeyaml - 1.16 - - + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + org.projectlombok + lombok + 1.16.6 + provided + + + junit + junit + 4.12 + test + + + org.slf4j + slf4j-simple + 1.7.12 + + + com.google.guava + guava + 19.0-rc2 + + + com.google.code.gson + gson + 2.4 + + + org.apache.commons + commons-io + 1.3.2 + + + org.apache.commons + commons-lang3 + 3.4 + + + commons-net + commons-net + 3.3 + + + me.chanjar + weixin-java-mp + 1.3.3 + + + com.mchange + c3p0 + 0.9.5.1 + + + mysql + mysql-connector-java + 5.1.37 + + + org.hibernate + hibernate-core + 5.0.3.Final + + + org.hibernate + hibernate-entitymanager + 5.0.3.Final + + + org.hibernate + hibernate-c3p0 + 5.0.3.Final + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + 1.0.0.Final + + + org.hibernate + hibernate-envers + 5.0.3.Final + + + de.svenkubiak + jBCrypt + 0.4 + + + org.yaml + snakeyaml + 1.16 + + + org.reflections + reflections + 0.9.10 + + \ No newline at end of file diff --git a/src/main/java/love/sola/netsupport/api/API.java b/src/main/java/love/sola/netsupport/api/API.java index cf90934..ac4bada 100644 --- a/src/main/java/love/sola/netsupport/api/API.java +++ b/src/main/java/love/sola/netsupport/api/API.java @@ -1,8 +1,8 @@ package love.sola.netsupport.api; import love.sola.netsupport.enums.Access; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/love/sola/netsupport/api/APIRouter.java b/src/main/java/love/sola/netsupport/api/APIRouter.java index c03049d..1a19cc7 100644 --- a/src/main/java/love/sola/netsupport/api/APIRouter.java +++ b/src/main/java/love/sola/netsupport/api/APIRouter.java @@ -1,15 +1,15 @@ package love.sola.netsupport.api; -import com.google.common.reflect.ClassPath; import com.google.gson.Gson; 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.wechat.WechatSession; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.HibernateException; +import org.reflections.Reflections; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -35,21 +35,20 @@ public class APIRouter extends HttpServlet { protected static Gson gson = SQLCore.gson; private Map nodes = new HashMap<>(); - public APIRouter() { + @Override + public void init() throws ServletException { + super.init(); try { - ClassPath path = ClassPath.from(getClass().getClassLoader()); - Set classes = path.getTopLevelClassesRecursive(getClass().getPackage().getName()); - for (ClassPath.ClassInfo info : classes) { - Class clz = info.load(); - if (!API.class.equals(clz) && API.class.isAssignableFrom(clz)) { - try { - System.out.print("Loading API: " + clz.getName()); - API obj = (API) clz.newInstance(); - System.out.println("Registered API: " + obj); - nodes.put(obj.url, obj); - } catch (InstantiationException | IllegalAccessException e) { - e.printStackTrace(); - } + Reflections reflections = new Reflections(getClass().getPackage().getName()); + Set> set = reflections.getSubTypesOf(API.class); + for (Class clz : set) { + try { + System.out.println("Loading API: " + clz.getName()); + API obj = clz.newInstance(); + System.out.println("Registered API: " + obj); + nodes.put(obj.url, obj); + } catch (InstantiationException | IllegalAccessException e) { + e.printStackTrace(); } } } catch (Exception e) { @@ -66,7 +65,7 @@ public class APIRouter extends HttpServlet { resp.addHeader("Access-Control-Allow-Origin", "*"); Object obj = null; try { - API api = nodes.get(req.getRequestURI()); + API api = nodes.get(req.getPathInfo()); if (api == null) { resp.sendError(HttpServletResponse.SC_FORBIDDEN); return; @@ -82,14 +81,14 @@ public class APIRouter extends HttpServlet { return; } if (api.access == Access.USER) { - User u = (User) session.getAttribute(Attribute.USER); + User u = session.getAttribute(Attribute.USER); if (u == null) { obj = Error.UNAUTHORIZED; return; } } if (api.access < Access.USER) { - Operator op = (Operator) session.getAttribute(Attribute.OPERATOR); + Operator op = session.getAttribute(Attribute.OPERATOR); if (op == null) { obj = Error.UNAUTHORIZED; return; @@ -121,7 +120,7 @@ public class APIRouter extends HttpServlet { private static WxSession getSession(HttpServletRequest req) { String t = req.getParameter("token"); if (t == null || t.isEmpty()) return null; - return WechatSession.get(t, false); + return WechatSession.get(t); } } diff --git a/src/main/java/love/sola/netsupport/api/CheckSession.java b/src/main/java/love/sola/netsupport/api/CheckSession.java index 3a7dab9..c4d2081 100644 --- a/src/main/java/love/sola/netsupport/api/CheckSession.java +++ b/src/main/java/love/sola/netsupport/api/CheckSession.java @@ -2,7 +2,7 @@ package love.sola.netsupport.api; import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; -import me.chanjar.weixin.common.session.WxSession; +import love.sola.netsupport.session.WxSession; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; @@ -17,7 +17,7 @@ import java.util.Map; public class CheckSession extends API { public CheckSession() { - url = "/api/checksession"; + url = "/checksession"; access = Access.GUEST; authorize = null; } diff --git a/src/main/java/love/sola/netsupport/api/Login.java b/src/main/java/love/sola/netsupport/api/Login.java index d356560..7f9ef8d 100644 --- a/src/main/java/love/sola/netsupport/api/Login.java +++ b/src/main/java/love/sola/netsupport/api/Login.java @@ -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; diff --git a/src/main/java/love/sola/netsupport/api/manager/GetUser.java b/src/main/java/love/sola/netsupport/api/manager/GetUser.java index 4000782..a6711f8 100644 --- a/src/main/java/love/sola/netsupport/api/manager/GetUser.java +++ b/src/main/java/love/sola/netsupport/api/manager/GetUser.java @@ -4,9 +4,9 @@ import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import javax.servlet.http.HttpServletRequest; @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; public class GetUser extends API { public GetUser() { - url = "/api/admin/getuser"; + url = "/admin/getuser"; access = Access.LEADER; authorize = Command.LOGIN; } diff --git a/src/main/java/love/sola/netsupport/api/manager/TicketPush.java b/src/main/java/love/sola/netsupport/api/manager/TicketPush.java index a1e0eb0..e49f3de 100644 --- a/src/main/java/love/sola/netsupport/api/manager/TicketPush.java +++ b/src/main/java/love/sola/netsupport/api/manager/TicketPush.java @@ -9,10 +9,10 @@ import love.sola.netsupport.enums.Status; import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.util.Checker; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.Session; import javax.servlet.http.HttpServletRequest; @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest; public class TicketPush extends API { public TicketPush() { - url = "/api/admin/ticketpush"; + url = "/admin/ticketpush"; access = Access.LEADER; authorize = Command.LOGIN; } @@ -41,7 +41,7 @@ public class TicketPush extends API { if (desc.length() > Settings.MAX_DESC_LENGTH) { return Error.LENGTH_LIMIT_EXCEEDED; } - Operator op = (Operator) session.getAttribute(Attribute.OPERATOR); + Operator op = session.getAttribute(Attribute.OPERATOR); try (Session s = SQLCore.sf.openSession()) { s.beginTransaction(); User u = s.get(User.class, Long.parseLong(uid)); diff --git a/src/main/java/love/sola/netsupport/api/root/DashBoard.java b/src/main/java/love/sola/netsupport/api/root/DashBoard.java index be8e58c..ca39861 100644 --- a/src/main/java/love/sola/netsupport/api/root/DashBoard.java +++ b/src/main/java/love/sola/netsupport/api/root/DashBoard.java @@ -2,13 +2,12 @@ package love.sola.netsupport.api.root; import love.sola.netsupport.api.API; import love.sola.netsupport.enums.Access; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; -import me.chanjar.weixin.common.session.InternalSession; -import me.chanjar.weixin.common.session.WxSession; import javax.servlet.http.HttpServletRequest; -import java.util.Enumeration; +import java.util.Set; /** * *********************************************** @@ -19,7 +18,7 @@ import java.util.Enumeration; public class DashBoard extends API { public DashBoard() { - url = "/api/root/dashboard"; + url = "/root/dashboard"; access = Access.ROOT; authorize = Command.LOGIN; } @@ -27,13 +26,11 @@ public class DashBoard extends API { @Override protected Object process(HttpServletRequest req, WxSession session) throws Exception { StringBuilder sb = new StringBuilder(); - for (InternalSession s : WechatSession.list()) { - sb.append("=====").append(s.getIdInternal()).append("=====\n"); - WxSession ws = s.getSession(); - Enumeration e = ws.getAttributeNames(); - while (e.hasMoreElements()) { - String key = e.nextElement(); - sb.append(key).append(": ").append(ws.getAttribute(key)).append("\n"); + for (love.sola.netsupport.session.WxSession ws : WechatSession.list()) { + sb.append("=====").append(ws.getId()).append("=====\n"); + Set e = ws.getAttributeNames(); + for (String key : e) { + sb.append(key).append(": ").append(ws.getAttribute(key).toString()).append("\n"); } } return sb.toString(); diff --git a/src/main/java/love/sola/netsupport/api/root/FlushCache.java b/src/main/java/love/sola/netsupport/api/root/FlushCache.java index 5e65075..dabfe7d 100644 --- a/src/main/java/love/sola/netsupport/api/root/FlushCache.java +++ b/src/main/java/love/sola/netsupport/api/root/FlushCache.java @@ -3,9 +3,9 @@ package love.sola.netsupport.api.root; import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import javax.servlet.http.HttpServletRequest; @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; public class FlushCache extends API { public FlushCache() { - url = "/api/root/flushcache"; + url = "/root/flushcache"; access = Access.ROOT; authorize = Command.LOGIN; } diff --git a/src/main/java/love/sola/netsupport/api/root/SetPassword.java b/src/main/java/love/sola/netsupport/api/root/SetPassword.java index ec4b2da..069309d 100644 --- a/src/main/java/love/sola/netsupport/api/root/SetPassword.java +++ b/src/main/java/love/sola/netsupport/api/root/SetPassword.java @@ -4,10 +4,10 @@ import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; import love.sola.netsupport.pojo.Operator; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.util.Crypto; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.Session; import javax.servlet.http.HttpServletRequest; @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; public class SetPassword extends API { public SetPassword() { - url = "/api/root/setpass"; + url = "/root/setpass"; access = Access.ROOT; authorize = Command.LOGIN; } diff --git a/src/main/java/love/sola/netsupport/api/stuff/TicketLog.java b/src/main/java/love/sola/netsupport/api/stuff/TicketLog.java index 07f5f43..18f1173 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketLog.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketLog.java @@ -3,10 +3,10 @@ package love.sola.netsupport.api.stuff; import love.sola.netsupport.api.API; import love.sola.netsupport.enums.Access; import love.sola.netsupport.pojo.Ticket; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.apache.commons.lang3.time.DateUtils; import org.hibernate.Session; import org.hibernate.envers.AuditReader; @@ -28,7 +28,7 @@ public class TicketLog extends API { public static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); public TicketLog() { - url = "/api/admin/ticketlog"; + url = "/admin/ticketlog"; access = Access.MEMBER; authorize = Command.LOGIN; } diff --git a/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java b/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java index 7032bce..298ba50 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java @@ -4,9 +4,9 @@ import love.sola.netsupport.api.API; import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Operator; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import javax.servlet.http.HttpServletRequest; @@ -19,14 +19,14 @@ import javax.servlet.http.HttpServletRequest; public class TicketLookup extends API { public TicketLookup() { - url = "/api/admin/ticketlookup"; + url = "/admin/ticketlookup"; access = Access.MEMBER; authorize = Command.LOGIN; } @Override protected Object process(HttpServletRequest req, WxSession session) throws Exception { - Operator op = (Operator) session.getAttribute(Attribute.OPERATOR); + Operator op = session.getAttribute(Attribute.OPERATOR); int block; if (req.getParameter("block") != null) { block = Integer.parseInt(req.getParameter("block")); diff --git a/src/main/java/love/sola/netsupport/api/stuff/TicketTrack.java b/src/main/java/love/sola/netsupport/api/stuff/TicketTrack.java index 789b7bb..8343e2e 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketTrack.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketTrack.java @@ -3,9 +3,9 @@ package love.sola.netsupport.api.stuff; import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import javax.servlet.http.HttpServletRequest; @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; public class TicketTrack extends API { public TicketTrack() { - url = "/api/admin/tickettrack"; + url = "/admin/tickettrack"; access = Access.MEMBER; authorize = Command.LOGIN; } diff --git a/src/main/java/love/sola/netsupport/api/stuff/TicketUpdate.java b/src/main/java/love/sola/netsupport/api/stuff/TicketUpdate.java index 2d995da..813714d 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketUpdate.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketUpdate.java @@ -6,10 +6,10 @@ import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.Ticket; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.util.Checker; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.Session; import javax.servlet.http.HttpServletRequest; @@ -24,7 +24,7 @@ import java.util.Date; public class TicketUpdate extends API { public TicketUpdate() { - url = "/api/admin/ticketupdate"; + url = "/admin/ticketupdate"; access = Access.MEMBER; authorize = Command.LOGIN; } @@ -36,7 +36,7 @@ public class TicketUpdate extends API { String status = req.getParameter("status"); if (Checker.hasNull(ticket, remark, status)) return Error.PARAMETER_REQUIRED; try (Session s = SQLCore.sf.openSession()) { - Operator op = (Operator) session.getAttribute(Attribute.OPERATOR); + Operator op = session.getAttribute(Attribute.OPERATOR); Ticket t = s.get(Ticket.class, Integer.parseInt(ticket)); if (t == null) { return Error.TICKET_NOT_FOUND; diff --git a/src/main/java/love/sola/netsupport/api/user/ProfileModify.java b/src/main/java/love/sola/netsupport/api/user/ProfileModify.java index 99bd52e..07e5b54 100644 --- a/src/main/java/love/sola/netsupport/api/user/ProfileModify.java +++ b/src/main/java/love/sola/netsupport/api/user/ProfileModify.java @@ -6,9 +6,9 @@ import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.ISP; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.exception.ConstraintViolationException; import javax.servlet.http.HttpServletRequest; @@ -24,14 +24,14 @@ import static love.sola.netsupport.util.Checker.*; public class ProfileModify extends API { public ProfileModify() { - url = "/api/profilemodify"; + url = "/profilemodify"; access = Access.USER; authorize = Command.PROFILE; } @Override protected Object process(HttpServletRequest req, WxSession session) throws Exception { - User u = (User) session.getAttribute(Attribute.USER); + User u = session.getAttribute(Attribute.USER); ISP isp = checkISP(req.getParameter("isp")); String netAccount = checkNetAccount(req.getParameter("username"), isp); int block = checkBlock(req.getParameter("block")); diff --git a/src/main/java/love/sola/netsupport/api/user/Register.java b/src/main/java/love/sola/netsupport/api/user/Register.java index 36a62a9..74eea55 100644 --- a/src/main/java/love/sola/netsupport/api/user/Register.java +++ b/src/main/java/love/sola/netsupport/api/user/Register.java @@ -6,12 +6,12 @@ import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.ISP; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.WxMpServlet; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.mp.bean.WxMpCustomMessage; import org.hibernate.exception.ConstraintViolationException; @@ -32,14 +32,14 @@ import static love.sola.netsupport.util.Checker.*; public class Register extends API { public Register() { - url = "/api/register"; + url = "/register"; access = Access.GUEST; authorize = Command.REGISTER; } @Override protected Object process(HttpServletRequest req, WxSession session) throws Exception { - String wechat = (String) session.getAttribute(Attribute.WECHAT); + String wechat = session.getAttribute(Attribute.WECHAT); if (wechat == null) { return Error.UNAUTHORIZED; } diff --git a/src/main/java/love/sola/netsupport/api/user/TicketQuery.java b/src/main/java/love/sola/netsupport/api/user/TicketQuery.java index 02c0522..b302f5f 100644 --- a/src/main/java/love/sola/netsupport/api/user/TicketQuery.java +++ b/src/main/java/love/sola/netsupport/api/user/TicketQuery.java @@ -5,9 +5,9 @@ import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.criterion.Order; @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; public class TicketQuery extends API { public TicketQuery() { - url = "/api/ticketquery"; + url = "/ticketquery"; access = Access.USER; authorize = Command.QUERY; } @@ -32,7 +32,7 @@ public class TicketQuery extends API { @Override protected Object process(HttpServletRequest req, WxSession session) throws Exception { try (Session s = SQLCore.sf.openSession()) { - User u = (User) session.getAttribute(Attribute.USER); + User u = session.getAttribute(Attribute.USER); Criteria c = s.createCriteria(Ticket.class); int first = req.getParameter("offset") == null ? 0 : Integer.parseInt(req.getParameter("offset")); int limit = req.getParameter("limit") == null ? 5 : Integer.parseInt(req.getParameter("limit")); diff --git a/src/main/java/love/sola/netsupport/api/user/TicketSubmit.java b/src/main/java/love/sola/netsupport/api/user/TicketSubmit.java index 8ae97ee..f8d170b 100644 --- a/src/main/java/love/sola/netsupport/api/user/TicketSubmit.java +++ b/src/main/java/love/sola/netsupport/api/user/TicketSubmit.java @@ -7,10 +7,10 @@ import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.wechat.Command; -import me.chanjar.weixin.common.session.WxSession; import org.hibernate.Session; import javax.servlet.http.HttpServletRequest; @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; public class TicketSubmit extends API { public TicketSubmit() { - url = "/api/ticketsubmit"; + url = "/ticketsubmit"; access = Access.USER; authorize = Command.SUBMIT; } @@ -40,7 +40,7 @@ public class TicketSubmit extends API { } try (Session s = SQLCore.sf.openSession()) { - User u = (User) session.getAttribute(Attribute.USER); + User u = session.getAttribute(Attribute.USER); if (TableTicket.hasOpen(u)) { session.invalidate(); return Error.ALREADY_SUBMITTED; diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2.java b/src/main/java/love/sola/netsupport/auth/OAuth2.java index 093d3d8..7008a1d 100644 --- a/src/main/java/love/sola/netsupport/auth/OAuth2.java +++ b/src/main/java/love/sola/netsupport/auth/OAuth2.java @@ -1,12 +1,11 @@ package love.sola.netsupport.auth; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.util.Checker; -import love.sola.netsupport.wechat.WechatSession; import love.sola.netsupport.wechat.WxMpServlet; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; -import me.chanjar.weixin.mp.bean.result.WxMpUser; import javax.servlet.AsyncContext; import javax.servlet.ServletException; @@ -15,6 +14,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; /** * *********************************************** @@ -22,9 +23,20 @@ import java.io.IOException; * Don't modify this source without my agreement * *********************************************** */ -@WebServlet(name = "OAuth2", urlPatterns = "/oauth2/callback", loadOnStartup = 21) +@WebServlet(name = "OAuth2", urlPatterns = "/oauth2/callback", loadOnStartup = 21, asyncSupported = true) public class OAuth2 extends HttpServlet { + private static Map oAuth2HandlerMap = new HashMap<>(); + + /** + * for {@link love.sola.netsupport.wechat.WxMpServlet#registerCommands} + * @param state the state key from open platform callback. + * @param handler handler + */ + public static void registerOAuth2Handler(String state, OAuth2Handler handler) { + oAuth2HandlerMap.put(state, handler); + } + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { AsyncContext acxt = req.startAsync(); @@ -34,13 +46,19 @@ public class OAuth2 extends HttpServlet { resp.sendError(HttpServletResponse.SC_FORBIDDEN); return; } + OAuth2Handler handler = oAuth2HandlerMap.get(state); + if (handler == null) { + resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); + return; + } acxt.start(() -> { try { WxMpService wxMpService = WxMpServlet.instance.wxMpService; WxMpOAuth2AccessToken token = wxMpService.oauth2getAccessToken(code); - WxMpUser wxUser = wxMpService.oauth2getUserInfo(token, "zh_CN"); - String sid = WechatSession.genId(); - WxSession session = WechatSession.get(sid, true); + String wechat = token.getOpenId(); + WxSession session = WechatSession.create(); + handler.onOAuth2(acxt, (HttpServletResponse) acxt.getResponse(), wechat, session); + acxt.complete(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java b/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java new file mode 100644 index 0000000..6103d74 --- /dev/null +++ b/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java @@ -0,0 +1,18 @@ +package love.sola.netsupport.auth; + +import love.sola.netsupport.session.WxSession; + +import javax.servlet.AsyncContext; +import javax.servlet.http.HttpServletResponse; + +/** + * *********************************************** + * Created by Sola on 2016/3/26. + * Don't modify this source without my agreement + * *********************************************** + */ +public interface OAuth2Handler { + + void onOAuth2(AsyncContext acxt, HttpServletResponse resp, String user, WxSession session); + +} diff --git a/src/main/java/love/sola/netsupport/session/MapSession.java b/src/main/java/love/sola/netsupport/session/MapSession.java new file mode 100644 index 0000000..9b8741f --- /dev/null +++ b/src/main/java/love/sola/netsupport/session/MapSession.java @@ -0,0 +1,88 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package love.sola.netsupport.session; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +/** + * @author Sola + */ +@EqualsAndHashCode(of = "id") +public final class MapSession implements WxSession, Serializable { + + @Getter + private final String id; + private Map sessionAttrs = new HashMap(); + @Getter + private long creationTime = System.currentTimeMillis(); + @Getter + @Setter + private long lastAccessedTime = creationTime; + @Getter + private boolean invalidated = false; + + /** + * Creates a new instance with a secure randomly generated identifier. + */ + public MapSession() { + this(UUID.randomUUID().toString()); + } + + /** + * Creates a new instance with the specified id. This is preferred to the + * default constructor when the id is known to prevent unnecessary consumption on + * entropy which can be slow. + * + * @param id the identifier to use + */ + public MapSession(String id) { + this.id = id; + } + + @SuppressWarnings("unchecked") + public T getAttribute(String attributeName) { + return (T) sessionAttrs.get(attributeName); + } + + public Set getAttributeNames() { + return sessionAttrs.keySet(); + } + + public void setAttribute(String attributeName, Object attributeValue) { + if (attributeValue == null) { + removeAttribute(attributeName); + } else { + sessionAttrs.put(attributeName, attributeValue); + } + } + + public void removeAttribute(String attributeName) { + sessionAttrs.remove(attributeName); + } + + public void invalidate() { + invalidated = true; + } + +} \ No newline at end of file diff --git a/src/main/java/love/sola/netsupport/session/MapSessionRepository.java b/src/main/java/love/sola/netsupport/session/MapSessionRepository.java new file mode 100644 index 0000000..37b3284 --- /dev/null +++ b/src/main/java/love/sola/netsupport/session/MapSessionRepository.java @@ -0,0 +1,85 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package love.sola.netsupport.session; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import love.sola.netsupport.config.Settings; +import org.apache.commons.lang3.Validate; + +import javax.annotation.Nonnull; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +/** + * @author Sola + */ +public class MapSessionRepository { + + private final LoadingCache sessions; + + public MapSessionRepository() { + this(CacheBuilder.newBuilder() + .concurrencyLevel(4) + .maximumSize(65535) + .expireAfterAccess(Settings.I.User_Session_Max_Inactive, TimeUnit.SECONDS) + .build(new CacheLoader() { + @Override + public MapSession load(@Nonnull String key) throws Exception { + return new MapSession(key); + } + } + ) + ); + } + + public MapSessionRepository(LoadingCache sessions) { + Validate.notNull(sessions); + this.sessions = sessions; + } + + public void save(MapSession session) { + sessions.put(session.getId(), session); + } + + public MapSession getSession(String id) { + MapSession saved = sessions.getIfPresent(id); + if (saved == null) { + return null; + } + if (saved.isInvalidated()) { + delete(saved.getId()); + return null; + } + return saved; + } + + public void delete(String id) { + sessions.invalidate(id); + } + + public MapSession createSession() { + MapSession session = new MapSession(); + save(session); + return session; + } + + public Map asMap() { + return sessions.asMap(); + } + +} diff --git a/src/main/java/love/sola/netsupport/session/WechatSession.java b/src/main/java/love/sola/netsupport/session/WechatSession.java new file mode 100644 index 0000000..d731838 --- /dev/null +++ b/src/main/java/love/sola/netsupport/session/WechatSession.java @@ -0,0 +1,32 @@ +package love.sola.netsupport.session; + + +import java.util.Collection; + +/** + * *********************************************** + * Created by Sola on 2015/12/14. + * Don't modify this source without my agreement + * *********************************************** + */ +public class WechatSession { + + private static MapSessionRepository repository; + + static { + repository = new MapSessionRepository(); + } + + public static WxSession get(String id) { + return repository.getSession(id); + } + + public static WxSession create() { + return repository.createSession(); + } + + public static Collection list() { + return repository.asMap().values(); + } + +} diff --git a/src/main/java/love/sola/netsupport/session/WxSession.java b/src/main/java/love/sola/netsupport/session/WxSession.java new file mode 100644 index 0000000..d7dd4a9 --- /dev/null +++ b/src/main/java/love/sola/netsupport/session/WxSession.java @@ -0,0 +1,22 @@ +package love.sola.netsupport.session; + +import java.util.Set; + +/** + * @author Sola + */ +public interface WxSession { + + String getId(); + + T getAttribute(String name); + + Set getAttributeNames(); + + void setAttribute(String name, Object value); + + void removeAttribute(String name); + + void invalidate(); + +} \ No newline at end of file diff --git a/src/main/java/love/sola/netsupport/sql/SQLCore.java b/src/main/java/love/sola/netsupport/sql/SQLCore.java index 0277111..5d7b0c1 100644 --- a/src/main/java/love/sola/netsupport/sql/SQLCore.java +++ b/src/main/java/love/sola/netsupport/sql/SQLCore.java @@ -5,6 +5,7 @@ import com.google.gson.annotations.Expose; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import com.mchange.v2.c3p0.ComboPooledDataSource; import love.sola.netsupport.enums.ISP; import love.sola.netsupport.wechat.Command; import org.hibernate.Hibernate; @@ -18,6 +19,7 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.service.ServiceRegistry; import javax.naming.InitialContext; +import javax.naming.NamingException; import javax.sql.DataSource; import java.io.IOException; import java.util.Date; @@ -30,7 +32,10 @@ import java.util.Date; */ public class SQLCore { + public static InitialContext ic; public static DataSource ds; + public static SessionFactory sf; + public static ServiceRegistry sr; public static Gson gson = new GsonBuilder() .addSerializationExclusionStrategy(new ExclusionStrategy() { @Override @@ -64,12 +69,10 @@ public class SQLCore { .registerTypeAdapter(Command.class, (JsonSerializer) (src, typeOfSrc, context) -> new JsonPrimitive(src.id)) .registerTypeAdapterFactory(HibernateProxyTypeAdapter.FACTORY) .create(); - public static SessionFactory sf; - public static ServiceRegistry sr; static { try { - InitialContext ic = new InitialContext(); + ic = new InitialContext(); ds = (DataSource) ic.lookup("java:comp/env/jdbc/netsupport"); ds.setLoginTimeout(3); @@ -83,6 +86,16 @@ public class SQLCore { } } + public static void destroy() { + try { + SQLCore.sf.close(); + ((ComboPooledDataSource) SQLCore.ds).close(); + SQLCore.ic.close(); + } catch (NamingException e) { + e.printStackTrace(); + } + } + public static AuditReader getAuditReader(Session session) { return AuditReaderFactory.get(session); } diff --git a/src/main/java/love/sola/netsupport/sql/TableUser.java b/src/main/java/love/sola/netsupport/sql/TableUser.java index a3a4c44..b6658bc 100644 --- a/src/main/java/love/sola/netsupport/sql/TableUser.java +++ b/src/main/java/love/sola/netsupport/sql/TableUser.java @@ -72,7 +72,7 @@ public class TableUser extends SQLCore { private static LoadingCache cache = CacheBuilder.newBuilder() .concurrencyLevel(4) .maximumSize(4096) - .expireAfterWrite(Settings.I.User_Wechat_Cache_Expire_Time, TimeUnit.SECONDS) + .expireAfterAccess(Settings.I.User_Wechat_Cache_Expire_Time, TimeUnit.SECONDS) .build(new ValueLoader()); private static class ValueLoader extends CacheLoader { diff --git a/src/main/java/love/sola/netsupport/util/Checker.java b/src/main/java/love/sola/netsupport/util/Checker.java index d0cd3b5..57cbe11 100644 --- a/src/main/java/love/sola/netsupport/util/Checker.java +++ b/src/main/java/love/sola/netsupport/util/Checker.java @@ -1,13 +1,7 @@ package love.sola.netsupport.util; -import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Block; import love.sola.netsupport.enums.ISP; -import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; -import me.chanjar.weixin.common.session.WxSession; - -import javax.servlet.http.HttpServletRequest; /** * *********************************************** @@ -25,13 +19,6 @@ public class Checker { return false; } - public static WxSession isAuthorized(HttpServletRequest r, Command c) { - String t = r.getParameter("token"); - if (t == null || t.isEmpty()) return null; - WxSession s = WechatSession.get(t, false); - return s == null ? null : s.getAttribute(Attribute.AUTHORIZED) == c ? s : null; - } - public static long checkStudentId(String studentId) { if (studentId == null) return -1; if (studentId.matches(STUDENT_ID_REGEX)) { diff --git a/src/main/java/love/sola/netsupport/util/ParseUtil.java b/src/main/java/love/sola/netsupport/util/ParseUtil.java index 55aba13..ea55adb 100644 --- a/src/main/java/love/sola/netsupport/util/ParseUtil.java +++ b/src/main/java/love/sola/netsupport/util/ParseUtil.java @@ -3,7 +3,6 @@ package love.sola.netsupport.util; import love.sola.netsupport.enums.Status; import love.sola.netsupport.pojo.Ticket; -import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import static love.sola.netsupport.config.Lang.lang; @@ -30,11 +29,4 @@ public class ParseUtil { return sb.toString(); } - public static String parseJsonP(HttpServletRequest request, String json) { - String jsonp = request.getParameter("jsonp"); - if (jsonp == null || jsonp.isEmpty()) - return json; - else - return jsonp.replace("{0}", json); - } } diff --git a/src/main/java/love/sola/netsupport/util/Redirect.java b/src/main/java/love/sola/netsupport/util/Redirect.java index 1ed0eaf..54fed1f 100644 --- a/src/main/java/love/sola/netsupport/util/Redirect.java +++ b/src/main/java/love/sola/netsupport/util/Redirect.java @@ -1,5 +1,7 @@ package love.sola.netsupport.util; +import com.google.common.net.UrlEscapers; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -13,15 +15,106 @@ import static love.sola.netsupport.config.Lang.lang; */ public class Redirect { - public static final String REDIRECT_PAGE = lang("Result_Page"); + private static final String REDIRECT_PAGE = lang("Result_Page"); + + private static final int SUCCESS = 1; + private static final int ERROR = 0; + private static final int WARNING = -1; + private static final int NON_WECHAT = 88; + + public static RedirectBuilder success() { + return new RedirectBuilder(SUCCESS); + } + + public static RedirectBuilder error() { + return new RedirectBuilder(ERROR); + } + + public static class RedirectBuilder { + + private StringBuilder sb; + + RedirectBuilder(int type) { + sb = new StringBuilder(REDIRECT_PAGE).append("?"); + type(type); + } + + private RedirectBuilder type(int type) { + sb.append("type=").append(type).append("&"); + return this; + } + + public RedirectBuilder msg(String msg) { + sb.append("msg=").append(i18nThenEscape(msg)).append("&"); + return this; + } + + public RedirectBuilder title(String title) { + sb.append("title=").append(i18nThenEscape(title)).append("&"); + return this; + } + + public RedirectBuilder noButton() { + sb.append("btn=").append("hide").append("&"); + return this; + } + + public RedirectBuilder button(String text) { + sb.append("btn=").append(i18nThenEscape(text)).append("&"); + return this; + } + + public RedirectBuilder icon(WeUIIcon icon) { + sb.append("icon=").append(icon.toString()).append("&"); + return this; + } + + public RedirectBuilder to(String url) { + sb.append("redirect=").append(i18nThenEscape(url)).append("&"); + return this; + } + + public void go(HttpServletResponse resp) throws IOException { + resp.sendRedirect(sb.toString()); + } + + public String toString() { + return sb.toString(); + } + + private static String i18nThenEscape(String str) { + return UrlEscapers.urlFragmentEscaper().escape(lang(str)); + } + + } + + public enum WeUIIcon { + SUCCESS("weui_icon_success"), + SUCCESS_CIRCLE("weui_icon_success_circle"), + SUCCESS_NO_CIRCLE("weui_icon_success_no_circle"), + SUCCESS_SAFE("weui_icon_safe_success"), + INFO("weui_icon_info"), + INFO_CIRCLE("weui_icon_info_circle"), + WAITING("weui_icon_waiting"), + WAITING_CIRCLE("weui_icon_waiting_circle"), + CIRCLE("weui_icon_circle"), + WARN("weui_icon_warn"), + WARN_SAFE("weui_icon_safe_warn"), + DOWNLOAD("weui_icon_download"), + CANCEL("weui_icon_cancel"), + ; + + private String value; + + WeUIIcon(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } - public static void message(HttpServletResponse response, int type, String message) throws IOException { - response.sendRedirect( - response.encodeRedirectURL(REDIRECT_PAGE + - "?msg=" + message + - "&type=" + type - ) - ); } } diff --git a/src/main/java/love/sola/netsupport/wechat/WechatSession.java b/src/main/java/love/sola/netsupport/wechat/WechatSession.java deleted file mode 100644 index 2dd5fa7..0000000 --- a/src/main/java/love/sola/netsupport/wechat/WechatSession.java +++ /dev/null @@ -1,43 +0,0 @@ -package love.sola.netsupport.wechat; - -import love.sola.netsupport.config.Settings; -import me.chanjar.weixin.common.session.*; - -import java.util.UUID; - -/** - * *********************************************** - * Created by Sola on 2015/12/14. - * Don't modify this source without my agreement - * *********************************************** - */ -public class WechatSession { - - private static StandardSessionManager manager; - - static{ - manager = new StandardSessionManager(); - manager.setMaxInactiveInterval(Settings.I.User_Session_Max_Inactive); - } - - public static WxSession get(String id, boolean create) { - WxSession session = manager.getSession(id, create); - if (session != null) { - ((StandardSessionFacade) session).getInternalSession().endAccess(); - } - return session; - } - - public static WxSession get(String id) { - return get(id, true); - } - - public static String genId() { - return UUID.randomUUID().toString(); - } - - public static InternalSession[] list() { - return manager.findSessions(); - } - -} diff --git a/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java b/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java index 83ee37f..7ee688b 100644 --- a/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java +++ b/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java @@ -1,6 +1,9 @@ package love.sola.netsupport.wechat; +import love.sola.netsupport.auth.OAuth2; +import love.sola.netsupport.auth.OAuth2Handler; import love.sola.netsupport.config.Settings; +import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.wechat.handler.RegisterHandler; import love.sola.netsupport.wechat.handler.SubscribeHandler; import love.sola.netsupport.wechat.matcher.CheckSpamMatcher; @@ -86,6 +89,9 @@ public class WxMpServlet extends HttpServlet { WxMpMessageHandler handler = c.handler.newInstance(); router.rule().async(false).msgType(WxConsts.XML_MSG_TEXT).rContent(c.regex).handler(handler).end(); router.rule().async(false).msgType(WxConsts.XML_MSG_EVENT).event(WxConsts.EVT_CLICK).eventKey(c.name()).handler(handler).end(); + if (handler instanceof OAuth2Handler) { + OAuth2.registerOAuth2Handler(c.name(), (OAuth2Handler) handler); + } } } @@ -153,4 +159,8 @@ public class WxMpServlet extends HttpServlet { doPost(req, resp); } + @Override + public void destroy() { + SQLCore.destroy(); + } } diff --git a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java index 67a2b9f..4728823 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java @@ -2,11 +2,11 @@ package love.sola.netsupport.wechat.handler; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpService; @@ -29,13 +29,12 @@ public class ProfileHandler implements WxMpMessageHandler { @Override public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException { User u = TableUser.getByWechat(wxMessage.getFromUserName()); - String id = WechatSession.genId(); - WxSession session = WechatSession.get(id, true); + WxSession session = WechatSession.create(); session.setAttribute(Attribute.AUTHORIZED, Command.PROFILE); session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName()); session.setAttribute(Attribute.USER, u); TextBuilder out = WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName()); - out.content(format("Profile_Modify", format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone()))); + out.content(format("Profile_Modify", format("User_Profile_Link", session.getId(), u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone()))); return out.build(); } diff --git a/src/main/java/love/sola/netsupport/wechat/handler/QueryHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/QueryHandler.java index eb0c228..f868461 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/QueryHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/QueryHandler.java @@ -3,13 +3,13 @@ package love.sola.netsupport.wechat.handler; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.util.ParseUtil; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpService; @@ -40,8 +40,7 @@ public class QueryHandler implements WxMpMessageHandler { return WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName()) .content(lang("No_Ticket_Available")).build(); } - String id = WechatSession.genId(); - WxSession session = WechatSession.get(id, true); + WxSession session = WechatSession.create(); session.setAttribute(Attribute.AUTHORIZED, Command.QUERY); session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName()); session.setAttribute(Attribute.USER, u); @@ -50,7 +49,7 @@ public class QueryHandler implements WxMpMessageHandler { WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); item.setTitle(lang("Query_Title")); item.setDescription(ParseUtil.parseTicket(t) + "\n" + lang("More_Details")); - item.setUrl(format("User_Query_Link", id)); + item.setUrl(format("User_Query_Link", session.getId())); out.addArticle(item); return out.build(); } diff --git a/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java index e65e6da..7bce4db 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java @@ -2,11 +2,11 @@ package love.sola.netsupport.wechat.handler; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpService; @@ -32,17 +32,16 @@ public class RegisterHandler implements WxMpMessageHandler { TextBuilder out = WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName()); String fromUser = wxMessage.getFromUserName(); User u = TableUser.getByWechat(fromUser); - String id = WechatSession.genId(); - WxSession session = WechatSession.get(id, true); + WxSession session = WechatSession.create(); if (u != null) { session.setAttribute(Attribute.AUTHORIZED, Command.PROFILE); session.setAttribute(Attribute.WECHAT, fromUser); session.setAttribute(Attribute.USER, u); - out.content(format("Already_Registered", format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone()))); + out.content(format("Already_Registered", format("User_Profile_Link", session.getId(), u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone()))); } else { session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER); session.setAttribute(Attribute.WECHAT, fromUser); - out.content(format("User_Register", format("User_Register_Link", id))); + out.content(format("User_Register", format("User_Register_Link", session.getId()))); } return out.build(); } diff --git a/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java index 36a4e2c..09c71ec 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java @@ -2,12 +2,12 @@ package love.sola.netsupport.wechat.handler; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.User; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpService; @@ -36,8 +36,7 @@ public class SubmitHandler implements WxMpMessageHandler { return WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName()) .content(lang("Already_Opening_Ticket")).build(); } - String id = WechatSession.genId(); - WxSession session = WechatSession.get(id, true); + WxSession session = WechatSession.create(); session.setAttribute(Attribute.AUTHORIZED, Command.SUBMIT); session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName()); session.setAttribute(Attribute.USER, u); @@ -46,7 +45,7 @@ public class SubmitHandler implements WxMpMessageHandler { WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); item.setTitle(lang("Submit_Title")); item.setDescription(lang("Submit_Desc")); - item.setUrl(format("User_Submit_Link", id, u.getName(), u.getIsp().id, u.getRoom(), u.getBlock(), u.getPhone())); + item.setUrl(format("User_Submit_Link", session.getId(), u.getName(), u.getIsp().id, u.getRoom(), u.getBlock(), u.getPhone())); out.addArticle(item); return out.build(); } diff --git a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java index 7caa86a..962060a 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java @@ -4,12 +4,12 @@ import love.sola.netsupport.api.user.Register; 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.TableOperator; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpService; @@ -34,13 +34,12 @@ public class SubscribeHandler implements WxMpMessageHandler { TextBuilder out = WxMpXmlOutMessage.TEXT().fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName()); String fromUser = wxMessage.getFromUserName(); User u = TableUser.getByWechat(fromUser); - String id = WechatSession.genId(); - WxSession session = WechatSession.get(id, true); + WxSession session = WechatSession.create(); if (u != null) { session.setAttribute(Attribute.AUTHORIZED, Command.PROFILE); session.setAttribute(Attribute.WECHAT, fromUser); session.setAttribute(Attribute.USER, u); - out.content(format("Event_Subscribe", format("Already_Registered", format("User_Profile_Link", id, u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone())))); + out.content(format("Event_Subscribe", format("Already_Registered", format("User_Profile_Link", session.getId(), u.getName(), u.getIsp().id, u.getNetAccount(), u.getBlock(), u.getRoom(), u.getPhone())))); Operator op = TableOperator.get(fromUser); if (op != null) { @@ -51,7 +50,7 @@ public class SubscribeHandler implements WxMpMessageHandler { } else { session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER); session.setAttribute(Attribute.WECHAT, fromUser); - out.content(format("Event_Subscribe", format("User_Register", format("User_Register_Link", id)))); + out.content(format("Event_Subscribe", format("User_Register", format("User_Register_Link", session.getId())))); } return out.build(); } diff --git a/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java index 9089a4a..1117ef6 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/admin/LoginHandler.java @@ -1,13 +1,15 @@ package love.sola.netsupport.wechat.handler.admin; +import love.sola.netsupport.auth.OAuth2Handler; import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Operator; +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableOperator; +import love.sola.netsupport.util.Redirect; import love.sola.netsupport.wechat.Command; -import love.sola.netsupport.wechat.WechatSession; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.session.WxSession; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpService; @@ -15,6 +17,8 @@ import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; +import javax.servlet.AsyncContext; +import javax.servlet.http.HttpServletResponse; import java.util.Map; import static love.sola.netsupport.config.Lang.format; @@ -26,7 +30,7 @@ import static love.sola.netsupport.config.Lang.lang; * Don't modify this source without my agreement * *********************************************** */ -public class LoginHandler implements WxMpMessageHandler { +public class LoginHandler implements WxMpMessageHandler, OAuth2Handler { @Override public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map context, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException { @@ -38,14 +42,12 @@ public class LoginHandler implements WxMpMessageHandler { else if (operator.getAccess() >= Access.NO_LOGIN) { out.content(lang("No_Login")); } else { - String id = WechatSession.genId(); - WxSession session = WechatSession.get(id, true); + WxSession session = WechatSession.create(); session.setAttribute(Attribute.AUTHORIZED, Command.LOGIN); session.setAttribute(Attribute.WECHAT, wxMessage.getFromUserName()); session.setAttribute(Attribute.OPERATOR, operator); - out.content(format("Operator_Home_Page", id)); + out.content(format("Home_Page_Msg", format("Operator_Home_Page", session.getId()))); } - } catch (Exception e) { e.printStackTrace(); out.content(lang("Login_Error")); @@ -53,4 +55,28 @@ public class LoginHandler implements WxMpMessageHandler { return out.build(); } + + @Override + public void onOAuth2(AsyncContext acxt, HttpServletResponse resp, String user, WxSession session) { + try { + Operator operator = TableOperator.get(user); + if (operator == null) { + Redirect.error().icon(Redirect.WeUIIcon.WARN_SAFE).noButton() + .title("Not_Operator").msg("Not_Operator_OAuth2").go(resp); + return; + } + if (operator.getAccess() >= Access.NO_LOGIN) { + Redirect.error().icon(Redirect.WeUIIcon.WAITING).noButton() + .title("Left_Operator_Title").msg("Left_Operator").go(resp); + return; + } + session.setAttribute(Attribute.AUTHORIZED, Command.LOGIN); + session.setAttribute(Attribute.WECHAT, user); + session.setAttribute(Attribute.OPERATOR, operator); + resp.sendRedirect(format("Operator_Home_Page", session.getId())); + } catch (Exception e) { + e.printStackTrace(); + } + } + } diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index aafdf3c..c2ea928 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -43,15 +43,19 @@ Cancel_Failed: '取消失败。' #Modify Profile_Modify: '> 点此修改资料 <' #Login +Home_Page_Msg: 'CLICK HERE' Not_Operator: '嘟嘟嘟……' +Not_Operator_OAuth2: '看起来你并不是我们网维大家族的一员，但我们随时都欢迎你的加入哦！' No_Login: 'Permission Denied.' +Left_Operator_Title: '一路上有你' +Left_Operator: '网络维护科的茁壮成长离不开每一位成员的陪伴。一路上有你，感谢你对网络维护科的贡献！' Internal_Error: '啊哦，登录失败了哦。' #Operator_Info Operator_Info: | 网维成员资料: 网维ID: {0,number,#} 姓名: {1} - 岗位: {2,choice,0#'Administrator >ω<'|3#值班组长|6#正式成员|7#实习成员|} + 岗位: {2,choice,0#'Administrator >ω<'|3#值班组长|6#正式成员|7#实习成员|9#'曾经的一员(TдT)'} 值班片区: {3,choice,0#'全图 >ω<'|1#岐头片区|2#北门片区|3#东门片区|4#香灰片区|5#凤翔片区} 值班日: {4,choice,0#'2月30日 >ω<'|1#周一|2#周二|3#周三|4#周四|5#周五|6#周六|7#周日} @@ -62,7 +66,7 @@ User_Query_Link: 'http://topaz.sinaapp.com/nm/v2/user/list.html?token={0}' User_Submit_Link: 'http://topaz.sinaapp.com/nm/v2/user/rrepair.html?token={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}' User_Profile_Link: 'http://topaz.sinaapp.com/nm/v2/user/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}' Result_Page: 'http://topaz.sinaapp.com/nm/v2/result.html' -Operator_Home_Page: 'CLICK HERE' +Operator_Home_Page: 'http://topaz.sinaapp.com/nm/v2/man/home.html?token={0}' Operator_Login_Page: 'http://topaz.sinaapp.com/nm/v2/man/login.html?pkey={0}' #Localized diff --git a/src/main/resources/menu-op.json b/src/main/resources/menu-op.json index 839a3a1..dac736d 100644 --- a/src/main/resources/menu-op.json +++ b/src/main/resources/menu-op.json @@ -34,9 +34,9 @@ "key": "OPERATOR_INFO" }, { - "type": "click", + "type": "view", "name": "后台登录", - "key": "LOGIN" + "url": "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb7a8b799e494b053&redirect_uri=http%3a%2f%2fwcs.sola.love%2foauth2%2fcallback&response_type=code&scope=snsapi_base&state=LOGIN#wechat_redirect" } ] } diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml new file mode 100644 index 0000000..d5ea7e8 --- /dev/null +++ b/src/main/webapp/META-INF/context.xml @@ -0,0 +1,48 @@ + + + + + + + WEB-INF/web.xml + + + + + + + + \ No newline at end of file diff --git a/src/test/java/love/sola/netsupport/api/ReflectionTest.java b/src/test/java/love/sola/netsupport/api/ReflectionTest.java index 50b4197..edcaac2 100644 --- a/src/test/java/love/sola/netsupport/api/ReflectionTest.java +++ b/src/test/java/love/sola/netsupport/api/ReflectionTest.java @@ -1,34 +1,23 @@ package love.sola.netsupport.api; -import com.google.common.reflect.ClassPath; import org.junit.Test; +import org.reflections.Reflections; -import java.io.IOException; import java.util.Set; /** * *********************************************** - * Created by Sola on 2014/8/20. + * Created by Sola on 2016/3/26. * Don't modify this source without my agreement * *********************************************** */ public class ReflectionTest { @Test - public void test() throws IOException, IllegalAccessException, InstantiationException { - int count = 0; - ClassPath path = ClassPath.from(getClass().getClassLoader()); - Set classes = path.getTopLevelClassesRecursive(getClass().getPackage().getName()); - for (ClassPath.ClassInfo info : classes) { - Class clz = info.load(); - if (!API.class.equals(clz) && API.class.isAssignableFrom(clz)) { - System.out.println("Loading API: " + clz.getName()); - API obj = (API) clz.newInstance(); - System.out.println("Registered API: " + obj); - count++; - } - } - System.out.println("Total " + count + " API(s) loaded."); + public void test() { + Reflections reflections = new Reflections(getClass().getPackage().getName()); + Set> set = reflections.getSubTypesOf(API.class); + assert set.size() == 14; } } diff --git a/src/test/java/love/sola/netsupport/wechat/TestDate.java b/src/test/java/love/sola/netsupport/config/ReflectionTest.java similarity index 53% rename from src/test/java/love/sola/netsupport/wechat/TestDate.java rename to src/test/java/love/sola/netsupport/config/ReflectionTest.java index 798cddf..1d6fb5f 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestDate.java +++ b/src/test/java/love/sola/netsupport/config/ReflectionTest.java @@ -1,20 +1,18 @@ -package love.sola.netsupport.wechat; +package love.sola.netsupport.config; import org.junit.Test; -import java.util.Date; - /** * *********************************************** - * Created by Sola on 2015/12/3. + * Created by Sola on 2016/3/26. * Don't modify this source without my agreement * *********************************************** */ -public class TestDate { +public class ReflectionTest { @Test - public void test() { - System.out.println(new Date()); + public void testLang() { + assert Lang.messages != null; } } diff --git a/src/test/java/love/sola/netsupport/wechat/TestReflection.java b/src/test/java/love/sola/netsupport/enums/ReflectionTest.java similarity index 57% rename from src/test/java/love/sola/netsupport/wechat/TestReflection.java rename to src/test/java/love/sola/netsupport/enums/ReflectionTest.java index aa05a93..323c97d 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestReflection.java +++ b/src/test/java/love/sola/netsupport/enums/ReflectionTest.java @@ -1,6 +1,5 @@ -package love.sola.netsupport.wechat; +package love.sola.netsupport.enums; -import love.sola.netsupport.enums.Block; import org.junit.Test; /** @@ -9,11 +8,21 @@ import org.junit.Test; * Don't modify this source without my agreement * *********************************************** */ -public class TestReflection { +public class ReflectionTest { @Test public void testBlock() { assert Block.inverseMap != null; } + @Test + public void testAccess() { + assert Access.inverseMap != null; + } + + @Test + public void testStatus() { + assert Status.inverseMap != null; + } + } diff --git a/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java b/src/test/java/love/sola/netsupport/util/EncryptTest.java similarity index 93% rename from src/test/java/love/sola/netsupport/wechat/TestEncrypt.java rename to src/test/java/love/sola/netsupport/util/EncryptTest.java index 3b7f04e..af83d42 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java +++ b/src/test/java/love/sola/netsupport/util/EncryptTest.java @@ -1,6 +1,5 @@ -package love.sola.netsupport.wechat; +package love.sola.netsupport.util; -import love.sola.netsupport.util.RSAUtil; import org.apache.commons.codec.binary.Base64; import org.junit.Test; import org.mindrot.jbcrypt.BCrypt; @@ -16,7 +15,7 @@ import java.security.spec.X509EncodedKeySpec; * Don't modify this source without my agreement * *********************************************** */ -public class TestEncrypt { +public class EncryptTest { @Test public void testBCrypt() { diff --git a/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java b/src/test/java/love/sola/netsupport/util/GsonTest.java similarity index 71% rename from src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java rename to src/test/java/love/sola/netsupport/util/GsonTest.java index 95360f7..e6f7a3f 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java +++ b/src/test/java/love/sola/netsupport/util/GsonTest.java @@ -1,11 +1,9 @@ -package love.sola.netsupport.wechat; +package love.sola.netsupport.util; import com.google.gson.*; -import love.sola.netsupport.config.Lang; import love.sola.netsupport.enums.ISP; import org.junit.Test; -import java.text.MessageFormat; import java.util.Date; /** @@ -14,12 +12,7 @@ import java.util.Date; * Don't modify this source without my agreement * *********************************************** */ -public class TestMessageFormat { - - @Test - public void testLang() { - assert Lang.messages != null; - } +public class GsonTest { @Test public void testJsonDate() { @@ -35,14 +28,4 @@ public class TestMessageFormat { assert gson.toJson(ISP.TELECOM).equals("1"); } - @Test - public void testLong() { - assert "15838838438".equals(MessageFormat.format("{0,number,#}", 15838838438L)); - } - - @Test - public void testOpInfo() { - assert !Lang.format("Operator_Info", 1541, "Sola", 0, 0, 4).isEmpty(); - } - } diff --git a/src/test/java/love/sola/netsupport/util/URLEncodeTest.java b/src/test/java/love/sola/netsupport/util/URLEncodeTest.java new file mode 100644 index 0000000..ec11410 --- /dev/null +++ b/src/test/java/love/sola/netsupport/util/URLEncodeTest.java @@ -0,0 +1,34 @@ +package love.sola.netsupport.util; + +import com.google.common.net.UrlEscapers; +import org.junit.Test; + +import java.io.UnsupportedEncodingException; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; + +/** + * *********************************************** + * Created by Sola on 2016/3/26. + * Don't modify this source without my agreement + * *********************************************** + */ +public class URLEncodeTest { + + @Test + public void testEncode() throws UnsupportedEncodingException { + assertThat( + UrlEscapers.urlFragmentEscaper().escape("Test Title"), + equalTo("Test%20Title") + ); + assertThat( + Redirect.success() + .title("Test Title") + .msg("Test Message") + .toString(), + equalTo("http://topaz.sinaapp.com/nm/v2/result.html?type=1&title=!!Test%20Title!!&msg=!!Test%20Message!!&") + ); + } + +} diff --git a/src/test/java/love/sola/netsupport/wechat/TestRegex.java b/src/test/java/love/sola/netsupport/wechat/TestRegex.java deleted file mode 100644 index ec1e351..0000000 --- a/src/test/java/love/sola/netsupport/wechat/TestRegex.java +++ /dev/null @@ -1,21 +0,0 @@ -package love.sola.netsupport.wechat; - -import org.junit.Test; - -/** - * *********************************************** - * Created by Sola on 2015/11/26. - * Don't modify this source without my agreement - * *********************************************** - */ -public class TestRegex { - - public static final String STUDENT_ID_REGEX = "^(2012|2013|2014|2015)[0-9]{9}"; - - @Test - public void testStudentId() { - assert !"2011130201233".matches(STUDENT_ID_REGEX); - assert "2015130201233".matches(STUDENT_ID_REGEX); - } - -}