Polish and reformatting

Signed-off-by: Sola <dev@sola.love>
This commit is contained in:
Sola
2018-08-12 18:29:41 +08:00
parent 4f3fbc2c91
commit c8dd0d6306
55 changed files with 343 additions and 236 deletions

15
.editorconfig Normal file
View File

@@ -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

View File

@@ -17,13 +17,14 @@
package love.sola.netsupport; package love.sola.netsupport;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet; import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,14 +17,16 @@
package love.sola.netsupport.api; 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.enums.Access;
import love.sola.netsupport.session.WxSession; import love.sola.netsupport.session.WxSession;
import love.sola.netsupport.wechat.Command; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -18,6 +18,23 @@
package love.sola.netsupport.api; package love.sola.netsupport.api;
import com.google.gson.Gson; 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.Access;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.Operator; 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.WechatSession;
import love.sola.netsupport.session.WxSession; import love.sola.netsupport.session.WxSession;
import love.sola.netsupport.sql.SQLCore; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,14 +17,15 @@
package love.sola.netsupport.api; 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.Access;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.session.WxSession; import love.sola.netsupport.session.WxSession;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -18,6 +18,16 @@
package love.sola.netsupport.api; package love.sola.netsupport.api;
import com.google.gson.Gson; 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.Access;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.Operator; 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.util.Crypto;
import love.sola.netsupport.wechat.Command; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.api.manager; package love.sola.netsupport.api.manager;
import javax.servlet.http.HttpServletRequest;
import love.sola.netsupport.api.API; import love.sola.netsupport.api.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.sql.TableUser;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,10 @@
package love.sola.netsupport.api.manager; 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.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.config.Settings; 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.sql.SQLCore;
import love.sola.netsupport.util.Checker; import love.sola.netsupport.util.Checker;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import org.hibernate.Session;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,15 +17,16 @@
package love.sola.netsupport.api.root; 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.api.API;
import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Access;
import love.sola.netsupport.session.WechatSession; import love.sola.netsupport.session.WechatSession;
import love.sola.netsupport.session.WxSession; import love.sola.netsupport.session.WxSession;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import javax.servlet.http.HttpServletRequest;
import java.util.Set;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.api.root; package love.sola.netsupport.api.root;
import javax.servlet.http.HttpServletRequest;
import love.sola.netsupport.api.API; import love.sola.netsupport.api.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.sql.TableUser;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,10 @@
package love.sola.netsupport.api.root; 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.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.sql.SQLCore;
import love.sola.netsupport.util.Crypto; import love.sola.netsupport.util.Crypto;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import org.hibernate.Session;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,6 +17,16 @@
package love.sola.netsupport.api.stuff; 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.api.API;
import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Access;
import love.sola.netsupport.pojo.Ticket; 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.SQLCore;
import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.sql.TableTicket;
import love.sola.netsupport.wechat.Command; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.api.stuff; package love.sola.netsupport.api.stuff;
import javax.servlet.http.HttpServletRequest;
import love.sola.netsupport.api.API; import love.sola.netsupport.api.API;
import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Access;
import love.sola.netsupport.enums.Attribute; 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.sql.TableTicket;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.api.stuff; package love.sola.netsupport.api.stuff;
import javax.servlet.http.HttpServletRequest;
import love.sola.netsupport.api.API; import love.sola.netsupport.api.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.sql.TableTicket;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,12 @@
package love.sola.netsupport.api.stuff; 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.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.sql.SQLCore;
import love.sola.netsupport.util.Checker; import love.sola.netsupport.util.Checker;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import org.hibernate.Session;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,14 +17,6 @@
package love.sola.netsupport.api.stuff; 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.StringUtils;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;
import org.hibernate.Criteria; import org.hibernate.Criteria;
@@ -33,9 +25,19 @@ import org.hibernate.criterion.Restrictions;
import org.hibernate.type.IntegerType; import org.hibernate.type.IntegerType;
import org.hibernate.type.Type; import org.hibernate.type.Type;
import javax.servlet.http.HttpServletRequest;
import java.util.Date; 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 * @author Sola
*/ */

View File

@@ -17,6 +17,10 @@
package love.sola.netsupport.api.user; 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.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.session.WxSession;
import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.sql.TableUser;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import org.hibernate.exception.ConstraintViolationException;
import javax.servlet.http.HttpServletRequest; import static love.sola.netsupport.util.Checker.checkBlock;
import static love.sola.netsupport.util.Checker.checkISP;
import static love.sola.netsupport.util.Checker.*; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,6 +17,10 @@
package love.sola.netsupport.api.user; 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.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.enums.Access; 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.session.WxSession;
import love.sola.netsupport.sql.TableUser; import love.sola.netsupport.sql.TableUser;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import org.hibernate.exception.ConstraintViolationException;
import javax.servlet.http.HttpServletRequest; import static love.sola.netsupport.util.Checker.checkBlock;
import static love.sola.netsupport.util.Checker.checkISP;
import static love.sola.netsupport.util.Checker.*; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
@@ -73,7 +79,8 @@ public class Register extends API {
User user = TableUser.getById(sid); User user = TableUser.getById(sid);
if (user == null) return Error.INVALID_PARAMETER.withMsg("Invalid_Student_Id"); 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.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.setIsp(isp);
user.setNetAccount(netAccount); user.setNetAccount(netAccount);
user.setBlock(block); user.setBlock(block);

View File

@@ -17,6 +17,13 @@
package love.sola.netsupport.api.user; 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.api.API;
import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Access;
import love.sola.netsupport.enums.Attribute; 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.session.WxSession;
import love.sola.netsupport.sql.SQLCore; import love.sola.netsupport.sql.SQLCore;
import love.sola.netsupport.wechat.Command; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,6 +17,10 @@
package love.sola.netsupport.api.user; 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.API;
import love.sola.netsupport.api.Error; import love.sola.netsupport.api.Error;
import love.sola.netsupport.config.Settings; 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.SQLCore;
import love.sola.netsupport.sql.TableTicket; import love.sola.netsupport.sql.TableTicket;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import org.hibernate.Session;
import javax.servlet.http.HttpServletRequest;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,12 +17,9 @@
package love.sola.netsupport.auth; package love.sola.netsupport.auth;
import love.sola.netsupport.session.WechatSession; import java.io.IOException;
import love.sola.netsupport.session.WxSession; import java.util.HashMap;
import love.sola.netsupport.util.Checker; import java.util.Map;
import love.sola.netsupport.wechat.WxMpServlet;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
import javax.servlet.AsyncContext; import javax.servlet.AsyncContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@@ -30,9 +27,13 @@ import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap; import love.sola.netsupport.session.WechatSession;
import java.util.Map; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,11 +17,11 @@
package love.sola.netsupport.auth; package love.sola.netsupport.auth;
import love.sola.netsupport.session.WxSession;
import javax.servlet.AsyncContext; import javax.servlet.AsyncContext;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import love.sola.netsupport.session.WxSession;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -30,7 +30,8 @@ public enum ISP {
TELECOM(1, "^1[3|4|5|7|8][0-9]{9}$"), TELECOM(1, "^1[3|4|5|7|8][0-9]{9}$"),
UNICOM(2, "ZSZJLAN[0-9]{10}@16900\\.gd"), UNICOM(2, "ZSZJLAN[0-9]{10}@16900\\.gd"),
CHINAMOBILE(3, "^1[3|4|5|7|8][0-9]{9}@139\\.gd$"), CHINAMOBILE(3, "^1[3|4|5|7|8][0-9]{9}@139\\.gd$"),
OTHER(4, ".*"),; OTHER(4, ".*"),
;
private static final Map<String, ISP> NAME_MAP = new HashMap<>(); private static final Map<String, ISP> NAME_MAP = new HashMap<>();
private static final Map<Integer, ISP> ID_MAP = new HashMap<>(); private static final Map<Integer, ISP> ID_MAP = new HashMap<>();

View File

@@ -17,13 +17,22 @@
package love.sola.netsupport.pojo; package love.sola.netsupport.pojo;
import love.sola.netsupport.sql.TableTicket;
import org.hibernate.envers.Audited; import org.hibernate.envers.Audited;
import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.envers.RelationTargetAuditMode;
import javax.persistence.*;
import java.util.Date; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */
@@ -47,7 +56,7 @@ public class Ticket {
private Date submitTime; private Date submitTime;
private String remark; private String remark;
private Date updateTime; private Date updateTime;
@ManyToOne(optional = true) @ManyToOne
@JoinColumn(name = TableTicket.COLUMN_OPSID) @JoinColumn(name = TableTicket.COLUMN_OPSID)
private Operator operator; private Operator operator;
private Integer status; private Integer status;

View File

@@ -3,9 +3,18 @@ package love.sola.netsupport.pojo;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import javax.persistence.*;
import java.util.Date; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -18,11 +18,16 @@
package love.sola.netsupport.pojo; package love.sola.netsupport.pojo;
import com.google.gson.annotations.Expose; 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.ISP;
import love.sola.netsupport.enums.ISPConverter; import love.sola.netsupport.enums.ISPConverter;
import javax.persistence.*;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -33,7 +33,11 @@
package love.sola.netsupport.session; package love.sola.netsupport.session;
import java.io.Serializable; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -35,13 +35,16 @@ package love.sola.netsupport.session;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import love.sola.netsupport.config.Settings;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import javax.annotation.Nonnull;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;
import love.sola.netsupport.config.Settings;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,14 +17,21 @@
package love.sola.netsupport.sql; 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.annotations.Expose;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import com.mchange.v2.c3p0.ComboPooledDataSource; 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.Hibernate;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
@@ -35,11 +42,15 @@ import org.hibernate.envers.AuditReaderFactory;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;
import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistry;
import java.io.IOException;
import java.util.Date;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.naming.NamingException; import javax.naming.NamingException;
import javax.sql.DataSource; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
@@ -146,7 +157,7 @@ public class SQLCore {
// Get the TypeAdapter of the original class, to delegate the serialization // Get the TypeAdapter of the original class, to delegate the serialization
TypeAdapter delegate = context.getAdapter(TypeToken.get(baseType)); TypeAdapter delegate = context.getAdapter(TypeToken.get(baseType));
// Get a filled instance of the original class // Get a filled instance of the original class
Object unproxiedValue = ((HibernateProxy) value).getHibernateLazyInitializer() Object unproxiedValue = value.getHibernateLazyInitializer()
.getImplementation(); .getImplementation();
// Serialize the value // Serialize the value
delegate.write(out, unproxiedValue); delegate.write(out, unproxiedValue);

View File

@@ -17,9 +17,13 @@
package love.sola.netsupport.sql; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}

View File

@@ -17,11 +17,12 @@
package love.sola.netsupport.sql; package love.sola.netsupport.sql;
import love.sola.netsupport.pojo.Operator;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.criterion.Projections; import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import love.sola.netsupport.pojo.Operator;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,9 +17,6 @@
package love.sola.netsupport.sql; 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.Session;
import org.hibernate.criterion.Order; import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections; import org.hibernate.criterion.Projections;
@@ -29,6 +26,10 @@ import org.hibernate.envers.query.AuditEntity;
import java.util.List; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -20,14 +20,16 @@ package love.sola.netsupport.sql;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; 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.Session;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import love.sola.netsupport.config.Settings;
import love.sola.netsupport.pojo.User;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,11 +17,11 @@
package love.sola.netsupport.util; package love.sola.netsupport.util;
import java.text.SimpleDateFormat;
import love.sola.netsupport.enums.Status; import love.sola.netsupport.enums.Status;
import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.Ticket;
import java.text.SimpleDateFormat;
import static love.sola.netsupport.config.Lang.lang; 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"); .append(lang("Ticket_Info_Submit_Time")).append(dateFormat.format(t.getSubmitTime())).append("\n");
if (t.getOperator() != null) if (t.getOperator() != null)
sb.append(lang("Ticket_Info_Operator")).append(t.getOperator().getId()).append("\n"); 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) if (t.getUpdateTime() != null)
sb.append(lang("Ticket_Info_Update_Time")).append(dateFormat.format(t.getUpdateTime())).append("\n"); 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())); sb.append(lang("Ticket_Info_Status")).append(Status.getLocalized(t.getStatus()));

View File

@@ -19,9 +19,10 @@ package love.sola.netsupport.util;
import com.google.common.net.UrlEscapers; import com.google.common.net.UrlEscapers;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;
/** /**
@@ -115,7 +116,8 @@ public class Redirect {
WARN("weui_icon_warn"), WARN("weui_icon_warn"),
WARN_SAFE("weui_icon_safe_warn"), WARN_SAFE("weui_icon_safe_warn"),
DOWNLOAD("weui_icon_download"), DOWNLOAD("weui_icon_download"),
CANCEL("weui_icon_cancel"),; CANCEL("weui_icon_cancel"),
;
private String value; private String value;

View File

@@ -17,15 +17,19 @@
package love.sola.netsupport.wechat; 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.LoginHandler;
import love.sola.netsupport.wechat.handler.admin.OperatorInfoHandler; import love.sola.netsupport.wechat.handler.admin.OperatorInfoHandler;
import love.sola.netsupport.wechat.handler.admin.SignHandler; import love.sola.netsupport.wechat.handler.admin.SignHandler;
import me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpMessageHandler;
import java.util.HashMap;
import java.util.Map;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;
/** /**

View File

@@ -17,6 +17,14 @@
package love.sola.netsupport.wechat; 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.OAuth2;
import love.sola.netsupport.auth.OAuth2Handler; import love.sola.netsupport.auth.OAuth2Handler;
import love.sola.netsupport.config.Settings; 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 love.sola.netsupport.wechat.matcher.RegisterMatcher;
import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.util.StringUtils; 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.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; 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; import static love.sola.netsupport.config.Lang.lang;
/** /**

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.wechat.handler; package love.sola.netsupport.wechat.handler;
import java.util.Map;
import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.common.session.WxSessionManager;
import me.chanjar.weixin.mp.api.WxMpMessageHandler; 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.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
import java.util.Map;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,6 +17,11 @@
package love.sola.netsupport.wechat.handler; 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.enums.Status;
import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.Operator;
import love.sola.netsupport.pojo.Ticket; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage; import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder; 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; import static love.sola.netsupport.config.Lang.lang;

View File

@@ -17,6 +17,11 @@
package love.sola.netsupport.wechat.handler; 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.auth.OAuth2Handler;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.User; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; 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.format;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.wechat.handler; package love.sola.netsupport.wechat.handler;
import java.util.Map;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.Ticket; import love.sola.netsupport.pojo.Ticket;
import love.sola.netsupport.pojo.User; 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.WxMpXmlOutNewsMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder; 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.format;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.wechat.handler; package love.sola.netsupport.wechat.handler;
import java.util.Map;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.User; import love.sola.netsupport.pojo.User;
import love.sola.netsupport.session.WechatSession; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; 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.format;
/** /**

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.wechat.handler; package love.sola.netsupport.wechat.handler;
import java.util.Map;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.User; import love.sola.netsupport.pojo.User;
import love.sola.netsupport.session.WechatSession; 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.WxMpXmlOutNewsMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.NewsBuilder; 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.format;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.wechat.handler; package love.sola.netsupport.wechat.handler;
import java.util.Map;
import love.sola.netsupport.enums.Attribute; import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.Operator;
import love.sola.netsupport.pojo.User; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; 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.format;
/** /**

View File

@@ -17,6 +17,11 @@
package love.sola.netsupport.wechat.handler.admin; 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.auth.OAuth2Handler;
import love.sola.netsupport.enums.Access; import love.sola.netsupport.enums.Access;
import love.sola.netsupport.enums.Attribute; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; 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.format;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;

View File

@@ -17,6 +17,8 @@
package love.sola.netsupport.wechat.handler.admin; package love.sola.netsupport.wechat.handler.admin;
import java.util.Map;
import love.sola.netsupport.pojo.Operator; import love.sola.netsupport.pojo.Operator;
import love.sola.netsupport.sql.TableOperator; import love.sola.netsupport.sql.TableOperator;
import me.chanjar.weixin.common.exception.WxErrorException; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; 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.format;
import static love.sola.netsupport.config.Lang.lang; import static love.sola.netsupport.config.Lang.lang;

View File

@@ -17,6 +17,14 @@
package love.sola.netsupport.wechat.handler.admin; 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 love.sola.netsupport.sql.SQLCore;
import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.common.session.WxSessionManager; 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.WxMpXmlOutMessage;
import me.chanjar.weixin.mp.bean.outxmlbuilder.TextBuilder; 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 <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
* @deprecated limited time only * @deprecated limited time only

View File

@@ -20,12 +20,13 @@ package love.sola.netsupport.wechat.matcher;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import java.util.concurrent.TimeUnit;
import love.sola.netsupport.config.Settings; import love.sola.netsupport.config.Settings;
import me.chanjar.weixin.mp.api.WxMpMessageMatcher; import me.chanjar.weixin.mp.api.WxMpMessageMatcher;
import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
import java.util.concurrent.TimeUnit;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -17,13 +17,13 @@
package love.sola.netsupport.wechat.matcher; package love.sola.netsupport.wechat.matcher;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import me.chanjar.weixin.mp.api.WxMpMessageMatcher; import me.chanjar.weixin.mp.api.WxMpMessageMatcher;
import me.chanjar.weixin.mp.bean.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -1,11 +1,9 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?><!--
<!--
~ Hibernate, Relational Persistence for Idiomatic Java ~ Hibernate, Relational Persistence for Idiomatic Java
~ ~
~ License: GNU Lesser General Public License (LGPL), version 2.1 or later. ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
--> --><!DOCTYPE hibernate-configuration PUBLIC
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 3.0//EN" "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd"> "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
@@ -28,7 +26,8 @@
<property name="dialect">org.hibernate.dialect.MySQL5InnoDBDialect</property> <property name="dialect">org.hibernate.dialect.MySQL5InnoDBDialect</property>
<!-- Disable the second-level cache --> <!-- Disable the second-level cache -->
<property name="cache.provider_class">org.hibernate.cache.internal.NoCacheProvider</property> <property name="cache.provider_class">org.hibernate.cache.internal.NoCacheProvider
</property>
<!-- Echo all executed SQL to stdout --> <!-- Echo all executed SQL to stdout -->
<property name="show_sql">true</property> <property name="show_sql">true</property>
@@ -37,10 +36,10 @@
<property name="hbm2ddl.auto">validate</property> <property name="hbm2ddl.auto">validate</property>
<!-- Names the annotated entity class --> <!-- Names the annotated entity class -->
<mapping class="love.sola.netsupport.pojo.User"/> <mapping class="love.sola.netsupport.pojo.User" />
<mapping class="love.sola.netsupport.pojo.Ticket"/> <mapping class="love.sola.netsupport.pojo.Ticket" />
<mapping class="love.sola.netsupport.pojo.Operator"/> <mapping class="love.sola.netsupport.pojo.Operator" />
<mapping class="love.sola.netsupport.pojo.ToolsCheck"/> <mapping class="love.sola.netsupport.pojo.ToolsCheck" />
</session-factory> </session-factory>

View File

@@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?><!--
<!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
@@ -14,9 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> --><!-- The contents of this file will be loaded for each web application --><!-- Don't swallowOutput for debugging, true for logging(production) -->
<!-- The contents of this file will be loaded for each web application -->
<!-- Don't swallowOutput for debugging, true for logging(production) -->
<Context antiResourceLocking="true"> <Context antiResourceLocking="true">
<!-- Default set of monitored resources --> <!-- Default set of monitored resources -->
@@ -26,20 +23,12 @@
<!-- <!--
<Manager pathname="" /> <Manager pathname="" />
--> -->
<Resource auth="Container" <Resource auth="Container" description="C3P0 database connection pool"
description="C3P0 database connection pool" driverClass="com.mysql.jdbc.Driver" maxPoolSize="10" minPoolSize="2" acquireIncrement="1"
driverClass="com.mysql.jdbc.Driver" maxIdleTime="3600" idleConnectionTestPeriod="1800" name="jdbc/netsupport" user="root"
maxPoolSize="10" password="" factory="org.apache.naming.factory.BeanFactory"
minPoolSize="2"
acquireIncrement="1"
maxIdleTime="3600"
idleConnectionTestPeriod="1800"
name="jdbc/netsupport"
user="root"
password=""
factory="org.apache.naming.factory.BeanFactory"
type="com.mchange.v2.c3p0.ComboPooledDataSource" type="com.mchange.v2.c3p0.ComboPooledDataSource"
jdbcUrl="jdbc:mysql://localhost:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8"/> jdbcUrl="jdbc:mysql://localhost:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8" />
<!-- Uncomment this to enable Comet connection tacking (provides events <!-- Uncomment this to enable Comet connection tacking (provides events
on session expiration as well as webapp lifecycle) --> on session expiration as well as webapp lifecycle) -->
<!-- <!--

View File

@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<!-- General description of your web application --> <!-- General description of your web application -->

View File

@@ -1,11 +1,17 @@
package love.sola.netsupport.util; package love.sola.netsupport.util;
import com.google.gson.*; import com.google.gson.Gson;
import love.sola.netsupport.enums.ISP; 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 org.junit.Test;
import java.util.Date; import java.util.Date;
import love.sola.netsupport.enums.ISP;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */

View File

@@ -1,6 +1,7 @@
package love.sola.netsupport.util; package love.sola.netsupport.util;
import com.google.common.net.UrlEscapers; import com.google.common.net.UrlEscapers;
import org.junit.Test; import org.junit.Test;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;