diff --git a/README_zh.md b/README_zh.md
index 5df737b4756f30bd49aa4a48ab5f54f00d7bb749..e3f963cb85528f0be79cf97e94f28339dcfb8c2a 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -217,8 +217,6 @@ dmClass.unAuthenticateDevice(this.deviceInfo);
 
   将devicemanager/display工程导入DevEco Studio 2.2 Beta1，复制display目录下的@ohos.distributedHardware.deviceManager.d.ts文件到Sdk\js\2.2.0.1\api\common目录下，进行编译构建及运行调试.
 
-  DevEco Studio使用方法请参考[DevEco Studio使用说明](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/tools_overview-0000001053582387)。
-
 - 编译环境依赖：IDE 2.2 SDK6
 
 - DeviceManager_UI.hap存放位置：[applications_hap仓库](https://gitee.com/openharmony/applications_hap)
diff --git a/common/include/ipc/model/ipc_get_dmfaparam_rsp.h b/common/include/ipc/model/ipc_get_dmfaparam_rsp.h
index 1267c2ef2f41fff8091a1a7b28c17f8872600c4e..3ddd3fc60fb576c218c64cefa664317840e5eefa 100644
--- a/common/include/ipc/model/ipc_get_dmfaparam_rsp.h
+++ b/common/include/ipc/model/ipc_get_dmfaparam_rsp.h
@@ -40,4 +40,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DEVICE_MANAGER_IPC_GET_DM_FA_PARAM_RSP_H
\ No newline at end of file
+#endif // OHOS_DEVICE_MANAGER_IPC_GET_DM_FA_PARAM_RSP_H
diff --git a/common/include/ipc/model/ipc_get_info_by_network_req.h b/common/include/ipc/model/ipc_get_info_by_network_req.h
index 60e250c329a21a99a19e3f1cfbc3bf97f6332ae4..ad9b04c9f05df57322f52a6ed0dc005a1938164e 100644
--- a/common/include/ipc/model/ipc_get_info_by_network_req.h
+++ b/common/include/ipc/model/ipc_get_info_by_network_req.h
@@ -39,4 +39,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_REQ_H
\ No newline at end of file
+#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_REQ_H
diff --git a/common/include/ipc/model/ipc_get_info_by_network_rsp.h b/common/include/ipc/model/ipc_get_info_by_network_rsp.h
index 6c1e0ea6e02cbea9ffa4fc5848053f196fafda1c..ab702de74487133867b2a52d16fd99e41c44be24 100644
--- a/common/include/ipc/model/ipc_get_info_by_network_rsp.h
+++ b/common/include/ipc/model/ipc_get_info_by_network_rsp.h
@@ -51,4 +51,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_RSP_H
\ No newline at end of file
+#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_RSP_H
diff --git a/common/include/ipc/model/ipc_get_local_device_info_rsp.h b/common/include/ipc/model/ipc_get_local_device_info_rsp.h
index a7d08072cd6b6e89545b7a2667502ac0bd18312c..62aa72aa423bb531c44b9c4b1e341341915871fc 100644
--- a/common/include/ipc/model/ipc_get_local_device_info_rsp.h
+++ b/common/include/ipc/model/ipc_get_local_device_info_rsp.h
@@ -40,4 +40,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_GET_LOCAL_DEVICE_INFO_RSP_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_GET_LOCAL_DEVICE_INFO_RSP_H
diff --git a/common/include/single_instance.h b/common/include/single_instance.h
index 5480fd674cb0f0c077358e74924b052e8a93a3da..b420f023490b6b977a862fd7a082fc78e4752a3b 100644
--- a/common/include/single_instance.h
+++ b/common/include/single_instance.h
@@ -42,5 +42,4 @@ private:                                    \
     }
 }; // namespace DistributedHardware
 }; // namespace OHOS
-
-#endif // OHOS_DM_SINGLE_INSTANCE_H
\ No newline at end of file
+#endif // OHOS_DM_SINGLE_INSTANCE_H
diff --git a/display/entry/build.gradle b/display/entry/build.gradle
index 127dec4068f8b66508c4b5709ccfa4fd35207460..f83acd766b18a865db22f77f9d9ff6611f27b73c 100644
--- a/display/entry/build.gradle
+++ b/display/entry/build.gradle
@@ -15,7 +15,6 @@
  
 apply plugin: 'com.huawei.ohos.hap'
 apply plugin: 'com.huawei.ohos.decctest'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
 ohos {
     compileSdkVersion 6
     defaultConfig {
diff --git a/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h b/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h
index 1268f4c0c8876325ae8043e841bf13524408eb26..94dfb108e67833afb658b752de8f164d70339564 100644
--- a/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h
+++ b/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h
@@ -23,7 +23,6 @@
 #include "dm_device_info.h"
 #include "dm_subscribe_info.h"
 #include "nlohmann/json.hpp"
-#include "dm_device_info.h"
 #include "jsi.h"
 
 namespace OHOS {
diff --git a/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h b/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h
index 9c9d4f51101fb2df978b47dcafdaaaa8ae567f27..14032ec06a2a3b90edd7627e6cc1390e71a2ba77 100644
--- a/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h
+++ b/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h
@@ -89,7 +89,7 @@ private:
 private:
     std::shared_ptr<HichainConnectorCallback> hichainConnectorCallback_ = nullptr;
     const DeviceGroupManager *deviceGroupManager_ = nullptr;
-    DeviceAuthCallback deviceAuthCallback_ ;
+    DeviceAuthCallback deviceAuthCallback_;
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp b/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp
index 6fa2b1966cb58eea2b45ebf4002e0d544802e8b4..2829799d7bbcb1caa06e5ca0c0007b8c45cf2103 100644
--- a/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp
+++ b/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp
@@ -250,7 +250,7 @@ void HichainConnector::OnMemberJoin(int64_t requestId, int32_t status)
     }
 
     if (hichainConnectorCallback_ == nullptr) {
-        DMLOG(DM_LOG_ERROR, "HichainConnector::OnMemberJoin hichainConnectorCallback_ not registe.");
+        DMLOG(DM_LOG_ERROR, "HichainConnector::OnMemberJoin hichainConnectorCallback_ not register.");
         return;
     }
     hichainConnectorCallback_->OnMemberJoin(requestId, status);
diff --git a/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp b/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp
index 52362efc5784898342d32157ee87d6ac437d48f5..23b9728e4b89b4ef3f656782376df2ac756d0081 100644
--- a/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp
+++ b/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp
@@ -18,7 +18,6 @@
 #include "msg_head.h"
 
 #include "constants.h"
-#include "device_manager_log.h"
 #include "device_manager_errno.h"
 
 namespace OHOS {
diff --git a/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp b/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp
index c6ca4234029ec5589f8a67a51c293908a0d4cf60..6a2aba58fa92a0e8d82342bb49f587ff6b54432a 100644
--- a/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp
+++ b/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp
@@ -20,13 +20,10 @@
 #include "constants.h"
 #include "encrypt_utils.h"
 #include "device_manager_errno.h"
-#include "device_manager_log.h"
-#include "encrypt_utils.h"
 #include "msg_request_auth.h"
 #include "parameter.h"
 #include "softbus_session.h"
 #include "softbus_bus_center.h"
-#include "msg_request_auth.h"
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp b/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp
index a73618ae06d1921ec0555bd020c85b57b9886b12..d652d0108bba9e52b8968cdfdd83529781b99881 100644
--- a/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp
+++ b/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp
@@ -19,7 +19,6 @@
 #include "constants.h"
 #include "msg_codec.h"
 #include "device_manager_log.h"
-#include "msg_codec.h"
 #include "device_manager_errno.h"
 #include "softbus_session.h"
 #include "encrypt_utils.h"
diff --git a/ext/profile/include/profile_connector.h b/ext/profile/include/profile_connector.h
index 69d5b35b0e82e7649bdf7f64d3d6514f0879d751..ee5fc87182f4ce0aeb5f2a8ab8802ecd17fda1cc 100755
--- a/ext/profile/include/profile_connector.h
+++ b/ext/profile/include/profile_connector.h
@@ -46,4 +46,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_PROFILE_CONNECTOR_H
\ No newline at end of file
+#endif // OHOS_DM_PROFILE_CONNECTOR_H
diff --git a/ext/profile/include/profile_connector_callback.h b/ext/profile/include/profile_connector_callback.h
index 3eeec5704834605b8d7490e2fdf536b644258ed0..b7bebfff5569fcb20d21810f9ce1cea919283063 100644
--- a/ext/profile/include/profile_connector_callback.h
+++ b/ext/profile/include/profile_connector_callback.h
@@ -25,4 +25,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_PROFILE_CONNECTOR_CALLBACK_H
\ No newline at end of file
+#endif // OHOS_DM_PROFILE_CONNECTOR_CALLBACK_H
diff --git a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h
index 676def35c1dd1ce2cbb94d48a583d2b72ee27b73..b72efb2af1bffa65ba0ef2147141d3d4b5a6f0d4 100644
--- a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h
+++ b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h
@@ -176,7 +176,7 @@ private:
     int32_t appIconLen { 0 };
     uint8_t *appIcon { nullptr };
     int32_t appThumbnailLen { 0 };
-    uint8_t *appThumbnail { nullptr } ;
+    uint8_t *appThumbnail { nullptr };
     const int32_t ICON_MAX_LEN = 32 * 1024;
     const int32_t THUMB_MAX_LEN = 153 * 1024;
 };
diff --git a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h
index 8f2b0074a2bd3a468fe22faf2acc1017a1ede362..b608df8ec4fe0fe4187729b613ba172e3c205ac0 100644
--- a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h
+++ b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h
@@ -35,4 +35,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_CLIENT_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_CLIENT_H
diff --git a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h
index 9325f68c4584f7163357308c8cf80da494a2b2b3..452e7e20062e691e47cb2d507173b359e24c943c 100644
--- a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h
+++ b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h
@@ -41,4 +41,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_CLIENT_PROXY_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_CLIENT_PROXY_H
diff --git a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h
index abc5f0acfa3f043428f71be866d56a79a710b16d..859bd50ba7dd2157419f60ba96dce4fc590d6966 100644
--- a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h
+++ b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h
@@ -57,4 +57,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_CLIENT_MANAGER_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_CLIENT_MANAGER_H
diff --git a/interfaces/kits/js/include/dm_native_event.h b/interfaces/kits/js/include/dm_native_event.h
index 2eaea548a95105084418f4d25b0a1564ac137925..16ce9ce34cb77d3c645927ab67445c22dff93e3b 100644
--- a/interfaces/kits/js/include/dm_native_event.h
+++ b/interfaces/kits/js/include/dm_native_event.h
@@ -41,5 +41,4 @@ protected:
     napi_ref thisVarRef_;
     std::map<std::string, std::shared_ptr<DmEventListener>> eventMap_;
 };
-
-#endif /* OHOS_DM_NATIVE_EVENT_H */
\ No newline at end of file
+#endif // OHOS_DM_NATIVE_EVENT_H
diff --git a/interfaces/kits/js/src/dm_native_event.cpp b/interfaces/kits/js/src/dm_native_event.cpp
index f06dbd1b174ac1d4bb189682ffa4e014c9a7af02..12e85c21802e05683aceae55f63a0bdfc2228329 100644
--- a/interfaces/kits/js/src/dm_native_event.cpp
+++ b/interfaces/kits/js/src/dm_native_event.cpp
@@ -103,4 +103,4 @@ void DmNativeEvent::OnEvent(const std::string &eventType, size_t argc, const nap
         return;
     }
     napi_close_handle_scope(env_, scope);
-}
\ No newline at end of file
+}
diff --git a/services/devicemanagerservice/include/config/dm_config_manager.h b/services/devicemanagerservice/include/config/dm_config_manager.h
index f131f41a34d18596f2eeeee6bcd5b5924d7c847a..0f9787056d1e4b90207ffc2a19956e09be545447 100644
--- a/services/devicemanagerservice/include/config/dm_config_manager.h
+++ b/services/devicemanagerservice/include/config/dm_config_manager.h
@@ -82,4 +82,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_OHOS_DM_CONFIG_MANAGER_H
\ No newline at end of file
+#endif // OHOS_OHOS_DM_CONFIG_MANAGER_H
diff --git a/services/devicemanagerservice/include/config/json_config.h b/services/devicemanagerservice/include/config/json_config.h
index 817af97cb03d1e9a2c023ce6f1d2e64cab055b3c..5160bd4ce4ebbd13f4828f68fee6436b159b2393 100644
--- a/services/devicemanagerservice/include/config/json_config.h
+++ b/services/devicemanagerservice/include/config/json_config.h
@@ -93,4 +93,4 @@ const std::string authJsonConfigString =
 })";
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_OHOS_DM_JSON_CONFIG_H
\ No newline at end of file
+#endif // OHOS_OHOS_DM_JSON_CONFIG_H
diff --git a/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h b/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h
index 2f147ebc09ff13742a7a38579cc35e61ca668b0f..43e2e4a0b6137068457e60bb9b397f155d036d48 100644
--- a/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h
+++ b/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h
@@ -67,4 +67,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_EVENT_MANAGER_ADAPT_H
\ No newline at end of file
+#endif // OHOS_EVENT_MANAGER_ADAPT_H
diff --git a/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h b/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h
index d56fce8d3ae6b581dc9e2f90fa0d60c2b6cf5a77..9dd46141b71d14ecd1d376bab33e02963558dad3 100644
--- a/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h
+++ b/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h
@@ -30,4 +30,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_MULTIPLE_USER_CONNECTOR_H
\ No newline at end of file
+#endif // OHOS_DM_MULTIPLE_USER_CONNECTOR_H
diff --git a/services/devicemanagerservice/src/authentication/auth_message_processor.cpp b/services/devicemanagerservice/src/authentication/auth_message_processor.cpp
index a9bd110b992be43a7bd1b6a8ed4b47e56e15fa86..71e8c59b83c505960e735e57cb55c84e953739b4 100644
--- a/services/devicemanagerservice/src/authentication/auth_message_processor.cpp
+++ b/services/devicemanagerservice/src/authentication/auth_message_processor.cpp
@@ -128,7 +128,6 @@ void AuthMessageProcessor::CreateResponseAuthMessage(nlohmann::json &json)
     json[TAG_REPLY] = authResponseContext_->reply;
     json[TAG_DEVICE_ID] = authResponseContext_->deviceId;
     json[TAG_TOKEN] = authResponseContext_->token;
-    LOGI("AuthMessageProcessor::ParseAuthResponseMessage %s", authResponseContext_->deviceId.c_str());
     if (authResponseContext_->reply == 0) {
         std::string groupId = authResponseContext_->groupId;
         LOGI("AuthMessageProcessor::CreateSimpleMessage groupId %d", groupId.c_str());
diff --git a/services/devicemanagerservice/src/config/dm_config_manager.cpp b/services/devicemanagerservice/src/config/dm_config_manager.cpp
index 6c0a8fc95d9b782c8521b365344f5b73181ab6ee..01266edefc100ec155d520aa878b8eb4fe190fe6 100644
--- a/services/devicemanagerservice/src/config/dm_config_manager.cpp
+++ b/services/devicemanagerservice/src/config/dm_config_manager.cpp
@@ -296,4 +296,4 @@ void DmConfigManager::GetAuthAdapter(std::map<int32_t, std::shared_ptr<IAuthenti
     }
 }
 } // namespace DistributedHardware
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/devicemanagerservice/src/dependency/commonevent/dm_common_event_manager.cpp b/services/devicemanagerservice/src/dependency/commonevent/dm_common_event_manager.cpp
index 5aeb131953d3ddfe055f6f28c393a476de04b7f5..56b472236de94a8b7e81c5ad2527c31b62aa206d 100644
--- a/services/devicemanagerservice/src/dependency/commonevent/dm_common_event_manager.cpp
+++ b/services/devicemanagerservice/src/dependency/commonevent/dm_common_event_manager.cpp
@@ -80,7 +80,7 @@ bool DmCommonEventManager::SubscribeServiceEvent(const std::string &event, const
         LOGE("subscriber is nullptr %s", event.c_str());
         return false;
     }
-    
+
     if (!CommonEventManager::SubscribeCommonEvent(subscriber)) {
         LOGE("Subscribe service event failed: %s", event.c_str());
         return false;
@@ -123,7 +123,7 @@ void DmCommonEventManager::EventSubscriber::OnReceiveEvent(const CommonEventData
         LOGE("userId is less zero");
         return;
     }
-    
+
     std::unique_lock<std::mutex> callbackQueueMutexLock(callbackQueueMutex_);
     if (callbackQueue_.size() > COMMON_CALLBACK_MAX_SIZE) {
         LOGE("event callback Queue is too long");
@@ -135,4 +135,4 @@ void DmCommonEventManager::EventSubscriber::OnReceiveEvent(const CommonEventData
     notEmpty_.notify_one();
 }
 } // namespace DistributedHardware
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp b/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp
index cbdae88d98299c21e958ef845d6d43e0b55fca8f..e1136f07bf90bd968aae8c43070079799a1bdaa4 100644
--- a/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp
+++ b/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp
@@ -50,4 +50,4 @@ int32_t MultipleUserConnector::GetSwitchOldUserId(void)
     return oldUserId_;
 }
 } // namespace DistributedHardware
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp
index 5e78716024fccd0e9fa357511fdd42bfd9026839..f8537b0e2f81b683b9d80ecaa9ac02f8eda25dfb 100644
--- a/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp
+++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp
@@ -62,4 +62,4 @@ const std::map<std::string, CommonSvcId> &IpcServerListenermgr::GetAllListeners(
     return dmListenerMap_;
 }
 } // namespace DistributedHardware
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp
index 0f808c289ab58a3fc465fba270540b5d606585ef..1b9e3aae56a59c21c734f3739d95aad87aa4a4f9 100644
--- a/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp
+++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp
@@ -24,4 +24,4 @@ int32_t main(int32_t argc, char *argv[])
         pause();
     }
     return 0;
-}
\ No newline at end of file
+}
diff --git a/test/unittest/UTTest_auth_message_processor.h b/test/unittest/UTTest_auth_message_processor.h
index 810ffb85a027a1ad6b2e7f19f5f73009f3a392a2..b802473e6708dffd2d430e7d472f6fdc023db19e 100644
--- a/test/unittest/UTTest_auth_message_processor.h
+++ b/test/unittest/UTTest_auth_message_processor.h
@@ -33,4 +33,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DEVICE_MESSAGE_TEST_H
\ No newline at end of file
+#endif // OHOS_DEVICE_MESSAGE_TEST_H
diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp
index 88f0928123ce09f4f221e76d1809c8d46c01f8f6..2932047a96ff6668c90bf96fe66cae0ef72bff5f 100644
--- a/test/unittest/UTTest_device_manager_service.cpp
+++ b/test/unittest/UTTest_device_manager_service.cpp
@@ -194,7 +194,7 @@ HWTEST_F(DeviceManagerServiceTest, GetTrustedDeviceList_001, testing::ext::TestS
 
 /**
  * @tc.name: GetTrustedDeviceList_002
- * @tc.desc:Set the intFlag of GetTrustedDeviceList to true and pkgName = null ; The return value is DM_INPUT_PARA_EMPTY
+ * @tc.desc:Set the intFlag of GetTrustedDeviceList to true and pkgName = null; The return value is DM_INPUT_PARA_EMPTY
  * @tc.type: FUNC
  * @tc.require: AR000GHSJK
  */
diff --git a/test/unittest/UTTest_device_manager_service.h b/test/unittest/UTTest_device_manager_service.h
index e59ad368ce8a8a9161a4d52c1d5fc0765ce98a49..59e92293e103c35399b88aaaf1e4560e36f13f57 100644
--- a/test/unittest/UTTest_device_manager_service.h
+++ b/test/unittest/UTTest_device_manager_service.h
@@ -41,4 +41,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif
\ No newline at end of file
+#endif
diff --git a/test/unittest/UTTest_device_manager_service_listener.cpp b/test/unittest/UTTest_device_manager_service_listener.cpp
index e3612975189b06b2ac737633c2ce66f73e4853f2..a1b270a9de64122c42c55d31a76bb9ca617770ee 100644
--- a/test/unittest/UTTest_device_manager_service_listener.cpp
+++ b/test/unittest/UTTest_device_manager_service_listener.cpp
@@ -107,6 +107,6 @@ HWTEST_F(DeviceManagerServiceListenerTest, OnVerifyAuthResult_001, testing::ext:
     std::string ret = pReq->GetDeviceId();
     EXPECT_EQ(ret, deviceId);
 }
-} // namespace
+}
 } // namespace DistributedHardware
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/test/unittest/UTTest_device_manager_service_listener.h b/test/unittest/UTTest_device_manager_service_listener.h
index 5e314716abb4d71a00490ffd4fbfadcb12bd9ca0..58c013aa18f2159bd3b3971e2042dd43dab9032f 100644
--- a/test/unittest/UTTest_device_manager_service_listener.h
+++ b/test/unittest/UTTest_device_manager_service_listener.h
@@ -39,4 +39,4 @@ public:
 } // namespace OHOS
 #undef private
 #undef protected
-#endif
\ No newline at end of file
+#endif
diff --git a/test/unittest/UTTest_dm_device_info_manager.cpp b/test/unittest/UTTest_dm_device_info_manager.cpp
index 148dd055f784dbea64e386cb1995da6af7ced86c..60f5649f896071924278bb4e13d0a51c16e88d57 100644
--- a/test/unittest/UTTest_dm_device_info_manager.cpp
+++ b/test/unittest/UTTest_dm_device_info_manager.cpp
@@ -54,6 +54,6 @@ HWTEST_F(DeviceManagerImplTest, DmDeviceInfoManager_001, testing::ext::TestSize.
     std::shared_ptr<DmDeviceInfoManager> p = std::make_shared<DmDeviceInfoManager>(softbusConnector);
     ASSERT_NE(p, nullptr);
 }
-} // namespace
+}
 } // namespace DistributedHardware
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS
diff --git a/test/unittest/UTTest_dm_device_info_manager.h b/test/unittest/UTTest_dm_device_info_manager.h
index c0b67f3392a29df5780d29c84f111c6ddf4d6f85..cd1360c1bde2809da72dda80404f452afb6b619d 100644
--- a/test/unittest/UTTest_dm_device_info_manager.h
+++ b/test/unittest/UTTest_dm_device_info_manager.h
@@ -39,4 +39,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif
\ No newline at end of file
+#endif
diff --git a/test/unittest/UTTest_dm_device_state_manager.cpp b/test/unittest/UTTest_dm_device_state_manager.cpp
index 6fa9316d3eac9360f3d69c2626db4b62cd172063..c9f1269e752180c459a388387c1ef8aa89647708 100644
--- a/test/unittest/UTTest_dm_device_state_manager.cpp
+++ b/test/unittest/UTTest_dm_device_state_manager.cpp
@@ -203,6 +203,6 @@ HWTEST_F(DmDeviceStateManagerTest, RegisterSoftbusStateCallback_001, testing::ex
     int ret = dmDeviceStateManager->RegisterSoftbusStateCallback();
     EXPECT_EQ(ret, DM_OK);
 }
-} // namespace
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/test/unittest/UTTest_dm_device_state_manager.h b/test/unittest/UTTest_dm_device_state_manager.h
index 7bbf2fb95d27b6ebce914acb9d4fe7b6ca817d2f..d01d2500df3c6972f429bb8fcd06fab8bfa29174 100644
--- a/test/unittest/UTTest_dm_device_state_manager.h
+++ b/test/unittest/UTTest_dm_device_state_manager.h
@@ -35,4 +35,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif
\ No newline at end of file
+#endif
diff --git a/test/unittest/UTTest_softbus_connector.cpp b/test/unittest/UTTest_softbus_connector.cpp
index dc879c96fdf2c31b11cdb2b02f3a462413d7ba0a..9a22ec88923460c39752d67601c5bc21c65b9158 100644
--- a/test/unittest/UTTest_softbus_connector.cpp
+++ b/test/unittest/UTTest_softbus_connector.cpp
@@ -315,6 +315,6 @@ HWTEST_F(SoftbusConnectorTest, CovertNodeBasicInfoToDmDevice_001, testing::ext::
     int ret = softbusConnector->CovertNodeBasicInfoToDmDevice(nodeBasicInfo, dmDeviceInfo);
     EXPECT_EQ(ret, DM_OK);
 }
-} // namespace
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/test/unittest/UTTest_softbus_session.h b/test/unittest/UTTest_softbus_session.h
index d1c7b6c85da3e0b19851705eb175b1fe9ee42914..8a915a54e3c403c3e186e2ab371c25acf50742a9 100644
--- a/test/unittest/UTTest_softbus_session.h
+++ b/test/unittest/UTTest_softbus_session.h
@@ -45,4 +45,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif
\ No newline at end of file
+#endif
diff --git a/test/unittest/mock/ipc_server_listener.h b/test/unittest/mock/ipc_server_listener.h
index 9493426b8f3fa2eb177682bb7c271e1352ec0c03..f125343e3f57ff9084fc627b6834f4fbc7bc1793 100644
--- a/test/unittest/mock/ipc_server_listener.h
+++ b/test/unittest/mock/ipc_server_listener.h
@@ -35,4 +35,4 @@ public:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_SERVER_LISTENER_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_SERVER_LISTENER_H
diff --git a/test/unittest/mock/parameter.h b/test/unittest/mock/parameter.h
index 1541047118b4977a23d40ff95018bf2804ffa6e9..aa8a706a11f09c8d373509672ff43fe17b92e9c0 100644
--- a/test/unittest/mock/parameter.h
+++ b/test/unittest/mock/parameter.h
@@ -35,5 +35,4 @@ int GetDevUdid(char *udid, int size);
 }
 #endif
 #endif /* __cplusplus */
-
-#endif
\ No newline at end of file
+#endif
diff --git a/utils/include/dm_anonymous.h b/utils/include/dm_anonymous.h
index a30909cf1a74bbcdd825f781d157aedb5edb8835..3537598b8a1e8abe624d59c3513bdf079cb81ee8 100644
--- a/utils/include/dm_anonymous.h
+++ b/utils/include/dm_anonymous.h
@@ -24,5 +24,4 @@ std::string GetAnonyString(const std::string &value);
 std::string GetAnonyInt32(const int32_t value);
 } // namespace DistributedHardware
 } // namespace OHOS
-
-#endif // OHOS_DM_ANONYMOUS_H
\ No newline at end of file
+#endif // OHOS_DM_ANONYMOUS_H
diff --git a/utils/include/ipc/lite/ipc_cmd_register.h b/utils/include/ipc/lite/ipc_cmd_register.h
index b4feac7f247a5380614132705e62d3ff30683b38..dd5967b0ed195fcff086ee9049a5e8086f746b35 100644
--- a/utils/include/ipc/lite/ipc_cmd_register.h
+++ b/utils/include/ipc/lite/ipc_cmd_register.h
@@ -112,4 +112,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_CMD_PARSER_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_CMD_PARSER_H
diff --git a/utils/include/ipc/standard/ipc_cmd_register.h b/utils/include/ipc/standard/ipc_cmd_register.h
index d83a9a5171eb06c06e48a239bdfaf03578023ac0..fa4bd0e15f717361d5ecd337274b667b08d1c5cf 100644
--- a/utils/include/ipc/standard/ipc_cmd_register.h
+++ b/utils/include/ipc/standard/ipc_cmd_register.h
@@ -92,4 +92,4 @@ private:
 };
 } // namespace DistributedHardware
 } // namespace OHOS
-#endif // OHOS_DM_IPC_CMD_PARSER_H
\ No newline at end of file
+#endif // OHOS_DM_IPC_CMD_PARSER_H