# 5.5.4

- 支持自定义Request的Region的时候支持校验
 - ACL设置增加Default有效值

Author: karisli

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.5.4    
+- 支持自定义Request的Region的时候支持校验 
+ - ACL设置增加Default有效值
+    
 # 5.5.3    
 - 修复分块复制过程中，region不同可能导致的问题。
 - 获取签名时增加超时机制，如果15秒内未能给出签名，则抛出错误。

QCloudCOSXML.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
-s.version              = "5.5.3"
+s.version              = "5.5.4"
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
 
   s.homepage         = "https://cloud.tencent.com/"
@@ -9,12 +9,12 @@ s.version              = "5.5.3"
   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.5.3'
+  s.dependency "QCloudCore",'5.5.4'
   s.static_framework = true
 
   s.subspec 'Transfer' do |sbt|
     sbt.source_files = 'QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/*'
-    sbt.dependency "QCloudCore",'5.5.3'
+    sbt.dependency "QCloudCore",'5.5.4'
  #   sbt.static_framework=true
   end
 end

QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.h

@@ -0,0 +1,17 @@
+//
+//  QCloudAbstractRequest+Quality.h
+//  QCloudCOSXML
+//
+//  Created by erichmzhang(张恒铭) on 2018/8/24.
+//
+
+#import <QCloudCore/QCloudCore.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QCloudAbstractRequest (Quality)
+
+
+@end
+
+NS_ASSUME_NONNULL_END

QCloudCOSXML/Classes/Base/QCloudAbstractRequest+Quality.m

@@ -0,0 +1,49 @@
+//
+//  QCloudAbstractRequest+Quality.m
+//  QCloudCOSXML
+//
+//  Created by erichmzhang(张恒铭) on 2018/8/24.
+//
+
+#import "QCloudAbstractRequest+Quality.h"
+#import <objc/runtime.h>
+#import "QualityDataUploader.h"
+@implementation QCloudAbstractRequest (Quality)
++ (void) load{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [self exchangeImplementation];
+    });
+}
+
++ (void)exchangeImplementation {
+    Class class = [self class];
+    SEL originalSelector = @selector(__notifySuccess:);
+    SEL swizzledSelector = @selector(__quality__notifySuccess:);
+    Method originNotifySuccessMethod = class_getInstanceMethod(class, @selector(__notifySuccess:));
+    Method swizzedNotifySuccessMethod = class_getInstanceMethod(class, @selector(__quality__notifySuccess:));
+
+        method_exchangeImplementations(originNotifySuccessMethod, swizzedNotifySuccessMethod);
+
+    
+    Method originNotifyErrorMethod = class_getInstanceMethod(class, @selector(__notifyError:));
+    Method swizzedNotifyErrorMethod = class_getInstanceMethod(class, @selector(__quality__notifyError:));
+    method_exchangeImplementations(originNotifyErrorMethod, swizzedNotifyErrorMethod);
+    
+    
+    
+}
+
+
+- (void)__quality__notifySuccess:(id)object {
+    [self __quality__notifySuccess:(id)object];
+    [QualityDataUploader trackRequestSuccessWithType:self.class];
+}
+
+- (void)__quality__notifyError:(NSError *)error {
+    [self __quality__notifyError:error];
+    [QualityDataUploader trackRequestFailWithError:error];
+}
+
+
+@end

QCloudCOSXML/Classes/Base/QCloudCOSXMLEndPoint.m

@@ -36,8 +36,7 @@ - (NSString *)formattedBucket:(NSString*)bucket withAPPID:(NSString*)APPID {
     return bucket;
 }
 
-- (NSURL*) serverURLWithBucket:(NSString *)bucket appID:(NSString *)appID
-{
+-(NSURL *)serverURLWithBucket:(NSString *)bucket appID:(NSString *)appID regionName:(NSString *)regionName{
     if (self.serverURLLiteral) {
         return self.serverURLLiteral;
     }
@@ -55,7 +54,13 @@ - (NSURL*) serverURLWithBucket:(NSString *)bucket appID:(NSString *)appID
     }
 
     NSString* formattedBucketName = [self formattedBucket:bucket withAPPID:appID];
-    NSURL* serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@-%@.cos.%@.%@",scheme,formattedBucketName,appID,self.regionName,self.serviceName]];
+    NSString *regionNametmp = nil;
+    if (regionName) {
+        regionNametmp = regionName;
+    }else{
+        regionNametmp = self.regionName;
+    }
+    NSURL* serverURL = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@-%@.cos.%@.%@",scheme,formattedBucketName,appID,regionNametmp,self.serviceName]];
     return serverURL;
 }
 
@@ -71,7 +76,6 @@ - (void)setRegionName:(QCloudRegion)regionName {
     }
     _regionName = regionName;
 }
-
 - (id)copyWithZone:(NSZone *)zone {
     QCloudCOSXMLEndPoint* endpoint = [super copyWithZone:nil];
     endpoint.regionName = self.regionName;

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.h

@@ -0,0 +1,13 @@
+//
+//  QCloudCOSXML+Quality.h
+//  QCloudCOSXML
+//
+//  Created by erichmzhang(张恒铭) on 2018/8/23.
+//
+
+
+#import <Foundation/Foundation.h>
+#import "QCloudCOSXMLService.h"
+@interface QCloudCOSXMLService (Quality)
+
+@end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService+Quality.m

@@ -0,0 +1,47 @@
+//
+//  QCloudCOSXML+Quality.m
+//  QCloudCOSXML
+//
+//  Created by erichmzhang(张恒铭) on 2018/8/23.
+//
+
+#import "QCloudCOSXMLService+Quality.h"
+#import <objc/runtime.h>
+#import <QCloudCore/MTA.h>
+#import <QCloudCore/MTAConfig.h>
+#import <QCloudCore/MTACrashReporter.h>
+#import <QCloudCore/QualityAssuranceDefine.h>
+#import <QCloudCore/QCloudCore.h>
+#import <QCloudCore/QCloudLogger.h>
+@implementation QCloudCOSXMLService (Quality)
+
++ (void)load {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [self changeImplementation];
+    });
+    
+}
+
++ (void) changeImplementation {
+    Class class = object_getClass((id)self);
+    Method originMethod = class_getClassMethod(class, @selector(registerDefaultCOSXMLWithConfiguration:));
+    Method replacedMethod = class_getClassMethod(class,  @selector(Quality_registerDefaultCOSXMLWithConfiguration:));
+    method_exchangeImplementations(originMethod, replacedMethod);
+    
+}
+
++ (QCloudCOSXMLService*) Quality_registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration*)configuration {
+    id result = [self Quality_registerDefaultCOSXMLWithConfiguration:configuration];
+    [self initMTA];
+    return result;
+}
+
+
++ (void) initMTA {
+    QCloudLogDebug(@"Quality assurence service start");
+    TACMTAConfig* config =  [TACMTAConfig getInstance];
+    config.reportStrategy = kQAUploadStrategy;
+    [TACMTA startWithAppkey:kQAccount];
+}
+@end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.h

@@ -65,6 +65,6 @@
  @param withAuthorization 是否需要签名，如果是私有读的Bucket，那么该URL需要带上签名才能访问
  @return object URL
  */
-- (NSString*)getURLWithBucket:(NSString*)bucket object:(NSString*)object withAuthorization:(BOOL)withAuthorization;
+- (NSString*)getURLWithBucket:(NSString*)bucket object:(NSString*)object withAuthorization:(BOOL)withAuthorization regionName:(NSString *)regionName;
 
 @end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m

@@ -100,11 +100,11 @@ + (QCloudCOSXMLService*) registerCOSXMLWithConfiguration:(QCloudServiceConfigura
     [QCloudCOSXMLServiceCache() setObject:cosxmlService  forKey:key];
     return cosxmlService;
 }
-- (NSString*)getURLWithBucket:(NSString *)bucket object:(NSString *)object withAuthorization:(BOOL)withAuthorization {
+- (NSString*)getURLWithBucket:(NSString *)bucket object:(NSString *)object withAuthorization:(BOOL)withAuthorization regionName:(NSString*)regionName {
     NSParameterAssert(bucket);
     NSParameterAssert(object);
     __block NSMutableString* resultURL = [[NSMutableString alloc] init];
-    NSString* bucketURL = [[self.configuration.endpoint serverURLWithBucket:bucket appID:self.configuration.appID] absoluteString];
+    NSString* bucketURL = [[self.configuration.endpoint serverURLWithBucket:bucket appID:self.configuration.appID regionName:regionName] absoluteString];
     [resultURL appendString:bucketURL];
     [resultURL appendFormat:@"/%@",object];
     if (withAuthorization) {

QCloudCOSXML/Classes/Base/QCloudCOSXMLServiceUtilities.h

@@ -8,4 +8,4 @@
 
 #import <Foundation/Foundation.h>
 #import <QCloudCore/QCloudCore.h>
-FOUNDATION_EXTERN NSString* QCloudCOSXMLObjectLocation(QCloudEndPoint* endpoint , NSString* appID,NSString* bucket, NSString* object);
+FOUNDATION_EXTERN NSString* QCloudCOSXMLObjectLocation(QCloudEndPoint* endpoint , NSString* appID,NSString* bucket, NSString* object,NSString *regionName);