Skip to content

Commit 605bc46

Browse files
author
garenwang
committed
quic6.3.9发布
1 parent 7a3e1e5 commit 605bc46

File tree

11 files changed

+171
-84
lines changed

11 files changed

+171
-84
lines changed

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ PODS:
1717
- QCloudTrack/Cls (6.3.9):
1818
- TencentCloudLogProducer
1919
- QCloudTrack/Default (6.3.9)
20-
- TencentCloudLogProducer (1.0.9):
21-
- TencentCloudLogProducer/Core (= 1.0.9)
22-
- TencentCloudLogProducer/Core (1.0.9):
20+
- TencentCloudLogProducer (1.1.0):
21+
- TencentCloudLogProducer/Core (= 1.1.0)
22+
- TencentCloudLogProducer/Core (1.1.0):
2323
- GMOpenSSL (~> 2.2.6)
2424

2525
DEPENDENCIES:
@@ -51,7 +51,7 @@ SPEC CHECKSUMS:
5151
QCloudCOSXML: a8139aaa7db0c74c870a5a36ccccbee89d5cad75
5252
QCloudQuic: 895ccf08046ecf068a6f965831dd16fc7d531fb4
5353
QCloudTrack: 00557c28b5b1a2cd4a0cf2c41a34947d8a19d119
54-
TencentCloudLogProducer: 980e6a4b9ed49b7b3f41779203be5e4ba1b03b95
54+
TencentCloudLogProducer: 4ccf2eb45c432180351564b1447b98d9b23ca37a
5555

5656
PODFILE CHECKSUM: 469848875513aa1180afa1e3751e2d873841a154
5757

‎QCloudCOSXMLDemo.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@
386386
1AB143E81E601E0500830F93 /* Sources */,
387387
1AB143E91E601E0500830F93 /* Frameworks */,
388388
1AB143EA1E601E0500830F93 /* Resources */,
389-
86791D761081E42076358600 /* [CP] Embed Pods Frameworks */,
390389
5531753F06D2602A23691AE3 /* [CP] Copy Pods Resources */,
390+
905E623E0EDCB9F5095F7201 /* [CP] Embed Pods Frameworks */,
391391
);
392392
buildRules = (
393393
);
@@ -506,17 +506,19 @@
506506
inputPaths = (
507507
"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-resources.sh",
508508
"${PODS_CONFIGURATION_BUILD_DIR}/QCloudCOSXML/QCloudCOSXML.bundle",
509+
"${PODS_CONFIGURATION_BUILD_DIR}/TencentCloudLogProducer/TencentCloudLogProducer.bundle",
509510
);
510511
name = "[CP] Copy Pods Resources";
511512
outputPaths = (
512513
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QCloudCOSXML.bundle",
514+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TencentCloudLogProducer.bundle",
513515
);
514516
runOnlyForDeploymentPostprocessing = 0;
515517
shellPath = /bin/sh;
516518
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-resources.sh\"\n";
517519
showEnvVarsInLog = 0;
518520
};
519-
86791D761081E42076358600 /* [CP] Embed Pods Frameworks */ = {
521+
905E623E0EDCB9F5095F7201 /* [CP] Embed Pods Frameworks */ = {
520522
isa = PBXShellScriptBuildPhase;
521523
buildActionMask = 2147483647;
522524
files = (

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

10.6 KB
Binary file not shown.

‎QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,113 @@
7474
endingLineNumber = "117">
7575
</BreakpointContent>
7676
</BreakpointProxy>
77+
<BreakpointProxy
78+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
79+
<BreakpointContent
80+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044"
81+
shouldBeEnabled = "Yes"
82+
ignoreCount = "0"
83+
continueAfterRunningActions = "No"
84+
filePath = "QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
85+
startingColumnNumber = "9223372036854775807"
86+
endingColumnNumber = "9223372036854775807"
87+
startingLineNumber = "1385"
88+
endingLineNumber = "1385"
89+
landmarkName = "-testMultiUpload1"
90+
landmarkType = "7">
91+
<Locations>
92+
<Location
93+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044 - d0673aa8f01eb2f8"
94+
shouldBeEnabled = "Yes"
95+
ignoreCount = "0"
96+
continueAfterRunningActions = "No"
97+
symbolName = "__42-[QCloudCOSTransferTests testMultiUpload1]_block_invoke_2"
98+
moduleName = "QCloudCOSXMLDemoTests"
99+
usesParentBreakpointCondition = "Yes"
100+
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
101+
startingColumnNumber = "9223372036854775807"
102+
endingColumnNumber = "9223372036854775807"
103+
startingLineNumber = "1385"
104+
endingLineNumber = "1385"
105+
offsetFromSymbolStart = "99">
106+
</Location>
107+
<Location
108+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044 - d0673aa8f01eb2f8"
109+
shouldBeEnabled = "Yes"
110+
ignoreCount = "0"
111+
continueAfterRunningActions = "No"
112+
symbolName = "__42-[QCloudCOSTransferTests testMultiUpload1]_block_invoke_2"
113+
moduleName = "QCloudCOSXMLDemoTests"
114+
usesParentBreakpointCondition = "Yes"
115+
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
116+
startingColumnNumber = "9223372036854775807"
117+
endingColumnNumber = "9223372036854775807"
118+
startingLineNumber = "1385"
119+
endingLineNumber = "1385"
120+
offsetFromSymbolStart = "397">
121+
</Location>
122+
<Location
123+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044 - d0673aa8f01eb2f8"
124+
shouldBeEnabled = "Yes"
125+
ignoreCount = "0"
126+
continueAfterRunningActions = "No"
127+
symbolName = "__42-[QCloudCOSTransferTests testMultiUpload1]_block_invoke_2"
128+
moduleName = "QCloudCOSXMLDemoTests"
129+
usesParentBreakpointCondition = "Yes"
130+
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
131+
startingColumnNumber = "9223372036854775807"
132+
endingColumnNumber = "9223372036854775807"
133+
startingLineNumber = "1385"
134+
endingLineNumber = "1385"
135+
offsetFromSymbolStart = "734">
136+
</Location>
137+
<Location
138+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044 - d0673aa8f01eb2f8"
139+
shouldBeEnabled = "Yes"
140+
ignoreCount = "0"
141+
continueAfterRunningActions = "No"
142+
symbolName = "__42-[QCloudCOSTransferTests testMultiUpload1]_block_invoke_2"
143+
moduleName = "QCloudCOSXMLDemoTests"
144+
usesParentBreakpointCondition = "Yes"
145+
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
146+
startingColumnNumber = "9223372036854775807"
147+
endingColumnNumber = "9223372036854775807"
148+
startingLineNumber = "1385"
149+
endingLineNumber = "1385"
150+
offsetFromSymbolStart = "813">
151+
</Location>
152+
<Location
153+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044 - d0673aa8f01eb2f8"
154+
shouldBeEnabled = "Yes"
155+
ignoreCount = "0"
156+
continueAfterRunningActions = "No"
157+
symbolName = "__42-[QCloudCOSTransferTests testMultiUpload1]_block_invoke_2"
158+
moduleName = "QCloudCOSXMLDemoTests"
159+
usesParentBreakpointCondition = "Yes"
160+
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
161+
startingColumnNumber = "9223372036854775807"
162+
endingColumnNumber = "9223372036854775807"
163+
startingLineNumber = "1385"
164+
endingLineNumber = "1385"
165+
offsetFromSymbolStart = "993">
166+
</Location>
167+
<Location
168+
uuid = "261BE051-C4D9-49D0-AF67-C63851091044 - d0673aa8f01eb2f8"
169+
shouldBeEnabled = "Yes"
170+
ignoreCount = "0"
171+
continueAfterRunningActions = "No"
172+
symbolName = "__42-[QCloudCOSTransferTests testMultiUpload1]_block_invoke_2"
173+
moduleName = "QCloudCOSXMLDemoTests"
174+
usesParentBreakpointCondition = "Yes"
175+
urlString = "file:///Users/garenwang/Documents/code/qcloud-sdk-ios/QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m"
176+
startingColumnNumber = "9223372036854775807"
177+
endingColumnNumber = "9223372036854775807"
178+
startingLineNumber = "1385"
179+
endingLineNumber = "1385"
180+
offsetFromSymbolStart = "1166">
181+
</Location>
182+
</Locations>
183+
</BreakpointContent>
184+
</BreakpointProxy>
77185
</Breakpoints>
78186
</Bucket>

‎QCloudCOSXMLDemoTests/QCloudCOSTransferTests.m‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,4 +1359,52 @@ -(void)testQCloudGetGenerateSnapshotRequest{
13591359
[[QCloudCOSXMLService defaultCOSXML] GetGenerateSnapshot:shotRequest];
13601360
[self waitForExpectationsWithTimeout:80 handler:nil];
13611361
}
1362+
1363+
- (void)testMultiUpload1 {
1364+
QCloudCOSXMLUploadObjectRequest *put = [QCloudCOSXMLUploadObjectRequest new];
1365+
int randomNumber = arc4random() % 100;
1366+
NSURL *url = [NSURL fileURLWithPath:[self tempFileWithSize:0.5 * 1024 * 1024]];
1367+
__block NSString *object = [NSUUID UUID].UUIDString;
1368+
put.body = url;
1369+
put.object = object;
1370+
put.regionName = @"ap-shanghai";
1371+
put.bucket = @"test-callback-1251668577";
1372+
[put setSendProcessBlock:^(int64_t bytesSent, int64_t totalBytesSent, int64_t totalBytesExpectedToSend) {
1373+
NSLog(@"upload %lld totalSend %lld aim %lld", bytesSent, totalBytesSent, totalBytesExpectedToSend);
1374+
}];
1375+
1376+
NSDictionary * dic = @{@"callbackUrl":@"http://114.132.67.183/index",@"callbackHost":@"114.132.67.183",@"callbackBody":@"bucket=${bucket}&object=${object}&etag=${etag}&test=test_123",@"callbackBodyType":@"application/x-www-form-urlencoded"};
1377+
1378+
NSData *data = [[dic qcloud_modelToJSONString] dataUsingEncoding:NSUTF8StringEncoding];
1379+
NSString *base64String = [data base64EncodedStringWithOptions:0];
1380+
1381+
put.customHeaders = @{@"x-cos-callback":base64String}.mutableCopy;
1382+
XCTestExpectation *exp = [self expectationWithDescription:@"testMultiUpload upload object expectation"];
1383+
__block QCloudUploadObjectResult *result;
1384+
[put setFinishBlock:^(QCloudUploadObjectResult *result, NSError *error) {
1385+
if (result.CallbackResult) {
1386+
if (result.CallbackResult.Status.integerValue == 200) {
1387+
// 获取回调CallbackBody: result.CallbackResult.CallbackBody
1388+
}else if (result.CallbackResult.Status.integerValue == 203){
1389+
// 获取回调状态：Status为203时，说明Callback，返回 Error，说明回调失败信息。
1390+
// result.CallbackResult.Error
1391+
}
1392+
}
1393+
// [request setFinishBlock:^(id outputObject, NSError *error) {
1394+
// QCloudLogInfo(@"outputObject%@",outputObject);
1395+
// XCTAssertNil(error);
1396+
[exp fulfill];
1397+
// }];
1398+
// [request setDownProcessBlock:^(int64_t bytesDownload, int64_t totalBytesDownload, int64_t totalBytesExpectedToDownload) {
1399+
// NSLog(@"⏬⏬⏬⏬DOWN [Total]%lld [Downloaded]%lld [Download]%lld", totalBytesExpectedToDownload, totalBytesDownload,
1400+
// bytesDownload);
1401+
// }];
1402+
// [[QCloudCOSXMLService defaultCOSXML] GetObject:request];
1403+
}];
1404+
1405+
[[QCloudCOSTransferMangerService defaultCOSTransferManager] UploadObject:put];
1406+
[self waitForExpectationsWithTimeout:18000
1407+
handler:^(NSError *_Nullable error) {
1408+
}];
1409+
}
13621410
@end

‎QCloudCOSXMLDemoTests/QCloudCOSXMLExceptionCoverage.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,6 @@ -(void)testQCloudDeleteBucketReplicationRequestExp{
653653
QCloudGetBucketLocationRequest.class,
654654
QCloudGetBucketACLRequest.class,
655655
QCloudGetBucketCORSRequest.class,
656-
QCloudGetRecognitionObjectRequest.class,
657656
QCloudListObjectVersionsRequest.class,
658657
QCloudListBucketMultipartUploadsRequest.class,
659658
QCloudGetObjectRequest.class,

‎QCloudCOSXMLDemoTests/QCloudCOSXMLModelCoverage.m‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import <QCloudCOSXML/QCloudTag.h>
1515
#import <QCloudCOSXML/QCloudGenerateSnapshotRotateTypeEnum.h>
1616
#import <QCloudCOSXML/QCloudInputJSONFileTypeEnum.h>
17-
#import <QCloudCOSXML/QCloudGetRecognitionResultInfo.h>
1817
#import <QCloudCOSXML/QCloudGenerateSnapshotInput.h>
1918
#import <QCloudCOSXML/QCloudCOSIncludedObjectVersionsEnum.h>
2019
#import <QCloudCOSXML/QCloudWebsiteRoutingRules.h>
@@ -60,31 +59,6 @@ - (void)testTagModel {
6059
XCTAssert([tag performSelector:@selector(modelCustomTransformToDictionary:) withObject:inputDict]);
6160
}
6261

63-
64-
-(void)testGetRecognitionResultInfo{
65-
XCTAssert([QCloudGetRecognitionResultInfo performSelector:@selector(modelCustomPropertyMapper)]);
66-
QCloudGetRecognitionResultInfo * resultInfo = [QCloudGetRecognitionResultInfo new];
67-
NSDictionary *inputDict = @{
68-
@"Code" : @"CodeValue",
69-
@"Msg" : @"MsgValue",
70-
@"HitFlag" : @"HitFlagValue",
71-
@"Score" : @"ScoreValue",
72-
@"Label" : @"LabelValue",
73-
@"Count" : @"CountValue",
74-
};;
75-
id output = [resultInfo performSelector:@selector(modelCustomWillTransformFromDictionary:) withObject:nil];
76-
XCTAssertNil(output);
77-
NSDictionary *transOutput = [resultInfo performSelector:@selector(modelCustomWillTransformFromDictionary:) withObject:inputDict];
78-
XCTAssert([transOutput[@"Code"] isEqualToString:@"CodeValue"]);
79-
XCTAssert([transOutput[@"Msg"] isEqualToString:@"MsgValue"]);
80-
XCTAssert([transOutput[@"HitFlag"] isEqualToString:@"HitFlagValue"]);
81-
XCTAssert([transOutput[@"Score"] isEqualToString:@"ScoreValue"]);
82-
XCTAssert([transOutput[@"Label"] isEqualToString:@"LabelValue"]);
83-
XCTAssert([transOutput[@"Count"] isEqualToString:@"CountValue"]);
84-
85-
XCTAssert([resultInfo performSelector:@selector(modelCustomTransformToDictionary:) withObject:inputDict]);
86-
}
87-
8862
-(void)testGenerateSnapshotInput{
8963
XCTAssert([QCloudGenerateSnapshotInput performSelector:@selector(modelCustomPropertyMapper)]);
9064
QCloudGenerateSnapshotInput * resultInfo = [QCloudGenerateSnapshotInput new];
@@ -113,50 +87,6 @@ -(void)testQCloudRequestProgress{
11387
XCTAssert([resultInfo performSelector:@selector(modelCustomTransformToDictionary:) withObject:inputDict]);
11488
}
11589

116-
-(void)testQCloudGetRecognitionObjectResult{
117-
XCTAssert([QCloudGetRecognitionResultInfo performSelector:@selector(modelCustomPropertyMapper)]);
118-
QCloudGetRecognitionResultInfo * resultInfo = [QCloudGetRecognitionResultInfo new];
119-
NSDictionary *inputDict = @{
120-
@"Code" : @"CodeValue",
121-
@"Msg" : @"MsgValue",
122-
@"HitFlag" : @"HitFlagValue",
123-
@"Score" : @"ScoreValue",
124-
@"Label" : @"LabelValue",
125-
@"Count" : @"CountValue",
126-
};;
127-
id output = [resultInfo performSelector:@selector(modelCustomWillTransformFromDictionary:) withObject:nil];
128-
XCTAssertNil(output);
129-
NSDictionary *transOutput = [resultInfo performSelector:@selector(modelCustomWillTransformFromDictionary:) withObject:inputDict];
130-
XCTAssert([transOutput[@"Code"] isEqualToString:@"CodeValue"]);
131-
XCTAssert([transOutput[@"Msg"] isEqualToString:@"MsgValue"]);
132-
XCTAssert([transOutput[@"HitFlag"] isEqualToString:@"HitFlagValue"]);
133-
XCTAssert([transOutput[@"Score"] isEqualToString:@"ScoreValue"]);
134-
XCTAssert([transOutput[@"Label"] isEqualToString:@"LabelValue"]);
135-
XCTAssert([transOutput[@"Count"] isEqualToString:@"CountValue"]);
136-
137-
XCTAssert([resultInfo performSelector:@selector(modelCustomTransformToDictionary:) withObject:inputDict]);
138-
139-
XCTAssert([QCloudGetRecognitionObjectResult performSelector:@selector(modelCustomPropertyMapper)]);
140-
QCloudGetRecognitionObjectResult * resultInfos = [QCloudGetRecognitionObjectResult new];
141-
NSDictionary * inputDicts = @{
142-
@"PornInfo" : resultInfo,
143-
@"TerroristInfo" : resultInfo,
144-
@"PoliticsInfo" : resultInfo,
145-
@"AdsInfo" : resultInfo,
146-
};
147-
148-
id outputs = [resultInfos performSelector:@selector(modelCustomWillTransformFromDictionary:) withObject:nil];
149-
XCTAssertNil(outputs);
150-
NSDictionary *transOutputs = [resultInfos performSelector:@selector(modelCustomWillTransformFromDictionary:) withObject:inputDicts];
151-
152-
XCTAssertNotNil(transOutputs[@"PornInfo"]);
153-
XCTAssertNotNil(transOutputs[@"TerroristInfo"]);
154-
XCTAssertNotNil(transOutputs[@"PoliticsInfo"]);
155-
XCTAssertNotNil(transOutputs[@"AdsInfo"]);
156-
157-
XCTAssert([resultInfos performSelector:@selector(modelCustomTransformToDictionary:) withObject:inputDicts]);
158-
}
159-
16090
-(void)testQCloudPutObjectWatermarkResult{
16191

16292

‎QCloudQuic.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.name = "QCloudQuic"
1111

1212

13-
s.version = "6.3.7"
13+
s.version = "6.3.9"
1414

1515

1616
s.summary = "QCloudQuic 腾讯云iOS-SDK组件"

‎QCloudQuic/Classes/QCloudBase/TquicConnection.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,9 @@ -(void)cancleRequest{
326326
-(void)startRequest{
327327
NSLog(@"Tquic startRequest: %@ (%@)", self.quicReqeust.host, self.quicReqeust.ip);
328328
if(self.quicReqeust.ip == nil){
329-
request_sp->ConnectWithDomain([self.quicReqeust.host UTF8String], [QCloudQuicConfig shareConfig].port);
329+
request_sp->ConnectWithDomain([self.quicReqeust.host?:@"" UTF8String], [QCloudQuicConfig shareConfig].port);
330330
}else{
331-
request_sp->Connect([self.quicReqeust.host UTF8String], [self.quicReqeust.ip UTF8String], [QCloudQuicConfig shareConfig].port, [QCloudQuicConfig shareConfig].tcp_port);
331+
request_sp->Connect([self.quicReqeust.host?:@"" UTF8String], [self.quicReqeust.ip?:@"" UTF8String], [QCloudQuicConfig shareConfig].port, [QCloudQuicConfig shareConfig].tcp_port);
332332
}
333333
// request_sp.get()->Connect([@"iacc.stgw.qq.com" UTF8String] , [@"101.89.15.244" UTF8String], [QCloudQuicConfig shareConfig].port, [QCloudQuicConfig shareConfig].tcp_port);
334334
}

‎QCloudQuic/Classes/QCloudQuicVersion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
#ifndef QCloudQuicModuleVersion_h
77
#define QCloudQuicModuleVersion_h
8-
#define QCloudQuicModuleVersionNumber 603007
8+
#define QCloudQuicModuleVersionNumber 603009
99

1010
//dependency
1111

1212
//
1313
FOUNDATION_EXTERN NSString * const QCloudQuicModuleVersion;
1414
FOUNDATION_EXTERN NSString * const QCloudQuicModuleName;
1515

16-
#endif
16+
#endif

0 commit comments

Comments
 (0)