fix bug

jxxghp · Sep 14, 2024 · 57bad63 · 57bad63
1 parent f6c84a7
commit 57bad63
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/app/db/plugindata_oper.py b/app/db/plugindata_oper.py
@@ -36,7 +36,7 @@ def get_data(self, plugin_id: str, key: str = None) -> Any:
             data = PluginData.get_plugin_data_by_key(self._db, plugin_id, key)
             if not data:
                 return None
-            if ObjectUtils.is_obj(data.value):
+            if ObjectUtils.is_objstr(data.value):
                 return json.loads(data.value)
             return data.value
         else:

diff --git a/app/db/systemconfig_oper.py b/app/db/systemconfig_oper.py
@@ -18,7 +18,7 @@ def __init__(self):
         """
         super().__init__()
         for item in SystemConfig.list(self._db):
-            if ObjectUtils.is_obj(item.value):
+            if ObjectUtils.is_objstr(item.value):
                 self.__SYSTEMCONF[item.key] = json.loads(item.value)
             else:
                 self.__SYSTEMCONF[item.key] = item.value

diff --git a/app/db/userconfig_oper.py b/app/db/userconfig_oper.py
@@ -18,7 +18,7 @@ def __init__(self):
         """
         super().__init__()
         for item in UserConfig.list(self._db):
-            value = json.loads(item.value) if ObjectUtils.is_obj(item.value) else item.value
+            value = json.loads(item.value) if ObjectUtils.is_objstr(item.value) else item.value
             self.__set_config_cache(username=item.username, key=item.key, value=value)
 
     def set(self, username: str, key: Union[str, UserConfigKey], value: Any):

diff --git a/app/utils/object.py b/app/utils/object.py
@@ -14,11 +14,18 @@ def is_obj(obj: Any):
         elif isinstance(obj, int) \
                 or isinstance(obj, float) \
                 or isinstance(obj, bool) \
-                or isinstance(obj, bytes):
+                or isinstance(obj, bytes) \
+                or isinstance(obj, str):
             return False
-        else:
-            return str(obj).startswith("{") \
-                or str(obj).startswith("[")
+        return True
+
+    @staticmethod
+    def is_objstr(obj: Any):
+        if not isinstance(obj, str):
+            return False
+        return str(obj).startswith("{") \
+            or str(obj).startswith("[") \
+            or str(obj).startswith("(")
 
     @staticmethod
     def arguments(func: Callable) -> int: