diff --git a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java index 6d77f0a3..cd79f9ae 100644 --- a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java +++ b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java @@ -33,7 +33,7 @@ import java.util.Base64; @EnableFeignClients({"org.springblade", "com.logpm"}) public class AuthApplication { - public static void main(String[] args) { + public static void main(String[] args){ BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args); } diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClient.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClient.java index 5e8dea57..3efcf302 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClient.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClient.java @@ -28,7 +28,7 @@ public interface IOssClient { @PostMapping(name = FILE_UPLOAD,consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - R fileUpload(@RequestPart(value = "file") MultipartFile file); + R fileUpload(@RequestPart(value = "file") MultipartFile file,@RequestParam(value = "bucket",required = false) String bucket); diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClientFallback.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClientFallback.java index 5b9114e5..e9d11c20 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClientFallback.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IOssClientFallback.java @@ -11,7 +11,7 @@ public class IOssClientFallback implements IOssClient { @Override - public R fileUpload(MultipartFile files) { + public R fileUpload(MultipartFile files,String bucket) { return R.fail("远程调用失败"); } } diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/OssClient.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/OssClient.java index d3b292c5..31dcb7d3 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/OssClient.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/OssClient.java @@ -1,41 +1,48 @@ package org.springblade.resource.feign; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.oss.OssTemplate; import org.springblade.core.oss.model.BladeFile; import org.springblade.core.sms.model.SmsResponse; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; import org.springblade.resource.builder.OssBuilder; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +@Slf4j @NonDS @RestController @AllArgsConstructor public class OssClient implements IOssClient { - /** - * 对象存储构建类 - */ - private final OssBuilder ossBuilder; - - - @Override - @PostMapping(name = FILE_UPLOAD,consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R fileUpload(@RequestPart("file") MultipartFile file) { - - - OssTemplate minio = ossBuilder.template("minio", "000000"); - if(!minio.bucketExists("op-logs")){ - // 创建bucket - minio.makeBucket("op-logs"); - } - return R.data(minio.putFile("op-logs",file.getName(),file)); - - //return R.data(ossBuilder.template("minio","000000").putFile(file)); - } + /** + * 对象存储构建类 + */ + private final OssBuilder ossBuilder; + + + @Override + @PostMapping(name = FILE_UPLOAD, consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R fileUpload(@RequestPart("file") MultipartFile file, @RequestParam(value = "bucket", required = false) String bucket) { + + if (StringUtil.isBlank(bucket)) { + bucket = "op-logs"; + } + OssTemplate minio = ossBuilder.template("minio", "000000"); + if (!minio.bucketExists(bucket)) { + // 创建bucket + log.info(">>>>>>>>>>>>>>>>>>> bucket {}", bucket); + minio.makeBucket(bucket); + } + return R.data(minio.putFile(bucket, file.getName(), file)); + + //return R.data(ossBuilder.template("minio","000000").putFile(file)); + } } diff --git a/blade-ops/blade-resource/src/main/resources/application-test.yml b/blade-ops/blade-resource/src/main/resources/application-test.yml index fae5c746..452e6044 100644 --- a/blade-ops/blade-resource/src/main/resources/application-test.yml +++ b/blade-ops/blade-resource/src/main/resources/application-test.yml @@ -13,7 +13,7 @@ oss: #minio、s3、qiniu、alioss、huaweiobs、tencentcos name: minio #租户模式 - tenant-mode: true + tenant-mode: false #oss服务地址 endpoint: http://8.137.14.82:9000 #minio转换服务地址,用于内网上传后将返回地址改为转换的外网地址