From e821bea13d9f20905bba3972c4e9c4964994db5d Mon Sep 17 00:00:00 2001 From: 杨锴 <841720330@qq.com> Date: 星期四, 24 十月 2024 21:04:22 +0800 Subject: [PATCH] fix API TEST --- XQMuse/Root/Network/NetworkRequest.swift | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/XQMuse/Root/Network/NetworkRequest.swift b/XQMuse/Root/Network/NetworkRequest.swift index d316951..5cdea49 100644 --- a/XQMuse/Root/Network/NetworkRequest.swift +++ b/XQMuse/Root/Network/NetworkRequest.swift @@ -193,10 +193,10 @@ if progress {showHUD()} var headers = HTTPHeaders() -// if let token = UserViewModel.getToken(){ -// headers.add(name: "Authorization", value: "Bearer" + " " + token) -// LogInfo("USER_token:Bearer \(token)") -// } + if let token = UserViewModel.getLoginInfo()?.accessToken{ + headers.add(name: "Authorization", value: "Bearer" + " " + token) + LogInfo("USER_token:Bearer \(token)") + } if encoding is JSONEncoding { headers.add(name: "Content-Type", value: "application/json;charset=UTF-8") @@ -206,11 +206,11 @@ if encoding != nil { newEncoding = encoding! } else { - #if DEBUG - newEncoding = URLEncoding.queryString - #else +// #if DEBUG +// newEncoding = URLEncoding.queryString +// #else newEncoding = method == .post ? URLEncoding.httpBody : URLEncoding.queryString - #endif +// #endif } sharedSessionManager.request(params.url.absoluteString, method: method, parameters:params.done(), encoding: newEncoding, headers:headers).validate().responseData{response in @@ -237,16 +237,7 @@ if let next = BaseResponse<T>.deserialize(from: jsonString){ switch next.code{ case 200:ob.onNext(next) - case 501: -// CommonAlertView.show(title: "提示", content: next.msg,isSingle: true) { _ in -// -// } - ob.onError(NetRequestError.InvaildSession) - case 600: - if !ignoreAlert{ - alertError(msg: "登录失效,请重新登录");ob.onError(NetRequestError.InvaildSession) - } -// app.needLogin() + case 401:ob.onError(NetRequestError.InvaildSession) default: if !ignoreAlert{ alertError(msg: "\(next.msg)") -- Gitblit v1.7.1