From 481eb2249f2886c3a6ea8445820a2ec5f153d4da Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:19:47 +0800
Subject: [PATCH] 销售报价编辑详情返回规格，辅单位
---
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java
index aad9007..4af50d5 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java
@@ -27,7 +27,7 @@
/**
* 鍩轰簬 S3 鍗忚鐨勬枃浠跺鎴风锛屽疄鐜� MinIO銆侀樋閲屼簯銆佽吘璁簯銆佷竷鐗涗簯銆佸崕涓轰簯绛変簯鏈嶅姟
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
@@ -116,13 +116,18 @@
@Override
public String presignGetUrl(String url, Integer expirationSeconds) {
// 1. 灏� url 杞崲涓� path
- String path = StrUtil.removePrefix(url, config.getDomain() + "/");
- path = HttpUtils.decodeUrlPath(HttpUtils.removeUrlQuery(path));
+ // 瀹屾暣 Domain URL 浼氳В鐮佽繕鍘熶负鍘熷瀵硅薄鍚嶏紱瑁� path 绾﹀畾宸茬粡鏄湭缂栫爜鐨勫璞″悕
+ boolean domainUrl = StrUtil.startWith(url, config.getDomain() + "/");
+ String path = domainUrl ? StrUtil.removePrefix(url, config.getDomain() + "/") : url;
+ if (domainUrl) {
+ path = HttpUtils.removeUrlPathQueryAndFragment(path);
+ path = HttpUtils.decodeUrlPath(path);
+ }
// 2.1 鎯呭喌涓�锛氬叕寮�璁块棶锛氭棤闇�绛惧悕
// 鑰冭檻鍒拌�佺増鏈殑鍏煎锛屾墍浠ュ繀椤绘槸 config.getEnablePublicAccess() 涓� false 鏃讹紝鎵嶈繘琛岀鍚�
if (!BooleanUtil.isFalse(config.getEnablePublicAccess())) {
- return config.getDomain() + "/" + path;
+ return config.getDomain() + "/" + HttpUtils.encodeUrlPath(path);
}
// 2.2 鎯呭喌浜岋細绉佹湁璁块棶锛氱敓鎴� GET 棰勭鍚� URL
--
Gitblit v1.9.3