Merge pull request #410 from YangSen-qn/develop

uc query add host

Author: xwen-winnie

CHANGELOG.md

@@ -1,4 +1,6 @@
 #Changelog
+## 8.4.2(2022-02-28)
+- uc query 流程增加新的域名
 
 ## 8.4.1(2022-01-27)
 - 支持 Swift Package Manager

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.4.1'
+  s.version      = '8.4.2'
   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'

QiniuSDK/Common/QNAutoZone.m

@@ -210,7 +210,7 @@ - (QNRequestTransaction *)createUploadRequestTransaction:(QNUpToken *)token{
     if (self.ucHosts && self.ucHosts.count > 0) {
         hosts = [self.ucHosts copy];
     } else {
-        hosts = @[kQNPreQueryHost00, kQNPreQueryHost01];
+        hosts = @[kQNPreQueryHost02, kQNPreQueryHost00, kQNPreQueryHost01];
     }
     QNRequestTransaction *transaction = [[QNRequestTransaction alloc] initWithHosts:hosts
                                                                            regionId:QNZoneInfoEmptyRegionId

QiniuSDK/Common/QNConfig.h

@@ -11,4 +11,5 @@
 //MARK: -- 内部布置 尽量不要修改
 #define kQNPreQueryHost00 @"uc.qbox.me"
 #define kQNPreQueryHost01 @"api.qiniu.com"
+#define kQNPreQueryHost02 @"kodo-config.qiniuapi.com"
 #define kQNUpLogHost @"uplog.qbox.me"

QiniuSDK/Utils/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static NSString *const kQiniuVersion = @"8.4.1";
+static NSString *const kQiniuVersion = @"8.4.2";

QiniuSDKTests/QNAutoZoneTest.m

@@ -20,6 +20,7 @@
 #import "QNZoneInfo.h"
 #import "QNTestConfig.h"
 #import "QNUpToken.h"
+#import "QNConfig.h"
 
 @interface QNAutoZoneTest : XCTestCase
 @property QNAutoZone* autozone;
@@ -37,6 +38,32 @@ - (void)tearDown {
     [super tearDown];
 }
 
+- (void)testAutoZone {
+    QNAutoZone* autoZone = [[QNAutoZone alloc] init];
+    QNUpToken* tok = [QNUpToken parse:token_na0];
+    __block int x = 0;
+    __block int c = 0;
+    [autoZone preQuery:tok on:^(int code, QNResponseInfo *info, QNUploadRegionRequestMetrics *metrics) {
+        x = 1;
+        c = code;
+    }];
+    AGWW_WAIT_WHILE(x == 0, 100.0);
+    XCTAssertEqual(0, c, @"c: %d", c);
+}
+
+- (void)testSetUcHosts02 {
+    QNAutoZone* autoZone = [QNAutoZone zoneWithUcHosts:@[kQNPreQueryHost02]];
+    QNUpToken* tok = [QNUpToken parse:token_na0];
+    __block int x = 0;
+    __block int c = 0;
+    [autoZone preQuery:tok on:^(int code, QNResponseInfo *info, QNUploadRegionRequestMetrics *metrics) {
+        x = 1;
+        c = code;
+    }];
+    AGWW_WAIT_WHILE(x == 0, 100.0);
+    XCTAssertEqual(0, c, @"c: %d", c);
+}
+
 - (void)testClearAutoZoneCache {
     QNAutoZone *autoZone = [[QNAutoZone alloc] init];
     QNUpToken* tok = [QNUpToken parse:token_na0];

README.md

@@ -14,19 +14,19 @@
 通过 CocoaPods
 
 ```ruby
-pod "Qiniu", "~> 8.4.1" 
+pod "Qiniu", "~> 8.4.2" 
 ```
 
 通过 Swift Package Manager (Xcode 11+)
 ```
 App 对接:
-File -> Swift Packages -> Add Package Dependency，输入 HappyDNS 库链接，选择相应版本即可
+File -> Swift Packages -> Add Package Dependency，输入库链接，选择相应版本即可
 库链接: https://github.com/qiniu/objc-sdk
 
 库对接:
 let package = Package(
     dependencies: [
-        .package(url: "https://github.com/qiniu/objc-sdk", from: "8.4.1")
+        .package(url: "https://github.com/qiniu/objc-sdk", from: "8.4.2")
     ],
     // ...
 )