diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index b488a66..76ebe6e 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling/HttpRequestCenter/RequestList.swift b/OrderScheduling/HttpRequestCenter/RequestList.swift index b2f2d6a..bb38e3b 100644 --- a/OrderScheduling/HttpRequestCenter/RequestList.swift +++ b/OrderScheduling/HttpRequestCenter/RequestList.swift @@ -28,8 +28,8 @@ open class RequestList { return DDAF.post(urlString: HOST+API.login,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel.self) } - func token(parameters:Encodable) -> Single?> { - return DDAF.post(urlString: HOST+API.token,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel.self) + func token(parameters:Encodable) -> Single?> { + return DDAF.post(urlString: HOST+API.token,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel.self) } func logout(parameters:Encodable) -> Single?> { diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 6883c86..a79854e 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -31,7 +31,7 @@ class LoginDataModel : Decodable { var expiresAt : Double? } public class LoginDataAdditionalModel: Decodable { - var user_info : LoginDataAdditionalUserModel + var user_info : LoginDataAdditionalUserModel? } public class LoginDataAdditionalUserModel: Decodable { var userId : Int diff --git a/OrderScheduling/Login/ViewController/LoginController.swift b/OrderScheduling/Login/ViewController/LoginController.swift index b8ec993..d32ae52 100644 --- a/OrderScheduling/Login/ViewController/LoginController.swift +++ b/OrderScheduling/Login/ViewController/LoginController.swift @@ -163,7 +163,7 @@ extension LoginController { if let token = responseModel?.data?.accessToken.tokenValue { USER.setToken(token: token) USER.setRefreshToken(token: responseModel?.data?.refreshToken.tokenValue) - USER.setSupplierType(supplierType: responseModel?.data?.additionalParameters.user_info.supplierType) + USER.setSupplierType(supplierType: responseModel?.data?.additionalParameters.user_info?.supplierType) USER.setPhone(phone: self?.loginView.phoneView.textfield.text) USER.setSupplierName(supplierName: self?.loginView.serviceProviderView.textfield.text) }