Merge branch 'release' into 'master'

Release

See merge request !318

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

@@ -62,6 +62,7 @@ public class AopLogRecord {
 
     @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){
+        String pid = null;
         try {
             long now = System.currentTimeMillis();
             // RequestContextHolder 顾名思义 持有 request 上下文的容器
@@ -85,8 +86,12 @@ public class AopLogRecord {
                 String method = methodSignature.getMethod().getAnnotation(ApiOperation.class).value();
                 // 前后台，false：前台，true：后台
                 boolean backstage = uri.contains("admin");
-                if (!(Tools.isNullOrUndefined(request.getHeader(jwtKey)) || Tools.isNullOrUndefined(request.getHeader("pid")))) {
+                String token = request.getHeader(jwtKey);
+                pid = request.getHeader("pid");
+                // 任意有一个不为空
+                if (!(Tools.isNullOrUndefined(token) || Tools.isNullOrUndefined(pid))) {
                     Map<String, Object> map = JwtUtil.unsign(request.getHeader(jwtKey), Map.class);
+                    // 排除token过期或其他组合的可能性
                     if (null == map) {
                         return;
                     }
@@ -116,7 +121,7 @@ public class AopLogRecord {
                 }
             }
         } catch (Exception e) {
-            log.error("beforeLog", e);
+            log.error("beforeLog,pid:{}",pid, e);
         }
     }