diff --git a/frameworks/common/src/random_mbedtls.cpp b/frameworks/common/src/random_mbedtls.cpp
index f7cf0f8f1bc43ea1d1d08f9f3413906822ab6da9..082298f5dadccf80d374831a7852a26fe18f3820 100644
--- a/frameworks/common/src/random_mbedtls.cpp
+++ b/frameworks/common/src/random_mbedtls.cpp
@@ -34,7 +34,7 @@ extern "C" unsigned int GetRandomUint32()
 
 int RandomMbedtls::GenerateRandomArray(unsigned char *randStr, unsigned int len)
 {
-    if (randStr == NULL || len == 0) {
+    if (randStr == nullptr || len == 0) {
         return RET_FAILED;
     }
     int ret;
diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
index 662ba98c19808949ae936c47cb9fe7b68e8f13cd..9717b3d22e755d48ea3bb8ff30be35e3960b07e4 100644
--- a/interfaces/innerkits/nativetoken/src/nativetoken.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -43,7 +43,7 @@ int32_t GetFileBuff(const char *cfg, char **retBuff)
         return ATRET_FAILED;
     }
 
-    size_t fileSize = fileStat.st_size;
+    size_t fileSize = (unsigned) fileStat.st_size;
 
     FILE *cfgFd = fopen(filePath, "r");
     if (cfgFd == NULL) {
diff --git a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
index f6d444a7862469e8c1e4f752d2f747b16d17effc..adf43828e064034f8b3f498c876db4e10f80c032 100644
--- a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
+++ b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
@@ -26,13 +26,13 @@
 namespace OHOS {
 namespace Security {
 namespace AccessToken {
-#define ASYN_THREAD_EXEC_SUCC 0
-#define ASYN_THREAD_EXEC_FAIL -1
-#define ACCESSTOKEN_PERMISSION_GRANT_FAIL -1
-#define ACCESSTOKEN_PERMISSION_GRANT_SUCC 0
-#define ACCESSTOKEN_PERMISSION_REVOKE_FAIL -1
-#define ACCESSTOKEN_PERMISSION_REVOKE_SUCC 0
-#define VALUE_BUFFER_SIZE 128
+const int ASYN_THREAD_EXEC_SUCC = 0;
+const int ASYN_THREAD_EXEC_FAIL = -1;
+const int ACCESSTOKEN_PERMISSION_GRANT_FAIL = -1;
+const int ACCESSTOKEN_PERMISSION_GRANT_SUCC = 0;
+const int ACCESSTOKEN_PERMISSION_REVOKE_FAIL = -1;
+const int ACCESSTOKEN_PERMISSION_REVOKE_SUCC = 0;
+const int VALUE_BUFFER_SIZE = 128;
 
 static thread_local napi_ref atManagerRef_;
 const std::string ATMANAGER_CLASS_NAME = "atManager";
diff --git a/services/tokensyncmanager/include/remote/soft_bus_channel.h b/services/tokensyncmanager/include/remote/soft_bus_channel.h
index f7e52e79e7cd6bff52d24f1009e8fa6941dd02a5..bc7b3ae60167ac5eb4cebc951128631dd29f0993 100644
--- a/services/tokensyncmanager/include/remote/soft_bus_channel.h
+++ b/services/tokensyncmanager/include/remote/soft_bus_channel.h
@@ -29,6 +29,7 @@
 #include "nlohmann/json.hpp"
 #include "rpc_channel.h"
 #include "session.h"
+#include "random.h"
 
 namespace OHOS {
 namespace Security {
@@ -227,7 +228,7 @@ private:
         int n;
 
         for (n = 0; n < uuidlen; ++n) {
-            int b = rand() % bbase;
+            unsigned int b = GetRandomUint32() % bbase;
             switch (n) {
                 case index6:
                     if (sprintf_s(p, bufSize, "4%x", b % xbase) < 0) {
@@ -235,7 +236,7 @@ private:
                     }
                     break;
                 case index8:
-                    if (sprintf_s(p, bufSize, "%c%x", c[rand() % strlen(c)], b % xbase) < 0) {
+                    if (sprintf_s(p, bufSize, "%c%x", c[GetRandomUint32() % strlen(c)], b % xbase) < 0) {
                         return;
                     }
                     break;
diff --git a/services/tokensyncmanager/src/command/base_remote_command.cpp b/services/tokensyncmanager/src/command/base_remote_command.cpp
index c6aaf74b60d977d3f2c3a845b5e1a2e7d9dab096..4f33586ae193f7ddf8e3576474cffbf0d0e219fb 100644
--- a/services/tokensyncmanager/src/command/base_remote_command.cpp
+++ b/services/tokensyncmanager/src/command/base_remote_command.cpp
@@ -99,7 +99,7 @@ void BaseRemoteCommand::ToPermStateJson(nlohmann::json& permStateJson, const Per
         return;
     }
     nlohmann::json permConfigsJson;
-    int size = state.resDeviceID.size();
+    int size = (signed) state.resDeviceID.size();
     for (int i = 0; i < size; i++) {
         nlohmann::json permConfigJson = nlohmann::json {
             {"resDeviceID", state.resDeviceID[i]},
@@ -142,7 +142,8 @@ void BaseRemoteCommand::FromHapTokenBasicInfoJson(const nlohmann::json& hapToken
     HapTokenInfo& hapTokenBasicInfo)
 {
     if (hapTokenJson.find("version") != hapTokenJson.end() && hapTokenJson.at("version").is_number()) {
-        hapTokenJson.at("version").get_to(hapTokenBasicInfo.ver);
    }
+        hapTokenJson.at("version").get_to(hapTokenBasicInfo.ver);
+    }
     if (hapTokenJson.find("tokenID") != hapTokenJson.end() && hapTokenJson.at("tokenID").is_number()) {
         hapTokenJson.at("tokenID").get_to(hapTokenBasicInfo.tokenID);
     }
@@ -186,7 +187,7 @@ void BaseRemoteCommand::FromPermStateListJson(const nlohmann::json& hapTokenJson
                 || permissionJson.find("isGeneral") == permissionJson.end()
                 || !permissionJson.at("isGeneral").is_boolean()
                 || permissionJson.find("grantConfig") == permissionJson.end()
-                || !permissionJson.at("grantConfig").is_array()

+                || !permissionJson.at("grantConfig").is_array()
                 || permissionJson.at("grantConfig").size() == 0) {
                 continue;
             }
@@ -196,7 +197,7 @@ void BaseRemoteCommand::FromPermStateListJson(const nlohmann::json& hapTokenJson
             for (auto grantConfigJson :grantConfigsJson) {
                 if (grantConfigJson.find("resDeviceID") == grantConfigJson.end()
                     || !grantConfigJson.at("resDeviceID").is_string()
-                    || grantConfigJson.find("grantStatus") == grantConfigJson.end()

+                    || grantConfigJson.find("grantStatus") == grantConfigJson.end()
                     || !grantConfigJson.at("grantStatus").is_number()
                     || grantConfigJson.find("grantFlags") == grantConfigJson.end()
                     || !grantConfigJson.at("grantFlags").is_number()) {
@@ -241,13 +242,13 @@ void BaseRemoteCommand::FromNativeTokenInfoJson(const nlohmann::json& nativeToke
         }
     }
     if (nativeTokenJson.find("version") != nativeTokenJson.end() && nativeTokenJson.at("version").is_number()) {
-        nativeTokenInfo.ver = nativeTokenJson.at("version").get<int32_t>();
+        nativeTokenInfo.ver = (unsigned) nativeTokenJson.at("version").get<int32_t>();
     }
     if (nativeTokenJson.find("tokenId") != nativeTokenJson.end() && nativeTokenJson.at("tokenId").is_number()) {
-        nativeTokenInfo.tokenID = nativeTokenJson.at("tokenId").get<int32_t>();
+        nativeTokenInfo.tokenID = (unsigned) nativeTokenJson.at("tokenId").get<int32_t>();
     }
     if (nativeTokenJson.find("tokenAttr") != nativeTokenJson.end() && nativeTokenJson.at("tokenAttr").is_number()) {
-        nativeTokenInfo.tokenAttr = nativeTokenJson.at("tokenAttr").get<int32_t>();
+        nativeTokenInfo.tokenAttr = (unsigned) nativeTokenJson.at("tokenAttr").get<int32_t>();
     }
     if (nativeTokenJson.find("dcaps") != nativeTokenJson.end() && nativeTokenJson.at("dcaps").is_array()
         && nativeTokenJson.at("dcaps").size() > 0 && (nativeTokenJson.at("dcaps"))[0].is_string()) {
diff --git a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp
index 65a3c04afd4ad6181d0f4ce23a278943cc72cf7c..c2dea36bf4a7d39c5b8cf2da0ab08bacf451df79 100644
--- a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp
+++ b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp
@@ -47,12 +47,13 @@ DeleteRemoteTokenCommand::DeleteRemoteTokenCommand(const std::string& json)
     BaseRemoteCommand::FromRemoteProtocolJson(jsonObject);
 
     if (jsonObject.find("tokenId") != jsonObject.end() && jsonObject.at("tokenId").is_number()) {
-        deleteTokenId_ = jsonObject.at("tokenId").get<int>();
+        deleteTokenId_ = (signed) jsonObject.at("tokenId").get<int>();
     }
 }
 
 std::string DeleteRemoteTokenCommand::ToJsonPayload()
 {
+    deleteTokenId_ = 0;
     nlohmann::json j = BaseRemoteCommand::ToRemoteProtocolJson();
     j["tokenId"] = deleteTokenId_;
     return j.dump();
diff --git a/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp b/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp
index fde09adb0439356654d768eb55a8021fb736045e..4f9623c410123fb7a031164fd5159ae007b48d2f 100644
--- a/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp
+++ b/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp
@@ -49,6 +49,7 @@ SyncRemoteHapTokenCommand::SyncRemoteHapTokenCommand(
 
 SyncRemoteHapTokenCommand::SyncRemoteHapTokenCommand(const std::string &json)
 {
+    requestTokenId_ = 0;
     nlohmann::json jsonObject = nlohmann::json::parse(json, nullptr, false);
     BaseRemoteCommand::FromRemoteProtocolJson(jsonObject);
     if (jsonObject.find("requestTokenId") != jsonObject.end() && jsonObject.at("requestTokenId").is_number()) {
@@ -63,6 +64,7 @@ SyncRemoteHapTokenCommand::SyncRemoteHapTokenCommand(const std::string &json)
 
 std::string SyncRemoteHapTokenCommand::ToJsonPayload()
 {
+    requestTokenId_ = 0;
     nlohmann::json j = BaseRemoteCommand::ToRemoteProtocolJson();
     j["requestTokenId"] = requestTokenId_;
     j["HapTokenInfo"] = BaseRemoteCommand::ToHapTokenInfosJson(hapTokenInfo_);
diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
index a71a1f7d274e09b7c1ea19766080e6d055cb9046..3005e77cf38ab0ba281e5cf2635cd4928ee3e47d 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
@@ -133,7 +133,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const
     std::string uuid(uuidbuf);
     ACCESSTOKEN_LOG_DEBUG(LABEL, "generated message uuid: %{public}s", uuid.c_str());
 
-    int len = RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length();
+    int len = (signed) (RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length());
     unsigned char *buf = new unsigned char[len + 1];
     if (buf == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", len);
@@ -253,7 +253,7 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr
     }
     ACCESSTOKEN_LOG_DEBUG(LABEL, "compress complete. compress %{public}d bytes to %{public}d", compressedLength,
         (int) len);
-    compressedLength = len;
+    compressedLength = (signed) len;
     return Constant::SUCCESS;
 }
 
@@ -352,7 +352,7 @@ void SoftBusChannel::HandleRequest(int session, const std::string &id, const std
         ACCESSTOKEN_LOG_WARN(LABEL, "command %{public}s cannot get from json %{public}s", commandName.c_str(),
             jsonPayload.c_str());
 
-        int sendlen = RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length();
+        int sendlen = (signed) (RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length());
         unsigned char *sendbuf = new unsigned char[sendlen + 1];
         if (sendbuf == nullptr) {
             ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", sendlen);
@@ -378,7 +378,7 @@ void SoftBusChannel::HandleRequest(int session, const std::string &id, const std
 
     // send result back
     std::string resultJsonPayload = command->ToJsonPayload();
-    int len = RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length();
+    int len = (signed) (RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length());
     unsigned char *buf = new unsigned char[len + 1];
     if (buf == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", len);
diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp
index c44fc70bdb7d59cee41841776352892203422581..cefdf158f489ea3ec44c124e3a3ddc0b7265700c 100644
--- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp
+++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp
@@ -55,7 +55,7 @@ int32_t TokenSyncManagerStub::OnRemoteRequest(
 void TokenSyncManagerStub::GetRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply)
 {
     std::string deviceID = data.ReadString();
-    int tokenID = data.ReadUint32();
+    AccessTokenID tokenID = data.ReadUint32();
 
     HapTokenInfoForSync tokenInfo;
     int result = this->GetRemoteHapTokenInfo(deviceID, tokenID);
@@ -65,7 +65,7 @@ void TokenSyncManagerStub::GetRemoteHapTokenInfoInner(MessageParcel& data, Messa
 void TokenSyncManagerStub::DeleteRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply)
 {
     std::string deviceID = data.ReadString();
-    int tokenID = data.ReadUint32();
+    AccessTokenID tokenID = data.ReadUint32();
     int result = this->DeleteRemoteHapTokenInfo(tokenID);
     reply.WriteInt32(result);
 }