From 8c9c52417e69af15638768704b0b53ba98482069 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 九月 2022 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
pom.xml | 239 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 136 insertions(+), 103 deletions(-)
diff --git a/pom.xml b/pom.xml
index f281612..8882d75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,57 +2,50 @@
<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>3.5.0</version>
+ <version>4.3.0-beta2</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>3.5.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.8</spring-boot.version>
+ <ruoyi-vue-plus.version>4.3.0-beta2</ruoyi-vue-plus.version>
+ <spring-boot.version>2.7.3</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.2.0</maven-jar-plugin.version>
- <druid.version>1.2.8</druid.version>
- <knife4j.version>3.0.3</knife4j.version>
- <swagger-annotations.version>1.5.22</swagger-annotations.version>
- <poi.version>4.1.2</poi.version>
- <easyexcel.version>2.2.11</easyexcel.version>
- <cglib.version>3.3.0</cglib.version>
+ <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+ <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+ <druid.version>1.2.12</druid.version>
+ <springdoc.version>1.6.11</springdoc.version>
+ <poi.version>5.2.2</poi.version>
+ <easyexcel.version>3.1.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.28.0</satoken.version>
- <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
+ <satoken.version>1.30.0</satoken.version>
+ <mybatis-plus.version>3.5.2</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.18</hutool.version>
- <okhttp.version>4.9.2</okhttp.version>
- <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
- <redisson.version>3.16.7</redisson.version>
- <lock4j.version>2.2.1</lock4j.version>
- <dynamic-ds.version>3.5.0</dynamic-ds.version>
- <tlog.version>1.3.6</tlog.version>
- <xxl-job.version>2.3.0</xxl-job.version>
+ <hutool.version>5.8.6</hutool.version>
+ <okhttp.version>4.10.0</okhttp.version>
+ <spring-boot-admin.version>2.7.4</spring-boot-admin.version>
+ <redisson.version>3.17.6</redisson.version>
+ <lock4j.version>2.2.2</lock4j.version>
+ <dynamic-ds.version>3.5.2</dynamic-ds.version>
+ <tlog.version>1.4.3</tlog.version>
+ <xxl-job.version>2.3.1</xxl-job.version>
+ <lombok.version>1.18.24</lombok.version>
- <!-- jdk11 缂哄け渚濊禆 jaxb-->
- <jaxb.version>3.0.1</jaxb.version>
+ <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
+ <guava.version>31.1-jre</guava.version>
<!-- OSS 閰嶇疆 -->
- <qiniu.version>7.9.0</qiniu.version>
- <aliyun.oss.version>3.13.1</aliyun.oss.version>
- <qcloud.cos.version>5.6.58</qcloud.cos.version>
- <minio.version>8.3.4</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>
-
+ <aws-java-sdk-s3.version>1.12.300</aws-java-sdk-s3.version>
+ <!-- SMS 閰嶇疆 -->
+ <aliyun.sms.version>2.0.18</aliyun.sms.version>
+ <tencent.sms.version>3.1.591</tencent.sms.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -68,6 +61,15 @@
<scope>import</scope>
</dependency>
+ <!-- hutool 鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-bom</artifactId>
+ <version>${hutool.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -76,30 +78,33 @@
</dependency>
<dependency>
- <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>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${swagger-annotations.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-javadoc</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
- <!-- excel宸ュ叿 -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
-
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
@@ -107,19 +112,9 @@
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>${cglib.version}</version>
</dependency>
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -140,13 +135,12 @@
<groupId>cn.dev33</groupId>
<artifactId>sa-token-jwt</artifactId>
<version>${satoken.version}</version>
- </dependency>
-
- <!-- jdk11 缂哄け渚濊禆 jaxb-->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
@@ -174,39 +168,27 @@
</dependency>
<dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-http</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-captcha</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-extra</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-jwt</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ <version>${aws-java-sdk-s3.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>dysmsapi20170525</artifactId>
+ <version>${aliyun.sms.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.tencentcloudapi</groupId>
+ <artifactId>tencentcloud-sdk-java</artifactId>
+ <version>${tencent.sms.version}</version>
</dependency>
<dependency>
@@ -243,12 +225,33 @@
<groupId>com.yomahub</groupId>
<artifactId>tlog-web-spring-boot-starter</artifactId>
<version>${tlog.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.yomahub</groupId>
<artifactId>tlog-xxljob-spring-boot-starter</artifactId>
<version>${tlog.version}</version>
+ </dependency>
+
+ <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
</dependency>
<!-- 瀹氭椂浠诲姟 -->
@@ -293,6 +296,13 @@
<version>${ruoyi-vue-plus.version}</version>
</dependency>
+ <!-- SMS鐭俊妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-sms</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
+ </dependency>
+
<!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -313,6 +323,7 @@
<module>ruoyi-demo</module>
<module>ruoyi-extend</module>
<module>ruoyi-oss</module>
+ <module>ruoyi-sms</module>
</modules>
<packaging>pom</packaging>
@@ -321,18 +332,45 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.9.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc-scribe</artifactId>
+ <version>0.15.0</version>
+ </path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring-boot.version}</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
- <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
<directory>src/main/resources</directory>
+ <!-- 鍏抽棴杩囨护 -->
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!-- 寮曞叆鎵�鏈� 鍖归厤鏂囦欢杩涜杩囨护 -->
+ <includes>
+ <include>application*</include>
+ <include>bootstrap*</include>
+ <include>banner*</include>
+ </includes>
<!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
<filtering>true</filtering>
</resource>
@@ -371,8 +409,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
</profile>
<profile>
@@ -381,8 +417,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -394,10 +428,9 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
- <knife4j.production>true</knife4j.production>
- <endpoints.include>health, info, logfile</endpoints.include>
</properties>
</profile>
</profiles>
</project>
+
--
Gitblit v1.9.3