|  | @@ -7,7 +7,6 @@ import java.util.Objects;
 | 
											
												
													
														|  |  import java.util.concurrent.TimeUnit;
 |  |  import java.util.concurrent.TimeUnit;
 | 
											
												
													
														|  |  import javax.servlet.http.HttpServletRequest;
 |  |  import javax.servlet.http.HttpServletRequest;
 | 
											
												
													
														|  |  import javax.servlet.http.HttpServletResponse;
 |  |  import javax.servlet.http.HttpServletResponse;
 | 
											
												
													
														|  | -import javax.xml.crypto.Data;
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import com.alibaba.fastjson.JSON;
 |  |  import com.alibaba.fastjson.JSON;
 | 
											
												
													
														|  |  import com.usky.common.core.util.IpUtils;
 |  |  import com.usky.common.core.util.IpUtils;
 | 
											
										
											
												
													
														|  | @@ -42,11 +41,13 @@ public class LogAspect {
 | 
											
												
													
														|  |      @Autowired
 |  |      @Autowired
 | 
											
												
													
														|  |      private AsyncLogService asyncLogService;
 |  |      private AsyncLogService asyncLogService;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    @Pointcut("@annotation(controllerLog)")
 |  | 
 | 
											
												
													
														|  | -    public void logPointcut(Log controllerLog) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    // 定义切入点,使用@annotation指示器
 | 
											
												
													
														|  | 
 |  | +    @Pointcut("@annotation(com.usky.common.log.annotation.Log)")
 | 
											
												
													
														|  | 
 |  | +    public void logPointcut() {
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    @Around("logPointcut(controllerLog)")
 |  | 
 | 
											
												
													
														|  | 
 |  | +    // 环绕通知,引用切入点并传递注解实例
 | 
											
												
													
														|  | 
 |  | +    @Around("logPointcut() && @annotation(controllerLog)")
 | 
											
												
													
														|  |      public Object aroundLog(ProceedingJoinPoint joinPoint, Log controllerLog) throws Throwable {
 |  |      public Object aroundLog(ProceedingJoinPoint joinPoint, Log controllerLog) throws Throwable {
 | 
											
												
													
														|  |          Date startTime = new Date();
 |  |          Date startTime = new Date();
 | 
											
												
													
														|  |          Object result = null;
 |  |          Object result = null;
 |