From 07771c180d5b977edd324cbf8b53dd89a170fb04 Mon Sep 17 00:00:00 2001
From: insistence <3055204202@qq.com>
Date: Sat, 27 Jul 2024 16:31:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D1.3.0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=87=87=E7=94=A8=E6=96=B0=E7=9A=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=BA=E5=88=B6=E5=90=8E=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=A3=85=E9=A5=B0=E5=99=A8=E6=97=A0=E6=B3=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_admin/annotation/log_annotation.py | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py b/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
index 4d0737e..1f3e220 100644
--- a/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
+++ b/ruoyi-fastapi-backend/module_admin/annotation/log_annotation.py
@@ -15,6 +15,8 @@ from module_admin.service.log_service import LoginLogService, OperationLogServic
 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.response_util import ResponseUtil
 
 
 class Log:
@@ -111,8 +113,17 @@ class Log:
                     loginTime=oper_time.strftime('%Y-%m-%d %H:%M:%S'),
                 )
                 kwargs['form_data'].login_info = login_log
-            # 调用原始函数
-            result = await func(*args, **kwargs)
+            try:
+                # 调用原始函数
+                result = await func(*args, **kwargs)
+            except LoginException as e:
+                result = ResponseUtil.failure(data=e.data, msg=e.message)
+            except ServiceException as e:
+                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:
+                result = ResponseUtil.error(msg=str(e))
             # 获取请求耗时
             cost_time = float(time.time() - start_time) * 100
             # 判断请求是否来自api文档
@@ -281,8 +292,17 @@ def log_decorator(
                     loginTime=oper_time.strftime('%Y-%m-%d %H:%M:%S'),
                 )
                 kwargs['form_data'].login_info = login_log
-            # 调用原始函数
-            result = await func(*args, **kwargs)
+            try:
+                # 调用原始函数
+                result = await func(*args, **kwargs)
+            except LoginException as e:
+                result = ResponseUtil.failure(data=e.data, msg=e.message)
+            except ServiceException as e:
+                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:
+                result = ResponseUtil.error(msg=str(e))
             # 获取请求耗时
             cost_time = float(time.time() - start_time) * 100
             # 判断请求是否来自api文档