From 2178b827a5ae8362357ca712b6a58d6677ae382a Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 23 Feb 2021 18:07:10 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=8E=E7=9A=84oss=E4=B8=8Esms=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-ops-api/blade-resource-api/pom.xml      |  2 +-
 blade-ops/blade-resource/pom.xml              | 41 ++++++++++++++++++-
 .../resource/builder/oss/AliOssBuilder.java   |  2 +-
 .../resource/builder/oss/MinioOssBuilder.java |  2 +-
 .../resource/builder/oss/QiniuOssBuilder.java |  2 +-
 .../builder/oss/TencentOssBuilder.java        |  2 +-
 .../resource/builder/sms/AliSmsBuilder.java   |  2 +-
 .../resource/builder/sms/QiniuSmsBuilder.java |  2 +-
 .../builder/sms/TencentSmsBuilder.java        |  2 +-
 .../builder/sms/YunpianSmsBuilder.java        |  2 +-
 blade-service/blade-desk/pom.xml              | 13 ++++--
 11 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/blade-ops-api/blade-resource-api/pom.xml b/blade-ops-api/blade-resource-api/pom.xml
index a2386b94..8c6d2ec6 100644
--- a/blade-ops-api/blade-resource-api/pom.xml
+++ b/blade-ops-api/blade-resource-api/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-core-sms</artifactId>
+            <artifactId>blade-starter-sms</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index c2e3c177..74183c7d 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -27,13 +27,50 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
+        <!--Oss-->
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-oss-all</artifactId>
+            <artifactId>blade-starter-oss</artifactId>
         </dependency>
+        <!--Sms-->
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-sms-all</artifactId>
+            <artifactId>blade-starter-sms</artifactId>
+        </dependency>
+        <!--MinIO-->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
+        <!--Alioss-->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+        <!--AliSms-->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+        </dependency>
+        <!--腾讯COS-->
+        <dependency>
+            <groupId>com.qcloud</groupId>
+            <artifactId>cos_api</artifactId>
+        </dependency>
+        <!--腾讯SMS-->
+        <dependency>
+            <groupId>com.github.qcloudsms</groupId>
+            <artifactId>qcloudsms</artifactId>
+        </dependency>
+        <!--QiNiu-->
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
+        </dependency>
+        <!--YunPian-->
+        <dependency>
+            <groupId>com.yunpian.sdk</groupId>
+            <artifactId>yunpian-java-sdk</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java
index 3a1152d8..c765a1e6 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java
@@ -22,7 +22,7 @@ import com.aliyun.oss.common.auth.CredentialsProvider;
 import com.aliyun.oss.common.auth.DefaultCredentialProvider;
 import lombok.SneakyThrows;
 import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.aliyun.AliossTemplate;
+import org.springblade.core.oss.AliossTemplate;
 import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.oss.rule.OssRule;
 import org.springblade.resource.entity.Oss;
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java
index cd38434b..1b5ec912 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/MinioOssBuilder.java
@@ -19,7 +19,7 @@ package org.springblade.resource.builder.oss;
 import io.minio.MinioClient;
 import lombok.SneakyThrows;
 import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.minio.MinioTemplate;
+import org.springblade.core.oss.MinioTemplate;
 import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.oss.rule.OssRule;
 import org.springblade.resource.entity.Oss;
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/QiniuOssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/QiniuOssBuilder.java
index 21075850..ddebdb53 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/QiniuOssBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/QiniuOssBuilder.java
@@ -24,7 +24,7 @@ import com.qiniu.util.Auth;
 import lombok.SneakyThrows;
 import org.springblade.core.oss.OssTemplate;
 import org.springblade.core.oss.props.OssProperties;
-import org.springblade.core.oss.qiniu.QiniuTemplate;
+import org.springblade.core.oss.QiniuTemplate;
 import org.springblade.core.oss.rule.OssRule;
 import org.springblade.resource.entity.Oss;
 
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/TencentOssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/TencentOssBuilder.java
index 4a24f8a0..b724d09e 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/TencentOssBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/TencentOssBuilder.java
@@ -25,7 +25,7 @@ import lombok.SneakyThrows;
 import org.springblade.core.oss.OssTemplate;
 import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.oss.rule.OssRule;
-import org.springblade.core.oss.tencent.TencentCosTemplate;
+import org.springblade.core.oss.TencentCosTemplate;
 import org.springblade.resource.entity.Oss;
 
 /**
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/AliSmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/AliSmsBuilder.java
index 5b0ea187..0e45e2fc 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/AliSmsBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/AliSmsBuilder.java
@@ -23,7 +23,7 @@ import com.aliyuncs.profile.IClientProfile;
 import lombok.SneakyThrows;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.sms.SmsTemplate;
-import org.springblade.core.sms.aliyun.AliSmsTemplate;
+import org.springblade.core.sms.AliSmsTemplate;
 import org.springblade.core.sms.props.SmsProperties;
 import org.springblade.resource.entity.Sms;
 
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/QiniuSmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/QiniuSmsBuilder.java
index 41c7ddca..51e2267e 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/QiniuSmsBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/QiniuSmsBuilder.java
@@ -22,7 +22,7 @@ import lombok.SneakyThrows;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.sms.SmsTemplate;
 import org.springblade.core.sms.props.SmsProperties;
-import org.springblade.core.sms.qiniu.QiniuSmsTemplate;
+import org.springblade.core.sms.QiniuSmsTemplate;
 import org.springblade.resource.entity.Sms;
 
 /**
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/TencentSmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/TencentSmsBuilder.java
index 70017f5a..6738adcc 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/TencentSmsBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/TencentSmsBuilder.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.sms.SmsTemplate;
 import org.springblade.core.sms.props.SmsProperties;
-import org.springblade.core.sms.tencent.TencentSmsTemplate;
+import org.springblade.core.sms.TencentSmsTemplate;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.entity.Sms;
 
diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/YunpianSmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/YunpianSmsBuilder.java
index 33236949..5fca1fb3 100644
--- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/YunpianSmsBuilder.java
+++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/YunpianSmsBuilder.java
@@ -21,7 +21,7 @@ import lombok.SneakyThrows;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.sms.SmsTemplate;
 import org.springblade.core.sms.props.SmsProperties;
-import org.springblade.core.sms.yunpian.YunpianSmsTemplate;
+import org.springblade.core.sms.YunpianSmsTemplate;
 import org.springblade.resource.entity.Sms;
 
 /**
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index 3582d357..4215aeb9 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -40,13 +40,20 @@
             <artifactId>blade-flow-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+        <!--Oss-->
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-oss-minio</artifactId>
+            <artifactId>blade-starter-oss</artifactId>
         </dependency>
+        <!--MinIO-->
         <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-oss-qiniu</artifactId>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
+        <!--QiNiu-->
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
         </dependency>
         <!--<dependency>
             <groupId>org.springblade</groupId>