From 51ae60820da95805287e9a4448f7cc35888a8957 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 27 七月 2021 11:07:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 135 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 102 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef4b26a..95761e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,35 +2,48 @@
<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>
+ <modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>2.5.2</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>2.1.2</ruoyi-vue-plus.version>
- <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
+ <ruoyi-vue-plus.version>2.5.2</ruoyi-vue-plus.version>
+ <spring-boot.version>2.4.9</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <druid.version>1.2.4</druid.version>
- <knife4j.version>3.0.2</knife4j.version>
- <swagger-annotations.version>1.5.22</swagger-annotations.version>
- <fastjson.version>1.2.75</fastjson.version>
+ <druid.version>1.2.6</druid.version>
+ <knife4j.version>3.0.3</knife4j.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.5.8</hutool.version>
- <feign.version>2.2.6.RELEASE</feign.version>
+ <hutool.version>5.7.5</hutool.version>
+ <feign.version>3.0.3</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
- <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
+ <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
+ <redisson.version>3.16.0</redisson.version>
+ <lock4j.version>2.2.1</lock4j.version>
+ <datasource.version>3.4.0</datasource.version>
+
+ <!-- OSS 閰嶇疆 -->
+ <qiniu.version>7.8.0</qiniu.version>
+ <aliyun.oss.version>3.13.0</aliyun.oss.version>
+ <qcloud.cos.version>5.6.47</qcloud.cos.version>
+ <minio.version>8.3.0</minio.version>
+
+ <!-- docker 閰嶇疆 -->
+ <docker.registry.url>localhost</docker.registry.url>
+ <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
+ <docker.namespace>ruoyi</docker.namespace>
+ <docker.plugin.version>1.2.2</docker.plugin.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -46,7 +59,7 @@
<scope>import</scope>
</dependency>
- <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+ <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
@@ -57,18 +70,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,25 +79,25 @@
<version>${poi.version}</version>
</dependency>
- <!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+ <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
</dependency>
- <!-- 闃块噷JSON瑙ｆ瀽鍣� -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
-
- <!--Token鐢熸垚涓庤В鏋�-->
+ <!-- Token鐢熸垚涓庤В鏋�-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
+ </dependency>
+
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <version>${datasource.version}</version>
</dependency>
<dependency>
@@ -109,6 +110,7 @@
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -138,6 +140,17 @@
<version>${spring-boot-admin.version}</version>
</dependency>
+ <!--redisson-->
+ <dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ <version>${redisson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+ <version>${lock4j.version}</version>
+ </dependency>
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -176,6 +189,13 @@
<!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-oss</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
+ </dependency>
+
+ <!-- demo妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -191,6 +211,8 @@
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-demo</module>
+ <module>ruoyi-extend</module>
+ <module>ruoyi-oss</module>
</modules>
<packaging>pom</packaging>
@@ -249,6 +271,14 @@
<profiles>
<profile>
+ <id>local</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>local</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ </profile>
+ <profile>
<id>dev</id>
<properties>
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
@@ -267,6 +297,45 @@
<logging.level>warn</logging.level>
</properties>
</profile>
+
+ <!-- jdk澶氱増鏈厤缃� -->
+ <profile>
+ <id>jdk8</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <jdk>1.8</jdk>
+ </activation>
+ <properties>
+ <java.version>1.8</java.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>jdk11</id>
+ <activation>
+ <jdk>11</jdk>
+ </activation>
+ <properties>
+ <java.version>11</java.version>
+ <jaxb.version>3.0.1</jaxb.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <!--jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
--
Gitblit v1.9.3