From 75f96e01dfd4711a69ccac7cb42c8f0fa68578f7 Mon Sep 17 00:00:00 2001 From: YangSen-qn Date: Fri, 25 Oct 2024 16:45:36 +0800 Subject: [PATCH 1/2] version to v7.17.0 --- CHANGELOG.md | 7 +++++++ README.md | 2 +- src/main/java/com/qiniu/common/Constants.java | 2 +- src/test/java/test/com/qiniu/storage/RegionTest.java | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bd4cc753..663e9ff2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 7.17.0 (2024-10-25) + +* 支持代码生成器 +* 支持任务模版 +* 处理 Response 成功但读取 Body 失败的场景 +* 支持 IAM 账户接口（示例：src/test/java/com/qiniu/iam/apis） + ## 7.16.0 (2024-09-12) * 支持闲时任务 diff --git a/README.md b/README.md index 50c93a442..425309ca0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ 或者 Gradle: ```groovy -implementation 'com.qiniu:qiniu-java-sdk:7.16.+' +implementation 'com.qiniu:qiniu-java-sdk:7.17.+' ``` ## 运行环境 diff --git a/src/main/java/com/qiniu/common/Constants.java b/src/main/java/com/qiniu/common/Constants.java index e0e05c647..f988694ce 100644 --- a/src/main/java/com/qiniu/common/Constants.java +++ b/src/main/java/com/qiniu/common/Constants.java @@ -10,7 +10,7 @@ public final class Constants { /** * 版本号 */ - public static final String VERSION = "7.16.0"; + public static final String VERSION = "7.17.0"; /** * 块大小，不能改变 */ diff --git a/src/test/java/test/com/qiniu/storage/RegionTest.java b/src/test/java/test/com/qiniu/storage/RegionTest.java index e6b7aa0c2..957e54d04 100644 --- a/src/test/java/test/com/qiniu/storage/RegionTest.java +++ b/src/test/java/test/com/qiniu/storage/RegionTest.java @@ -1,6 +1,5 @@ package test.com.qiniu.storage; -import com.qiniu.common.QiniuException; import com.qiniu.storage.Region; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; From 6180d70465bebe973cd00d7c18f768c750e72497 Mon Sep 17 00:00:00 2001 From: YangSen-qn Date: Thu, 31 Oct 2024 14:41:20 +0800 Subject: [PATCH 2/2] fix build doc --- src/main/java/com/qiniu/media/apis/ApiPrefop.java | 2 +- src/main/java/com/qiniu/processing/OperationStatus.java | 2 +- src/main/java/com/qiniu/storage/Retry.java | 7 +++++++ src/main/java/com/qiniu/util/UrlUtils.java | 4 ++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/qiniu/media/apis/ApiPrefop.java b/src/main/java/com/qiniu/media/apis/ApiPrefop.java index c285221c8..f4859c69f 100644 --- a/src/main/java/com/qiniu/media/apis/ApiPrefop.java +++ b/src/main/java/com/qiniu/media/apis/ApiPrefop.java @@ -380,7 +380,7 @@ public String getPipeline() { /** * 获取变量值 - * 如果没有，则表示通过 `api+fops` 命令提交的任务，否则遵循规则 `: `，其中 `` 当前可选 `workflow` 或 `trigger` + * 如果没有，则表示通过 `api+fops` 命令提交的任务，否则遵循规则 `{source}:{source_id}`，其中 `{source}` 当前可选 `workflow` 或 `trigger` * * @return taskFrom */ diff --git a/src/main/java/com/qiniu/processing/OperationStatus.java b/src/main/java/com/qiniu/processing/OperationStatus.java index 33e577ce4..e2e4c3ef1 100644 --- a/src/main/java/com/qiniu/processing/OperationStatus.java +++ b/src/main/java/com/qiniu/processing/OperationStatus.java @@ -33,7 +33,7 @@ public class OperationStatus { /*** * taskFrom * 1. 如果没有 taskFrom, 则表示是通过 api+fops命令 提交的任务, 否则见 2 - * 2. taskFrom 字段规则: : ，其中 source 当前可选: workflow|trigger + * 2. taskFrom 字段规则: {source}:{source_id}，其中 source 当前可选: workflow|trigger **/ public String taskFrom; diff --git a/src/main/java/com/qiniu/storage/Retry.java b/src/main/java/com/qiniu/storage/Retry.java index 733a8330c..27319f441 100644 --- a/src/main/java/com/qiniu/storage/Retry.java +++ b/src/main/java/com/qiniu/storage/Retry.java @@ -95,6 +95,8 @@ public interface Interval { /** * 重试时间间隔，单位：毫秒 + * + * @return 重试时间间隔 **/ int interval(); } @@ -103,6 +105,11 @@ public interface RetryCondition { /** * 是否需要重试 + * + * @param request 请求 + * @param response 响应 + * @param exception 异常 + * @return 是否需要重试 **/ boolean shouldRetry(Api.Request request, Api.Response response, QiniuException exception); } diff --git a/src/main/java/com/qiniu/util/UrlUtils.java b/src/main/java/com/qiniu/util/UrlUtils.java index d644c97f1..3fa83ce7b 100644 --- a/src/main/java/com/qiniu/util/UrlUtils.java +++ b/src/main/java/com/qiniu/util/UrlUtils.java @@ -210,6 +210,10 @@ public static URL parseHost(String host) { /** * 如果 host 包含 scheme 则优先使用 host 中包含的 scheme * 如果 host 不包含 scheme 则按照 useHttps 增加 scheme + * + * @param host 域名 + * @param useHttps 是否使用 https + * @return 合成后的 url */ public static String setHostScheme(String host, boolean useHttps) { if (host == null || StringUtils.isNullOrEmpty(host)) {