1 Commits

Author SHA1 Message Date
dependabot[bot]
325d96fcff Bump mysql-connector-java from 5.1.37 to 8.0.28
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.37 to 8.0.28.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.37...8.0.28)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 00:36:58 +00:00
6 changed files with 28 additions and 35 deletions

1
.gitignore vendored
View File

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

32
pom.xml
View File

@@ -1,7 +1,6 @@
<?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>
@@ -27,21 +26,16 @@
<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.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
</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>
</plugins>
</build>
@@ -101,7 +95,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.37</version>
<version>8.0.28</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>

View File

@@ -67,13 +67,13 @@ Operator_Info: |
若以上信息有误,请及时联系@15-沙子森。
#URL
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}'
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}'
#Localized
#Status

View File

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

View File

@@ -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="${DATABASE_USER}"
password="${DATABASE_PASSWORD}" factory="org.apache.naming.factory.BeanFactory"
maxIdleTime="3600" idleConnectionTestPeriod="1800" name="jdbc/netsupport" user="root"
password="" factory="org.apache.naming.factory.BeanFactory"
type="com.mchange.v2.c3p0.ComboPooledDataSource"
jdbcUrl="jdbc:mysql://${DATABASE_HOST}:3306/netsupport?autoReconnect=true&amp;characterEncoding=utf8" />
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) -->
<!--

View File

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