Merge pull request #328 from XiaopingSun/QNResponse_add_clientId

fix uplog issue

Author: bachue

QiniuSDK/Http/QNResponseInfo.h

@@ -55,6 +55,11 @@ extern const int kQNFileError;
  */
 @property (nonatomic, copy, readonly) NSString *reqId;
 
+/**
+ *    七牛日志上报返回的X_Log_Client_Id
+ */
+@property (nonatomic, copy, readonly) NSString *xClientId;
+
 /**
  *    七牛服务器内部跟踪记录
  */

QiniuSDK/Http/QNResponseInfo.m

@@ -10,6 +10,7 @@
 #import "QNHttpResponseInfo.h"
 #import "QNUserAgent.h"
 #import "QNVersion.h"
+#import "QNUploadInfoReporter.h"
 
 const int kQNZeroDataSize = -6;
 const int kQNInvalidToken = -5;
@@ -127,6 +128,7 @@ - (instancetype)initWithStatus:(int)status
         _duration = duration;
         _id = [QNUserAgent sharedInstance].id;
         _timeStamp = [[NSDate date] timeIntervalSince1970];
+        _xClientId = Reporter.X_Log_Client_Id;
     }
     return self;
 }
@@ -158,12 +160,13 @@ - (instancetype)initWithStatusCode:(int)statusCode
         _duration = duration;
         _id = [QNUserAgent sharedInstance].id;
         _timeStamp = [[NSDate date] timeIntervalSince1970];
+        _xClientId = Reporter.X_Log_Client_Id;
     }
     return self;
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat:@"<%@= id: %@, ver: %@, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ duration: %.3f s time: %llu error: %@>", NSStringFromClass([self class]), _id, kQiniuVersion, _statusCode, _reqId, _xlog, _xvia, _host, _duration, _timeStamp, _error];
+    return [NSString stringWithFormat:@"<%@= id: %@, ver: %@, status: %d, requestId: %@, xClientId: %@, xlog: %@, xvia: %@, host: %@ duration: %.3f s time: %llu error: %@>", NSStringFromClass([self class]), _id, kQiniuVersion, _statusCode, _reqId, _xClientId, _xlog, _xvia, _host, _duration, _timeStamp, _error];
 }
 
 - (BOOL)isCancelled {

QiniuSDK/Storage/QNUploadInfoReporter.h

@@ -124,6 +124,8 @@
 
 @interface QNUploadInfoReporter : NSObject
 
+@property (nonatomic, copy, readonly) NSString *X_Log_Client_Id;
+
 - (id)init __attribute__((unavailable("Use sharedInstance: instead.")));
 + (instancetype)sharedInstance;
 

QiniuSDK/Storage/QNUploadInfoReporter.m

@@ -29,12 +29,12 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
-        self.up_time = [[NSDate dateWithTimeIntervalSinceNow:0] timeIntervalSince1970] * 1000;
+        self.up_time = [[NSDate dateWithTimeIntervalSinceNow:0] timeIntervalSince1970];
     }
     return self;
 }
 - (NSString *)toJson {
-    NSMutableDictionary *requestItemDic = [NSMutableDictionary dictionary];
+    NSMutableDictionary *itemDic = [NSMutableDictionary dictionary];
 
     // self class property
     unsigned int selfPropertyCount = 0;
@@ -52,12 +52,12 @@ - (NSString *)toJson {
                 if (0 == strcmp(value, "@\"NSString\"")) {
                     NSString *key = [NSString stringWithCString:name encoding:NSUTF8StringEncoding];
                     NSString *ivarValue = [self valueForKey:key];
-                    if (ivarValue) [requestItemDic setValue:ivarValue forKey:key];
+                    if (ivarValue) [itemDic setValue:ivarValue forKey:key];
                 } else {
                     // 默认其他属性的基本类型是int
                     NSString *key = [NSString stringWithCString:name encoding:NSUTF8StringEncoding];
                     NSNumber *ivarValue = [self valueForKey:key];
-                    if (ivarValue && ![ivarValue isEqualToNumber:@(QN_IntNotSet)]) [requestItemDic setValue:ivarValue forKey:key];
+                    if (ivarValue && ![ivarValue isEqualToNumber:@(QN_IntNotSet)]) [itemDic setValue:ivarValue forKey:key];
                 }
             }
         }
@@ -81,12 +81,12 @@ - (NSString *)toJson {
                 if (0 == strcmp(value, "@\"NSString\"")) {
                     NSString *key = [NSString stringWithCString:name encoding:NSUTF8StringEncoding];
                     NSString *ivarValue = [self valueForKey:key];
-                    if (ivarValue) [requestItemDic setValue:ivarValue forKey:key];
+                    if (ivarValue) [itemDic setValue:ivarValue forKey:key];
                 } else {
                     // 默认其他属性的基本类型是int
                     NSString *key = [NSString stringWithCString:name encoding:NSUTF8StringEncoding];
                     NSNumber *ivarValue = [self valueForKey:key];
-                    if (ivarValue) [requestItemDic setValue:ivarValue forKey:key];
+                    if (ivarValue) [itemDic setValue:ivarValue forKey:key];
                 }
             }
         }
@@ -95,10 +95,10 @@ - (NSString *)toJson {
     free(superProperties);
 
     NSError *error;
-    NSData *requestItemData = [NSJSONSerialization dataWithJSONObject:requestItemDic options:NSJSONWritingPrettyPrinted error:&error];
+    NSData *itemData = [NSJSONSerialization dataWithJSONObject:itemDic options:kNilOptions error:&error];
     if (error) return nil;
-    NSString *requestItemJson = [[NSString alloc] initWithData:requestItemData encoding:NSUTF8StringEncoding];
-    return requestItemJson;
+    NSString *itemJson = [[NSString alloc] initWithData:itemData encoding:NSUTF8StringEncoding];
+    return itemJson;
 }
 @end
 
@@ -398,7 +398,7 @@ @interface QNUploadInfoReporter ()
 @property (nonatomic, strong) NSString *recorderFilePath;
 @property (nonatomic, strong) dispatch_queue_t recordQueue;
 @property (nonatomic, strong) dispatch_semaphore_t semaphore;
-@property (nonatomic, copy) NSString *X_Log_Client_Id;
+@property (nonatomic, copy, readwrite) NSString *X_Log_Client_Id;
 
 @end
 

QiniuSDKTests/QNTestConfig.h

@@ -6,4 +6,4 @@
 //  Copyright (c) 2014年 Qiniu. All rights reserved.
 //
 
-static NSString *const g_token = @"bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:bx3SEGbnAAk-AwUEzDP866Ydqio=:eyJzY29wZSI6InNodWFuZ2h1bzEiLCJkZWFkbGluZSI6MTU4OTMzOTc0M30K";
+static NSString *const g_token = @"bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:C2KxWn7I5B3oTUPjtxi9HrrHcvE=:eyJzY29wZSI6InNodWFuZ2h1bzEiLCJkZWFkbGluZSI6MTU4OTk2NjkyNn0K";