1 Commits

Author SHA1 Message Date
dependabot[bot]
ce92f44a0f Bump junit from 4.12 to 4.13.1
Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-13 06:44:00 +00:00
3 changed files with 7 additions and 7 deletions

View File

@@ -49,7 +49,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

View File

@@ -27,9 +27,9 @@ import static love.sola.netsupport.config.Lang.lang;
*/
public enum ISP {
TELECOM(1, "^1[3|4|5|6|7|8|9][0-9]{9}$"),
UNICOM(2, "^\\w+([-+.]\\w+)*@16900\\.gd"),
CHINAMOBILE(3, "^1[3|4|5|6|7|8|9][0-9]{9}@139\\.gd$"),
TELECOM(1, "^1[3|4|5|7|8][0-9]{9}$"),
UNICOM(2, "ZSZJLAN[0-9]{10}@16900\\.gd"),
CHINAMOBILE(3, "^1[3|4|5|7|8][0-9]{9}@139\\.gd$"),
OTHER(4, ".*"),
;

View File

@@ -25,8 +25,8 @@ import love.sola.netsupport.enums.ISP;
*/
public class Checker {
public static final String STUDENT_ID_REGEX = "^(2|1)[0-9]{9,12}$";
public static final String PHONE_NUMBER_REGEX = "^1[3456789][0-9]{9}$";
public static final String STUDENT_ID_REGEX = "^(2015|2016|2017|2018|2019)[0-9]{9}$";
public static final String PHONE_NUMBER_REGEX = "^1[345789][0-9]{9}$";
public static boolean hasNull(Object... v) {
for (Object o : v) if (o == null) return true;