diff --git a/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java b/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java index 2f391d8..ef0c735 100644 --- a/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java +++ b/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java @@ -18,6 +18,8 @@ package org.springblade.modules.resource.builder.oss; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.log.Log; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.oss.OssTemplate; @@ -44,6 +46,7 @@ import static org.springblade.core.cache.constant.CacheConstant.RESOURCE_CACHE; * * @author Chill */ +@Slf4j public class OssBuilder { public static final String OSS_CODE = "oss:code:"; @@ -130,10 +133,13 @@ public class OssBuilder { Oss defaultOss = new Oss(); defaultOss.setId(0L); defaultOss.setCategory(OssEnum.of(ossProperties.getName()).getCategory()); - defaultOss.setEndpoint(ossProperties.getEndpoint()); + defaultOss.setEndpoint("http://127.0.0.1:9002"); defaultOss.setBucketName(ossProperties.getBucketName()); defaultOss.setAccessKey(ossProperties.getAccessKey()); defaultOss.setSecretKey(ossProperties.getSecretKey()); + + Log.warn("oss object : " + defaultOss.toString()); + return defaultOss; // String key = tenantId; // LambdaQueryWrapper lqw = Wrappers.query().lambda().eq(Oss::getTenantId, tenantId); diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java index f1b57b4..addc50c 100644 --- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java +++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java @@ -19,6 +19,8 @@ package org.springblade.modules.resource.endpoint; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.log.Log; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.oss.model.BladeFile; import org.springblade.core.oss.model.OssFile; @@ -146,6 +148,11 @@ public class OssEndpoint { @PostMapping("/put-file") public R putFile(@RequestParam MultipartFile file) { BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream()); + String link = bladeFile.getLink(); + if (Func.isNotEmpty(link)) { + link = link.replace("http://127.0.0.1:9002", "https://api.etriphome.com:9000"); + } + bladeFile.setLink(link); return R.data(bladeFile); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 55b0269..aad325d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -37,7 +37,7 @@ oss: enabled: true name: minio tenant-mode: false - endpoint: http://47.104.224.41:9000 + endpoint: http://127.0.0.1:9002 access-key: JFuZsufFyX9T2yuYaJr6 secret-key: LDzFXFodYLHtnLdPEPFwBDuKVKiUNJMsgQ4SsGYc bucket-name: etriphome diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8158111..f289719 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -118,16 +118,6 @@ report: provider: prefix: blade- -#oss默认配置 -oss: - enabled: true - name: qiniu - tenant-mode: true - endpoint: http://prt1thnw3.bkt.clouddn.com - access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h - secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS - bucket-name: bladex - #blade配置 blade: #token配置