Skip to content

Commit b4ac527

Browse files
author
garenwang
committed
# 6.2.7
1.优化文本审核参数校验
1 parent 3d3c372 commit b4ac527

File tree

13 files changed

+45
-29
lines changed

13 files changed

+45
-29
lines changed

CHANGELOG.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
# 6.2.7
2-
1.优化文本审核参数校验
1+
# 6.2.7
32

3+
1.优化文本审核参数校验
4+
45
# 6.2.6
5-
1.新增最大并发数自增上限配置。
6-
2.quic和cosxml解耦。
6+
7+
1.新增最大并发数自增上限配置。2.quic和cosxml解耦。
78

89
# 6.2.5
910
1.新增媒体处理接口。2.调整service注册策略

QCloudCOSXML.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22
s.name = "QCloudCOSXML"
33

44

5-
s.version = "6.2.7"
5+
s.version = "6.2.6"
66

77

88
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -22,15 +22,15 @@ s.version = "6.2.7"
2222
s.subspec 'Default' do |default|
2323
default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
2424

25-
default.dependency "QCloudCore",'6.2.7'
25+
default.dependency "QCloudCore",'6.2.6'
2626
end
2727
s.subspec 'Slim' do |slim|
2828
slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
29-
slim.dependency "QCloudCore/WithoutMTA",'6.2.7'
29+
slim.dependency "QCloudCore/WithoutMTA",'6.2.6'
3030
end
3131
s.subspec 'Transfer' do |transfer|
3232
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
33-
transfer.dependency "QCloudCore/WithoutMTA",'6.2.7'
33+
transfer.dependency "QCloudCore/WithoutMTA",'6.2.6'
3434

3535
end
3636

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
#ifndef QCloudCOSXMLModuleVersion_h
77
#define QCloudCOSXMLModuleVersion_h
8-
#define QCloudCOSXMLModuleVersionNumber 602007
8+
#define QCloudCOSXMLModuleVersionNumber 602006
99

1010
//dependency
1111

1212
//
1313
FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
1414
FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
1515

16-
#endif
16+
#endif

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "QCloudCOSXMLVersion.h"
2-
NSString * const QCloudCOSXMLModuleVersion = @"6.2.7";
2+
NSString * const QCloudCOSXMLModuleVersion = @"6.2.6";
33
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
44
@interface QCloudQCloudCOSXMLLoad : NSObject
55
@end
@@ -26,4 +26,4 @@ + (void) load
2626
#pragma clang diagnostic pop
2727
}
2828
}
29-
@end
29+
@end

QCloudCOSXML/Classes/Transfer/enum/QCloudCOSStorageClassEnum.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ typedef NS_ENUM(NSInteger, QCloudCOSStorageClass) {
4747
QCloudCOSStorageMAZ_INTELLIGENT_TIERING = 6,
4848
//深度归档
4949
QCloudCOSStorageDEEP_ARCHIVE = 7,
50+
QCloudCOSStorageCOLD = 8,
51+
QCloudCOSStorageMAZ_COLD = 9,
5052
};
5153

5254
FOUNDATION_EXTERN QCloudCOSStorageClass QCloudCOSStorageClassDumpFromString(NSString *key);

QCloudCOSXML/Classes/Transfer/enum/QCloudCOSStorageClassEnum.m

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ QCloudCOSStorageClass QCloudCOSStorageClassDumpFromString(NSString *key) {
2626
return QCloudCOSStorageMAZ_INTELLIGENT_TIERING;
2727
} else if ([key isEqualToString:@"DEEP_ARCHIVE"]) {
2828
return QCloudCOSStorageDEEP_ARCHIVE;
29+
} else if ([key isEqualToString:@"COLD"]) {
30+
return QCloudCOSStorageCOLD;
31+
} else if ([key isEqualToString:@"MAZ_COLD"]) {
32+
return QCloudCOSStorageMAZ_COLD;
2933
}
3034
return 0;
3135
}
@@ -55,6 +59,12 @@ QCloudCOSStorageClass QCloudCOSStorageClassDumpFromString(NSString *key) {
5559
case QCloudCOSStorageDEEP_ARCHIVE: {
5660
return @"DEEP_ARCHIVE";
5761
}
62+
case QCloudCOSStorageCOLD: {
63+
return @"COLD";
64+
}
65+
case QCloudCOSStorageMAZ_COLD: {
66+
return @"MAZ_COLD";
67+
}
5868
default:
5969
return nil;
6070
}

QCloudCOSXML/Classes/Transfer/request/QCloudGetObjectRequest.m

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
6767
if (!self.object || ([self.object isKindOfClass:NSString.class] && ((NSString *)self.object).length == 0)) {
6868
if (error != NULL) {
6969
*error = [NSError
70-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
71-
message:[NSString stringWithFormat:
72-
@"InvalidArgument:paramter[object] is invalid (nil), it must have some value. please check it"]];
70+
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
71+
message:[NSString stringWithFormat:
72+
@"InvalidArgument:paramter[object] is invalid (nil), it must have some value. please check it"]];
7373
return NO;
7474
}
7575
}
7676
if (!self.bucket || ([self.bucket isKindOfClass:NSString.class] && ((NSString *)self.bucket).length == 0)) {
7777
if (error != NULL) {
7878
*error = [NSError
79-
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
80-
message:[NSString stringWithFormat:
81-
@"InvalidArgument:paramter[bucket] is invalid (nil), it must have some value. please check it"]];
79+
qcloud_errorWithCode:QCloudNetworkErrorCodeParamterInvalid
80+
message:[NSString stringWithFormat:
81+
@"InvalidArgument:paramter[bucket] is invalid (nil), it must have some value. please check it"]];
8282
return NO;
8383
}
8484
}
@@ -125,7 +125,10 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
125125
if (self.trafficLimit) {
126126
[self.requestData setValue:@(self.trafficLimit).stringValue forHTTPHeaderField:@"x-cos-traffic-limit"];
127127
}
128-
128+
129+
if(![self.customHeaders isKindOfClass:NSMutableDictionary.class]){
130+
self.customHeaders = self.customHeaders.mutableCopy;
131+
}
129132
[self.customHeaders setObject:@"no-cache" forKey:@"Cache-Control"];
130133

131134
NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket

QCloudCore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.name = "QCloudCore"
1111

1212

13-
s.version = "6.2.7"
13+
s.version = "6.2.6"
1414

1515

1616

QCloudCore/Classes/Base/QCloudCoreVersion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
#ifndef QCloudCoreModuleVersion_h
77
#define QCloudCoreModuleVersion_h
8-
#define QCloudCoreModuleVersionNumber 602007
8+
#define QCloudCoreModuleVersionNumber 602006
99

1010
//dependency
1111

1212
//
1313
FOUNDATION_EXTERN NSString * const QCloudCoreModuleVersion;
1414
FOUNDATION_EXTERN NSString * const QCloudCoreModuleName;
1515

16-
#endif
16+
#endif

QCloudCore/Classes/Base/QCloudCoreVersion.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "QCloudCoreVersion.h"
2-
NSString * const QCloudCoreModuleVersion = @"6.2.7";
2+
NSString * const QCloudCoreModuleVersion = @"6.2.6";
33
NSString * const QCloudCoreModuleName = @"QCloudCore";
44
@interface QCloudQCloudCoreLoad : NSObject
55
@end
@@ -26,4 +26,4 @@ + (void) load
2626
#pragma clang diagnostic pop
2727
}
2828
}
29-
@end
29+
@end

0 commit comments

Comments
 (0)