From b348b766fc4cd9079d1bee1fed32fc21bfe01436 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 10 六月 2021 15:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8854353..94ab8d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.1.2</ruoyi-vue-plus.version>
+ <ruoyi-vue-plus.version>2.3.1</ruoyi-vue-plus.version>
<spring-boot.version>2.3.11.RELEASE</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -21,7 +21,6 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.6</druid.version>
<knife4j.version>3.0.2</knife4j.version>
- <swagger-annotations.version>1.5.22</swagger-annotations.version>
<fastjson.version>1.2.76</fastjson.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
@@ -31,6 +30,7 @@
<feign.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
+ <redisson.version>3.15.2</redisson.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -46,7 +46,7 @@
<scope>import</scope>
</dependency>
- <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+ <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
@@ -57,18 +57,6 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>swagger-annotations</artifactId>
- <groupId>io.swagger</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${swagger-annotations.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -78,7 +66,7 @@
<version>${poi.version}</version>
</dependency>
- <!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+ <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
@@ -92,7 +80,7 @@
<version>${fastjson.version}</version>
</dependency>
- <!--Token鐢熸垚涓庤В鏋�-->
+ <!-- Token鐢熸垚涓庤В鏋�-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
@@ -180,6 +168,13 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
+ <!--redisson-->
+ <dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ <version>${redisson.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -249,6 +244,14 @@
<profiles>
<profile>
+ <id>local</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>local</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ </profile>
+ <profile>
<id>dev</id>
<properties>
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
--
Gitblit v1.9.3