diff --git a/CoreModules/plugin_interface.py b/CoreModules/plugin_interface.py index e5e9808..b7609c7 100644 --- a/CoreModules/plugin_interface.py +++ b/CoreModules/plugin_interface.py @@ -80,7 +80,7 @@ class PluginInterface(ABC): config.Log("Error", f"{ConsoleFrontColor.RED}提交表 {db_model.table_name} 列更新失败: {e}{ConsoleFrontColor.RESET}") @final - def execute(self, path:str) -> Optional[APIRouter]: + def execute(self) -> Optional[APIRouter]: ''' 继承后是否返回路由决定是否启动该插件 若返回None, 则不启动该插件 @@ -100,16 +100,22 @@ class PluginInterface(ABC): Architecture.Register(self.__class__, self, setup, *self.dependencies()) router = APIRouter() - router.post(path)(self.generate_router_callback()) + router.post(f"/{self.__class__.__name__}/callback")(self.generate_router_callback()) + if self.generate_router_illustrated_guide() is not None: + router.get(f"/{self.__class__.__name__}")(self.generate_router_illustrated_guide()) return router def generate_router_callback(self) -> Callable|Coroutine: ''' 继承后重写该方法生成路由回调函数 ''' - async def callback(message: str, chat_id: int, user_id: int) -> Any: - return await self.callback(message, chat_id, user_id) - return callback + return self.callback + + def generate_router_illustrated_guide(self) -> Callable|Coroutine|None: + ''' + 继承后重写该方法生成渲染图鉴与攻略网页的函数 + ''' + return None def dependencies(self) -> List[Type]: ''' @@ -218,7 +224,7 @@ def ImportPlugins(app: FastAPI, plugin_dir:str = "Plugins") -> None: plugin = plugin_class() if plugin.is_enable_plugin() == False: continue - router = plugin.execute(f"/{module_file.GetFullPath().replace(".py", '')}/{class_name}") + router = plugin.execute() if router: app.include_router(router, prefix=f"/api", tags=[plugin.get_plugin_tag()]) except Exception as e: