6.4.6

Author: garenwang

CHANGELOG.md

@@ -1,5 +1,8 @@
+# 6.4.6    
+支持自定义网络
+
 # 6.4.5    
-1、安全漏洞修复
+1、修复安全漏洞
 
 # 6.4.4  
 1、增加上传接口取消时类型保护
@@ -12,6 +15,7 @@
 
 # 6.4.1    
 1、支持cos请求使用单临时秘钥。2、新增元数据接口。3、修复一直问题。
+
 
 # 6.4.0    
 1、修改getBucket接口漏洞

Podfile.lock

@@ -1,22 +1,22 @@
 PODS:
   - GMOpenSSL (2.2.9)
-  - QCloudCore (6.4.5):
-    - QCloudCore/Default (= 6.4.5)
-  - QCloudCore/Default (6.4.5):
-    - QCloudTrack/Beacon (= 6.4.5)
-  - QCloudCOSXML (6.4.5):
-    - QCloudCOSXML/Default (= 6.4.5)
-  - QCloudCOSXML/Default (6.4.5):
-    - QCloudCore (= 6.4.5)
-  - QCloudQuic (6.3.9):
-    - QCloudQuic/Default (= 6.3.9)
-  - QCloudQuic/Default (6.3.9)
-  - QCloudTrack (6.4.5):
-    - QCloudTrack/Default (= 6.4.5)
-  - QCloudTrack/Beacon (6.4.5)
-  - QCloudTrack/Cls (6.4.5):
+  - QCloudCore (6.4.6):
+    - QCloudCore/Default (= 6.4.6)
+  - QCloudCore/Default (6.4.6):
+    - QCloudTrack/Beacon (= 6.4.6)
+  - QCloudCOSXML (6.4.6):
+    - QCloudCOSXML/Default (= 6.4.6)
+  - QCloudCOSXML/Default (6.4.6):
+    - QCloudCore (= 6.4.6)
+  - QCloudQuic (6.4.1):
+    - QCloudQuic/Default (= 6.4.1)
+  - QCloudQuic/Default (6.4.1)
+  - QCloudTrack (6.4.6):
+    - QCloudTrack/Default (= 6.4.6)
+  - QCloudTrack/Beacon (6.4.6)
+  - QCloudTrack/Cls (6.4.6):
     - TencentCloudLogProducer
-  - QCloudTrack/Default (6.4.5)
+  - QCloudTrack/Default (6.4.6)
   - TencentCloudLogProducer (1.1.1):
     - TencentCloudLogProducer/Core (= 1.1.1)
   - TencentCloudLogProducer/Core (1.1.1):
@@ -47,10 +47,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GMOpenSSL: d6d119ff8f00d4e03c2cdf733fb61e98e22da9c7
-  QCloudCore: a1c543624fe34c5e98c92b7faf421a23f57ad5e3
-  QCloudCOSXML: 8185a7a51c7dce6ff1a25c725907f6beb270cd01
-  QCloudQuic: 81e2c29fa8122c1d5e8323a90349683e52c8e101
-  QCloudTrack: 6bf7aaa7e870d72fb4c9c88455dc63c7c65073b7
+  QCloudCore: de90acb39acb50296e83429bb8b7e6f133234f2b
+  QCloudCOSXML: 2b34890eab32d3799a1ada7e6ed736443d84027e
+  QCloudQuic: a4f2405ccaedde33c36420d4225436b80bd5bf67
+  QCloudTrack: 86264169809cfc4a611eb918d165c39737914d9c
   TencentCloudLogProducer: 564e944491e6396c81df4c9c51470784752ff3ab
 
 PODFILE CHECKSUM: 469848875513aa1180afa1e3751e2d873841a154

QCloudCOSXML.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCOSXML"
 
 
-s.version              = "6.4.5"
+s.version              = "6.4.6"
 
 
   s.summary          = "QCloudCOSXML 腾讯云iOS-SDK组件"
@@ -13,29 +13,29 @@ s.version              = "6.4.5"
   s.source           = { :git => "https://github.com/tencentyun/qcloud-sdk-ios.git", :tag => s.version.to_s }
   s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
   s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
   s.osx.deployment_target = "10.12"
   s.resource_bundles = {'QCloudCOSXML' => ['QCloudCOSXML/PrivacyInfo.xcprivacy']}
   s.static_framework = true
   s.default_subspec = 'Default'
   s.subspec 'Default' do |default|
     default.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  default.dependency "QCloudCore",'6.4.5'
+  default.dependency "QCloudCore",'6.4.6'
   end
   s.subspec 'Slim' do |slim|
     slim.source_files = 'QCloudCOSXML/Classes/**/*','QCloudCOSXML/Classes/QCloudCOSXML/*'
-  slim.dependency "QCloudCore/WithoutMTA",'6.4.5'
+  slim.dependency "QCloudCore/WithoutMTA",'6.4.6'
   end
   s.subspec 'Transfer' do |transfer|
     transfer.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
-  transfer.dependency "QCloudCore/WithoutMTA",'6.4.5'
+  transfer.dependency "QCloudCore/WithoutMTA",'6.4.6'
 
   end
 
   s.subspec 'Widget' do |widget|
     widget.source_files = 'QCloudCOSXML/Classes/*','QCloudCOSXML/Classes/Transfer/**/*','QCloudCOSXML/Classes/Base/**/*'
     widget.exclude_files = 'QCloudCOSXML/Classes/Base/QCloudLogManager.h','QCloudCOSXML/Classes/Base/QCloudLogManager.m'
-  widget.dependency "QCloudCore/WithoutMTA",'6.4.5'
+  widget.dependency "QCloudCore/WithoutMTA",'6.4.6'
   end
 
 end

QCloudCOSXML/Classes/QCloudCOSXMLVersion.h

@@ -5,7 +5,7 @@
 
 #ifndef QCloudCOSXMLModuleVersion_h
 #define QCloudCOSXMLModuleVersion_h
-#define QCloudCOSXMLModuleVersionNumber 604005
+#define QCloudCOSXMLModuleVersionNumber 604006
 
 //dependency
 

QCloudCOSXML/Classes/QCloudCOSXMLVersion.m

@@ -1,5 +1,5 @@
 #import "QCloudCOSXMLVersion.h"
-NSString * const QCloudCOSXMLModuleVersion = @"6.4.5";
+NSString * const QCloudCOSXMLModuleVersion = @"6.4.6";
 NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
 @interface QCloudQCloudCOSXMLLoad : NSObject
 @end

QCloudCOSXMLDemo.xcodeproj/project.pbxproj

@@ -464,7 +464,7 @@
 				1AB143E91E601E0500830F93 /* Frameworks */,
 				1AB143EA1E601E0500830F93 /* Resources */,
 				5531753F06D2602A23691AE3 /* [CP] Copy Pods Resources */,
-				905E623E0EDCB9F5095F7201 /* [CP] Embed Pods Frameworks */,
+				FDACDAA5AF79CC2945E84754 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -601,40 +601,40 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		905E623E0EDCB9F5095F7201 /* [CP] Embed Pods Frameworks */ = {
+		9985684AE5A7F7B42D827A19 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh",
-				"${PODS_ROOT}/../QCloudQuic/Classes/QuicFramework/Tquic.framework",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Tquic.framework",
+				"$(DERIVED_FILE_DIR)/Pods-QCloudCOSXMLDemo-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9985684AE5A7F7B42D827A19 /* [CP] Check Pods Manifest.lock */ = {
+		FDACDAA5AF79CC2945E84754 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
+				"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh",
+				"${PODS_ROOT}/../QCloudQuic/Classes/QuicFramework/Tquic.framework",
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-QCloudCOSXMLDemo-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Tquic.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -821,7 +821,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/QCloudCOSXMLDemo/PrefixHeader.pch";
 				INFOPLIST_FILE = QCloudCOSXMLDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -849,7 +849,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/QCloudCOSXMLDemo/PrefixHeader.pch";
 				INFOPLIST_FILE = QCloudCOSXMLDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.name             = "QCloudCore"
 
 
-s.version              = "6.4.5"
+s.version              = "6.4.6"
 
 
 
@@ -34,27 +34,27 @@ QCloudCore--腾讯云iOS-SDK Foundation。提供腾讯云iOS相关SDK的基础
   s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
   s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
   s.osx.deployment_target = "10.12"
   s.frameworks ='CoreMedia', "Accelerate", "SystemConfiguration"
   s.libraries = "z","c++"
   s.static_framework = true
   s.default_subspec = 'Default'
   s.subspec 'Default' do |default|
-      default.ios.deployment_target = '9.0'
+      default.ios.deployment_target = '10.0'
       default.osx.deployment_target = "10.12"
       default.source_files = 'QCloudCore/Classes/Base/**/*'
-      default.dependency "QCloudTrack/Beacon","6.4.5"
+      default.dependency "QCloudTrack/Beacon","6.4.6"
   end
 
   s.subspec 'WithoutMTA' do |withoutMTA|
-      withoutMTA.ios.deployment_target = '9.0'
+      withoutMTA.ios.deployment_target = '10.0'
       withoutMTA.osx.deployment_target = "10.12"
       withoutMTA.source_files = 'QCloudCore/Classes/Base/**/*'
   end
 
   s.subspec 'DNSLoader' do |tdns|
-    tdns.ios.deployment_target = '9.0'
+    tdns.ios.deployment_target = '10.0'
     tdns.dependency "MSDKDns_C11";
     tdns.dependency "QCloudCore/WithoutMTA";
     tdns.source_files = 'QCloudCore/Classes/DNSLoader/*';

QCloudCore.podspec

@@ -0,0 +1,23 @@
+//
+//  QCloudCustomLoader.h
+//  Pods
+//
+//  Created by garenwang on 2024/12/30.
+//
+
+#import <Foundation/Foundation.h>
+#import "QCloudCustomSession.h"
+#import "QCloudCustomLoaderTask.h"
+#import "QCloudHTTPRequest.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol QCloudCustomLoader <NSObject>
+
+-(QCloudCustomSession *)session;
+
+-(BOOL)enable:(QCloudHTTPRequest *)httpRequest;
+
+@end
+
+NS_ASSUME_NONNULL_END
+

QCloudCore/Classes/Base/CustomLoader/QCloudCustomLoader.h

@@ -0,0 +1,34 @@
+//
+//  QCloudCustomLoaderTask.h
+//  Pods-QCloudCOSXMLDemo
+//
+//  Created by garenwang on 2024/12/26.
+//
+
+#import <Foundation/Foundation.h>
+@class QCloudCustomSession;
+NS_ASSUME_NONNULL_BEGIN
+
+@interface QCloudCustomLoaderTask : NSURLSessionDataTask
+
+@property (nullable, readwrite, copy) NSHTTPURLResponse *response;
+@property (nullable, readwrite, copy) NSURLRequest *currentRequest;
+@property (nullable, readwrite, copy) NSURLRequest *originalRequest;
+
+/// 子类实现，用于构建自定义task。
+/// - Parameters:
+///   - httpRequest: SDK 构建好的 NSMutableURLRequest示例对象。
+///   - fromFile: 上传文件的本地路径，只有上传文件格式为文件路径时才有值。
+///   - session: 自定义session ，QCloudCustomSession的子类实例。
+- (instancetype)initWithHTTPRequest:(NSMutableURLRequest *)httpRequest
+                           fromFile:(NSURL *)fromFile
+                            session:(QCloudCustomSession *)session;
+
+/// 子类实现，用于开启任务。
+-(void)resume;
+
+/// 子类实现，用于取消当前任务。
+- (void)cancel;
+@end
+
+NS_ASSUME_NONNULL_END

QCloudCore/Classes/Base/CustomLoader/QCloudCustomLoaderTask.h

@@ -0,0 +1,35 @@
+//
+//  QCloudCustomLoaderTask.m
+//  Pods-QCloudCOSXMLDemo
+//
+//  Created by garenwang on 2024/12/26.
+//
+
+#import "QCloudCustomLoaderTask.h"
+#import "QCloudCustomSession.h"
+#import "QCloudError.h"
+
+@interface QCloudCustomLoaderTask ()
+@property (nonatomic,strong)NSMutableURLRequest * httpRequest;
+@property (nonatomic,strong)QCloudCustomSession * session;
+@end
+
+@implementation QCloudCustomLoaderTask
+@synthesize response = _response;
+@synthesize originalRequest = _originalRequest;
+@synthesize currentRequest = _currentRequest;
+
+
+- (instancetype)initWithHTTPRequest:(NSMutableURLRequest *)httpRequest
+                           fromFile:(NSURL *)fromFile
+                            session:(QCloudCustomSession *)session{
+    @throw [NSException exceptionWithName:QCloudErrorDomain reason:@"请在子类中实现" userInfo:nil];
+}
+
+-(void)resume{
+    @throw [NSException exceptionWithName:QCloudErrorDomain reason:@"请在子类中实现" userInfo:nil];
+}
+- (void)cancel{
+    @throw [NSException exceptionWithName:QCloudErrorDomain reason:@"请在子类中实现" userInfo:nil];
+}
+@end