Skip to content

Commit f4b4b6d

Browse files
author
garenwang
committed
# 5.7.9
修复 #import <Commoncrypto/CommonDigest.h> 大小写问题
1 parent fc91d5b commit f4b4b6d

File tree

589 files changed

+19497
-20524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

589 files changed

+19497
-20524
lines changed

CHANGELOG.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
# 5.7.8
2-
1. storageClass增加智能分层和深度归档两种类型
3-
2. 增加设置和获取存储桶智能分层存储配置的接口
4-
3. 修复写日志时隐磁盘空间不足导致的crash
1+
# 5.7.9
2+
修复 #import <Commoncrypto/CommonDigest.h> 大小写问题
3+
4+
# 5.7.7
5+
1. storageClass增加智能分层和深度归档两种类型。
6+
2. 增加设置和获取存储桶智能分层存储配置的接口。
7+
3. 修复写日志时隐磁盘空间不足导致的crash。
58
4. 上传时检测文件是否存在,不存在抛出错误。
6-
5. 支持用户自定义需要签名的header和paramate,可通过shouldSignedList设置
7-
6. 支持用户自定义签名是拼接在url还是host中:可通过请求的isSignedInURL属性设置
9+
5. 支持用户自定义需要签名的header和paramate,可通过shouldSignedList设置
10+
6. 支持用户自定义签名是拼接在url还是host中:可通过请求的isSignedInURL属性设置
811

912
# 5.7.7
1013
修MD5

QCloudCOSXML.podspec

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

4-
s.version = "5.7.8"
4+
s.version = "5.7.9"
55

66
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
77

@@ -18,15 +18,15 @@ s.version = "5.7.8"
1818
s.default_subspec = 'Default'
1919
s.subspec 'Default' do |default|
2020
default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
21-
default.dependency "QCloudCore",'5.7.8'
21+
default.dependency "QCloudCore",'5.7.9'
2222
end
2323
s.subspec 'Slim' do |slim|
2424
slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
25-
slim.dependency "QCloudCore/WithoutMTA",'5.7.8'
25+
slim.dependency "QCloudCore/WithoutMTA",'5.7.9'
2626
end
2727
s.subspec 'Transfer' do |transfer|
2828
transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
29-
transfer.dependency "QCloudCore/WithoutMTA",'5.7.8'
29+
transfer.dependency "QCloudCore/WithoutMTA",'5.7.9'
3030
end
3131

3232
end

QCloudCOSXML/Classes/Base/NSString+RegularExpressionCategory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
#import <Foundation/Foundation.h>
99

1010
@interface NSString (RegularExpressionCategory)
11-
- (BOOL) matchesRegularExpression:(NSString *)regularExpression;
11+
- (BOOL)matchesRegularExpression:(NSString *)regularExpression;
1212
@end

QCloudCOSXML/Classes/Base/NSString+RegularExpressionCategory.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#import "NSString+RegularExpressionCategory.h"
99

1010
@implementation NSString (RegularExpressionCategory)
11-
- (BOOL) matchesRegularExpression:(NSString *)regularExpression {
12-
NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",regularExpression];
11+
- (BOOL)matchesRegularExpression:(NSString *)regularExpression {
12+
NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regularExpression];
1313
return [predicate evaluateWithObject:self];
1414
}
1515
@end

QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ NS_ASSUME_NONNULL_BEGIN
1111

1212
@interface QCloudAbstractRequest (Quality)
1313

14-
1514
@end
1615

1716
NS_ASSUME_NONNULL_END

QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "QualityDataUploader.h"
1111

1212
@implementation QCloudAbstractRequest (Quality)
13-
+ (void) load{
13+
+ (void)load {
1414
static dispatch_once_t onceToken;
1515
dispatch_once(&onceToken, ^{
1616
[self exchangeImplementation];
@@ -22,16 +22,11 @@ + (void)exchangeImplementation {
2222
Method originNotifyErrorMethod = class_getInstanceMethod(class, @selector(__notifyError:));
2323
Method swizzedNotifyErrorMethod = class_getInstanceMethod(class, @selector(__quality__notifyError:));
2424
method_exchangeImplementations(originNotifyErrorMethod, swizzedNotifyErrorMethod);
25-
26-
27-
2825
}
2926

30-
3127
- (void)__quality__notifyError:(NSError *)error {
3228
[self __quality__notifyError:error];
3329
[QualityDataUploader trackRequestFailWithType:self.class Error:error];
3430
}
3531

36-
3732
@end

QCloudCOSXML/Classes/Base/QCloudCOSXMLEndPoint.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
* 服务地域名称,可用的服务地域名称请查看官网https://www.qcloud.com/document/product/436/6224
2020
* 中提供的地域,这里填入官网里提供的地域简称,例如ap-beijing等。
2121
*/
22-
@property (nonatomic, copy) QCloudRegion regionName;
23-
@property (nonatomic,assign)BOOL isPrefixURL;
22+
@property (nonatomic, copy) QCloudRegion regionName;
23+
@property (nonatomic, assign) BOOL isPrefixURL;
2424
/**
2525
服务的基础名称, 默认值为: myqcloud.com
2626
*/
27-
@property (nonatomic, copy) QCloudServiceName serviceName;
27+
@property (nonatomic, copy) QCloudServiceName serviceName;
2828

2929
/**
3030
自定义域名:http://bucketname.suffix

QCloudCOSXML/Classes/Base/QCloudCOSXMLEndPoint.m

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#import "NSString+RegularExpressionCategory.h"
1111
@implementation QCloudCOSXMLEndPoint
1212

13-
- (instancetype) init
14-
{
13+
- (instancetype)init {
1514
self = [super init];
1615
if (!self) {
1716
return self;
@@ -21,35 +20,35 @@ - (instancetype) init
2120
return self;
2221
}
2322

24-
25-
26-
- (NSString *)formattedBucket:(NSString*)bucket withAPPID:(NSString*)APPID {
23+
- (NSString *)formattedBucket:(NSString *)bucket withAPPID:(NSString *)APPID {
2724
NSInteger subfixLength = APPID.length + 1;
2825
if (bucket.length <= subfixLength) {
2926
return bucket;
3027
}
31-
NSString* APPIDSubfix = [NSString stringWithFormat:@"-%@",APPID];
28+
NSString *APPIDSubfix = [NSString stringWithFormat:@"-%@", APPID];
3229
if (APPIDSubfix) {
33-
NSString* subfixString = [bucket substringWithRange:NSMakeRange(bucket.length - subfixLength , subfixLength)];
30+
NSString *subfixString = [bucket substringWithRange:NSMakeRange(bucket.length - subfixLength, subfixLength)];
3431
if ([subfixString isEqualToString:APPIDSubfix]) {
3532
return [bucket substringWithRange:NSMakeRange(0, bucket.length - subfixLength)];
3633
}
37-
}else{
34+
} else {
3835
if (!APPID) {
39-
@throw [NSException exceptionWithName:kQCloudNetworkDomain reason:[NSString stringWithFormat:@"您没有配置AppID就使用了服务%@", self.class] userInfo:nil];
36+
@throw [NSException exceptionWithName:kQCloudNetworkDomain
37+
reason:[NSString stringWithFormat:@"您没有配置AppID就使用了服务%@", self.class]
38+
userInfo:nil];
4039
}
4140
}
42-
43-
//should not reach here
41+
42+
// should not reach here
4443
return bucket;
4544
}
4645

47-
-(NSURL *)serverURLWithBucket:(NSString *)bucket appID:(NSString *)appID regionName:(NSString *)regionName{
46+
- (NSURL *)serverURLWithBucket:(NSString *)bucket appID:(NSString *)appID regionName:(NSString *)regionName {
4847
if (self.serverURLLiteral) {
4948
return self.serverURLLiteral;
5049
}
51-
52-
NSString* scheme = @"https";
50+
51+
NSString *scheme = @"https";
5352
if (!self.useHTTPS) {
5453
scheme = @"http";
5554
}
@@ -58,54 +57,54 @@ -(NSURL *)serverURLWithBucket:(NSString *)bucket appID:(NSString *)appID regionN
5857
NSAssert(isLegal, @"bucket name contains illegal character! It can only contains a-z, A-Z, 0-9, '.' and '-' ");
5958
if (!isLegal) {
6059
QCloudLogDebug(@"bucket %@ contains illeagal character, building service url pregress returns immediately", bucket);
61-
return nil;
60+
return nil;
6261
}
63-
NSString* formattedBucketName = [self formattedBucket:bucket withAPPID:appID];
62+
NSString *formattedBucketName = [self formattedBucket:bucket withAPPID:appID];
6463
if (appID) {
65-
formattedBucketName = [NSString stringWithFormat:@"%@-%@",formattedBucketName,appID];
64+
formattedBucketName = [NSString stringWithFormat:@"%@-%@", formattedBucketName, appID];
6665
}
6766
NSString *regionNametmp = nil;
6867
if (regionName) {
6968
regionNametmp = regionName;
70-
}else{
69+
} else {
7170
regionNametmp = self.regionName;
7271
}
7372
NSURL *serverURL;
7473

75-
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.cos.%@.%@",scheme,formattedBucketName,regionNametmp,self.serviceName]];
74+
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.cos.%@.%@", scheme, formattedBucketName, regionNametmp, self.serviceName]];
7675
if (!self.isPrefixURL) {
77-
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.cos.%@/%@",scheme,regionNametmp,self.serviceName,formattedBucketName]];
76+
serverURL =
77+
[NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.cos.%@/%@", scheme, regionNametmp, self.serviceName, formattedBucketName]];
7878
}
7979
if (self.suffix) {
80-
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.%@",scheme,formattedBucketName,self.suffix]];
80+
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@.%@", scheme, formattedBucketName, self.suffix]];
8181
if (!self.isPrefixURL) {
82-
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/%@",scheme,self.suffix,formattedBucketName]];
82+
serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/%@", scheme, self.suffix, formattedBucketName]];
8383
}
8484
}
85-
QCloudLogDebug(@"serverURL: %@",serverURL);
85+
QCloudLogDebug(@"serverURL: %@", serverURL);
8686
return serverURL;
8787
}
88-
-(void)setIsPrefixURL:(BOOL)isPrefixURL{
88+
- (void)setIsPrefixURL:(BOOL)isPrefixURL {
8989
_isPrefixURL = isPrefixURL;
9090
}
9191
- (void)setRegionName:(QCloudRegion)regionName {
92-
//Region 仅允许由 a-z, A-Z, 0-9, 英文句号. 和 - 构成。
92+
// Region 仅允许由 a-z, A-Z, 0-9, 英文句号. 和 - 构成。
9393
if ([self.serviceName isEqualToString:@"myqcloud.com"]) {
9494
NSParameterAssert(regionName);
9595
static NSString *regularExpression = @"[a-zA-Z0-9.-]*";
9696
BOOL isLegal = [regionName matchesRegularExpression:regularExpression];
9797
NSAssert(isLegal, @"Region name contains illegal character! It can only contains a-z, A-Z, 0-9, '.' and '-' ");
9898
if (!isLegal) {
9999
QCloudLogDebug(@"Region %@ contains illeagal character, setter returns immediately", regionName);
100-
return ;
100+
return;
101101
}
102102
}
103-
104-
103+
105104
_regionName = regionName;
106105
}
107106
- (id)copyWithZone:(NSZone *)zone {
108-
QCloudCOSXMLEndPoint* endpoint = [super copyWithZone:nil];
107+
QCloudCOSXMLEndPoint *endpoint = [super copyWithZone:nil];
109108
endpoint.regionName = self.regionName;
110109
endpoint.serviceName = self.serviceName;
111110
endpoint.isPrefixURL = self.isPrefixURL;

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Configuration.h

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,30 @@
55
// Created by tencent
66
//
77
//
8-
// ██████╗ ██████╗██╗ ██████╗ ██╗ ██╗██████╗ ████████╗███████╗██████╗ ███╗ ███╗██╗███╗ ██╗ █████╗ ██╗ ██╗ █████╗ ██████╗
9-
// ██╔═══██╗██╔════╝██║ ██╔═══██╗██║ ██║██╔══██╗ ╚══██╔══╝██╔════╝██╔══██╗████╗ ████║██║████╗ ██║██╔══██╗██║ ██║ ██╔══██╗██╔══██╗
10-
// ██║ ██║██║ ██║ ██║ ██║██║ ██║██║ ██║ ██║ █████╗ ██████╔╝██╔████╔██║██║██╔██╗ ██║███████║██║ ██║ ███████║██████╔╝
11-
// ██║▄▄ ██║██║ ██║ ██║ ██║██║ ██║██║ ██║ ██║ ██╔══╝ ██╔══██╗██║╚██╔╝██║██║██║╚██╗██║██╔══██║██║ ██║ ██╔══██║██╔══██╗
12-
// ╚██████╔╝╚██████╗███████╗╚██████╔╝╚██████╔╝██████╔╝ ██║ ███████╗██║ ██║██║ ╚═╝ ██║██║██║ ╚████║██║ ██║███████╗ ███████╗██║ ██║██████╔╝
13-
// ╚══▀▀═╝ ╚═════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝╚═╝ ╚═╝╚══════╝ ╚══════╝╚═╝ ╚═╝╚═════╝
8+
// ██████╗ ██████╗██╗ ██████╗ ██╗ ██╗██████╗ ████████╗███████╗██████╗ ███╗ ███╗██╗███╗ ██╗ █████╗ ██╗ ██╗ █████╗
9+
// ██████╗
10+
// ██╔═══██╗██╔════╝██║ ██╔═══██╗██║ ██║██╔══██╗ ╚══██╔══╝██╔════╝██╔══██╗████╗ ████║██║████╗ ██║██╔══██╗██║ ██║ ██╔══██╗██╔══██╗
11+
// ██║ ██║██║ ██║ ██║ ██║██║ ██║██║ ██║ ██║ █████╗ ██████╔╝██╔████╔██║██║██╔██╗ ██║███████║██║ ██║ ███████║██████╔╝
12+
// ██║▄▄ ██║██║ ██║ ██║ ██║██║ ██║██║ ██║ ██║ ██╔══╝ ██╔══██╗██║╚██╔╝██║██║██║╚██╗██║██╔══██║██║ ██║ ██╔══██║██╔══██╗
13+
// ╚██████╔╝╚██████╗███████╗╚██████╔╝╚██████╔╝██████╔╝ ██║ ███████╗██║ ██║██║ ╚═╝ ██║██║██║ ╚████║██║ ██║███████╗ ███████╗██║
14+
// ██║██████╔╝
15+
// ╚══▀▀═╝ ╚═════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝╚═╝ ╚═╝╚═╝ ╚═╝╚═╝╚═╝ ╚═══╝╚═╝ ╚═╝╚══════╝ ╚══════╝╚═╝ ╚═╝╚═════╝
1416
//
1517
//
1618
// _ __ _ _
1719
// (_) / _| | | | |
18-
// ___ ___ _ ____ ___ ___ ___ | |_ ___ _ __ __| | _____ _____| | ___ _ __ ___ _ __ ___
19-
// / __|/ _ \ '__\ \ / / |/ __/ _ \ | _/ _ \| '__| / _` |/ _ \ \ / / _ \ |/ _ \| '_ \ / _ \ '__/ __|
20-
// \__ \ __/ | \ V /| | (_| __/ | || (_) | | | (_| | __/\ V / __/ | (_) | |_) | __/ | \__
21-
// |___/\___|_| \_/ |_|\___\___| |_| \___/|_| \__,_|\___| \_/ \___|_|\___/| .__/ \___|_| |___/
20+
// ___ ___ _ ____ ___ ___ ___ | |_ ___ _ __ __| | _____ _____| | ___ _ __ ___ _
21+
// __ ___
22+
// / __|/ _ \ '__\ \ / / |/ __/ _ \ | _/ _ \| '__| / _` |/ _ \ \ / / _ \ |/ _ \| '_ \ / _ \
23+
// '__/ __|
24+
// \__ \ __/ | \ V /| | (_| __/ | || (_) | | | (_| | __/\ V / __/ | (_) | |_) | __/
25+
// | \__
26+
// |___/\___|_| \_/ |_|\___\___| |_| \___/|_| \__,_|\___| \_/ \___|_|\___/| .__/
27+
// \___|_| |___/
2228
// ______ ______ ______ ______ ______ ______ ______ ______ | |
2329
// |______|______|______|______|______|______|______|______| |_|
2430
//
2531

26-
27-
28-
2932
#import <Foundation/Foundation.h>
3033
#import <QCloudCore/QCloudService.h>
3134
#import "QCloudCOSXMLService.h"

0 commit comments

Comments
 (0)