diff --git a/OAT.xml b/OAT.xml
index e2f5a5ae9ea6cd9c38b4dc95360cbe942d6bf794..6433eb1d4a8c68509bf5a9faeb9f21dee81a2ae3 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2021-2022 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
diff --git a/frameworks/accesstoken/src/hap_policy_parcel.cpp b/frameworks/accesstoken/src/hap_policy_parcel.cpp
index 434c419038eac29b5d209312dfa9aa2f3adc3aaa..bbd333fc00b905fbeea4cb17ca05ed7494571d9d 100644
--- a/frameworks/accesstoken/src/hap_policy_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_policy_parcel.cpp
@@ -89,4 +89,4 @@ HapPolicyParcel* HapPolicyParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp b/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp
index 1f3d642868d5f3a7d9909003d1288afbc0948758..282939ccb0449a03981a19e6aad9bf4859666271 100644
--- a/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_token_info_for_sync_parcel.cpp
@@ -73,4 +73,3 @@ HapTokenInfoForSyncParcel* HapTokenInfoForSyncParcel::Unmarshalling(Parcel& in)
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-
diff --git a/frameworks/accesstoken/src/hap_token_info_parcel.cpp b/frameworks/accesstoken/src/hap_token_info_parcel.cpp
index 5c91760c505577a39114f596783c5113047df9db..025d29a0a78ece97c93f0c4aa2076c8c4431ee64 100644
--- a/frameworks/accesstoken/src/hap_token_info_parcel.cpp
+++ b/frameworks/accesstoken/src/hap_token_info_parcel.cpp
@@ -65,4 +65,4 @@ HapTokenInfoParcel* HapTokenInfoParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/native_token_info_parcel.cpp b/frameworks/accesstoken/src/native_token_info_parcel.cpp
index daca0e793beb954f9b2a6352e8e6f470a1d8196c..bccd54204526ccf665a0adbdd6425c70aacd0660 100644
--- a/frameworks/accesstoken/src/native_token_info_parcel.cpp
+++ b/frameworks/accesstoken/src/native_token_info_parcel.cpp
@@ -79,4 +79,4 @@ NativeTokenInfoParcel* NativeTokenInfoParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/permission_list_state_parcel.cpp b/frameworks/accesstoken/src/permission_list_state_parcel.cpp
index 55d4c25c28412d76a3a45f7541dfca1901c8e6c5..96f0d2419a8c0c4594bc1b6c0e9be35c69576e1b 100644
--- a/frameworks/accesstoken/src/permission_list_state_parcel.cpp
+++ b/frameworks/accesstoken/src/permission_list_state_parcel.cpp
@@ -49,4 +49,4 @@ PermissionListStateParcel* PermissionListStateParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/accesstoken/src/permission_state_full_parcel.cpp b/frameworks/accesstoken/src/permission_state_full_parcel.cpp
index 99735cf9a734bbd189276b2b658218a616fe2578..642dbda7b7cb30d08a74b329593eadd8c4cf21c8 100644
--- a/frameworks/accesstoken/src/permission_state_full_parcel.cpp
+++ b/frameworks/accesstoken/src/permission_state_full_parcel.cpp
@@ -87,4 +87,4 @@ PermissionStateFullParcel* PermissionStateFullParcel::Unmarshalling(Parcel& in)
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/frameworks/common/include/data_validator.h b/frameworks/common/include/data_validator.h
index 9a146ba70facc8560327db79cd176bf1a5d79df2..db08ee9aaa3bc82fcce934229c632b3b2a04cf52 100644
--- a/frameworks/common/include/data_validator.h
+++ b/frameworks/common/include/data_validator.h
@@ -46,6 +46,7 @@ public:
     static bool IsPermissionFlagValid(int flag);
     static bool IsDcapValid(const std::string& dcap);
     static bool IsTokenIDValid(AccessTokenID id);
+
 private:
     const static int MAX_LENGTH = 256;
     const static int MAX_APPIDDESC_LENGTH = 10240;
diff --git a/frameworks/common/include/random_mbedtls.h b/frameworks/common/include/random_mbedtls.h
index 443993b135f5f3904497258a05b48b066decf82e..d9461c734a277e015371d2a74d51e979fb75ec27 100644
--- a/frameworks/common/include/random_mbedtls.h
+++ b/frameworks/common/include/random_mbedtls.h
@@ -27,11 +27,11 @@ class RandomMbedtls {
 public:
     static RandomMbedtls& GetInstance();
     int GenerateRandomArray(unsigned char *randStr, unsigned int len);
-    ~RandomMbedtls() {};
+    ~RandomMbedtls() {}
     static unsigned int GetRandomUint32();
 
 private:
-    RandomMbedtls() : initFlag_(false) {};
+    RandomMbedtls() : initFlag_(false) {}
     mbedtls_entropy_context entropy_;
     mbedtls_ctr_drbg_context ctrDrbg_;
     OHOS::Utils::RWLock randomLock_;
diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h b/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h
index a48cc77035606d84ff151a98741a18d33a79a474..974bdb50d70e8ef6298c3fca2f1f3aeba8db8bb6 100644
--- a/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h
+++ b/interfaces/innerkits/accesstoken/include/accesstoken_death_recipient.h
@@ -24,7 +24,7 @@ namespace Security {
 namespace AccessToken {
 class AccessTokenDeathRecipient : public IRemoteObject::DeathRecipient {
 public:
-    AccessTokenDeathRecipient() {};
+    AccessTokenDeathRecipient() {}
     virtual ~AccessTokenDeathRecipient() = default;
     void OnRemoteDied(const wptr<IRemoteObject> &object) override;
 };
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
index 07324eefa7bde73803fcf066a3c43f0bceafe1b5..3ad9cab15b73c59f3a465e71bbfe7a6710c50cbb 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
@@ -73,6 +73,7 @@ public:
 #endif
 
     void DumpTokenInfo(std::string& dumpInfo) override;
+
 private:
     static inline BrokerDelegator<AccessTokenManagerProxy> delegator_;
 };
diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
index 7b0f4bdcf5f3b0ad2cdbb20501aa01a98d3717e6..f481a593ee24c16665374123fb280e86dae2537a 100644
--- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
+++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp
@@ -2257,7 +2257,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2325,7 +2325,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = wrongBaseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2392,7 +2392,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo003, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2443,7 +2443,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo004, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2501,7 +2501,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo005, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2558,7 +2558,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo006, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2615,7 +2615,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo007, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2666,7 +2666,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo008, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2719,7 +2719,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo009, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2775,7 +2775,7 @@ HWTEST_F(AccessTokenKitTest, SetRemoteHapTokenInfo010, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2816,7 +2816,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2870,7 +2870,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceToken002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -2944,7 +2944,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceTokens001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -3006,7 +3006,7 @@ HWTEST_F(AccessTokenKitTest, DeleteRemoteDeviceTokens002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -3111,7 +3111,7 @@ HWTEST_F(AccessTokenKitTest, GetHapTokenInfoFromRemote002, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
@@ -3175,7 +3175,7 @@ HWTEST_F(AccessTokenKitTest, AllocLocalTokenID001, TestSize.Level1)
 
     HapTokenInfoForSync remoteTokenInfo = {
         .baseInfo = baseInfo,
-        .permStateList =permStateList
+        .permStateList = permStateList
     };
 
     int ret = AccessTokenKit::SetRemoteHapTokenInfo(deviceID, remoteTokenInfo);
diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c
index ad1e6207f91de6f0ccbe51ac55245eb26138a951..89837e5331e336e88f1a5a5732a99c919bfa742d 100644
--- a/interfaces/innerkits/nativetoken/src/nativetoken.c
+++ b/interfaces/innerkits/nativetoken/src/nativetoken.c
@@ -469,7 +469,7 @@ static cJSON *CreateNativeTokenJsonObject(const NativeTokenList *curr)
     }
     return object;
 }
- 
+
 static void SaveTokenIdToCfg(const NativeTokenList *curr)
 {
     char *fileBuff = NULL;
diff --git a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
index f6d444a7862469e8c1e4f752d2f747b16d17effc..04f07ca352cb0c187a986511badce6e7f19f6f5e 100644
--- a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
+++ b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef NAPI_ATMANAGER_H_
-#define NAPI_ATMANAGER_H_
+#ifndef  INTERFACES_KITS_ACCESSTOKEN_NAPI_INCLUDE_NAPI_ATMANAGER_H_
+#define  INTERFACES_KITS_ACCESSTOKEN_NAPI_INCLUDE_NAPI_ATMANAGER_H_
 
 #include <pthread.h>
 #include <cstdio>
@@ -85,4 +85,4 @@ private:
  */
 static napi_value Init(napi_env env, napi_value exports);
 
-#endif /* NAPI_ATMANAGER_H_ */
+#endif /*  INTERFACES_KITS_ACCESSTOKEN_NAPI_INCLUDE_NAPI_ATMANAGER_H_ */
diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h b/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
index 38eb71d560746089444e8eda7c97dfbdc8898610..773153759d1ea2d7c9484153fb2900f5070feaa6 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_policy_set.h
@@ -31,7 +31,7 @@ namespace Security {
 namespace AccessToken {
 struct PermissionPolicySet final {
 public:
-    PermissionPolicySet() : tokenId_(0) {};
+    PermissionPolicySet() : tokenId_(0) {}
     virtual ~PermissionPolicySet();
 
     static std::shared_ptr<PermissionPolicySet> BuildPermissionPolicySet(AccessTokenID tokenId,
diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
index 97aa044f00503ce29d76ba86f5ab8d0ff7299bc8..0e7de0fb3b266dae812e561281c90ff6c1d2195f 100644
--- a/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
+++ b/services/accesstokenmanager/main/cpp/include/permission/permission_validator.h
@@ -23,8 +23,8 @@ namespace Security {
 namespace AccessToken {
 struct PermissionValidator final {
 public:
-    PermissionValidator() {};
-    ~PermissionValidator() {};
+    PermissionValidator() {}
+    ~PermissionValidator() {}
 
     static bool IsPermissionNameValid(const std::string& permissionName);
     static bool IsPermissionFlagValid(int flag);
diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
index b35579d1bb0b46554e5b3c2b0534b7c841da42b6..5ab88b09343ce49aadee6d45875a0dec6d264f52 100644
--- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
+++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h
@@ -74,6 +74,7 @@ public:
 #endif
 
     void DumpTokenInfo(std::string& dumpInfo) override;
+
 private:
     bool Initialize() const;
 
diff --git a/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
index e2cad901f4f815fcf70f4ff9b2183b1e9978a626..d0180f065ac4c267ee887c38f183beff485ccfa0 100644
--- a/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
+++ b/services/accesstokenmanager/main/cpp/include/token/native_token_receptor.h
@@ -37,7 +37,7 @@ public:
     int Init();
 
 private:
-    NativeTokenReceptor() : ready_(false) {};
+    NativeTokenReceptor() : ready_(false) {}
     DISALLOW_COPY_AND_MOVE(NativeTokenReceptor);
     int ReadCfgFile(std::string &nativeRawData);
     void FromJson(const nlohmann::json &jsonObject,
diff --git a/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h b/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h
index c884f37b224028219bedeb999272811bd2fdb19a..1ad3aad4ba3eea97ee8810cde8f1a538b464369f 100644
--- a/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h
+++ b/services/accesstokenmanager/main/cpp/include/token/token_modify_notifier.h
@@ -53,4 +53,3 @@ private:
 } // namespace Security
 } // namespace OHOS
 #endif // TOKEN_MODIFY_NOTIFIER_H
-
diff --git a/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp b/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
index 01970dd1b23566270fff0e46bd4715c657a5c145..2d9f3e83e6731de1d779607a57c7febadc6f9dca 100644
--- a/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/data_storage.cpp
@@ -26,4 +26,4 @@ DataStorage& DataStorage::GetRealDataStorage()
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp b/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
index cc4804a5ba611c856dc6d846c1c32a5473a76c6b..8ae83624aedfc8cec2aa34575194614ae888e507 100644
--- a/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/generic_values.cpp
@@ -70,4 +70,4 @@ std::vector<std::string> GenericValues::GetAllKeys() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp b/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
index edeabdbfd7e8c975c421bbc4018df9f308e0eccd..a01c5e5f676a2f7c5d40789d836dd02a0dee25f7 100644
--- a/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/sqlite_helper.cpp
@@ -185,4 +185,4 @@ std::string SqliteHelper::SpitError() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/statement.cpp b/services/accesstokenmanager/main/cpp/src/database/statement.cpp
index 3871387423899716d7bf27b9d05378505628df09..02b605afd7c357e72477cbb853e9900846cbaa9d 100644
--- a/services/accesstokenmanager/main/cpp/src/database/statement.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/statement.cpp
@@ -122,4 +122,4 @@ VariantValue Statement::GetValue(const int column) const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp b/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
index f849bbcc7719e977366a7a5b2498025a766025cc..77f5c906efda67413c25561b7602e7fb4adc2131 100644
--- a/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
+++ b/services/accesstokenmanager/main/cpp/src/database/variant_value.cpp
@@ -58,4 +58,4 @@ std::string VariantValue::GetString() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
index ac368030f100235a607434c9af2b1d5f46818219..c6de37ecf2a420e5c4ffa680827693ccd507fbdf 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
@@ -371,4 +371,4 @@ std::string PermissionManager::TransferPermissionDefToString(const PermissionDef
 }
 } // namespace AccessToken
 } // namespace Security
-}
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
index b222a9dcac74d471810246fd52a3aa6ce91e6a15..70445c5e4bed532a4cb8296fd233baded59fe617 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
@@ -357,4 +357,4 @@ bool AccessTokenManagerService::Initialize() const
 }
 } // namespace AccessToken
 } // namespace Security
-}
+} // namespace OHOS
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
index a48dbd371069759aee0e15fa9eab1d492929ec1b..95d471cbd055293306905ee3b4c3aba9ede149ba 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp
@@ -30,7 +30,7 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_
 int32_t AccessTokenManagerStub::OnRemoteRequest(
     uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, code: %{public}d", __func__, code);
+    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, code: %{public}u", __func__, code);
     std::u16string descriptor = data.ReadInterfaceToken();
     if (descriptor != IAccessTokenManager::GetDescriptor()) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "get unexpect descriptor: %{public}s", Str16ToStr8(descriptor).c_str());
diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp
index 1334c19ea2e7728d86403ad0c8a9b5e3c0c5d8d1..6310b3f3449b3f5e2b96ef3d17b0ec0d918806f3 100644
--- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_remote_token_manager.cpp
@@ -152,4 +152,3 @@ int AccessTokenRemoteTokenManager::RemoveDeviceMappingTokenID(const std::string&
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-
diff --git a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
index 49ba60e8faff80ed611d2f1f1401ed8977aeb79b..ca2c8c9b3c3ce4d6ee6c0059d0cc17181f54565d 100644
--- a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
@@ -116,4 +116,3 @@ void TokenModifyNotifier::NotifyTokenChangedIfNeed()
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-
diff --git a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
index 3755b945125d4958d052503acee2b3b81735ea16..0a4f579dbefad490b0156c4350c54490dc304906 100644
--- a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
+++ b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-
 #include "native_token_receptor_test.h"
 
 #include <fcntl.h>
diff --git a/services/tokensyncmanager/include/common/constant.h b/services/tokensyncmanager/include/common/constant.h
index db8e50bf840537bc691087a68f474f1ece87db31..3a7d0d5e60b3ca60022fbfc79d6352e6dc0a15d4 100644
--- a/services/tokensyncmanager/include/common/constant.h
+++ b/services/tokensyncmanager/include/common/constant.h
@@ -92,4 +92,4 @@ public:
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-#endif // CONSTANT_H
\ No newline at end of file
+#endif // CONSTANT_H
diff --git a/services/tokensyncmanager/include/device/device_info.h b/services/tokensyncmanager/include/device/device_info.h
index 958aa080352b6a933df0e1cbf72072e34600e64d..cfb567915fe40001b8c9d872b696b64e97e08166 100644
--- a/services/tokensyncmanager/include/device/device_info.h
+++ b/services/tokensyncmanager/include/device/device_info.h
@@ -43,4 +43,4 @@ struct DeviceInfo {
 } // namespace Security
 } // namespace OHOS
 
-#endif // DEVICE_INFO_H
\ No newline at end of file
+#endif // DEVICE_INFO_H
diff --git a/services/tokensyncmanager/include/device/device_info_manager.h b/services/tokensyncmanager/include/device/device_info_manager.h
index b5be6c8270854fe30c6f151c3f5d5f4b44b6c95f..93cd63a4716a4ae0873aeb207ab0b43215b0e7ce 100644
--- a/services/tokensyncmanager/include/device/device_info_manager.h
+++ b/services/tokensyncmanager/include/device/device_info_manager.h
@@ -101,4 +101,4 @@ public:
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-#endif // DEVICE_INFO_MANAGER_H
\ No newline at end of file
+#endif // DEVICE_INFO_MANAGER_H
diff --git a/services/tokensyncmanager/include/device/device_info_repository.h b/services/tokensyncmanager/include/device/device_info_repository.h
index 319e76838de8b37c1f2ef4ee39e81573a67a47ec..74f9d17eabe29644e3e307202056699e4aae6bff 100644
--- a/services/tokensyncmanager/include/device/device_info_repository.h
+++ b/services/tokensyncmanager/include/device/device_info_repository.h
@@ -74,4 +74,4 @@ private:
 } // namespace AccessToken
 } // namespace Security
 } // namespace OHOS
-#endif // DEVICE_INFO_REPOSITORY_H
\ No newline at end of file
+#endif // DEVICE_INFO_REPOSITORY_H
diff --git a/services/tokensyncmanager/include/remote/rpc_channel.h b/services/tokensyncmanager/include/remote/rpc_channel.h
index c8f61456a13d5b13ae543b8cdb152da294c43367..1fda21dfd974a41a41d8661c92ce008fd7538733 100644
--- a/services/tokensyncmanager/include/remote/rpc_channel.h
+++ b/services/tokensyncmanager/include/remote/rpc_channel.h
@@ -71,7 +71,7 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    virtual void Release() {};
+    virtual void Release() {}
 };
 }  // namespace AccessToken
 }  // namespace Security
diff --git a/services/tokensyncmanager/src/device/device_info_manager.cpp b/services/tokensyncmanager/src/device/device_info_manager.cpp
index 1066ad4554100f546cbe80b841a013662cfabb97..e6c17ac4ba953f6f6646bc9e05c077b4d8952adf 100644
--- a/services/tokensyncmanager/src/device/device_info_manager.cpp
+++ b/services/tokensyncmanager/src/device/device_info_manager.cpp
@@ -164,4 +164,4 @@ bool DeviceInfoManager::IsDeviceUniversallyUniqueId(const std::string &nodeId) c
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/tokensyncmanager/src/device/device_info_repository.cpp b/services/tokensyncmanager/src/device/device_info_repository.cpp
index ed457b2956400141fc52096737d86363109a2a8a..d1fd6297491b05427e110aac727b68698e8d50fe 100644
--- a/services/tokensyncmanager/src/device/device_info_repository.cpp
+++ b/services/tokensyncmanager/src/device/device_info_repository.cpp
@@ -188,4 +188,4 @@ void DeviceInfoRepository::Clear()
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
index a71a1f7d274e09b7c1ea19766080e6d055cb9046..21650d63f1f79711c1725c106d7d896d39e1f179 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
@@ -252,7 +252,7 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr
         return result;
     }
     ACCESSTOKEN_LOG_DEBUG(LABEL, "compress complete. compress %{public}d bytes to %{public}d", compressedLength,
-        (int) len);
+        (int)len);
     compressedLength = len;
     return Constant::SUCCESS;
 }
@@ -271,7 +271,7 @@ std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int len
     if (result != Z_OK) {
         ACCESSTOKEN_LOG_ERROR(LABEL,
             "uncompress failed, error code: %{public}d, bound length: %{public}d, buffer length: %{public}d", result,
-            (int) len, length);
+            (int)len, length);
         delete[] buf;
         return "";
     }
@@ -324,9 +324,6 @@ int SoftBusChannel::CheckSessionMayReopenLocked()
 
 bool SoftBusChannel::IsSessionAvailable()
 {
-    if (session_ == Constant::INVALID_SESSION) {
-        return false;
-    }
     return session_ > Constant::INVALID_SESSION;
 }
 
diff --git a/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
index e138da60acced0f614c88d34e6b4cc3861e9caa5..f73d5d1d445462b7640dfb5db693140e2964c678 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_session_listener.cpp
@@ -82,6 +82,7 @@ void SoftBusSessionListener::OnSessionClosed(int32_t session)
 
 void SoftBusSessionListener::OnMessageReceived(int32_t sessionId, const void *data, uint32_t dataLen)
 {
+    (void)data;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "OnMessageReceived: data length = %{public}u", dataLen);
 }
 
diff --git a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
index 5a3c034b8cef019501acf2d470d2440956c49c88..e318a95b016ef333382d6bcedbbf09f05490626e 100644
--- a/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
+++ b/services/tokensyncmanager/src/service/token_sync_manager_service.cpp
@@ -195,4 +195,4 @@ bool TokenSyncManagerService::Initialize()
 }
 } // namespace AccessToken
 } // namespace Security
-}
+} // namespace OHOS
diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn
index 1a7ca56bf981ac3809298bb00c9d6549219bb482..34989d34ba985737947c42f6ea7b75cf13b53a7c 100644
--- a/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn
+++ b/services/tokensyncmanager/test/unittest/token_sync_service/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp
index 51c4aa2aa4050a1c321797c78ce2eec40fc78c4c..391402cb80cf327d069363f9a2f943c36457e722 100644
--- a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp
+++ b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h
index 06e60116d0a889ceeb424a0bc84f20959624fa6c..4fc0ebdbd460dadd38d43f1491e20c0e899293ca 100644
--- a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h
+++ b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/tools/accesstoken/include/atm_command.h b/tools/accesstoken/include/atm_command.h
index 922429d5a86d8ead4bea6ad8c837bbea84fdcf33..d8617b51a69c1f9ebdc9e999d6d65fa8719a1410 100644
--- a/tools/accesstoken/include/atm_command.h
+++ b/tools/accesstoken/include/atm_command.h
@@ -45,4 +45,4 @@ private:
 } // namespace Security
 } // namespace OHOS
 
-#endif // ACCESSTOKENMANAGER_COMMAND_H
\ No newline at end of file
+#endif // ACCESSTOKENMANAGER_COMMAND_H
diff --git a/tools/accesstoken/include/atm_receiver_impl.h b/tools/accesstoken/include/atm_receiver_impl.h
index 7bacf3f57c8c82059cf0a0abed73f410f7e56997..346830f75122192a13c0505f634162e2ae4df5fb 100644
--- a/tools/accesstoken/include/atm_receiver_impl.h
+++ b/tools/accesstoken/include/atm_receiver_impl.h
@@ -40,4 +40,4 @@ private:
 } // namespace Security
 } // namespace OHOS
 
-#endif // ACCESSTOKENMANAGER_RECEIVER_IMPL_H
\ No newline at end of file
+#endif // ACCESSTOKENMANAGER_RECEIVER_IMPL_H
diff --git a/tools/accesstoken/src/atm_command.cpp b/tools/accesstoken/src/atm_command.cpp
index d5b1556ae40c45d5ad0b016ae847ff521b63181e..24a0a7eb2ba7313e16c685e622f17507e8f11961 100644
--- a/tools/accesstoken/src/atm_command.cpp
+++ b/tools/accesstoken/src/atm_command.cpp
@@ -37,12 +37,6 @@ ErrCode AtmCommand::CreateCommandMap()
 ErrCode AtmCommand::CreateMessageMap()
 {
     messageMap_ = {
-        // error + message
-        // currently there is no error to use
-        // {
-        //     AppExecFwk::IStatusReceiver::ERR_USER_REMOVE_FALIED,
-        //     "error: user remove failed.",
-        // },
     };
 
     return OHOS::ERR_OK;
@@ -76,4 +70,4 @@ ErrCode AtmCommand::RunAsDumpCommand()
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/tools/accesstoken/src/atm_receiver_impl.cpp b/tools/accesstoken/src/atm_receiver_impl.cpp
index 7d7333b96c14bb090ccabcb05f314c3bd64ad28a..3666b22d731eaa92796182d33f3d223f0dace2d6 100644
--- a/tools/accesstoken/src/atm_receiver_impl.cpp
+++ b/tools/accesstoken/src/atm_receiver_impl.cpp
@@ -56,4 +56,4 @@ int32_t AtmReceiverImpl::GetResultCode() const
 }
 } // namespace AccessToken
 } // namespace Security
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS