From e7215cec9eba84ed2e06ab0abe76cce4177900f1 Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Mon, 13 Mar 2023 10:33:01 +0800
Subject: [PATCH] =?UTF-8?q?improvement:=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=BA=A7=E5=88=AB=E9=97=AE=E9=A2=98=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E6=97=A0=E6=95=88=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/GlobalControllerExceptionHandler.java  | 12 ++++++++++++
 .../permission/serviceimpl/AdminUserServiceImpl.java |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java
index 57d1a852..14a1a010 100644
--- a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java
+++ b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java
@@ -59,6 +59,18 @@ public class GlobalControllerExceptionHandler {
                 message += ":" + serviceException.getMsg();
             }
 
+            // 对一些特殊异常处理，不再打印error级别的日志
+            assert serviceException.getResultCode() != null;
+            if (serviceException.getResultCode().equals(ResultCode.DEMO_SITE_EXCEPTION)) {
+                log.debug("[DEMO_SITE_EXCEPTION]:{}", serviceException.getResultCode().message(), e);
+                return ResultUtil.error(code, message);
+            }
+            if (serviceException.getResultCode().equals(ResultCode.USER_AUTH_EXPIRED)) {
+                log.debug("403 :{}", serviceException.getResultCode().message(), e);
+                return ResultUtil.error(code, message);
+            }
+
+
             log.error("全局异常[ServiceException]:{}-{}", serviceException.getResultCode().code(), serviceException.getResultCode().message(), e);
             return ResultUtil.error(code, message);
 
diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
index bc4f55d4..64f52872 100644
--- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java
@@ -85,7 +85,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
                                     .getTitle()
                     );
                 } catch (Exception e) {
-                    log.error("填充部门信息异常", e);
+                    log.debug("权限部门信息异常", e);
                 }
             }
             if (!CharSequenceUtil.isEmpty(adminUser.getRoleIds())) {
@@ -97,7 +97,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
                                     .collect(Collectors.toList())
                     );
                 } catch (Exception e) {
-                    log.error("填充部门信息异常", e);
+                    log.debug("权限色信息异常", e);
                 }
             }
             result.add(adminUserVO);