Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
#Changelog

## 7.2.4 (2018-05-11)
## 增加
* 新上传节点

## 7.2.3 (2017-12-21)
## 修正
* 修复uploadtoken 错误

## 7.2.2 (2017-12-07)
## 修正
* 进度回调重复
Expand Down
2 changes: 1 addition & 1 deletion Qiniu.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion QiniuSDK/Common/QNVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
/**
* sdk 版本
*/
static const NSString *kQiniuVersion = @"7.2.3";
static const NSString *kQiniuVersion = @"7.2.4";
11 changes: 7 additions & 4 deletions QiniuSDK/Storage/QNConfiguration.m
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ - (NSString *)up:(QNUpToken *)token
return nil;
}

- (void)preQuery:(QNUpToken *)token
on:(QNPrequeryReturn)ret {
ret(0);
}

@end

@interface QNFixedZone () {
Expand Down Expand Up @@ -296,22 +301,20 @@ + (instancetype)zoneNa0 {
});
return zNa0;
}

+ (instancetype)zoneAs0 {
static QNFixedZone *zAs0 = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
static const NSArray<NSString *> *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<NSString *> *)uplist];
}
});
return zAs0;
}



- (void)preQuery:(QNUpToken *)token
on:(QNPrequeryReturn)ret {
Expand Down
1 change: 0 additions & 1 deletion QiniuSDKTests/QNFileRecorderTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ - (void)tearDown {
// [self template:700 pos:0.1];
//}


- (void)test4M {
if (_inTravis) {
return;
Expand Down