diff --git a/services/distributeddataservice/adapter/bundle_mgr/BUILD.gn b/services/distributeddataservice/adapter/bundle_mgr/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..7ca4db4f9b288cedeba3f80ced2ab196aa1e3cfb
--- /dev/null
+++ b/services/distributeddataservice/adapter/bundle_mgr/BUILD.gn
@@ -0,0 +1,57 @@
+# Copyright (c) 2025 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/ohos.gni")
+import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni")
+
+config("module_public_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "${data_service_path}/adapter" ]
+}
+
+ohos_source_set("distributeddata_bundle_mgr") {
+  branch_protector_ret = "pac_ret"
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+    boundary_sanitize = true
+    ubsan = true
+  }
+  sources = [ "bundle_mgr_adapter.cpp" ]
+  cflags_cc = [
+    "-fvisibility=hidden",
+    "-Oz",
+    "-fstack-protector-strong",
+  ]
+
+  public_configs = [ ":module_public_config" ]
+  cflags = [
+    "-fdata-sections",
+    "-ffunction-sections",
+    "-Werror",
+    "-Wno-multichar",
+    "-Wno-c99-designator",
+    "-D_LIBCPP_HAS_COND_CLOCKWAIT",
+    "-Oz",
+    "-fstack-protector-strong",
+  ]
+
+  external_deps = [ "kv_store:datamgr_common" ]
+  external_deps += [
+    "bundle_framework:appexecfwk_base",
+    "bundle_framework:appexecfwk_core",
+    "hilog:libhilog",
+  ]
+  subsystem_name = "distributeddatamgr"
+  part_name = "datamgr_service"
+}
diff --git a/services/distributeddataservice/adapter/bundle_mgr/bundle_mgr_adapter.cpp b/services/distributeddataservice/adapter/bundle_mgr/bundle_mgr_adapter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..efd9d203a194134b47b38164b72efc34fb0d916e
--- /dev/null
+++ b/services/distributeddataservice/adapter/bundle_mgr/bundle_mgr_adapter.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "BundleMgrAdapter"
+#include "bundle_mgr/bundle_mgr_adapter.h"
+#include "bundle_mgr_client.h"
+#include "log_print.h"
+using namespace OHOS::AppExecFwk;
+namespace OHOS::DistributedData {
+
+BundleMgrAdapter &BundleMgrAdapter::GetInstance()
+{
+    static BundleMgrAdapter instance;
+    return instance;
+}
+
+std::string BundleMgrAdapter::GetBundleName(int32_t uid)
+{
+    BundleMgrClient client;
+    std::string bundleName;
+    auto code = client.GetNameForUid(uid, bundleName);
+    if (code != 0) {
+        ZLOGE("failed. uid:%{public}d, code:%{public}d", uid, code);
+        return "";
+    }
+    return bundleName;
+}
+} // namespace OHOS::DistributedData
\ No newline at end of file
diff --git a/services/distributeddataservice/adapter/bundle_mgr/bundle_mgr_adapter.h b/services/distributeddataservice/adapter/bundle_mgr/bundle_mgr_adapter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e955a6fbab2454768c3fe6b4609cff12ab056cbd
--- /dev/null
+++ b/services/distributeddataservice/adapter/bundle_mgr/bundle_mgr_adapter.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef DISTRIBUTEDDATAMGR_DATAMGR_BUNDLE_MANAGER_ADAPTER_H
+#define DISTRIBUTEDDATAMGR_DATAMGR_BUNDLE_MANAGER_ADAPTER_H
+
+#include <string>
+#include <vector>
+#include "visibility.h"
+
+namespace OHOS {
+namespace DistributedData {
+class API_EXPORT BundleMgrAdapter {
+public:
+    static BundleMgrAdapter &GetInstance();
+    std::string GetBundleName(int32_t uid);
+};
+} // namespace DistributedData
+} // namespace OHOS
+#endif //DISTRIBUTEDDATAMGR_DATAMGR_BUNDLE_MANAGER_ADAPTER_H
diff --git a/services/distributeddataservice/adapter/bundle_mgr/test/BUILD.gn b/services/distributeddataservice/adapter/bundle_mgr/test/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..193ada6a489bf4e54c0691a5d990d522fe664973
--- /dev/null
+++ b/services/distributeddataservice/adapter/bundle_mgr/test/BUILD.gn
@@ -0,0 +1,42 @@
+# Copyright (c) 2025 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/test.gni")
+import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni")
+module_output_path = "datamgr_service/datamgr_service/distributeddatafwk"
+
+###############################################################################
+ohos_unittest("BundleMgrTest") {
+  module_out_path = module_output_path
+
+  sources = [ "bundle_mgr_test.cpp" ]
+
+  cflags = [ "-Werror" ]
+  deps = [ "${data_service_path}/adapter/bundle_mgr:distributeddata_bundle_mgr" ]
+
+  external_deps = [
+    "googletest:gtest_main",
+    "hilog:libhilog",
+    "ipc:ipc_core",
+    "kv_store:datamgr_common",
+  ]
+}
+
+###############################################################################
+group("unittest") {
+  testonly = true
+
+  deps = []
+
+  deps += [ ":BundleMgrTest" ]
+}
+###############################################################################
diff --git a/services/distributeddataservice/adapter/bundle_mgr/test/bundle_mgr_test.cpp b/services/distributeddataservice/adapter/bundle_mgr/test/bundle_mgr_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bf5590727434022a7006a8a80de655e9be5ab1e2
--- /dev/null
+++ b/services/distributeddataservice/adapter/bundle_mgr/test/bundle_mgr_test.cpp
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2025 Huawei Device Co., Ltd.
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include <gtest/gtest.h>
+
+#include "bundle_mgr/bundle_mgr_adapter.h"
+#include "ipc_skeleton.h"
+namespace {
+using namespace OHOS;
+using namespace OHOS::DistributedData;
+using namespace testing::ext;
+
+class BundleMgrTest : public testing::Test {
+public:
+    static void SetUpTestCase(void) {}
+    static void TearDownTestCase(void) {}
+    void SetUp() {}
+    void TearDown() {}
+};
+
+/**
+* @tc.name: GetBundleName
+* @tc.desc: GetBundleName test
+* @tc.type: FUNC
+* @tc.require:
+* @tc.author:
+*/
+HWTEST_F(BundleMgrTest, GetBundleName, TestSize.Level0)
+{
+    auto bundleName = BundleMgrAdapter::GetInstance().GetBundleName(0);
+    EXPECT_TRUE(bundleName.empty());
+}
+} // namespace
\ No newline at end of file
diff --git a/services/distributeddataservice/adapter/test/BUILD.gn b/services/distributeddataservice/adapter/test/BUILD.gn
index 6f6f3b435e02812d2ab6e46a46646c7a8683218b..7e5686d14711869e203fda7804851ad55c4b9796 100755
--- a/services/distributeddataservice/adapter/test/BUILD.gn
+++ b/services/distributeddataservice/adapter/test/BUILD.gn
@@ -20,11 +20,15 @@ group("unittest") {
 
   deps += [
     "../account/test:unittest",
+    "../bundle_mgr/test:unittest",
     "../communicator/test:unittest",
     "../dfx/test:unittest",
-    "../screenlock/test:unittest",
   ]
 
+  if (defined(global_parts_info) && defined(global_parts_info.theme_screenlock_mgr)) {
+    deps += [ "${data_service_path}/adapter/screenlock/test:unittest" ]
+  }
+
   if (datamgr_service_cloud) {
     deps += [ "../network/test:unittest" ]
   }
diff --git a/services/distributeddataservice/service/rdb/BUILD.gn b/services/distributeddataservice/service/rdb/BUILD.gn
index ad693d92d8acab1c86f34e97d6b40bf44b1b5da8..9692c996e47bdd9f10428c01aadc43a9f5dae98d 100644
--- a/services/distributeddataservice/service/rdb/BUILD.gn
+++ b/services/distributeddataservice/service/rdb/BUILD.gn
@@ -67,6 +67,7 @@ ohos_source_set("distributeddata_rdb") {
   ]
 
   deps = [
+    "${data_service_path}/adapter/bundle_mgr:distributeddata_bundle_mgr",
     "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
     "${data_service_path}/service/common:distributeddata_common",
     "${data_service_path}/service/crypto:distributeddata_crypto",
diff --git a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
index 61bff0d7681858adc3ccef8ecbb863a16e5348ee..3d5f4830247613a251c79b543f11159c626b71d9 100644
--- a/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_service_impl.cpp
@@ -18,6 +18,7 @@
 #include "abs_rdb_predicates.h"
 #include "accesstoken_kit.h"
 #include "account/account_delegate.h"
+#include "bundle_mgr/bundle_mgr_adapter.h"
 #include "changeevent/remote_change_event.h"
 #include "checker/checker_manager.h"
 #include "cloud/change_event.h"
@@ -233,10 +234,18 @@ bool RdbServiceImpl::CheckAccess(const std::string& bundleName, const std::strin
 
 std::string RdbServiceImpl::ObtainDistributedTableName(const std::string &device, const std::string &table)
 {
-    ZLOGI("device=%{public}s table=%{public}s", Anonymous::Change(device).c_str(), table.c_str());
-    auto uuid = DmAdapter::GetInstance().GetUuidByNetworkId(device);
+    ZLOGI("device=%{public}s table=%{public}s", Anonymous::Change(device).c_str(), Anonymous::Change(table).c_str());
+    auto uid = IPCSkeleton::GetCallingUid();
+    auto bundleName = BundleMgrAdapter::GetInstance().GetBundleName(uid);
+    auto tokenId = IPCSkeleton::GetCallingTokenID();
+    std::string appId = " ";
+    if (AccessTokenKit::GetTokenTypeFlag(tokenId) == Security::AccessToken::TOKEN_HAP) {
+        appId = CheckerManager::GetInstance().GetAppId({ uid, tokenId, bundleName });
+    }
+    auto uuid = DmAdapter::GetInstance().CalcClientUuid(appId, DmAdapter::GetInstance().ToUUID(device));
     if (uuid.empty()) {
-        ZLOGE("get uuid failed");
+        ZLOGE("get uuid failed, bundle:%{public}s, deviceId:%{public}s, table:%{public}s", bundleName.c_str(),
+            Anonymous::Change(device).c_str(), Anonymous::Change(table).c_str());
         return "";
     }
     return DistributedDB::RelationalStoreManager::GetDistributedTableName(uuid, table);
diff --git a/services/distributeddataservice/service/rdb/rdb_service_stub.cpp b/services/distributeddataservice/service/rdb/rdb_service_stub.cpp
index 737b216bbe98d95f4e4363bb8181c2174c909dbe..fd7ee6ee4447c358de9b589c7239d02415c1525c 100755
--- a/services/distributeddataservice/service/rdb/rdb_service_stub.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_service_stub.cpp
@@ -36,7 +36,8 @@ int32_t RdbServiceStub::OnRemoteObtainDistributedTableName(MessageParcel &data,
     }
 
     std::string distributedTableName = ObtainDistributedTableName(device, table);
-    if (!ITypesUtil::Marshal(reply, distributedTableName)) {
+    int32_t status = distributedTableName.empty() ? RDB_ERROR : RDB_OK;
+    if (!ITypesUtil::Marshal(reply, status, distributedTableName)) {
         ZLOGE("Marshal distributedTableName:%{public}s", distributedTableName.c_str());
         return IPC_STUB_WRITE_PARCEL_ERR;
     }
diff --git a/services/distributeddataservice/service/test/BUILD.gn b/services/distributeddataservice/service/test/BUILD.gn
index b2f90d849d23e376d6cc49cad915980eaec560d3..ef922b621965cfc869cf64f12b4f7270b907e679 100755
--- a/services/distributeddataservice/service/test/BUILD.gn
+++ b/services/distributeddataservice/service/test/BUILD.gn
@@ -67,8 +67,6 @@ ohos_unittest("CloudDataTest") {
   }
   module_out_path = module_output_path
   sources = [
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
     "${data_service_path}/service/cloud/cloud_data_translate.cpp",
     "${data_service_path}/service/cloud/cloud_service_impl.cpp",
     "${data_service_path}/service/cloud/cloud_service_stub.cpp",
@@ -76,40 +74,6 @@ ohos_unittest("CloudDataTest") {
     "${data_service_path}/service/cloud/cloud_value_util.cpp",
     "${data_service_path}/service/cloud/sync_manager.cpp",
     "${data_service_path}/service/cloud/sync_strategies/network_sync_strategy.cpp",
-    "${data_service_path}/service/common/common_types_utils.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/kvdb/user_delegate.cpp",
-    "${data_service_path}/service/matrix/src/device_matrix.cpp",
-    "${data_service_path}/service/matrix/src/matrix_event.cpp",
-    "${data_service_path}/service/permission/src/permission_validator.cpp",
-    "${data_service_path}/service/permission/src/permit_delegate.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "${data_service_path}/service/test/mock/checker_mock.cpp",
     "cloud_data_test.cpp",
   ]
@@ -117,33 +81,26 @@ ohos_unittest("CloudDataTest") {
   configs = [ ":module_private_config" ]
 
   external_deps = [
-    "ability_base:base",
-    "ability_base:want",
     "access_token:libaccesstoken_sdk",
     "access_token:libtoken_setproc",
     "access_token:libtokenid_sdk",
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "device_manager:devicemanagersdk",
     "hicollie:libhicollie",
-    "hilog:libhilog",
-    "hisysevent:libhisysevent",
-    "huks:libhukssdk",
-    "ipc:ipc_core",
+    "json:nlohmann_json_static",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddb",
-    "netmanager_base:net_conn_manager_if",
     "relational_store:native_rdb",
-    "resource_management:global_resmgr",
-    "samgr:samgr_proxy",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
     "${data_service_path}/adapter/communicator:distributeddata_communicator",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
-    "../../framework:distributeddatasvcfwk",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
+    "${data_service_path}/framework:distributeddatasvcfwk",
     "mock:distributeddata_mock_static",
     "//third_party/googletest:gtest_main",
   ]
@@ -163,8 +120,6 @@ ohos_unittest("CloudServiceImplTest") {
   }
   module_out_path = module_output_path
   sources = [
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
     "${data_service_path}/service/cloud/cloud_data_translate.cpp",
     "${data_service_path}/service/cloud/cloud_service_impl.cpp",
     "${data_service_path}/service/cloud/cloud_service_stub.cpp",
@@ -172,40 +127,6 @@ ohos_unittest("CloudServiceImplTest") {
     "${data_service_path}/service/cloud/cloud_value_util.cpp",
     "${data_service_path}/service/cloud/sync_manager.cpp",
     "${data_service_path}/service/cloud/sync_strategies/network_sync_strategy.cpp",
-    "${data_service_path}/service/common/common_types_utils.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/kvdb/user_delegate.cpp",
-    "${data_service_path}/service/matrix/src/device_matrix.cpp",
-    "${data_service_path}/service/matrix/src/matrix_event.cpp",
-    "${data_service_path}/service/permission/src/permission_validator.cpp",
-    "${data_service_path}/service/permission/src/permit_delegate.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "${data_service_path}/service/test/mock/checker_mock.cpp",
     "cloud_service_impl_test.cpp",
   ]
@@ -213,33 +134,25 @@ ohos_unittest("CloudServiceImplTest") {
   configs = [ ":module_private_config" ]
 
   external_deps = [
-    "ability_base:base",
-    "ability_base:want",
     "access_token:libaccesstoken_sdk",
     "access_token:libtoken_setproc",
-    "access_token:libtokenid_sdk",
-    "bundle_framework:appexecfwk_base",
-    "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "device_manager:devicemanagersdk",
     "hicollie:libhicollie",
-    "hilog:libhilog",
-    "hisysevent:libhisysevent",
-    "huks:libhukssdk",
-    "ipc:ipc_core",
+    "json:nlohmann_json_static",
     "kv_store:distributeddata_inner",
     "kv_store:distributeddb",
-    "netmanager_base:net_conn_manager_if",
     "relational_store:native_rdb",
-    "resource_management:global_resmgr",
-    "samgr:samgr_proxy",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
     "${data_service_path}/adapter/communicator:distributeddata_communicator",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
-    "../../framework:distributeddatasvcfwk",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
+    "${data_service_path}/framework:distributeddatasvcfwk",
     "mock:distributeddata_mock_static",
     "//third_party/googletest:gtest_main",
   ]
diff --git a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
index 3cb8f10bdf4a4f02757ff2f3dbfc594e0248ee1b..809567f62fdc22e3e61d018785f04adebb77cf37 100644
--- a/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/cloudservicestub_fuzzer/BUILD.gn
@@ -64,65 +64,24 @@ ohos_fuzztest("CloudServiceStubFuzzTest") {
   sources = [
     "${data_service_path}/app/src/checker/bundle_checker.cpp",
     "${data_service_path}/app/src/checker/system_checker.cpp",
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
-    "${data_service_path}/service/cloud/cloud_data_translate.cpp",
-    "${data_service_path}/service/cloud/cloud_service_impl.cpp",
-    "${data_service_path}/service/cloud/cloud_service_stub.cpp",
-    "${data_service_path}/service/cloud/cloud_types_util.cpp",
-    "${data_service_path}/service/cloud/cloud_value_util.cpp",
-    "${data_service_path}/service/cloud/sync_manager.cpp",
-    "${data_service_path}/service/cloud/sync_strategies/network_sync_strategy.cpp",
-    "${data_service_path}/service/common/common_types_utils.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/kvdb/user_delegate.cpp",
-    "${data_service_path}/service/permission/src/permission_validator.cpp",
-    "${data_service_path}/service/permission/src/permit_delegate.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "cloudservicestub_fuzzer.cpp",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/network:distributeddata_network",
     "${data_service_path}/adapter/schema_helper:distributeddata_schema_helper",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${data_service_path}/service:distributeddatasvc",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/cloud:distributeddata_cloud",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
     "${kv_store_distributeddb_path}:distributeddb",
   ]
 
   external_deps = [
-    "ability_base:want",
-    "ability_base:zuri",
-    "ability_runtime:ability_manager",
-    "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "access_token:libtoken_setproc",
     "access_token:libtokenid_sdk",
diff --git a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
index e51d78511f3f6e31e68cc9494dc0133b8bcf9d50..8201727060871b9676b90e7cf8a75065a4832e27 100644
--- a/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/service/test/fuzztest/rdbservicestub_fuzzer/BUILD.gn
@@ -64,46 +64,19 @@ ohos_fuzztest("RdbServiceStubFuzzTest") {
   sources = [
     "${data_service_path}/app/src/checker/bundle_checker.cpp",
     "${data_service_path}/app/src/checker/system_checker.cpp",
-    "${data_service_path}/service/backup/src/backup_manager.cpp",
-    "${data_service_path}/service/bootstrap/src/bootstrap.cpp",
-    "${data_service_path}/service/common/value_proxy.cpp",
-    "${data_service_path}/service/common/xcollie.cpp",
-    "${data_service_path}/service/config/src/config_factory.cpp",
-    "${data_service_path}/service/config/src/model/app_id_mapping_config.cpp",
-    "${data_service_path}/service/config/src/model/backup_config.cpp",
-    "${data_service_path}/service/config/src/model/checker_config.cpp",
-    "${data_service_path}/service/config/src/model/cloud_config.cpp",
-    "${data_service_path}/service/config/src/model/component_config.cpp",
-    "${data_service_path}/service/config/src/model/directory_config.cpp",
-    "${data_service_path}/service/config/src/model/global_config.cpp",
-    "${data_service_path}/service/config/src/model/network_config.cpp",
-    "${data_service_path}/service/config/src/model/protocol_config.cpp",
-    "${data_service_path}/service/config/src/model/thread_config.cpp",
-    "${data_service_path}/service/crypto/src/crypto_manager.cpp",
-    "${data_service_path}/service/rdb/cache_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_asset_loader.cpp",
-    "${data_service_path}/service/rdb/rdb_cloud.cpp",
-    "${data_service_path}/service/rdb/rdb_cursor.cpp",
-    "${data_service_path}/service/rdb/rdb_general_store.cpp",
-    "${data_service_path}/service/rdb/rdb_hiview_adapter.cpp",
-    "${data_service_path}/service/rdb/rdb_notifier_proxy.cpp",
-    "${data_service_path}/service/rdb/rdb_query.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_result_set_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_schema_config.cpp",
-    "${data_service_path}/service/rdb/rdb_service_impl.cpp",
-    "${data_service_path}/service/rdb/rdb_service_stub.cpp",
-    "${data_service_path}/service/rdb/rdb_watcher.cpp",
     "rdbservicestub_fuzzer.cpp",
   ]
 
   deps = [
     "${data_service_path}/adapter/account:distributeddata_account",
+    "${data_service_path}/adapter/dfx:distributeddata_dfx",
     "${data_service_path}/adapter/utils:distributeddata_utils",
     "${data_service_path}/framework:distributeddatasvcfwk",
-    "${data_service_path}/service:distributeddatasvc",
+    "${data_service_path}/service/bootstrap:distributeddata_bootstrap",
+    "${data_service_path}/service/cloud:distributeddata_cloud",
+    "${data_service_path}/service/common:distributeddata_common",
+    "${data_service_path}/service/rdb:distributeddata_rdb",
     "${kv_store_distributeddb_path}:distributeddb",
-    "${relational_store_inner_api_path}:native_rdb_static",
   ]
 
   external_deps = [