Skip to content

Commit 0c59753

Browse files
karis-lixuekaris-lixue
committed
# 5.7.1
- 读取剪贴板卡死 - 多次注册service的问题 - generate_multiple_pod_projects 编译修复 - 修复生成预签名链接接口在临时密钥时没有返回token参数
1 parent 05590c0 commit 0c59753

27 files changed

+185
-198
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
# 5.7.1
2+
- 读取剪贴板卡死
3+
- 多次注册service的问题
4+
- generate_multiple_pod_projects 编译修复
5+
- 修复生成预签名链接接口在临时密钥时没有返回token参数
6+
17
# 5.7.0
2-
时机制
8+
- 支持设置请求的超时时间
39

410
# 5.6.9
511
- 编译警告修复

‎QCloudCOSXML.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "QCloudCOSXML"
33

4-
s.version = "5.7.0"
4+
s.version = "5.7.1"
55

66
s.summary = "QCloudCOSXML 腾讯云iOS-SDK组件"
77

@@ -17,7 +17,7 @@ s.version = "5.7.0"
1717
s.default_subspec = 'Default'
1818
s.subspec 'Default' do |default|
1919
default.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'
20-
default.dependency "QCloudCore",'5.7.0'
20+
default.dependency "QCloudCore",'5.7.1'
2121
end
2222
s.subspec 'Slim' do |slim|
2323
slim.source_files = 'QCloudCOSXML/Classes/**/*','Models/request.model','QCloudCOSXML/Classes/QCloudCOSXML/*'

‎QCloudCOSXML/Classes/Base/QCloudCOSXMLService.m‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,7 @@ + (QCloudCOSXMLService*) defaultCOSXML
5353
return COSXMLService;
5454
}
5555
}
56-
- (QCloudHTTPSessionManager*) sessionManager {
57-
58-
@synchronized(self) {
59-
if (self.isHaveBody) {
60-
if (self.configuration.backgroundEnable) {
61-
QCloudLogDebug(@"get background sessionManager: %@ ",[QCloudHTTPSessionManager shareClient]);
62-
return [QCloudHTTPSessionManager sessionManagerWithBackgroundIdentifier:self.configuration.backgroundIdentifier];
63-
}else{
64-
return [QCloudHTTPSessionManager shareClient];;
65-
}
66-
}else{
67-
return [QCloudHTTPSessionManager shareClient];;
68-
}
69-
70-
}
71-
QCloudLogDebug(@"get client sessionManager: %@ ",[QCloudHTTPSessionManager shareClient]);
72-
return [QCloudHTTPSessionManager shareClient];
73-
}
56+
7457

7558
+ (QCloudCOSXMLService*) registerDefaultCOSXMLWithConfiguration:(QCloudServiceConfiguration*)configuration
7659
{

‎QCloudCOSXML/Classes/Base/QCloudLogManager.m‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,18 @@ - (void)dealloc {
133133
[[NSNotificationCenter defaultCenter] removeObserver:self];
134134
}
135135
- (void) onHandleAppBecomeActive :(NSNotification *)notification {
136-
if ([self shouldShowLogs]) {
137-
[UIPasteboard generalPasteboard].string = @"";
138-
[self showLogs];
139-
}
136+
137+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
138+
//
139+
NSString *currentPasteBoardContent = [UIPasteboard generalPasteboard].string;
140+
if ([currentPasteBoardContent isEqualToString:@"##qcloud-cos-log-ispct##"]) {
141+
dispatch_async(dispatch_get_main_queue(), ^{
142+
[UIPasteboard generalPasteboard].string = @"";
143+
[self showLogs];
144+
});
145+
146+
}
147+
});
140148
}
141149

142150

‎QCloudCOSXML/Classes/Manager/QCloudCOSXMLService+Manager.m‎

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -43,202 +43,206 @@
4343
@implementation QCloudCOSXMLService (Manager)
4444
- (void) AppendObject:(QCloudAppendObjectRequest*)request
4545
{
46-
[super performRequest:request isHaveBody:NO];
46+
[super performRequest:request ];
4747
}
4848
- (void) GetObjectACL:(QCloudGetObjectACLRequest*)request
4949
{
50-
[super performRequest:request isHaveBody:NO];
50+
[super performRequest:request ];
5151
}
5252

5353
- (void) PutObjectACL:(QCloudPutObjectACLRequest*)request
5454
{
55-
[super performRequest:request isHaveBody:NO];
55+
[super performRequest:request ];
5656
}
5757
- (void) DeleteObject:(QCloudDeleteObjectRequest*)request
5858
{
59-
[super performRequest:request isHaveBody:NO];
59+
[super performRequest:request ];
6060
}
6161
- (void) DeleteMultipleObject:(QCloudDeleteMultipleObjectRequest*)request
6262
{
63-
[super performRequest:request isHaveBody:NO];
63+
[super performRequest:request ];
6464
}
6565

6666
- (void) OptionsObject:(QCloudOptionsObjectRequest*)request
6767
{
68-
[super performRequest:request isHaveBody:NO];
68+
[super performRequest:request ];
6969
}
7070

7171

7272
- (void) PutBucket:(QCloudPutBucketRequest*)request
7373
{
74-
[super performRequest:request isHaveBody:NO];
74+
[super performRequest:request ];
7575
}
7676
- (void) GetBucket:(QCloudGetBucketRequest*)request
7777
{
78-
[super performRequest:request isHaveBody:NO];
78+
[super performRequest:request ];
7979
}
8080
- (void) GetBucketACL:(QCloudGetBucketACLRequest*)request
8181
{
82-
[super performRequest:request isHaveBody:NO];
82+
[super performRequest:request ];
8383
}
8484
- (void) GetBucketCORS:(QCloudGetBucketCORSRequest*)request
8585
{
86-
[super performRequest:request isHaveBody:NO];
86+
[super performRequest:request ];
8787
}
8888
- (void) GetBucketLocation:(QCloudGetBucketLocationRequest*)request
8989
{
90-
[super performRequest:request isHaveBody:NO];
90+
[super performRequest:request ];
9191
}
9292
- (void) GetBucketLifecycle:(QCloudGetBucketLifecycleRequest*)request
9393
{
94-
[super performRequest:request isHaveBody:NO];
94+
[super performRequest:request ];
9595
}
9696

9797
- (void) PutBucketACL:(QCloudPutBucketACLRequest*)request
9898
{
99-
[super performRequest:request isHaveBody:NO];
99+
[super performRequest:request ];
100100
}
101101
- (void) PutBucketCORS:(QCloudPutBucketCORSRequest*)request
102102
{
103-
[super performRequest:request isHaveBody:NO];
103+
[super performRequest:request ];
104104
}
105105
- (void) PutBucketLifecycle:(QCloudPutBucketLifecycleRequest*)request
106106
{
107-
[super performRequest:request isHaveBody:NO];
107+
[super performRequest:request ];
108108
}
109109

110110
- (void) DeleteBucketCORS:(QCloudDeleteBucketCORSRequest*)request
111111
{
112-
[super performRequest:request isHaveBody:NO];
112+
[super performRequest:request ];
113113
}
114114
- (void) DeleteBucketLifeCycle:(QCloudDeleteBucketLifeCycleRequest*)request
115115
{
116-
[super performRequest:request isHaveBody:NO];
116+
[super performRequest:request ];
117117
}
118118

119119
- (void) DeleteBucket:(QCloudDeleteBucketRequest*)request
120120
{
121-
[super performRequest:request isHaveBody:NO];
121+
[super performRequest:request ];
122122
}
123123
- (void) HeadBucket:(QCloudHeadBucketRequest*)request
124124
{
125-
[super performRequest:request isHaveBody:NO];
125+
[super performRequest:request ];
126126
}
127127
- (void) ListBucketMultipartUploads:(QCloudListBucketMultipartUploadsRequest*)request
128128
{
129-
[super performRequest:request isHaveBody:NO];
129+
[super performRequest:request ];
130130
}
131131
- (void) PutBucketVersioning:(QCloudPutBucketVersioningRequest*)request {
132-
[super performRequest:request isHaveBody:NO];
132+
[super performRequest:request ];
133133
}
134134
- (void) GetBucketVersioning:(QCloudGetBucketVersioningRequest*)request {
135-
[super performRequest:request isHaveBody:NO];
135+
[super performRequest:request ];
136136
}
137137
- (void) PutBucketRelication:(QCloudPutBucketReplicationRequest*)request {
138-
[super performRequest:request isHaveBody:NO];
138+
[super performRequest:request ];
139139
}
140140
- (void) GetBucketReplication:(QCloudGetBucketReplicationRequest*)request {
141-
[super performRequest:request isHaveBody:NO];
141+
[super performRequest:request ];
142142
}
143143
- (void) DeleteBucketReplication:(QCloudDeleteBucketReplicationRequest*)request {
144-
[super performRequest:request isHaveBody:NO];
144+
[super performRequest:request ];
145145
}
146146
- (void) GetService:(QCloudGetServiceRequest*)request {
147-
[super performRequest:request isHaveBody:NO];
147+
[super performRequest:request ];
148148
}
149149
- (void) PostObjectRestore:(QCloudPostObjectRestoreRequest*)request {
150-
[super performRequest:request isHaveBody:NO];
150+
[super performRequest:request ];
151151
}
152152
- (void) ListObjectVersions:(QCloudListObjectVersionsRequest *)request {
153-
[super performRequest:request isHaveBody:NO];
153+
[super performRequest:request ];
154154
}
155155

156156

157157

158158
-(void)PutBucketDomain:(QCloudPutBucketDomainRequest *)request{
159-
[super performRequest:request isHaveBody:NO];
159+
[super performRequest:request ];
160160
}
161161

162162
-(void)GetBucketDomain:(QCloudGetBucketDomainRequest *)request{
163-
[super performRequest:request isHaveBody:NO];
163+
[super performRequest:request ];
164164
}
165165

166166
-(void)PutBucketWebsite:(QCloudPutBucketWebsiteRequest *)request{
167-
[super performRequest:request isHaveBody:NO];
167+
[super performRequest:request ];
168168
}
169169

170170
-(void)GetBucketWebsite:(QCloudGetBucketWebsiteRequest *)request{
171-
[super performRequest:request isHaveBody:NO];
171+
[super performRequest:request ];
172172
}
173173

174174
-(void)DeleteBucketWebsite:(QCloudDeleteBucketWebsiteRequest *)request{
175-
[super performRequest:request isHaveBody:NO];
175+
[super performRequest:request ];
176176
}
177177

178178

179179
-(void)GetBucketTagging:(QCloudGetBucketTaggingRequest *)request{
180-
[super performRequest:request isHaveBody:NO];
180+
[super performRequest:request ];
181181
}
182182

183183
-(void)PutBucketTagging:(QCloudPutBucketTaggingRequest *)request{
184-
[super performRequest:request isHaveBody:NO];
184+
[super performRequest:request ];
185185
}
186186

187187
-(void)DeleteBucketTagging:(QCloudDeleteBucketTaggingRequest *)request{
188-
[super performRequest:request isHaveBody:NO];
188+
[super performRequest:request ];
189189
}
190190

191191
-(void)SelectObjectContent:(QCloudSelectObjectContentRequest *)request{
192-
[super performRequest:request isHaveBody:NO];
192+
[super performRequest:request ];
193193
}
194194
-(void)GetBucketLogging:(QCloudGetBucketLoggingRequest *)request{
195-
[super performRequest:request isHaveBody:NO];
195+
[super performRequest:request ];
196196
}
197197

198198
-(void)PutBucketLogging:(QCloudPutBucketLoggingRequest *)request{
199-
[super performRequest:request isHaveBody:NO];
199+
[super performRequest:request ];
200200
}
201201

202202
-(void)PutBucketInventory:(QCloudPutBucketInventoryRequest *)request{
203-
[super performRequest:request isHaveBody:NO];
203+
[super performRequest:request ];
204204
}
205205

206206
-(void)GetBucketInventory:(QCloudGetBucketInventoryRequest *)request{
207-
[super performRequest:request isHaveBody:NO];
207+
[super performRequest:request ];
208208
}
209209

210210
-(void)DeleteBucketInventory:(QCloudDeleteBucketInventoryRequest *)request{
211-
[super performRequest:request isHaveBody:NO];
211+
[super performRequest:request ];
212212
}
213213

214214
-(void)ListBucketInventory:(QCloudListBucketInventoryConfigurationsRequest *)request{
215-
[super performRequest:request isHaveBody:NO];
215+
[super performRequest:request ];
216216
}
217217

218218
- (void) getPresignedURL:(QCloudGetPresignedURLRequest*)request {
219219

220220
request.runOnService = self;
221+
request.signatureProvider = self.configuration.signatureProvider;
221222
NSError* error;
222223
NSURLRequest* urlRequest = [request buildURLRequest:&error];
223224
if (nil != error) {
224225
[request onError:error];
225226
return ;
226227
}
227228
__block NSString* requestURLString = urlRequest.URL.absoluteString;
228-
[self loadCOSXMLAuthorizationForBiz:request urlRequest:urlRequest compelete:^(QCloudSignature *signature, NSError *error) {
229+
[request.signatureProvider signatureWithFields:request.signatureFields request:request urlRequest:urlRequest compelete:^(QCloudSignature *signature, NSError *error) {
229230
NSString* authorizatioinString = signature.signature;
230-
if ([requestURLString hasSuffix:@"&"] || [requestURLString hasSuffix:@"?"]) {
231-
requestURLString = [requestURLString stringByAppendingString:authorizatioinString];
232-
} else {
233-
requestURLString = [requestURLString stringByAppendingFormat:@"?%@",authorizatioinString];
234-
}
235-
QCloudGetPresignedURLResult* result = [[QCloudGetPresignedURLResult alloc] init];
236-
result.presienedURL = requestURLString;
237-
if (request.finishBlock) {
238-
request.finishBlock(result, nil);
231+
if ([requestURLString hasSuffix:@"&"] || [requestURLString hasSuffix:@"?"]) {
232+
requestURLString = [requestURLString stringByAppendingString:authorizatioinString];
233+
} else {
234+
requestURLString = [requestURLString stringByAppendingFormat:@"?%@",authorizatioinString];
235+
}
236+
if (signature.token) {
237+
requestURLString = [requestURLString stringByAppendingFormat:@"&x-cos-security-token=%@",signature.token];
239238
}
239+
QCloudGetPresignedURLResult* result = [[QCloudGetPresignedURLResult alloc] init];
240+
result.presienedURL = requestURLString;
241+
if (request.finishBlock) {
242+
request.finishBlock(result, nil);
243+
}
240244
}];
241-
245+
242246
}
243247

244248

‎QCloudCOSXML/Classes/QCloudCOSXMLVersion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#ifndef QCloudCOSXMLModuleVersion_h
77
#define QCloudCOSXMLModuleVersion_h
8-
#define QCloudCOSXMLModuleVersionNumber 507000
8+
#define QCloudCOSXMLModuleVersionNumber 507001
99

1010
//dependency
1111

‎QCloudCOSXML/Classes/QCloudCOSXMLVersion.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "QCloudCOSXMLVersion.h"
2-
NSString * const QCloudCOSXMLModuleVersion = @"5.7.0";
2+
NSString * const QCloudCOSXMLModuleVersion = @"5.7.1";
33
NSString * const QCloudCOSXMLModuleName = @"QCloudCOSXML";
44
@interface QCloudQCloudCOSXMLLoad : NSObject
55
@end

‎QCloudCOSXML/Classes/Transfer/QCloudCOSTransferMangerService.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ NS_ASSUME_NONNULL_BEGIN
5454
- (void) UploadObject:(QCloudCOSXMLUploadObjectRequest*)upload;
5555
- (void) CopyObject:(QCloudCOSXMLCopyObjectRequest*)copy;
5656
- (void) DownloadObject: (QCloudCOSXMLDownloadObjectRequest*)get;
57-
+(void)interceptApplication:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)(void))completionHandler;
57+
5858
@end
5959
NS_ASSUME_NONNULL_END

‎QCloudCOSXML/Classes/Transfer/QCloudCOSTransferMangerService.m‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,5 @@ -(void)DownloadObject:(QCloudCOSXMLDownloadObjectRequest *)request{
129129
@param identifier The identifier of the URL session requiring attention.
130130
@param completionHandler The completion handler to call when you finish processing the events.
131131
*/
132-
+(void)interceptApplication:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)(void))completionHandler{
133-
134-
// For the SDK managed service clients
135-
for (NSString *key in cloudBackGroundSessionManagersCache.allKeys) {
136-
QCloudHTTPSessionManager *sessionManager = [cloudBackGroundSessionManagersCache objectForKey:key];
137-
if ([identifier isEqualToString:sessionManager.configuration.identifier]) {
138-
sessionManager.didFinishEventsForBackgroundURLSession = completionHandler;
139-
}
140-
}
141-
142-
}
132+
143133
@end

0 commit comments

Comments
 (0)