From eddff9ae9521d052b2b6f169e2302806a3655c85 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@163.com>
Date: Sat, 3 Aug 2024 00:32:47 +0800
Subject: [PATCH] =?UTF-8?q?3.1.0,=E5=BE=88=E5=A4=9A=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=EF=BC=8C=E9=87=8D=E6=96=B0=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/wx_core/utils/common_utils.py | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pywxdump/wx_core/utils/common_utils.py b/pywxdump/wx_core/utils/common_utils.py
index c49b04f..7b899e3 100644
--- a/pywxdump/wx_core/utils/common_utils.py
+++ b/pywxdump/wx_core/utils/common_utils.py
@@ -11,20 +11,15 @@ import hmac
 import sys
 import traceback
 import hashlib
-<<<<<<< HEAD:pywxdump/wx_info/utils.py
-=======
 from ._loger import wx_core_loger
->>>>>>> ta:pywxdump/wx_core/utils/common_utils.py
+
 if sys.platform == "win32":
     from win32com.client import Dispatch
 else:
     Dispatch = None
 
-<<<<<<< HEAD:pywxdump/wx_info/utils.py
-def info_error(func):
-=======
+
 def wx_core_error(func):
->>>>>>> ta:pywxdump/wx_core/utils/common_utils.py
     """
     错误处理装饰器
     :param func:
@@ -34,15 +29,8 @@ def wx_core_error(func):
         try:
             return func(*args, **kwargs)
         except Exception as e:
-<<<<<<< HEAD:pywxdump/wx_info/utils.py
-            traceback_data = traceback.format_exc()
-            rdata = f"{traceback_data}"
-            print(f"info_error: \n{rdata}")
-            return "None"
-=======
             wx_core_loger.error(f"wx_core_error: {e}", exc_info=True)
             return None
->>>>>>> ta:pywxdump/wx_core/utils/common_utils.py
     return wrapper