1.0.8 release

xiaozao2008 · Nov 17, 2017 · 60724fa · 60724fa
1 parent c1ea8f9
commit 60724fa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/WolfNet.podspec b/WolfNet.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "WolfNet"
-  s.version      = "1.0.7"
+  s.version      = "1.0.8"
   s.summary      = "泛型的网络请求与解析"
   s.homepage     = "https://github.com/xiaozao2008/WolfNet"
   s.license      = "MIT"

diff --git a/WolfNet/Wolf/WolfBaseModel.swift b/WolfNet/Wolf/WolfBaseModel.swift
@@ -9,9 +9,9 @@
 import ObjectMapper
 import Foundation
 
-public class WolfEmpty<T: Mappable>: Mappable {
+public class WolfEmpty: Mappable {
 
-    required public init?(map: Map) {
+    public required init?(map: Map) {
     }
 
     public func mapping(map: Map) {

diff --git a/WolfNet/Wolf/WolfNetwork.swift b/WolfNet/Wolf/WolfNetwork.swift
@@ -75,21 +75,21 @@ public class WolfNetwork {
 
 struct Model {
 
-    static func objectFromJSON<T: Mappable>(_ Json: Data, _ msg: ((String?, Int?) -> Void)) -> WolfBaseModel<T>? {
+    static func objectFromJSON<T: Mappable>(_ Json: Data, _ msg: ((String?, Int?) -> Void)?) -> WolfBaseModel<T>? {
         let mapperModel = Mapper<WolfBaseModel<T>>()
         if let json = String.init(data: Json, encoding: .utf8) {
             let object = mapperModel.map(JSONString: json)
-            msg(object?.msg, object?.code)
+            msg?(object?.msg, object?.code)
             return object
         }
         return nil
     }
 
-    static func listFromJSON<T: Mappable>(_ Json: Data, _ msg: ((String?, Int?) -> Void)) -> WolfListModel<T>? {
+    static func listFromJSON<T: Mappable>(_ Json: Data, _ msg: ((String?, Int?) -> Void)?) -> WolfListModel<T>? {
         let mapperModel = Mapper<WolfListModel<T>>()
         if let json = String.init(data: Json, encoding: .utf8) {
             let object = mapperModel.map(JSONString: json)
-            msg(object?.msg, object?.code)
+            msg?(object?.msg, object?.code)
             return object
         }
         return nil