Merge branch 'developer' into 'master'

有些免登录需要用到session数据

See merge request !6

gic-enterprise-common/src/main/java/com/gic/enterprise/interceptor/AuthInterceptor.java

@@ -73,18 +73,20 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
         }
         //判断是否有权限的路径
         UserDetail userDetail = UserContext.getContext().getByRedis();
-        if (userDetail == null || userDetail.getUserInfo() == null) {
-            throw new CommonException(ErrorCode.LOGIN_INVALID.getErrorCode(), "登录信息不存在，请登录");
-        }
-        request.setAttribute("user", userDetail);
-
 
         HandlerMethod handler = (HandlerMethod) object;
         //免登录接口路由
         IgnoreLogin ignoreLogin = handler.getMethodAnnotation(IgnoreLogin.class);
         if (null != ignoreLogin) {
+            //有些免登录需要用到session数据
+            request.setAttribute("user", userDetail);
             return true;
         }
+        if (userDetail == null || userDetail.getUserInfo() == null) {
+            throw new CommonException(ErrorCode.LOGIN_INVALID.getErrorCode(), "登录信息不存在，请登录");
+        }
+        request.setAttribute("user", userDetail);
+
 
         //不需要拦截的路径
         if (ignoreUriAfterLoginMap.containsKey(uri)) {