Skip to content

Commit 41c4f5f

Browse files
authored
Merge pull request #280 from longbai/travis
update version
2 parents 6382e11 + 44bab09 commit 41c4f5f

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
#Changelog
22

3+
## 7.2.4 (2018-05-11)
4+
## 增加
5+
* 新上传节点
6+
7+
## 7.2.3 (2017-12-21)
8+
## 修正
9+
* 修复uploadtoken 错误
10+
311
## 7.2.2 (2017-12-07)
412
## 修正
513
* 进度回调重复

Qiniu.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Qiniu'
3-
s.version = '7.2.3'
3+
s.version = '7.2.4'
44
s.summary = 'Qiniu Resource Storage SDK for iOS and Mac'
55
s.homepage = 'https://github.com/qiniu/objc-sdk'
66
s.social_media_url = 'http://weibo.com/qiniutek'

QiniuSDK/Common/QNVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
/**
1212
* sdk 版本
1313
*/
14-
static const NSString *kQiniuVersion = @"7.2.3";
14+
static const NSString *kQiniuVersion = @"7.2.4";

QiniuSDK/Storage/QNConfiguration.m

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ - (NSString *)up:(QNUpToken *)token
212212
return nil;
213213
}
214214

215+
- (void)preQuery:(QNUpToken *)token
216+
on:(QNPrequeryReturn)ret {
217+
ret(0);
218+
}
219+
215220
@end
216221

217222
@interface QNFixedZone () {
@@ -296,22 +301,20 @@ + (instancetype)zoneNa0 {
296301
});
297302
return zNa0;
298303
}
299-
304+
300305
+ (instancetype)zoneAs0 {
301306
static QNFixedZone *zAs0 = nil;
302307
static dispatch_once_t onceToken;
303308
dispatch_once(&onceToken, ^{
304309
static const NSArray<NSString *> *uplist = nil;
305310
if (!uplist) {
306311
uplist = [[NSArray alloc] initWithObjects:@"upload-as0.qiniup.com", @"up-as0.qiniup.com",
307-
@"upload-as0.qbox.me", @"up-as0.qbox.me", nil];
312+
@"upload-as0.qbox.me", @"up-as0.qbox.me", nil];
308313
zAs0 = [QNFixedZone createWithHost:(NSArray<NSString *> *)uplist];
309314
}
310315
});
311316
return zAs0;
312317
}
313-
314-
315318

316319
- (void)preQuery:(QNUpToken *)token
317320
on:(QNPrequeryReturn)ret {

QiniuSDKTests/QNFileRecorderTest.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ - (void)tearDown {
113113
// [self template:700 pos:0.1];
114114
//}
115115

116-
117116
- (void)test4M {
118117
if (_inTravis) {
119118
return;

0 commit comments

Comments
 (0)