COS XML 5.3.0 Release

Author: erichmzhang

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 5.3.0
+- 增加了生成预签名 URL 的接口。
+- 增加列出指定前缀 Object 所有版本的接口。
+- 增加从 CAS 归档恢复的接口。
+- Get, Put, Delete, Head Object等相关接口支持多版本。
+- 上传过程中增加了 MD5 校验。
+- 下载过程中可以开启 MD5 校验。
+- 针对弱网络情况进行优化，大幅度提高弱网络情况下上传成功率。
+- 修复分块 Copy 大文件的问题。
+- 签名计算时支持自定义开始和结束时间。
+
+
 # 5.2.0
 - 增加了精简版的SDK，只支持上传下载功能。
 - BucketName概念统一。

QCloudCOSXML.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
-  s.version          = "5.2.0"
+  s.version          = "5.3.0"
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
   s.homepage         = "https://cloud.tencent.com/"
@@ -9,10 +9,10 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
   s.source_files = 'QCloudCOSXML/Classes/**/*'
-  s.dependency "QCloudCore",'5.2.0'
+  s.dependency "QCloudCore",'5.3.0'
 
   s.subspec 'Transfer' do |sbt|
     sbt.source_files = 'QCloudCOSXML/Classes/Transfer/*','QCloudCOSXML/Classes/Base/*'
-    sbt.dependency "QCloudCore",'5.2.0'
+    sbt.dependency "QCloudCore",'5.3.0'
   end
 end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.h

@@ -29,7 +29,7 @@
 #import <Foundation/Foundation.h>
 #import <QCloudCore/QCloudService.h>
 
-
+@class QCloudGetPresignedURLRequest;
 @interface QCloudCOSXMLService : QCloudService
 
 #pragma hidden super selectors
@@ -43,4 +43,21 @@
 + (QCloudCOSXMLService*) registerCOSXMLWithConfiguration:(QCloudServiceConfiguration*)configuration withKey:(NSString*)key;
 + (void) removeCOSXMLWithKey:(NSString*)key;
 
+/**
+根据Bukcet, Object来生成可以直接访问的URL。如果您的Bucket是私有读的话，那么访问的时候需要带上签名，反之则不需要。
+ 
+ 
+需要注意的是，如果通过该接口来生成带签名的URL的话，因为签名可能是在服务器生成的，该方法是同步方法，可能因为网络请求阻塞，建议不要在主线程里调用。
+
+此外, 传入的Object需要是URLEncode后的结果。
+ 
+ @param bucket 存储桶
+ @param object 存储对象, 请传入URL Encode后的结果
+ @param withAuthorization 是否需要签名，如果是私有读的Bucket，那么该URL需要带上签名才能访问
+ @return object URL
+ */
+- (NSString*)getURLWithBucket:(NSString*)bucket object:(NSString*)object withAuthorization:(BOOL)withAuthorization;
+
+- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request;
+
 @end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m

@@ -29,7 +29,7 @@
 #import "QCloudCOSXMLService+Private.h"
 #import "QCloudThreadSafeMutableDictionary.h"
 #import "QCLoudError.h"
-
+#import "QCloudGetPresignedURLRequest.h"
 
 QCloudThreadSafeMutableDictionary* QCloudCOSXMLServiceCache()
 {
@@ -82,6 +82,53 @@ + (QCloudCOSXMLService*) registerCOSXMLWithConfiguration:(QCloudServiceConfigura
     [QCloudCOSXMLServiceCache() setObject:cosxmlService  forKey:key];
     return cosxmlService;
 }
+- (NSString*)getURLWithBucket:(NSString *)bucket object:(NSString *)object withAuthorization:(BOOL)withAuthorization {
+    NSParameterAssert(bucket);
+    NSParameterAssert(object);
+    __block NSMutableString* resultURL = [[NSMutableString alloc] init];
+    NSString* bucketURL = [[self.configuration.endpoint serverURLWithBucket:bucket appID:self.configuration.appID] absoluteString];
+    [resultURL appendString:bucketURL];
+    [resultURL appendFormat:@"/%@",object];
+    if (withAuthorization) {
+        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+        NSMutableURLRequest* fakeURLRequest = [[NSMutableURLRequest alloc] init];
+        [fakeURLRequest setHTTPMethod:@"GET"];
+        [fakeURLRequest setURL:[NSURL URLWithString:resultURL]];
+        [self.configuration.signatureProvider signatureWithFields:nil request:nil urlRequest:fakeURLRequest compelete:^(QCloudSignature *signature, NSError *error) {
+            NSString* sign = signature.signature;
+            sign = QCloudURLEncodeUTF8(sign);
+            [resultURL appendFormat:@"?sign=%@",sign];
+            dispatch_semaphore_signal(semaphore);
+        }];
+        dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 5*NSEC_PER_SEC));
+    }
+    return [resultURL copy];
+}
+
+- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request {
 
+    request.runOnService = self;
+    NSError* error;
+    NSURLRequest* urlRequest = [request buildURLRequest:&error];
+    if (nil != error) {
+        [request onError:error];
+        return ;
+    }
+    __block NSString* requestURLString = urlRequest.URL.absoluteString;
+    [self loadCOSXMLAuthorizationForBiz:request urlRequest:urlRequest compelete:^(QCloudSignature *signature, NSError *error) {
+        NSString* authorizatioinString = signature.signature;
+        if ([requestURLString hasSuffix:@"&"] || [requestURLString hasSuffix:@"?"]) {
+             requestURLString = [requestURLString stringByAppendingString:authorizatioinString];
+        } else {
+            requestURLString = [requestURLString stringByAppendingFormat:@"?%@",authorizatioinString];
+        }
+       QCloudGetPresignedURLResult* result = [[QCloudGetPresignedURLResult alloc] init];
+        result.presienedURL = requestURLString;
+        if (request.finishBlock) {
+            request.finishBlock(result, nil);
+        }
+    }];
+    
+}
 
 @end

QCloudCOSXML/Classes/Base/QCloudCOSXMLVersion.m

@@ -0,0 +1,12 @@
+//
+//  QCloudRequestData+COSXMLVersion.h
+//  QCloudCOSXML
+//
+//  Created by erichmzhang(张恒铭) on 22/01/2018.
+//
+
+#import <QCloudCore/QCloudCore.h>
+
+@interface QCloudRequestData (COSXMLVersion)
+
+@end

QCloudCOSXML/Classes/Base/QCloudRequestData+COSXMLVersion.h

@@ -0,0 +1,12 @@
+//
+//  QCloudRequestData+COSXMLVersion.m
+//  QCloudCOSXML
+//
+//  Created by erichmzhang(张恒铭) on 22/01/2018.
+//
+
+#import "QCloudRequestData+COSXMLVersion.h"
+
+@implementation QCloudRequestData (COSXMLVersion)
+
+@end

QCloudCOSXML/Classes/Base/QCloudRequestData+COSXMLVersion.m

@@ -1,4 +1,10 @@
 //
+//  CASJobParameters.h
+//  CASJobParameters
+//
+//  Created by tencent
+//  Copyright (c) 2015年 tencent. All rights reserved.
+//
 //   ██████╗  ██████╗██╗      ██████╗ ██╗   ██╗██████╗     ████████╗███████╗██████╗ ███╗   ███╗██╗███╗   ██╗ █████╗ ██╗         ██╗      █████╗ ██████╗
 //  ██╔═══██╗██╔════╝██║     ██╔═══██╗██║   ██║██╔══██╗    ╚══██╔══╝██╔════╝██╔══██╗████╗ ████║██║████╗  ██║██╔══██╗██║         ██║     ██╔══██╗██╔══██╗
 //  ██║   ██║██║     ██║     ██║   ██║██║   ██║██║  ██║       ██║   █████╗  ██████╔╝██╔████╔██║██║██╔██╗ ██║███████║██║         ██║     ███████║██████╔╝
@@ -10,25 +16,24 @@
 //                                                                              _             __                 _                _
 //                                                                             (_)           / _|               | |              | |
 //                                                          ___  ___ _ ____   ___  ___ ___  | |_ ___  _ __    __| | _____   _____| | ___  _ __   ___ _ __ ___
-//                                                         / __|/ _ \\ '__\\ \\ / / |/ __/ _ \\ |  _/ _ \\| '__|  / _` |/ _ \\ \\ / / _ \\ |/ _ \\| '_ \\ / _ \\ '__/ __|
-//                                                         \\__ \\  __/ |   \\ V /| | (_|  __/ | || (_) | |    | (_| |  __/\\ V /  __/ | (_) | |_) |  __/ |  \\__
-//                                                         |___/\\___|_|    \\_/ |_|\\___\\___| |_| \\___/|_|     \\__,_|\\___| \\_/ \\___|_|\\___/| .__/ \\___|_|  |___/
+//                                                         / __|/ _ \ '__\ \ / / |/ __/ _ \ |  _/ _ \| '__|  / _` |/ _ \ \ / / _ \ |/ _ \| '_ \ / _ \ '__/ __|
+//                                                         \__ \  __/ |   \ V /| | (_|  __/ | || (_) | |    | (_| |  __/\ V /  __/ | (_) | |_) |  __/ |  \__
+//                                                         |___/\___|_|    \_/ |_|\___\___| |_| \___/|_|     \__,_|\___| \_/ \___|_|\___/| .__/ \___|_|  |___/
 //    ______ ______ ______ ______ ______ ______ ______ ______                                                                            | |
 //   |______|______|______|______|______|______|______|______|                                                                           |_|
 //
-#import <Foundation/Foundation.h>
-#import <QCloudCore/QCloudCoreVersion.h>
 
-#ifndef QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 1001
 
-//dependency
-//#if QCloudCoreModuleVersionNumber != 1001 
-//    #error "库QCloudCOSXML依赖QCloudCore最小版本号为0.1.1，当前引入的QCloudCore版本号过低，请及时升级后使用" 
-//#endif
-//
-FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleVersion;
-FOUNDATION_EXTERN NSString * const QCloudCOSXMLModuleName;
 
-#endif
+#import <Foundation/Foundation.h>
+#import <QCloudCore/QCloudCore.h>
+#import "QCloudCASTierEnum.h"
+
+NS_ASSUME_NONNULL_BEGIN
+@interface CASJobParameters : NSObject
+/**
+复原的过程类型配置信息
+*/
+@property (assign, nonatomic) QCloudCASTier tier;
+@end
+NS_ASSUME_NONNULL_END

QCloudCOSXML/Classes/Base/QCloudCOSXMLVersion.h renamed to QCloudCOSXML/Classes/Manager/CASJobParameters.h

@@ -0,0 +1,76 @@
+//
+//  CASJobParameters.m
+//  CASJobParameters
+//
+//  Created by tencent
+//  Copyright (c) 2015年 tencent. All rights reserved.
+//
+//   ██████╗  ██████╗██╗      ██████╗ ██╗   ██╗██████╗     ████████╗███████╗██████╗ ███╗   ███╗██╗███╗   ██╗ █████╗ ██╗         ██╗      █████╗ ██████╗
+//  ██╔═══██╗██╔════╝██║     ██╔═══██╗██║   ██║██╔══██╗    ╚══██╔══╝██╔════╝██╔══██╗████╗ ████║██║████╗  ██║██╔══██╗██║         ██║     ██╔══██╗██╔══██╗
+//  ██║   ██║██║     ██║     ██║   ██║██║   ██║██║  ██║       ██║   █████╗  ██████╔╝██╔████╔██║██║██╔██╗ ██║███████║██║         ██║     ███████║██████╔╝
+//  ██║▄▄ ██║██║     ██║     ██║   ██║██║   ██║██║  ██║       ██║   ██╔══╝  ██╔══██╗██║╚██╔╝██║██║██║╚██╗██║██╔══██║██║         ██║     ██╔══██║██╔══██╗
+//  ╚██████╔╝╚██████╗███████╗╚██████╔╝╚██████╔╝██████╔╝       ██║   ███████╗██║  ██║██║ ╚═╝ ██║██║██║ ╚████║██║  ██║███████╗    ███████╗██║  ██║██████╔╝
+//   ╚══▀▀═╝  ╚═════╝╚══════╝ ╚═════╝  ╚═════╝ ╚═════╝        ╚═╝   ╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝╚═╝╚═╝  ╚═══╝╚═╝  ╚═╝╚══════╝    ╚══════╝╚═╝  ╚═╝╚═════╝
+//
+//
+//                                                                              _             __                 _                _
+//                                                                             (_)           / _|               | |              | |
+//                                                          ___  ___ _ ____   ___  ___ ___  | |_ ___  _ __    __| | _____   _____| | ___  _ __   ___ _ __ ___
+//                                                         / __|/ _ \ '__\ \ / / |/ __/ _ \ |  _/ _ \| '__|  / _` |/ _ \ \ / / _ \ |/ _ \| '_ \ / _ \ '__/ __|
+//                                                         \__ \  __/ |   \ V /| | (_|  __/ | || (_) | |    | (_| |  __/\ V /  __/ | (_) | |_) |  __/ |  \__
+//                                                         |___/\___|_|    \_/ |_|\___\___| |_| \___/|_|     \__,_|\___| \_/ \___|_|\___/| .__/ \___|_|  |___/
+//    ______ ______ ______ ______ ______ ______ ______ ______                                                                            | |
+//   |______|______|______|______|______|______|______|______|                                                                           |_|
+//
+
+
+#import "CASJobParameters.h"
+
+
+
+NS_ASSUME_NONNULL_BEGIN
+@implementation CASJobParameters
+
+
+
++ (NSDictionary *)modelCustomPropertyMapper
+{
+  return @{
+      @"tier" :@"Tier",
+  };
+}
+
+
+- (BOOL)modelCustomTransformToDictionary:(NSMutableDictionary *)dic
+{
+
+    NSNumber* CASTierenumValue = dic[@"Tier"];
+    if (CASTierenumValue) {
+        NSString* value = QCloudCASTierTransferToString([CASTierenumValue intValue]);
+        if (value) {
+            dic[@"Tier"] = value;
+        }
+    }
+
+    return YES;
+}
+
+- (NSDictionary *)modelCustomWillTransformFromDictionary:(NSDictionary *)dic
+{
+    if (!dic) {
+        return dic;
+    }
+    NSMutableDictionary* transfromDic = [NSMutableDictionary dictionaryWithDictionary:dic];
+
+        NSString* CASTierenumValue = transfromDic[@"Tier"];
+        if (CASTierenumValue && [CASTierenumValue isKindOfClass:[NSString class]] && CASTierenumValue.length > 0) {
+            int value = QCloudCASTierDumpFromString(CASTierenumValue);
+            transfromDic[@"Tier"] = @(value);
+        }
+    return transfromDic;
+}
+
+@end
+
+
+NS_ASSUME_NONNULL_END

QCloudCOSXML/Classes/Manager/CASJobParameters.m

@@ -27,15 +27,15 @@
 
 #import <Foundation/Foundation.h>
 #import <QCloudCore/QCloudCore.h>
-#import "QCloudQCloudCOSXMLStatusEnum.h"
+#import "QCloudCOSXMLStatusEnum.h"
 #import "QCloudBucketReplicationDestination.h"
 
 NS_ASSUME_NONNULL_BEGIN
 @interface QCloudBucketReplicationRule : NSObject
 /**
     标志Rule是否生效
     */
-@property (assign, nonatomic) QCloudQCloudCOSXMLStatus status;
+@property (assign, nonatomic) QCloudCOSXMLStatus status;
 /**
     用来标注具体rule的名称
     */