From c26682e19bc6d592f8962909708d073477ec24d5 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@163.com>
Date: Sat, 3 Aug 2024 20:35:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0rjson=E9=9D=9E0=E7=9A=84?=
 =?UTF-8?q?=E5=A0=86=E6=A0=88=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/api/rjson.py | 4 ++--
 pywxdump/api/utils.py | 2 +-
 pywxdump/db/dbbase.py | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pywxdump/api/rjson.py b/pywxdump/api/rjson.py
index 7645ae9..4498097 100644
--- a/pywxdump/api/rjson.py
+++ b/pywxdump/api/rjson.py
@@ -42,11 +42,11 @@ def ReJson(code: int, body: [dict, list] = None, msg: str = None, error: str = N
         stack = traceback.extract_stack()
         project_stack = [frame for frame in stack if "pywxdump" in frame.filename.lower() and
                          any(keyword in frame.filename for keyword in
-                             ["api", "db", "wx_core", "analyzer", "ui"])]
+                             ["api", "db", "wx_core", "analyzer", "ui", "cli", "server"])]
         # 格式化调用栈信息
         formatted_stack = ''.join(traceback.format_list(project_stack))
         # stack_trace = ''.join(traceback.format_stack())
-        loger_rjson.warning(f"\n{code=}\nbody=\n{rjson['body']}\nmsg={rjson['msg']}\n{extra=}\n{formatted_stack}")
+        loger_rjson.warning(f"\n{code=}\n{rjson['body']=}\n{rjson['msg']=}\n{rjson['extra']=}\n{formatted_stack}")
     if error:
         loger_rjson.error(error, exc_info=True)
     return rjson
diff --git a/pywxdump/api/utils.py b/pywxdump/api/utils.py
index af58046..1a61a8f 100644
--- a/pywxdump/api/utils.py
+++ b/pywxdump/api/utils.py
@@ -99,7 +99,7 @@ def error9999(func):
             traceback_data = traceback.format_exc()
             rdata = f"{traceback_data}"
             # logging.error(rdata)
-            return ReJson(9999, body=rdata)
+            return ReJson(9999, body=f"{str(e)}\n{rdata}", error=str(e))
 
     return wrapper
 
diff --git a/pywxdump/db/dbbase.py b/pywxdump/db/dbbase.py
index 201610e..a3a2e86 100644
--- a/pywxdump/db/dbbase.py
+++ b/pywxdump/db/dbbase.py
@@ -124,7 +124,6 @@ class DatabaseBase(DatabaseSingletonBase):
         finally:
             connection.close()
 
-
     def check_tables_exist(self, required_tables):
         """
         判断该类所需要的表是否存在