架构更改和增加了脚手架工具

Author: erichmzhang

QCloudCOSXML/Classes/QCloudCOSXMLService+Configuration.m

@@ -44,7 +44,7 @@ - (instancetype) initWithConfiguration:(QCloudServiceConfiguration *)configurati
     return self;
 }
 
-- (void) loadAuthorizationForBiz:(QCloudBizHTTPRequest *)bizRequest urlRequest:(NSURLRequest *)urlrequest compelete:(QCloudHTTPAuthentationContinueBlock)cotinueBlock
+- (void) loadAuthorizationForBiz:(QCloudBizHTTPRequest *)bizRequest urlRequest:(NSMutableURLRequest *)urlrequest compelete:(QCloudHTTPAuthentationContinueBlock)cotinueBlock
 {
     [self loadCOSXMLAuthorizationForBiz:bizRequest urlRequest:urlrequest compelete:cotinueBlock];
 }

QCloudCOSXML/Classes/QCloudCOSXMLUploadObjectRequest.m

@@ -431,7 +431,7 @@ - (void) cancel
     if (NULL != _queueSource) {
         dispatch_source_cancel(_queueSource);
     }
-    for (QCloudBizHTTPRequest* request  in self.requestCacheArray) {
+    for (QCloudBizHTTPRequest* request  in [self.requestCacheArray copy]) {
         [request cancel];
     }
 }

QCloudCOSXML/Classes/auto-generation/QCloudUploadPartRequest+Custom.h

@@ -29,5 +29,5 @@
 #import <Foundation/Foundation.h>
 #import "QCloudUploadPartRequest.h"
 @interface QCloudUploadPartRequest (Custom)
-- (BOOL) customBuildRequestData:(NSError *__autoreleasing *)error;
+
 @end

QCloudCOSXML/Classes/auto-generation/QCloudUploadPartRequest+Custom.m

@@ -27,13 +27,6 @@
 #import "QCloudUploadPartRequest+Custom.h"
 #import "QCloudUploadpartRequestRetryHandler.h"
 @implementation  QCloudUploadPartRequest (Custom)
-- (NSMutableURLRequest*) cachedBuildURLRequest:(NSError* __autoreleasing*)error
-{
-    NSMutableURLRequest* request = [super cachedBuildURLRequest:error];
-    request.timeoutInterval = 60;
-    return request;
-    
-}
 
 - (QCloudHTTPRetryHanlder*)retryPolicy {
     QCloudUploadPartRequestRetryHandler* retryHandler =  [[QCloudUploadPartRequestRetryHandler alloc] initWithMaxCount:3 sleepTime:1];

QCloudCOSXML/README.md

@@ -246,6 +246,42 @@ SDK中的请求需要用到签名，以确访问的用户的身份，也保障
 
 ```
 
+其实到这一步，您已经可以生成签名正常使用SDK里面的接口。但为了方便您实现临时签名，从服务器端获取tempSecretKey等临时签名需要的信息，我们提供了脚手架工具可供使用。您可以依照前面的代码来生成签名，也可以通过我们的脚手架工具QCloudCredentailFenceQueue来方便地获取临时签名。QCloudCredentailFenceQueue提供了栅栏机制，也就是说您使用QCloudCredentailFenceQueue去获取签名的话，所有需要获取签名的请求会等待签名完成后再执行，免去了自己管理异步过程的烦恼。   
+使用QCloudCredentailFenceQueue，我们需要先生成一个实例。
+```objective-c
+//AppDelegate.m
+//AppDelegate需遵循QCloudCredentailFenceQueueDelegate协议
+//
+- (BOOL)application:(UIApplication * )application didFinishLaunchingWithOptions:(NSDictionary * )launchOptions {
+    // init step
+    self.credentialFenceQueue = [QCloudCredentailFenceQueue new];
+    self.credentialFenceQueue.delegate = self;
+    return YES;
+}
+```   
+然后调用QCloudCredentailFenceQueue的类需要遵循QCloudCredentailFenceQueueDelegate并实现协议内定义的方法：
+```objective-c
+- (void) fenceQueue:(QCloudCredentailFenceQueue * )queue requestCreatorWithContinue:(QCloudCredentailFenceQueueContinue)continueBlock
+```
+当通过QCloudCredentailFenceQueue去获取签名时，所有需要签名的SDK里的请求都会等待该协议定义的方法内拿到了签名所需的参数并生成有效的签名后执行。请看以下例子
+```objective-c
+//AppDelegate.m
+- (void) fenceQueue:(QCloudCredentailFenceQueue * )queue requestCreatorWithContinue:(QCloudCredentailFenceQueueContinue)continueBlock
+{
+   QCloudCredential* credential = [QCloudCredential new];
+	 //在这里可以同步过程从服务器获取临时签名需要的secretID,secretKey,expiretionDate和token参数
+   credential.secretID = @"****";
+   credential.secretKey = @"****";
+   credential.experationDate = [NSDate dateWithTimeIntervalSince1970:1504183628];
+   credential.token = @"****";
+   QCloudAuthentationV5Creator* creator = [[QCloudAuthentationV5Creator alloc] initWithCredential:credential];
+   continueBlock(creator, nil);
+}
+
+```   
+至此，就可以通过我们提供的脚手架工具来生成临时签名了。当然您也可以自己去实现具体的签名过程
+
+
 
 
 ## 存储桶操作

QCloudCore/Classes/QCLOUDRestNet/CoreRequest/QCloudHTTPRequest.h

@@ -78,8 +78,6 @@ typedef void(^QCloudHTTPRequestConfigure)(QCloudRequestSerializer* requestSerial
 
 - (void) setConfigureBlock:(void(^)(QCloudRequestSerializer* requestSerializer, QCloudResponseSerializer* responseSerializer))configBlock;
 
-- (void) clearBuildCache;
-- (NSMutableURLRequest*) cachedBuildURLRequest:(NSError* __autoreleasing*)error;
 /**
  构架RequestData，加载自定义的参数
  */
@@ -119,7 +117,7 @@ typedef void(^QCloudHTTPRequestConfigure)(QCloudRequestSerializer* requestSerial
 
 
 
-- (NSURLRequest*) prepareInvokeURLRequest:(NSURLRequest *)urlRequest error:(NSError* __autoreleasing*)error;
+- (BOOL ) prepareInvokeURLRequest:(NSMutableURLRequest*)urlRequest error:(NSError* __autoreleasing*)error;
 @end
 
 

QCloudCore/Classes/QCLOUDRestNet/CoreRequest/QCloudHTTPRequest.m

@@ -128,29 +128,6 @@ - (void) clearBuildCache
     _cachedURLRequestBuildError = nil;
 }
 
-- (NSMutableURLRequest*) cachedBuildURLRequest:(NSError* __autoreleasing*)error
-{
-    NSError* localError = nil;
-    if (self.cachedURLRequestBuildError) {
-        if (NULL != error) {
-            *error = localError;
-        }
-        return nil;
-    }
-    if (_cachedURLRequest) {
-        return _cachedURLRequest;
-    } else {
-        _cachedURLRequest = [[self buildURLRequest:&localError] mutableCopy];
-        if (localError) {
-            if (NULL != error) {
-                *error = localError;
-            }
-        }
-        return _cachedURLRequest;
-    }
-}
-
-
 - (NSURLRequest*) buildURLRequest:(NSError* __autoreleasing*)error
 {
     [self.benchMarkMan benginWithKey:kRNBenchmarkRTT];
@@ -218,9 +195,9 @@ - (void) onReciveRespone:(NSHTTPURLResponse *)response data:(NSData *)data
     }
 }
 
-- (NSURLRequest*) prepareInvokeURLRequest:(NSURLRequest *)urlRequest error:(NSError* __autoreleasing*)error
+- (BOOL) prepareInvokeURLRequest:(NSMutableURLRequest*)urlRequest error:(NSError* __autoreleasing*)error
 {
-    return urlRequest;
+    return YES;
 }
 
 - (void) cancel

QCloudCore/Classes/QCLOUDRestNet/CoreRequest/Serializer/QCloudResponseSerializer.m

@@ -93,6 +93,12 @@ QCloudResponseSerializerBlock QCloudAcceptRespnseCodeBlock(NSSet* acceptCode, Cl
                     } else {
                         userInfo = map;
                     }
+                } else if ([contentType.lowercaseString containsString:@"application/xml"]) {
+                    QCloudXMLDictionaryParser* parser = [QCloudXMLDictionaryParser new];
+                    NSDictionary* output = [parser dictionaryWithData:inputData];
+                    if (output) {
+                        userInfo = output;
+                    }
                 }
             }
 

QCloudCore/Classes/QCLOUDRestNet/DNSCache/QCloudHttpDNS.h

@@ -31,7 +31,7 @@ extern NSString* const kQCloudHttpDNSHost;
       @param request 需要被重定向的URLRequest
       @return 如果改URLRequest原始指向的URL中的host对应的IP已经被解析了，则进行重定向操作，如果没有直接返回原始URLReqest
  */
-- (NSURLRequest*) resolveURLRequestIfCan:(NSURLRequest*)request;
+- (NSMutableURLRequest*) resolveURLRequestIfCan:(NSMutableURLRequest*)request;
 
 /**
    判断一个IP是否是被解析出来，且被信任的

QCloudCore/Classes/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m

@@ -89,7 +89,7 @@ - (NSString*) queryIPForHost:(NSString*)host
     }
     return nil;
 }
-- (NSURLRequest*) resolveURLRequestIfCan:(NSURLRequest*)request
+- (NSMutableURLRequest*) resolveURLRequestIfCan:(NSMutableURLRequest*)request
 {
     if (!request) {
         return request;