소스 검색

:zap: 适配新版合并后的oss与sms依赖

smallchill 5 년 전
부모
커밋
c8d156cdb2

+ 45 - 8
pom.xml

@@ -90,14 +90,6 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-develop</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-oss-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-sms-all</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
@@ -157,6 +149,51 @@
             <version>1.7</version>
             <scope>provided</scope>
         </dependency>
+        <!--Oss-->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-oss</artifactId>
+        </dependency>
+        <!--Sms-->
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <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>
         <!-- lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Oss;

+ 1 - 1
src/main/java/org/springblade/modules/resource/builder/oss/MinioOssBuilder.java

@@ -19,7 +19,7 @@ package org.springblade.modules.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.modules.resource.entity.Oss;

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Oss;
 

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Oss;
 
 /**

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Sms;
 

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Sms;
 
 /**

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Sms;
 

+ 1 - 1
src/main/java/org/springblade/modules/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.modules.resource.entity.Sms;
 
 /**