From 82c84b2afe79b1193333af9462d1f3ccad923be1 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Wed, 4 Sep 2024 09:01:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=97=A5=E5=BF=97=E8=A3=85=E9=A5=B0?=
 =?UTF-8?q?=E5=99=A8=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?logger=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_admin/annotation/log_annotation.py     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py b/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
index 1f3e220..952dfb8 100644
--- a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
+++ b/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
@@ -16,6 +16,7 @@ from module_admin.service.login_service import LoginService
 from config.enums import BusinessType
 from config.env import AppConfig
 from exceptions.exception import LoginException, ServiceException, ServiceWarning
+from utils.log_util import logger
 from utils.response_util import ResponseUtil
 
 
@@ -116,13 +117,14 @@ class Log:
             try:
                 # 调用原始函数
                 result = await func(*args, **kwargs)
-            except LoginException as e:
+            except (LoginException, ServiceWarning) as e:
+                logger.warning(e.message)
                 result = ResponseUtil.failure(data=e.data, msg=e.message)
             except ServiceException as e:
+                logger.error(e.message)
                 result = ResponseUtil.error(data=e.data, msg=e.message)
-            except ServiceWarning as e:
-                result = ResponseUtil.failure(data=e.data, msg=e.message)
             except Exception as e:
+                logger.exception(e)
                 result = ResponseUtil.error(msg=str(e))
             # 获取请求耗时
             cost_time = float(time.time() - start_time) * 100
@@ -295,13 +297,14 @@ def log_decorator(
             try:
                 # 调用原始函数
                 result = await func(*args, **kwargs)
-            except LoginException as e:
+            except (LoginException, ServiceWarning) as e:
+                logger.warning(e.message)
                 result = ResponseUtil.failure(data=e.data, msg=e.message)
             except ServiceException as e:
+                logger.error(e.message)
                 result = ResponseUtil.error(data=e.data, msg=e.message)
-            except ServiceWarning as e:
-                result = ResponseUtil.failure(data=e.data, msg=e.message)
             except Exception as e:
+                logger.exception(e)
                 result = ResponseUtil.error(msg=str(e))
             # 获取请求耗时
             cost_time = float(time.time() - start_time) * 100