From b6e31cac2360fc604fb93e54868a65a218919d19 Mon Sep 17 00:00:00 2001
From: Rock Chin <1010553892@qq.com>
Date: Thu, 23 Mar 2023 21:29:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E8=BD=BD=E6=97=B6=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=B0=83=E7=94=A8load=5Fconfig()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py               | 3 ++-
 pkg/utils/reloader.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 71bbbd28..28b69369 100644
--- a/main.py
+++ b/main.py
@@ -102,6 +102,7 @@ def reset_logging():
     pkg.utils.context.context['logger_handler'] = sh
     return sh
 
+
 # 临时函数，用于加载config和上下文，未来统一放在config类
 def load_config():
     # 完整性校验
@@ -121,13 +122,13 @@ def load_config():
     # 存进上下文
     pkg.utils.context.set_config(config)
 
+
 def start(first_time_init=False):
     """启动流程，reload之后会被执行"""
 
     global known_exception_caught
     import pkg.utils.context
 
-    load_config() #暂时在start里加载config应对重载，未来在config抽象类中统一处理reload(未来删除该行)
     config = pkg.utils.context.get_config()
     # 更新openai库到最新版本
     if not hasattr(config, 'upgrade_dependencies') or config.upgrade_dependencies:
diff --git a/pkg/utils/reloader.py b/pkg/utils/reloader.py
index 3ab0edd9..0449a40c 100644
--- a/pkg/utils/reloader.py
+++ b/pkg/utils/reloader.py
@@ -32,6 +32,7 @@ def reload_all(notify=True):
     context.context['exceeded_keys'] = context.get_openai_manager().key_mgr.exceeded
     this_context = context.context
     walk(pkg)
+    importlib.reload(__import__("config-template"))
     importlib.reload(__import__('config'))
     importlib.reload(__import__('main'))
     importlib.reload(__import__('banlist'))
@@ -43,6 +44,7 @@ def reload_all(notify=True):
 
     # 执行启动流程
     logging.info("执行程序启动流程")
+    main.load_config()
     context.get_thread_ctl().reload(
         admin_pool_num=context.get_config().admin_pool_num,
         user_pool_num=context.get_config().user_pool_num