switch to HikariCP (#5)

README.md

@@ -22,7 +22,7 @@ submit pull requests to `master` branch will be ignored.
 ## TroubleShooting
 - Before you report a bug, please [search the issue tracker](https://github.com/ZSCNetSupportDept/WechatTicketSystem/issues) to see if someone has already reported the problem.
 - If the issue doesn’t already exist, [create a new issue](https://github.com/ZSCNetSupportDept/WechatTicketSystem/issues/new).
-- Please provide as much information as possible with the issue report, we like to know the version you are using, as well as your Operating System and JVM version.
+- Please provide as much information as possible with the issue report, we like to know the version of FYoung4j that you are using, as well as your Operating System and JVM version.
 - If you need to paste code, or include a stack trace use Markdown ```` ``` ```` escapes before and after your text.
 
 ## License

pom.xml

@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -88,9 +88,9 @@
 			<version>1.3.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.mchange</groupId>
+			<groupId>com.zaxxer</groupId>
-			<artifactId>c3p0</artifactId>
+			<artifactId>HikariCP</artifactId>
-			<version>0.9.5.4</version>
+			<version>3.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>

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 STUDENT_ID_REGEX = "^(2015|2016|2017|2018)[0-9]{9}$";
-    public static final String PHONE_NUMBER_REGEX = "^1[345789][0-9]{9}$";
+    public static final String PHONE_NUMBER_REGEX = "^1[34578][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_Register_Link: 'http://wwbx.zsc.edu.cn/nm/v2/user/reg.html?token={0}'
-User_Query_Link: 'https://wwbx.zsxyww.htroy.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: 'https://wwbx.zsxyww.htroy.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: '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,#}'
+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: 'https://wwbx.zsxyww.htroy.com/nm/v2/result.html'
+Result_Page: 'http://wwbx.zsc.edu.cn/nm/v2/result.html'
-Operator_Home_Page: 'https://wwbx.zsxyww.htroy.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: 'https://wwbx.zsxyww.htroy.com/nm/v2/man/login.html?pkey={0}'
+Operator_Login_Page: 'http://wwbx.zsc.edu.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": "http://wwbx.zsc.edu.cn/nm/v2/"
         },
         {
           "type": "view",
           "name": "联系我们",
-          "url": "https://wwbx.zsxyww.htroy.com/nm/v2/404.html"
+          "url": "http://wwbx.zsc.edu.cn/nm/v2/404.html"
         },
         {
           "type": "view",
           "name": "关于网维",
-          "url": "https://wwbx.zsxyww.htroy.com/nm/v2/404.html"
+          "url": "http://wwbx.zsc.edu.cn/nm/v2/404.html"
         }
       ]
     }

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

@@ -23,11 +23,11 @@
     <!--
     <Manager pathname="" />
     -->
-    <Resource auth="Container" description="C3P0 database connection pool"
+    <Resource auth="Container" description="HikariCP 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"
-        type="com.mchange.v2.c3p0.ComboPooledDataSource"
+        type="com.zaxxer.hikari.HikariDataSource"
         jdbcUrl="jdbc:mysql://localhost:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8" />
     <!-- Uncomment this to enable Comet connection tacking (provides events
          on session expiration as well as webapp lifecycle) -->