From d2fe2a7fc5d64241a963c8fcd7e7715930b65a47 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 07 五月 2022 09:39:11 +0800
Subject: [PATCH] fix 修复 腾讯短信 与 minio okhttp依赖冲突问题
---
pom.xml | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4fc098f..b5e00a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,10 @@
<qcloud.cos.version>5.6.72</qcloud.cos.version>
<minio.version>8.3.8</minio.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>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
@@ -193,6 +197,24 @@
</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>
+ <exclusions>
+ <exclusion>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<version>${spring-boot-admin.version}</version>
@@ -297,6 +319,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>
@@ -317,6 +346,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