Skip to content

[#44] Adapt "minbox-oss" component #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2020
Merged

[#44] Adapt "minbox-oss" component #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api-boot-project/api-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@
<artifactId>minbox-security</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-oss</artifactId>
<optional>true</optional>
</dependency>


<!--Others-->
Expand Down
17 changes: 9 additions & 8 deletions ...ain/java/org/minbox/framework/api/boot/autoconfigure/oss/ApiBootOssAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package org.minbox.framework.api.boot.autoconfigure.oss;

import com.aliyun.oss.OSSClient;
import org.minbox.framework.api.boot.oss.ApiBootOssService;
import org.minbox.framework.api.boot.oss.progress.ApiBootObjectStorageProgress;
import org.minbox.framework.oss.ObjectStorageProgress;
import org.minbox.framework.oss.ObjectStorageService;
import org.minbox.framework.oss.support.aliyun.AliyunObjectStorageService;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
Expand Down Expand Up @@ -36,9 +37,9 @@ public class ApiBootOssAutoConfiguration {
/**
* ApiBoot Progress Provider
*/
private ApiBootObjectStorageProgress apiBootObjectStorageProgress;
private ObjectStorageProgress apiBootObjectStorageProgress;

public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, ObjectProvider<ApiBootObjectStorageProgress> apiBootProgressProvider) {
public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, ObjectProvider<ObjectStorageProgress> apiBootProgressProvider) {
this.apiBootOssProperties = apiBootOssProperties;
this.apiBootObjectStorageProgress = apiBootProgressProvider.getIfAvailable();
}
Expand All @@ -50,9 +51,9 @@ public ApiBootOssAutoConfiguration(ApiBootOssProperties apiBootOssProperties, Ob
*/
@Bean
@ConditionalOnMissingBean
ApiBootOssService apiBootOssService() {
ApiBootOssService apiBootOssService = new ApiBootOssService(apiBootOssProperties.getRegion().getEndpoint(), apiBootOssProperties.getBucketName(), apiBootOssProperties.getAccessKeyId(), apiBootOssProperties.getAccessKeySecret(), apiBootOssProperties.getDomain());
apiBootOssService.setApiBootObjectStorageProgress(apiBootObjectStorageProgress);
return apiBootOssService;
ObjectStorageService apiBootOssService() {
AliyunObjectStorageService objectStorageService = new AliyunObjectStorageService(apiBootOssProperties.getRegion().getEndpoint(), apiBootOssProperties.getBucketName(), apiBootOssProperties.getAccessKeyId(), apiBootOssProperties.getAccessKeySecret(), apiBootOssProperties.getDomain());
objectStorageService.setObjectStorageProgress(apiBootObjectStorageProgress);
return objectStorageService;
}
}
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/minbox/framework/api/boot/autoconfigure/oss/ApiBootOssProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.minbox.framework.api.boot.autoconfigure.oss;

import lombok.Data;
import org.minbox.framework.api.boot.oss.OssRegion;
import org.minbox.framework.oss.OssRegion;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

Expand Down
194 changes: 4 additions & 190 deletions api-boot-project/api-boot-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,18 @@
<!--Spring Projects-->
<spring.version>5.2.7.RELEASE</spring.version>
<spring.boot.version>2.3.1.RELEASE</spring.boot.version>
<security.oauth2.version>2.3.8.RELEASE</security.oauth2.version>
<spring.security.jwt.version>1.1.0.RELEASE</spring.security.jwt.version>
<spring-data-mongodb.version>3.0.1.RELEASE</spring-data-mongodb.version>

<!--Minbox Projects-->
<minbox.version>1.0.5.RELEASE</minbox.version>
<minbox-logging.version>1.0.5.RELEASE</minbox-logging.version>
<minbox-ratelimiter.version>1.0.0.RELEASE</minbox-ratelimiter.version>
<minbox-resource-load.version>1.0.0.RELEASE</minbox-resource-load.version>
<minbox-datasource-switch.version>1.0.0.RELEASE</minbox-datasource-switch.version>
<minbox-sequence.version>1.0.0.RELEASE</minbox-sequence.version>
<minbox-oauth.version>1.0.0.RELEASE</minbox-oauth.version>
<minbox-security.version>1.0.0.RELEASE</minbox-security.version>
<minbox-mongo-client-settings.version>1.0.0.RELEASE</minbox-mongo-client-settings.version>
<minbox-bom.version>1.0.1-SNAPSHOT</minbox-bom.version>
<code.builder.core.version>1.0.5.RELEASE</code.builder.core.version>
<mybatis-enhance.version>1.1.3.RELEASE</mybatis-enhance.version>
<mybatis.pageable.core.version>1.0.7.RELEASE</mybatis.pageable.core.version>

<!--Others-->
<druid.version>1.1.21</druid.version>
<druid.starter.version>1.1.21</druid.starter.version>
<fastjson.version>1.2.60</fastjson.version>
<reflections.version>0.9.11</reflections.version>
<guava.version>29.0-jre</guava.version>
<swagger.version>2.9.2</swagger.version>
<alibaba.oss.version>2.8.3</alibaba.oss.version>
<aliyun.sdk.core.version>4.2.0</aliyun.sdk.core.version>
<aliyun.sdk.dysmsapi.version>1.1.0</aliyun.sdk.dysmsapi.version>
<quartz.version>2.3.2</quartz.version>
<jpush-client.version>3.3.11</jpush-client.version>
<mysema.codegen.version>0.6.8</mysema.codegen.version>
<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
<nacos.config.version>0.2.7</nacos.config.version>
<aliyun-java-sdk-dm.version>3.3.1</aliyun-java-sdk-dm.version>
<mongo-driver-sync.version>4.0.4</mongo-driver-sync.version>

<!--Plugins-->
<maven-plugin-api.version>3.6.1</maven-plugin-api.version>
Expand All @@ -74,12 +51,11 @@
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-dependencies</artifactId>
<version>${minbox.version}</version>
<artifactId>minbox-bom</artifactId>
<version>${minbox-bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<!--SpringBoot Related Dependencies-->
<dependency>
<groupId>com.alibaba</groupId>
Expand All @@ -92,114 +68,12 @@
<version>${nacos.config.version}</version>
</dependency>

<!--Spring Related Dependencies-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>${security.oauth2.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-jwt</artifactId>
<version>${spring.security.jwt.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<version>${spring-data-mongodb.version}</version>
</dependency>

<!--MinBox Related Dependencies-->
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-web</artifactId>
<version>${minbox.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-core</artifactId>
<version>${minbox.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-logging-admin</artifactId>
<version>${minbox-logging.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-logging-admin-ui</artifactId>
<version>${minbox-logging.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-logging-client</artifactId>
<version>${minbox-logging.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-logging-spring-context</artifactId>
<version>${minbox-logging.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-mongo-client-settings</artifactId>
<version>${minbox-mongo-client-settings.version}</version>
</dependency>
<!--MinBox Dependencies-->
<dependency>
<groupId>com.gitee.hengboy</groupId>
<artifactId>code-builder-core</artifactId>
<version>${code.builder.core.version}</version>
</dependency>
<dependency>
<groupId>com.gitee.hengboy</groupId>
<artifactId>mybatis-pageable-core</artifactId>
<version>${mybatis.pageable.core.version}</version>
</dependency>
<dependency>
<groupId>com.gitee.hengboy</groupId>
<artifactId>mybatis-enhance-core</artifactId>
<version>${mybatis-enhance.version}</version>
</dependency>
<dependency>
<groupId>com.gitee.hengboy</groupId>
<artifactId>mybatis-enhance-dsl</artifactId>
<version>${mybatis-enhance.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-ratelimiter</artifactId>
<version>${minbox-ratelimiter.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-resource-load</artifactId>
<version>${minbox-resource-load.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-datasource-switch</artifactId>
<version>${minbox-datasource-switch.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-sequence</artifactId>
<version>${minbox-sequence.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-oauth</artifactId>
<version>${minbox-oauth.version}</version>
</dependency>
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-security</artifactId>
<version>${minbox-security.version}</version>
</dependency>


<!--ApiBoot Dependencies-->
Expand Down Expand Up @@ -319,26 +193,11 @@


<!--Others-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
Expand All @@ -349,41 +208,6 @@
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven-plugin-annotations.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-bean-validators</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>${alibaba.oss.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>${aliyun.sdk.core.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
<version>${aliyun.sdk.dysmsapi.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
</dependency>
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
Expand All @@ -394,21 +218,11 @@
<artifactId>codegen</artifactId>
<version>${mysema.codegen.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dm</artifactId>
<version>${aliyun-java-sdk-dm.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation-api.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>${mongo-driver-sync.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
6 changes: 2 additions & 4 deletions api-boot-project/api-boot-starters/api-boot-starter-alibaba-oss/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@
<tag>HEAD</tag>
</scm>
<dependencies>
<!--ApiBoot Starter-->
<dependency>
<groupId>org.minbox.framework</groupId>
<artifactId>api-boot-starter</artifactId>
</dependency>
<!--Aliyun oss-->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<groupId>org.minbox.framework</groupId>
<artifactId>minbox-oss</artifactId>
</dependency>
</dependencies>

Expand Down
5 changes: 0 additions & 5 deletions api-boot-project/api-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
Expand Down
Loading