From 282f723d34556994fbfc9777e681b15c6adbf49b Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 10 Feb 2024 10:58:43 +0800
Subject: [PATCH] fix plugin api

---
 app/db/plugindata_oper.py | 17 ++++++++++-------
 app/plugins/__init__.py   |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/db/plugindata_oper.py b/app/db/plugindata_oper.py
index 0cda364a..0c5ae785 100644
--- a/app/db/plugindata_oper.py
+++ b/app/db/plugindata_oper.py
@@ -28,18 +28,21 @@ class PluginDataOper(DbOper):
         else:
             PluginData(plugin_id=plugin_id, key=key, value=value).create(self._db)
 
-    def get_data(self, plugin_id: str, key: str) -> Any:
+    def get_data(self, plugin_id: str, key: str = None) -> Any:
         """
         获取插件数据
         :param plugin_id: 插件id
         :param key: 数据key
         """
-        data = PluginData.get_plugin_data_by_key(self._db, plugin_id, key)
-        if not data:
-            return None
-        if ObjectUtils.is_obj(data.value):
-            return json.loads(data.value)
-        return data.value
+        if key:
+            data = PluginData.get_plugin_data_by_key(self._db, plugin_id, key)
+            if not data:
+                return None
+            if ObjectUtils.is_obj(data.value):
+                return json.loads(data.value)
+            return data.value
+        else:
+            return PluginData.get_plugin_data(self._db, plugin_id)
 
     def del_data(self, plugin_id: str, key: str) -> Any:
         """
diff --git a/app/plugins/__init__.py b/app/plugins/__init__.py
index 5bc83048..9e7446dc 100644
--- a/app/plugins/__init__.py
+++ b/app/plugins/__init__.py
@@ -166,7 +166,7 @@ class _PluginBase(metaclass=ABCMeta):
             plugin_id = self.__class__.__name__
         self.plugindata.save(plugin_id, key, value)
 
-    def get_data(self, key: str, plugin_id: str = None) -> Any:
+    def get_data(self, key: str = None, plugin_id: str = None) -> Any:
         """
         获取插件数据
         :param key: 数据key