From 97ebcd84152687636d0a2329664d6bfd8f010b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 3 Mar 2023 09:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91AutoLogAspect?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/aspect/AutoLogAspect.java | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
index 77c6b8dc..613508a7 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/AutoLogAspect.java
@@ -1,7 +1,17 @@
 package com.jero.common.aspect;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
+import com.jero.common.api.dto.LogDTO;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.ModuleType;
+import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.IPUtils;
+import com.jero.common.util.SpringContextUtils;
+import com.jero.common.util.oConvertUtils;
+import com.jero.modules.base.service.BaseCommonService;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -9,20 +19,11 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import com.jero.common.api.dto.LogDTO;
-import com.jero.common.api.vo.Result;
-import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.constant.CommonConstant;
-import com.jero.common.constant.enums.ModuleType;
-import com.jero.modules.base.service.BaseCommonService;
-import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.IPUtils;
-import com.jero.common.util.SpringContextUtils;
-import com.jero.common.util.oConvertUtils;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.annotation.Resource;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -46,7 +47,7 @@ public class AutoLogAspect {
 
     @Pointcut("@annotation(com.jero.common.aspect.annotation.AutoLog)")
     public void logPointCut() {
-
+        // do other
     }
 
     @Around("logPointCut()")
@@ -88,6 +89,7 @@ public class AutoLogAspect {
 
         //设置操作类型
         if (dto.getLogType() == CommonConstant.LOG_TYPE_2) {
+            assert syslog != null;
             dto.setOperateType(getOperateType(methodName, syslog.operateType()));
         }
 
@@ -174,7 +176,7 @@ public class AutoLogAspect {
                     return true;
                 }
             };
-            params = JSONObject.toJSONString(arguments, profilter);
+            params = JSON.toJSONString(arguments, profilter);
             //update-end-author:taoyan date:20200724 for:日志数据太长的直接过滤掉
         } else {
             MethodSignature signature = (MethodSignature) joinPoint.getSignature();