backendTeam/WechatTicketSystem
1
0
Fork 0
mirror of https://github.com/ZSCNetSupportDept/WechatTicketSystem.git synced 2025-10-28 23:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
# Conflicts:
#	README.md
This commit is contained in:
Sola
2017-12-11 16:06:21 +08:00
parent 6f11c7f965 abe2e1a125
commit 8d7d7d22e4
20 changed files with 580 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.gitignore vendored
View File

@@ -1,12 +1,12 @@
/buildNumber.properties /buildNumber.properties
/docs /docs
.idea/ .idea/
out/ out/
/.metadata/ /.metadata/
/web/META-INF/context.xml /web/META-INF/context.xml
*.iml *.iml
~* ~*
.DS_Store .DS_Store
.classpath .classpath
/target /target
.project .project

330
LICENSE
View File

@@ -1,165 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below. License, supplemented by the additional permissions listed below.
0. Additional Definitions. 0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License. General Public License.
"The Library" refers to a covered work governed by this License, "The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below. other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library. by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library. of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked with which the Combined Work was made is also called the "Linked
Version". Version".
The "Minimal Corresponding Source" for a Combined Work means the The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version. based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work. Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL. 1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL. without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions. 2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified facility is invoked), then you may convey a copy of the modified
version: version:
a) under this License, provided that you make a good faith effort to a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy. this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files. 3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following: (ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are Library is used in it and that the Library and its use are
covered by this License. covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license b) Accompany the object code with a copy of the GNU GPL and this license
document. document.
4. Combined Works. 4. Combined Works.
You may convey a Combined Work under terms of your choice that, You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of engineering for debugging such modifications, if you also do each of
the following: the following:
a) Give prominent notice with each copy of the Combined Work that a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are the Library is used in it and that the Library and its use are
covered by this License. covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license b) Accompany the Combined Work with a copy of the GNU GPL and this license
document. document.
c) For a Combined Work that displays copyright notices during c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document. copies of the GNU GPL and this license document.
d) Do one of the following: d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this 0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying manner specified by section 6 of the GNU GPL for conveying
Corresponding Source. Corresponding Source.
1) Use a suitable shared library mechanism for linking with the 1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked of the Library that is interface-compatible with the Linked
Version. Version.
e) Provide Installation Information, but only if you would otherwise e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.) for conveying Corresponding Source.)
5. Combined Libraries. 5. Combined Libraries.
You may place library facilities that are a work based on the You may place library facilities that are a work based on the
Library side by side in a single library together with other library Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your License, and convey such a combined library under terms of your
choice, if you do both of the following: choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities, on the Library, uncombined with any other library facilities,
conveyed under the terms of this License. conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work. accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License. 6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version" of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and applies to it, you have the option of following the terms and
conditions either of that published version or of any later version conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation. General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the permanent authorization for you to choose that version for the
Library. Library.

334
pom.xml
View File

@@ -1,168 +1,168 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<name>WechatTicketSystem</name> <name>WechatTicketSystem</name>
<groupId>love.sola.netsupport</groupId> <groupId>love.sola.netsupport</groupId>
<artifactId>WechatTicketSystem</artifactId> <artifactId>WechatTicketSystem</artifactId>
<version>2.1-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
</properties> </properties>
<scm> <scm>
<connection>scm:svn:http://127.0.0.1/dummy</connection> <connection>scm:svn:http://127.0.0.1/dummy</connection>
<developerConnection>scm:svn:https://127.0.0.1/dummy</developerConnection> <developerConnection>scm:svn:https://127.0.0.1/dummy</developerConnection>
<tag>HEAD</tag> <tag>HEAD</tag>
<url>http://127.0.0.1/dummy</url> <url>http://127.0.0.1/dummy</url>
</scm> </scm>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId> <artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version> <version>1.4</version>
<configuration> <configuration>
<format>{0,number,0000}</format> <format>{0,number,0000}</format>
<items> <items>
<item>buildNumber0</item> <item>buildNumber0</item>
</items> </items>
<doCheck>false</doCheck> <doCheck>false</doCheck>
<doUpdate>false</doUpdate> <doUpdate>false</doUpdate>
<revisionOnScmFailure>unknown</revisionOnScmFailure> <revisionOnScmFailure>unknown</revisionOnScmFailure>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>create</goal> <goal>create</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}##${buildNumber}</finalName> <finalName>${project.artifactId}##${buildNumber}</finalName>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.16.6</version> <version>1.16.6</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>1.7.12</version> <version>1.7.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>19.0-rc2</version> <version>19.0-rc2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.4</version> <version>2.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.4</version> <version>3.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-net</groupId> <groupId>commons-net</groupId>
<artifactId>commons-net</artifactId> <artifactId>commons-net</artifactId>
<version>3.3</version> <version>3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>me.chanjar</groupId> <groupId>me.chanjar</groupId>
<artifactId>weixin-java-mp</artifactId> <artifactId>weixin-java-mp</artifactId>
<version>1.3.3</version> <version>1.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mchange</groupId> <groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId> <artifactId>c3p0</artifactId>
<version>0.9.5.1</version> <version>0.9.5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.37</version> <version>5.1.37</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>5.0.3.Final</version> <version>5.0.3.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId> <artifactId>hibernate-entitymanager</artifactId>
<version>5.0.3.Final</version> <version>5.0.3.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId> <artifactId>hibernate-c3p0</artifactId>
<version>5.0.3.Final</version> <version>5.0.3.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate.javax.persistence</groupId> <groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId> <artifactId>hibernate-jpa-2.1-api</artifactId>
<version>1.0.0.Final</version> <version>1.0.0.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId> <artifactId>hibernate-envers</artifactId>
<version>5.0.3.Final</version> <version>5.0.3.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.svenkubiak</groupId> <groupId>de.svenkubiak</groupId>
<artifactId>jBCrypt</artifactId> <artifactId>jBCrypt</artifactId>
<version>0.4</version> <version>0.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.16</version> <version>1.16</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>0.9.10</version> <version>0.9.10</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

19
src/main/java/love/sola/netsupport/api/API.java
View File

@@ -20,8 +20,11 @@ package love.sola.netsupport.api;
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 javax.servlet.http.HttpServletRequest;
import java.util.Calendar;
import java.util.Date;
/** /**
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
@@ -43,4 +46,20 @@ public abstract class API {
'}'; '}';
} }
public static String getParameterWithDefault(String obj, String def) {
return obj == null ? def : obj;
}
public static Date getParameterAsDate(String obj, Date def) {
return obj == null ? def : new Date(Long.valueOf(obj));
}
public static Date getToday() {
return DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH);
}
public static Date getDay(Date date) {
return DateUtils.truncate(date, Calendar.DAY_OF_MONTH);
}
} }

12
src/main/java/love/sola/netsupport/api/APIRouter.java
View File

@@ -131,6 +131,18 @@ public class APIRouter extends HttpServlet {
} }
} }
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
doGet(req, resp);
}
@Override
protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.addHeader("Access-Control-Allow-Method", "POST, GET, OPTIONS");
resp.addHeader("Access-Control-Allow-Origin", "*");
resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
}
private static WxSession getSession(HttpServletRequest req) { private static WxSession getSession(HttpServletRequest req) {
String t = req.getParameter("token"); String t = req.getParameter("token");
if (t == null || t.isEmpty()) return null; if (t == null || t.isEmpty()) return null;

5
src/main/java/love/sola/netsupport/api/stuff/TicketLog.java
View File

@@ -31,7 +31,6 @@ import org.hibernate.envers.query.AuditEntity;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
/** /**
@@ -70,8 +69,4 @@ public class TicketLog extends API {
} }
} }
private static Date getToday() {
return DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH);
}
} }

104
src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java Normal file
View File

@@ -0,0 +1,104 @@
/*
* This file is part of WechatTicketSystem.
*
* WechatTicketSystem is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* WechatTicketSystem is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with WechatTicketSystem. If not, see <http://www.gnu.org/licenses/>.
*/
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;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.hibernate.type.IntegerType;
import org.hibernate.type.Type;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
/**
* @author Sola
*/
public class ToolsCheck extends API {
public ToolsCheck() {
url = "/admin/toolscheck";
access = Access.MEMBER;
authorize = Command.LOGIN;
}
@Override
protected Object process(HttpServletRequest req, WxSession session) throws Exception {
if (req.getMethod().equals("GET")) {
return query(req, session);
} else if (req.getMethod().equals("POST")) {
return submit(req, session);
}
return null;
}
private Object submit(HttpServletRequest req, WxSession session) {
Operator op = session.getAttribute(Attribute.OPERATOR);
int status = Integer.valueOf(getParameterWithDefault(req.getParameter("status"), "0"));
String remark = req.getParameter("remark");
if (status != 0 && StringUtils.isBlank(remark)) {
return Error.PARAMETER_REQUIRED;
}
try (Session s = SQLCore.sf.openSession()) {
s.beginTransaction();
s.save(new love.sola.netsupport.pojo.ToolsCheck(
null,
op,
op.getBlock(),
new Date(),
status,
remark
)
);
s.getTransaction().commit();
return Error.OK;
}
}
private Object query(HttpServletRequest req, WxSession session) {
int status = Integer.valueOf(getParameterWithDefault(req.getParameter("status"), "0"));
Date after = getDay(getParameterAsDate(req.getParameter("after"), getToday()));
Date before = getDay(getParameterAsDate(req.getParameter("before"), getToday()));
before = DateUtils.addDays(before, 1);
int block = Integer.valueOf(getParameterWithDefault(req.getParameter("block"), "0"));
try (Session s = SQLCore.sf.openSession()) {
Criteria query = s.createCriteria(love.sola.netsupport.pojo.ToolsCheck.class);
query.add(
Restrictions.sqlRestriction(
"{alias}.status & ? = ?",
new Object[]{status, status},
new Type[]{IntegerType.INSTANCE, IntegerType.INSTANCE}
)
);
query.add(Restrictions.between("checkTime", after, before));
if (block != 0) query.add(Restrictions.eq("block", block));
return query.list();
}
}
}

49
src/main/java/love/sola/netsupport/api/user/Register.java
View File

@@ -24,19 +24,11 @@ import love.sola.netsupport.enums.Attribute;
import love.sola.netsupport.enums.ISP; import love.sola.netsupport.enums.ISP;
import love.sola.netsupport.pojo.User; 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.TableUser; import love.sola.netsupport.sql.TableUser;
import love.sola.netsupport.wechat.Command; import love.sola.netsupport.wechat.Command;
import love.sola.netsupport.wechat.WxMpServlet;
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.ConstraintViolationException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import static love.sola.netsupport.util.Checker.*; import static love.sola.netsupport.util.Checker.*;
@@ -94,48 +86,7 @@ public class Register extends API {
String dupKey = e.getConstraintName(); String dupKey = e.getConstraintName();
return Error.INVALID_PARAMETER.withMsg("Duplicated_" + dupKey.toUpperCase()); // PHONE ACCOUNT WECHAT return Error.INVALID_PARAMETER.withMsg("Duplicated_" + dupKey.toUpperCase()); // PHONE ACCOUNT WECHAT
} }
// FIXME: 2015/12/30 Temporary converter
converterWithRetry(user);
return Error.OK; return Error.OK;
} }
public static void converterWithRetry(User u) {
Throwable last = null;
for (int i = 0; i < 3; i++) {
try {
converter(u);
return;
} catch (WxErrorException | SQLException e) {
last = e;
}
}
last.printStackTrace();
try {
WxMpServlet.instance.wxMpService.customMessageSend(WxMpCustomMessage.TEXT().toUser(u.getWechatId()).content("数据转换失败").build());
} catch (WxErrorException e) {
e.printStackTrace();
}
}
public static void converter(User u) throws WxErrorException, SQLException {
try (Connection conn = SQLCore.ds.getConnection()) {
PreparedStatement ps = conn.prepareStatement("SELECT wechat FROM `convert` WHERE id=?");
ps.setLong(1, u.getId());
ResultSet rs = ps.executeQuery();
if (rs.next()) {
WxMpServlet.instance.wxMpService
.userUpdateGroup(u.getWechatId(), 100L);
String old = rs.getString(1);
ps = conn.prepareStatement("UPDATE `operators` SET wechat=? WHERE wechat=?");
ps.setString(1, u.getWechatId());
ps.setString(2, old);
if (ps.executeUpdate() == 1) {
WxMpServlet.instance.wxMpService.customMessageSend(WxMpCustomMessage.TEXT().toUser(u.getWechatId()).content("数据转换成功").build());
} else {
WxMpServlet.instance.wxMpService.customMessageSend(WxMpCustomMessage.TEXT().toUser(u.getWechatId()).content("已进行过数据转换").build());
}
}
}
}
} }

24
src/main/java/love/sola/netsupport/enums/Block.java
View File

@@ -51,6 +51,16 @@ public class Block {
public static final int FX_4 = 53; public static final int FX_4 = 53;
public static final int FX_5 = 54; public static final int FX_5 = 54;
public static final int FX_6 = 55; public static final int FX_6 = 55;
public static final int BS_1 = 60;
public static final int BS_2 = 61;
public static final int BS_3 = 62;
public static final int BS_4 = 63;
public static final int BS_5 = 64;
public static final int BS_6 = 65;
public static final int BS_7 = 66;
public static final int BS_8 = 67;
public static final int BS_9 = 68;
public static final int ZH = 80;
public static final Map<Integer, String> inverseMap = new HashMap<>(); public static final Map<Integer, String> inverseMap = new HashMap<>();
@@ -67,9 +77,10 @@ public class Block {
} }
} }
public static final int[][] AVAILABLE = new int[62][0]; private static final int[][] AVAILABLE = new int[100][0];
static { static {
// @formatter:off
// -------------------------------------------- // // -------------------------------------------- //
// THANKS DATA PROVIDED BY Lai Juncheng // THANKS DATA PROVIDED BY Lai Juncheng
// -------------------------------------------- // // -------------------------------------------- //
@@ -98,6 +109,17 @@ public class Block {
AVAILABLE[XH_C] = new int[]{126, 226, 326, 426, 526, 626, 726, 826, 926, 1026, 1126, 1226}; AVAILABLE[XH_C] = new int[]{126, 226, 326, 426, 526, 626, 726, 826, 926, 1026, 1126, 1226};
AVAILABLE[XH_D] = new int[]{128, 228, 328, 428, 528, 628, 728, 828, 928, 1028, 1128, 1228}; AVAILABLE[XH_D] = new int[]{128, 228, 328, 428, 528, 628, 728, 828, 928, 1028, 1128, 1228};
AVAILABLE[FX_6] = new int[0]; AVAILABLE[FX_6] = new int[0];
AVAILABLE[BS_1] = new int[]{102, 203, 301};
AVAILABLE[BS_2] = new int[]{102, 203, 301};
AVAILABLE[BS_3] = new int[]{103, 203, 302};
AVAILABLE[BS_4] = new int[]{102, 203, 301};
AVAILABLE[BS_5] = new int[]{102, 203, 301};
AVAILABLE[BS_6] = new int[]{102, 203, 302};
AVAILABLE[BS_7] = new int[]{102, 203, 301};
AVAILABLE[BS_8] = new int[]{102, 203, 301};
AVAILABLE[BS_9] = new int[]{103, 203, 302};
AVAILABLE[ZH] = new int[]{199, 299, 399, 499, 599, 699, 799, 899, 999, 1099, 1199, 1299, 1399};
// @formatter:on
} }
public static boolean checkRoom(int block, int room) { public static boolean checkRoom(int block, int room) {

40
src/main/java/love/sola/netsupport/pojo/ToolsCheck.java Normal file
View File

@@ -0,0 +1,40 @@
package love.sola.netsupport.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import javax.persistence.*;
import java.util.Date;
/**
* @author Sola {@literal <dev@sola.love>}
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "toolschk", indexes = {
@Index(columnList = "block,chktime,status"),
@Index(columnList = "chktime,status")
})
@DynamicInsert
public class ToolsCheck {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@ManyToOne(optional = false)
@JoinColumn(name = "opsid", nullable = false)
private Operator operator;
@Column(nullable = false)
private Integer block;
@Column(name = "chktime", nullable = false)
private Date checkTime = new Date();
@ColumnDefault("0")
private Integer status = 0;
private String remark;
}

2
src/main/java/love/sola/netsupport/util/Checker.java
View File

@@ -25,7 +25,7 @@ import love.sola.netsupport.enums.ISP;
*/ */
public class Checker { public class Checker {
public static final String STUDENT_ID_REGEX = "^(2010|2012|2013|2014|2015)[0-9]{9}$"; public static final String STUDENT_ID_REGEX = "^(2014|2015|2016|2017)[0-9]{9}$";
public static final String PHONE_NUMBER_REGEX = "^1[34578][0-9]{9}$"; public static final String PHONE_NUMBER_REGEX = "^1[34578][0-9]{9}$";
public static boolean hasNull(Object... v) { public static boolean hasNull(Object... v) {

5
src/main/java/love/sola/netsupport/wechat/Command.java
View File

@@ -20,6 +20,7 @@ package love.sola.netsupport.wechat;
import love.sola.netsupport.wechat.handler.*; import love.sola.netsupport.wechat.handler.*;
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 me.chanjar.weixin.mp.api.WxMpMessageHandler; import me.chanjar.weixin.mp.api.WxMpMessageHandler;
import java.util.HashMap; import java.util.HashMap;
@@ -38,7 +39,9 @@ public enum Command {
CANCEL(3, CancelHandler.class), CANCEL(3, CancelHandler.class),
PROFILE(4, ProfileHandler.class), PROFILE(4, ProfileHandler.class),
LOGIN(10, LoginHandler.class), LOGIN(10, LoginHandler.class),
OPERATOR_INFO(11, OperatorInfoHandler.class),; OPERATOR_INFO(11, OperatorInfoHandler.class),
SIGN(12, SignHandler.class), //FIXME
;
private static final Map<Integer, Command> ID_MAP = new HashMap<>(); private static final Map<Integer, Command> ID_MAP = new HashMap<>();

3
src/main/java/love/sola/netsupport/wechat/handler/SubscribeHandler.java
View File

@@ -17,7 +17,6 @@
package love.sola.netsupport.wechat.handler; package love.sola.netsupport.wechat.handler;
import love.sola.netsupport.api.user.Register;
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;
@@ -58,8 +57,6 @@ public class SubscribeHandler implements WxMpMessageHandler {
Operator op = TableOperator.get(fromUser); Operator op = TableOperator.get(fromUser);
if (op != null) { if (op != null) {
wxMpService.userUpdateGroup(fromUser, 100L); wxMpService.userUpdateGroup(fromUser, 100L);
} else {
Register.converterWithRetry(u); //TODO remove me
} }
} else { } else {
session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER); session.setAttribute(Attribute.AUTHORIZED, Command.REGISTER);

14
src/main/java/love/sola/netsupport/wechat/handler/admin/SignHandler.java
View File

@@ -35,11 +35,15 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* @deprecated limited time only
* @author Sola {@literal <dev@sola.love>} * @author Sola {@literal <dev@sola.love>}
*/ */
@Deprecated
public class SignHandler implements WxMpMessageHandler { public class SignHandler implements WxMpMessageHandler {
public static Pattern pat = Pattern.compile("(?i)^Auth (\\d{4})"); public static Pattern pat = Pattern.compile("^(?i)Auth (\\d{4})");
public static final int INVALID_ID = -1;
public static final int SIGNED_ID = -2;
@Override @Override
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException { public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
@@ -52,10 +56,10 @@ public class SignHandler implements WxMpMessageHandler {
int id = Integer.parseInt(mat.group(1)); int id = Integer.parseInt(mat.group(1));
try (Connection conn = SQLCore.ds.getConnection()) { try (Connection conn = SQLCore.ds.getConnection()) {
switch (checkID(conn, id)) { switch (checkID(conn, id)) {
case -1: case INVALID_ID:
out.content("无效ID。"); out.content("无效ID。");
break root; break root;
case -2: case SIGNED_ID:
out.content("该ID已登记过。"); out.content("该ID已登记过。");
break root; break root;
} }
@@ -86,9 +90,9 @@ public class SignHandler implements WxMpMessageHandler {
ps.setInt(1, id); ps.setInt(1, id);
ResultSet rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
return rs.getString("wechat") != null ? -2 : 0; return rs.getString("wechat") != null ? SIGNED_ID : 0;
} else { } else {
return -1; return INVALID_ID;
} }
} }

1
src/main/resources/hibernate.cfg.xml
View File

@@ -40,6 +40,7 @@
<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"/>
</session-factory> </session-factory>

22
src/main/resources/lang.yml
View File

@@ -1,6 +1,9 @@
#System Exception #System Exception
Access_Denied: 'Access denied.' Access_Denied: 'Access denied.'
Illegal_Request: "Access denied.\nYou are doing a illegal request, and our system has logged your behaviors.\nYou need to take this seriously, if you do this frequently, you may be banned from our system." 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.
Unknown_Encrypt_Type: 'Unknown encrypt-type.' Unknown_Encrypt_Type: 'Unknown encrypt-type.'
#Command Regex #Command Regex
@@ -11,9 +14,10 @@ REGEX_CANCEL: '^(?i)(Cancel)|(取消)|(撤销)|(qx)|(cx)$'
REGEX_LOGIN: '^(?i)Authme$' REGEX_LOGIN: '^(?i)Authme$'
REGEX_PROFILE: '^(?i)(EditProfile)|(修改资料)|(修改信息)|(xgzl)|(xgxx)$' REGEX_PROFILE: '^(?i)(EditProfile)|(修改资料)|(修改信息)|(xgzl)|(xgxx)$'
REGEX_OPERATOR_INFO: '^(?i)(OpInfo)|(网维资料)|(wwzl)$' REGEX_OPERATOR_INFO: '^(?i)(OpInfo)|(网维资料)|(wwzl)$'
REGEX_SIGN: '^(?i)Auth (\d{4})$'
#Misc #Misc
Invalid_Operation: 'Whoops，报修姬找不到你想要的东西啦 (╯‵□′)╯︵┻━┻。' Invalid_Operation: 'Whoops，本报修平台暂未开放聊天功能哦，请点击下方菜单选择你想进行的操作。'
Message_Spam: '你的打字速度太快了，喝一杯82年的Java压压惊吧。' Message_Spam: '你的打字速度太快了，喝一杯82年的Java压压惊吧。'
#Subscribe #Subscribe
Event_Subscribe: "欢迎使用电子科技大学中山学院网络维护科微信自助报修平台。\n\n{0}" Event_Subscribe: "欢迎使用电子科技大学中山学院网络维护科微信自助报修平台。\n\n{0}"
@@ -63,13 +67,13 @@ Operator_Info: |
若以上信息有误，请及时联系@15-沙子森。 若以上信息有误，请及时联系@15-沙子森。
#URL #URL
User_Register_Link: 'http://topaz.sinaapp.com/nm/v2/user/reg.html?token={0}' User_Register_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/reg.html?token={0}'
User_Query_Link: 'http://topaz.sinaapp.com/nm/v2/user/list.html?token={0}' User_Query_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/list.html?token={0}'
User_Submit_Link: 'http://topaz.sinaapp.com/nm/v2/user/rrepair.html?token={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}' User_Submit_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/rrepair.html?token={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}'
User_Profile_Link: 'http://topaz.sinaapp.com/nm/v2/user/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}' User_Profile_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}'
Result_Page: 'http://topaz.sinaapp.com/nm/v2/result.html' Result_Page: 'http://wwbx.zsc.edu.cn/nm/v2/result.html'
Operator_Home_Page: 'http://topaz.sinaapp.com/nm/v2/man/home.html?token={0}' Operator_Home_Page: 'http://wwbx.zsc.edu.cn/nm/v2/man/home.html?token={0}'
Operator_Login_Page: 'http://topaz.sinaapp.com/nm/v2/man/login.html?pkey={0}' Operator_Login_Page: 'http://wwbx.zsc.edu.cn/nm/v2/man/login.html?pkey={0}'
#Localized #Localized
#Status #Status

28
src/main/resources/menu-op.json
View File

@@ -19,24 +19,9 @@
"key": "CANCEL" "key": "CANCEL"
}, },
{ {
"type": "view", "type": "click",
"name": "修改资料", "name": "修改资料",
"url": "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb7a8b799e494b053&redirect_uri=http%3a%2f%2fwcs.sola.love%2foauth2%2fcallback&response_type=code&scope=snsapi_base&state=PROFILE#wechat_redirect" "key": "PROFILE"
}
]
},
{
"name": "工具箱",
"sub_button": [
{
"type": "view",
"name": "电信宽带查余额",
"url": "http://util.sola.love/yue.html"
},
{
"type": "view",
"name": "四六级成绩查询",
"url": "http://util.sola.love/cet.html"
} }
] ]
}, },
@@ -49,14 +34,9 @@
"key": "OPERATOR_INFO" "key": "OPERATOR_INFO"
}, },
{ {
"type": "view", "type": "click",
"name": "后台登录", "name": "后台登录",
"url": "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb7a8b799e494b053&redirect_uri=http%3a%2f%2fwcs.sola.love%2foauth2%2fcallback&response_type=code&scope=snsapi_base&state=LOGIN#wechat_redirect" "key": "LOGIN"
},
{
"type": "view",
"name": "网维留言板",
"url": "http://wcs.sola.love/oauth2/go"
} }
] ]
} }

30
src/main/resources/menu.json
View File

@@ -19,49 +19,29 @@
"key": "CANCEL" "key": "CANCEL"
}, },
{ {
"type": "view", "type": "click",
"name": "修改资料", "name": "修改资料",
"url": "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb7a8b799e494b053&redirect_uri=http%3a%2f%2fwcs.sola.love%2foauth2%2fcallback&response_type=code&scope=snsapi_base&state=PROFILE#wechat_redirect" "key": "PROFILE"
}
]
},
{
"name": "工具箱",
"sub_button": [
{
"type": "view",
"name": "电信宽带查余额",
"url": "http://util.sola.love/yue.html"
},
{
"type": "view",
"name": "四六级成绩查询",
"url": "http://util.sola.love/cet.html"
} }
] ]
}, },
{ {
"name": "关于网维", "name": "关于网维",
"sub_button": [ "sub_button": [
{
"type": "view",
"name": "网维留言板",
"url": "http://wcs.sola.love/oauth2/go"
},
{ {
"type": "view", "type": "view",
"name": "关于报修系统", "name": "关于报修系统",
"url": "http://topaz.sinaapp.com/nm/v2/" "url": "http://wwbx.zsc.edu.cn/nm/v2/"
}, },
{ {
"type": "view", "type": "view",
"name": "联系我们", "name": "联系我们",
"url": "http://topaz.sinaapp.com/nm/v2/404.html" "url": "http://wwbx.zsc.edu.cn/nm/v2/404.html"
}, },
{ {
"type": "view", "type": "view",
"name": "关于网维", "name": "关于网维",
"url": "http://topaz.sinaapp.com/nm/v2/404.html" "url": "http://wwbx.zsc.edu.cn/nm/v2/404.html"
} }
] ]
} }

2
src/test/java/love/sola/netsupport/api/ReflectionTest.java
View File

@@ -14,7 +14,7 @@ public class ReflectionTest {
public void test() { public void test() {
Reflections reflections = new Reflections(getClass().getPackage().getName()); Reflections reflections = new Reflections(getClass().getPackage().getName());
Set<Class<? extends API>> set = reflections.getSubTypesOf(API.class); Set<Class<? extends API>> set = reflections.getSubTypesOf(API.class);
assert set.size() == 14; assert set.size() == 15;
} }
} }

2
src/test/java/love/sola/netsupport/util/URLEncodeTest.java
View File

@@ -24,7 +24,7 @@ public class URLEncodeTest {
.title("Test Title") .title("Test Title")
.msg("Test Message") .msg("Test Message")
.toString(), .toString(),
equalTo("http://topaz.sinaapp.com/nm/v2/result.html?type=1&title=Test%20Title&msg=Test%20Message&") equalTo("http://s.wts.sola.love/nm/v2/result.html?type=1&title=Test%20Title&msg=Test%20Message&")
); );
} }