From ab8111bdeb46e0dba8129c1fd581553998dccc0c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 27 五月 2022 09:32:18 +0800
Subject: [PATCH] fix 修复 登录未选部门报空问题
---
pom.xml | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6125028..77bbdb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,47 +6,49 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.0.1</version>
+ <version>4.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>4.0.1</ruoyi-vue-plus.version>
- <spring-boot.version>2.6.4</spring-boot.version>
+ <ruoyi-vue-plus.version>4.1.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.6.8</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.2</maven-jar-plugin.version>
- <druid.version>1.2.8</druid.version>
+ <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
+ <druid.version>1.2.9</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>
<commons-compress.version>1.21</commons-compress.version>
- <easyexcel.version>3.0.5</easyexcel.version>
- <cglib.version>3.3.0</cglib.version>
+ <easyexcel.version>3.1.0</easyexcel.version>
<velocity.version>2.3</velocity.version>
- <satoken.version>1.29.0</satoken.version>
+ <satoken.version>1.30.0</satoken.version>
<mybatis-plus.version>3.5.1</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.21</hutool.version>
- <okhttp.version>4.9.2</okhttp.version>
- <spring-boot-admin.version>2.6.2</spring-boot-admin.version>
- <redisson.version>3.16.8</redisson.version>
+ <hutool.version>5.8.1</hutool.version>
+ <okhttp.version>4.9.3</okhttp.version>
+ <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
+ <redisson.version>3.17.2</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>
+ <dynamic-ds.version>3.5.1</dynamic-ds.version>
+ <tlog.version>1.4.0</tlog.version>
+ <xxl-job.version>2.3.1</xxl-job.version>
<!-- jdk11 缂哄け渚濊禆 jaxb-->
<jaxb.version>3.0.1</jaxb.version>
+ <!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
+ <guava.version>30.0-jre</guava.version>
<!-- OSS 閰嶇疆 -->
- <qiniu.version>7.9.3</qiniu.version>
- <aliyun.oss.version>3.14.0</aliyun.oss.version>
- <qcloud.cos.version>5.6.68</qcloud.cos.version>
- <minio.version>8.3.7</minio.version>
+ <aws-java-sdk-s3.version>1.12.215</aws-java-sdk-s3.version>
+ <!-- SMS 閰嶇疆 -->
+ <aliyun.sms.version>2.0.9</aliyun.sms.version>
+ <tencent.sms.version>3.1.500</tencent.sms.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
@@ -133,12 +135,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>${cglib.version}</version>
- </dependency>
-
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -197,6 +193,24 @@
</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>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<version>${spring-boot-admin.version}</version>
@@ -230,12 +244,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>
<!-- 瀹氭椂浠诲姟 -->
@@ -280,6 +315,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>
@@ -300,6 +342,7 @@
<module>ruoyi-demo</module>
<module>ruoyi-extend</module>
<module>ruoyi-oss</module>
+ <module>ruoyi-sms</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3