From 470c4f78c148a14e3e5febf99fe21a680f0d6325 Mon Sep 17 00:00:00 2001 From: chennian Date: Wed, 21 Sep 2022 11:01:27 +0800 Subject: [PATCH] =?UTF-8?q?deviceId=20udid=E5=8C=BF=E5=90=8D=E5=8C=96?= =?UTF-8?q?=E6=89=93=E5=8D=B0=20Signed-off-by:chennian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chennian --- .../src/remote/remote_command_manager.cpp | 6 +++--- .../tokensyncmanager/src/remote/soft_bus_channel.cpp | 7 +++++-- .../tokensyncmanager/src/remote/soft_bus_manager.cpp | 11 ++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/services/tokensyncmanager/src/remote/remote_command_manager.cpp b/services/tokensyncmanager/src/remote/remote_command_manager.cpp index 447448bde..6227c5d01 100644 --- a/services/tokensyncmanager/src/remote/remote_command_manager.cpp +++ b/services/tokensyncmanager/src/remote/remote_command_manager.cpp @@ -150,7 +150,7 @@ void RemoteCommandManager::Clear() int RemoteCommandManager::NotifyDeviceOnline(const std::string &nodeId) { if (!DataValidator::IsDeviceIdValid(nodeId)) { - ACCESSTOKEN_LOG_INFO(LABEL, "invalid nodeId: %{public}s", nodeId.c_str()); + ACCESSTOKEN_LOG_INFO(LABEL, "invalid nodeId: %{public}s", ConstantCommon::EncryptDevId(nodeId).c_str()); return Constant::FAILURE; } ACCESSTOKEN_LOG_INFO(LABEL, "operation start with nodeId: %{public}s", nodeId.c_str()); @@ -205,7 +205,7 @@ int RemoteCommandManager::NotifyDeviceOnline(const std::string &nodeId) int RemoteCommandManager::NotifyDeviceOffline(const std::string &nodeId) { if (!DataValidator::IsDeviceIdValid(nodeId)) { - ACCESSTOKEN_LOG_INFO(LABEL, "invalid nodeId: %{public}s", nodeId.c_str()); + ACCESSTOKEN_LOG_INFO(LABEL, "invalid nodeId: %{public}s", ConstantCommon::EncryptDevId(nodeId).c_str()); return Constant::FAILURE; } ACCESSTOKEN_LOG_INFO(LABEL, "operation start with nodeId: %{public}s", nodeId.c_str()); @@ -268,7 +268,7 @@ std::shared_ptr RemoteCommandManager::GetOrCreateRemoteCo */ std::shared_ptr RemoteCommandManager::GetExecutorChannel(const std::string &nodeId) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "convert udid start, nodeId:%{public}s", nodeId.c_str()); + ACCESSTOKEN_LOG_DEBUG(LABEL, "convert udid start, nodeId:%{public}s", ConstantCommon::EncryptDevId(nodeId).c_str()); std::string udid = DeviceInfoManager::GetInstance().ConvertToUniqueDeviceIdOrFetch(nodeId); if (!DataValidator::IsDeviceIdValid(udid)) { ACCESSTOKEN_LOG_WARN( diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp index d4cdeb052..59fadadec 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp @@ -16,6 +16,7 @@ #include +#include "constant_common.h" #include "device_info_manager.h" #include "token_sync_event_handler.h" #include "token_sync_manager_service.h" @@ -63,7 +64,8 @@ int SoftBusChannel::BuildConnection() std::unique_lock lock(sessionMutex_); if (session_ == Constant::INVALID_SESSION) { - ACCESSTOKEN_LOG_INFO(LABEL, "open session with device: %{public}s", (deviceId_.c_str())); + ACCESSTOKEN_LOG_INFO(LABEL, "open session with device: %{public}s", + ConstantCommon::EncryptDevId(deviceId_).c_str()); int session = SoftBusManager::GetInstance().OpenSession(deviceId_); if (session == Constant::INVALID_SESSION) { ACCESSTOKEN_LOG_ERROR(LABEL, "open session failed."); @@ -96,7 +98,8 @@ void SoftBusChannel::CloseConnection() } else { SoftBusManager::GetInstance().CloseSession(thisPtr->session_); thisPtr->session_ = Constant::INVALID_SESSION; - ACCESSTOKEN_LOG_INFO(LABEL, "close session for device: %{public}s", thisPtr->deviceId_.c_str()); + ACCESSTOKEN_LOG_INFO(LABEL, "close session for device: %{public}s", + ConstantCommon::EncryptDevId(thisPtr->deviceId_).c_str()); } thisPtr->isDelayClosing_ = false; }); diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index c1bd1344a..ff8800913 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -277,7 +277,7 @@ int SoftBusManager::CloseSession(int sessionId) std::string SoftBusManager::GetUniversallyUniqueIdByNodeId(const std::string &nodeId) { if (!DataValidator::IsDeviceIdValid(nodeId)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "invalid nodeId: %{public}s", nodeId.c_str()); + ACCESSTOKEN_LOG_ERROR(LABEL, "invalid nodeId: %{public}s", ConstantCommon::EncryptDevId(nodeId).c_str()); return ""; } @@ -307,7 +307,7 @@ std::string SoftBusManager::GetUniversallyUniqueIdByNodeId(const std::string &no std::string SoftBusManager::GetUniqueDeviceIdByNodeId(const std::string &nodeId) { if (!DataValidator::IsDeviceIdValid(nodeId)) { - ACCESSTOKEN_LOG_ERROR(LABEL, "invalid nodeId: %{public}s", nodeId.c_str()); + ACCESSTOKEN_LOG_ERROR(LABEL, "invalid nodeId: %{public}s", ConstantCommon::EncryptDevId(nodeId).c_str()); return ""; } std::string udid = GetUdidByNodeId(nodeId); @@ -343,8 +343,8 @@ std::string SoftBusManager::GetUuidByNodeId(const std::string &nodeId) const } std::string uuid(reinterpret_cast(info)); delete[] info; - ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished. nodeId(in): %{public}s, uuid: %{public}s", nodeId.c_str(), - uuid.c_str()); + ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished. nodeId(in): %{public}s, uuid: %{public}s", + ConstantCommon::EncryptDevId(nodeId).c_str(), uuid.c_str()); return uuid; } @@ -365,7 +365,8 @@ std::string SoftBusManager::GetUdidByNodeId(const std::string &nodeId) const } std::string udid(reinterpret_cast(info)); delete[] info; - ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished: nodeId(in): %{public}s", nodeId.c_str()); + ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished: nodeId(in): %{public}s", + ConstantCommon::EncryptDevId(nodeId).c_str()); return udid; } -- Gitee