Skip to content

Commit f36aa60

Browse files
hengboyhengboy
committed
Move "api-boot-plugin-alibaba-oss" to "api-boot"
1 parent e3e3afe commit f36aa60

File tree

15 files changed

+40
-56
lines changed

15 files changed

+40
-56
lines changed

‎api-boot-project/api-boot-autoconfigure/pom.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
<groupId>org.springframework.boot</groupId>
2020
<artifactId>spring-boot-configuration-processor</artifactId>
2121
</dependency>
22+
<!--ApiBoot-->
23+
<dependency>
24+
<groupId>org.minbox.framework</groupId>
25+
<artifactId>api-boot</artifactId>
26+
<optional>true</optional>
27+
</dependency>
2228
<!--ApiBoot Common-->
2329
<dependency>
2430
<groupId>${project.groupId}</groupId>
@@ -83,14 +89,12 @@
8389
<artifactId>spring-security-jwt</artifactId>
8490
<optional>true</optional>
8591
</dependency>
86-
87-
<!--ApiBoot Oss Plugin-->
92+
<!--Aliyun oss-->
8893
<dependency>
89-
<groupId>${project.groupId}</groupId>
90-
<artifactId>api-boot-plugin-alibaba-oss</artifactId>
94+
<groupId>com.aliyun.oss</groupId>
95+
<artifactId>aliyun-sdk-oss</artifactId>
9196
<optional>true</optional>
9297
</dependency>
93-
9498
<!--ApiBoot Sms Plugin-->
9599
<dependency>
96100
<groupId>${project.groupId}</groupId>

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oss/ApiBootOssAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.minbox.framework.api.boot.autoconfigure.oss;
22

33
import com.aliyun.oss.OSSClient;
4-
import org.minbox.framework.api.boot.plugin.oss.ApiBootOssService;
5-
import org.minbox.framework.api.boot.plugin.oss.progress.ApiBootObjectStorageProgress;
4+
import org.minbox.framework.api.boot.oss.ApiBootOssService;
5+
import org.minbox.framework.api.boot.oss.progress.ApiBootObjectStorageProgress;
66
import org.springframework.beans.factory.ObjectProvider;
77
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
88
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oss/ApiBootOssProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.minbox.framework.api.boot.autoconfigure.oss;
22

33
import lombok.Data;
4-
import org.minbox.framework.api.boot.plugin.oss.OssRegion;
4+
import org.minbox.framework.api.boot.oss.OssRegion;
55
import org.springframework.boot.context.properties.ConfigurationProperties;
66
import org.springframework.context.annotation.Configuration;
77

‎api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/pom.xml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎api-boot-project/api-boot-plugins/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<main.basedir>${basedir}/../..</main.basedir>
1919
</properties>
2020
<modules>
21-
<module>api-boot-plugin-alibaba-oss</module>
2221
<module>api-boot-plugin</module>
2322
<module>api-boot-plugin-alibaba-sms</module>
2423
<module>api-boot-plugin-security</module>

‎api-boot-project/api-boot-starters/api-boot-starter-alibaba-oss/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
<groupId>org.minbox.framework</groupId>
3434
<artifactId>api-boot-starter</artifactId>
3535
</dependency>
36-
<!--ApiBoot Alibaba Oss Plugin-->
36+
<!--Aliyun oss-->
3737
<dependency>
38-
<groupId>org.minbox.framework</groupId>
39-
<artifactId>api-boot-plugin-alibaba-oss</artifactId>
38+
<groupId>com.aliyun.oss</groupId>
39+
<artifactId>aliyun-sdk-oss</artifactId>
4040
</dependency>
4141
</dependencies>
4242

‎api-boot-project/api-boot/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<name>ApiBoot</name>
1616
<artifactId>api-boot</artifactId>
1717
<dependencies>
18+
<!--alibaba oss-->
19+
<dependency>
20+
<groupId>com.aliyun.oss</groupId>
21+
<artifactId>aliyun-sdk-oss</artifactId>
22+
<optional>true</optional>
23+
</dependency>
1824
<dependency>
1925
<groupId>org.projectlombok</groupId>
2026
<artifactId>lombok</artifactId>

‎api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/src/main/java/org/minbox/framework/api/boot/plugin/oss/ApiBootOssService.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oss/ApiBootOssService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.minbox.framework.api.boot.plugin.oss;
1+
package org.minbox.framework.api.boot.oss;
22

33
import com.aliyun.oss.OSSClient;
44
import com.aliyun.oss.model.*;
55
import lombok.Setter;
6-
import org.minbox.framework.api.boot.plugin.oss.progress.ApiBootObjectStorageProgress;
7-
import org.minbox.framework.api.boot.plugin.oss.progress.OssProgressListener;
8-
import org.minbox.framework.api.boot.plugin.storage.ApiBootObjectStorageService;
9-
import org.minbox.framework.api.boot.plugin.storage.exception.ApiBootObjectStorageException;
10-
import org.minbox.framework.api.boot.plugin.storage.response.ApiBootObjectStorageResponse;
6+
import org.minbox.framework.api.boot.oss.progress.ApiBootObjectStorageProgress;
7+
import org.minbox.framework.api.boot.oss.progress.OssProgressListener;
8+
import org.minbox.framework.api.boot.storage.ApiBootObjectStorageService;
9+
import org.minbox.framework.api.boot.storage.exception.ApiBootObjectStorageException;
10+
import org.minbox.framework.api.boot.storage.response.ApiBootObjectStorageResponse;
1111

1212
import java.io.ByteArrayInputStream;
1313
import java.io.File;

‎api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/src/main/java/org/minbox/framework/api/boot/plugin/oss/OssRegion.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oss/OssRegion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.minbox.framework.api.boot.plugin.oss;
1+
package org.minbox.framework.api.boot.oss;
22

33
import lombok.Getter;
44

‎api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/src/main/java/org/minbox/framework/api/boot/plugin/oss/PartSize.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/oss/PartSize.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package org.minbox.framework.api.boot.plugin.oss;
18+
package org.minbox.framework.api.boot.oss;
1919

2020
/**
2121
* File size unit

0 commit comments

Comments
 (0)