From 686c0c770f94e9a77e85bc44b4c80a01b79c108e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Sat, 17 Aug 2024 14:41:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(file):=20S3=E6=97=A0=E9=9C=80=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=EF=BC=8C=E5=9D=87?= =?UTF-8?q?=E4=BD=BF=E7=94=A8/=E4=BD=9C=E4=B8=BA=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes 5845 --- .../pig4cloud/pigx/common/file/oss/service/OssTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java index 791203df3..4afc2fd8e 100755 --- a/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java +++ b/pigx-common/pigx-common-oss/src/main/java/com/pig4cloud/pigx/common/file/oss/service/OssTemplate.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.common.file.oss.service; -import cn.hutool.core.io.FileUtil; +import cn.hutool.core.text.CharPool; import cn.hutool.core.util.StrUtil; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.AWSCredentials; @@ -156,7 +156,7 @@ public class OssTemplate implements InitializingBean, FileTemplate { @Override public S3Object getObject(String bucketName, String dir, String objectName) { if (StrUtil.isNotBlank(dir)) { - objectName = dir + '/' + objectName; + objectName = dir + CharPool.SLASH + objectName; } return getObject(bucketName, objectName); } @@ -199,7 +199,7 @@ public class OssTemplate implements InitializingBean, FileTemplate { throws Exception { if (StrUtil.isNotBlank(dir)) { // dir 路径为 a/b - objectName = dir + '/' + objectName; + objectName = dir + CharPool.SLASH + objectName; } putObject(bucketName, objectName, stream, stream.available(), contextType);