mirror of
https://github.com/ZSCNetSupportDept/WechatTicketSystem.git
synced 2025-10-29 08:05:04 +08:00
Merge branch 'develop'
# Conflicts: # README.md
This commit is contained in:
@@ -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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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
104
src/main/java/love/sola/netsupport/api/stuff/ToolsCheck.java
Normal 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
40
src/main/java/love/sola/netsupport/pojo/ToolsCheck.java
Normal 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;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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<>();
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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&")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user