From 8f9ba8cb35c1405ecdd91eaf03653113f596306c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Tue, 17 Dec 2019 17:36:12 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20MinioEndpoint=20?= =?UTF-8?q?=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/minio/MinioAutoConfiguration.java | 8 ++++++++ .../pig4cloud/pigx/common/minio/http/MinioEndpoint.java | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java index 3518a463b..a5552f012 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/MinioAutoConfiguration.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.common.minio; +import com.pig4cloud.pigx.common.minio.http.MinioEndpoint; import com.pig4cloud.pigx.common.minio.service.MinioTemplate; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -45,4 +46,11 @@ public class MinioAutoConfiguration { ); } + + @Bean + @ConditionalOnProperty(name = "minio.endpoint.enable", havingValue = "true") + public MinioEndpoint minioEndpoint(MinioTemplate template) { + return new MinioEndpoint(template); + } + } diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java index 1513c8730..1bf3155b0 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/pigx/common/minio/http/MinioEndpoint.java @@ -23,7 +23,6 @@ import com.pig4cloud.pigx.common.minio.vo.MinioObject; import io.minio.messages.Bucket; import lombok.AllArgsConstructor; import lombok.SneakyThrows; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -39,7 +38,6 @@ import java.util.Map; *

* minio.endpoint.enable */ -@ConditionalOnProperty(name = "minio.endpoint.enable", havingValue = "true") @RestController @AllArgsConstructor @RequestMapping("${minio.endpoint.name:/minio}")