Merge branch 'feature' into 'dev'

2022/09/16 17:40

See merge request !39

src/main/java/com/zhiwei/brandkbs2/aop/AopLogRecord.java

 package com.zhiwei.brandkbs2.aop;
 
-import com.zhiwei.brandkbs2.auth.UserThreadLocal;
 import com.zhiwei.brandkbs2.common.GenericAttribute;
 import com.zhiwei.brandkbs2.dao.BehaviorDao;
 import com.zhiwei.brandkbs2.pojo.Behavior;
@@ -45,7 +44,7 @@ public class AopLogRecord {
 
     private static final List<String> URL_PATTERNS = Arrays.asList("/getNewAll", "/getNew", "/schedule");
 
-    @Before("execution(public * com..controller..*Controller.*(..)) && !execution(* com..controller..BaseController.*(..))")
+    @Before("execution(public * com..controller..admin..*Controller.*(..)) || execution(* com..controller..app..*Controller.*(..))")
     private void beforeLog(JoinPoint joinPoint) throws UnknownHostException {
         long now = System.currentTimeMillis();
         // RequestContextHolder是持有上下文的Request容器