diff --git a/src/main/java/love/sola/netsupport/enums/Block.java b/src/main/java/love/sola/netsupport/enums/Block.java index eb15eb7..dd7cee9 100644 --- a/src/main/java/love/sola/netsupport/enums/Block.java +++ b/src/main/java/love/sola/netsupport/enums/Block.java @@ -60,6 +60,7 @@ public class Block { 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 inverseMap = new HashMap<>(); @@ -76,7 +77,7 @@ public class Block { } } - private static final int[][] AVAILABLE = new int[70][0]; + private static final int[][] AVAILABLE = new int[100][0]; static { // @formatter:off @@ -117,6 +118,7 @@ public class Block { 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 } diff --git a/src/main/java/love/sola/netsupport/util/Checker.java b/src/main/java/love/sola/netsupport/util/Checker.java index 0e2b041..0fb5e2f 100644 --- a/src/main/java/love/sola/netsupport/util/Checker.java +++ b/src/main/java/love/sola/netsupport/util/Checker.java @@ -25,7 +25,7 @@ import love.sola.netsupport.enums.ISP; */ public class Checker { - public static final String STUDENT_ID_REGEX = "^(2010|2012|2013|2014|2015|2016)[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 boolean hasNull(Object... v) { diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index 90a258f..ccbc33d 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -1,6 +1,9 @@ #System Exception 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.' #Command Regex diff --git a/src/main/resources/menu-op.json b/src/main/resources/menu-op.json index 87b5859..839a3a1 100644 --- a/src/main/resources/menu-op.json +++ b/src/main/resources/menu-op.json @@ -19,24 +19,9 @@ "key": "CANCEL" }, { - "type": "view", + "type": "click", "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" - } - ] - }, - { - "name": "工具箱", - "sub_button": [ - { - "type": "view", - "name": "电信宽带查余额", - "url": "http://util.sola.love/yue.html" - }, - { - "type": "view", - "name": "四六级成绩查询", - "url": "http://util.sola.love/cet.html" + "key": "PROFILE" } ] }, @@ -49,14 +34,9 @@ "key": "OPERATOR_INFO" }, { - "type": "view", + "type": "click", "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" - }, - { - "type": "view", - "name": "网维留言板", - "url": "http://wcs.sola.love/oauth2/go" + "key": "LOGIN" } ] } diff --git a/src/main/resources/menu.json b/src/main/resources/menu.json index 0e17a95..5202999 100644 --- a/src/main/resources/menu.json +++ b/src/main/resources/menu.json @@ -19,35 +19,15 @@ "key": "CANCEL" }, { - "type": "view", + "type": "click", "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" - } - ] - }, - { - "name": "工具箱", - "sub_button": [ - { - "type": "view", - "name": "电信宽带查余额", - "url": "http://util.sola.love/yue.html" - }, - { - "type": "view", - "name": "四六级成绩查询", - "url": "http://util.sola.love/cet.html" + "key": "PROFILE" } ] }, { "name": "关于网维", "sub_button": [ - { - "type": "view", - "name": "网维留言板", - "url": "http://wcs.sola.love/oauth2/go" - }, { "type": "view", "name": "关于报修系统",