From 5306a45093bd7549dcd864c58bebd8f53b5fe279 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 九月 2021 17:53:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
pom.xml | 146 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 108 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 03e1b0a..3f38e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,39 +3,59 @@
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>
-
+
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>3.1.0</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.0.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
+ <ruoyi-vue-plus.version>3.1.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.4</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>2.0.8</knife4j.version>
- <fastjson.version>1.2.75</fastjson.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+ <druid.version>1.2.6</druid.version>
+ <knife4j.version>3.0.3</knife4j.version>
<poi.version>4.1.2</poi.version>
+ <easyexcel.version>2.2.11</easyexcel.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.2</mybatis-plus.version>
- <hutool.version>5.5.8</hutool.version>
- <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>
+ <mybatis-plus.version>3.4.3.3</mybatis-plus.version>
+ <p6spy.version>3.9.1</p6spy.version>
+ <hutool.version>5.7.13</hutool.version>
+ <feign.version>3.0.3</feign.version>
+ <feign-okhttp.version>11.6</feign-okhttp.version>
+ <okhttp.version>4.9.1</okhttp.version>
+ <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+ <redisson.version>3.16.2</redisson.version>
+ <lock4j.version>2.2.1</lock4j.version>
+ <dynamic-ds.version>3.4.1</dynamic-ds.version>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <jaxb.version>3.0.1</jaxb.version>
+
+ <!-- OSS 閰嶇疆 -->
+ <qiniu.version>7.8.0</qiniu.version>
+ <aliyun.oss.version>3.13.1</aliyun.oss.version>
+ <qcloud.cos.version>5.6.51</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>
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
-
+
<!-- SpringBoot鐨勪緷璧栭厤缃�-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -44,8 +64,8 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+
+ <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
@@ -57,33 +77,39 @@
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
-
+
<!-- excel宸ュ叿 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
-
- <!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ </dependency>
+
+ <!-- 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>${dynamic-ds.version}</version>
</dependency>
<dependency>
@@ -96,6 +122,13 @@
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
+ <!-- sql鎬ц兘鍒嗘瀽鎻掍欢 -->
+ <dependency>
+ <groupId>p6spy</groupId>
+ <artifactId>p6spy</artifactId>
+ <version>${p6spy.version}</version>
+ </dependency>
+
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
@@ -115,6 +148,12 @@
</dependency>
<dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<version>${spring-boot-admin.version}</version>
@@ -125,43 +164,56 @@
<version>${spring-boot-admin.version}</version>
</dependency>
+ <!--redisson-->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <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>
<artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
-
+
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
+ </dependency>
+
+ <!-- demo妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-oss</artifactId>
<version>${ruoyi-vue-plus.version}</version>
</dependency>
@@ -183,12 +235,19 @@
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-demo</module>
+ <module>ruoyi-extend</module>
+ <module>ruoyi-oss</module>
</modules>
<packaging>pom</packaging>
<dependencies>
-
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -218,7 +277,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -229,7 +288,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -241,11 +300,21 @@
<profiles>
<profile>
+ <id>local</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>local</profiles.active>
+ <logging.level>debug</logging.level>
+ <endpoints.include>'*'</endpoints.include>
+ </properties>
+ </profile>
+ <profile>
<id>dev</id>
<properties>
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
+ <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -257,6 +326,7 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
+ <endpoints.include>health, info, logfile</endpoints.include>
</properties>
</profile>
</profiles>
--
Gitblit v1.9.3