Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  网络请求封装 返回具体模型出去

galaxy/Podfile

@@ -87,6 +87,8 @@ target 'galaxy' do
   
   #富文本库
   pod 'AttributedString','3.3.5'
+  #json转模型
+  pod 'HandyJSON', '~> 5.0.2'
 end
 
 

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -21,14 +21,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
-//            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel
+            let dic = json.data
             guard let resultModel = YHHomeCofigMode.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock(false,nil)
                 return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift

@@ -151,15 +151,10 @@ extension YHBasicInfoFillViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
+            printLog("model 是 ==> \(json)")
             
-            if model.code == 200 {
-                let dic = model.data?.peel
+            if json.code == 200 {
+                let dic = json.data
                 guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     callBackBlock(false,nil)
                     return
@@ -170,7 +165,7 @@ extension YHBasicInfoFillViewModel {
                 callBackBlock(true,nil)
                 
             } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 callBackBlock(false,error)
             }
         } failBlock: { err in
@@ -187,17 +182,12 @@ extension YHBasicInfoFillViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == 200 {
+            printLog("model 是 ==> \(json)")
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
                 
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 callBackBlock(false,error)
                 
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHEducationRequestViewModel.swift

@@ -27,14 +27,9 @@ class YHEducationRequestViewModel {
            
            YHHUD.hide()
            guard let self = self else { return }
-           guard let model = NetBaseModel.deserialize(dict: json) else {
-               let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-               callBackBlock(false,error)
-               return
-           }
-           printLog("model 是 ==> \(model)")
-           let dic = model.data?.peel as? [AnyHashable : Any]
-           guard let resultModel = YHEducationListInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
+           printLog("model 是 ==> \(json)")
+           let dic = json.data as? [AnyHashable : Any]
+           guard let resultModel = YHEducationListInfo.deserialize(dict: dic) else {
 
                callBackBlock(false,nil)
                return
@@ -58,14 +53,9 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel as? [AnyHashable : Any]
-            guard let resultModel = YHEducationDetailInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
+            printLog("model 是 ==> \(json)")
+            let dic = json.data as? [AnyHashable : Any]
+            guard let resultModel = YHEducationDetailInfo.deserialize(dict: dic) else {
 
                 callBackBlock(false,nil)
                 return
@@ -89,13 +79,8 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == NetWorkCode.success.rawValue {
+            printLog("model 是 ==> \(json)")
+            if json.code == NetWorkCode.success.rawValue {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, nil)
@@ -117,13 +102,8 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == NetWorkCode.success.rawValue {
+            printLog("model 是 ==> \(json)")
+            if json.code == NetWorkCode.success.rawValue {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, nil)
@@ -145,13 +125,8 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == NetWorkCode.success.rawValue {
+            printLog("model 是 ==> \(json)")
+            if json.code == NetWorkCode.success.rawValue {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, nil)
@@ -173,13 +148,8 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == NetWorkCode.success.rawValue {
+            printLog("model 是 ==> \(json)")
+            if json.code == NetWorkCode.success.rawValue {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, nil)
@@ -201,13 +171,8 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if let dic = model.data?.peel as? [AnyHashable : Any] {
+            printLog("model 是 ==> \(json)")
+            if let dic = json.data as? [AnyHashable : Any] {
                 guard let quaDict = dic["qua_data"] as? [AnyHashable : Any] ,  let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict  as? [AnyHashable : Any]) else {
 
                     callBackBlock(false,nil)
@@ -238,13 +203,8 @@ class YHEducationRequestViewModel {
             
             YHHUD.hide()
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == NetWorkCode.success.rawValue {
+            printLog("model 是 ==> \(json)")
+            if json.code == NetWorkCode.success.rawValue {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, nil)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -23,13 +23,9 @@ class YHFamilyRequestViewModel {
             
             guard let self = self else { return }
              
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel as? [AnyHashable : Any]
+            
+            printLog("model 是 ==> \(json)")
+            let dic = json.data as? [AnyHashable : Any]
             
             guard var dic = dic else { return }
             
@@ -88,13 +84,8 @@ if let brother = dic["brother"], brother is [[String: Any]] {
            
            YHHUD.hide()
            guard let self = self else { return }
-           guard let model = NetBaseModel.deserialize(dict: json) else {
-               let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-               callBackBlock(false,error)
-               return
-           }
-           printLog("model 是 ==> \(model)")
-           if model.code == NetWorkCode.success.rawValue {
+           printLog("model 是 ==> \(json)")
+           if json.code == NetWorkCode.success.rawValue {
                callBackBlock(true,nil)
            } else {
                callBackBlock(false, nil)
@@ -113,13 +104,8 @@ if let brother = dic["brother"], brother is [[String: Any]] {
         
         let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
             YHHUD.hide()
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            if model.code == NetWorkCode.success.rawValue {
+            printLog("model 是 ==> \(json)")
+            if json.code == NetWorkCode.success.rawValue {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, nil)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -215,13 +215,8 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(nil,error)
-                return
-            }
-            let dic = model.data?.peel
+
+            let dic = json.data
             guard let result = YHMainInformationModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock(nil,nil)
                 return
@@ -301,7 +296,6 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.updateInformation
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             guard let self = self else { return }
-            printLog("code = \(json["code"]) ---- message =\(json["msg"])")
             callBackBlock(true)
         } failBlock: { err in
             callBackBlock(false)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHSelectCountryViewModel.swift

@@ -19,14 +19,8 @@ class YHSelectCountryViewModel: NSObject {
         YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock([],error)
-                return
-            }
 ////            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel
+            let dic = json.data
             guard let resultArray = [YHCountryMessage].deserialize(array: dic as? [Any]) else {
                 callBackBlock([],nil)
                 return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift

@@ -260,13 +260,8 @@ extension YHOtherInfoFillViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel
+            printLog("model 是 ==> \(json)")
+            let dic = json.data
             guard let resultModel = YHOtherInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock(false,nil)
                 return
@@ -289,18 +284,13 @@ extension YHOtherInfoFillViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
+            printLog("model 是 ==> \(json)")
             //根据返回值 组装 真实的数据
             
-            if model.code == 200 {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 callBackBlock(false,error)
             }
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHCompanyViewModel.swift

@@ -18,13 +18,7 @@ class YHCompanyViewModel: YHBaseViewModel {
         YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock([],error)
-                return
-            }
-            let dic = model.data?.peel
+            let dic = json.data
             guard let result = YHCompanyModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock([],nil)
                 return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkExperienceViewModel.swift

@@ -139,13 +139,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
-            let dic = model.data?.peel
+            let dic = json.data
             guard let result = [YHWorkExampleModel].deserialize(array: dic as? [Any]) else {
                 callBackBlock(false,nil)
                 return
@@ -162,13 +156,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
-            let dic = model.data?.peel
+            let dic = json.data
             guard let result = YHWorkExperienceDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock(false,nil)
                 return
@@ -252,13 +240,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock([],error)
-                return
-            }
-            let dic = model.data?.peel
+            let dic = json.data
             guard let resultArray = [YHWorkExperienceProjectModel].deserialize(array: dic as? [Any]) else {
                 callBackBlock([],nil)
                 return
@@ -276,12 +258,6 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
             callBackBlock(true, nil)
         } failBlock: { err in
             callBackBlock(false, err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkIntroductionViewModel.swift

@@ -20,13 +20,7 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
-            let dic = model.data?.peel
+            let dic = json.data
             guard let result = [YHWorkExampleModel].deserialize(array: dic as? [Any]) else {
                 callBackBlock(false,nil)
                 return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkItemListViewModel.swift

@@ -21,13 +21,7 @@ class YHWorkItemListViewModel: YHBaseViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock([],error)
-                return
-            }
-            let dic = model.data?.peel
+            let dic = json.data
             guard let result = YHWorkModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock([],nil)
                 return
@@ -45,12 +39,6 @@ class YHWorkItemListViewModel: YHBaseViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
             callBackBlock(true, nil)
         } failBlock: { err in
             callBackBlock(false, err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -37,13 +37,8 @@ extension YHServiceCenterMainViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel
+            printLog("model 是 ==> \(json)")
+            let dic = json.data
             guard let resultModel = YHScoreResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 callBackBlock(false,nil)
                 return
@@ -70,15 +65,10 @@ extension YHServiceCenterMainViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
+            printLog("model 是 ==> \(json)")
             
-            if model.code == 200 {
-                let dic = model.data?.peel
+            if json.code == 200 {
+                let dic = json.data
                 guard let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     arrContactList = []
                     callBackBlock(false,nil)
@@ -89,7 +79,7 @@ extension YHServiceCenterMainViewModel {
                 
             } else {
                 arrContactList = []
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg.count > 0 ? model.msg : "数据错误")
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
                 callBackBlock(false,error)
             }
         } failBlock: { err in
@@ -105,17 +95,12 @@ extension YHServiceCenterMainViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
+            printLog("model 是 ==> \(json)")
             
             arrContactStausItmes = []
             
-            if model.code == 200 {
-                let dic = model.data?.peel
+            if json.code == 200 {
+                let dic = json.data
                 guard let resultModel = YHContactMainItemStatusModel2.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     self.arrContactStausItmes = []
                     callBackBlock(false,nil)
@@ -152,7 +137,7 @@ extension YHServiceCenterMainViewModel {
                 }
                 callBackBlock(true,nil)
             } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg.count > 0 ? model.msg : "数据错误")
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
                 callBackBlock(false,error)
             }
             
@@ -170,16 +155,8 @@ extension YHServiceCenterMainViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                self.arrInfoFillStep = []
-                informationFillStepModel = nil
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
-            let dic = model.data?.peel
+            printLog("model 是 ==> \(json)")
+            let dic = json.data
             guard let resultModel = YHPersonInfoFillStepModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 self.arrInfoFillStep = []
                 informationFillStepModel = nil
@@ -187,10 +164,8 @@ extension YHServiceCenterMainViewModel {
                 return
             }
             
-            arrInfoFillStep.removeAll()
-            
-            if model.code == 200 {
-                
+            if json.code == 200 {
+                arrInfoFillStep.removeAll()
                 informationFillStepModel = resultModel
                 myInfoFillStep = resultModel.step
                 
@@ -223,7 +198,7 @@ extension YHServiceCenterMainViewModel {
                 
             } else {
                 
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 self.arrInfoFillStep = []
                 informationFillStepModel = nil
             }
@@ -241,13 +216,7 @@ extension YHServiceCenterMainViewModel {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Users.submitSweetNotifyApi
         let _ = YHNetRequest.postRequest(url: strUrl,params: params) {json, code in
             //1. json字符串 转 对象
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-
-                callBackBlock(false,error)
-                return
-            }
-            printLog("model 是 ==> \(model)")
+            printLog("model 是 ==> \(json)")
             callBackBlock(true,nil)
         } failBlock: { err in
             callBackBlock(false,err)

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -27,18 +27,12 @@ extension YHLoginViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
             guard let self = self else { return }
             
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                callBackBlock( false,error)
-                return
-            }
-            
             //1. json字符串 转 对象
-            if model.code == 200 {
-                YHHUD.flash(message: model.msg)
+            if json.code == 200 {
+                YHHUD.flash(message: json.msg)
                 callBackBlock(true,nil)
             } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 callBackBlock(false,error)
             }
         } failBlock: { err in
@@ -57,14 +51,8 @@ extension YHLoginViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let model = NetBaseModel.deserialize(dict: json) else {
-                let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
-                
-                callBackBlock(false,error)
-                return
-            }
-            printLog(model)
-            let dic = model.data?.peel
+            printLog(json)
+            let dic = json.data
             guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
                 callBackBlock(false,error)
@@ -72,7 +60,7 @@ extension YHLoginViewModel {
             }
             
             
-            if model.code == 200 {
+            if json.code == 200 {
                 if resultModel.token?.count != 0 {
                     //token 正常
                     self.userModel = resultModel
@@ -90,7 +78,7 @@ extension YHLoginViewModel {
                     callBackBlock(false,error)
                 }
             } else {                
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code), errorMsg: model.msg)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
                 callBackBlock(false,error)
             }
         } failBlock: { err in

galaxy/galaxy/Classes/Tools/NetWork/NetBaseModel.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import SmartCodable
+import HandyJSON
 
 enum NetWorkCode: Int {
     case success = 200
@@ -31,3 +32,9 @@ struct TestModel: SmartCodable {
         case test3 = "test333" //字段 映射
     }
 }
+
+struct NetWorkBaseModel: HandyJSON {
+    var data : Any?
+    var code : Int = -1
+    var msg : String = ""
+}

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -51,6 +51,7 @@ public struct YHErrorModel {
 class YHNetRequest: NSObject {
     ///成功回调
     typealias SuccessHandlerType = (([String:Any],Int) ->Void)
+    typealias SuccessResultType = ((NetWorkBaseModel,Int) ->Void)
     ///失败回调
     typealias FailureHandlerType = ((YHErrorModel) -> Void)
     ///请求类型
@@ -60,7 +61,7 @@ class YHNetRequest: NSObject {
     ///  参数
     private var params: [String:Any]?
     ///  成功的回调
-    private var success: SuccessHandlerType?
+    private var success: SuccessResultType?
     ///  失败的回调
     private var failure: FailureHandlerType?
     ///  headers 设置
@@ -126,7 +127,7 @@ class YHNetRequest: NSObject {
         return self
     }
     ///成功
-    func success(_ handler:@escaping SuccessHandlerType) -> Self {
+    func success(_ handler:@escaping SuccessResultType) -> Self {
         self.success = handler
         return self
     }
@@ -227,16 +228,18 @@ class YHNetRequest: NSObject {
             break
         }
         
+        if statusCode == 200 {
+            guard let obj = NetWorkBaseModel.deserialize(from: serverDict) else {
+                guard let errorBlock = self.failure else { return }
+                let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)
+                errorBlock(errorModel)
+                return
+            }
 #if DEBUG
-        printLog("网络返回的数据 ===> ")
-        printLog(serverDict)
+            printLog("服务器返回数据是：\(obj)")
 #endif
-        if statusCode == 200 {
             guard let suclock = self.success else { return }
-            
-            let dittt = self.handleJsonObjectNullValue(serverDict)
-            suclock(dittt as? [String : Any] ?? [:], statusCode)
-            //            suclock(serverDict, statusCode)
+            suclock(obj, statusCode)
         } else {
             guard let errorBlock = self.failure else { return }
             
@@ -244,55 +247,21 @@ class YHNetRequest: NSObject {
             errorBlock(errorModel)
         }
     }
-    
-    
-    //处理对象为空的情况
-    func handleJsonObjectNullValue(_ jsonObject: Any) -> Any {
-        if let jsonArray = jsonObject as? Array<Any> {
-            let noNullArray: [Any] = jsonArray.map { value in
-                if value is NSNull {
-                    return ""
-                }else if let value = value as? Array<Any> {
-                    return handleJsonObjectNullValue(value)
-                }else if let value = value as? Dictionary<AnyHashable, Any> {
-                    return handleJsonObjectNullValue(value)
-                }else {
-                    return value
-                }
-            }
-            return noNullArray
-        }else if let jsonDic = jsonObject as? Dictionary<AnyHashable, Any> {
-            let noNullDic: [AnyHashable: Any] = jsonDic.mapValues { value in
-                if value is NSNull {
-                    return ""
-                }else if let value = value as? Array<Any> {
-                    return handleJsonObjectNullValue(value)
-                }else if let value = value as? Dictionary<AnyHashable, Any> {
-                    return handleJsonObjectNullValue(value)
-                }else {
-                    return value
-                }
-            }
-            return noNullDic
-        }
-        return jsonObject
-    }
-    
 }
 
 extension YHNetRequest {
-    class func getRequest(url:String, params:[String:Any] = [:], successBlock: SuccessHandlerType!, failBlock: FailureHandlerType!) -> Request? {
+    class func getRequest(url:String, params:[String:Any] = [:], successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
         
         printLog("\n发起请求的URL是===> url = \(url)")
         return YHNetRequest().url(url).requestType(.get).params(params).success(successBlock).failed(failBlock).startRequest()
     }
     
-    class func postRequest(url:String, params:[String:Any] = [:], successBlock: SuccessHandlerType!, failBlock: FailureHandlerType!) -> Request? {
+    class func postRequest(url:String, params:[String:Any] = [:], successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
         printLog("\n发起请求的URL是===> url = \(url)")
         return YHNetRequest().url(url).requestType(.post).params(params).success(successBlock).failed(failBlock).startRequest()
     }
     
-    class func uplaodRequest(url:String, headers:HTTPHeaders, image: UIImage, successBlock: SuccessHandlerType!, failBlock: FailureHandlerType!) -> Request? {
+    class func uplaodRequest(url:String, headers:HTTPHeaders, image: UIImage, successBlock: SuccessResultType!, failBlock: FailureHandlerType!) -> Request? {
         printLog("\n发起请求的URL是===> url = \(url)")
         return YHNetRequest().url(url).success(successBlock).failed(failBlock).uploadRequest(headers, image)
     }