com.taptap.sdk.compliance 4.5.2 → 4.5.4

package/Mobile/Editor/NativeDependencies.xml

@@ -4,12 +4,12 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-compliance:4.5.2"/>
+    <androidPackage spec="com.taptap.sdk:tap-compliance:4.5.4"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapComplianceSDK" version="~> 4.5.2" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapComplianceSDK" version="~> 4.5.4" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Runtime/Public/TapTapCompliance.cs

@@ -10,7 +10,7 @@ namespace TapSDK.Compliance
     public static class TapTapCompliance
     {
 
-        public static readonly string Version = "4.5.2";
+        public static readonly string Version = "4.5.4";
 
         public static void RegisterComplianceCallback(Action<int, string> callback)
         {
@@ -109,6 +109,7 @@ namespace TapSDK.Compliance
         /// 设置测试环境，需要在 startup 接口调用前设置
         /// </summary>
         /// <param name="enable">测试环境是否可用</param>
+        [Obsolete("该方法已失效，不需要再额外调用")]
         public static void SetTestEnvironment(bool enable) {
                 ComplianceJobManager.Job?.SetTestEnvironment(enable);
         }

package/Standalone/Runtime/ComplianceWorker.cs

@@ -16,6 +16,7 @@ using TapSDK.Core.Internal;
 using UnityEngine;
 using System.Linq;
 using TapSDK.Compliance.Standalone.Internal;
+using TapSDK.Core.Standalone.Internal.Http;
 
 
 namespace TapSDK.Compliance
@@ -107,7 +108,8 @@ namespace TapSDK.Compliance
 
                 // 计算时间
                 DateTimeOffset gameEndTime = Config.StrictEndTime;
-                TimeSpan remain = gameEndTime - DateTimeOffset.Now;
+                DateTimeOffset now = DateTimeOffset.FromUnixTimeSeconds(GetCurrentTime()).ToOffset(DateTimeOffset.Now.Offset);
+                TimeSpan remain = gameEndTime - now;
 
                 return new PlayableResult 
                 {
@@ -221,7 +223,8 @@ namespace TapSDK.Compliance
         /// </summary>
         private bool IsGameTime()
         {
-            string currentDate = System.DateTime.Now.ToString( "yyyy-MM-dd" );
+            DateTimeOffset now = DateTimeOffset.FromUnixTimeSeconds(GetCurrentTime()).ToOffset(DateTimeOffset.Now.Offset);
+            string currentDate = now.ToString( "yyyy-MM-dd" );
             List<string> holidays = TapTapComplianceManager.CurrentUserAntiResult.localConfig.timeRangeConfig.holidays;
             TapLogger.Debug("current date = " + currentDate + " holidays = " + holidays.ToArray());
             if(holidays.Contains(currentDate)){
@@ -229,7 +232,6 @@ namespace TapSDK.Compliance
                 DateTimeOffset strictEnd = Config.StrictEndTime;
 
                 bool playable;
-                DateTimeOffset now = DateTimeOffset.Now;
                 TapLogger.Debug(" now = " + now + " ,start = " + strictStart + ", end = " + strictEnd);
                 playable = now >= strictStart && now < strictEnd;
                 return playable;
@@ -237,6 +239,15 @@ namespace TapSDK.Compliance
             return false;
         }
 
+        private long GetCurrentTime(){
+            long serverTime = TapHttpTime.GetCurrentServerTime();
+            TapLogger.Debug("current serverTime = " + serverTime + " localTime = " + GetCurrentLocalTime());
+            if ( serverTime > 0){
+                return serverTime;
+            }
+            return GetCurrentLocalTime();
+        }
+
         /// <summary>
         /// 打开中国实名制窗口
         /// </summary>

package/Standalone/Runtime/Internal/ComplianceNewJob.cs

@@ -115,6 +115,11 @@ namespace TapSDK.Compliance
             if(!CheckInitState()){
                 return;
             }
+            if (string.IsNullOrEmpty(userId)) 
+            {
+                TapLogger.Error(" current user is invalid:" + userId);
+                return;
+            }
             // 如果正在处理中，直接返回
             if (isCheckingUser) {
                 TapLogger.Debug(" current user is checking so return");

package/Standalone/Runtime/Internal/Config.cs

@@ -18,10 +18,8 @@ namespace TapSDK.Compliance.Internal
 
         private const string TIME_FROMAT = "HH:mm";
 
-        internal static readonly Persistence persistence = new Persistence(Path.Combine(Application.persistentDataPath,
-            ANTI_ADDICTION_DIR, CONFIG_FILENAME));
-        internal static readonly Persistence userPersistence = new Persistence(Path.Combine(Application.persistentDataPath,
-            ANTI_ADDICTION_DIR, USER_CONFIG_FILENAME));
+        internal static readonly Lazy<Persistence> persistence = new Lazy<Persistence>(() => new Persistence(CONFIG_FILENAME));
+        internal static readonly Lazy<Persistence> userPersistence = new Lazy<Persistence>(() =>new Persistence(USER_CONFIG_FILENAME));
         
 
         static RealNameConfigResult current;
@@ -46,7 +44,7 @@ namespace TapSDK.Compliance.Internal
                     Current = await Network.FetchConfig(userId);
                     if (IsValid())
                     {
-                        await persistence.Save(Current);
+                        await persistence.Value.Save(Current);
                         return true;
                     }
                 } 
@@ -64,7 +62,7 @@ namespace TapSDK.Compliance.Internal
                 // 从设备缓存加载
                 try 
                 {
-                    Current = await persistence.Load<RealNameConfigResult>();
+                    Current = await persistence.Value.Load<RealNameConfigResult>();
                     if (Current != null)
                         return true;
                 } 

package/Standalone/Runtime/Internal/Http/ComplianceHttpClient.cs

@@ -1,44 +1,29 @@
 using System;
-using System.Text;
-using System.Linq;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
+using System.Text;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using TapSDK.Core;
-using TapSDK.Core.Internal.Json;
-using TapSDK.Core.Internal.Http;
-using TapSDK.Compliance.Model;
+using TapSDK.Core.Standalone.Internal.Http;
 
 namespace TapSDK.Compliance.Internal.Http {
     public class ComplianceHttpClient {
+
         static readonly int INTERNAL_SERVER_ERROR_LIMIT = 3;
 
         internal readonly string serverUrl;
 
-        private readonly HttpClient client;
+        private static readonly TapHttp tapHttp = TapHttp
+            .NewBuilder("TapCompliance", TapTapCompliance.Version)
+            .Build();
 
-        private readonly Dictionary<string, Func<Task<string>>> runtimeHeaderTasks = new Dictionary<string, Func<Task<string>>>();
 
         private readonly Dictionary<string, string> additionalHeaders = new Dictionary<string, string>();
 
         public ComplianceHttpClient(string serverUrl) {
             this.serverUrl = serverUrl;
-            client = new HttpClient();
-            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
         }
 
-        public void AddRuntimeHeaderTask(string key, Func<Task<string>> task) {
-            if (string.IsNullOrEmpty(key)) {
-                return;
-            }
-            if (task == null) {
-                return;
-            }
-            runtimeHeaderTasks[key] = task;
-        }
 
         public void ChangeAddtionalHeader(string key, string value) {
             if (string.IsNullOrEmpty(key)) {
@@ -69,19 +54,6 @@ namespace TapSDK.Compliance.Internal.Http {
             return Request<T>(path, HttpMethod.Post, headers, data, queryParams);
         }
 
-        public Task<T> Put<T>(string path,
-            Dictionary<string, object> headers = null,
-            object data = null,
-            Dictionary<string, object> queryParams = null) {
-            return Request<T>(path, HttpMethod.Put, headers, data, queryParams);
-        }
-
-        public Task Delete(string path,
-            Dictionary<string, object> headers = null,
-            object data = null,
-            Dictionary<string, object> queryParams = null) {
-            return Request<Dictionary<string, object>>(path, HttpMethod.Delete, headers, data, queryParams);
-        }
 
         async Task<T> Request<T>(string path,
             HttpMethod method,
@@ -89,123 +61,56 @@ namespace TapSDK.Compliance.Internal.Http {
             object data = null,
             Dictionary<string, object> queryParams = null) {
 
-            int retryTimes = INTERNAL_SERVER_ERROR_LIMIT;
-            HttpStatusCode serverErrorStatusCode = HttpStatusCode.InternalServerError;
-            string serverErrorString = "";
-            while(retryTimes > 0){
-                string url = BuildUrl(path, queryParams);
-                HttpRequestMessage request = new HttpRequestMessage {
-                    RequestUri = new Uri(url),
-                    Method = method,
-                };
-                await FillHeaders(request.Headers, headers);
-
-                string content = null;
-                if (data != null) {
-                    content = JsonConvert.SerializeObject(data);
-                    StringContent requestContent = new StringContent(content);
-                    requestContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-                    request.Content = requestContent;
-                }
-                TapHttpUtils.PrintRequest(client, request, content);
-           
-                HttpResponseMessage response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-                request.Dispose();
-
-                string resultString = await response.Content.ReadAsStringAsync();
-                response.Dispose();
-                TapHttpUtils.PrintResponse(response, resultString);
-
-                if (response.IsSuccessStatusCode)
-                {
-                    T ret = JsonConvert.DeserializeObject<T>(resultString,
-                        TapJsonConverter.Default);
-                    if (ret is BaseResponse baseResponse && !baseResponse.Success)
-                    {
-                        throw HandleErrorResponse(response.StatusCode, resultString);
-                    }
-                    return ret;
-                }
-                TapLogger.Debug("http log response code = " + response.StatusCode + " result = " + resultString);
-                if(response.StatusCode >= HttpStatusCode.InternalServerError){
-                    retryTimes--;
-                    serverErrorStatusCode = response.StatusCode;
-                    serverErrorString = resultString;
-                }else{
-                    throw HandleErrorResponse(response.StatusCode, resultString);
-                }
-            }
-            throw HandleErrorResponse(serverErrorStatusCode, serverErrorString);
-        }
-
-        Exception HandleErrorResponse(HttpStatusCode statusCode, string responseContent) 
-        {
-            
-            if (statusCode >= HttpStatusCode.InternalServerError) {
-                return new ComplianceException((int)statusCode, responseContent);
-            }
-
-            int code = (int)statusCode;
-            string message = responseContent;
-            string err = null;
-            string desc = null;
-            long timestamp = 0;
-            long errorCode = -1;
-            try {
-                // 尝试获取 LeanCloud 返回错误信息
-                ErrorResponse error = JsonConvert.DeserializeObject<ErrorResponse>(responseContent,
-                    TapJsonConverter.Default);
-                message = error.Result.Message;
-                err = error.Result.Error;
-                desc = error.Result.Description;
-                timestamp = error.Now;
-                errorCode = error.Result.ErrorCode;
-            } catch (Exception e) {
-                TapLogger.Error(e);
-            }
-            return new ComplianceException(code, message) {
-                Error = err,
-                Description = desc,
-                Now = timestamp,
-                ErrorCode = errorCode
-            };
-        }
-
-        string BuildUrl(string path, Dictionary<string, object> queryParams) {
             string apiServer = serverUrl;
             StringBuilder urlSB = new StringBuilder(apiServer.TrimEnd('/'));
             urlSB.Append($"/{path}");
             string url = urlSB.ToString();
-            if (queryParams != null) {
-                IEnumerable<string> queryPairs = queryParams.Select(kv => $"{kv.Key}={Uri.EscapeDataString(kv.Value.ToString())}");
-                string queries = string.Join("&", queryPairs);
-                url = $"{url}?{queries}";
-            }
-            return url;
-        }
 
-        async Task FillHeaders(HttpRequestHeaders headers, Dictionary<string, object> reqHeaders = null) {
-            // 额外 headers
-            if (reqHeaders != null) {
-                foreach (KeyValuePair<string, object> kv in reqHeaders) {
-                    headers.Add(kv.Key, kv.Value.ToString());
+            Dictionary<string, string> newHeaders = null;
+            if(headers != null){
+                newHeaders = new Dictionary<string, string>();
+               foreach (KeyValuePair<string, object> kv in headers) {
+                    newHeaders.Add(kv.Key, kv.Value.ToString());
                 }
             }
-            if (additionalHeaders.Count > 0) {
-                foreach (KeyValuePair<string, string> kv in additionalHeaders) {
-                    headers.Add(kv.Key, kv.Value);
+
+            Dictionary<string, string> newQueryParams = null;
+            if(queryParams != null){
+                newQueryParams = new Dictionary<string, string>();
+                foreach (KeyValuePair<string, object> kv in queryParams) {
+                    newQueryParams.Add(kv.Key, kv.Value.ToString());
                 }
             }
-            // 服务额外 headers
-            foreach (KeyValuePair<string, Func<Task<string>>> kv in runtimeHeaderTasks) {
-                if (headers.Contains(kv.Key)) {
-                    continue;
-                }
-                string value = await kv.Value.Invoke();
-                if (string.IsNullOrEmpty(value)) {
-                    continue;
-                }
-                headers.Add(kv.Key, value);
+
+            TapHttpResult<T> result;
+            if(method == HttpMethod.Get)
+            {
+             result =  await tapHttp.GetAsync<T>(url:url, headers:newHeaders, queryParams: newQueryParams);
+            } else {
+              result = await tapHttp.PostJsonAsync<T>(path:url, headers: newHeaders, queryParams:newQueryParams,
+              json: data, retryStrategy: TapHttpRetryStrategy.CreateDefault(TapHttpBackoffStrategy.CreateFixed(INTERNAL_SERVER_ERROR_LIMIT)));
+            }
+            if (result.IsSuccess){
+                return result.Data;
+            }else{
+                 AbsTapHttpException  exception = result.HttpException;
+                 if(exception is TapHttpServerException  serverException) {
+                     ComplianceException complianceException;
+                    if(serverException.StatusCode >= HttpStatusCode.InternalServerError){
+                        complianceException = new ComplianceException((int)serverException.StatusCode, serverException.Message);
+                    }else {
+                        complianceException = new ComplianceException((int)serverException.StatusCode, serverException.Message) {
+                            Error = serverException.ErrorData.Error,
+                            Description = serverException.ErrorData.ErrorDescription,
+                            Now = serverException.TapHttpResponse.Now,
+                            ErrorCode = serverException.ErrorData.Code
+                        };
+                    }
+                    throw complianceException;
+                 }else {
+                    throw exception;
+                 }
+                
             }
         }
 

package/Standalone/Runtime/Internal/Network.cs

@@ -1,22 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Net.Http.Headers;
 using System.Reflection;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using TapSDK.Compliance.Internal.Http;
 using TapSDK.Compliance.Model;
 using TapSDK.Core;
 using TapSDK.Login;
 using TapSDK.Login.Internal;
-using TapSDK.Login.Standalone;
-using UnityEngine;
-using System.Security.Cryptography;
-using System.Text;
-using System.Linq;
-using TapSDK.Core.Standalone.Internal;
-using TapSDK.Core.Standalone;
 using System.Net;
 
 
@@ -32,13 +22,10 @@ namespace TapSDK.Compliance.Internal
 
         private static string clientToken;
         
-        private static bool enableTestMode;
-
         internal static void SetGameInfo(string gameId, string clientToken)
         {
             Network.gameId = gameId;
             Network.clientToken = clientToken;
-            HttpClient.ChangeAddtionalHeader("X-LC-Id", gameId);
         }
 
         internal static void InitSetting()
@@ -59,10 +46,14 @@ namespace TapSDK.Compliance.Internal
         /// </summary>
         /// <returns></returns>
         internal static async Task<RealNameConfigResult> FetchConfig(string userId) {
-            string path = $"real-name/v1/get-global-config?client_id={gameId}&user_identifier={WebUtility.UrlEncode(userId)}";
-            var headers = GetAuthHeaders(path,"GET", 0, null);
-            RealNameConfigResponse response = await HttpClient.Get<RealNameConfigResponse>(path, headers);
-            return response.Result;
+            string path = $"real-name/v1/get-global-config";
+            var headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId,
+                ["user_identifier"] = userId
+            };
+            RealNameConfigResult response = await HttpClient.Get<RealNameConfigResult>(path, headers, queryParams);
+            return response;
         }
 
         /// <summary>
@@ -71,30 +62,38 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         internal static async Task<VerificationResult> FetchVerification(string userId) 
         {
-            string path = $"real-name/v1/anti-addiction-token?client_id={gameId}&user_identifier={WebUtility.UrlEncode(userId)}";
-            var headers = GetAuthHeaders(path,"GET", 0, null);
-            ServerVerificationResponse response = await HttpClient.Get<ServerVerificationResponse>(path, headers);
-            return response.Result;
+            string path = $"real-name/v1/anti-addiction-token";
+            var headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId,
+                ["user_identifier"] = userId
+            };
+            VerificationResult response = await HttpClient.Get<VerificationResult>(path, headers, queryParams);
+            return response;
         }
 
          /// <summary>
         /// V1 升级 v2 token
         internal static async Task<VerificationResult> UpgradeToken(string userId, string oldToken) 
         {
-            string path = $"real-name/v1/anti-addiction-token-upgrade?client_id={gameId}";
+            string path = $"real-name/v1/anti-addiction-token-upgrade";
             var param = new Dictionary<string, object> {
                 ["anti_addiction_token_v1"] = oldToken,
                 ["user_identifier"] = userId
             };
-            var headers = GetAuthHeaders(path,"POST", 0, param);
-            ServerVerificationResponse response = await HttpClient.Post<ServerVerificationResponse>(path, headers, data:param);
-            return response.Result;
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId
+           };
+            var headers = GetAuthHeaders();
+            VerificationResult response = await HttpClient.Post<VerificationResult>(path, headers, data:param, queryParams);
+            return response;
         }
 
         /// </summary>
         /// 使用 TapToken 获取实名 token
         /// <returns></returns>
         public static async Task<VerificationResult> FetchVerificationByTapToken(string userId, AccessToken token, long timestamp = 0) {
+            // 这里手动拼 query 是为了进行 Tap 的签算
             string path = $"real-name/v1/anti-addiction-token-taptap?client_id={gameId}&user_identifier={WebUtility.UrlEncode(userId)}";            
             var httpClientType = typeof(ComplianceHttpClient);
             var hostFieldInfo = httpClientType.GetField("serverUrl", BindingFlags.NonPublic | BindingFlags.Instance);
@@ -102,10 +101,15 @@ namespace TapSDK.Compliance.Internal
             var uri = new Uri(host  + "/" +  path);
 
             var sign = GetMacToken(token, uri, timestamp);
-            var headers = GetAuthHeaders(path,"GET", (int)timestamp, null);
+            var headers = GetAuthHeaders();
             headers.Add("Authorization", sign);
-            ServerVerificationResponse response = await HttpClient.Get<ServerVerificationResponse>(path, headers:headers);
-            return response.Result;
+
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId,
+                ["user_identifier"] = userId
+            };
+            VerificationResult response = await HttpClient.Get<VerificationResult>(path, headers:headers, queryParams);
+            return response;
         }
         
         private static string GetMacToken(AccessToken token, Uri uri, long timestamp = 0) {
@@ -136,16 +140,19 @@ namespace TapSDK.Compliance.Internal
         internal static async Task<VerificationResult> FetchVerificationManual(string userName, string idCard)
         {
             var tcs = new TaskCompletionSource<VerificationResult>();
-            string path = $"real-name/v1/anti-addiction-token-manual?client_id={gameId}";
+            string path = $"real-name/v1/anti-addiction-token-manual";
             Dictionary<string, object> data = new Dictionary<string, object>
             {
                 ["name"] = userName,
                 ["idcard"] = idCard,
                 ["user_identifier"] = TapTapComplianceManager.UserId
             };
-             var headers = GetAuthHeaders(path,"POST", 0, data);
-            ServerVerificationResponse response = await HttpClient.Post<ServerVerificationResponse>(path, headers, data: data);
-            tcs.TrySetResult(response.Result);
+            var headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId
+            };
+            VerificationResult response = await HttpClient.Post<VerificationResult>(path, headers, data, queryParams);
+            tcs.TrySetResult(response);
             
             return await tcs.Task;
         }
@@ -156,18 +163,18 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         internal static async Task<UserComplianceConfigResult> CheckUserConfig() 
         {
-            string path;
-            if (!enableTestMode) {
-             path = $"anti-addiction/v1/get-config-by-token?platform=pc&client_id={gameId}&user_identifier={WebUtility.UrlEncode(TapTapComplianceManager.UserId)}";
-            }else{
-             path = $"anti-addiction/v1/get-config-by-token?platform=pc&client_id={gameId}&test_mode=1&user_identifier={WebUtility.UrlEncode(TapTapComplianceManager.UserId)}";
-            }
-            Dictionary<string, object> headers = GetAuthHeaders(path,"GET",0,null);
-            UserComplianceConfigResponse response = await HttpClient.Get<UserComplianceConfigResponse>(path, headers: headers);
+            string path = $"anti-addiction/v1/get-config-by-token";
+            Dictionary<string, object> headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId,
+                ["user_identifier"] = TapTapComplianceManager.UserId,
+                ["platform"] = "pc"
+            };
+            UserComplianceConfigResult response = await HttpClient.Get<UserComplianceConfigResult>(path, headers, queryParams);
             #if UNITY_EDITOR
-            TapLogger.Debug($"检查用户状态: ageLimit: {response.Result.userState.ageLimit} ageCheck: {response.Result.ageCheckResult.allow}  IsAdult: {response.Result.userState.isAdult} ");
+            TapLogger.Debug($"检查用户状态: ageLimit: {response.userState.ageLimit} ageCheck: {response.ageCheckResult.allow}  IsAdult: {response.userState.isAdult} ");
             #endif
-            return response.Result;
+            return response;
         }
         /// <summary>
         /// 检测是否可玩
@@ -175,23 +182,21 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         internal static async Task<PlayableResult> CheckPlayable() 
         {
-            string path = "";
-            if (!enableTestMode) {
-                path = $"anti-addiction/v1/heartbeat?client_id={gameId}";
-            }
-            else {
-                path = $"anti-addiction/v1/heartbeat?client_id={gameId}&test_mode=1";
-            }
+            string  path = $"anti-addiction/v1/heartbeat";
+            
             Dictionary<string,object> data = new Dictionary<string,object>{
                 ["session_id"] = TapTapComplianceManager.CurrentSession,
                 ["user_identifier"] = TapTapComplianceManager.UserId
             };
-            Dictionary<string, object> headers = GetAuthHeaders(path,"POST",0, data);
-            PlayableResponse response = await HttpClient.Post<PlayableResponse>(path, headers: headers, data:data);
+            Dictionary<string, object> headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId
+            };
+            PlayableResult response = await HttpClient.Post<PlayableResult>(path, headers, data, queryParams);
             #if UNITY_EDITOR
-            TapLogger.Debug($"检查是否可玩结果: remainTime: {response.Result.RemainTime}  Content: {response.Result.Content}");
+            TapLogger.Debug($"检查是否可玩结果: remainTime: {response.RemainTime}  Content: {response.Content}");
             #endif
-            return response.Result;
+            return response;
         }
 
         /// <summary>
@@ -201,16 +206,15 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         internal static async Task<PayableResult> CheckPayable(long amount) 
         {
-            string path = "";
-            if (!enableTestMode) {
-                path = $"anti-addiction/v1/payable?client_id={gameId}&amount={amount}&user_identifier={WebUtility.UrlEncode(TapTapComplianceManager.UserId)}";
-            }
-            else {
-                path = $"anti-addiction/v1/payable?client_id={gameId}&amount={amount}&test_mode=1&user_identifier={WebUtility.UrlEncode(TapTapComplianceManager.UserId)}";
-            }
-            Dictionary<string, object> headers = GetAuthHeaders(path, "GET", 0, null);
-            PayableResponse response = await HttpClient.Get<PayableResponse>(path, headers: headers);
-            return response.Result;
+            string path = $"anti-addiction/v1/payable";
+            Dictionary<string, object> headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId,
+                ["user_identifier"] = TapTapComplianceManager.UserId,
+                ["amount"] = amount
+            };
+            PayableResult response = await HttpClient.Get<PayableResult>(path, headers, queryParams);
+            return response;
         }
 
         /// <summary>
@@ -220,86 +224,37 @@ namespace TapSDK.Compliance.Internal
         /// <returns></returns>
         internal static async Task SubmitPayment(long amount) 
         {
-            string path = "";
-            if (!enableTestMode) {
-                path = $"anti-addiction/v1/payment-submit?client_id={gameId}";
-            }
-            else {
-                path = $"anti-addiction/v1/payment-submit?client_id={gameId}&test_mode=1";
-            }
-             Dictionary<string, object> data = new Dictionary<string, object> 
+            string path = $"anti-addiction/v1/payment-submit";
+            
+            Dictionary<string, object> data = new Dictionary<string, object> 
             {
                 { "amount", amount },
                 {"user_identifier", TapTapComplianceManager.UserId}
             };
-            Dictionary<string, object> headers = GetAuthHeaders(path, "POST", 0, data);
+            Dictionary<string, object> headers = GetAuthHeaders();
+            var queryParams = new Dictionary<string, object>{
+                ["client_id"] = gameId
+            };
            
-            await HttpClient.Post<SubmitPaymentResponse>(path, headers:headers, data: data);
+            await HttpClient.Post<SubmitPaymentResponse>(path, headers, data, queryParams);
         }
         // internal static Dictionary<string, object> GetAuthHeaders(){
         //     return new Dictionary<string,object>{};
         // }
 
-        internal static Dictionary<string, object> GetAuthHeaders(string path, string httpMethod,int timestamp, Dictionary<string,object> body) 
+        internal static Dictionary<string, object> GetAuthHeaders() 
         {
-            var httpClientType = typeof(ComplianceHttpClient);
-            var hostFieldInfo = httpClientType.GetField("serverUrl", BindingFlags.NonPublic | BindingFlags.Instance);
-            string host = hostFieldInfo?.GetValue(HttpClient) as string;
-            var uri =  "/" +  path;
-            int ts = timestamp;
-            if (ts == 0) {
-                var dt = DateTime.UtcNow - new DateTime(1970, 1, 1);
-                ts = (int)dt.TotalSeconds;
-            }
-            var nonce = new System.Random().Next().ToString();
-            var headers = new Dictionary<string, object> 
-            {
-                { "X-Tap-PN", "TapSDK" },
-                { "X-Tap-Lang", Tracker.getServerLanguage() },
-                { "X-Tap-Device-Id", SystemInfo.deviceUniqueIdentifier},
-                { "X-Tap-Platform", "PC"},
-                { "X-Tap-SDK-Module","TapCompliance"},
-                { "X-Tap-SDK-Module-Version", TapTapSDK.Version},
-                { "X-Tap-SDK-Artifact", "Unity"},
-                { "User-Agent","TapSDK-Unity/" + TapTapSDK.Version},
-                { "X-Tap-Nonce", nonce},
-                { "X-Tap-Ts",ts}
-            };
+            var headers = new Dictionary<string, object>();
             string token = Verification.GetCurrentToken();
             if (!string.IsNullOrEmpty(token)) 
             {
                 headers.Add("X-Tap-Anti-Addiction-Token", token);
             }
-            
-            string currentDBUserId = TapCoreStandalone.GetCurrentUserId();
-            if(currentDBUserId != null && currentDBUserId.Length > 0) {
-                headers.Add("X-Tap-SDK-Game-User-Id", currentDBUserId);
-            }
-            
-             headers = headers.OrderBy(x => x.Key).ToDictionary(x => x.Key, y=>y.Value);
-             List<string> headerList = new List<string>();
-             foreach(KeyValuePair<string,object> kv in headers){
-                if(kv.Key.ToLower().StartsWith("x-tap-")){
-                    headerList.Add(kv.Key.ToLower()+":"+kv.Value);
-                }
-             }
-             string headerString = string.Join("\n",headerList);
-             var normalizedString = $"{httpMethod}\n{uri}\n{headerString}\n";
-             if(body != null){
-                normalizedString += $"{JsonConvert.SerializeObject(body)}\n";
-             }else{
-                normalizedString += "\n";
-             }
-
-            HashAlgorithm hashGenerator= new HMACSHA256(Encoding.UTF8.GetBytes(clientToken));
-
-            var hash = Convert.ToBase64String(hashGenerator.ComputeHash(Encoding.UTF8.GetBytes(normalizedString)));
-            headers.Add("X-Tap-Sign",hash);
             return headers;
         }
 
         internal static void SetTestEnvironment(bool enable) {
-            enableTestMode = enable;
+            
         }
     }
 }

package/Standalone/Runtime/Internal/Persistence.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using TapSDK.Core;
+using UnityEngine;
 
 namespace TapSDK.Compliance.Internal 
 {
@@ -13,10 +14,20 @@ namespace TapSDK.Compliance.Internal
     internal class Persistence 
     {
         private readonly string _filePath;
-
         internal Persistence(string path) 
         {
-            _filePath = path;
+            string new_cacheDir = Path.Combine(Application.persistentDataPath, Config.ANTI_ADDICTION_DIR);
+            if (!string.IsNullOrEmpty(TapTapComplianceManager.ClientId)){
+                new_cacheDir = Path.Combine(Application.persistentDataPath, Config.ANTI_ADDICTION_DIR + "_" + TapTapComplianceManager.ClientId);
+            }
+            // 文件夹不存在时，尝试兼容旧版本数据
+            if(!Directory.Exists(new_cacheDir)) {
+                string old_cacheDir = Path.Combine(Application.persistentDataPath, Config.ANTI_ADDICTION_DIR);
+                if(Directory.Exists(old_cacheDir)) {
+                    Directory.Move(old_cacheDir, new_cacheDir);
+                }
+            }
+            _filePath = Path.Combine(new_cacheDir, path);
         }
 
         internal async Task<T> Load<T>() where T : class 
@@ -24,7 +35,7 @@ namespace TapSDK.Compliance.Internal
             TapLogger.Debug(_filePath);
             if (!File.Exists(_filePath)) 
             {
-                return null;
+                return null;  
             }
 
             string text;

package/Standalone/Runtime/Internal/Verification.cs

@@ -48,8 +48,7 @@ namespace TapSDK.Compliance.Internal
             string filename = Tool.EncryptString(userId);
             // 存储 v2 token 数据   
             if(persistenceV2 == null){ 
-                persistenceV2 = new Persistence(Path.Combine(Application.persistentDataPath,
-                    Config.ANTI_ADDICTION_DIR,
+                persistenceV2 = new Persistence(Path.Combine(
                     VERIFICATION_V2_FILENAME,
                     filename));   
             }
@@ -94,8 +93,7 @@ namespace TapSDK.Compliance.Internal
             string filename = Tool.EncryptString(userId);
              //存储 v1 token数据
              if(persistence == null){
-                persistence = new Persistence(Path.Combine(Application.persistentDataPath,
-                    Config.ANTI_ADDICTION_DIR,
+                persistence = new Persistence(Path.Combine(
                     VERIFICATION_FILENAME,
                     filename));
              }
@@ -210,8 +208,7 @@ namespace TapSDK.Compliance.Internal
                 await FetchByTapToken(userId, token);
                 if(persistenceV2 == null){
                     var filename = Tool.EncryptString(userId);
-                    persistenceV2 = new Persistence(Path.Combine(Application.persistentDataPath,
-                    Config.ANTI_ADDICTION_DIR,
+                    persistenceV2 = new Persistence(Path.Combine(
                     VERIFICATION_V2_FILENAME,
                     filename));
                 }
@@ -237,8 +234,7 @@ namespace TapSDK.Compliance.Internal
             TapLogger.Debug("try save  v2 token to local");
             if(persistenceV2 == null){
                 var filename = Tool.EncryptString(userId);
-                persistenceV2 = new Persistence(Path.Combine(Application.persistentDataPath,
-                Config.ANTI_ADDICTION_DIR,
+                persistenceV2 = new Persistence(Path.Combine(
                 VERIFICATION_V2_FILENAME,
                 filename));
             }
@@ -252,8 +248,7 @@ namespace TapSDK.Compliance.Internal
                 current.IsAdult = isAdult;
                 if(persistenceV2 == null){
                     var filename = Tool.EncryptString(current.UserId);
-                    persistenceV2 = new Persistence(Path.Combine(Application.persistentDataPath,
-                    Config.ANTI_ADDICTION_DIR,
+                    persistenceV2 = new Persistence(Path.Combine(
                     VERIFICATION_V2_FILENAME,
                     filename));
                 }

package/Standalone/Runtime/Internal/Worker/BaseComplianceWorker.cs

@@ -22,6 +22,11 @@ namespace TapSDK.Compliance
         #region Abstract
         
         static readonly string USER_ANTI_FILENAME = "user_anti_config";
+
+        // 本地基准时间戳
+        private long BaseLocalTime = 0;
+        //获取本地时间戳时，应用运行的时间
+        private long BaseLocalStartUpTime = 0;
         
         
         /// <summary>
@@ -124,8 +129,7 @@ namespace TapSDK.Compliance
         protected virtual async Task<UserComplianceConfigResult> CheckUserConfigAsyncWithFallback()
         {
             string filename = Tool.EncryptString(Verification.Current.UserId);
-            Persistence persistence = new Persistence(Path.Combine(Application.persistentDataPath,
-                Config.ANTI_ADDICTION_DIR,
+            Persistence persistence = new Persistence(Path.Combine(
                 USER_ANTI_FILENAME,
                 filename));
             UserComplianceConfigResult result = await persistence.Load<UserComplianceConfigResult>();
@@ -145,6 +149,7 @@ namespace TapSDK.Compliance
                    throw;
                 }else{
                     if(result != null){
+                        ResetBaseLocalTime();
                         TapTapComplianceManager.CurrentSession = GenerateSession();
                         return result; 
                     }else{
@@ -158,6 +163,7 @@ namespace TapSDK.Compliance
                 if(result == null){
                     throw;
                 }else{
+                    ResetBaseLocalTime();
                     TapTapComplianceManager.CurrentSession = GenerateSession();
                     return result;
                 }
@@ -165,6 +171,24 @@ namespace TapSDK.Compliance
             
         }
 
+        private void ResetBaseLocalTime(){
+            if(BaseLocalTime > 0){
+                return;
+            }
+            BaseLocalTime = DateTimeOffset.Now.ToUnixTimeSeconds();
+            BaseLocalStartUpTime = (long)Time.realtimeSinceStartup;
+            TapLogger.Debug(" current local time " + DateTimeOffset.Now);
+        }
+
+        /// <summary>
+        /// 获取基于本地时间的当前时间戳，用于离线心跳计算
+        /// </summary>
+        /// <returns></returns>
+        protected long GetCurrentLocalTime(){
+            long currentStartUpTime = (long) Time.realtimeSinceStartup;
+            return BaseLocalTime + currentStartUpTime - BaseLocalStartUpTime;
+        }
+
          private string GenerateSession()
         {
             const string baseStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
@@ -304,8 +328,7 @@ namespace TapSDK.Compliance
         {
             if(needClearCache){
                 string filename = Tool.EncryptString(Verification.Current.UserId);
-                Persistence persistence = new Persistence(Path.Combine(Application.persistentDataPath,
-                                Config.ANTI_ADDICTION_DIR,
+                Persistence persistence = new Persistence(Path.Combine(
                                 USER_ANTI_FILENAME,
                                 filename));
                 persistence.Delete();

package/link.xml

@@ -0,0 +1,5 @@
+<linker>
+  <assembly fullname="TapSDK.Compliance" preserve="all" />
+  <assembly fullname="TapSDK.Compliance.Runtime" preserve="all" />
+  <assembly fullname="TapSDK.Compliance.Mobile.Runtime" preserve="all" />
+</linker>

package/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 366bb74499caa4189bcb11c3aa8608f7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -2,11 +2,11 @@
   "name": "com.taptap.sdk.compliance",
   "displayName": "TapTapSDK Compliance",
   "description": "TapTapSDK Compliance",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.5.2",
-    "com.taptap.sdk.login": "4.5.2"
+    "com.taptap.sdk.core": "4.5.4",
+    "com.taptap.sdk.login": "4.5.4"
   }
 }