Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java

@@ -15,10 +15,10 @@

    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        /*if (!(handler instanceof HandlerMethod)) {
        if (!(handler instanceof HandlerMethod)) {
            return true;
        }
        String token = form.getHeader("token");
        String token = request.getHeader("token");
        if (token == null) {
            return false;
        }
@@ -29,7 +29,7 @@
            TokenUtils.extendTokenTime(token);
        } catch (Exception e) {
            return false;
        }*/
        }
        return true;
    }
}