From 69b274237a74768ec3737e9f124aff8c7d23b570 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 22 Dec 2023 09:27:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=97=A5=E5=BF=97=E4=B8=AD=E5=BF=83):?=
 =?UTF-8?q?=20=E6=9C=89=E5=85=B3admin=E8=B4=A6=E5=8F=B7=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=8D=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/aspect/AutoLogAspect.java |  3 +++
 .../service/impl/BaseCommonServiceImpl.java   | 22 +++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
index a961f317..a83e72e2 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
@@ -105,6 +105,9 @@ public class AutoLogAspect {
         //获取登录用户信息
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if(sysUser!=null){
+            if ("admin".equals(sysUser.getUsername())){
+                return;
+            }
             dto.setUserid(sysUser.getUsername());
             dto.setUsername(sysUser.getRealname());
 
diff --git a/laws-base/laws-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java b/laws-base/laws-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java
index 7872f9e3..445ebbe3 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/modules/base/service/impl/BaseCommonServiceImpl.java
@@ -1,26 +1,20 @@
 package com.jero.modules.base.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import com.jero.common.api.dto.LogDTO;
-import com.jero.common.constant.CacheConstant;
-import com.jero.modules.base.mapper.BaseCommonMapper;
-import com.jero.modules.base.service.BaseCommonService;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.system.vo.SysPermissionDataRuleModel;
-import com.jero.common.system.vo.SysUserCacheInfo;
 import com.jero.common.util.IPUtils;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.oConvertUtils;
-import org.springframework.cache.annotation.Cacheable;
+import com.jero.modules.base.mapper.BaseCommonMapper;
+import com.jero.modules.base.service.BaseCommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.Date;
 
 @Service
 @Slf4j
@@ -34,6 +28,9 @@ public class BaseCommonServiceImpl implements BaseCommonService {
         if(oConvertUtils.isEmpty(logDTO.getId())){
             logDTO.setId(String.valueOf(IdWorker.getId()));
         }
+        if ("admin".equals(logDTO.getUsername())){
+            return;
+        }
         //保存日志（异常捕获处理，防止数据太大存储失败，导致业务失败）JT-238
         try {
             baseCommonMapper.saveLog(logDTO);
@@ -68,6 +65,9 @@ public class BaseCommonServiceImpl implements BaseCommonService {
             }
         }
         if(user!=null){
+            if ("admin".equals(user.getUsername())){
+                return;
+            }
             sysLog.setUserid(user.getUsername());
             sysLog.setUsername(user.getRealname());
         }