Merge branch 'release' into 'master'

Release

See merge request !288

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();
@@ -110,6 +114,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) {

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