Merge branch 'master' of E:\workspace-nice\system-examination-signup with conflicts.

This commit is contained in:
Renpc-kilig 2021-05-01 11:06:55 +08:00
parent 0657276512
commit 6b17b59955
2 changed files with 11 additions and 5 deletions

View File

@ -102,6 +102,12 @@
<version>1.18.16</version> <version>1.18.16</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--<dependency>
<artifactId>module-building-pictures</artifactId>
<groupId>cn.com.tenlion</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>-->
</dependencies> </dependencies>
<build> <build>

View File

@ -1,6 +1,6 @@
server: server:
port: 7009 port: 8089
url: http://127.0.0.1:7009/signup url: http://192.168.0.111:8089/signup
system-title: 考试报名系统 system-title: 考试报名系统
system-sub-title: 考试报名系统 system-sub-title: 考试报名系统
servlet: servlet:
@ -25,11 +25,11 @@ spring:
max-request-size: 1GB max-request-size: 1GB
datasource: datasource:
druid: druid:
url: jdbc:mysql://127.0.0.1:3306/db_examination_signup?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC url: jdbc:mysql://49.232.216.45:3306/db_module_building_pictures?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
db-type: mysql db-type: mysql
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: renpengcheng
password: root password: tsrenpengcheng
initial-size: 2 initial-size: 2
min-idle: 2 min-idle: 2
max-active: 5 max-active: 5