网络请求缓存封装一半

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -215,7 +215,6 @@
 		A79057062276EA3D0037F823 /* OpenCityListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057052276EA3D0037F823 /* OpenCityListModel.swift */; };
 		A7A17E5F22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */; };
 		A7A17E6322A102B700B7A77E /* BaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A17E6222A102B700B7A77E /* BaseModel.swift */; };
-		A7A17E6522A1307900B7A77E /* ConfigModel1.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A17E6422A1307800B7A77E /* ConfigModel1.swift */; };
 		A7A98DFD227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */; };
 		A7A98DFF227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */; };
 		A7A98E02227E8900005306E9 /* ProductSearchListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98E01227E8900005306E9 /* ProductSearchListModel.swift */; };
@@ -617,7 +616,6 @@
 		A79057052276EA3D0037F823 /* OpenCityListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenCityListModel.swift; sourceTree = "<group>"; };
 		A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkManagerTools.swift; sourceTree = "<group>"; };
 		A7A17E6222A102B700B7A77E /* BaseModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseModel.swift; sourceTree = "<group>"; };
-		A7A17E6422A1307800B7A77E /* ConfigModel1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigModel1.swift; sourceTree = "<group>"; };
 		A7A59A7722363CCB00417FA4 /* RainbowPlanet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RainbowPlanet.entitlements; sourceTree = "<group>"; };
 		A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceProductApi.swift; sourceTree = "<group>"; };
 		A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceProduct.swift; sourceTree = "<group>"; };
@@ -2275,7 +2273,6 @@
 			isa = PBXGroup;
 			children = (
 				A715333D22980CC60017C861 /* ConfigModel.swift */,
-				A7A17E6422A1307800B7A77E /* ConfigModel1.swift */,
 				A79057052276EA3D0037F823 /* OpenCityListModel.swift */,
 				A757C92F2274839900226355 /* SelfMentionAddressListModel.swift */,
 				BDD22F0A228FAA5B00D43BFB /* ImageUrlModel.swift */,
@@ -3427,7 +3424,6 @@
 				A70B2C532288584500B2449F /* ShareView.swift in Sources */,
 				A71AF0AE226EF0A3001730FE /* SearchHeaderCollectionReusableView.swift in Sources */,
 				A7636AC52268139C00374F9E /* LocationViewController.swift in Sources */,
-				A7A17E6522A1307900B7A77E /* ConfigModel1.swift in Sources */,
 				A7D46090227617D200A5A54E /* SQLModel.swift in Sources */,
 				A72C01222275404A0065E0C3 /* ProvinceCityAreaModel.swift in Sources */,
 				A7FF1579228C82CE00A85748 /* OrderDetailViewController.swift in Sources */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -23,9 +23,6 @@ extension AppDelegate {
             /// 设置全局的navigation
             self?.setNavBarAppearence()
         }
-        // 获取默认配置
-//        SwiftMoyaNetWorkServiceConfig.shared().configPickupNodeIndexApi1 { (data) -> (Void) in
-//        }
         if (UserModel.shared().getModel()?.token) != nil && (DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType) != nil {
             /// 设置Tabbar
             /// 刷新token

RainbowPlanet/RainbowPlanet/Service/Model/ConfigModel/ConfigModel1.swift

@@ -1,23 +0,0 @@
-//
-//	ConfigModel1.swift
-//	Model file generated using JSONExport: https://github.com/Ahmed-Ali/JSONExport
-
-import RealmSwift
-
-class ConfigModel1: Object {
-
-	dynamic var orderExpiredTime: String!
-
-
-	/**
-	 * Instantiate the instance using the passed dictionary values to set the properties values
-	 */
-	class func fromDictionary(dictionary: [String:Any]) -> ConfigModel1	{
-		let this = ConfigModel1()
-		if let orderExpiredTimeValue = dictionary["order_expired_time"] as? String{
-			this.orderExpiredTime = orderExpiredTimeValue
-		}
-		return this
-	}
-
-}

RainbowPlanet/RainbowPlanet/Service/Model/RootModel/BaseModel.swift

@@ -3,29 +3,22 @@
 //	Model file generated using JSONExport: https://github.com/Ahmed-Ali/JSONExport
 
 import RealmSwift
+import SwiftyJSON
+
+public protocol Object {
+    init(json:JSON)
+}
 
 class BaseModel: Object {
+
+    dynamic var code: Int?
+    dynamic var data: Any
+    dynamic var msg: String?
     
-    dynamic var code: Int = 0
-    dynamic var data: Any!
-    dynamic var msg: String!
-    
-    
-    /**
-     * Instantiate the instance using the passed dictionary values to set the properties values
-     */
-    class func fromDictionary(dictionary: [String:Any]) -> BaseModel    {
-        let this = BaseModel()
-        if let codeValue = dictionary["code"] as? Int{
-            this.code = codeValue
-        }
-        if let dataValue = dictionary["data"]  {
-            this.data = dataValue
-        }
-        if let msgValue = dictionary["msg"] as? String{
-            this.msg = msgValue
-        }
-        return this
+    required init(json: JSON) {
+        code = json["code"].int
+        msg = json["msg"].string
+        data = json["data"].object
     }
     
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift

@@ -35,20 +35,6 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
         }
     }
     
-    /// 前端config配置
-    ///
-    /// - Parameter completion: 回调
-    func configPickupNodeIndexApi1(completion: @escaping apiCallBack) {
-        let parameters = Dictionary<String,Any>()
-        
-        SwiftProgressHUD.shared().showWait()
-        SwiftRXMoyaReamlObjectSwiftJsonNetWorkManager.shared.requestObject(ConfigModel1.self, target: MultiTarget(SwiftMoyaServiceConfigApi.configConfig(parameters: parameters))) { (configModel) in
-            SwiftProgressHUD.shared().hide()
-            completion(configModel)
-        }
-
-    }
-    
     /// 自提点列表
     ///
     /// - Parameters:

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftRXMoyaReamlObjectSwiftJsonNetWorkManager.swift

@@ -189,10 +189,10 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                 if response.statusCode == 200 {
                     NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
                     
-                    let baseModel = BaseModel.fromDictionary(dictionary: json.dictionary ?? Dictionary())
+                    let baseModel = BaseModel.init(json: json)
                     if baseModel.code  == 0 {
-//                        let object = try JSON(data: baseModel.data).object
-                        return Single<Any?>.just(nil)
+                        let object = baseModel.data
+                        return Single<Any?>.just(object)
                     }else if baseModel.code  == 1 {
                         SwiftProgressHUD.shared().showText(baseModel.msg ?? "信息有误!!!")
                         return Single<Any?>.just(nil)
@@ -231,10 +231,10 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                 if response.statusCode == 200 {
                     NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
                     
-                    let baseModel = BaseModel.fromDictionary(dictionary: json.dictionary ?? Dictionary())
+                    let baseModel = BaseModel.init(json: json)
                     if baseModel.code  == 0 {
-//                        let object =
-                        return Single<T?>.just(nil)
+                        let object = T(json: JSON(baseModel.data))
+                        return Single<T?>.just(object)
                     }else if baseModel.code  == 1 {
                         SwiftProgressHUD.shared().showText(baseModel.msg ?? "信息有误!!!")
                         return Single<T?>.just(nil)
@@ -276,10 +276,10 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
                     let url = String(describing: response.request!.url!)
                     NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json.description)")
                     
-                    let baseModel = BaseModel.fromDictionary(dictionary: json.dictionary ?? Dictionary())
+                    let baseModel = BaseModel.init(json: json)
                     if baseModel.code  == 0 {
-//                        let objects = try JSON(data: baseModel.data).arrayObject as! [T]
-                        return Single<[T]?>.just(nil)
+                        let objects =  JSON(baseModel.data).arrayObject as! [T]
+                        return Single<[T]?>.just(objects)
                     }else if baseModel.code  == 1 {
                         SwiftProgressHUD.shared().showText(baseModel.msg ?? "信息有误!!!", textAlignment: .left)
                         return Single<[T]?>.just(nil)