yexuejc/yexuejc-springboot
1
0
Fork 0
mirror of https://gitee.com/incloudcode/yexuejc-springboot.git synced 2025-09-28 02:43:21 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/2.x' into 2.x

Browse Source 
# Conflicts:
#	README.md
#	UPDATE.md
#	doc/MENU.md
#	pom.xml
#	yexuejc-springboot-base/pom.xml
This commit is contained in:
maxf
2018-12-03 10:54:37 +08:00
parent 40c1472104 56eeafd38e
commit 539e9361f4
5 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
yexuejc-springboot-base/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>com.yexuejc.springboot</groupId>
<artifactId>yexuejc-springboot-parent</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
<!-- 本地打包：使用相对关联路径 -->
<!--<relativePath>../../yexuejc</relativePath>-->
</parent>
@@ -62,13 +62,6 @@
<artifactId>aliyun-sdk-oss</artifactId>
<optional>true</optional>
</dependency>
<!-- 阿里云消息服务MNS相关SDK -->
<dependency>
<groupId>com.aliyun.mns</groupId>
<artifactId>aliyun-sdk-mns</artifactId>
<classifier>jar-with-dependencies</classifier>
<optional>true</optional>
</dependency>
<!-- JJWT -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
@@ -77,8 +70,8 @@
</dependency>
<!-- 使用Redis -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -86,6 +79,20 @@
<artifactId>jedis</artifactId>
<optional>true</optional>
</dependency>
<!-- 阿里云消息服务MNS相关SDK -->
<dependency>
<groupId>com.aliyun.mns</groupId>
<artifactId>aliyun-sdk-mns</artifactId>
<classifier>jar-with-dependencies</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<!-- HikariCP数据库连接池（JDK1.8） -->
<dependency>
<groupId>com.zaxxer</groupId>
@@ -105,11 +112,6 @@
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>