add willSendRequest

Author: debugly

SCNetworkKit/Classes/NetworkService/SCNetworkService.h

@@ -20,5 +20,7 @@ FOUNDATION_EXPORT NSString *const SCNetworkKitErrorDomain;
 
 ///开始请求；
 - (void)startRequest:(__kindof SCNetworkBasicRequest *)request;
+///将要发送请求，可以在发送前修改这个 request, 返回 NO 将取消此次请求
+- (void)willSendRequest:(BOOL(^)(__kindof SCNetworkBasicRequest *request))block;
 
 @end

SCNetworkKit/Classes/NetworkService/SCNetworkService.m

@@ -23,6 +23,7 @@ @interface SCNetworkService ()<NSURLSessionDelegate,NSURLSessionTaskDelegate,NSU
 @property (nonatomic, strong) dispatch_queue_t taskSynzQueue;
 @property (nonatomic, strong) NSMutableDictionary *taskRequestMap;
 @property (nonatomic, strong) NSURLSession *session;
+@property (nonatomic, copy) BOOL (^willSendRequestBlcok)(__kindof SCNetworkBasicRequest *);
 
 @end
 
@@ -86,8 +87,21 @@ - (instancetype)initWithSessionConfiguration:(NSURLSessionConfiguration *)config
     return self;
 }
 
+- (void)willSendRequest:(BOOL (^)(__kindof SCNetworkBasicRequest *))block
+{
+    self.willSendRequestBlcok = block;
+}
+
 - (void)startRequest:(__kindof SCNetworkBasicRequest *)request
 {
+    if (self.willSendRequestBlcok) {
+        BOOL send = self.willSendRequestBlcok(request);
+        if (!send) {
+            [request cancel];
+            return;
+        }
+    }
+    
     NSURLRequest * urlRequest = request.urlRequest;
     if(!request || !urlRequest) {
         NSAssert((request && urlRequest),

SCNetworkKit/Classes/Request/SCNetworkRequest.m

@@ -289,19 +289,21 @@ - (NSMutableURLRequest *)_makeURLRequest:(NSString *)urlString
                                    query:(NSDictionary *)parameters
 {
     NSAssert(urlString, @"makeURLRequest:url不能为空");
-    NSString *queryStr = [SCNUtil makeUrlEncodeingString:parameters];
-    if (queryStr.length > 0) {
-        if (NSNotFound != [urlString rangeOfString:@"?"].location) {
-            NSString *join = @"&";
-            if ([urlString hasSuffix:@"&"]) {
-                join = @"";
+    if (parameters) {
+        NSString *queryStr = [SCNUtil makeUrlEncodeingString:parameters];
+        if (queryStr.length > 0) {
+            if (NSNotFound != [urlString rangeOfString:@"?"].location) {
+                NSString *join = @"&";
+                if ([urlString hasSuffix:@"&"]) {
+                    join = @"";
+                }
+                urlString = [NSString stringWithFormat:@"%@%@%@", urlString,join,queryStr];
+            } else {
+                urlString = [NSString stringWithFormat:@"%@?%@", urlString,queryStr];
             }
-            urlString = [NSString stringWithFormat:@"%@%@%@", urlString,join,queryStr];
-        } else {
-            urlString = [NSString stringWithFormat:@"%@?%@", urlString,queryStr];
         }
     }
-
+    
     NSURL *url = [NSURL URLWithString:urlString];
 
     NSAssert(url, @"makeURLRequest:url不合法");