111

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java

@@ -32,9 +32,6 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
 
     private static Logger logger= LoggerFactory.getLogger(WebInterceptor.class);
 
-    @Autowired
-    private ClerkRightManageService clerkRightManageService;
-
 
     private void errorResult(HttpServletResponse httpServletResponse, HaoBanErrCode errCode) {
         HaobanResponse response = new HaobanResponse();
@@ -56,48 +53,28 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
         logger.info("post-url:{}", requestURI);
         Map<String, String[]> parameterMap = httpServletRequest.getParameterMap();
         logger.info("post-params:{}", JSONObject.toJSONString(parameterMap));
-        UserRightDetailDTO loginUser = (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
-
-        if (loginUser == null) {
-            this.errorResult(httpServletResponse, HaoBanErrCode.ERR_4);
-            logger.info("用户不存在!");
-            return false;
-        }
-        HandlerMethod method = null;
-        if (o instanceof HandlerMethod) {
-            method = (HandlerMethod) (o);
-        }
-        if (method == null) {
-            return true;
-        }
-        MenuCheck methodAnnotation = method.getMethodAnnotation(MenuCheck.class);
-        if (StringUtils.isNotBlank(loginUser.getEnterpriseId())) {
-            httpServletRequest.setAttribute("enterpriseId", loginUser.getEnterpriseId());
-        }
-        if (StringUtils.isNotBlank(loginUser.getUserId())) {
-            httpServletRequest.setAttribute("clerkId", loginUser.getUserId());
-        }
-        if (null != methodAnnotation) {
-            String value = methodAnnotation.value();
-            RoleCodeEnum[] roleCodes = methodAnnotation.roleCodes();
-            boolean b = true;
-            //权限判断
-            if (StringUtils.isNotBlank(value)) {
-                b = loginUser.checkRight(value);
-            }
-            //角色判读
-            if (b) {
-                if (roleCodes.length > 0) {
-                    b = Arrays.stream(roleCodes).anyMatch(codeEnum -> loginUser.checkRole(codeEnum.getCode()));
-                }
-            }
-            if (!b) {
-                logger.info("缺少权限");
-                errorResult(httpServletResponse, HaoBanErrCode.ERR_7);
-            }
-            return b;
-        }
+        
+        //TODO 登陆信息拦截
         return true;
+        
+        
+        
+        
+//        UserRightDetailDTO loginUser = (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
+//
+//        if (loginUser == null) {
+//            this.errorResult(httpServletResponse, HaoBanErrCode.ERR_4);
+//            logger.info("用户不存在!");
+//            return false;
+//        }
+//        HandlerMethod method = null;
+//        if (o instanceof HandlerMethod) {
+//            method = (HandlerMethod) (o);
+//        }
+//        if (method == null) {
+//            return true;
+//        }
+//        return true;
     }
 
     @Override