Merge branch 'feature' into 'dev'

权限部分调整7

See merge request !286

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

@@ -98,10 +98,6 @@ 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();

src/main/java/com/zhiwei/brandkbs2/auth/AuthAspect.java

@@ -70,7 +70,7 @@ public class AuthAspect {
         }
         String token = request.getHeader(jwtKey);
         // 存在有效token
-        if (null != token && !Tools.tokenEmpty(token)) {
+        if (null != token && !Tools.isNullOrUndefined(token)) {
             Object proceed;
             try {
                 Map<String, Object> tokenInfo = JwtUtil.unsign(token, Map.class);

src/main/java/com/zhiwei/brandkbs2/interceptor/MainAuthInterceptor.java

@@ -53,7 +53,7 @@ public class MainAuthInterceptor implements HandlerInterceptor {
         String token = request.getHeader("Token");
         try {
             // 不存在token 重新获取token
-            if (Tools.tokenEmpty(token)) {
+            if (Tools.isNullOrUndefined(token)) {
                 Tools.responseMessage(response, HttpServletResponse.SC_UNAUTHORIZED, new ResponseResult(CommonCodeEnum.UNAUTHENTICATED, null));
                 return false;
             }

src/main/java/com/zhiwei/brandkbs2/util/Tools.java

@@ -649,10 +649,6 @@ public class Tools {
         }
     }
 
-    public static boolean tokenEmpty(String token) {
-        return null == token || Objects.equals("undefined", token) || Objects.equals("null", token);
-    }
-
     /**
      * 获得区段时间的最大最小值
      *
@@ -1027,6 +1023,6 @@ public class Tools {
      * @return
      */
     public static boolean isNullOrUndefined(Object o) {
-        return (isEmpty(o) || Objects.equals("undefined", o));
+        return (isEmpty(o) || Objects.equals("undefined", o) || Objects.equals("null", o));
     }
 }
\ No newline at end of file