From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/aop/OperLogAspect.java |   72 +++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/aop/OperLogAspect.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/aop/OperLogAspect.java
index 30986ce..d7aed55 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/aop/OperLogAspect.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/aop/OperLogAspect.java
@@ -1,15 +1,16 @@
 package com.panzhihua.serviceapi.aop;
 
-import com.alibaba.fastjson.JSONObject;
-import com.panzhihua.common.constants.Constants;
-import com.panzhihua.common.constants.TokenConstant;
-import com.panzhihua.common.interfaces.OperLog;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.user.SysOperLogVO;
-import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.common.utlis.AES;
-import com.panzhihua.common.utlis.IPUtil;
-import lombok.extern.slf4j.Slf4j;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -20,15 +21,17 @@
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.constants.TokenConstant;
+import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.user.SysOperLogVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.AES;
+import com.panzhihua.common.utlis.IPUtil;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 切面处理类,操作日志异常日志记录处理
@@ -48,15 +51,15 @@
      * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
      */
     @Pointcut("@annotation(com.panzhihua.common.interfaces.OperLog)")
-    public void operLogPoinCut() {
-    }
-
+    public void operLogPoinCut() {}
 
     /**
      * 正常返回通知,拦截用户操作日志,连接点正常执行完成后执行, 如果连接点抛出异常,则不会执行
      *
-     * @param joinPoint 切入点
-     * @param keys      返回结果
+     * @param joinPoint
+     *            切入点
+     * @param keys
+     *            返回结果
      */
     @AfterReturning(value = "operLogPoinCut()", returning = "keys")
     public void saveOperLog(JoinPoint joinPoint, Object keys) {
@@ -64,9 +67,9 @@
         // 获取RequestAttributes
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
         // 从获取RequestAttributes中获取HttpServletRequest的信息
-        HttpServletRequest request = (HttpServletRequest) requestAttributes
-                .resolveReference(RequestAttributes.REFERENCE_REQUEST);
-//        登录对象信息
+        HttpServletRequest request =
+            (HttpServletRequest)requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST);
+        // 登录对象信息
         String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
         boolean empty = ObjectUtils.isEmpty(userInfo);
         if (empty) {
@@ -82,7 +85,7 @@
         try {
 
             // 从切面织入点处通过反射机制获取织入点处的方法
-            MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+            MethodSignature signature = (MethodSignature)joinPoint.getSignature();
             // 获取切入点所在的方法
             Method method = signature.getMethod();
             // 获取操作
@@ -136,11 +139,11 @@
         }
     }
 
-
     /**
      * 转换request 请求参数
      *
-     * @param paramMap request获取的参数数组
+     * @param paramMap
+     *            request获取的参数数组
      */
     public Map<String, String> converMap(Map<String, String[]> paramMap) {
         Map<String, String> rtnMap = new HashMap<>(6);
@@ -168,9 +171,12 @@
     /**
      * 转换异常信息为字符串
      *
-     * @param exceptionName    异常名称
-     * @param exceptionMessage 异常信息
-     * @param elements         堆栈信息
+     * @param exceptionName
+     *            异常名称
+     * @param exceptionMessage
+     *            异常信息
+     * @param elements
+     *            堆栈信息
      */
     public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) {
         StringBuffer strbuff = new StringBuffer();

--
Gitblit v1.7.1