文件上传增加S3协议的OSS支持

hsweb-system/hsweb-system-file/pom.xml

@@ -59,6 +59,7 @@
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
             <version>${aws.sdk.version}</version>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>

hsweb-system/hsweb-system-file/src/main/java/org/hswebframework/web/file/FileServiceConfiguration.java

@@ -2,66 +2,37 @@
 
 import org.hswebframework.web.file.service.FileStorageService;
 import org.hswebframework.web.file.service.LocalFileStorageService;
-import org.hswebframework.web.file.service.S3FileStorageService;
 import org.hswebframework.web.file.web.ReactiveFileController;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
 
-import java.net.URI;
 
 @AutoConfiguration
-@EnableConfigurationProperties({FileUploadProperties.class,S3StorageProperties.class})
+@EnableConfigurationProperties(FileUploadProperties.class)
+@ConditionalOnProperty(name = "file.storage", havingValue = "local", matchIfMissing = true)
 public class FileServiceConfiguration {
 
 
     @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
     static class ReactiveConfiguration {
 
         @Bean
-        @ConditionalOnProperty(name = "file.storage", havingValue = "local", matchIfMissing = true)
+        @ConditionalOnMissingBean(FileStorageService.class)
         public FileStorageService fileStorageService(FileUploadProperties properties) {
             return new LocalFileStorageService(properties);
         }
 
         @Bean
-        @ConditionalOnProperty(name = "file.storage", havingValue = "s3")
+        @ConditionalOnMissingBean(name = "reactiveFileController")
         public ReactiveFileController reactiveFileController(FileUploadProperties properties,
                                                              FileStorageService storageService) {
             return new ReactiveFileController(properties, storageService);
         }
 
-
-
-
-        @Bean
-        @ConditionalOnMissingBean(FileStorageService.class)
-        public FileStorageService s3FileStorageService(S3StorageProperties properties,
-                                                         S3Client s3Client) {
-            return new S3FileStorageService(properties, s3Client);
-        }
-
-        @Bean
-        @ConditionalOnProperty(name = "file.storage", havingValue = "s3")
-        public S3Client s3Client(S3StorageProperties properties) {
-            return S3Client.builder()
-                    .endpointOverride(URI.create(properties.getEndpoint()))
-                    .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
-                            properties.getAccessKey(), properties.getSecretKey()
-                    )))
-                    .region(Region.of(properties.getRegion()))
-                    .build();
-        }
-
     }
 
 }

hsweb-system/hsweb-system-file/src/main/java/org/hswebframework/web/file/S3FileStorageConfiguration.java

@@ -0,0 +1,50 @@
+package org.hswebframework.web.file;
+
+import org.hswebframework.web.file.service.FileStorageService;
+import org.hswebframework.web.file.service.S3FileStorageService;
+import org.hswebframework.web.file.web.S3FileController;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+import java.net.URI;
+
+@Configuration
+@ConditionalOnClass(S3Client.class)
+@ConditionalOnProperty(name = "file.storage", havingValue = "s3", matchIfMissing = false)
+@EnableConfigurationProperties(S3StorageProperties.class)
+public class S3FileStorageConfiguration {
+
+    @Bean
+    @ConditionalOnBean(S3StorageProperties.class)
+    @ConditionalOnMissingBean(name = "s3FileController")
+    public S3FileController s3FileController(S3StorageProperties properties,
+                                                         FileStorageService storageService) {
+        return new S3FileController(properties, storageService);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public S3Client s3Client(S3StorageProperties properties) {
+        return S3Client.builder()
+                .endpointOverride(URI.create(properties.getEndpoint()))
+                .credentialsProvider(StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(properties.getAccessKey(), properties.getSecretKey())))
+                .region(Region.of(properties.getRegion()))
+                .build();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(FileStorageService.class)
+    public FileStorageService s3FileStorageService(S3StorageProperties properties, S3Client s3Client) {
+        return new S3FileStorageService(properties, s3Client);
+    }
+}

hsweb-system/hsweb-system-file/src/main/java/org/hswebframework/web/file/service/S3FileStorageService.java

@@ -3,24 +3,18 @@
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.hswebframework.web.file.S3StorageProperties;
-import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.http.MediaType;
 import org.springframework.http.codec.multipart.FilePart;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
-import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Locale;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 
 @AllArgsConstructor
 public class S3FileStorageService implements FileStorageService {

hsweb-system/hsweb-system-file/src/main/java/org/hswebframework/web/file/web/S3FileController.java

@@ -23,10 +23,10 @@
 import java.io.IOException;
 
 @RestController
-@Resource(id = "ossFile", name = "文件上传")
+@Resource(id = "ossFile", name = "oss文件上传")
 @Slf4j
-@RequestMapping("/oss/file")
-@Tag(name = "文件上传")
+@RequestMapping("/ossFile")
+@Tag(name = "oss文件上传")
 public class S3FileController {
     private final S3StorageProperties properties;
 

hsweb-system/hsweb-system-file/src/test/java/org/hswebframework/web/file/web/S3FileControllerTest.java

@@ -1,30 +1,21 @@
 package org.hswebframework.web.file.web;
 
-import org.hswebframework.web.file.FileServiceConfiguration;
+import org.hswebframework.web.file.S3FileStorageConfiguration;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.BodyInserters;
 
-import static org.junit.Assert.*;
-
 @WebFluxTest(S3FileController.class)
 @RunWith(SpringRunner.class)
-@ImportAutoConfiguration(FileServiceConfiguration.class)
+@ImportAutoConfiguration(S3FileStorageConfiguration.class)
 public class S3FileControllerTest {
 
     static {
@@ -42,7 +33,7 @@ public class S3FileControllerTest {
     @Test
     public void test(){
         client.post()
-                .uri("/oss/file/static")
+                .uri("/ossFile/static")
                 .contentType(MediaType.MULTIPART_FORM_DATA)
                 .body(BodyInserters.fromMultipartData("file",new HttpEntity<>(new ClassPathResource("test.json"))))
                 .exchange()