diff --git a/CustomKeyboard/Network/KBNetworkManager.m b/CustomKeyboard/Network/KBNetworkManager.m index a3bcc00..e5618a0 100644 --- a/CustomKeyboard/Network/KBNetworkManager.m +++ b/CustomKeyboard/Network/KBNetworkManager.m @@ -26,8 +26,12 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network"; if (self = [super init]) { _enabled = NO; // 键盘扩展默认无网络能力,需外部显式开启 _timeout = 10.0; - // 默认接受任意类型,避免下载图片/二进制被服务端基于 Accept 拒绝 - _defaultHeaders = @{ @"Accept": @"*/*" }; + // 默认请求头:Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language + NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: @"en"; + _defaultHeaders = @{ + @"Accept": @"*/*", + @"Accept-Language": lang + }; // 设置基础域名,路径可相对该地址拼接 _baseURL = [NSURL URLWithString:KB_BASE_URL]; } diff --git a/keyBoard/Class/Login/VM/KBLoginVM.m b/keyBoard/Class/Login/VM/KBLoginVM.m index b67ed0d..a19a049 100644 --- a/keyBoard/Class/Login/VM/KBLoginVM.m +++ b/keyBoard/Class/Login/VM/KBLoginVM.m @@ -40,7 +40,7 @@ NSString *authorizationCode = cred.authorizationCode ? [[NSString alloc] initWithData:cred.authorizationCode encoding:NSUTF8StringEncoding] : nil; NSMutableDictionary *params = [NSMutableDictionary dictionary]; - if (identityToken.length) params[@"code"] = identityToken; + if (identityToken.length) params[@"identityToken"] = identityToken; if (authorizationCode.length) params[@"accessCode"] = authorizationCode; // 仅供后端需要时使用 if (cred.user.length) params[@"userID"] = cred.user; // 可选 diff --git a/keyBoard/Class/Network/KBNetworkManager.m b/keyBoard/Class/Network/KBNetworkManager.m index d15f189..7155b98 100644 --- a/keyBoard/Class/Network/KBNetworkManager.m +++ b/keyBoard/Class/Network/KBNetworkManager.m @@ -36,8 +36,12 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network"; if (self = [super init]) { _enabled = NO; // 键盘扩展默认无网络能力,需外部显式开启 _timeout = 10.0; - // 默认接受任意类型,避免下载图片/二进制被服务端基于 Accept 拒绝 - _defaultHeaders = @{ @"Accept": @"*/*" }; + // 默认请求头:Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language + NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: @"en"; + _defaultHeaders = @{ + @"Accept": @"*/*", + @"Accept-Language": lang + }; // 设置基础域名,路径可相对该地址拼接 _baseURL = [NSURL URLWithString:KB_BASE_URL]; } @@ -82,6 +86,7 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network"; jsonBody:(id)jsonBody headers:(NSDictionary *)headers completion:(KBNetworkCompletion)completion { + NSLog(@"====="); if (![self ensureEnabled:completion]) return nil; NSString *urlString = [self buildURLStringWithPath:path]; if (!urlString) { [self fail:KBNetworkErrorInvalidURL completion:completion]; return nil; }