Skip to content

Commit f2a93c0

Browse files
author
erichmzhang
committed
no message
1 parent 56ff768 commit f2a93c0

File tree

4 files changed

+33
-28
lines changed

4 files changed

+33
-28
lines changed

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#import <Foundation/Foundation.h>
3030
#import <QCloudCore/QCloudService.h>
3131

32-
@class QCloudGetPresignedURLRequest;
3332
@interface QCloudCOSXMLService : QCloudService
3433

3534
#pragma hidden super selectors
@@ -58,6 +57,5 @@
5857
*/
5958
- (NSString*)getURLWithBucket:(NSString*)bucket object:(NSString*)object withAuthorization:(BOOL)withAuthorization;
6059

61-
- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request;
6260

6361
@end

QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#import "QCloudCOSXMLService+Private.h"
3030
#import "QCloudThreadSafeMutableDictionary.h"
3131
#import "QCLoudError.h"
32-
#import "QCloudGetPresignedURLRequest.h"
3332

3433
QCloudThreadSafeMutableDictionary* QCloudCOSXMLServiceCache()
3534
{
@@ -105,30 +104,5 @@ - (NSString*)getURLWithBucket:(NSString *)bucket object:(NSString *)object withA
105104
return [resultURL copy];
106105
}
107106

108-
- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request {
109-
110-
request.runOnService = self;
111-
NSError* error;
112-
NSURLRequest* urlRequest = [request buildURLRequest:&error];
113-
if (nil != error) {
114-
[request onError:error];
115-
return ;
116-
}
117-
__block NSString* requestURLString = urlRequest.URL.absoluteString;
118-
[self loadCOSXMLAuthorizationForBiz:request urlRequest:urlRequest compelete:^(QCloudSignature *signature, NSError *error) {
119-
NSString* authorizatioinString = signature.signature;
120-
if ([requestURLString hasSuffix:@"&"] || [requestURLString hasSuffix:@"?"]) {
121-
requestURLString = [requestURLString stringByAppendingString:authorizatioinString];
122-
} else {
123-
requestURLString = [requestURLString stringByAppendingFormat:@"?%@",authorizatioinString];
124-
}
125-
QCloudGetPresignedURLResult* result = [[QCloudGetPresignedURLResult alloc] init];
126-
result.presienedURL = requestURLString;
127-
if (request.finishBlock) {
128-
request.finishBlock(result, nil);
129-
}
130-
}];
131-
132-
}
133107

134108
@end

QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
@class QCloudUploadPartCopyRequest;
4141
@class QCloudPostObjectRestoreRequest;
4242
@class QCloudListObjectVersionsRequest;
43+
@class QCloudGetPresignedURLRequest;
44+
4345
@interface QCloudCOSXMLService (Manager)
4446

4547
- (void) AppendObject:(QCloudAppendObjectRequest*)request;
@@ -73,4 +75,6 @@
7375
- (void) GetService:(QCloudGetServiceRequest*)request;
7476
- (void) PostObjectRestore:(QCloudPostObjectRestoreRequest*)request;
7577
- (void) ListObjectVersions:(QCloudListObjectVersionsRequest*)request;
78+
79+
- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request;
7680
@end

QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.m

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
#import "QCloudDeleteObjectRequest.h"
4040
#import "QCloudListObjectVersionsRequest.h"
41+
#import "QCloudGetPresignedURLRequest.h"
42+
4143
@implementation QCloudCOSXMLService (Manager)
4244
- (void) AppendObject:(QCloudAppendObjectRequest*)request
4345
{
@@ -150,4 +152,31 @@ - (void) PostObjectRestore:(QCloudPostObjectRestoreRequest*)request {
150152
- (void) ListObjectVersions:(QCloudListObjectVersionsRequest *)request {
151153
[super performRequest:request];
152154
}
155+
156+
157+
- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request {
158+
159+
request.runOnService = self;
160+
NSError* error;
161+
NSURLRequest* urlRequest = [request buildURLRequest:&error];
162+
if (nil != error) {
163+
[request onError:error];
164+
return ;
165+
}
166+
__block NSString* requestURLString = urlRequest.URL.absoluteString;
167+
[self loadCOSXMLAuthorizationForBiz:request urlRequest:urlRequest compelete:^(QCloudSignature *signature, NSError *error) {
168+
NSString* authorizatioinString = signature.signature;
169+
if ([requestURLString hasSuffix:@"&"] || [requestURLString hasSuffix:@"?"]) {
170+
requestURLString = [requestURLString stringByAppendingString:authorizatioinString];
171+
} else {
172+
requestURLString = [requestURLString stringByAppendingFormat:@"?%@",authorizatioinString];
173+
}
174+
QCloudGetPresignedURLResult* result = [[QCloudGetPresignedURLResult alloc] init];
175+
result.presienedURL = requestURLString;
176+
if (request.finishBlock) {
177+
request.finishBlock(result, nil);
178+
}
179+
}];
180+
181+
}
153182
@end

0 commit comments

Comments
 (0)