更新配置文件与依赖配置,解决在linux中通过tomcat部署出现的依赖冲突问题

master
Bosen 2021-05-07 17:53:20 +08:00
parent 3e1e310358
commit 31fc234e2c
2 changed files with 3 additions and 18 deletions

15
pom.xml
View File

@ -110,27 +110,18 @@
<artifactId>spring-boot</artifactId>
<version>2.3.5.RELEASE</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
<!-- 二维码支持包 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>net.glxn</groupId>
<artifactId>qrgen</artifactId>
@ -141,17 +132,11 @@
<artifactId>fastjson</artifactId>
<version>1.2.47</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>2.3.4.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>

View File

@ -1,4 +1,4 @@
site-url: http://127.0.0.1
site-url: 47.115.118.34
server:
port: 80
tomcat:
@ -18,7 +18,7 @@ spring:
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/jieyue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
url: jdbc:mysql://${site-url}:3306/jieyue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
mvc:
static-path-pattern: /*/**
mail:
@ -44,7 +44,7 @@ spring:
redis:
database: 0
port: 6379
host: 127.0.0.1
host: ${site-url}
mybatis:
mapper-locations: classpath:/static/mapping/*Mapping.xml
type-aliases-package: com.example.jieyue.common.entity