diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/idevice_status_change_listener.h b/frameworks/innerkitsimpl/distributeddatafwk/include/idevice_status_change_listener.h
index ca6cf4f46dad1d7e8a4537c8653ba835877b8d09..b17f9e499968d3c06e058aa1f54d3acd2f36ed5f 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/idevice_status_change_listener.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/idevice_status_change_listener.h
@@ -30,8 +30,8 @@ public:
 
 class DeviceStatusChangeListenerStub : public IRemoteStub<IDeviceStatusChangeListener> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 };
 
 class DeviceStatusChangeListenerProxy : public IRemoteProxy<IDeviceStatusChangeListener> {
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h
index ffd926a6df4b2171bba15e3a971075c36fb56ade..7c374727d1c2d9cc251b5a50658e44c50433a3b2 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h
@@ -58,8 +58,8 @@ public:
 
 class KvStoreImplStub : public IRemoteStub<IKvStoreImpl> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 
 private:
     int32_t GetKvStoreSnapshotOnRemote(MessageParcel &data, MessageParcel &reply);
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_data_service.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_data_service.h
index 17fb50cb4b93410e64c4866452f84d9c442586a3..d7540ae18b881ac3a1bbaa6788de5321b0d190a9 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_data_service.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_data_service.h
@@ -106,8 +106,8 @@ public:
 
 class KvStoreDataServiceStub : public IRemoteStub<IKvStoreDataService> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 
 private:
     int32_t GetKvStoreOnRemote(MessageParcel &data, MessageParcel &reply);
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h
index 14b195f78bc0e120a4418dc0318fe415e7676633..cf05a666816af0aa045b538b2dab6f8fbfab56e5 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h
@@ -33,8 +33,8 @@ public:
 
 class KvStoreObserverStub : public IRemoteStub<IKvStoreObserver> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 };
 
 class KvStoreObserverProxy : public IRemoteProxy<IKvStoreObserver> {
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_resultset.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_resultset.h
index 313025afbefd9d70769b99b1e14385e78f9e1334..0aa8deedf8ae78fa96fbf5504895af38de6b2ce9 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_resultset.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_resultset.h
@@ -56,8 +56,8 @@ public:
 
 class KvStoreResultSetStub : public IRemoteStub<IKvStoreResultSet> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 
 private:
     int GetEntryOnRemote(MessageParcel &reply);
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h
index f255339df243fba25ac6e9d937d89e6647c84eac..56f44c149675282decd77e64d6a61f1c8473adbe 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h
@@ -100,8 +100,8 @@ public:
 
 class SingleKvStoreStub : public IRemoteStub<ISingleKvStore> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 
 private:
     int PutOnRemote(MessageParcel &data, MessageParcel &reply);
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h
index 31268126d2bb985bbae3744e9804916bc9b612c8..a031c52758880158440a9c238a8fdee709c632d6 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h
@@ -41,8 +41,8 @@ public:
 
 class KvStoreSnapshotImplStub : public IRemoteStub<IKvStoreSnapshotImpl> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 
 private:
     int32_t GetEntriesOnRemote(MessageParcel &data, MessageParcel &reply);
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h
index 7761fdfc71521096335dcdf582392811f275b5c4..832650285ce067f7f3c291dddbd541e233f3ffc7 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h
@@ -32,8 +32,8 @@ public:
 
 class KvStoreSyncCallbackStub : public IRemoteStub<IKvStoreSyncCallback> {
 public:
-    virtual int OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                MessageParcel &reply, MessageOption &option) override;
+    int OnRemoteRequest(uint32_t code, MessageParcel &data,
+                        MessageParcel &reply, MessageOption &option) override;
 };
 
 class KvStoreSyncCallbackProxy : public IRemoteProxy<IKvStoreSyncCallback> {
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_observer.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_observer.cpp
index b763404879a534ccf8203b44b286fc94114b6ce8..a9d0a58305beff3dbd4e1adf2f900c15da7352c7 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_observer.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_observer.cpp
@@ -17,6 +17,7 @@
 
 #include "ikvstore_observer.h"
 #include <chrono>
+#include <cinttypes>
 #include "constant.h"
 #include "log_print.h"
 #include "message_parcel.h"
@@ -98,9 +99,8 @@ void KvStoreObserverProxy::OnChange(const ChangeNotification &changeNotification
         ZLOGE("Write ChangeNotification buffer size to parcel failed.");
         return;
     }
-    ZLOGD("I(%lld) U(%lld) D(%lld) T(%lld)", static_cast<long long>(insertBufferSize),
-          static_cast<long long>(updateBufferSize), static_cast<long long>(deleteBufferSize),
-          static_cast<long long>(totalBufferSize));
+    ZLOGD("I(%" PRId64") U(%" PRId64") D(%" PRId64") T(%" PRId64")",
+          insertBufferSize, updateBufferSize, deleteBufferSize, totalBufferSize);
     if (totalBufferSize < Constant::SWITCH_RAW_DATA_SIZE) {
         if (!data.WriteParcelable(&changeNotification)) {
             ZLOGW("Write ChangeNotification to parcel failed.");
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
index bd6aa922c28ea4e53235719097f49be1a51a7c2f..857ba5e42c03088e381913e13b25d7622ff90ead 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
@@ -56,7 +56,7 @@ class MyDeathRecipient : public KvStoreDeathRecipient {
 public:
     MyDeathRecipient() {}
     virtual ~MyDeathRecipient() {}
-    virtual void OnRemoteDied() override {}
+    void OnRemoteDied() override {}
 };
 
 DistributedKvDataManager DistributedKvDataManagerTest::manager;
@@ -257,7 +257,7 @@ HWTEST_F(DistributedKvDataManagerTest, GetAllKvStore001, TestSize.Level1)
     std::vector<StoreId> storeIds;
     Status status = manager.GetAllKvStoreId(appId, storeIds);
     EXPECT_EQ(status, Status::SUCCESS);
-    EXPECT_EQ(storeIds.size(), (unsigned long)0);
+    EXPECT_EQ(storeIds.size(), static_cast<size_t>(0));
 }
 
 /**
@@ -307,7 +307,7 @@ HWTEST_F(DistributedKvDataManagerTest, GetAllKvStore002, TestSize.Level1)
     EXPECT_TRUE(haveId1);
     EXPECT_TRUE(haveId2);
     EXPECT_TRUE(haveId3);
-    EXPECT_EQ(storeIds.size(), (unsigned long)3);
+    EXPECT_EQ(storeIds.size(), static_cast<size_t>(3));
 }
 
 /**
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/local_subscribe_store_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/local_subscribe_store_test.cpp
index cd79e1362c2c6aaa33bc146e39ffe5533bf255e8..fde1cd3d26f29465d0adb9a9e99a143c0f1cbd33 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/local_subscribe_store_test.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/local_subscribe_store_test.cpp
@@ -96,10 +96,10 @@ public:
     // reset the callCount_ to zero.
     void ResetToZero();
 
-    unsigned long GetCallCount() const;
+    uint64_t GetCallCount() const;
 
 private:
-    unsigned long callCount_;
+    uint64_t callCount_;
 };
 
 KvStoreObserverUnitTest::KvStoreObserverUnitTest()
@@ -148,7 +148,7 @@ void KvStoreObserverUnitTest::ResetToZero()
     callCount_ = 0;
 }
 
-unsigned long KvStoreObserverUnitTest::GetCallCount() const
+uint64_t KvStoreObserverUnitTest::GetCallCount() const
 {
     return callCount_;
 }
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp
index 6ee99553abca321d131c459257724971451f516c..6e9ce337017916e644eddc8e6328b4b73424aaaf 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/single_kvstore_client_test.cpp
@@ -96,10 +96,10 @@ public:
     // reset the callCount_ to zero.
     void ResetToZero();
 
-    unsigned long GetCallCount() const;
+    uint64_t GetCallCount() const;
 
 private:
-    unsigned long callCount_;
+    uint64_t callCount_;
 };
 
 void KvStoreObserverTestImpl::OnChange(const ChangeNotification &changeNotification)
@@ -145,7 +145,7 @@ void KvStoreObserverTestImpl::ResetToZero()
     callCount_ = 0;
 }
 
-unsigned long KvStoreObserverTestImpl::GetCallCount() const
+uint64_t KvStoreObserverTestImpl::GetCallCount() const
 {
     return callCount_;
 }
@@ -222,10 +222,10 @@ HWTEST_F(SingleKvStoreClientTest, GetEntriesAndResultSet001, TestSize.Level1)
     EXPECT_NE(singleKvStorePtr, nullptr) << "kvStorePtr is null.";
 
     // prepare 10
-    unsigned long sum = 10;
+    size_t sum = 10;
     int sum_1 = 10;
     std::string prefix = "prefix_";
-    for (unsigned long i = 0; i < sum; i++) {
+    for (size_t i = 0; i < sum; i++) {
         singleKvStorePtr->Put({prefix + std::to_string(i)}, {std::to_string(i)});
     }
 
@@ -250,7 +250,7 @@ HWTEST_F(SingleKvStoreClientTest, GetEntriesAndResultSet001, TestSize.Level1)
     Entry entry;
     resultSet->GetEntry(entry);
 
-    for (unsigned long i = 0; i < sum; i++) {
+    for (size_t i = 0; i < sum; i++) {
         singleKvStorePtr->Delete({prefix + std::to_string(i)});
     }
 
@@ -710,7 +710,7 @@ HWTEST_F(SingleKvStoreClientTest, SingleKvStoreDdmDeleteBatch001, TestSize.Level
     EXPECT_EQ(Status::SUCCESS, status2) << "singleKvStore deletebatch data return wrong status";
     std::vector<Entry> results;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch001_", results);
-    unsigned long sum = 0;
+    size_t sum = 0;
     EXPECT_EQ(results.size(), sum) << "entries size is not equal 0.";
 }
 
@@ -751,7 +751,7 @@ HWTEST_F(SingleKvStoreClientTest, SingleKvStoreDdmDeleteBatch002, TestSize.Level
     EXPECT_EQ(Status::SUCCESS, status2) << "KvStore deletebatch data return wrong status";
     std::vector<Entry> results;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch002_", results);
-    unsigned long sum = 0;
+    size_t sum = 0;
     EXPECT_EQ(results.size(), sum) << "entries size is not equal 0.";
 }
 
@@ -791,7 +791,7 @@ HWTEST_F(SingleKvStoreClientTest, SingleKvStoreDdmDeleteBatch003, TestSize.Level
     EXPECT_EQ(Status::INVALID_ARGUMENT, status2) << "KvStore deletebatch data return wrong status";
     std::vector<Entry> results;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch003_", results);
-    unsigned long sum = 3;
+    size_t sum = 3;
     EXPECT_EQ(results.size(), sum) << "entries size is not equal 3.";
 }
 
@@ -829,14 +829,14 @@ HWTEST_F(SingleKvStoreClientTest, SingleKvStoreDdmDeleteBatch004, TestSize.Level
 
     std::vector<Entry> results1;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch004_", results1);
-    unsigned long sum1 = 3;
+    size_t sum1 = 3;
     EXPECT_EQ(results1.size(), sum1) << "entries size1111 is not equal 3.";
 
     Status status2 = singleKvStorePtr->DeleteBatch(keys);
     EXPECT_EQ(Status::INVALID_ARGUMENT, status2) << "SingleKvStore deletebatch data return wrong status";
     std::vector<Entry> results;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch004_", results);
-    unsigned long sum = 3;
+    size_t sum = 3;
     EXPECT_EQ(results.size(), sum) << "entries size is not equal 3.";
 }
 
@@ -875,14 +875,14 @@ HWTEST_F(SingleKvStoreClientTest, SingleKvStoreDdmDeleteBatch005, TestSize.Level
 
     std::vector<Entry> results1;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch005_", results1);
-    unsigned long sum1 = 3;
+    size_t sum1 = 3;
     EXPECT_EQ(results1.size(), sum1) << "entries111 size is not equal 3.";
 
     Status status2 = singleKvStorePtr->DeleteBatch(keys);
     EXPECT_EQ(Status::INVALID_ARGUMENT, status2) << "SingleKvStore deletebatch data return wrong status";
     std::vector<Entry> results;
     singleKvStorePtr->GetEntries("SingleKvStoreDdmDeleteBatch005_", results);
-    unsigned long sum = 3;
+    size_t sum = 3;
     EXPECT_EQ(results.size(), sum) << "entries size is not equal 3.";
 }
 
diff --git a/frameworks/jskitsimpl/distributeddata/include/js_kv_manager.h b/frameworks/jskitsimpl/distributeddata/include/js_kv_manager.h
index a13417cecce7dd6680275965a05c9644604394e9..1ea27b46e72b7eb35853fdece5076ef53598a705 100644
--- a/frameworks/jskitsimpl/distributeddata/include/js_kv_manager.h
+++ b/frameworks/jskitsimpl/distributeddata/include/js_kv_manager.h
@@ -46,7 +46,7 @@ private:
     public:
         DeathRecipient(std::shared_ptr<UvQueue> uvQueue, napi_value callback) : JSObserver(uvQueue, callback) {};
         virtual ~DeathRecipient() = default;
-        virtual void OnRemoteDied() override;
+        void OnRemoteDied() override;
     };
 
     DistributedKv::DistributedKvDataManager kvDataManager_ {};
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp b/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp
index 966c6388ad19ce1d849762bdc6cf686a7cbd3a4a..98b7634e75a41387ed24c0511fd353a102660ea3 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp
@@ -150,14 +150,14 @@ static napi_status GetVariantArgs(napi_env env, size_t argc, napi_value* argv, V
             CHECK_RETURN(!va.keyPrefix.empty(), "invalid arg[1], i.e. invalid keyPrefix!", napi_invalid_arg);
             va.type = ArgsType::DEVICEID_KEYPREFIX;
         } else if (type == napi_object) {
-            status = JSUtil::Unwrap(env, argv[1], (void**)(&va.query), JsQuery::Constructor(env));
+            status = JSUtil::Unwrap(env, argv[1], reinterpret_cast<void**>(&va.query), JsQuery::Constructor(env));
             CHECK_RETURN(va.query != nullptr, "invalid arg[1], i.e. invalid query!", napi_invalid_arg);
             va.type = ArgsType::DEVICEID_QUERY;
         }
     } else if (type == napi_object) {
         // number 1 means: required 1 arguments, <query>
         CHECK_RETURN(argc == 1, "invalid arguments!", napi_invalid_arg);
-        status = JSUtil::Unwrap(env, argv[0], (void**)(&va.query), JsQuery::Constructor(env));
+        status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&va.query), JsQuery::Constructor(env));
         CHECK_RETURN(va.query != nullptr, "invalid arg[0], i.e. invalid query!", napi_invalid_arg);
         va.type = ArgsType::QUERY;
     }
@@ -240,7 +240,7 @@ napi_value JsDeviceKVStore::GetResultSet(napi_env env, napi_callback_info info)
     auto input = [env, ctxt](size_t argc, napi_value* argv) {
         ctxt->status = GetVariantArgs(env, argc, argv, ctxt->va);
         CHECK_STATUS_RETURN_VOID(ctxt, "invalid arguments!");
-        ctxt->ref = JSUtil::NewWithRef(env, 0, nullptr, (void**)(&ctxt->resultSet),
+        ctxt->ref = JSUtil::NewWithRef(env, 0, nullptr, reinterpret_cast<void**>(&ctxt->resultSet),
             JsKVStoreResultSet::Constructor(env));
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->resultSet != nullptr, "KVStoreResultSet::New failed!");
     };
@@ -295,7 +295,7 @@ napi_value JsDeviceKVStore::CloseResultSet(napi_env env, napi_callback_info info
         napi_valuetype type = napi_undefined;
         ctxt->status = napi_typeof(env, argv[0], &type);
         CHECK_ARGS_RETURN_VOID(ctxt, type == napi_object, "invalid arg[0], i.e. invalid resultSet!");
-        ctxt->status = JSUtil::Unwrap(env, argv[0], (void**)(&ctxt->resultSet),
+        ctxt->status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&ctxt->resultSet),
             JsKVStoreResultSet::Constructor(env));
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->resultSet != nullptr, "invalid arg[0], i.e. invalid resultSet!");
     };
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp b/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp
index e70bb13e7076e8e7c4b96e443deac25791200bdc..e0da7a13ba48a480f2ff27f49786447c0989657f 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp
@@ -109,7 +109,7 @@ napi_value JsFieldNode::AppendChild(napi_env env, napi_callback_info info)
     auto input = [env, ctxt, &child](size_t argc, napi_value* argv) {
         // required 1 arguments :: <child>
         CHECK_ARGS_RETURN_VOID(ctxt, argc == 1, "invalid arguments!");
-        ctxt->status = JSUtil::Unwrap(env, argv[0], (void**)(&child), JsFieldNode::Constructor(env));
+        ctxt->status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&child), JsFieldNode::Constructor(env));
         CHECK_STATUS_RETURN_VOID(ctxt, "napi_unwrap to FieldNode failed");
         CHECK_ARGS_RETURN_VOID(ctxt, child != nullptr, "invalid arg[0], i.e. invalid FieldNode!");
     };
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp b/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp
index 27488d96dd0f11b05f3fc955bc6f7269e34a206d..68238a2575fd448fe3d16b68922edfa9bcdf6d86 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp
@@ -66,7 +66,8 @@ napi_value JsKVManager::CreateKVManager(napi_env env, napi_callback_info info)
         ctxt->status = JSUtil::GetNamedProperty(env, argv[0], "bundleName", bundleName);
         CHECK_ARGS_RETURN_VOID(ctxt, (ctxt->status == napi_ok) && !bundleName.empty(), "invalid bundleName!");
 
-        ctxt->ref = JSUtil::NewWithRef(env, argc, argv, (void**)&ctxt->kvManger, JsKVManager::Constructor(env));
+        ctxt->ref = JSUtil::NewWithRef(env, argc, argv, reinterpret_cast<void**>(&ctxt->kvManger),
+                                       JsKVManager::Constructor(env));
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->kvManger != nullptr, "KVManager::New failed!");
     };
     ctxt->GetCbInfo(env, info, input);
@@ -98,9 +99,11 @@ struct GetKVStoreContext : public ContextBase {
             CHECK_ARGS_RETURN_VOID(this, IsStoreTypeSupported(options), "invalid options.KvStoreType");
             ZLOGD("GetKVStore kvStoreType=%{public}d", options.kvStoreType);
             if (options.kvStoreType == KvStoreType::DEVICE_COLLABORATION) {
-                ref = JSUtil::NewWithRef(env, argc, argv, (void**)&kvStore, JsDeviceKVStore::Constructor(env));
+                ref = JSUtil::NewWithRef(env, argc, argv, reinterpret_cast<void**>(&kvStore),
+                                         JsDeviceKVStore::Constructor(env));
             } else if (options.kvStoreType == KvStoreType::SINGLE_VERSION) {
-                ref = JSUtil::NewWithRef(env, argc, argv, (void**)&kvStore, JsSingleKVStore::Constructor(env));
+                ref = JSUtil::NewWithRef(env, argc, argv, reinterpret_cast<void**>(&kvStore),
+                                         JsSingleKVStore::Constructor(env));
             }
         };
         ContextBase::GetCbInfo(env, info, input);
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_kv_store.cpp b/frameworks/jskitsimpl/distributeddata/src/js_kv_store.cpp
index b82ae3aa72a375c62ca8b38875d873601439e389..2762606e842229ae7b6fb536e89fc19e17575822 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_kv_store.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_kv_store.cpp
@@ -86,10 +86,10 @@ bool JsKVStore::IsInstanceOf(napi_env env, napi_value obj, const std::string& st
 {
     bool result = false;
     napi_status status = napi_instanceof(env, obj, constructor, &result);
-    CHECK_RETURN(result, "is not instance of JsKVStore!", false);
+    CHECK_RETURN((status == napi_ok) && (result != false), "is not instance of JsKVStore!", false);
 
     JsKVStore* kvStore = nullptr;
-    status = napi_unwrap(env, obj, (void**)&kvStore);
+    status = napi_unwrap(env, obj, reinterpret_cast<void**>(&kvStore));
     CHECK_RETURN((status == napi_ok) && (kvStore != nullptr), "can not unwrap to JsKVStore!", false);
     return kvStore->storeId_ == storeId;
 }
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp b/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp
index e406b9c5fdccefac528a741f72863776e4dce55d..04467b0ed99839927cf1357d28b0380c6c63ad90 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp
@@ -165,7 +165,7 @@ napi_value JsKVStoreResultSet::Move(napi_env env, napi_callback_info info) /* bo
     auto input = [env, ctxt, &offset](size_t argc, napi_value* argv) {
         // required 1 arguments :: <offset>
         CHECK_ARGS_RETURN_VOID(ctxt, argc == 1, "invalid arguments!");
-        ctxt->status = napi_get_value_int32(env, argv[0], (int32_t*)&offset);
+        ctxt->status = napi_get_value_int32(env, argv[0], reinterpret_cast<int32_t*>(&offset));
     };
     ctxt->GetCbInfoSync(env, info, input);
     NAPI_ASSERT(env, ctxt->status == napi_ok, "invalid arguments!");
@@ -184,7 +184,7 @@ napi_value JsKVStoreResultSet::MoveToPosition(napi_env env, napi_callback_info i
     auto input = [env, ctxt, &position](size_t argc, napi_value* argv) {
         // required 1 arguments :: <position>
         CHECK_ARGS_RETURN_VOID(ctxt, argc == 1, "invalid arguments!");
-        ctxt->status = napi_get_value_int32(env, argv[0], (int32_t*)&position);
+        ctxt->status = napi_get_value_int32(env, argv[0], reinterpret_cast<int32_t*>(&position));
     };
     ctxt->GetCbInfoSync(env, info, input);
     NAPI_ASSERT(env, ctxt->status == napi_ok, "invalid arguments!");
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp b/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp
index 9e50c95d5be7850faac847402613441707861fd2..d43765a906beda01a886f9daa57dcd80352a836f 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp
@@ -82,7 +82,7 @@ napi_value JsSchema::New(napi_env env, napi_callback_info info)
 napi_status JsSchema::ToJson(napi_env env, napi_value inner, JsSchema*& out)
 {
     ZLOGD("Schema::ToJson");
-    return JSUtil::Unwrap(env, inner, (void**)(&out), JsSchema::Constructor(env));
+    return JSUtil::Unwrap(env, inner, reinterpret_cast<void**>(&out), JsSchema::Constructor(env));
 }
 
 JsSchema* JsSchema::GetSchema(napi_env env, napi_callback_info info, std::shared_ptr<ContextBase>& ctxt)
@@ -110,7 +110,7 @@ napi_value JsSchema::GetRootNode(napi_env env, napi_callback_info info)
         std::string root(SCHEMA_DEFINE);
         JSUtil::SetValue(env, root, argv[0]);
         schema->ref = JSUtil::NewWithRef(env, argc, argv,
-            (void**)&schema->rootNode, JsFieldNode::Constructor(env));
+            reinterpret_cast<void**>(&schema->rootNode), JsFieldNode::Constructor(env));
     }
     NAPI_ASSERT(env, schema->ref != nullptr, "no root, please set first!");
     NAPI_CALL(env, napi_get_reference_value(env, schema->ref, &ctxt->output));
@@ -125,7 +125,7 @@ napi_value JsSchema::SetRootNode(napi_env env, napi_callback_info info)
         // required 2 arguments :: <root-node>
         CHECK_ARGS_RETURN_VOID(ctxt, argc == 1, "invalid arguments!");
         JsFieldNode* node = nullptr;
-        ctxt->status = JSUtil::Unwrap(env, argv[0], (void**)(&node), JsFieldNode::Constructor(env));
+        ctxt->status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&node), JsFieldNode::Constructor(env));
         CHECK_STATUS_RETURN_VOID(ctxt, "napi_unwrap to FieldNode failed");
         CHECK_ARGS_RETURN_VOID(ctxt, node != nullptr, "invalid arg[0], i.e. invalid node!");
 
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp b/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp
index 1444f488b5975671b6cf2cb6a8bed187f499c467..99babeb6c62d90e6a8ef26017247cb72077977ff 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp
@@ -125,7 +125,7 @@ static napi_status GetVariantArgs(napi_env env, size_t argc, napi_value* argv, V
         CHECK_RETURN(!va.keyPrefix.empty(), "invalid arg[0], i.e. invalid keyPrefix!", napi_invalid_arg);
         va.type = ArgsType::KEYPREFIX;
     } else if (type == napi_object) {
-        status = JSUtil::Unwrap(env, argv[0], (void**)(&va.query), JsQuery::Constructor(env));
+        status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&va.query), JsQuery::Constructor(env));
         CHECK_RETURN(va.query != nullptr, "invalid arg[0], i.e. invalid query!", napi_invalid_arg);
         va.type = ArgsType::QUERY;
     }
@@ -200,7 +200,7 @@ napi_value JsSingleKVStore::GetResultSet(napi_env env, napi_callback_info info)
         CHECK_ARGS_RETURN_VOID(ctxt, argc == 1, "invalid arguments!");
         ctxt->status = GetVariantArgs(env, argc, argv, ctxt->va);
         CHECK_STATUS_RETURN_VOID(ctxt, "invalid arguments!");
-        ctxt->ref = JSUtil::NewWithRef(env, 0, nullptr, (void**)(&ctxt->resultSet),
+        ctxt->ref = JSUtil::NewWithRef(env, 0, nullptr, reinterpret_cast<void**>(&ctxt->resultSet),
             JsKVStoreResultSet::Constructor(env));
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->resultSet != nullptr, "KVStoreResultSet::New failed!");
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->ref != nullptr, "KVStoreResultSet::New failed!");
@@ -250,7 +250,7 @@ napi_value JsSingleKVStore::CloseResultSet(napi_env env, napi_callback_info info
         napi_valuetype type = napi_undefined;
         ctxt->status = napi_typeof(env, argv[0], &type);
         CHECK_ARGS_RETURN_VOID(ctxt, type == napi_object, "invalid arg[0], i.e. invalid resultSet!");
-        ctxt->status = JSUtil::Unwrap(env, argv[0], (void**)(&ctxt->resultSet),
+        ctxt->status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&ctxt->resultSet),
             JsKVStoreResultSet::Constructor(env));
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->resultSet != nullptr, "invalid arg[0], i.e. invalid resultSet!");
     };
@@ -284,7 +284,7 @@ napi_value JsSingleKVStore::GetResultSize(napi_env env, napi_callback_info info)
         napi_valuetype type = napi_undefined;
         ctxt->status = napi_typeof(env, argv[0], &type);
         CHECK_ARGS_RETURN_VOID(ctxt, type == napi_object, "invalid arg[0], i.e. invalid query!");
-        ctxt->status = JSUtil::Unwrap(env, argv[0], (void**)(&ctxt->query), JsQuery::Constructor(env));
+        ctxt->status = JSUtil::Unwrap(env, argv[0], reinterpret_cast<void**>(&ctxt->query), JsQuery::Constructor(env));
         CHECK_ARGS_RETURN_VOID(ctxt, ctxt->query != nullptr, "invalid arg[0], i.e. invalid query!");
     };
     ctxt->GetCbInfo(env, info, input);
diff --git a/frameworks/jskitsimpl/distributeddata/src/js_util.cpp b/frameworks/jskitsimpl/distributeddata/src/js_util.cpp
index 34c347e92750828444b8a7616b84179fb0f68478..0f8842775a624b4197a89b17d7262b413615c027 100644
--- a/frameworks/jskitsimpl/distributeddata/src/js_util.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/js_util.cpp
@@ -450,7 +450,8 @@ napi_status JSUtil::GetValue(napi_env env, napi_value in, std::vector<int32_t>&
     napi_value buffer = nullptr;
     size_t offset = 0;
     uint8_t* data = nullptr;
-    napi_status status = napi_get_typedarray_info(env, in, &type, &length, (void**)&data, &buffer, &offset);
+    napi_status status = napi_get_typedarray_info(env, in, &type, &length,
+                                                  reinterpret_cast<void**>(&data), &buffer, &offset);
     ZLOGD("array type=%{public}d length=%{public}d offset=%{public}d", (int)type, (int)length, (int)offset);
     CHECK_RETURN(status == napi_ok, "napi_get_typedarray_info failed!", napi_invalid_arg);
     CHECK_RETURN(type <= napi_int32_array, "is not int32 supported typed array!", napi_invalid_arg);
@@ -488,7 +489,8 @@ napi_status JSUtil::GetValue(napi_env env, napi_value in, std::vector<uint32_t>&
     napi_value buffer = nullptr;
     size_t offset = 0;
     uint8_t* data = nullptr;
-    napi_status status = napi_get_typedarray_info(env, in, &type, &length, (void**)&data, &buffer, &offset);
+    napi_status status = napi_get_typedarray_info(env, in, &type, &length,
+                                                  reinterpret_cast<void**>(&data), &buffer, &offset);
     ZLOGD("napi_get_typedarray_info type=%{public}d", (int)type);
     CHECK_RETURN(status == napi_ok, "napi_get_typedarray_info failed!", napi_invalid_arg);
     CHECK_RETURN((type <= napi_uint16_array) || (type == napi_uint32_array), "invalid type!", napi_invalid_arg);
@@ -526,7 +528,8 @@ napi_status JSUtil::GetValue(napi_env env, napi_value in, std::vector<int64_t>&
     napi_value buffer = nullptr;
     size_t offset = 0;
     uint8_t* data = nullptr;
-    napi_status status = napi_get_typedarray_info(env, in, &type, &length, (void**)&data, &buffer, &offset);
+    napi_status status = napi_get_typedarray_info(env, in, &type, &length,
+                                                  reinterpret_cast<void**>(&data), &buffer, &offset);
     ZLOGD("array type=%{public}d length=%{public}d offset=%{public}d", (int)type, (int)length, (int)offset);
     CHECK_RETURN(status == napi_ok, "napi_get_typedarray_info failed!", napi_invalid_arg);
     CHECK_RETURN((type <= napi_uint32_array) || (type == napi_bigint64_array), "invalid type!", napi_invalid_arg);
@@ -560,6 +563,7 @@ napi_status JSUtil::GetValue(napi_env env, napi_value in, std::vector<double>& o
     bool isTypedArray = false;
     napi_status status = napi_is_typedarray(env, in, &isTypedArray);
     ZLOGD("napi_value -> std::vector<double> input %{public}s a TypedArray", isTypedArray ? "is" : "is not");
+    CHECK_RETURN((status == napi_ok), "napi_is_typedarray failed!", status);
     if (isTypedArray) {
         ZLOGD("napi_value -> std::vector<double> ");
         napi_typedarray_type type = napi_biguint64_array;
@@ -567,7 +571,7 @@ napi_status JSUtil::GetValue(napi_env env, napi_value in, std::vector<double>& o
         napi_value buffer = nullptr;
         size_t offset = 0;
         uint8_t* data = nullptr;
-        status = napi_get_typedarray_info(env, in, &type, &length, (void**)&data, &buffer, &offset);
+        status = napi_get_typedarray_info(env, in, &type, &length, reinterpret_cast<void**>(&data), &buffer, &offset);
         ZLOGD("napi_get_typedarray_info status=%{public}d type=%{public}d", status, (int)type);
         CHECK_RETURN(status == napi_ok, "napi_get_typedarray_info failed!", napi_invalid_arg);
         CHECK_RETURN((length > 0) && (data != nullptr), "invalid data!", napi_invalid_arg);
diff --git a/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp b/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp
index e09d7ac179b5a76a23be0266756cbe08ddaa4326..f225e70b76d78a6abba61958c8a01ed6793b6b43 100644
--- a/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp
+++ b/frameworks/jskitsimpl/distributeddata/src/napi_queue.cpp
@@ -107,7 +107,7 @@ napi_value NapiQueue::AsyncWork(napi_env env, std::shared_ptr<ContextBase> ctxt,
             }
             GenerateOutput(ctxt);
         },
-        (void*)(ctxt.get()), &ctxt->work);
+        reinterpret_cast<void*>(ctxt.get()), &ctxt->work);
     napi_queue_async_work(ctxt->env, ctxt->work);
     ctxt->hold = ctxt; // save crossing-thread ctxt.
     return promise;
diff --git a/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp b/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp
index d0984fb2c3c8e06658a6ed822f6cb34058b13518..fa99325c39b45c7d12acb05a5dfbf0776b60505b 100644
--- a/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp
+++ b/services/distributeddataservice/adapter/communicator/test/unittest/communication_provider_impl_test.cpp
@@ -206,7 +206,7 @@ HWTEST_F(CommunicationProviderImplTest, CommunicationProvider017, TestSize.Level
     CommunicationProvider::GetInstance().StartWatchDataChange(dataListener17, id17);
     CommunicationProvider::GetInstance().Start(id17);
     std::string content = "Helloworlds";
-    const uint8_t *t = (uint8_t *)(content.c_str());
+    const uint8_t *t = reinterpret_cast<const uint8_t*>(content.c_str());
     DeviceId di17 = {"127.0.0.2"};
     Status status = CommunicationProvider::GetInstance().SendData(id17, di17, t, content.length());
     EXPECT_NE(status, Status::SUCCESS);