diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 82db19bc..661daaec 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -3,6 +3,7 @@ package com.ruoyi.file.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,6 +25,7 @@ public class SysFileController private static final Logger log = LoggerFactory.getLogger(SysFileController.class); @Autowired + @Qualifier("minioSysFileService") private ISysFileService sysFileService; /** diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 56c6afd2..bdafa076 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -14,7 +14,7 @@ import com.ruoyi.file.utils.FileUploadUtils; * @author ruoyi */ @Primary -@Service +@Service("localSysFileService") public class LocalSysFileServiceImpl implements ISysFileService { /** diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 9afd2910..16ed54ea 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -17,7 +17,7 @@ import io.minio.RemoveObjectArgs; * * @author ruoyi */ -@Service +@Service("minioSysFileService") public class MinioSysFileServiceImpl implements ISysFileService { @Autowired @@ -36,28 +36,39 @@ public class MinioSysFileServiceImpl implements ISysFileService @Override public String uploadFile(MultipartFile file) throws Exception { - InputStream inputStream = null; - try - { - String fileName = FileUploadUtils.extractFilename(file); - inputStream = file.getInputStream(); - PutObjectArgs args = PutObjectArgs.builder() - .bucket(minioConfig.getBucketName()) - .object(fileName) - .stream(inputStream, file.getSize(), -1) - .contentType(file.getContentType()) - .build(); - client.putObject(args); - return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; - } - catch (Exception e) - { - throw new RuntimeException("Minio Failed to upload file", e); - } - finally - { - IoUtils.closeQuietly(inputStream); - } +// InputStream inputStream = null; +// try +// { +// String fileName = FileUploadUtils.extractFilename(file); +// inputStream = file.getInputStream(); +// PutObjectArgs args = PutObjectArgs.builder() +// .bucket(minioConfig.getBucketName()) +// .object(fileName) +// .stream(inputStream, file.getSize(), -1) +// .contentType(file.getContentType()) +// .build(); +// client.putObject(args); +// return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; +// } +// catch (Exception e) +// { +// throw new RuntimeException("Minio Failed to upload file", e); +// } +// finally +// { +// IoUtils.closeQuietly(inputStream); +// } + String fileName = FileUploadUtils.extractFilename(file); + InputStream inputStream = file.getInputStream(); + PutObjectArgs args = PutObjectArgs.builder() + .bucket(minioConfig.getBucketName()) + .object(fileName) + .stream(inputStream, file.getSize(), -1) + .contentType(file.getContentType()) + .build(); + client.putObject(args); + IoUtils.closeQuietly(inputStream); + return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName; } /** diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..a04c45c5 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,12 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 43.136.76.125:8848 + namespace: 1c8ac19f-8d7a-4008-a291-90b162b37fd5 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 43.136.76.125:8848 + namespace: 1c8ac19f-8d7a-4008-a291-90b162b37fd5 # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + main: + web-application-type: reactive \ No newline at end of file