Merge pull request #356 from YangSen-qn/sdk_v7_uc_query_v4

version7: uc query v4

Author: bachue

QiniuSDK/Common/QNAutoZone.m

@@ -142,7 +142,7 @@ - (void)preQuery:(QNUpToken *)token
     }
 
     //https://uc.qbox.me/v3/query?ak=T3sAzrwItclPGkbuV4pwmszxK7Ki46qRXXGBBQz3&bucket=if-pbl
-    NSString *url = [NSString stringWithFormat:@"%@/v3/query?ak=%@&bucket=%@", server, token.access, token.bucket];
+    NSString *url = [NSString stringWithFormat:@"%@/v4/query?ak=%@&bucket=%@", server, token.access, token.bucket];
     [sesionManager get:url withHeaders:nil withCompleteBlock:^(QNHttpResponseInfo *httpResponseInfo, NSDictionary *respBody) {
         if (!httpResponseInfo.error) {
 

QiniuSDK/Common/QNZoneInfo.m

@@ -40,54 +40,38 @@ - (instancetype)init:(long)ttl
 - (QNZoneInfo *)buildInfoFromJson:(NSDictionary *)resp {
     long ttl = [[resp objectForKey:@"ttl"] longValue];
     NSDictionary *up = [resp objectForKey:@"up"];
-    NSDictionary *acc = [up objectForKey:@"acc"];
-    NSDictionary *src = [up objectForKey:@"src"];
-    NSDictionary *old_acc = [up objectForKey:@"old_acc"];
-    NSDictionary *old_src = [up objectForKey:@"old_src"];
-    NSArray *urlDicList = [[NSArray alloc] initWithObjects:acc, src, old_acc, old_src, nil];
+    NSArray *domains = [up objectForKey:@"domains"];
+    NSArray *oldDomains = [up objectForKey:@"old"];
+    
     NSMutableArray *domainList = [[NSMutableArray alloc] init];
     NSMutableDictionary *domainDic = [[NSMutableDictionary alloc] init];
-    //main
-    for (int i = 0; i < urlDicList.count; i++) {
-        if ([[urlDicList[i] allKeys] containsObject:@"main"]) {
-            NSArray *mainDomainList = urlDicList[i][@"main"];
-            for (int i = 0; i < mainDomainList.count; i++) {
-                [domainList addObject:mainDomainList[i]];
-                [domainDic setObject:[NSDate dateWithTimeIntervalSince1970:0] forKey:mainDomainList[i]];
-            }
-        }
+    for (int i = 0; i < domains.count; i++) {
+        [domainList addObject:domains[i]];
+        [domainDic setObject:[NSDate dateWithTimeIntervalSince1970:0] forKey:domains[i]];
     }
-    
-    //backup
-    for (int i = 0; i < urlDicList.count; i++) {
-        if ([[urlDicList[i] allKeys] containsObject:@"backup"]) {
-            NSArray *mainDomainList = urlDicList[i][@"backup"];
-            for (int i = 0; i < mainDomainList.count; i++) {
-                [domainList addObject:mainDomainList[i]];
-                [domainDic setObject:[NSDate dateWithTimeIntervalSince1970:0] forKey:mainDomainList[i]];
-            }
-        }
+    for (int i = 0; i < oldDomains.count; i++) {
+        [domainList addObject:oldDomains[i]];
+        [domainDic setObject:[NSDate dateWithTimeIntervalSince1970:0] forKey:oldDomains[i]];
     }
 
     // judge zone region via io
-    NSDictionary *io = [resp objectForKey:@"io"];
-    NSDictionary *io_src = [io objectForKey:@"src"];
-    NSArray *io_main = [io_src objectForKey:@"main"];
-    NSString *io_host = io_main.count > 0 ? io_main[0] : nil;
+    NSString *regionId = [resp objectForKey:@"regionId"];
 
     QNZoneRegion zoneRegion = QNZoneRegion_unknown;
-    if ([io_host isEqualToString:@"iovip.qbox.me"]) {
-        zoneRegion = QNZoneRegion_z0;
-    } else if ([io_host isEqualToString:@"iovip-z1.qbox.me"]) {
-        zoneRegion = QNZoneRegion_z1;
-    } else if ([io_host isEqualToString:@"iovip-z2.qbox.me"]) {
-        zoneRegion = QNZoneRegion_z2;
-    } else if ([io_host isEqualToString:@"iovip-na0.qbox.me"]) {
-        zoneRegion = QNZoneRegion_na0;
-    } else if ([io_host isEqualToString:@"iovip-as0.qbox.me"]) {
-        zoneRegion = QNZoneRegion_as0;
-    } else {
-        zoneRegion = QNZoneRegion_unknown;
+    if ([regionId isKindOfClass:[NSString class]]) {
+        if ([regionId isEqualToString:@"z0"]) {
+            zoneRegion = QNZoneRegion_z0;
+        } else if ([regionId isEqualToString:@"z1"]) {
+            zoneRegion = QNZoneRegion_z1;
+        } else if ([regionId isEqualToString:@"z2"]) {
+            zoneRegion = QNZoneRegion_z2;
+        } else if ([regionId isEqualToString:@"as0"]) {
+            zoneRegion = QNZoneRegion_na0;
+        } else if ([regionId isEqualToString:@"na0"]) {
+            zoneRegion = QNZoneRegion_as0;
+        } else {
+            zoneRegion = QNZoneRegion_unknown;
+        }
     }
 
     return [[QNZoneInfo alloc] init:ttl upDomainsList:domainList upDomainsDic:domainDic zoneRegion:zoneRegion];

QiniuSDKTests/QNTestConfig.h

@@ -6,4 +6,5 @@
 //  Copyright (c) 2014年 Qiniu. All rights reserved.
 //
 
-static NSString *const g_token = @"jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:yxC-8NN8CDRUAQZVkD20EB5TRDo=:eyJzY29wZSI6InpvbmUwLXNwYWNlIiwiZGVhZGxpbmUiOjE2MDI4NDQyMzEsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
+static NSString *const g_token = @"jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:6SxDNsbfE8Womrv09M5ORkcTDKk=:eyJzY29wZSI6InpvbmUwLXNwYWNlIiwiZGVhZGxpbmUiOjE2MDI5MDA0MDAsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
+