1.log

BFNetRequestKit/Classes/BFNetRequestAdaptor.swift

@@ -12,8 +12,8 @@ private var bf_abInfoData: [String: Any] = Dictionary<String, Any>.init() // 实
 public class BFNetRequestAdaptor: NSObject {
     public typealias completeHander = (_ jsonObject: Any?, _ extData: [String: Any]?, _ error: PQError?, _ duration: TimeInterval?) -> Void
     /// get请求
-    public class func getRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default,isJsonEncodingNormal:Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
-        SWNetRequest.getRequestData(url: url, parames: requestParams(encoding: encoding,isJsonEncodingNormal:isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
+    public class func getRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default, isJsonEncodingNormal: Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
+        SWNetRequest.getRequestData(url: url, parames: requestParams(encoding: encoding, isJsonEncodingNormal: isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
             if jsonObject != nil {
                 let paraseData = paraseJsonObject(respondDict: jsonObject as! [String: Any])
                 response(paraseData.0, paraseData.1, paraseData.2, duration)
@@ -24,8 +24,8 @@ public class BFNetRequestAdaptor: NSObject {
     }
 
     /// post请求
-    public class func postRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default,isJsonEncodingNormal:Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
-        SWNetRequest.postRequestData(url: url, parames: requestParams(encoding: encoding,isJsonEncodingNormal:isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
+    public class func postRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default, isJsonEncodingNormal: Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
+        SWNetRequest.postRequestData(url: url, parames: requestParams(encoding: encoding, isJsonEncodingNormal: isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
             if jsonObject != nil {
                 let paraseData = paraseJsonObject(respondDict: jsonObject as! [String: Any])
                 response(paraseData.0, paraseData.1, paraseData.2, duration)
@@ -36,8 +36,8 @@ public class BFNetRequestAdaptor: NSObject {
     }
 
     // put请求
-    public class func putRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default,isJsonEncodingNormal:Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
-        SWNetRequest.putRequestData(url: url, parames: requestParams(encoding: encoding,isJsonEncodingNormal:isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
+    public class func putRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default, isJsonEncodingNormal: Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
+        SWNetRequest.putRequestData(url: url, parames: requestParams(encoding: encoding, isJsonEncodingNormal: isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
             if jsonObject != nil {
                 let paraseData = paraseJsonObject(respondDict: jsonObject as! [String: Any])
                 response(paraseData.0, paraseData.1, paraseData.2, duration)
@@ -48,8 +48,8 @@ public class BFNetRequestAdaptor: NSObject {
     }
 
     /// delete请求
-    public class func deleteRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default,isJsonEncodingNormal:Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
-        SWNetRequest.deleteRequestData(url: url, parames: requestParams(encoding: encoding,isJsonEncodingNormal:isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
+    public class func deleteRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default, isJsonEncodingNormal: Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
+        SWNetRequest.deleteRequestData(url: url, parames: requestParams(encoding: encoding, isJsonEncodingNormal: isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
             if jsonObject != nil {
                 let paraseData = paraseJsonObject(respondDict: jsonObject as! [String: Any])
                 response(paraseData.0, paraseData.1, paraseData.2, duration)
@@ -60,8 +60,8 @@ public class BFNetRequestAdaptor: NSObject {
     }
 
     /// head请求
-    public class func headRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default,isJsonEncodingNormal:Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
-        SWNetRequest.headRequestData(url: url, parames: requestParams(encoding: encoding,isJsonEncodingNormal:isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
+    public class func headRequestData(url: String, parames: [String: Any]?, commonParams: [String: Any]? = nil, encoding: ParameterEncoding = URLEncoding.default, isJsonEncodingNormal: Bool = false, timeoutInterval: TimeInterval = 60, response: @escaping completeHander) {
+        SWNetRequest.headRequestData(url: url, parames: requestParams(encoding: encoding, isJsonEncodingNormal: isJsonEncodingNormal, parames: parames, commonParams: commonParams), encoding: encoding, timeoutInterval: timeoutInterval) { jsonObject, error, duration in
             if jsonObject != nil {
                 let paraseData = paraseJsonObject(respondDict: jsonObject as! [String: Any])
                 response(paraseData.0, paraseData.1, paraseData.2, duration)
@@ -70,7 +70,7 @@ public class BFNetRequestAdaptor: NSObject {
             }
         }
     }
-    
+
     /// 校验图片是否有效
     /// - Parameter url: <#url description#>
     /// - Returns: <#description#>
@@ -92,14 +92,14 @@ public class BFNetRequestAdaptor: NSObject {
         }
         headTask.resume()
     }
-    
+
     /// 处理请求参数
     /// - Parameters:
     ///   - encoding: <#encoding description#>
     ///   - parames: <#parames description#>
     ///   - commonParams: <#commonParams description#>
     /// - Returns: <#description#>
-    public class func requestParams(encoding: ParameterEncoding,isJsonEncodingNormal:Bool = false, parames: [String: Any]?, commonParams: [String: Any]?) -> [String: Any]? {
+    public class func requestParams(encoding: ParameterEncoding, isJsonEncodingNormal: Bool = false, parames: [String: Any]?, commonParams: [String: Any]?) -> [String: Any]? {
         var requestParams: [String: Any] = Dictionary<String, Any>.init()
         var tempCommonParams: [String: Any] = commonParams ?? Dictionary<String, Any>.init()
         var tempParames: [String: Any] = parames ?? Dictionary<String, Any>.init()

BFNetRequestKit/Classes/SWNetRequest.swift

@@ -90,8 +90,7 @@ public class SWNetRequest: NSObject {
             response(nil, PQError(msg: "非法地址", code: 0), nil)
             return
         }
-//        DebugPrint("网络请求-发起：url = \(url),parames = \(parames ?? [:])")
-
+        NTLog(message: "网络请求-发起：url = \(url),parames = \(parames ?? [:])")
         sessionManager?.request(url, method: method, parameters: parames, encoding: encoding, headers: nil, requestModifier: { request in
             request.timeoutInterval = bf_timeoutInterval
         }).responseJSON { jsonResponse in
@@ -99,15 +98,15 @@ public class SWNetRequest: NSObject {
             case .success:
                 if jsonResponse.data != nil {
                     let jsonData: Any = try! JSONSerialization.jsonObject(with: jsonResponse.data!, options: JSONSerialization.ReadingOptions.mutableContainers)
-                    DebugPrint("网络请求-成功：url = \(jsonResponse.request?.url?.absoluteString ?? ""),jsonData = \(jsonData)")
+                    NTLog(message: "网络请求-成功：url = \(jsonResponse.request?.url?.absoluteString ?? ""),jsonData = \(jsonData)")
                     response(jsonData, nil, jsonResponse.metrics?.taskInterval.duration)
-                }else {
+                } else {
                     response(nil, PQError(msg: "数据为空", code: 1), jsonResponse.metrics?.taskInterval.duration)
                 }
             case let .failure(error):
                 let errorResult = dealWithError(error: error)
                 response(nil, PQError(msg: errorResult.msg, code: errorResult.code), jsonResponse.metrics?.taskInterval.duration)
-//                DebugPrint("网络请求-失败：url = \(jsonResponse.request?.url?.absoluteString ?? ""),error = \(String(describing: jsonResponse.error?.localizedDescription))")
+                NTLog(message: "网络请求-失败：url = \(jsonResponse.request?.url?.absoluteString ?? ""),error = \(String(describing: jsonResponse.error?.localizedDescription))")
             }
         }
     }
@@ -202,70 +201,73 @@ public class SWNetRequest: NSObject {
         if let error = error as? AFError {
             switch error {
             case let .invalidURL(url):
-                DebugPrint("网球请求-处理错误：Invalid URL: \(url) - \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：Invalid URL: \(url) - \(error.localizedDescription)")
                 code = .valideUrl
                 msg = "请求地址检验失败"
             case let .parameterEncodingFailed(reason):
-                DebugPrint("网球请求-处理错误：parameterEncodingFailed \(error.localizedDescription)，Reason: \(reason)")
+                NTLog(message: "网球请求-处理错误：parameterEncodingFailed \(error.localizedDescription)，Reason: \(reason)")
             case let .multipartEncodingFailed(reason):
-                DebugPrint("网球请求-处理错误：multipartEncodingFailed: \(error.localizedDescription)，\(reason)")
+                NTLog(message: "网球请求-处理错误：multipartEncodingFailed: \(error.localizedDescription)，\(reason)")
             case let .responseValidationFailed(reason):
-                DebugPrint("网球请求-处理错误：responseValidationFailed: \(error.localizedDescription)，Reason: \(reason)")
+                NTLog(message: "网球请求-处理错误：responseValidationFailed: \(error.localizedDescription)，Reason: \(reason)")
                 switch reason {
                 case .dataFileNil, .dataFileReadFailed:
-                    DebugPrint("网球请求-处理错误：Downloaded file could not be read")
+                    NTLog(message: "网球请求-处理错误：Downloaded file could not be read")
                 case let .missingContentType(acceptableContentTypes):
-                    DebugPrint("网球请求-处理错误：Content Type Missing: \(acceptableContentTypes)")
+                    NTLog(message: "网球请求-处理错误：Content Type Missing: \(acceptableContentTypes)")
                 case let .unacceptableContentType(acceptableContentTypes, responseContentType):
-                    DebugPrint("网球请求-处理错误：Response content type: \(responseContentType) was unacceptable: \(acceptableContentTypes)")
+                    NTLog(message: "网球请求-处理错误：Response content type: \(responseContentType) was unacceptable: \(acceptableContentTypes)")
                 case let .unacceptableStatusCode(code):
-                    DebugPrint("网球请求-处理错误：Response status code was unacceptable: \(code)")
+                    NTLog(message: "网球请求-处理错误：Response status code was unacceptable: \(code)")
                 case let .customValidationFailed(error: error):
-                    DebugPrint("网球请求-处理错误：customValidationFailed: \(error)")
+                    NTLog(message: "网球请求-处理错误：customValidationFailed: \(error)")
                 }
             case let .responseSerializationFailed(reason):
-                DebugPrint("网球请求-处理错误：Response serialization failed: \(error.localizedDescription)")
-                DebugPrint("Failure Reason: \(reason)")
+                NTLog(message: "网球请求-处理错误：Response serialization failed: \(error.localizedDescription)")
+                NTLog(message: "Failure Reason: \(reason)")
             case let .createUploadableFailed(error: error):
-                DebugPrint("网球请求-处理错误：createUploadableFailed: \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：createUploadableFailed: \(error.localizedDescription)")
             case let .createURLRequestFailed(error: error):
-                DebugPrint("createURLRequestFailed: \(error.localizedDescription)")
+                NTLog(message: "createURLRequestFailed: \(error.localizedDescription)")
             case let .downloadedFileMoveFailed(error: error, source: source, destination: destination):
-                DebugPrint("网球请求-处理错误：downloadedFileMoveFailed: \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：downloadedFileMoveFailed: \(error.localizedDescription),\(source),\(destination)")
             case .explicitlyCancelled:
-                DebugPrint("网球请求-处理错误：explicitlyCancelled: \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：explicitlyCancelled: \(error.localizedDescription)")
             case let .parameterEncoderFailed(reason: reason):
-                DebugPrint("网球请求-处理错误：parameterEncoderFailed: \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：parameterEncoderFailed: \(error.localizedDescription),\(reason)")
             case let .requestAdaptationFailed(error: error):
-                DebugPrint("网球请求-处理错误：requestAdaptationFailed: \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：requestAdaptationFailed: \(error.localizedDescription)")
             case let .requestRetryFailed(retryError: retryError, originalError: originalError):
-                DebugPrint("网球请求-处理错误：requestRetryFailed:  retryError = \(retryError),originalError = \(originalError)\(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：requestRetryFailed:  retryError = \(retryError),originalError = \(originalError)\(error.localizedDescription)")
             case let .serverTrustEvaluationFailed(reason: reason):
-                DebugPrint("网球请求-处理错误：serverTrustEvaluationFailed: - \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：serverTrustEvaluationFailed: - \(error.localizedDescription),\(reason)")
             case .sessionDeinitialized:
-                DebugPrint("网球请求-处理错误：sessionDeinitialized:  \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：sessionDeinitialized:  \(error.localizedDescription)")
             case let .sessionInvalidated(error: error):
-                DebugPrint("网球请求-处理错误：sessionInvalidated: \(error?.localizedDescription)")
-            case let .sessionTaskFailed(error: error):
-                DebugPrint("网球请求-处理错误：sessionTaskFailed:error = \(error)  \(error.localizedDescription)")
-                code = errorCode.init(rawValue: (error as? NSError)?.code ?? 1) ?? .nomal
+                NTLog(message: "网球请求-处理错误：sessionInvalidated: \(String(describing: error?.localizedDescription))")
+            case let .sessionTaskFailed(error: failError):
+                NTLog(message: "网球请求-处理错误：sessionTaskFailed:error = \(error)  \(error.localizedDescription)")
+                code = errorCode.init(rawValue: (failError as? NSError)?.code ?? 1) ?? .nomal
                 if code == .netLost || code == .tomeOut {
                     msg = "网络不给力"
                 }
             case let .urlRequestValidationFailed(reason: reason):
-                DebugPrint("网球请求-处理错误：urlRequestValidationFailed: \(error.localizedDescription)")
+                NTLog(message: "网球请求-处理错误：urlRequestValidationFailed: \(error.localizedDescription),\(reason)")
             }
-            DebugPrint("网球请求-处理错误：Underlying error: \(String(describing: error.underlyingError))")
+            NTLog(message: "网球请求-处理错误：Underlying error: \(String(describing: error.underlyingError))")
         } else {
-            DebugPrint("网球请求-处理错误：Unknown error: \(String(describing: error))")
+            NTLog(message: "网球请求-处理错误：Unknown error: \(String(describing: error))")
         }
         return (code.rawValue, msg)
     }
 }
 
-func DebugPrint(_ printString:String){
+/** 打印 */
+func NTLog<T>(message: T, fileName: String = #file, methodName: String = #function, lineNumber: Int = #line) {
     #if DEBUG
-//        print(printString)
+        print("👉func: \((fileName.components(separatedBy: "/").last)!).\(methodName)\n  time: \(Int64(CFAbsoluteTimeGetCurrent() * 1000))\n  line: \(lineNumber)\n  message: \(message)👈")
+    #else
+
     #endif
 }