fix: solve conflictsv2.0.10

4 files changed, 7 insertions, 8 deletions

diff --git a/src/core/function/GlobalSettingStation.cpp b/src/core/function/GlobalSettingStation.cpp
index db8d1bc3..7231ac9e 100644
--- a/src/core/function/GlobalSettingStation.cpp
+++ b/src/core/function/GlobalSettingStation.cpp
@@ -55,6 +55,7 @@ GpgFrontend::GlobalSettingStation::GlobalSettingStation(int channel) noexcept
   LOG(INFO) << _("App Data Path") << app_data_path_;
   LOG(INFO) << _("App Log Path") << app_log_path_;
   LOG(INFO) << _("App Locale Path") << app_locale_path_;
+  LOG(INFO) << _("App Conf Path") << ui_config_path_;
 
   if (!is_directory(app_configure_path_)) create_directory(app_configure_path_);
 
diff --git a/src/core/function/GlobalSettingStation.h b/src/core/function/GlobalSettingStation.h
index 58282466..8811623f 100644
--- a/src/core/function/GlobalSettingStation.h
+++ b/src/core/function/GlobalSettingStation.h
@@ -173,10 +173,9 @@ class GPGFRONTEND_CORE_EXPORT GlobalSettingStation
       QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)
           .toStdString();  ///< Program Configure Location
   std::filesystem::path ui_config_dir_path_ =
-      app_configure_path_ /
-      "UserInterface";  ///< Configure File Directory Location
+      app_configure_path_ / "conf";  ///< Configure File Directory Location
   std::filesystem::path ui_config_path_ =
-      ui_config_dir_path_ / "ui.cfg";  ///< UI Configure File Location
+      ui_config_dir_path_ / "main.cfg";  ///< Main Configure File Location
 
   libconfig::Config ui_cfg_;  ///< UI Configure File
 
diff --git a/src/core/function/gpg/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp
index ff848e0e..571e8797 100644
--- a/src/core/function/gpg/GpgKeyGetter.cpp
+++ b/src/core/function/gpg/GpgKeyGetter.cpp
@@ -88,13 +88,10 @@ GpgFrontend::KeyLinkListPtr GpgFrontend::GpgKeyGetter::FetchKey() {
 
   auto keys_list = std::make_unique<GpgKeyLinkList>();
 
-  LOG(INFO) << "cache address:" << &keys_cache_ << "object address" << this;
-
   for (const auto& [key, value] : keys_cache_) {
     LOG(INFO) << "FetchKey Id:" << value.GetId();
     keys_list->push_back(value.Copy());
   }
-  LOG(INFO) << "ended";
   return keys_list;
 }
 
@@ -141,8 +138,6 @@ void GpgFrontend::GpgKeyGetter::FlushKeyCache() {
 
   err = gpgme_op_keylist_end(ctx_);
   assert(check_gpg_error_2_err_code(err, GPG_ERR_EOF) == GPG_ERR_NO_ERROR);
-
-  LOG(INFO) << "ended";
 }
 
 GpgFrontend::KeyListPtr GpgFrontend::GpgKeyGetter::GetKeys(
diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp
index 03d8c8d9..0839c132 100644
--- a/src/core/function/gpg/GpgKeyOpera.cpp
+++ b/src/core/function/gpg/GpgKeyOpera.cpp
@@ -245,6 +245,10 @@ 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();
+
   auto algo_utf8 = (params->GetAlgo() + params->GetKeySizeStr());
   const char* algo = algo_utf8.c_str();
   unsigned long expires = 0;