diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
index c9d8f24495c9bb25afda88715361130cacc3cdf3..df54788599c908942448f953e806c4861427e2af 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
@@ -95,7 +95,7 @@ ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(AccessTokenID tokenID)
     if (tokenID == 0) {
         return TOKEN_INVALID;
     }
-    AccessTokenIDInner *idInner = (AccessTokenIDInner *)&tokenID;
+    AccessTokenIDInner *idInner = reinterpret_cast<AccessTokenIDInner *>(&tokenID);
     return (ATokenTypeEnum)(idInner->type);
 }
 
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
index 3ad9cab15b73c59f3a465e71bbfe7a6710c50cbb..5e549ade6a422f37f9c5bf8a94e72c6fb846ea1e 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h
@@ -37,7 +37,7 @@ namespace AccessToken {
 class AccessTokenManagerProxy : public IRemoteProxy<IAccessTokenManager> {
 public:
     explicit AccessTokenManagerProxy(const sptr<IRemoteObject>& impl);
-    virtual ~AccessTokenManagerProxy() override;
+    ~AccessTokenManagerProxy() override;
 
     int VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName) override;
     int VerifyNativeToken(AccessTokenID tokenID, const std::string& permissionName) override;
diff --git a/interfaces/innerkits/token_setproc/src/token_setproc.c b/interfaces/innerkits/token_setproc/src/token_setproc.c
index 14363d5958545bc574a29c5913473d688be89518..da5dd2a1afe5edacb8ae3e9079fc764cd41598bd 100644
--- a/interfaces/innerkits/token_setproc/src/token_setproc.c
+++ b/interfaces/innerkits/token_setproc/src/token_setproc.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #define    ACCESS_TOKEN_ID_IOCTL_BASE    'A'
 
@@ -32,13 +33,13 @@ enum {
 };
 
 #define    ACCESS_TOKENID_GET_TOKENID \
-    _IOR(ACCESS_TOKEN_ID_IOCTL_BASE, GET_TOKEN_ID, unsigned long long)
+    _IOR(ACCESS_TOKEN_ID_IOCTL_BASE, GET_TOKEN_ID, uint64_t)
 #define    ACCESS_TOKENID_SET_TOKENID \
-    _IOW(ACCESS_TOKEN_ID_IOCTL_BASE, SET_TOKEN_ID, unsigned long long)
+    _IOW(ACCESS_TOKEN_ID_IOCTL_BASE, SET_TOKEN_ID, uint64_t)
 #define    ACCESS_TOKENID_GET_FTOKENID \
-    _IOR(ACCESS_TOKEN_ID_IOCTL_BASE, GET_FTOKEN_ID, unsigned long long)
+    _IOR(ACCESS_TOKEN_ID_IOCTL_BASE, GET_FTOKEN_ID, uint64_t)
 #define    ACCESS_TOKENID_SET_FTOKENID \
-    _IOW(ACCESS_TOKEN_ID_IOCTL_BASE, SET_FTOKEN_ID, unsigned long long)
+    _IOW(ACCESS_TOKEN_ID_IOCTL_BASE, SET_FTOKEN_ID, uint64_t)
 
 #define ACCESS_TOKEN_OK 0
 #define ACCESS_TOKEN_ERROR (-1)
@@ -48,7 +49,7 @@ enum {
 
 #define TOKENID_DEVNODE "/dev/access_token_id"
 
-uint64_t GetSelfTokenID()
+uint64_t GetSelfTokenID(void)
 {
     uint64_t token = INVAL_TOKEN_ID;
     int fd = open(TOKENID_DEVNODE, O_RDWR);
@@ -81,7 +82,7 @@ int SetSelfTokenID(uint64_t tokenID)
     return ACCESS_TOKEN_OK;
 }
 
-uint64_t GetFirstCallerTokenID()
+uint64_t GetFirstCallerTokenID(void)
 {
     uint64_t token = INVAL_TOKEN_ID;
     int fd = open(TOKENID_DEVNODE, O_RDWR);
diff --git a/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.h b/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.h
index 6e251e9612d32f642be1ec246d7fd026d1b63960..9568bfa6dd96dad3d903a065d72461a95c8c20d7 100644
--- a/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.h
+++ b/interfaces/innerkits/tokensync/src/token_sync_manager_proxy.h
@@ -30,7 +30,7 @@ namespace AccessToken {
 class TokenSyncManagerProxy : public IRemoteProxy<ITokenSyncManager> {
 public:
     explicit TokenSyncManagerProxy(const sptr<IRemoteObject>& impl);
-    virtual ~TokenSyncManagerProxy() override;
+    ~TokenSyncManagerProxy() override;
 
     int GetRemoteHapTokenInfo(const std::string& deviceID, AccessTokenID tokenID) override;
     int DeleteRemoteHapTokenInfo(AccessTokenID tokenID) override;
diff --git a/interfaces/kits/accesstoken/napi/src/napi_atmanager.cpp b/interfaces/kits/accesstoken/napi/src/napi_atmanager.cpp
index 672003a66f2366556a365b46f054678a0a903695..beb333567fe0c99d500dae43b764e804ff9a9fb1 100644
--- a/interfaces/kits/accesstoken/napi/src/napi_atmanager.cpp
+++ b/interfaces/kits/accesstoken/napi/src/napi_atmanager.cpp
@@ -146,7 +146,7 @@ void NapiAtManager::ParseInputVerifyPermissionOrGetFlag(const napi_env env, cons
 
 void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void *data)
 {
-    AtManagerAsyncContext* asyncContext = (AtManagerAsyncContext *)data;
+    AtManagerAsyncContext* asyncContext = reinterpret_cast<AtManagerAsyncContext *>(data);
 
     // use innerkit class method to verify permission
     asyncContext->result = AccessTokenKit::VerifyAccessToken(asyncContext->tokenId,
@@ -208,7 +208,7 @@ napi_value NapiAtManager::VerifyAccessToken(napi_env env, napi_callback_info inf
 
     napi_create_async_work( // define work
         env, nullptr, resource, VerifyAccessTokenExecute, VerifyAccessTokenComplete,
-        (void *)asyncContext, &(asyncContext->work));
+        reinterpret_cast<void *>(asyncContext), &(asyncContext->work));
     napi_queue_async_work(env, asyncContext->work); // add async work handle to the napi queue and wait for result
 
     ACCESSTOKEN_LOG_DEBUG(LABEL, "VerifyAccessToken end.");
@@ -257,7 +257,7 @@ void NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const
 
 void NapiAtManager::GrantUserGrantedPermissionExcute(napi_env env, void *data)
 {
-    AtManagerAsyncContext* asyncContext = (AtManagerAsyncContext *)data;
+    AtManagerAsyncContext* asyncContext = reinterpret_cast<AtManagerAsyncContext *>(data);
     PermissionDef permissionDef;
 
     // struct init, can not use = { 0 } or memset otherwise program crashdump
@@ -300,7 +300,7 @@ void NapiAtManager::GrantUserGrantedPermissionExcute(napi_env env, void *data)
 
 void NapiAtManager::GrantUserGrantedPermissionComplete(napi_env env, napi_status status, void *data)
 {
-    AtManagerAsyncContext* asyncContext = (AtManagerAsyncContext*)data;
+    AtManagerAsyncContext* asyncContext = reinterpret_cast<AtManagerAsyncContext*>(data);
     napi_value result = nullptr;
 
     if (asyncContext->status == ASYN_THREAD_EXEC_SUCC) {
@@ -370,7 +370,7 @@ napi_value NapiAtManager::GrantUserGrantedPermission(napi_env env, napi_callback
 
     napi_create_async_work( // define work
         env, nullptr, resource, GrantUserGrantedPermissionExcute, GrantUserGrantedPermissionComplete,
-        (void *)asyncContext, &(asyncContext->work));
+        reinterpret_cast<void *>(asyncContext), &(asyncContext->work));
 
     napi_queue_async_work(env, asyncContext->work); // add async work handle to the napi queue and wait for result
 
@@ -381,7 +381,7 @@ napi_value NapiAtManager::GrantUserGrantedPermission(napi_env env, napi_callback
 
 void NapiAtManager::RevokeUserGrantedPermissionExcute(napi_env env, void *data)
 {
-    AtManagerAsyncContext* asyncContext = (AtManagerAsyncContext *)data;
+    AtManagerAsyncContext* asyncContext = reinterpret_cast<AtManagerAsyncContext *>(data);
     PermissionDef permissionDef;
 
     // struct init, can not use = { 0 } or memset otherwise program crashdump
@@ -423,7 +423,7 @@ void NapiAtManager::RevokeUserGrantedPermissionExcute(napi_env env, void *data)
 
 void NapiAtManager::RevokeUserGrantedPermissionComplete(napi_env env, napi_status status, void *data)
 {
-    AtManagerAsyncContext* asyncContext = (AtManagerAsyncContext*)data;
+    AtManagerAsyncContext* asyncContext = reinterpret_cast<AtManagerAsyncContext*>(data);
     napi_value result = nullptr;
 
     if (asyncContext->status == ASYN_THREAD_EXEC_SUCC) {
@@ -493,7 +493,7 @@ napi_value NapiAtManager::RevokeUserGrantedPermission(napi_env env, napi_callbac
 
     napi_create_async_work( // define work
         env, nullptr, resource, RevokeUserGrantedPermissionExcute, RevokeUserGrantedPermissionComplete,
-        (void *)asyncContext, &(asyncContext->work));
+        reinterpret_cast<void *>(asyncContext), &(asyncContext->work));
 
     napi_queue_async_work(env, asyncContext->work); // add async work handle to the napi queue and wait for result
 
@@ -514,7 +514,7 @@ void NapiAtManager::GetPermissionFlagsExcute(napi_env env, void *data)
 
 void NapiAtManager::GetPermissionFlagsComplete(napi_env env, napi_status status, void *data)
 {
-    AtManagerAsyncContext* asyncContext = (AtManagerAsyncContext*)data;
+    AtManagerAsyncContext* asyncContext = reinterpret_cast<AtManagerAsyncContext*>(data);
     napi_value result;
 
     ACCESSTOKEN_LOG_DEBUG(LABEL, "permissionName = %{public}s, tokenId = %{public}d, flag = %{public}d.",
@@ -560,7 +560,7 @@ napi_value NapiAtManager::GetPermissionFlags(napi_env env, napi_callback_info in
 
     napi_create_async_work( // define work
         env, nullptr, resource, GetPermissionFlagsExcute, GetPermissionFlagsComplete,
-        (void *)asyncContext, &(asyncContext->work));
+        reinterpret_cast<void *>(asyncContext), &(asyncContext->work));
     napi_queue_async_work(env, asyncContext->work); // add async work handle to the napi queue and wait for result
 
     ACCESSTOKEN_LOG_DEBUG(LABEL, "GetPermissionFlags end.");
diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
index 19d7f272245ec23f99be8f6c808a981a9c2adead..e96fdccf3dabb0af446180f6fb439eaacb048e0a 100644
--- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp
@@ -27,7 +27,7 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_
 
 ATokenTypeEnum AccessTokenIDManager::GetTokenIdTypeEnum(AccessTokenID id)
 {
-    AccessTokenIDInner *idInner = (AccessTokenIDInner *)&id;
+    AccessTokenIDInner *idInner = reinterpret_cast<AccessTokenIDInner *>(&id);
     return (ATokenTypeEnum)idInner->type;
 }
 
@@ -44,7 +44,7 @@ ATokenTypeEnum AccessTokenIDManager::GetTokenIdType(AccessTokenID id)
 
 int AccessTokenIDManager::RegisterTokenId(AccessTokenID id, ATokenTypeEnum type)
 {
-    AccessTokenIDInner *idInner = (AccessTokenIDInner *)&id;
+    AccessTokenIDInner *idInner = reinterpret_cast<AccessTokenIDInner *>(&id);
     if (idInner->version != DEFAULT_TOKEN_VERSION || idInner->type != type) {
         return RET_FAILED;
     }
@@ -53,7 +53,7 @@ int AccessTokenIDManager::RegisterTokenId(AccessTokenID id, ATokenTypeEnum type)
 
     for (std::set<AccessTokenID>::iterator it = tokenIdSet_.begin(); it != tokenIdSet_.end(); ++it) {
         AccessTokenID tokenId = *it;
-        AccessTokenIDInner *idInnerExist = (AccessTokenIDInner *)&tokenId;
+        AccessTokenIDInner *idInnerExist = reinterpret_cast<AccessTokenIDInner *>(&tokenId);
         if (idInnerExist->tokenUniqueID == idInner->tokenUniqueID) {
             return RET_FAILED;
         }
diff --git a/services/tokensyncmanager/include/command/delete_remote_token_command.h b/services/tokensyncmanager/include/command/delete_remote_token_command.h
index 97e3a2444aba3847c30bdca4f901e6c58f62786d..f0623b051f5ce55722147188dc3458b2f6709bfe 100644
--- a/services/tokensyncmanager/include/command/delete_remote_token_command.h
+++ b/services/tokensyncmanager/include/command/delete_remote_token_command.h
@@ -34,7 +34,7 @@ public:
 
     std::string ToJsonPayload() override;
 
-    DeleteRemoteTokenCommand(const std::string &json);
+    explicit DeleteRemoteTokenCommand(const std::string &json);
     DeleteRemoteTokenCommand(const std::string &srcDeviceId, const std::string &dstDeviceId,
         AccessTokenID deleteID);
     virtual ~DeleteRemoteTokenCommand() = default;
diff --git a/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h b/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h
index 14df3a21c9ca4d01f370ddd213ea300fa1692c76..a746a977242302ccc77bf742e220dfa8afbcab63 100644
--- a/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h
+++ b/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h
@@ -39,7 +39,7 @@ public:
 
     std::string ToJsonPayload() override;
 
-    SyncRemoteHapTokenCommand(const std::string &json);
+    explicit SyncRemoteHapTokenCommand(const std::string &json);
     SyncRemoteHapTokenCommand(const std::string &srcDeviceId,
         const std::string &dstDeviceId, AccessTokenID id);
     virtual ~SyncRemoteHapTokenCommand() = default;
diff --git a/services/tokensyncmanager/include/command/sync_remote_native_token_command.h b/services/tokensyncmanager/include/command/sync_remote_native_token_command.h
index e398d780427dc00b1b39bed652478f15a6ef7433..2fe6093e15cc3091096f4f9b9f2800ac0a307aa3 100644
--- a/services/tokensyncmanager/include/command/sync_remote_native_token_command.h
+++ b/services/tokensyncmanager/include/command/sync_remote_native_token_command.h
@@ -38,7 +38,7 @@ public:
 
     std::string ToJsonPayload() override;
 
-    SyncRemoteNativeTokenCommand(const std::string &json);
+    explicit SyncRemoteNativeTokenCommand(const std::string &json);
     SyncRemoteNativeTokenCommand(const std::string &srcDeviceId, const std::string &dstDeviceId);
     virtual ~SyncRemoteNativeTokenCommand() = default;
 
diff --git a/services/tokensyncmanager/include/command/update_remote_hap_token_command.h b/services/tokensyncmanager/include/command/update_remote_hap_token_command.h
index 1e6f889195d65ab11d9e03054308fb9253295583..3786241bb31677620eac20840bd2a119b421bd34 100644
--- a/services/tokensyncmanager/include/command/update_remote_hap_token_command.h
+++ b/services/tokensyncmanager/include/command/update_remote_hap_token_command.h
@@ -38,7 +38,7 @@ public:
 
     std::string ToJsonPayload() override;
 
-    UpdateRemoteHapTokenCommand(const std::string &json);
+    explicit UpdateRemoteHapTokenCommand(const std::string &json);
     UpdateRemoteHapTokenCommand(const std::string &srcDeviceId, const std::string &dstDeviceId,
         const HapTokenInfoForSync& tokenInfo);
     virtual ~UpdateRemoteHapTokenCommand() = default;
diff --git a/services/tokensyncmanager/include/service/token_sync_event_handler.h b/services/tokensyncmanager/include/service/token_sync_event_handler.h
index f9a0caf36e0ef615a1307cece641460628443b35..a86ca94eae2a830d9c0e91a25e30c1eef376b571 100644
--- a/services/tokensyncmanager/include/service/token_sync_event_handler.h
+++ b/services/tokensyncmanager/include/service/token_sync_event_handler.h
@@ -26,7 +26,7 @@ namespace Security {
 namespace AccessToken {
 class TokenSyncEventHandler : public AppExecFwk::EventHandler {
 public:
-    TokenSyncEventHandler(const std::shared_ptr<AppExecFwk::EventRunner> &runner);
+    explicit TokenSyncEventHandler(const std::shared_ptr<AppExecFwk::EventRunner> &runner);
     virtual ~TokenSyncEventHandler();
 
     bool ProxyPostTask(const Callback &callback, int64_t delayTime);
diff --git a/services/tokensyncmanager/src/common/constant.cpp b/services/tokensyncmanager/src/common/constant.cpp
index ac90d7d1990ba4086a8691fc8d551320833f42d8..60ba9b670dc2f20e7ccb2928a6de001e92fdb20a 100644
--- a/services/tokensyncmanager/src/common/constant.cpp
+++ b/services/tokensyncmanager/src/common/constant.cpp
@@ -20,14 +20,15 @@ namespace Security {
 namespace AccessToken {
 const std::string Constant::COMMAND_RESULT_SUCCESS = "success";
 const std::string Constant::COMMAND_RESULT_FAILED = "execute command failed";
+static const char REPLACE_TARGET[] = "****";
 
 std::string Constant::EncryptDevId(std::string deviceId)
 {
     std::string result = deviceId;
     if (deviceId.size() >= ENCRYPTLEN) {
-        result.replace(ENCRYPTBEGIN, ENCRYPTEND, "****");
+        result.replace(ENCRYPTBEGIN, ENCRYPTEND, REPLACE_TARGET);
     } else {
-        result.replace(ENCRYPTBEGIN, result.size() - 1, "****");
+        result.replace(ENCRYPTBEGIN, result.size() - 1, REPLACE_TARGET);
     }
     return result;
 }
diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
index 61695aeeb099e5cd7def4e25feb4b8c49b1ae690..ab6a481ebee14e7a64e8c3753a4d5df65875addc 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp
@@ -32,8 +32,8 @@ namespace {
 static const std::string REQUEST_TYPE = "request";
 static const std::string RESPONSE_TYPE = "response";
 static const std::string TASK_NAME_CLOSE_SESSION = "atm_soft_bus_channel_close_session";
-static const long EXECUTE_COMMAND_TIME_OUT = 3000;
-static const long WAIT_SESSION_CLOSE_MILLISECONDS = 5 * 1000;
+static const int32_t EXECUTE_COMMAND_TIME_OUT = 3000;
+static const int32_t WAIT_SESSION_CLOSE_MILLISECONDS = 5 * 1000;
 // send buf size for header
 static const int RPC_TRANSFER_HEAD_BYTES_LENGTH = 1024 * 256;
 // decompress buf size
@@ -101,7 +101,7 @@ void SoftBusChannel::CloseConnection()
         thisPtr->isDelayClosing_ = false;
     });
 
-    ACCESSTOKEN_LOG_DEBUG(LABEL, "close session after %{public}ld ms", WAIT_SESSION_CLOSE_MILLISECONDS);
+    ACCESSTOKEN_LOG_DEBUG(LABEL, "close session after %{public}d ms", WAIT_SESSION_CLOSE_MILLISECONDS);
     handler->ProxyPostTask(delayed, TASK_NAME_CLOSE_SESSION, WAIT_SESSION_CLOSE_MILLISECONDS);
 
     isDelayClosing_ = true;
@@ -276,7 +276,7 @@ std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int len
         return "";
     }
     buf[len] = '\0';
-    std::string str((char *) buf);
+    std::string str(reinterpret_cast<char *>(buf));
     delete[] buf;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "done, output: %{public}s", str.c_str());
     return str;
diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
index 279c6c1d470a294ab981c8976d3fef40bcb7b6d8..325f3daae7d6646ec9cb6968a3d354823bff0ab6 100644
--- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
+++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp
@@ -283,7 +283,7 @@ std::string SoftBusManager::GetUuidByNodeId(const std::string &nodeId) const
         ACCESSTOKEN_LOG_WARN(LABEL, "GetNodeKeyInfo error, return code: %{public}d", ret);
         return "";
     }
-    std::string uuid((char *) info);
+    std::string uuid(reinterpret_cast<char *>(info));
     delete[] info;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished. nodeId(in): %{public}s, uuid: %{public}s", nodeId.c_str(),
         uuid.c_str());
@@ -305,7 +305,7 @@ std::string SoftBusManager::GetUdidByNodeId(const std::string &nodeId) const
         ACCESSTOKEN_LOG_WARN(LABEL, "GetNodeKeyInfo error, code: %{public}d", ret);
         return "";
     }
-    std::string udid((char *) info);
+    std::string udid(reinterpret_cast<char *>(info));
     delete[] info;
     ACCESSTOKEN_LOG_DEBUG(LABEL, "call softbus finished: nodeId(in): %{public}s, udid: %{public}s", nodeId.c_str(),
         udid.c_str());
diff --git a/services/tokensyncmanager/test/mock/src/constant_mock.cpp b/services/tokensyncmanager/test/mock/src/constant_mock.cpp
index 3995ac79a448a76f60f3700798d5b36425dede7e..1491c2cb1e210875dc4610a7a50c716679cca5fc 100644
--- a/services/tokensyncmanager/test/mock/src/constant_mock.cpp
+++ b/services/tokensyncmanager/test/mock/src/constant_mock.cpp
@@ -19,14 +19,15 @@ namespace Security {
 namespace AccessToken {
 const std::string Constant::COMMAND_RESULT_SUCCESS = "success";
 const std::string Constant::COMMAND_RESULT_FAILED = "execute command failed";
+static const char REPLACE_TARGET[] = "****";
 
 std::string Constant::EncryptDevId(std::string deviceId)
 {
     std::string result = deviceId;
     if (deviceId.size() >= ENCRYPTLEN) {
-        result.replace(ENCRYPTBEGIN, ENCRYPTEND, "****");
+        result.replace(ENCRYPTBEGIN, ENCRYPTEND, REPLACE_TARGET);
     } else {
-        result.replace(ENCRYPTBEGIN, result.size() - 1, "****");
+        result.replace(ENCRYPTBEGIN, result.size() - 1, REPLACE_TARGET);
     }
     return result;
 }