# 5.7.0

karis-lixue · karis-lixue · commit 05590c0b8d11 · 2019-12-23T15:10:29.000+08:00
时机制
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
+# 5.7.0    
+时机制
+    
 # 5.6.9    
 - 编译警告修复
     
-# 5.6.8    
-- 修复swift工程调用sdk接口的警\- 修复sdk自身的警告
-    
 # 5.6.7    
 - 修复预签名徒步没有透传的bug
 -  修复swift工程中使用sdk的若干警告
diff --git a/QCloudCOSXML.podspec b/QCloudCOSXML.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
-s.version              = "5.6.9"
+s.version              = "5.7.0"
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
@@ -17,7 +17,7 @@ s.version              = "5.6.9"
   s.default_subspec = 'Default'
   s.subspec 'Default' do |default|
   default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
-    default.dependency "QCloudCore",'5.6.9'
+    default.dependency "QCloudCore",'5.7.0'
     end
   s.subspec 'Slim' do |slim|
   slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
diff --git a/QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.h b/QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.h
@@ -774,6 +774,8 @@ NS_ASSUME_NONNULL_BEGIN
  @endcode
  */
 - (void)GetBucketLogging:(QCloudGetBucketLoggingRequest *)request;
+
+
 - (void)PutBucketLogging:(QCloudPutBucketLoggingRequest *)request;
 
 - (void)GetBucketTagging:(QCloudGetBucketTaggingRequest *)request;
@@ -834,24 +836,24 @@ NS_ASSUME_NONNULL_BEGIN
 - (void) GetService:(QCloudGetServiceRequest*)request;
 
 
-//
-//- (void) PutBucketDomain:(QCloudPutBucketDomainRequest*)request;
-//
-//- (void) GetBucketDomain:(QCloudGetBucketDomainRequest*)request;
-//
-//- (void) PutBucketWebsite:(QCloudPutBucketWebsiteRequest*)request;
-//
-//- (void) GetBucketWebsite:(QCloudGetBucketWebsiteRequest*)request;
-//
-//- (void) DeleteBucketWebsite:(QCloudDeleteBucketWebsiteRequest*)request;
-//
-//    
-//-(void)PutBucketInventory:(QCloudPutBucketInventoryRequest *)request;
-//-(void)GetBucketInventory:(QCloudGetBucketInventoryRequest *)request;
-//    
-//-(void)DeleteBucketInventory:(QCloudDeleteBucketInventoryRequest *)request;
-//    
-//-(void)ListBucketInventory:(QCloudListBucketInventoryConfigurationsRequest *)request;
+
+- (void) PutBucketDomain:(QCloudPutBucketDomainRequest*)request;
+
+- (void) GetBucketDomain:(QCloudGetBucketDomainRequest*)request;
+
+- (void) PutBucketWebsite:(QCloudPutBucketWebsiteRequest*)request;
+
+- (void) GetBucketWebsite:(QCloudGetBucketWebsiteRequest*)request;
+
+- (void) DeleteBucketWebsite:(QCloudDeleteBucketWebsiteRequest*)request;
+
+    
+-(void)PutBucketInventory:(QCloudPutBucketInventoryRequest *)request;
+-(void)GetBucketInventory:(QCloudGetBucketInventoryRequest *)request;
+    
+-(void)DeleteBucketInventory:(QCloudDeleteBucketInventoryRequest *)request;
+    
+-(void)ListBucketInventory:(QCloudListBucketInventoryConfigurationsRequest *)request;
 
 - (void) PostObjectRestore:(QCloudPostObjectRestoreRequest*)request;
 - (void) ListObjectVersions:(QCloudListObjectVersionsRequest*)request;
diff --git a/QCloudCOSXML/Classes/Manager/model/QCloudInventoryConfiguration.h b/QCloudCOSXML/Classes/Manager/model/QCloudInventoryConfiguration.h
@@ -43,6 +43,11 @@ NS_ASSUME_NONNULL_BEGIN
 清单是否启用的标识。如果设置为 True，清单功能将生效；如果设置为 False，将不生成任何清单
 */
 @property (strong, nonatomic) NSString *isEnabled;
+/**
+ 是否在清单中包含对象版本：
+ 如果设置为 All，清单中将会包含所有对象版本，并在清单中增加 VersionId，IsLatest，DeleteMarker 这几个字段
+ 如果设置为 Current，则清单中不包含对象版本信息
+ */
 @property (assign, nonatomic) QCloudCOSIncludedObjectVersions includedObjectVersions;
 /**
 描述存放清单结果的信息
diff --git a/QCloudCOSXML/Classes/Manager/request/QCloudPutBucketDomainRequest.h b/QCloudCOSXML/Classes/Manager/request/QCloudPutBucketDomainRequest.h
@@ -29,9 +29,7 @@
 #import <QCloudCore/QCloudCore.h>
 @class QCloudDomainConfiguration;
 NS_ASSUME_NONNULL_BEGIN
-/**
-域名配置的规则
-*/
+
 @interface QCloudPutBucketDomainRequest : QCloudBizHTTPRequest
 /**
 域名配置的规则
diff --git a/QCloudCOSXML/Classes/Manager/request/QCloudPutBucketInventoryRequest.h b/QCloudCOSXML/Classes/Manager/request/QCloudPutBucketInventoryRequest.h
@@ -37,6 +37,11 @@ NS_ASSUME_NONNULL_BEGIN
 说明日志记录配置的状态
 */
 @property (strong, nonatomic) QCloudInventoryConfiguration *inventoryConfiguration;
+
+/**
+ 清单任务的名称。缺省值：None；合法字符：a-z，A-Z，0-9，-，_，.
+ */
+
 @property (strong, nonatomic) NSString *inventoryID;
 /**
 存储桶名
diff --git a/QCloudCOSXML/Classes/Manager/request/QCloudPutBucketTaggingRequest.h b/QCloudCOSXML/Classes/Manager/request/QCloudPutBucketTaggingRequest.h
@@ -30,6 +30,10 @@
 @class QCloudBucketTagging;
 NS_ASSUME_NONNULL_BEGIN
 @interface QCloudPutBucketTaggingRequest : QCloudBizHTTPRequest
+
+/**
+ 标签集合
+ */
 @property (strong, nonatomic) QCloudBucketTagging *taggings;
 /**
 存储桶名
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.h
@@ -5,7 +5,7 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 506009
+#define QCloudCOSXMLModuleVersionNumber 507000
 
 //dependency
 
diff --git a/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m b/QCloudCOSXML/Classes/QCloudCOSXMLVersion.m
@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"5.6.9";
+NSString * const QCloudCOSXMLModuleVersion = @"5.7.0";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end
diff --git a/QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m b/QCloudCOSXML/Classes/Transfer/request/QCloudCOSXMLUploadObjectRequest.m
@@ -139,12 +139,12 @@ - (void) continueMultiUpload:(QCloudListPartsResult*)existParts
         [existMap setObject:part forKey:part.partNumber];
     }
     QCloudLogDebug(@"SERVER EXIST PARTS %@", [existParts qcloud_modelToJSONString]);
-
+    
     NSMutableArray* restParts = [NSMutableArray new];
     for (QCloudFileOffsetBody* offsetBody in allParts) {
         NSString* key = [@(offsetBody.index+1) stringValue];
         QCloudMultipartUploadPart* part = [existMap objectForKey:key];
-     
+        
         if (!part) {
             [restParts addObject:offsetBody];
         } else {
@@ -158,10 +158,10 @@ - (void) continueMultiUpload:(QCloudListPartsResult*)existParts
             [_uploadParts addObject:info];
         }
     }
-
+    
     if (!isChange) {
         if (restParts.count == 0) {
-             [self finishUpload:self.uploadId];
+            [self finishUpload:self.uploadId];
         }else{
             [self uploadOffsetBodys:restParts];
         }
@@ -171,7 +171,7 @@ - (void) continueMultiUpload:(QCloudListPartsResult*)existParts
         if (uploadedSize == self.dataContentLength) {
             [self finishUpload:self.uploadId];
         } else {
-        //开始分片
+            //开始分片
             [self uploadOffsetBodys:[self getFileLocalUploadParts]];
         }
     }
@@ -187,7 +187,7 @@ -(void)getContinueInfo:(NSArray *)existParts{
     if ([info.partNumber integerValue]!=1){
         return;
     }
-
+    
     for (i = 0; i<existParts.count; i++) {
         QCloudMultipartUploadPart  *part1 = existParts[i];
         QCloudMultipartInfo* info1 = [QCloudMultipartInfo new];
@@ -202,7 +202,7 @@ -(void)getContinueInfo:(NSArray *)existParts{
         if (([part1.partNumber integerValue]+1)!= [part2.partNumber integerValue]) {
             break;
         }
-       
+        
     }
     startPartNumber = _uploadParts.count;
     
@@ -214,6 +214,7 @@ - (void) resumeUpload
 {
     QCloudListMultipartRequest* request = [QCloudListMultipartRequest new];
     request.priority = self.priority;
+    request.timeoutInterval = self.timeoutInterval;
     request.object = self.object;
     request.regionName = self.regionName;
     request.bucket = self.bucket;
@@ -223,7 +224,7 @@ - (void) resumeUpload
     __weak typeof(self) weakSelf = self;
     [request setFinishBlock:^(QCloudListPartsResult * _Nonnull result,
                               NSError * _Nonnull error) {
-
+        
         __strong typeof(weakSelf)strongSelf = weakSelf;
         __strong typeof(weakRequest)strongRequst = weakRequest;
         [strongSelf.requstMetricArray addObject: @{[NSString stringWithFormat:@"%@",strongRequst]:weakRequest.benchMarkMan.tastMetrics}];
@@ -252,7 +253,7 @@ - (void) fakeStart {
             //开始分片上传的时候，上传的起始位置是0
             uploadedSize = 0;
             startPartNumber = 0;
-           [self startMultiUpload];
+            [self startMultiUpload];
         } else {
             [self startSimpleUpload];
         }
@@ -269,8 +270,9 @@ - (void) startSimpleUpload
     __weak typeof(self) weakSelf = self;
     __weak typeof(request)weakRequest  = request;
     request.retryPolicy.delegate = self;
+    request.timeoutInterval = self.timeoutInterval;
     request.finishBlock = ^(id outputObject, NSError *error) {
-
+        
         __strong typeof(weakSelf)strongSelf = weakSelf;
         __strong typeof(weakRequest)strongRequst = weakRequest;
         [strongSelf.requstMetricArray addObject: @{[NSString stringWithFormat:@"%@",strongRequst]:weakRequest.benchMarkMan.tastMetrics}];
@@ -284,7 +286,7 @@ - (void) startSimpleUpload
                 result.versionID = outputObject[@"x-cos-version-id"];
             }
             
-
+            
             result.key = weakSelf.object;
             result.bucket = weakSelf.bucket;
             result.location = QCloudCOSXMLObjectLocation(weakSelf.transferManager.configuration.endpoint,
@@ -320,6 +322,7 @@ - (void) startSimpleUpload
 - (void) startMultiUpload {
     _uploadParts = [NSMutableArray new];
     QCloudInitiateMultipartUploadRequest* uploadRequet = [QCloudInitiateMultipartUploadRequest new];
+    uploadRequet.timeoutInterval = self.timeoutInterval;
     uploadRequet.bucket = self.bucket;
     uploadRequet.regionName = self.regionName;
     uploadRequet.object = self.object;
@@ -338,10 +341,10 @@ - (void) startMultiUpload {
     uploadRequet.priority = self.priority;
     __weak typeof(uploadRequet)weakRequest  = uploadRequet;
     __weak typeof(self) weakSelf = self;
-
+    
     [uploadRequet setFinishBlock:^(QCloudInitiateMultipartUploadResult * _Nonnull result,
                                    NSError * _Nonnull error) {
-
+        
         __strong typeof(weakSelf)strongSelf = weakSelf;
         __strong typeof(weakRequest)strongRequst = weakRequest;
         [strongSelf.requstMetricArray addObject: @{[NSString stringWithFormat:@"%@",strongRequst]:weakRequest.benchMarkMan.tastMetrics}];
@@ -436,9 +439,10 @@ - (void) uploadOffsetBodys:(NSArray<QCloudFileOffsetBody*>*)allParts
     dispatch_resume(_queueSource);
     for (int i = 0; i < allParts.count; i++) {
         __block QCloudFileOffsetBody* body = allParts[i];
-
+        
         QCloudUploadPartRequest* request = [QCloudUploadPartRequest new];
         request.bucket = self.bucket;
+        request.timeoutInterval = self.timeoutInterval;
         request.regionName = self.regionName;
         request.object = self.object;
         request.priority = QCloudAbstractRequestPriorityLow;
@@ -468,7 +472,7 @@ - (void) uploadOffsetBodys:(NSArray<QCloudFileOffsetBody*>*)allParts
             if (!weakSelf) {
                 return ;
             }
-
+            
             __strong typeof(weakSelf)strongSelf = weakSelf;
             __strong typeof(weakRequest)strongRequst = weakRequest;
             [strongSelf.requstMetricArray addObject: @{[NSString stringWithFormat:@"%@",strongRequst]:weakRequest.benchMarkMan.tastMetrics}];
@@ -483,7 +487,7 @@ - (void) uploadOffsetBodys:(NSArray<QCloudFileOffsetBody*>*)allParts
             } else{
                 
                 if(self.enableMD5Verification) {
-                
+                    
                     NSString* MD5FromeETag = [outputObject.eTag substringWithRange:NSMakeRange(1, outputObject.eTag.length-2)];
                     NSString* localMD5String = [QCloudEncrytFileOffsetMD5(body.fileURL.path, body.offset, body.sliceLength) lowercaseString];
                     if (![MD5FromeETag isEqualToString:localMD5String]) {
@@ -562,6 +566,7 @@ - (void) finishUpload:(NSString*)uploadId
     complete.regionName = self.regionName;
     complete.customHeaders = [self.customHeaders mutableCopy];
     complete.retryPolicy.delegate = self;
+    complete.timeoutInterval = self.timeoutInterval;
     QCloudCompleteMultipartUploadInfo* info = [QCloudCompleteMultipartUploadInfo new];
     [self.uploadParts sortUsingComparator:^NSComparisonResult(QCloudMultipartInfo*  _Nonnull obj1,
                                                               QCloudMultipartInfo*  _Nonnull obj2) {
@@ -579,9 +584,9 @@ - (void) finishUpload:(NSString*)uploadId
     complete.parts = info;
     
     __weak typeof(self) weakSelf = self;
-   __weak typeof(complete)weakRequest  = complete;
+    __weak typeof(complete)weakRequest  = complete;
     [complete setFinishBlock:^(QCloudUploadObjectResult* outputObject, NSError *error) {
-
+        
         __strong typeof(weakSelf)strongSelf = weakSelf;
         __strong typeof(weakRequest)strongRequst = weakRequest;
         [strongSelf.requstMetricArray addObject: @{[NSString stringWithFormat:@"%@",strongRequst]:weakRequest.benchMarkMan.tastMetrics}];
@@ -602,7 +607,7 @@ - (void) finishUpload:(NSString*)uploadId
     
     [self.requestCacheArray addPointer:(__bridge void * _Nullable)(complete)];
     [self.transferManager.cosService CompleteMultipartUpload:complete];
-
+    
 }
 
 
@@ -641,15 +646,15 @@ - (void) cancel
     }
     QCloudLogDebug(@"cancelledRequestIDs :%@",cancelledRequestIDs);
     QCloudLogDebug(@"begin cancelRequestsWithID transferManager: %@ sessionManager: %@ cosService: %@ ",self.transferManager,self.transferManager.cosService,self.transferManager.cosService.sessionManager);
-
+    
     [self.transferManager.cosService.sessionManager cancelRequestsWithID:cancelledRequestIDs];
 }
 - (QCloudCOSXMLUploadObjectResumeData) cancelByProductingResumeData:(NSError *__autoreleasing *)error
 {
     QCloudLogDebug(@"cancelByProductingResumeData begin");
     //延迟取消 让函数先返回
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-
+        
         QCloudLogDebug(@"⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️ ：cancel");
         [self cancel];
     });
@@ -684,12 +689,12 @@ - (QCloudCOSXMLUploadObjectResumeData) productingReqsumeData:(NSError* __autorel
         return nil;
     }
     [_recursiveLock lock];
-        NSURL* url = (NSURL*)self.body;
-        QCloudUniversalPath *universalPath = [QCloudUniversalPathFactory universalPathWithURL:url];
-        self.body = universalPath;
-        NSData* info = [self qcloud_modelToJSONData];
-        QCloudLogDebug(@"RESUME data %@",info);
-        self.body = url;
+    NSURL* url = (NSURL*)self.body;
+    QCloudUniversalPath *universalPath = [QCloudUniversalPathFactory universalPathWithURL:url];
+    self.body = universalPath;
+    NSData* info = [self qcloud_modelToJSONData];
+    QCloudLogDebug(@"RESUME data %@",info);
+    self.body = url;
     [_recursiveLock unlock];
     return info;
 }
@@ -712,6 +717,7 @@ - (void) abort:(QCloudRequestFinishBlock _Nullable)finishBlock
             abortRequest.uploadId = self.uploadId;
             abortRequest.finishBlock = finishBlock;
             abortRequest.priority = self.priority;
+            abortRequest.timeoutInterval = self.timeoutInterval;
             self.uploadId = nil;
             [self.transferManager.cosService AbortMultipfartUpload:abortRequest];
         } else {
diff --git a/QCloudCore.podspec b/QCloudCore.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
-s.version              = "5.6.9"
+s.version              = "5.7.0"
 
   s.summary          = "QCloudCore--腾讯云iOS-SDK Foundation"
 
diff --git a/QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudAbstractRequest.h b/QCloudCore/Classes/Base/QCLOUDRestNet/CoreRequest/QCloudAbstractRequest.h
@@ -32,7 +32,7 @@ typedef void (^QCloudRequestDownProcessBlock)(int64_t bytesDownload, int64_t tot
 @property (nonatomic, assign) QCloudAbstractRequestPriority priority;
 @property (nonatomic, strong, readonly) QCloudHttpMetrics* _Nullable benchMarkMan;
 @property (atomic, assign, readonly) BOOL finished;
-
+@property (nonatomic,assign)NSTimeInterval timeoutInterval;
 /**
   协议执行结果向外通知的委托（delegate）主要包括成功和失败两种情况。与Block方式并存，当两者都设置的时候都会通知。
  */
diff --git a/QCloudCore/Classes/Base/QCLOUDRestNet/SessionSupport/QCloudHTTPSessionManager.m b/QCloudCore/Classes/Base/QCLOUDRestNet/SessionSupport/QCloudHTTPSessionManager.m
diff --git a/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudService.m b/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudService.m
diff --git a/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.h b/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.h
diff --git a/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.m b/QCloudCore/Classes/Base/QCloudClientBase/Request/QCloudServiceConfiguration.m
diff --git a/QCloudCore/Classes/QCloudCoreVersion.h b/QCloudCore/Classes/QCloudCoreVersion.h
diff --git a/QCloudCore/Classes/QCloudCoreVersion.m b/QCloudCore/Classes/QCloudCoreVersion.m
