Skip to content

Commit 045d3c0

Browse files
author
gaoyd
committed
随java sdk废除不起作用的endpointsuffix
1 parent a9e7094 commit 045d3c0

File tree

5 files changed

+3
-18
lines changed

5 files changed

+3
-18
lines changed

conf/config.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ secretKey=yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
1919
bucketName=mybucket-1251668577
2020
# 目的bucket的region信息. COS地域的简称请参照 https://www.qcloud.com/document/product/436/6224
2121
region=ap-guangzhou
22-
# 目的园区的endpoint suffix, 一般情况不用填写,适用于自定义域名CNAME到COS上传域名的客户.工具会在自动在在suffix前加上${bucketname}。最终形成的域名是
23-
# ${bucketName}.${endPointsuffix}. endPoint的优先级比region高,如果设置了endpoint则会以enpoint来补充域名
24-
endPointSuffix=
2522
# 存储类型, 标准(Standard), 多AZ标准(Maz_Standard), 低频(Standard_IA), 多AZ低频(Maz_Standard_IA),
2623
# 智能分层(Intelligent_Tiering), 多AZ智能分层(Maz_Intelligent_Tiering), 归档(Archive), 深度归档(Deep_Archive)
2724
storageClass=Standard

src/main/java/com/qcloud/cos_migrate_tool/config/CommonConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,13 @@ public void setRegion(String region) throws IllegalArgumentException {
220220
}
221221
this.region = region.trim();
222222
}
223-
223+
224+
@Deprecated
224225
public String getEndpointSuffix() {
225226
return endpointSuffix;
226227
}
227228

229+
@Deprecated
228230
public void setEndpointSuffix(String endpointSuffix) {
229231
this.endpointSuffix = endpointSuffix;
230232
}

src/main/java/com/qcloud/cos_migrate_tool/config/ConfigParser.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public class ConfigParser {
2626

2727
private static final String COMMON_SECTION_NAME = "common";
2828
private static final String COMMON_REGION = "region";
29-
private static final String COMMON_ENDPOINT_SUFFIX = "endPointSuffix";
3029
private static final String COMMON_BUCKETNAME = "bucketName";
3130
private static final String COMMON_AK = "secretId";
3231
private static final String COMMON_SK = "secretKey";
@@ -548,12 +547,6 @@ private boolean initCommonConfig(Preferences prefs, CommonConfig commonConfig) {
548547
assert (timeWindowStr != null);
549548
commonConfig.setTimeWindowsStr(timeWindowStr);
550549

551-
String endPointSuffixStr =
552-
getConfigValue(prefs, COMMON_SECTION_NAME, COMMON_ENDPOINT_SUFFIX);
553-
if (endPointSuffixStr != null && !endPointSuffixStr.trim().isEmpty()) {
554-
commonConfig.setEndpointSuffix(endPointSuffixStr);
555-
}
556-
557550
String proxyHost = getConfigValue(prefs, COMMON_SECTION_NAME, COMMON_PROXY_HOST);
558551
if (proxyHost != null && !proxyHost.trim().isEmpty()) {
559552
commonConfig.setProxyHost(proxyHost);

src/main/java/com/qcloud/cos_migrate_tool/task/MigrateCopyBucketTaskExecutor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ public MigrateCopyBucketTaskExecutor(CopyBucketConfig config) {
6262
clientConfig.setShortConnection();
6363
}
6464

65-
if (config.getSrcEndpointSuffix() != null) {
66-
clientConfig.setEndPointSuffix(config.getSrcEndpointSuffix());
67-
}
6865
clientConfig.setConnectionTimeout(5000);
6966
clientConfig.setSocketTimeout(5000);
7067

src/main/java/com/qcloud/cos_migrate_tool/task/TaskExecutor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ public TaskExecutor(MigrateType migrateType, CommonConfig config) {
9494
clientConfig.setHttpProtocol(HttpProtocol.http);
9595
}
9696

97-
if (config.getEndpointSuffix() != null) {
98-
System.out.println(config.getEndpointSuffix());
99-
clientConfig.setEndPointSuffix(config.getEndpointSuffix());
100-
}
10197
clientConfig.setUserAgent(VersionInfoUtils.getUserAgent());
10298

10399
if (!config.getProxyHost().isEmpty() && config.getProxyPort() > 0) {

0 commit comments

Comments
 (0)