1 files changed, 12 insertions, 13 deletions

diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp
index 08103bbb..00c0a6c8 100644
--- a/src/core/function/gpg/GpgKeyOpera.cpp
+++ b/src/core/function/gpg/GpgKeyOpera.cpp
@@ -59,7 +59,7 @@ void GpgFrontend::GpgKeyOpera::DeleteKeys(
                               GPGME_DELETE_ALLOW_SECRET | GPGME_DELETE_FORCE));
       assert(gpg_err_code(err) == GPG_ERR_NO_ERROR);
     } else {
-      LOG(WARNING) << "GpgKeyOpera DeleteKeys get key failed" << tmp;
+      SPDLOG_WARN("GpgKeyOpera DeleteKeys get key failed", tmp);
     }
   }
 }
@@ -84,7 +84,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire(
         to_time_t(*expires) - system_clock::to_time_t(system_clock::now());
   }
 
-  LOG(INFO) << key.GetId() << subkey_fpr << expires_time;
+  SPDLOG_INFO(key.GetId(), subkey_fpr, expires_time);
 
   GpgError err;
   if (key.GetFingerprint() == subkey_fpr || subkey_fpr.empty())
@@ -116,7 +116,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateKey(
   const char* userid = userid_utf8.c_str();
   auto algo_utf8 = params->GetAlgo() + params->GetKeySizeStr();
 
-  LOG(INFO) << "params" << params->GetAlgo() << params->GetKeySizeStr();
+  SPDLOG_INFO("params: {} {}", params->GetAlgo(), params->GetKeySizeStr());
 
   const char* algo = algo_utf8.c_str();
   unsigned long expires = 0;
@@ -129,7 +129,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateKey(
 
   GpgError err;
 
-  LOG(INFO) << "ctx version" << ctx_.GetInfo(false).GnupgVersion;
+  SPDLOG_INFO("ctx version, {}", ctx_.GetInfo(false).GnupgVersion);
 
   if (ctx_.GetInfo(false).GnupgVersion >= "2.1.0") {
     unsigned int flags = 0;
@@ -141,7 +141,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateKey(
     if (params->IsNonExpired()) flags |= GPGME_CREATE_NOEXPIRE;
     if (params->IsNoPassPhrase()) flags |= GPGME_CREATE_NOPASSWD;
 
-    LOG(INFO) << "args: " << userid << algo << expires << flags;
+    SPDLOG_INFO("args: {}", userid, algo, expires, flags);
 
     err = gpgme_op_createkey(ctx_, userid, algo, 0, expires, nullptr, flags);
 
@@ -170,7 +170,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateKey(
 
     ss << "</GnupgKeyParms>";
 
-    DLOG(INFO) << "params" << std::endl << ss.str();
+    SPDLOG_INFO("params: {}", ss.str());
 
     err = gpgme_op_genkey(ctx_, ss.str().c_str(), nullptr, nullptr);
   }
@@ -193,9 +193,8 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateSubkey(
     const GpgKey& key, const std::unique_ptr<GenKeyInfo>& params) {
   if (!params->IsSubKey()) return GPG_ERR_CANCELED;
 
-  LOG(INFO) << "generate subkey"
-            << "algo" << params->GetAlgo() << "key size"
-            << params->GetKeySizeStr();
+  SPDLOG_INFO("generate subkey algo {} key size {}", params->GetAlgo(),
+              params->GetKeySizeStr());
 
   auto algo_utf8 = (params->GetAlgo() + params->GetKeySizeStr());
   const char* algo = algo_utf8.c_str();
@@ -216,8 +215,8 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateSubkey(
 
   flags |= GPGME_CREATE_NOPASSWD;
 
-  LOG(INFO) << "GpgFrontend::GpgKeyOpera::GenerateSubkey Args: " << key.GetId()
-            << algo << expires << flags;
+  SPDLOG_INFO("GpgFrontend::GpgKeyOpera::GenerateSubkey args: {} {} {} {}",
+              key.GetId(), algo, expires, flags);
 
   auto err =
       gpgme_op_createsubkey(ctx_, gpgme_key_t(key), algo, 0, expires, flags);
@@ -227,7 +226,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateSubkey(
 GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::ModifyPassword(
     const GpgFrontend::GpgKey& key) {
   if (ctx_.GetInfo(false).GnupgVersion < "2.0.15") {
-    LOG(ERROR) << _("operator not support");
+    SPDLOG_ERROR("operator not support");
     return GPG_ERR_NOT_SUPPORTED;
   }
   auto err = gpgme_op_passwd(ctx_, gpgme_key_t(key), 0);
@@ -236,7 +235,7 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::ModifyPassword(
 GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::ModifyTOFUPolicy(
     const GpgFrontend::GpgKey& key, gpgme_tofu_policy_t tofu_policy) {
   if (ctx_.GetInfo(false).GnupgVersion < "2.1.10") {
-    LOG(ERROR) << _("operator not support");
+    SPDLOG_ERROR("operator not support");
     return GPG_ERR_NOT_SUPPORTED;
   }
   auto err = gpgme_op_tofu_policy(ctx_, gpgme_key_t(key), tofu_policy);