From d2dccfebc5c3be5b89eac6e867a9207f04543c58 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Mon, 22 Aug 2022 22:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=85=8D=E7=BD=AE=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../init_plugin_config/init_plugins_config.py | 20 ++++++++---------
 configs/utils/__init__.py                     | 22 ++++++++-----------
 .../image_management/upload_image/__init__.py |  2 ++
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/basic_plugins/init_plugin_config/init_plugins_config.py b/basic_plugins/init_plugin_config/init_plugins_config.py
index d95348f9..da9fcbe2 100755
--- a/basic_plugins/init_plugin_config/init_plugins_config.py
+++ b/basic_plugins/init_plugin_config/init_plugins_config.py
@@ -108,16 +108,16 @@ def init_plugins_config(data_path):
                 _data, wf, indent=2, Dumper=yaml.RoundTripDumper, allow_unicode=True
             )
     user_config_file = Path() / "configs" / "config.yaml"
-    if not user_config_file.exists():
-        _replace_config()
-    else:
-        logger.info('五分钟后将进行配置数据替换，请注意...')
-        scheduler.add_job(
-            _replace_config,
-            "date",
-            run_date=datetime.now() + timedelta(minutes=5),
-            id=f"_replace_config"
-        )
+    # if not user_config_file.exists():
+    _replace_config()
+    # else:
+    #     logger.info('五分钟后将进行配置数据替换，请注意...')
+    #     scheduler.add_job(
+    #         _replace_config,
+    #         "date",
+    #         run_date=datetime.now() + timedelta(minutes=5),
+    #         id=f"_replace_config"
+    #     )
 
 
 def _replace_config():
diff --git a/configs/utils/__init__.py b/configs/utils/__init__.py
index 4ee7ce08..a91c8de5 100644
--- a/configs/utils/__init__.py
+++ b/configs/utils/__init__.py
@@ -94,13 +94,14 @@ class ConfigsManager:
             del self._data[module]
         self.save()
 
-    def set_config(self, module: str, key: str, value: Any, save_simple_data: bool = False):
+    def set_config(self, module: str, key: str, value: Any, auto_save: bool = False, save_simple_data: bool = True):
         """
         设置配置值
         :param module: 模块名
         :param key: 配置名称
         :param value: 值
-        :param save_simple_data: 同时保存至config.yaml
+        :param auto_save: 自动保存
+        :param save_simple_data: 保存至config.yaml
         """
         if module in self._data.keys():
             if (
@@ -109,6 +110,7 @@ class ConfigsManager:
             ):
                 self._data[module][key]["value"] = value
                 self._simple_data[module][key] = value
+            if auto_save:
                 self.save(save_simple_data=save_simple_data)
 
     def set_help(self, module: str, key: str, help_: str):
@@ -145,18 +147,12 @@ class ConfigsManager:
         :param default: 没有key值内容的默认返回值
         """
         key = key.upper()
-        # 优先使用simple_data
-        if module in self._simple_data.keys():
+        if module in self._data.keys():
             for key in [key, f"{key} [LEVEL]"]:
-                if self._simple_data[module].get(key) is not None:
-                    return self._simple_data[module][key]
-        # if module in self._data.keys():
-        #     if module in self._data.keys():
-        #         for key in [key, f"{key} [LEVEL]"]:
-        #             if self._data[module].get(key) is not None:
-        #                 if self._data[module][key]["value"] is None:
-        #                     return self._data[module][key]["value"]
-        #                 return self._data[module][key]["default_value"]
+                if self._data[module].get(key) is not None:
+                    if self._data[module][key]["value"] is None:
+                        return self._data[module][key]["default_value"]
+                    return self._data[module][key]["value"]
         if default is not None:
             return default
         return None
diff --git a/plugins/image_management/upload_image/__init__.py b/plugins/image_management/upload_image/__init__.py
index 4dd2059e..23ae08aa 100755
--- a/plugins/image_management/upload_image/__init__.py
+++ b/plugins/image_management/upload_image/__init__.py
@@ -53,6 +53,8 @@ async def _(event: MessageEvent, state: T_State, arg: Message = CommandArg()):
     if img_list:
         state["img_list"] = arg
 
+print(Config.get_config("image_management", "IMAGE_DIR_LIST"))
+
 
 @upload_img.got(
     "path",