From 2cdf828679bf703b43a2d0ab2c56d7189b2160f4 Mon Sep 17 00:00:00 2001 From: luqing Date: Mon, 16 Jun 2025 20:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BF=AE=E6=94=B9=20Signed-o?= =?UTF-8?q?ff-by:=20luqing=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/object/include/object_service_impl.h | 2 +- .../service/object/src/object_service_impl.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/services/distributeddataservice/service/object/include/object_service_impl.h b/services/distributeddataservice/service/object/include/object_service_impl.h index 79549a94d..98f0fcd61 100644 --- a/services/distributeddataservice/service/object/include/object_service_impl.h +++ b/services/distributeddataservice/service/object/include/object_service_impl.h @@ -71,7 +71,7 @@ private: }; void RegisterObjectServiceInfo(); void RegisterHandler(); - int32_t SaveMetaData(StoreMetaData& saveMeta, const std::string &user, const std::string &account); + int32_t SaveMetaData(StoreMetaData& saveMeta); void UpdateMetaData(); static Factory factory_; diff --git a/services/distributeddataservice/service/object/src/object_service_impl.cpp b/services/distributeddataservice/service/object/src/object_service_impl.cpp index f8ce39d2e..a3f7210a3 100644 --- a/services/distributeddataservice/service/object/src/object_service_impl.cpp +++ b/services/distributeddataservice/service/object/src/object_service_impl.cpp @@ -133,16 +133,14 @@ int32_t ObjectServiceImpl::OnInitialize() ZLOGE("failed to get local device id"); return OBJECT_INNER_ERROR; } - auto token = IPCSkeleton::GetCallingTokenID(); - const auto userId = DistributedData::AccountDelegate::GetInstance()->GetUserByToken(token); if (executors_ == nullptr) { ZLOGE("executors_ is nullptr"); return OBJECT_INNER_ERROR; } - executors_->Schedule(std::chrono::seconds(WAIT_ACCOUNT_SERVICE), [userId, this]() { + executors_->Schedule(std::chrono::seconds(WAIT_ACCOUNT_SERVICE), [this]() { StoreMetaData saveMeta; - SaveMetaData(saveMeta, std::to_string(userId), "accountId"); + SaveMetaData(saveMeta); ObjectStoreManager::GetInstance()->SetData(saveMeta.dataDir, saveMeta.user); ObjectStoreManager::GetInstance()->InitUserMeta(); RegisterObjectServiceInfo(); @@ -153,7 +151,7 @@ int32_t ObjectServiceImpl::OnInitialize() return OBJECT_SUCCESS; } -int32_t ObjectServiceImpl::SaveMetaData(StoreMetaData &saveMeta, const std::string &user, const std::string &account) +int32_t ObjectServiceImpl::SaveMetaData(StoreMetaData &saveMeta) { auto localDeviceId = DmAdapter::GetInstance().GetLocalDevice().uuid; if (localDeviceId.empty()) { @@ -211,7 +209,7 @@ int32_t ObjectServiceImpl::OnUserChange(uint32_t code, const std::string &user, ZLOGE("Clear fail user:%{public}s, status: %{public}d", user.c_str(), status); } StoreMetaData saveMeta; - SaveMetaData(saveMeta, user, account); + SaveMetaData(saveMeta); ObjectStoreManager::GetInstance()->SetData(saveMeta.dataDir, saveMeta.user); } return Feature::OnUserChange(code, user, account); -- Gitee