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

张天森

2022-10-08 650aba5e2c0341b547fb811e64209920fcd4e4f3

 flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java

@@ -15,10 +15,6 @@
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;

/**
 * 自定义拦截器，判断此次请求是否有权限
@@ -52,25 +48,11 @@

        if(StringUtils.isEmpty(token))
        {
//            if(StringUtils.isEmpty(HCtoken))
//            {
//                String reponse = "{\"result\": 448, \"message\": \"token not is null \"}";
//                response.setStatus(200);
//                response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
//                ResponseFacade facade = (ResponseFacade) response;
//                facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
//                facade.getWriter().write(reponse);
//                return false;
//            }
//            else
//            {
//
//            }

            //花城e+   token
            if (manager.checkHCToken(HCtoken)) {
                //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
                request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
                System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
//            SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
                return true;
            }
@@ -86,18 +68,20 @@
            }
        }


        //如果验证token失败，并且方法或类注明了Authorization，返回401错误
        if (method.getAnnotation(Authorization.class) != null ||
                bean.getClass().getAnnotation(Authorization.class) != null)
        if(!StringUtils.isEmpty(token))
        {
            String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
            response.setStatus(200);
            response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
            ResponseFacade facade = (ResponseFacade) response;
            facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
            facade.getWriter().write(reponse);
            return false;
            //如果验证token失败，并且方法或类注明了Authorization，返回401错误
            if (method.getAnnotation(Authorization.class) != null ||
                    bean.getClass().getAnnotation(Authorization.class) != null)
            {
                String reponse = "{\"result\": 449, \"message\": \"Overdue token\"}";
                response.setStatus(200);
                response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
                ResponseFacade facade = (ResponseFacade) response;
                facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
                facade.getWriter().write(reponse);
                return false;
            }
        }
        return true;
    }