From 9dc709a0d9c522106bbc2e59eee53001516954d4 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 24 Oct 2024 13:35:48 +0800
Subject: [PATCH] 配置修改
---
src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java | 13 +++++++++++++
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 15 +++++++++++++++
src/main/resources/application.yml | 3 ++-
3 files changed, 30 insertions(+), 1 deletions(-)
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 d7716dd..9270fb5 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,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.OssTemplate;
@@ -58,6 +59,15 @@
}
/**
+ * 获取template
+ *
+ * @return OssProperties
+ */
+ public OssProperties ossProperties() {
+ return ossProperties;
+ }
+
+ /**
* OssTemplate配置缓存池
*/
private final Map<String, OssTemplate> templatePool = new ConcurrentHashMap<>();
@@ -84,6 +94,9 @@
*/
public OssTemplate template(String code) {
String tenantId = AuthUtil.getTenantId();
+ if (Strings.isBlank(tenantId)){
+ tenantId = "000000";
+ }
Oss oss = getOss(tenantId, code);
Oss ossCached = ossPool.get(tenantId);
OssTemplate template = templatePool.get(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 e4a5670..a5928ea 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -156,9 +156,24 @@
@PostMapping("/put-file")
public R<BladeFile> putFile(@RequestParam MultipartFile file) {
BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
+ changeLink(bladeFile);
return R.data(bladeFile);
}
+
+ /**
+ * 修改link
+ *
+ * @param bladeFile
+ */
+ private void changeLink(BladeFile bladeFile) {
+ if (null != bladeFile) {
+ // 替换url link 前缀
+ String newLink = ossBuilder.ossProperties().getEndpoint() + bladeFile.getName();
+ bladeFile.setLink(newLink);
+ }
+ }
+
/**
* 上传文件
*
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d819896..10f661a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -127,7 +127,7 @@
enabled: true
name: qiniu
tenant-mode: true
- endpoint: http://prt1thnw3.bkt.clouddn.com
+ endpoint: https://wrj.shuixiongit.com/gminio/zhxy/
access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h
secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS
bucket-name: bladex
@@ -203,6 +203,7 @@
- /blade-parking/parking/**
- /blade-door/door/**
- blade-hd/hd/**
+ - /blade-resource/oss/endpoint/**
#安全框架配置
secure:
#接口放行
--
Gitblit v1.9.3