From c8dd0d630608f426ddf7907337fbd8cfd7644a53 Mon Sep 17 00:00:00 2001 From: Sola Date: Sun, 12 Aug 2018 18:29:41 +0800 Subject: [PATCH] Polish and reformatting Signed-off-by: Sola --- .editorconfig | 15 ++++++++ src/main/java/love/sola/netsupport/Index.java | 5 +-- .../java/love/sola/netsupport/api/API.java | 12 ++++--- .../love/sola/netsupport/api/APIRouter.java | 31 +++++++++-------- .../sola/netsupport/api/CheckSession.java | 9 ++--- .../java/love/sola/netsupport/api/Login.java | 20 ++++++----- .../sola/netsupport/api/manager/GetUser.java | 4 +-- .../netsupport/api/manager/TicketPush.java | 7 ++-- .../sola/netsupport/api/root/DashBoard.java | 7 ++-- .../sola/netsupport/api/root/FlushCache.java | 4 +-- .../sola/netsupport/api/root/SetPassword.java | 7 ++-- .../sola/netsupport/api/stuff/TicketLog.java | 18 +++++----- .../netsupport/api/stuff/TicketLookup.java | 4 +-- .../netsupport/api/stuff/TicketTrack.java | 4 +-- .../netsupport/api/stuff/TicketUpdate.java | 10 +++--- .../sola/netsupport/api/stuff/ToolsCheck.java | 20 ++++++----- .../netsupport/api/user/ProfileModify.java | 13 ++++--- .../sola/netsupport/api/user/Register.java | 17 +++++++--- .../sola/netsupport/api/user/TicketQuery.java | 13 +++---- .../netsupport/api/user/TicketSubmit.java | 7 ++-- .../love/sola/netsupport/auth/OAuth2.java | 19 ++++++----- .../sola/netsupport/auth/OAuth2Handler.java | 4 +-- .../java/love/sola/netsupport/enums/ISP.java | 3 +- .../love/sola/netsupport/pojo/Ticket.java | 15 ++++++-- .../love/sola/netsupport/pojo/ToolsCheck.java | 11 +++++- .../java/love/sola/netsupport/pojo/User.java | 9 +++-- .../sola/netsupport/session/MapSession.java | 8 +++-- .../session/MapSessionRepository.java | 7 ++-- .../love/sola/netsupport/sql/SQLCore.java | 23 +++++++++---- .../love/sola/netsupport/sql/TableConfig.java | 8 +++-- .../sola/netsupport/sql/TableOperator.java | 3 +- .../love/sola/netsupport/sql/TableTicket.java | 7 ++-- .../love/sola/netsupport/sql/TableUser.java | 6 ++-- .../love/sola/netsupport/util/ParseUtil.java | 7 ++-- .../love/sola/netsupport/util/Redirect.java | 6 ++-- .../love/sola/netsupport/wechat/Command.java | 12 ++++--- .../sola/netsupport/wechat/WxMpServlet.java | 21 +++++++----- .../wechat/handler/AutoReplyHandler.java | 4 +-- .../wechat/handler/CancelHandler.java | 9 ++--- .../wechat/handler/ProfileHandler.java | 9 ++--- .../wechat/handler/QueryHandler.java | 4 +-- .../wechat/handler/RegisterHandler.java | 4 +-- .../wechat/handler/SubmitHandler.java | 4 +-- .../wechat/handler/SubscribeHandler.java | 4 +-- .../wechat/handler/admin/LoginHandler.java | 9 ++--- .../handler/admin/OperatorInfoHandler.java | 4 +-- .../wechat/handler/admin/SignHandler.java | 16 ++++----- .../wechat/matcher/CheckSpamMatcher.java | 5 +-- .../wechat/matcher/CommandMatcher.java | 6 ++-- src/main/resources/hibernate.cfg.xml | 23 ++++++------- src/main/resources/lang.yml | 34 +++++++++---------- src/main/webapp/META-INF/context.xml | 29 +++++----------- src/main/webapp/WEB-INF/web.xml | 8 ++--- .../love/sola/netsupport/util/GsonTest.java | 10 ++++-- .../sola/netsupport/util/URLEncodeTest.java | 1 + 55 files changed, 343 insertions(+), 236 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..474abe5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +[*] +charset=utf-8 +end_of_line=lf +trim_trailing_whitespace=true +insert_final_newline=true +indent_style=space +indent_size=4 + +[*.json] +indent_style=space +indent_size=2 + +[{*.ddl,*.sql}] +indent_style=space +indent_size=2 diff --git a/src/main/java/love/sola/netsupport/Index.java b/src/main/java/love/sola/netsupport/Index.java index 017f314..4fe81b8 100644 --- a/src/main/java/love/sola/netsupport/Index.java +++ b/src/main/java/love/sola/netsupport/Index.java @@ -17,13 +17,14 @@ package love.sola.netsupport; +import java.io.IOException; +import java.io.PrintWriter; + 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; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/api/API.java b/src/main/java/love/sola/netsupport/api/API.java index 8929c6c..81738c6 100644 --- a/src/main/java/love/sola/netsupport/api/API.java +++ b/src/main/java/love/sola/netsupport/api/API.java @@ -17,14 +17,16 @@ package love.sola.netsupport.api; +import org.apache.commons.lang3.time.DateUtils; + +import java.util.Calendar; +import java.util.Date; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.enums.Access; import love.sola.netsupport.session.WxSession; import love.sola.netsupport.wechat.Command; -import org.apache.commons.lang3.time.DateUtils; - -import javax.servlet.http.HttpServletRequest; -import java.util.Calendar; -import java.util.Date; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/api/APIRouter.java b/src/main/java/love/sola/netsupport/api/APIRouter.java index f23bed2..a54dd18 100644 --- a/src/main/java/love/sola/netsupport/api/APIRouter.java +++ b/src/main/java/love/sola/netsupport/api/APIRouter.java @@ -18,6 +18,23 @@ package love.sola.netsupport.api; import com.google.gson.Gson; + +import org.hibernate.HibernateException; +import org.reflections.Reflections; + +import java.io.IOException; +import java.io.PrintWriter; +import java.text.ParseException; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +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 love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Operator; @@ -25,20 +42,6 @@ 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 org.hibernate.HibernateException; -import org.reflections.Reflections; - -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; -import java.text.ParseException; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/api/CheckSession.java b/src/main/java/love/sola/netsupport/api/CheckSession.java index 8dc6f23..ee3d885 100644 --- a/src/main/java/love/sola/netsupport/api/CheckSession.java +++ b/src/main/java/love/sola/netsupport/api/CheckSession.java @@ -17,14 +17,15 @@ package love.sola.netsupport.api; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.session.WxSession; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; -import java.util.Map; - /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/api/Login.java b/src/main/java/love/sola/netsupport/api/Login.java index ff26262..739c516 100644 --- a/src/main/java/love/sola/netsupport/api/Login.java +++ b/src/main/java/love/sola/netsupport/api/Login.java @@ -18,6 +18,16 @@ package love.sola.netsupport.api; import com.google.gson.Gson; + +import java.io.IOException; +import java.io.PrintWriter; + +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 love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Operator; @@ -30,14 +40,6 @@ import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.util.Crypto; import love.sola.netsupport.wechat.Command; -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; - /** * @author Sola {@literal } */ @@ -100,4 +102,4 @@ public class Login extends HttpServlet { return Error.INTERNAL_ERROR; } } -} \ No newline at end of file +} 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 3a1b411..0798165 100644 --- a/src/main/java/love/sola/netsupport/api/manager/GetUser.java +++ b/src/main/java/love/sola/netsupport/api/manager/GetUser.java @@ -17,6 +17,8 @@ package love.sola.netsupport.api.manager; +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -25,8 +27,6 @@ import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import javax.servlet.http.HttpServletRequest; - /** * @author Sola {@literal } */ 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 c55eb5c..d49bf2f 100644 --- a/src/main/java/love/sola/netsupport/api/manager/TicketPush.java +++ b/src/main/java/love/sola/netsupport/api/manager/TicketPush.java @@ -17,6 +17,10 @@ package love.sola.netsupport.api.manager; +import org.hibernate.Session; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.config.Settings; @@ -30,9 +34,6 @@ 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 org.hibernate.Session; - -import javax.servlet.http.HttpServletRequest; /** * @author Sola {@literal } 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 3f94db6..7f659bc 100644 --- a/src/main/java/love/sola/netsupport/api/root/DashBoard.java +++ b/src/main/java/love/sola/netsupport/api/root/DashBoard.java @@ -17,15 +17,16 @@ package love.sola.netsupport.api.root; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; + 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 javax.servlet.http.HttpServletRequest; -import java.util.Set; - /** * @author Sola {@literal } */ 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 c83eb17..bb91d73 100644 --- a/src/main/java/love/sola/netsupport/api/root/FlushCache.java +++ b/src/main/java/love/sola/netsupport/api/root/FlushCache.java @@ -17,6 +17,8 @@ package love.sola.netsupport.api.root; +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -24,8 +26,6 @@ import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.wechat.Command; -import javax.servlet.http.HttpServletRequest; - /** * @author Sola {@literal } */ 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 5094fab..60c997d 100644 --- a/src/main/java/love/sola/netsupport/api/root/SetPassword.java +++ b/src/main/java/love/sola/netsupport/api/root/SetPassword.java @@ -17,6 +17,10 @@ package love.sola.netsupport.api.root; +import org.hibernate.Session; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -25,9 +29,6 @@ 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 org.hibernate.Session; - -import javax.servlet.http.HttpServletRequest; /** * @author Sola {@literal } 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 21361a9..bd572c7 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketLog.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketLog.java @@ -17,6 +17,16 @@ package love.sola.netsupport.api.stuff; +import org.apache.commons.lang3.time.DateUtils; +import org.hibernate.Session; +import org.hibernate.envers.AuditReader; +import org.hibernate.envers.query.AuditEntity; + +import java.text.SimpleDateFormat; +import java.util.Date; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.enums.Access; import love.sola.netsupport.pojo.Ticket; @@ -24,14 +34,6 @@ 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 org.apache.commons.lang3.time.DateUtils; -import org.hibernate.Session; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.query.AuditEntity; - -import javax.servlet.http.HttpServletRequest; -import java.text.SimpleDateFormat; -import java.util.Date; /** * @author Sola {@literal } 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 07a764c..f11ab8d 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketLookup.java @@ -17,6 +17,8 @@ package love.sola.netsupport.api.stuff; +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; @@ -25,8 +27,6 @@ import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.wechat.Command; -import javax.servlet.http.HttpServletRequest; - /** * @author Sola {@literal } */ 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 d086b48..8c9cd5b 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketTrack.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketTrack.java @@ -17,6 +17,8 @@ package love.sola.netsupport.api.stuff; +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -24,8 +26,6 @@ import love.sola.netsupport.session.WxSession; import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.wechat.Command; -import javax.servlet.http.HttpServletRequest; - /** * @author Sola {@literal } */ 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 00be7b9..27cf436 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/TicketUpdate.java +++ b/src/main/java/love/sola/netsupport/api/stuff/TicketUpdate.java @@ -17,6 +17,12 @@ package love.sola.netsupport.api.stuff; +import org.hibernate.Session; + +import java.util.Date; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -27,10 +33,6 @@ 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 org.hibernate.Session; - -import javax.servlet.http.HttpServletRequest; -import java.util.Date; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java b/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java index 64dfd91..86af4c5 100644 --- a/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java +++ b/src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java @@ -17,14 +17,6 @@ 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.enums.Attribute; -import love.sola.netsupport.pojo.Operator; -import love.sola.netsupport.session.WxSession; -import love.sola.netsupport.sql.SQLCore; -import love.sola.netsupport.wechat.Command; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.hibernate.Criteria; @@ -33,9 +25,19 @@ import org.hibernate.criterion.Restrictions; import org.hibernate.type.IntegerType; import org.hibernate.type.Type; -import javax.servlet.http.HttpServletRequest; import java.util.Date; +import javax.servlet.http.HttpServletRequest; + +import love.sola.netsupport.api.API; +import love.sola.netsupport.api.Error; +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.SQLCore; +import love.sola.netsupport.wechat.Command; + /** * @author Sola */ 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 14963a5..71bcd10 100644 --- a/src/main/java/love/sola/netsupport/api/user/ProfileModify.java +++ b/src/main/java/love/sola/netsupport/api/user/ProfileModify.java @@ -17,6 +17,10 @@ package love.sola.netsupport.api.user; +import org.hibernate.exception.ConstraintViolationException; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -26,11 +30,12 @@ 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 org.hibernate.exception.ConstraintViolationException; -import javax.servlet.http.HttpServletRequest; - -import static love.sola.netsupport.util.Checker.*; +import static love.sola.netsupport.util.Checker.checkBlock; +import static love.sola.netsupport.util.Checker.checkISP; +import static love.sola.netsupport.util.Checker.checkNetAccount; +import static love.sola.netsupport.util.Checker.checkPhoneNumber; +import static love.sola.netsupport.util.Checker.checkRoom; /** * @author Sola {@literal } 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 f2d6450..4e63558 100644 --- a/src/main/java/love/sola/netsupport/api/user/Register.java +++ b/src/main/java/love/sola/netsupport/api/user/Register.java @@ -17,6 +17,10 @@ package love.sola.netsupport.api.user; +import org.hibernate.exception.ConstraintViolationException; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.enums.Access; @@ -26,11 +30,13 @@ 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 org.hibernate.exception.ConstraintViolationException; -import javax.servlet.http.HttpServletRequest; - -import static love.sola.netsupport.util.Checker.*; +import static love.sola.netsupport.util.Checker.checkBlock; +import static love.sola.netsupport.util.Checker.checkISP; +import static love.sola.netsupport.util.Checker.checkNetAccount; +import static love.sola.netsupport.util.Checker.checkPhoneNumber; +import static love.sola.netsupport.util.Checker.checkRoom; +import static love.sola.netsupport.util.Checker.checkStudentId; /** * @author Sola {@literal } @@ -73,7 +79,8 @@ public class Register extends API { User user = TableUser.getById(sid); if (user == null) return Error.INVALID_PARAMETER.withMsg("Invalid_Student_Id"); if (!user.getName().equals(name)) return Error.INVALID_PARAMETER.withMsg("Invalid_Name"); - if (user.getWechatId() != null) return Error.INVALID_PARAMETER.withMsg("User_Already_Registered"); + if (user.getWechatId() != null) + return Error.INVALID_PARAMETER.withMsg("User_Already_Registered"); user.setIsp(isp); user.setNetAccount(netAccount); user.setBlock(block); 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 249ddb2..a7f9308 100644 --- a/src/main/java/love/sola/netsupport/api/user/TicketQuery.java +++ b/src/main/java/love/sola/netsupport/api/user/TicketQuery.java @@ -17,6 +17,13 @@ package love.sola.netsupport.api.user; +import org.hibernate.Criteria; +import org.hibernate.Session; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; @@ -25,12 +32,6 @@ 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 org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; - -import javax.servlet.http.HttpServletRequest; /** * @author Sola {@literal } 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 75b73ba..6067397 100644 --- a/src/main/java/love/sola/netsupport/api/user/TicketSubmit.java +++ b/src/main/java/love/sola/netsupport/api/user/TicketSubmit.java @@ -17,6 +17,10 @@ package love.sola.netsupport.api.user; +import org.hibernate.Session; + +import javax.servlet.http.HttpServletRequest; + import love.sola.netsupport.api.API; import love.sola.netsupport.api.Error; import love.sola.netsupport.config.Settings; @@ -28,9 +32,6 @@ 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 org.hibernate.Session; - -import javax.servlet.http.HttpServletRequest; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2.java b/src/main/java/love/sola/netsupport/auth/OAuth2.java index ea3f3bd..bca6fb5 100644 --- a/src/main/java/love/sola/netsupport/auth/OAuth2.java +++ b/src/main/java/love/sola/netsupport/auth/OAuth2.java @@ -17,12 +17,9 @@ 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.WxMpServlet; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import javax.servlet.AsyncContext; import javax.servlet.ServletException; @@ -30,9 +27,13 @@ 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.util.HashMap; -import java.util.Map; + +import love.sola.netsupport.session.WechatSession; +import love.sola.netsupport.session.WxSession; +import love.sola.netsupport.util.Checker; +import love.sola.netsupport.wechat.WxMpServlet; +import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java b/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java index 21d3752..bcd9c80 100644 --- a/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java +++ b/src/main/java/love/sola/netsupport/auth/OAuth2Handler.java @@ -17,11 +17,11 @@ package love.sola.netsupport.auth; -import love.sola.netsupport.session.WxSession; - import javax.servlet.AsyncContext; import javax.servlet.http.HttpServletResponse; +import love.sola.netsupport.session.WxSession; + /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/enums/ISP.java b/src/main/java/love/sola/netsupport/enums/ISP.java index 5e3e403..1abc5e5 100644 --- a/src/main/java/love/sola/netsupport/enums/ISP.java +++ b/src/main/java/love/sola/netsupport/enums/ISP.java @@ -30,7 +30,8 @@ public enum ISP { TELECOM(1, "^1[3|4|5|7|8][0-9]{9}$"), UNICOM(2, "ZSZJLAN[0-9]{10}@16900\\.gd"), CHINAMOBILE(3, "^1[3|4|5|7|8][0-9]{9}@139\\.gd$"), - OTHER(4, ".*"),; + OTHER(4, ".*"), + ; private static final Map NAME_MAP = new HashMap<>(); private static final Map ID_MAP = new HashMap<>(); diff --git a/src/main/java/love/sola/netsupport/pojo/Ticket.java b/src/main/java/love/sola/netsupport/pojo/Ticket.java index 160d592..26b3238 100644 --- a/src/main/java/love/sola/netsupport/pojo/Ticket.java +++ b/src/main/java/love/sola/netsupport/pojo/Ticket.java @@ -17,13 +17,22 @@ package love.sola.netsupport.pojo; -import love.sola.netsupport.sql.TableTicket; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +import love.sola.netsupport.sql.TableTicket; + /** * @author Sola {@literal } */ @@ -47,7 +56,7 @@ public class Ticket { private Date submitTime; private String remark; private Date updateTime; - @ManyToOne(optional = true) + @ManyToOne @JoinColumn(name = TableTicket.COLUMN_OPSID) private Operator operator; private Integer status; diff --git a/src/main/java/love/sola/netsupport/pojo/ToolsCheck.java b/src/main/java/love/sola/netsupport/pojo/ToolsCheck.java index 97d1db3..c8af161 100644 --- a/src/main/java/love/sola/netsupport/pojo/ToolsCheck.java +++ b/src/main/java/love/sola/netsupport/pojo/ToolsCheck.java @@ -3,9 +3,18 @@ package love.sola.netsupport.pojo; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; -import javax.persistence.*; import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Index; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/pojo/User.java b/src/main/java/love/sola/netsupport/pojo/User.java index 6898a41..3118e98 100644 --- a/src/main/java/love/sola/netsupport/pojo/User.java +++ b/src/main/java/love/sola/netsupport/pojo/User.java @@ -18,11 +18,16 @@ package love.sola.netsupport.pojo; import com.google.gson.annotations.Expose; + +import javax.persistence.Column; +import javax.persistence.Convert; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + import love.sola.netsupport.enums.ISP; import love.sola.netsupport.enums.ISPConverter; -import javax.persistence.*; - /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/session/MapSession.java b/src/main/java/love/sola/netsupport/session/MapSession.java index db385da..a71d95f 100644 --- a/src/main/java/love/sola/netsupport/session/MapSession.java +++ b/src/main/java/love/sola/netsupport/session/MapSession.java @@ -33,7 +33,11 @@ package love.sola.netsupport.session; import java.io.Serializable; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; /** * @author Sola {@literal } @@ -123,4 +127,4 @@ public final class MapSession implements WxSession, Serializable { public int hashCode() { return Objects.hash(id); } -} \ 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 index c40d990..865f2e2 100644 --- a/src/main/java/love/sola/netsupport/session/MapSessionRepository.java +++ b/src/main/java/love/sola/netsupport/session/MapSessionRepository.java @@ -35,13 +35,16 @@ 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; +import javax.annotation.Nonnull; + +import love.sola.netsupport.config.Settings; + /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/sql/SQLCore.java b/src/main/java/love/sola/netsupport/sql/SQLCore.java index ed4f05f..9033b59 100644 --- a/src/main/java/love/sola/netsupport/sql/SQLCore.java +++ b/src/main/java/love/sola/netsupport/sql/SQLCore.java @@ -17,14 +17,21 @@ package love.sola.netsupport.sql; -import com.google.gson.*; +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializer; +import com.google.gson.TypeAdapter; +import com.google.gson.TypeAdapterFactory; 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; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -35,11 +42,15 @@ import org.hibernate.envers.AuditReaderFactory; import org.hibernate.proxy.HibernateProxy; import org.hibernate.service.ServiceRegistry; +import java.io.IOException; +import java.util.Date; + import javax.naming.InitialContext; import javax.naming.NamingException; import javax.sql.DataSource; -import java.io.IOException; -import java.util.Date; + +import love.sola.netsupport.enums.ISP; +import love.sola.netsupport.wechat.Command; /** * @author Sola {@literal } @@ -146,7 +157,7 @@ public class SQLCore { // Get the TypeAdapter of the original class, to delegate the serialization TypeAdapter delegate = context.getAdapter(TypeToken.get(baseType)); // Get a filled instance of the original class - Object unproxiedValue = ((HibernateProxy) value).getHibernateLazyInitializer() + Object unproxiedValue = value.getHibernateLazyInitializer() .getImplementation(); // Serialize the value delegate.write(out, unproxiedValue); diff --git a/src/main/java/love/sola/netsupport/sql/TableConfig.java b/src/main/java/love/sola/netsupport/sql/TableConfig.java index a008b5b..c7295a0 100644 --- a/src/main/java/love/sola/netsupport/sql/TableConfig.java +++ b/src/main/java/love/sola/netsupport/sql/TableConfig.java @@ -17,9 +17,13 @@ package love.sola.netsupport.sql; -import love.sola.netsupport.config.Settings; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; -import java.sql.*; +import love.sola.netsupport.config.Settings; /** * @author Sola {@literal } diff --git a/src/main/java/love/sola/netsupport/sql/TableOperator.java b/src/main/java/love/sola/netsupport/sql/TableOperator.java index 806ac65..d0f2cca 100644 --- a/src/main/java/love/sola/netsupport/sql/TableOperator.java +++ b/src/main/java/love/sola/netsupport/sql/TableOperator.java @@ -17,11 +17,12 @@ package love.sola.netsupport.sql; -import love.sola.netsupport.pojo.Operator; import org.hibernate.Session; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; +import love.sola.netsupport.pojo.Operator; + /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/sql/TableTicket.java b/src/main/java/love/sola/netsupport/sql/TableTicket.java index 60807f0..52b061e 100644 --- a/src/main/java/love/sola/netsupport/sql/TableTicket.java +++ b/src/main/java/love/sola/netsupport/sql/TableTicket.java @@ -17,9 +17,6 @@ package love.sola.netsupport.sql; -import love.sola.netsupport.enums.Status; -import love.sola.netsupport.pojo.Ticket; -import love.sola.netsupport.pojo.User; import org.hibernate.Session; import org.hibernate.criterion.Order; import org.hibernate.criterion.Projections; @@ -29,6 +26,10 @@ import org.hibernate.envers.query.AuditEntity; import java.util.List; +import love.sola.netsupport.enums.Status; +import love.sola.netsupport.pojo.Ticket; +import love.sola.netsupport.pojo.User; + /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/sql/TableUser.java b/src/main/java/love/sola/netsupport/sql/TableUser.java index b7868e8..c023296 100644 --- a/src/main/java/love/sola/netsupport/sql/TableUser.java +++ b/src/main/java/love/sola/netsupport/sql/TableUser.java @@ -20,14 +20,16 @@ package love.sola.netsupport.sql; 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 love.sola.netsupport.pojo.User; + import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import love.sola.netsupport.config.Settings; +import love.sola.netsupport.pojo.User; + /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/util/ParseUtil.java b/src/main/java/love/sola/netsupport/util/ParseUtil.java index 8297e8b..8aa7277 100644 --- a/src/main/java/love/sola/netsupport/util/ParseUtil.java +++ b/src/main/java/love/sola/netsupport/util/ParseUtil.java @@ -17,11 +17,11 @@ package love.sola.netsupport.util; +import java.text.SimpleDateFormat; + import love.sola.netsupport.enums.Status; import love.sola.netsupport.pojo.Ticket; -import java.text.SimpleDateFormat; - import static love.sola.netsupport.config.Lang.lang; /** @@ -38,7 +38,8 @@ public class ParseUtil { .append(lang("Ticket_Info_Submit_Time")).append(dateFormat.format(t.getSubmitTime())).append("\n"); if (t.getOperator() != null) sb.append(lang("Ticket_Info_Operator")).append(t.getOperator().getId()).append("\n"); - if (t.getRemark() != null) sb.append(lang("Ticket_Info_Remark")).append(t.getRemark()).append("\n"); + if (t.getRemark() != null) + sb.append(lang("Ticket_Info_Remark")).append(t.getRemark()).append("\n"); if (t.getUpdateTime() != null) sb.append(lang("Ticket_Info_Update_Time")).append(dateFormat.format(t.getUpdateTime())).append("\n"); sb.append(lang("Ticket_Info_Status")).append(Status.getLocalized(t.getStatus())); diff --git a/src/main/java/love/sola/netsupport/util/Redirect.java b/src/main/java/love/sola/netsupport/util/Redirect.java index 378d9b5..38d0a23 100644 --- a/src/main/java/love/sola/netsupport/util/Redirect.java +++ b/src/main/java/love/sola/netsupport/util/Redirect.java @@ -19,9 +19,10 @@ package love.sola.netsupport.util; import com.google.common.net.UrlEscapers; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + import static love.sola.netsupport.config.Lang.lang; /** @@ -115,7 +116,8 @@ public class Redirect { WARN("weui_icon_warn"), WARN_SAFE("weui_icon_safe_warn"), DOWNLOAD("weui_icon_download"), - CANCEL("weui_icon_cancel"),; + CANCEL("weui_icon_cancel"), + ; private String value; diff --git a/src/main/java/love/sola/netsupport/wechat/Command.java b/src/main/java/love/sola/netsupport/wechat/Command.java index b49fe9b..27f4035 100644 --- a/src/main/java/love/sola/netsupport/wechat/Command.java +++ b/src/main/java/love/sola/netsupport/wechat/Command.java @@ -17,15 +17,19 @@ package love.sola.netsupport.wechat; -import love.sola.netsupport.wechat.handler.*; +import java.util.HashMap; +import java.util.Map; + +import love.sola.netsupport.wechat.handler.CancelHandler; +import love.sola.netsupport.wechat.handler.ProfileHandler; +import love.sola.netsupport.wechat.handler.QueryHandler; +import love.sola.netsupport.wechat.handler.RegisterHandler; +import love.sola.netsupport.wechat.handler.SubmitHandler; import love.sola.netsupport.wechat.handler.admin.LoginHandler; import love.sola.netsupport.wechat.handler.admin.OperatorInfoHandler; import love.sola.netsupport.wechat.handler.admin.SignHandler; import me.chanjar.weixin.mp.api.WxMpMessageHandler; -import java.util.HashMap; -import java.util.Map; - import static love.sola.netsupport.config.Lang.lang; /** diff --git a/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java b/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java index 02e5b65..a57d1b5 100644 --- a/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java +++ b/src/main/java/love/sola/netsupport/wechat/WxMpServlet.java @@ -17,6 +17,14 @@ package love.sola.netsupport.wechat; +import java.io.IOException; + +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 love.sola.netsupport.auth.OAuth2; import love.sola.netsupport.auth.OAuth2Handler; import love.sola.netsupport.config.Settings; @@ -27,17 +35,14 @@ import love.sola.netsupport.wechat.matcher.CheckSpamMatcher; import love.sola.netsupport.wechat.matcher.RegisterMatcher; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.util.StringUtils; -import me.chanjar.weixin.mp.api.*; +import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage; +import me.chanjar.weixin.mp.api.WxMpMessageHandler; +import me.chanjar.weixin.mp.api.WxMpMessageRouter; +import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.api.WxMpServiceImpl; import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; -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 static love.sola.netsupport.config.Lang.lang; /** diff --git a/src/main/java/love/sola/netsupport/wechat/handler/AutoReplyHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/AutoReplyHandler.java index 7690065..c3a036d 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/AutoReplyHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/AutoReplyHandler.java @@ -17,6 +17,8 @@ package love.sola.netsupport.wechat.handler; +import java.util.Map; + import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpMessageHandler; @@ -24,8 +26,6 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; -import java.util.Map; - /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/wechat/handler/CancelHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/CancelHandler.java index 15d1a6b..9a78345 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/CancelHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/CancelHandler.java @@ -17,6 +17,11 @@ package love.sola.netsupport.wechat.handler; +import org.hibernate.Session; + +import java.util.Date; +import java.util.Map; + import love.sola.netsupport.enums.Status; import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.Ticket; @@ -33,10 +38,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder; -import org.hibernate.Session; - -import java.util.Date; -import java.util.Map; import static love.sola.netsupport.config.Lang.lang; 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 1ccbc01..101374d 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/ProfileHandler.java @@ -17,6 +17,11 @@ package love.sola.netsupport.wechat.handler; +import java.util.Map; + +import javax.servlet.AsyncContext; +import javax.servlet.http.HttpServletResponse; + import love.sola.netsupport.auth.OAuth2Handler; import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.User; @@ -33,10 +38,6 @@ 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; import static love.sola.netsupport.config.Lang.lang; 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 a977092..f4014c4 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/QueryHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/QueryHandler.java @@ -17,6 +17,8 @@ package love.sola.netsupport.wechat.handler; +import java.util.Map; + import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.User; @@ -35,8 +37,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder; -import java.util.Map; - import static love.sola.netsupport.config.Lang.format; import static love.sola.netsupport.config.Lang.lang; 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 3eb9260..9ee1167 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/RegisterHandler.java @@ -17,6 +17,8 @@ package love.sola.netsupport.wechat.handler; +import java.util.Map; + import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.User; import love.sola.netsupport.session.WechatSession; @@ -31,8 +33,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; -import java.util.Map; - import static love.sola.netsupport.config.Lang.format; /** 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 94560fe..38ab71a 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java @@ -17,6 +17,8 @@ package love.sola.netsupport.wechat.handler; +import java.util.Map; + import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.User; import love.sola.netsupport.session.WechatSession; @@ -33,8 +35,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder; -import java.util.Map; - import static love.sola.netsupport.config.Lang.format; import static love.sola.netsupport.config.Lang.lang; 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 ecb5070..6748e85 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java @@ -17,6 +17,8 @@ package love.sola.netsupport.wechat.handler; +import java.util.Map; + import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.User; @@ -33,8 +35,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; -import java.util.Map; - import static love.sola.netsupport.config.Lang.format; /** 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 5096b57..2d70643 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 @@ -17,6 +17,11 @@ package love.sola.netsupport.wechat.handler.admin; +import java.util.Map; + +import javax.servlet.AsyncContext; +import javax.servlet.http.HttpServletResponse; + import love.sola.netsupport.auth.OAuth2Handler; import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Attribute; @@ -34,10 +39,6 @@ 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; import static love.sola.netsupport.config.Lang.lang; diff --git a/src/main/java/love/sola/netsupport/wechat/handler/admin/OperatorInfoHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/admin/OperatorInfoHandler.java index 08c6208..b306833 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/admin/OperatorInfoHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/admin/OperatorInfoHandler.java @@ -17,6 +17,8 @@ package love.sola.netsupport.wechat.handler.admin; +import java.util.Map; + import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.sql.TableOperator; import me.chanjar.weixin.common.exception.WxErrorException; @@ -27,8 +29,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; -import java.util.Map; - import static love.sola.netsupport.config.Lang.format; import static love.sola.netsupport.config.Lang.lang; diff --git a/src/main/java/love/sola/netsupport/wechat/handler/admin/SignHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/admin/SignHandler.java index 8867f91..3267915 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/admin/SignHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/admin/SignHandler.java @@ -17,6 +17,14 @@ package love.sola.netsupport.wechat.handler.admin; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import love.sola.netsupport.sql.SQLCore; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; @@ -26,14 +34,6 @@ import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * @author Sola {@literal } * @deprecated limited time only diff --git a/src/main/java/love/sola/netsupport/wechat/matcher/CheckSpamMatcher.java b/src/main/java/love/sola/netsupport/wechat/matcher/CheckSpamMatcher.java index 3d18d30..b5f2844 100644 --- a/src/main/java/love/sola/netsupport/wechat/matcher/CheckSpamMatcher.java +++ b/src/main/java/love/sola/netsupport/wechat/matcher/CheckSpamMatcher.java @@ -20,12 +20,13 @@ package love.sola.netsupport.wechat.matcher; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; + +import java.util.concurrent.TimeUnit; + import love.sola.netsupport.config.Settings; import me.chanjar.weixin.mp.api.WxMpMessageMatcher; import me.chanjar.weixin.mp.bean.WxMpXmlMessage; -import java.util.concurrent.TimeUnit; - /** * @author Sola {@literal } */ diff --git a/src/main/java/love/sola/netsupport/wechat/matcher/CommandMatcher.java b/src/main/java/love/sola/netsupport/wechat/matcher/CommandMatcher.java index 035d1da..e3d166c 100644 --- a/src/main/java/love/sola/netsupport/wechat/matcher/CommandMatcher.java +++ b/src/main/java/love/sola/netsupport/wechat/matcher/CommandMatcher.java @@ -17,13 +17,13 @@ package love.sola.netsupport.wechat.matcher; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import love.sola.netsupport.wechat.Command; import me.chanjar.weixin.mp.api.WxMpMessageMatcher; import me.chanjar.weixin.mp.bean.WxMpXmlMessage; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * @author Sola {@literal } */ diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index 5b1c392..f943ff0 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -1,13 +1,11 @@ - - - + --> @@ -28,7 +26,8 @@ org.hibernate.dialect.MySQL5InnoDBDialect - org.hibernate.cache.internal.NoCacheProvider + org.hibernate.cache.internal.NoCacheProvider + true @@ -37,11 +36,11 @@ validate - - - - + + + + - \ No newline at end of file + diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index e8cae4e..c489584 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -1,9 +1,9 @@ #System Exception Access_Denied: 'Access denied.' Illegal_Request: | - Access denied. - You are doing an illegal request, and our system has logged your behaviors. - You have to take this seriously, you may be banned from our system if you do this frequently. + Access denied. + You are doing an illegal request, and our system has logged your behaviors. + You have to take this seriously, you may be banned from our system if you do this frequently. Unknown_Encrypt_Type: 'Unknown encrypt-type.' #Command Regex @@ -32,13 +32,13 @@ No_Ticket_Available: '您尚未提交过任何报修。' Already_Opening_Ticket: "您上次提交的报修单仍在处理中. 若需要查询报修单状态,请发送 '查询' 。" Submit_Title: '在网维工作人员上门解决您的问题之前...' Submit_Desc: | - 在网维工作人员上门解决您的问题之前,您可以尝试以下方法来更有效地解决您的问题: - - 重新插拔您电脑的网线以及墙上的端口。 - - 尝试卸载掉您的wifi共享软件并重启电脑。 - - 请您检查一下您的账号是否余额充足。 - - 若您的电脑出现明显异常,请尝试使用他人的电脑能否正常登录,网维的工作成员主要负责网络的维护工作,可能无法解决您的个人电脑问题。 + 在网维工作人员上门解决您的问题之前,您可以尝试以下方法来更有效地解决您的问题: + - 重新插拔您电脑的网线以及墙上的端口。 + - 尝试卸载掉您的wifi共享软件并重启电脑。 + - 请您检查一下您的账号是否余额充足。 + - 若您的电脑出现明显异常,请尝试使用他人的电脑能否正常登录,网维的工作成员主要负责网络的维护工作,可能无法解决您的个人电脑问题。 - 若以上步骤对您没有帮助,请点此提交报修表单。 + 若以上步骤对您没有帮助,请点此提交报修表单。 #Cancel No_Open_Ticket_Available: '您当前没有未解决的报修表单。' Cancel_Title: '报修已取消:' @@ -58,14 +58,14 @@ Left_Operator: '网络维护科的茁壮成长离不开每一位成员的陪伴 Internal_Error: '啊哦,登录失败了哦。' #Operator_Info Operator_Info: | - 网维成员资料: - 网维ID: {0,number,#} - 姓名: {1} - 岗位: {2,choice,0#'Administrator >ω<'|3#值班组长|6#正式成员|7#实习成员|9#'曾经的一员(TдT)'} - 值班片区: {3,choice,0#'全图 >ω<'|1#岐头片区|2#北门片区|3#东门片区|4#香灰片区|5#凤翔片区|8#朝晖片区} - 值班日: {4,choice,0#'2月30日 >ω<'|1#周一|2#周二|3#周三|4#周四|5#周五|6#周六|7#周日} + 网维成员资料: + 网维ID: {0,number,#} + 姓名: {1} + 岗位: {2,choice,0#'Administrator >ω<'|3#值班组长|6#正式成员|7#实习成员|9#'曾经的一员(TдT)'} + 值班片区: {3,choice,0#'全图 >ω<'|1#岐头片区|2#北门片区|3#东门片区|4#香灰片区|5#凤翔片区|8#朝晖片区} + 值班日: {4,choice,0#'2月30日 >ω<'|1#周一|2#周二|3#周三|4#周四|5#周五|6#周六|7#周日} - 若以上信息有误,请及时联系@15-沙子森。 + 若以上信息有误,请及时联系@15-沙子森。 #URL User_Register_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/reg.html?token={0}' User_Query_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/list.html?token={0}' @@ -86,4 +86,4 @@ Ticket_Info_Submit_Time: '提交时间: ' Ticket_Info_Operator: '操作员: ' Ticket_Info_Remark: '维修描述: ' Ticket_Info_Update_Time: '更新时间: ' -Ticket_Info_Status: '报修单状态: ' \ No newline at end of file +Ticket_Info_Status: '报修单状态: ' diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index a1c4c91..6b8bd51 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -1,5 +1,4 @@ - - - - +--> @@ -26,24 +23,16 @@ - + - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8dc1b11..c746422 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> @@ -23,4 +21,4 @@ 10 - \ No newline at end of file + diff --git a/src/test/java/love/sola/netsupport/util/GsonTest.java b/src/test/java/love/sola/netsupport/util/GsonTest.java index c00bb62..52f5745 100644 --- a/src/test/java/love/sola/netsupport/util/GsonTest.java +++ b/src/test/java/love/sola/netsupport/util/GsonTest.java @@ -1,11 +1,17 @@ package love.sola.netsupport.util; -import com.google.gson.*; -import love.sola.netsupport.enums.ISP; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializer; + import org.junit.Test; import java.util.Date; +import love.sola.netsupport.enums.ISP; + /** * @author Sola {@literal } */ diff --git a/src/test/java/love/sola/netsupport/util/URLEncodeTest.java b/src/test/java/love/sola/netsupport/util/URLEncodeTest.java index 2657bb1..670ef27 100644 --- a/src/test/java/love/sola/netsupport/util/URLEncodeTest.java +++ b/src/test/java/love/sola/netsupport/util/URLEncodeTest.java @@ -1,6 +1,7 @@ package love.sola.netsupport.util; import com.google.common.net.UrlEscapers; + import org.junit.Test; import java.io.UnsupportedEncodingException;