From ce39472358fffef5ff43ee7d4094aaca1f010de5 Mon Sep 17 00:00:00 2001 From: bigtea Date: Fri, 8 Aug 2025 15:34:30 +0800 Subject: [PATCH] Modify code Signed-off-by: bigtea --- .../main/cpp/src/database/access_token_open_callback.cpp | 3 +-- .../main/cpp/src/permission/short_grant_manager.cpp | 3 +-- .../main/cpp/src/service/accesstoken_manager_service.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp b/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp index fb5c7459f..2b9d50d8f 100644 --- a/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp @@ -188,13 +188,12 @@ int32_t AccessTokenOpenCallback::CreateVersionOneTable(NativeRdb::RdbStore& rdbS LOGE(ATM_DOMAIN, ATM_TAG, "Failed to create table permission_definition_table."); return res; } - + res = CreatePermissionStateTable(rdbStore); if (res != NativeRdb::E_OK) { LOGE(ATM_DOMAIN, ATM_TAG, "Failed to create table permission_state_table."); return res; } - return 0; } diff --git a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp index a3b23b5ef..02b57a8dc 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp @@ -142,7 +142,6 @@ int ShortGrantManager::RefreshPermission(AccessTokenID tokenID, const std::strin shortGrantData_.begin(), shortGrantData_.end(), [tokenID, permission](const PermTimerData& data) { return data.tokenID == tokenID && data.permissionName == permission; }); - if (iter == shortGrantData_.end()) { auto iterator = std::find(g_shortGrantPermission.begin(), g_shortGrantPermission.end(), permission); if (iterator == g_shortGrantPermission.end()) { @@ -251,7 +250,7 @@ void ShortGrantManager::ScheduleRevokeTask(AccessTokenID tokenID, const std::str LOGI(ATM_DOMAIN, ATM_TAG, "Token: %{public}d, permission: %{public}s, delay revoke permission end.", tokenID, permission.c_str()); }); - LOGI(ATM_DOMAIN, ATM_TAG, "cancelTimes %{public}d", cancelTimes); + eventHandler->ProxyPostTask(delayed, taskName, cancelTimes * 1000); // 1000 means to ms return; #else diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp index 1bd833360..29c1cc715 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -128,7 +128,7 @@ void AccessTokenManagerService::OnStart() bool ret = Publish(DelayedSingleton::GetInstance().get()); if (!ret) { LOGE(ATM_DOMAIN, ATM_TAG, "Failed to publish service!"); - ReportSysEventServiceStartError(SA_PUBLISH_FAILED, "Publish accesstoken_service fail.", ERROR); + ReportSysEventServiceStartError(SA_PUBLISH_FAILED, "Publish accesstoken_service fail.", -1); return; } AccessTokenServiceParamSet(); -- Gitee