Merge branch 'feature' into 'dev'

权限部分调整6

See merge request !285

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

@@ -16,6 +16,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -31,7 +33,6 @@ import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.*;
 
 import static java.util.Objects.nonNull;
@@ -45,6 +46,8 @@ import static java.util.Objects.nonNull;
 @Aspect
 @Component
 public class AopLogRecord {
+    public static final Logger log = LogManager.getLogger(AopLogRecord.class);
+
     @Value("${jwt.key}")
     private String jwtKey;
     @Resource(name = "userServiceImpl")
@@ -58,7 +61,8 @@ public class AopLogRecord {
     private static final List<String> URL_PATTERNS = Arrays.asList("/getNewAll", "/getNew", "/schedule");
 
     @AfterReturning(value = "execution(public * com..controller..admin..*Controller.*(..)) || execution(* com..controller..app..*Controller.*(..)) || execution(* com..controller..LoginController.checkBind())", returning = "ResponseResult")
-    private void beforeLog(JoinPoint joinPoint, ResponseResult ResponseResult) throws UnknownHostException, ClassNotFoundException{
+    private void beforeLog(JoinPoint joinPoint, ResponseResult ResponseResult){
+        try {
             long now = System.currentTimeMillis();
             // RequestContextHolder 顾名思义 持有 request 上下文的容器
             ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
@@ -94,6 +98,10 @@ public class AopLogRecord {
                     String userId = userIdObj.toString();
                     String projectId = request.getHeader("pid");
                     UserInfo userInfo = userService.queryUserInfo(userId, projectId);
+                    if (null == userInfo) {
+                        log.info("userInfo为null,map:{},userId:{},projectId:{}", JSONObject.toJSONString(map), request.getHeader(jwtKey), request.getHeader("pid"));
+                        return;
+                    }
                     String nickName = userInfo.getNickname();
                     // 请求地址和服务器地址
                     String severAddress = InetAddress.getLocalHost().getHostAddress();
@@ -110,6 +118,9 @@ public class AopLogRecord {
                     behaviorDao.insertOneWithoutId(behavior, collectionName);
                 }
             }
+        } catch (Exception e) {
+            log.error("beforeLog", e);
+        }
     }
 
     private UserLogRecord userLogRecord(String projectId, UserInfo userInfo, JoinPoint joinPoint, MethodSignature methodSignature, ResponseResult responseResult) {