From f224bbe2196791c3ef75e2eff9d5da846bfb5be1 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 25 Jun 2024 17:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=B0oss=20=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80=E6=97=B6=E5=86=99?= =?UTF-8?q?=E6=AD=BB=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/resource/controller/OssController.java | 6 +++++- .../java/org/springblade/resource/endpoint/OssEndpoint.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java index e510c3e7..3ec245ee 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java @@ -16,6 +16,7 @@ */ package org.springblade.resource.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; @@ -27,6 +28,7 @@ import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.annotation.PreAuth; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.RoleConstant; @@ -76,7 +78,9 @@ public class OssController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入oss") public R> list(Oss oss, Query query) { - IPage pages = ossService.page(Condition.getPage(query), Condition.getQueryWrapper(oss)); + QueryWrapper queryWrapper = Condition.getQueryWrapper(oss); + queryWrapper.eq("tenant_id", AuthUtil.getTenantId()); + IPage pages = ossService.page(Condition.getPage(query), queryWrapper); return R.data(OssWrapper.build().pageVO(pages)); } diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java index 6fd2df7d..ae65440c 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java @@ -263,8 +263,9 @@ public class OssEndpoint { long endTime = System.currentTimeMillis(); log.info("Upload file {} from merge, start-end time: {}, {}", fileName, startTime, endTime); - bladeFile.setLink(bladeFile.getLink().replaceFirst("(http|https)://.*?/", "/minio/")); +// bladeFile.setLink(bladeFile.getLink().replaceFirst("(http|https)://.*?/", "/minio/")); + bladeFile.setDomain("http://files.huo5u.com/"); return R.data(bladeFile); } } catch (Exception e) {