Selaa lähdekoodia

1.请求参数变化

wenweiwei 3 vuotta sitten
vanhempi
commit
8a10d0167e

+ 1 - 1
BFCommonKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'BFCommonKit'
-  s.version          = '1.1.6'
+  s.version          = '1.1.7'
   s.summary          = 'A short description of BFCommonKit.'
   s.swift_version    = '5.0'
 # This description is used to generate tags and improve search results.

+ 9 - 1
BFCommonKit/Classes/BFConfig/PQBFConfig.swift

@@ -86,7 +86,15 @@ public class PQBFConfig: NSObject {
 
     // 是否可打印 LOG
     public var enableBFLog: Bool = false
-
+    
+    // 业务需求-先下沉
+    public var sessionId: String = ""
+    public var subSessionId: String?
+    public var deviceToken: String?
+    public var token: String?
+    public var loginUid: String?
+    public var uid: String?
+    
     override private init() {
         super.init()
     }

+ 13 - 13
BFCommonKit/Classes/BFUtility/PQCommonMethodUtil.swift

@@ -131,7 +131,7 @@ public func kf_imageCacheImage(originUrl: String, completeHandle: @escaping (_ i
 }
 
 /** 打印 */
-public func BFLog<T>(message: T) {
+public func BFLog<T>(message _: T) {
 //    let logger = NXLogger.shared
 //
 //    logger.level = .info
@@ -163,24 +163,24 @@ public func commonParams() -> [String: Any] {
         "clientTimestamp": Int64(Date().timeIntervalSince1970 * 1000),
         "platform": "iOS",
         "versionName": versionName,
-//        "sessionId": PQSingletoMemoryUtil.shared.sessionId,
-//        "subSessionId": PQSingletoMemoryUtil.shared.subSessionid ?? PQSingletoMemoryUtil.shared.sessionId,
         "mid": getMachineCode(),
         "machineInfo": dictionaryToJsonString(machineInfo) ?? "",
-//        "abInfoData": dictionaryToJsonString(PQSingletoMemoryUtil.shared.abInfoData) ?? "",
         "requestId": getUniqueId(desc: "requestId"),
         "idfa": ASIdentifierManager.shared().advertisingIdentifier.uuidString,
         "idfv": UIDevice.current.identifierForVendor?.uuidString ?? "",
-//        "deviceToken": PQSingletoMemoryUtil.shared.deviceToken,
+        "sessionId": PQBFConfig.shared.sessionId,
+        "subSessionId": PQBFConfig.shared.subSessionId ?? PQBFConfig.shared.sessionId,
     ]
-//    if BFLoginUserInfo.shared.accessToken.count > 0 {
-//        commParams["token"] = BFLoginUserInfo.shared.accessToken
-//    }
-//    if BFLoginUserInfo.shared.uid.count > 0 {
-//        commParams["loginUid"] = BFLoginUserInfo.shared.uid
-//        commParams["uid"] = BFLoginUserInfo.shared.uid
-//    }
-//    showAlertVc(title: "公参", message: dictionaryToJsonString(commParams))
+    if PQBFConfig.shared.token != nil, (PQBFConfig.shared.token?.count ?? 0) > 0 {
+        commParams["token"] = PQBFConfig.shared.token ?? ""
+    }
+    if PQBFConfig.shared.loginUid != nil, (PQBFConfig.shared.loginUid?.count ?? 0) > 0 {
+        commParams["loginUid"] = PQBFConfig.shared.loginUid ?? ""
+        commParams["uid"] = PQBFConfig.shared.loginUid ?? ""
+    }
+    if PQBFConfig.shared.deviceToken != nil, (PQBFConfig.shared.deviceToken?.count ?? 0) > 0 {
+        commParams["deviceToken"] = PQBFConfig.shared.deviceToken ?? ""
+    }
     return commParams
 }