更新链接地址至davisye.cn，调整项目配置，添加.vscode到.gitignore

Signed-off-by: Sola <dev@sola.love>

.gitignore

@@ -2,3 +2,4 @@
 .idea/
 *.iml
 /target
+.vscode

pom.xml

@@ -1,6 +1,7 @@
 <?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"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<name>WechatTicketSystem</name>
 	<groupId>love.sola.netsupport</groupId>
@@ -26,16 +27,21 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <url>http://localhost:8080/manager/text</url>
-                    <server>wwbx</server>
-                    <path>/WechatTicketSystem</path>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<url>http://localhost:8080/manager/text</url>
+					<server>wwbx</server>
+					<path>/WechatTicketSystem</path>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.3.2</version>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -139,4 +145,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>

src/main/java/love/sola/netsupport/enums/ISP.java

@@ -27,9 +27,9 @@ import static love.sola.netsupport.config.Lang.lang;
  */
 public enum ISP {
 
-    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$"),
+    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$"),
     OTHER(4, ".*"),
     ;
 

src/main/java/love/sola/netsupport/util/Checker.java

@@ -25,8 +25,8 @@ import love.sola.netsupport.enums.ISP;
  */
 public class Checker {
 
-    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 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 boolean hasNull(Object... v) {
         for (Object o : v) if (o == null) return true;

src/main/resources/lang.yml

@@ -67,13 +67,13 @@ Operator_Info: |
 
   若以上信息有误，请及时联系@15-沙子森。
 #URL
-User_Register_Link: 'https://wwbx.zsxyww.htroy.com/nm/v2/user/reg.html?token={0}'
-User_Query_Link: 'https://wwbx.zsxyww.htroy.com/nm/v2/user/list.html?token={0}'
-User_Submit_Link: 'https://wwbx.zsxyww.htroy.com/nm/v2/user/rrepair.html?token={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}'
-User_Profile_Link: 'https://wwbx.zsxyww.htroy.com/nm/v2/user/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}'
-Result_Page: 'https://wwbx.zsxyww.htroy.com/nm/v2/result.html'
-Operator_Home_Page: 'https://wwbx.zsxyww.htroy.com/nm/v2/man/home.html?token={0}'
-Operator_Login_Page: 'https://wwbx.zsxyww.htroy.com/nm/v2/man/login.html?pkey={0}'
+User_Register_Link: 'https://wwbx.davisye.cn/nm/v2/user/reg.html?token={0}'
+User_Query_Link: 'https://wwbx.davisye.cn/nm/v2/user/list.html?token={0}'
+User_Submit_Link: 'https://wwbx.davisye.cn/nm/v2/user/rrepair.html?token={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}'
+User_Profile_Link: 'https://wwbx.davisye.cn/nm/v2/user/modi.html?token={0}&name={1}&isp={2}&username={3}&block={4}&room={5}&phone={6,number,#}'
+Result_Page: 'https://wwbx.davisye.cn/nm/v2/result.html'
+Operator_Home_Page: 'https://wwbx.davisye.cn/nm/v2/man/home.html?token={0}'
+Operator_Login_Page: 'https://wwbx.davisye.cn/nm/v2/man/login.html?pkey={0}'
 
 #Localized
 #Status

src/main/resources/menu.json

@@ -31,17 +31,17 @@
         {
           "type": "view",
           "name": "关于报修系统",
-          "url": "https://wwbx.zsxyww.htroy.com/nm/v2/"
+          "url": "https://wwbx.davisye.cn/nm/v2/"
         },
         {
           "type": "view",
           "name": "联系我们",
-          "url": "https://wwbx.zsxyww.htroy.com/nm/v2/404.html"
+          "url": "https://wwbx.davisye.cn/nm/v2/404.html"
         },
         {
           "type": "view",
           "name": "关于网维",
-          "url": "https://wwbx.zsxyww.htroy.com/nm/v2/404.html"
+          "url": "https://wwbx.davisye.cn/nm/v2/404.html"
         }
       ]
     }

src/main/webapp/META-INF/context.xml

@@ -25,10 +25,10 @@
     -->
     <Resource auth="Container" description="C3P0 database connection pool"
         driverClass="com.mysql.jdbc.Driver" maxPoolSize="10" minPoolSize="2" acquireIncrement="1"
-        maxIdleTime="3600" idleConnectionTestPeriod="1800" name="jdbc/netsupport" user="root"
-        password="" factory="org.apache.naming.factory.BeanFactory"
+        maxIdleTime="3600" idleConnectionTestPeriod="1800" name="jdbc/netsupport" user="${DATABASE_USER}"
+        password="${DATABASE_PASSWORD}" factory="org.apache.naming.factory.BeanFactory"
         type="com.mchange.v2.c3p0.ComboPooledDataSource"
-        jdbcUrl="jdbc:mysql://localhost:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8" />
+        jdbcUrl="jdbc:mysql://${DATABASE_HOST}:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8" />
     <!-- Uncomment this to enable Comet connection tacking (provides events
          on session expiration as well as webapp lifecycle) -->
     <!--

src/test/java/love/sola/netsupport/util/URLEncodeTest.java

@@ -25,7 +25,7 @@ public class URLEncodeTest {
                         .title("Test Title")
                         .msg("Test Message")
                         .toString(),
-                equalTo("http://wwbx.zsc.edu.cn/nm/v2/result.html?type=1&title=Test%20Title&msg=Test%20Message&")
+                equalTo("https://wwbx.davisye.cn/nm/v2/result.html?type=1&title=Test%20Title&msg=Test%20Message&")
         );
     }