Skip to content

Commit 0000c1f

Browse files
hengboyhengboy
authored
Merge pull request #45 from hengboy/2.3.x
[#44] Adapt "minbox-oss" component
2 parents c3e408b + 3f2c0c9 commit 0000c1f

File tree

16 files changed

+29
-875
lines changed

16 files changed

+29
-875
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@
156156
<artifactId>minbox-security</artifactId>
157157
<optional>true</optional>
158158
</dependency>
159+
<dependency>
160+
<groupId>org.minbox.framework</groupId>
161+
<artifactId>minbox-oss</artifactId>
162+
<optional>true</optional>
163+
</dependency>
159164

160165

161166
<!--Others-->

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

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

33
import com.aliyun.oss.OSSClient;
4-
import org.minbox.framework.api.boot.oss.ApiBootOssService;
5-
import org.minbox.framework.api.boot.oss.progress.ApiBootObjectStorageProgress;
4+
import org.minbox.framework.oss.ObjectStorageProgress;
5+
import org.minbox.framework.oss.ObjectStorageService;
6+
import org.minbox.framework.oss.support.aliyun.AliyunObjectStorageService;
67
import org.springframework.beans.factory.ObjectProvider;
78
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
89
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -36,9 +37,9 @@ public class ApiBootOssAutoConfiguration {
3637
/**
3738
* ApiBoot Progress Provider
3839
*/
39-
private ApiBootObjectStorageProgress apiBootObjectStorageProgress;
40+
private ObjectStorageProgress apiBootObjectStorageProgress;
4041

41-
public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, ObjectProvider<ApiBootObjectStorageProgress> apiBootProgressProvider) {
42+
public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, ObjectProvider<ObjectStorageProgress> apiBootProgressProvider) {
4243
this.apiBootOssProperties = apiBootOssProperties;
4344
this.apiBootObjectStorageProgress = apiBootProgressProvider.getIfAvailable();
4445
}
@@ -50,9 +51,9 @@ public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, Ob
5051
*/
5152
@Bean
5253
@ConditionalOnMissingBean
53-
ApiBootOssService apiBootOssService() {
54-
ApiBootOssService apiBootOssService = new ApiBootOssService(apiBootOssProperties.getRegion().getEndpoint(), apiBootOssProperties.getBucketName(), apiBootOssProperties.getAccessKeyId(), apiBootOssProperties.getAccessKeySecret(), apiBootOssProperties.getDomain());
55-
apiBootOssService.setApiBootObjectStorageProgress(apiBootObjectStorageProgress);
56-
return apiBootOssService;
54+
ObjectStorageService apiBootOssService() {
55+
AliyunObjectStorageService objectStorageService = new AliyunObjectStorageService(apiBootOssProperties.getRegion().getEndpoint(), apiBootOssProperties.getBucketName(), apiBootOssProperties.getAccessKeyId(), apiBootOssProperties.getAccessKeySecret(), apiBootOssProperties.getDomain());
56+
objectStorageService.setObjectStorageProgress(apiBootObjectStorageProgress);
57+
return objectStorageService;
5758
}
5859
}

‎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.oss.OssRegion;
4+
import org.minbox.framework.oss.OssRegion;
55
import org.springframework.boot.context.properties.ConfigurationProperties;
66
import org.springframework.context.annotation.Configuration;
77

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

Lines changed: 4 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,18 @@
1818
<!--Spring Projects-->
1919
<spring.version>5.2.7.RELEASE</spring.version>
2020
<spring.boot.version>2.3.1.RELEASE</spring.boot.version>
21-
<security.oauth2.version>2.3.8.RELEASE</security.oauth2.version>
22-
<spring.security.jwt.version>1.1.0.RELEASE</spring.security.jwt.version>
23-
<spring-data-mongodb.version>3.0.1.RELEASE</spring-data-mongodb.version>
2421

2522
<!--Minbox Projects-->
26-
<minbox.version>1.0.5.RELEASE</minbox.version>
27-
<minbox-logging.version>1.0.5.RELEASE</minbox-logging.version>
28-
<minbox-ratelimiter.version>1.0.0.RELEASE</minbox-ratelimiter.version>
29-
<minbox-resource-load.version>1.0.0.RELEASE</minbox-resource-load.version>
30-
<minbox-datasource-switch.version>1.0.0.RELEASE</minbox-datasource-switch.version>
31-
<minbox-sequence.version>1.0.0.RELEASE</minbox-sequence.version>
32-
<minbox-oauth.version>1.0.0.RELEASE</minbox-oauth.version>
33-
<minbox-security.version>1.0.0.RELEASE</minbox-security.version>
34-
<minbox-mongo-client-settings.version>1.0.0.RELEASE</minbox-mongo-client-settings.version>
23+
<minbox-bom.version>1.0.1-SNAPSHOT</minbox-bom.version>
3524
<code.builder.core.version>1.0.5.RELEASE</code.builder.core.version>
36-
<mybatis-enhance.version>1.1.3.RELEASE</mybatis-enhance.version>
37-
<mybatis.pageable.core.version>1.0.7.RELEASE</mybatis.pageable.core.version>
3825

3926
<!--Others-->
40-
<druid.version>1.1.21</druid.version>
4127
<druid.starter.version>1.1.21</druid.starter.version>
42-
<fastjson.version>1.2.60</fastjson.version>
4328
<reflections.version>0.9.11</reflections.version>
44-
<guava.version>29.0-jre</guava.version>
45-
<swagger.version>2.9.2</swagger.version>
46-
<alibaba.oss.version>2.8.3</alibaba.oss.version>
47-
<aliyun.sdk.core.version>4.2.0</aliyun.sdk.core.version>
48-
<aliyun.sdk.dysmsapi.version>1.1.0</aliyun.sdk.dysmsapi.version>
49-
<quartz.version>2.3.2</quartz.version>
5029
<jpush-client.version>3.3.11</jpush-client.version>
5130
<mysema.codegen.version>0.6.8</mysema.codegen.version>
5231
<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
5332
<nacos.config.version>0.2.7</nacos.config.version>
54-
<aliyun-java-sdk-dm.version>3.3.1</aliyun-java-sdk-dm.version>
55-
<mongo-driver-sync.version>4.0.4</mongo-driver-sync.version>
5633

5734
<!--Plugins-->
5835
<maven-plugin-api.version>3.6.1</maven-plugin-api.version>
@@ -74,12 +51,11 @@
7451
</dependency>
7552
<dependency>
7653
<groupId>org.minbox.framework</groupId>
77-
<artifactId>minbox-dependencies</artifactId>
78-
<version>${minbox.version}</version>
54+
<artifactId>minbox-bom</artifactId>
55+
<version>${minbox-bom.version}</version>
7956
<scope>import</scope>
8057
<type>pom</type>
8158
</dependency>
82-
8359
<!--SpringBoot Related Dependencies-->
8460
<dependency>
8561
<groupId>com.alibaba</groupId>
@@ -92,114 +68,12 @@
9268
<version>${nacos.config.version}</version>
9369
</dependency>
9470

95-
<!--Spring Related Dependencies-->
96-
<dependency>
97-
<groupId>org.springframework</groupId>
98-
<artifactId>spring-tx</artifactId>
99-
<version>${spring.version}</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.springframework.security.oauth</groupId>
103-
<artifactId>spring-security-oauth2</artifactId>
104-
<version>${security.oauth2.version}</version>
105-
</dependency>
106-
<dependency>
107-
<groupId>org.springframework.security</groupId>
108-
<artifactId>spring-security-jwt</artifactId>
109-
<version>${spring.security.jwt.version}</version>
110-
</dependency>
111-
<dependency>
112-
<groupId>org.springframework.data</groupId>
113-
<artifactId>spring-data-mongodb</artifactId>
114-
<version>${spring-data-mongodb.version}</version>
115-
</dependency>
116-
117-
<!--MinBox Related Dependencies-->
118-
<dependency>
119-
<groupId>org.minbox.framework</groupId>
120-
<artifactId>minbox-web</artifactId>
121-
<version>${minbox.version}</version>
122-
</dependency>
123-
<dependency>
124-
<groupId>org.minbox.framework</groupId>
125-
<artifactId>minbox-core</artifactId>
126-
<version>${minbox.version}</version>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.minbox.framework</groupId>
130-
<artifactId>minbox-logging-admin</artifactId>
131-
<version>${minbox-logging.version}</version>
132-
</dependency>
133-
<dependency>
134-
<groupId>org.minbox.framework</groupId>
135-
<artifactId>minbox-logging-admin-ui</artifactId>
136-
<version>${minbox-logging.version}</version>
137-
</dependency>
138-
<dependency>
139-
<groupId>org.minbox.framework</groupId>
140-
<artifactId>minbox-logging-client</artifactId>
141-
<version>${minbox-logging.version}</version>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.minbox.framework</groupId>
145-
<artifactId>minbox-logging-spring-context</artifactId>
146-
<version>${minbox-logging.version}</version>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.minbox.framework</groupId>
150-
<artifactId>minbox-mongo-client-settings</artifactId>
151-
<version>${minbox-mongo-client-settings.version}</version>
152-
</dependency>
71+
<!--MinBox Dependencies-->
15372
<dependency>
15473
<groupId>com.gitee.hengboy</groupId>
15574
<artifactId>code-builder-core</artifactId>
15675
<version>${code.builder.core.version}</version>
15776
</dependency>
158-
<dependency>
159-
<groupId>com.gitee.hengboy</groupId>
160-
<artifactId>mybatis-pageable-core</artifactId>
161-
<version>${mybatis.pageable.core.version}</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>com.gitee.hengboy</groupId>
165-
<artifactId>mybatis-enhance-core</artifactId>
166-
<version>${mybatis-enhance.version}</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>com.gitee.hengboy</groupId>
170-
<artifactId>mybatis-enhance-dsl</artifactId>
171-
<version>${mybatis-enhance.version}</version>
172-
</dependency>
173-
<dependency>
174-
<groupId>org.minbox.framework</groupId>
175-
<artifactId>minbox-ratelimiter</artifactId>
176-
<version>${minbox-ratelimiter.version}</version>
177-
</dependency>
178-
<dependency>
179-
<groupId>org.minbox.framework</groupId>
180-
<artifactId>minbox-resource-load</artifactId>
181-
<version>${minbox-resource-load.version}</version>
182-
</dependency>
183-
<dependency>
184-
<groupId>org.minbox.framework</groupId>
185-
<artifactId>minbox-datasource-switch</artifactId>
186-
<version>${minbox-datasource-switch.version}</version>
187-
</dependency>
188-
<dependency>
189-
<groupId>org.minbox.framework</groupId>
190-
<artifactId>minbox-sequence</artifactId>
191-
<version>${minbox-sequence.version}</version>
192-
</dependency>
193-
<dependency>
194-
<groupId>org.minbox.framework</groupId>
195-
<artifactId>minbox-oauth</artifactId>
196-
<version>${minbox-oauth.version}</version>
197-
</dependency>
198-
<dependency>
199-
<groupId>org.minbox.framework</groupId>
200-
<artifactId>minbox-security</artifactId>
201-
<version>${minbox-security.version}</version>
202-
</dependency>
20377

20478

20579
<!--ApiBoot Dependencies-->
@@ -319,26 +193,11 @@
319193

320194

321195
<!--Others-->
322-
<dependency>
323-
<groupId>com.alibaba</groupId>
324-
<artifactId>fastjson</artifactId>
325-
<version>${fastjson.version}</version>
326-
</dependency>
327-
<dependency>
328-
<groupId>com.alibaba</groupId>
329-
<artifactId>druid</artifactId>
330-
<version>${druid.version}</version>
331-
</dependency>
332196
<dependency>
333197
<groupId>org.reflections</groupId>
334198
<artifactId>reflections</artifactId>
335199
<version>${reflections.version}</version>
336200
</dependency>
337-
<dependency>
338-
<groupId>com.google.guava</groupId>
339-
<artifactId>guava</artifactId>
340-
<version>${guava.version}</version>
341-
</dependency>
342201
<dependency>
343202
<groupId>org.apache.maven</groupId>
344203
<artifactId>maven-plugin-api</artifactId>
@@ -349,41 +208,6 @@
349208
<artifactId>maven-plugin-annotations</artifactId>
350209
<version>${maven-plugin-annotations.version}</version>
351210
</dependency>
352-
<dependency>
353-
<groupId>io.springfox</groupId>
354-
<artifactId>springfox-swagger-ui</artifactId>
355-
<version>${swagger.version}</version>
356-
</dependency>
357-
<dependency>
358-
<groupId>io.springfox</groupId>
359-
<artifactId>springfox-swagger2</artifactId>
360-
<version>${swagger.version}</version>
361-
</dependency>
362-
<dependency>
363-
<groupId>io.springfox</groupId>
364-
<artifactId>springfox-bean-validators</artifactId>
365-
<version>${swagger.version}</version>
366-
</dependency>
367-
<dependency>
368-
<groupId>com.aliyun.oss</groupId>
369-
<artifactId>aliyun-sdk-oss</artifactId>
370-
<version>${alibaba.oss.version}</version>
371-
</dependency>
372-
<dependency>
373-
<groupId>com.aliyun</groupId>
374-
<artifactId>aliyun-java-sdk-core</artifactId>
375-
<version>${aliyun.sdk.core.version}</version>
376-
</dependency>
377-
<dependency>
378-
<groupId>com.aliyun</groupId>
379-
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
380-
<version>${aliyun.sdk.dysmsapi.version}</version>
381-
</dependency>
382-
<dependency>
383-
<groupId>org.quartz-scheduler</groupId>
384-
<artifactId>quartz</artifactId>
385-
<version>${quartz.version}</version>
386-
</dependency>
387211
<dependency>
388212
<groupId>cn.jpush.api</groupId>
389213
<artifactId>jpush-client</artifactId>
@@ -394,21 +218,11 @@
394218
<artifactId>codegen</artifactId>
395219
<version>${mysema.codegen.version}</version>
396220
</dependency>
397-
<dependency>
398-
<groupId>com.aliyun</groupId>
399-
<artifactId>aliyun-java-sdk-dm</artifactId>
400-
<version>${aliyun-java-sdk-dm.version}</version>
401-
</dependency>
402221
<dependency>
403222
<groupId>javax.annotation</groupId>
404223
<artifactId>javax.annotation-api</artifactId>
405224
<version>${javax-annotation-api.version}</version>
406225
</dependency>
407-
<dependency>
408-
<groupId>org.mongodb</groupId>
409-
<artifactId>mongodb-driver-sync</artifactId>
410-
<version>${mongo-driver-sync.version}</version>
411-
</dependency>
412226
</dependencies>
413227
</dependencyManagement>
414228

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828
<tag>HEAD</tag>
2929
</scm>
3030
<dependencies>
31-
<!--ApiBoot Starter-->
3231
<dependency>
3332
<groupId>org.minbox.framework</groupId>
3433
<artifactId>api-boot-starter</artifactId>
3534
</dependency>
36-
<!--Aliyun oss-->
3735
<dependency>
38-
<groupId>com.aliyun.oss</groupId>
39-
<artifactId>aliyun-sdk-oss</artifactId>
36+
<groupId>org.minbox.framework</groupId>
37+
<artifactId>minbox-oss</artifactId>
4038
</dependency>
4139
</dependencies>
4240

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@
8989
<scope>compile</scope>
9090
<optional>true</optional>
9191
</dependency>
92-
<dependency>
93-
<groupId>com.aliyun.oss</groupId>
94-
<artifactId>aliyun-sdk-oss</artifactId>
95-
<optional>true</optional>
96-
</dependency>
9792
<dependency>
9893
<groupId>com.aliyun</groupId>
9994
<artifactId>aliyun-java-sdk-core</artifactId>

0 commit comments

Comments
 (0)