diff --git a/CHANGELOG.md b/CHANGELOG.md index aaf70363..5e29efd6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ #Changelog +## 7.2.4 (2018-05-11) +## 增加 +* 新上传节点 + +## 7.2.3 (2017-12-21) +## 修正 +* 修复uploadtoken 错误 + ## 7.2.2 (2017-12-07) ## 修正 * 进度回调重复 diff --git a/Qiniu.podspec b/Qiniu.podspec index 30474f7e..5629c34a 100755 --- a/Qiniu.podspec +++ b/Qiniu.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Qiniu' - s.version = '7.2.3' + s.version = '7.2.4' s.summary = 'Qiniu Resource Storage SDK for iOS and Mac' s.homepage = 'https://github.com/qiniu/objc-sdk' s.social_media_url = 'http://weibo.com/qiniutek' diff --git a/QiniuSDK/Common/QNVersion.h b/QiniuSDK/Common/QNVersion.h index dc19bbd7..4f94af53 100755 --- a/QiniuSDK/Common/QNVersion.h +++ b/QiniuSDK/Common/QNVersion.h @@ -11,4 +11,4 @@ /** * sdk 版本 */ -static const NSString *kQiniuVersion = @"7.2.3"; +static const NSString *kQiniuVersion = @"7.2.4"; diff --git a/QiniuSDK/Storage/QNConfiguration.m b/QiniuSDK/Storage/QNConfiguration.m index 534aba5e..0865df19 100644 --- a/QiniuSDK/Storage/QNConfiguration.m +++ b/QiniuSDK/Storage/QNConfiguration.m @@ -212,6 +212,11 @@ - (NSString *)up:(QNUpToken *)token return nil; } +- (void)preQuery:(QNUpToken *)token + on:(QNPrequeryReturn)ret { + ret(0); +} + @end @interface QNFixedZone () { @@ -296,7 +301,7 @@ + (instancetype)zoneNa0 { }); return zNa0; } - + + (instancetype)zoneAs0 { static QNFixedZone *zAs0 = nil; static dispatch_once_t onceToken; @@ -304,14 +309,12 @@ + (instancetype)zoneAs0 { static const NSArray *uplist = nil; if (!uplist) { uplist = [[NSArray alloc] initWithObjects:@"upload-as0.qiniup.com", @"up-as0.qiniup.com", - @"upload-as0.qbox.me", @"up-as0.qbox.me", nil]; + @"upload-as0.qbox.me", @"up-as0.qbox.me", nil]; zAs0 = [QNFixedZone createWithHost:(NSArray *)uplist]; } }); return zAs0; } - - - (void)preQuery:(QNUpToken *)token on:(QNPrequeryReturn)ret { diff --git a/QiniuSDKTests/QNFileRecorderTest.m b/QiniuSDKTests/QNFileRecorderTest.m index ae971ba4..1b68605d 100644 --- a/QiniuSDKTests/QNFileRecorderTest.m +++ b/QiniuSDKTests/QNFileRecorderTest.m @@ -113,7 +113,6 @@ - (void)tearDown { // [self template:700 pos:0.1]; //} - - (void)test4M { if (_inTravis) { return;