浏览代码

修改BUG

nahida 1 年之前
父节点
当前提交
df2e0bdbee

+ 5 - 0
src/main/java/com/zksy/MinioConfiguration.java

@@ -1,14 +1,19 @@
 package com.zksy;
 
+import com.zksy.config.MinIOConfigProperties;
 import com.zksy.service.IpCounterService;
 import com.zksy.service.MinioFileStorageService;
 import com.zksy.service.impl.IpCounterServiceImpl;
 import com.zksy.service.impl.MinioFileStorageServiceImpl;
+import io.minio.MinioClient;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class MinioConfiguration {
+
     @Bean
     public IpCounterService ipCounterService(){
         return new IpCounterServiceImpl();

+ 3 - 1
src/main/java/com/zksy/config/MinIOConfig.java

@@ -5,6 +5,7 @@ import io.minio.MinioClient;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,7 +21,8 @@ public class MinIOConfig {
     private MinIOConfigProperties minIOConfigProperties;
 
     @Bean
-    public MinioClient buildMinioClient() {
+    @ConditionalOnMissingBean(MinioClient.class)
+    public MinioClient minioClient() {
         return MinioClient
                 .builder()
                 .credentials(minIOConfigProperties.getAccessKey(), minIOConfigProperties.getSecretKey())

+ 1 - 0
src/main/java/com/zksy/service/impl/MinioFileStorageServiceImpl.java

@@ -5,6 +5,7 @@ import com.zksy.service.MinioFileStorageService;
 import io.minio.*;
 import io.minio.errors.*;
 import io.minio.messages.ObjectMetadata;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 4 - 0
src/main/resources/META-INF/spring.factories

@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.zksy.MinioConfiguration,\
+  com.zksy.service.impl.MinioFileStorageServiceImpl,\
+  com.zksy.config.MinIOConfig

+ 0 - 1
src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.zksy.MinioConfiguration