私信 api 接口更新

Author: wanghengheng

Coding_iOS/Util/Manager/CodingNetAPIClient.m

@@ -237,39 +237,57 @@ - (void)uploadImage:(UIImage *)image path:(NSString *)path name:(NSString *)name
        successBlock:(void (^)(AFHTTPRequestOperation *operation, id responseObject))success
        failureBlock:(void (^)(AFHTTPRequestOperation *operation, NSError *error))failure
       progerssBlock:(void (^)(CGFloat progressValue))progress{
-
-    NSData *data = [image dataForCodingUpload];
 
-    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-    formatter.dateFormat = @"yyyyMMddHHmmss";
-    NSString *str = [formatter stringFromDate:[NSDate date]];
-    NSString *fileName = [NSString stringWithFormat:@"%@_%@.jpg", [Login curLoginUser].global_key, str];
+    NSData *data = [image dataForCodingUpload];
+    NSString *fileName = [NSString stringWithFormat:@"%@_%@.jpg", [Login curLoginUser].global_key, [[NSDate date] stringWithFormat:@"yyyyMMddHHmmss"]];
     DebugLog(@"\nuploadImageSize\n%@ : %.0f", fileName, (float)data.length/1024);
-
-    AFHTTPRequestOperation *operation = [self POST:path parameters:nil constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-        [formData appendPartWithFileData:data name:name fileName:fileName mimeType:@"image/jpeg"];
-    } success:^(AFHTTPRequestOperation *operation, id responseObject) {
-        DebugLog(@"Success: %@ ***** %@", operation.responseString, responseObject);
-        id error = [self handleResponse:responseObject];
-        if (error && failure) {
-            failure(operation, error);
-        }else{
-            success(operation, responseObject);
-        }
-    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-        DebugLog(@"Error: %@ ***** %@", operation.responseString, error);
-        if (failure) {
-            failure(operation, error);
-        }
-    }];
 
-    [operation setUploadProgressBlock:^(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite) {
-        CGFloat progressValue = (float)totalBytesWritten/(float)totalBytesExpectedToWrite;
-        if (progress) {
-            progress(progressValue);
-        }
-    }];
-    [operation start];
+    __weak typeof(self) weakSelf = self;
+    void (^uploadBlock)(NSDictionary *) = ^(NSDictionary *uploadParams){
+        AFHTTPRequestOperation *operation = [weakSelf POST:path parameters:uploadParams constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+            [formData appendPartWithFileData:data name:name fileName:fileName mimeType:@"image/jpeg"];
+        } success:^(AFHTTPRequestOperation *operation, id responseObject) {
+            DebugLog(@"Success: %@ ***** %@", operation.responseString, responseObject);
+            id error = [self handleResponse:responseObject];
+            if (error && failure) {
+                failure(operation, error);
+            }else{
+                success(operation, responseObject);
+            }
+        } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+            DebugLog(@"Error: %@ ***** %@", operation.responseString, error);
+            if (failure) {
+                failure(operation, error);
+            }
+        }];
+        [operation setUploadProgressBlock:^(NSUInteger bytesWritten, long long totalBytesWritten, long long totalBytesExpectedToWrite) {
+            CGFloat progressValue = (float)totalBytesWritten/(float)totalBytesExpectedToWrite;
+            if (progress) {
+                progress(progressValue);
+            }
+        }];
+        [operation start];
+    };
+    if ([path isEqualToString:@"https://up.qbox.me/"]) {//先拿 token
+        NSDictionary *params = @{
+                                 @"fileName": fileName,
+                                 @"fileSize": @(data.length)
+                                 };
+        [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/upload_token/public/images" withParams:params withMethodType:Get andBlock:^(id data, NSError *error) {
+            if (data) {
+                NSDictionary *result = data[@"data"];
+                NSMutableDictionary *uploadParams = @{}.mutableCopy;
+                uploadParams[@"token"] = result[@"uptoken"];
+                uploadParams[@"x:time"] = result[@"time"];
+                uploadParams[@"x:authToken"] = result[@"authToken"];
+                uploadParams[@"x:userId"] = result[@"userId"];
+                uploadParams[@"key"] = fileName;
+                uploadBlock(uploadParams);
+            }
+        }];
+    }else{
+        uploadBlock(nil);
+    }
 }
 
 - (void)uploadAssets:(NSArray *)assets

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -3055,7 +3055,7 @@ - (void)uploadTweetImage:(UIImage *)image
         done(nil, [NSError errorWithDomain:@"DATA EMPTY" code:0 userInfo:@{NSLocalizedDescriptionKey : @"有张照片没有读取成功"}]);
         return;
     }
-    [[CodingNetAPIClient sharedJsonClient] uploadImage:image path:@"api/tweet/insert_image" name:@"tweetImg" successBlock:^(AFHTTPRequestOperation *operation, id responseObject) {
+    [[CodingNetAPIClient sharedJsonClient] uploadImage:image path:@"https://up.qbox.me/" name:@"file" successBlock:^(AFHTTPRequestOperation *operation, id responseObject) {
         NSString *reslutString = [responseObject objectForKey:@"data"];
         DebugLog(@"%@", reslutString);
         done(reslutString, nil);