diff --git a/wake/Utils/APIConfig.swift b/wake/Utils/APIConfig.swift index c9c3401..5257f1b 100644 --- a/wake/Utils/APIConfig.swift +++ b/wake/Utils/APIConfig.swift @@ -3,7 +3,7 @@ import Foundation /// API 配置信息 public enum APIConfig { /// API 基础 URL - public static let baseURL = "https://api.memorywake.com:31274/api/v1" + public static let baseURL = "https://api.memorywake.com/api/v1" /// 认证 token - 从 Keychain 中获取 public static var authToken: String { diff --git a/wake/Utils/LoginURLSession.swift b/wake/Utils/LoginURLSession.swift index f29d3d8..2d2b5b3 100644 --- a/wake/Utils/LoginURLSession.swift +++ b/wake/Utils/LoginURLSession.swift @@ -11,7 +11,7 @@ import Foundation //enum AnyCodable: Codable {} func passwordLogin(username: String, password: String) { - guard let url = URL(string: "https://api.memorywake.com:31274/api/v1/iam/login/password-login") else { + guard let url = URL(string: "https://api.memorywake.com/api/v1/iam/login/password-login") else { print("❌ 无效的URL") return } diff --git a/wake/Utils/NetworkService.swift b/wake/Utils/NetworkService.swift index 9e2b8e9..d4d8d4a 100644 --- a/wake/Utils/NetworkService.swift +++ b/wake/Utils/NetworkService.swift @@ -48,6 +48,19 @@ extension NetworkService: NetworkServiceProtocol { post(path: path, parameters: parameters, headers: headers, completion: completion) } + public func getWithToken( + path: String, + parameters: [String: Any]? = nil, + completion: @escaping (Result) -> Void + ) { + var headers = [String: String]() + if let token = KeychainHelper.getAccessToken() { + headers["Authorization"] = "Bearer \(token)" + } + + get(path: path, parameters: parameters, headers: headers, completion: completion) + } + @discardableResult public func upload( request: URLRequest, diff --git a/wake/Utils/PasswordLogin.swift b/wake/Utils/PasswordLogin.swift index ef26d52..dbe0d97 100644 --- a/wake/Utils/PasswordLogin.swift +++ b/wake/Utils/PasswordLogin.swift @@ -7,7 +7,7 @@ struct LoginResponse: Codable { func callLoginAPI() { // 1. 创建 URL - let urlString = "https://api.memorywake.com:31274/api/v1/iam/login/password-login" + let urlString = "https://api.memorywake.com/api/v1/iam/login/password-login" guard let url = URL(string: urlString) else { print("Invalid URL") return