1

keyBoard/Class/Network/KBNetworkManager.m

@@ -63,9 +63,7 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
 }
 
 - (void)getSignWithParare:(NSDictionary *)bodyParams{
-    if (bodyParams == nil) {
-        return;
-    }
+   
     NSString *appId    = @"loveKeyboard";
     NSString *secret   = @"kZJM39HYvhxwbJkG1fmquQRVkQiLAh2H"; // 和服务端保持一致
     NSString *timestamp = [KBSignUtils currentTimestamp];
@@ -84,7 +82,20 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
         }
     }];
     NSString *sign = [KBSignUtils signWithParams:signParams secret:secret];
-    
+
+    // 将签名相关字段合并进默认请求头
+    NSMutableDictionary<NSString *, NSString *> *headers =
+    [self.defaultHeaders mutableCopy] ?: [NSMutableDictionary dictionary];
+
+    if (sign.length > 0) {
+        headers[@"X-Sign"] = sign;
+    }
+    headers[@"X-App-Id"]    = appId;
+    headers[@"X-Timestamp"] = timestamp;
+    headers[@"X-Nonce"]     = nonce;
+
+    // 触发 copy 语义，确保对外仍是不可变字典
+    self.defaultHeaders = headers;
 }
 
 #
@@ -97,6 +108,7 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
          autoShowBusinessError:(BOOL)autoShowBusinessError
                      completion:(KBNetworkCompletion)completion {
     NSLog(@"[KBNetworkManager] GET called, enabled=%d, path=%@", self.isEnabled, path);
+    [self getSignWithParare:parameters];
     if (![self ensureEnabled:completion]) return nil;
     NSString *urlString = [self buildURLStringWithPath:path];
     if (!urlString) { [self fail:KBNetworkErrorInvalidURL completion:completion]; return nil; }
@@ -131,6 +143,8 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
                     parameters:(NSDictionary *)parameters
                        headers:(NSDictionary<NSString *,NSString *> *)headers
                      completion:(KBNetworkCompletion)completion {
+    [self getSignWithParare:parameters];
+
     return [self GET:path
           parameters:parameters
              headers:headers
@@ -145,6 +159,7 @@ autoShowBusinessError:YES
         autoShowBusinessError:(BOOL)autoShowBusinessError
                      completion:(KBNetworkCompletion)completion {
     NSLog(@"[KBNetworkManager] POST called, enabled=%d, path=%@", self.isEnabled, path);
+    [self getSignWithParare:jsonBody];
     if (![self ensureEnabled:completion]) return nil;
     NSString *urlString = [self buildURLStringWithPath:path];
     if (!urlString) { [self fail:KBNetworkErrorInvalidURL completion:completion]; return nil; }
@@ -176,6 +191,7 @@ autoShowBusinessError:YES
                       jsonBody:(id)jsonBody
                        headers:(NSDictionary<NSString *,NSString *> *)headers
                      completion:(KBNetworkCompletion)completion {
+    [self getSignWithParare:jsonBody];
     return [self POST:path
              jsonBody:jsonBody
               headers:headers

keyBoard/Class/Utils/KBSignUtils.h

@@ -1,32 +0,0 @@
-//
-//  KBSignUtils.h
-//  keyBoard
-//
-//  Created by Mac on 2025/12/4.
-//
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KBSignUtils : NSObject
-
-/// URL 编码（与后端保持一致）
-+ (NSString *)urlEncode:(NSString *)value;
-
-/// HMAC-SHA256，返回十六进制小写字符串
-+ (NSString *)hmacSHA256:(NSString *)data secret:(NSString *)secret;
-
-/// 生成签名：传入参与签名的所有参数（不含 sign 自身）
-+ (NSString *)signWithParams:(NSDictionary<NSString *, NSString *> *)params
-                      secret:(NSString *)secret;
-
-/// 秒级时间戳（字符串）
-+ (NSString *)currentTimestamp;
-
-/// 简单 nonce 生成（默认 16 位）
-+ (NSString *)generateNonceWithLength:(NSUInteger)length;
-
-@end
-
-NS_ASSUME_NONNULL_END
-

keyBoard/Class/Utils/KBSignUtils.m

@@ -1,92 +0,0 @@
-//
-//  KBSignUtils.m
-//  keyBoard
-//
-//  Created by Mac on 2025/12/4.
-//
-
-#import "KBSignUtils.h"
-#import <CommonCrypto/CommonCrypto.h>
-
-@implementation KBSignUtils
-
-+ (NSString *)urlEncode:(NSString *)value {
-    if (!value) return @"";
-    // 和 Swift 里的 .urlQueryAllowed 类似
-    NSCharacterSet *allowed = [NSCharacterSet URLQueryAllowedCharacterSet];
-    NSString *encoded = [value stringByAddingPercentEncodingWithAllowedCharacters:allowed];
-    return encoded ?: value;
-}
-
-+ (NSString *)hmacSHA256:(NSString *)data secret:(NSString *)secret {
-    const char *cKey  = [secret cStringUsingEncoding:NSUTF8StringEncoding];
-    const char *cData = [data cStringUsingEncoding:NSUTF8StringEncoding];
-
-    unsigned char cHMAC[CC_SHA256_DIGEST_LENGTH];
-
-    CCHmac(kCCHmacAlgSHA256,
-           cKey,
-           strlen(cKey),
-           cData,
-           strlen(cData),
-           cHMAC);
-
-    // 转十六进制小写字符串
-    NSMutableString *output = [NSMutableString stringWithCapacity:CC_SHA256_DIGEST_LENGTH * 2];
-    for (int i = 0; i < CC_SHA256_DIGEST_LENGTH; i++) {
-        [output appendFormat:@"%02x", cHMAC[i]];
-    }
-    return output;
-}
-
-+ (NSString *)signWithParams:(NSDictionary<NSString *, NSString *> *)params
-                      secret:(NSString *)secret {
-
-    // 1. 过滤空值 & sign 自身
-    NSMutableDictionary<NSString *, NSString *> *filtered = [NSMutableDictionary dictionary];
-    [params enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) {
-        if (!obj || obj.length == 0) return;
-        if ([[key lowercaseString] isEqualToString:@"sign"]) return;
-        filtered[key] = obj;
-    }];
-
-    // 2. 按 key 字典序排序
-    NSArray<NSString *> *sortedKeys = [[filtered allKeys] sortedArrayUsingSelector:@selector(compare:)];
-
-    // 3. 拼接 key=value&key2=value2...&secret=xxx
-    NSMutableArray<NSString *> *components = [NSMutableArray array];
-    for (NSString *key in sortedKeys) {
-        NSString *value = filtered[key] ?: @"";
-        NSString *encodedValue = [self urlEncode:value];
-        NSString *part = [NSString stringWithFormat:@"%@=%@", key, encodedValue];
-        [components addObject:part];
-    }
-
-    NSString *encodedSecret = [self urlEncode:secret];
-    NSString *secretPart = [NSString stringWithFormat:@"secret=%@", encodedSecret];
-    [components addObject:secretPart];
-
-    NSString *dataString = [components componentsJoinedByString:@"&"];
-
-    // 4. HMAC-SHA256
-    NSString *sign = [self hmacSHA256:dataString secret:secret];
-    return sign;
-}
-
-+ (NSString *)currentTimestamp {
-    NSTimeInterval ts = [[NSDate date] timeIntervalSince1970];
-    long long seconds = (long long)ts;
-    return [NSString stringWithFormat:@"%lld", seconds];
-}
-
-+ (NSString *)generateNonceWithLength:(NSUInteger)length {
-    // 用 UUID 生成，去掉 - , 再截取前 length 位
-    NSString *uuid = [[NSUUID UUID].UUIDString stringByReplacingOccurrencesOfString:@"-" withString:@""];
-    if (length == 0 || length > uuid.length) {
-        return uuid;
-    }
-    return [uuid substringToIndex:length];
-}
-
-@end
-