From 3a3b76afc1c4622f26729d8b891a6f32287b5b4f Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Sat, 7 May 2022 11:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkrs/common/account/JwtLoginFilter.java | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/xkrs/common/account/JwtLoginFilter.java b/src/main/java/com/xkrs/common/account/JwtLoginFilter.java index ce04288..b39fb89 100644 --- a/src/main/java/com/xkrs/common/account/JwtLoginFilter.java +++ b/src/main/java/com/xkrs/common/account/JwtLoginFilter.java @@ -2,7 +2,7 @@ package com.xkrs.common.account; import com.xkrs.common.encapsulation.OutputEncapsulation; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.model.entity.SysUserEntity; +import com.xkrs.dao.StreetDao; import com.xkrs.model.vo.SysUserVo; import com.xkrs.service.SysUserService; import com.xkrs.utils.IpUtil; @@ -35,16 +35,19 @@ import java.util.Map; /** * jwt登录过滤器 + * * @author tajochen */ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter { private static final Logger logger = LoggerFactory.getLogger(JwtLoginFilter.class); - @Resource private SysUserService sysUserService; + @Resource + private StreetDao streetDao; + public JwtLoginFilter(String url, AuthenticationManager authManager) { super(new AntPathRequestMatcher(url)); setAuthenticationManager(authManager); @@ -52,6 +55,7 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter { /** * 登录时验证 + * * @param req * @param res * @return @@ -59,7 +63,7 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter { @Override public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse res) throws UnsupportedEncodingException { req.setCharacterEncoding("UTF-8"); - res.setHeader("Access-Control-Allow-Origin","*"); + res.setHeader("Access-Control-Allow-Origin", "*"); res.setHeader("Access-Control-Allow-Credentials", "false"); AccountCredentials creds = new AccountCredentials(); //获取表单数据 @@ -67,26 +71,22 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter { String password = req.getParameter("password"); String rememberMe = req.getParameter("remember"); //如果用户名密码为空 - if(userName == null||password == null|| userName.trim().isEmpty()||password.trim().isEmpty()){ + if (userName == null || password == null || userName.trim().isEmpty() || password.trim().isEmpty()) { throw new BadCredentialsException("user or password is null"); } - if(rememberMe == null||rememberMe.isEmpty()){ + if (rememberMe == null || rememberMe.isEmpty()) { rememberMe = "false"; } creds.setUserName(userName.trim()); creds.setPassword(password.trim()); creds.setRemember(Boolean.parseBoolean(rememberMe)); // 返回一个验证令牌 - return getAuthenticationManager().authenticate( - new UsernamePasswordAuthenticationToken( - creds.getUserName(), - creds.getPassword() - ) - ); + return getAuthenticationManager().authenticate(new UsernamePasswordAuthenticationToken(creds.getUserName(), creds.getPassword())); } /** * 验证成功后调用 + * * @param req * @param response * @param chain @@ -95,9 +95,8 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter { * @throws ServletException */ @Override - protected void successfulAuthentication( - HttpServletRequest req, HttpServletResponse response, FilterChain chain, Authentication auth) { - if(sysUserService==null){ + protected void successfulAuthentication(HttpServletRequest req, HttpServletResponse response, FilterChain chain, Authentication auth) { + if (sysUserService == null) { ServletContext servletContext = req.getServletContext(); WebApplicationContext webApplicationContext = WebApplicationContextUtils.getWebApplicationContext(servletContext); sysUserService = webApplicationContext.getBean(SysUserService.class); @@ -110,33 +109,36 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter { response.setContentType("application/json"); response.setCharacterEncoding("UTF-8"); Map map = new HashMap(3); - if(userByUserName.getCountyCode().substring(2).equals("0000")){ + if (9 == userByUserName.getCountyCode().length()) { + List> streetByCountyCode = streetDao.selectStreetList(userByUserName.getCountyCode()); + map.put("county", streetByCountyCode); + TokenAuthenticationService.addAuthentication(response, auth.getName(), auth.getAuthorities(), userByUserName, map); + } else if (userByUserName.getCountyCode().substring(2).equals("0000")) { List> cityByProCode = sysUserService.findCityByProCode(userByUserName.getCountyCode()); - map.put("city",cityByProCode); + map.put("city", cityByProCode); List> countyByProCode = sysUserService.findCountyByProCode(userByUserName.getCountyCode()); - map.put("county",countyByProCode); - TokenAuthenticationService.addAuthentication(response, auth.getName(),auth.getAuthorities(),userByUserName,map); - }else if(userByUserName.getCountyCode().substring(4).equals("00") && !userByUserName.getCountyCode().substring(2).equals("0000")) { + map.put("county", countyByProCode); + TokenAuthenticationService.addAuthentication(response, auth.getName(), auth.getAuthorities(), userByUserName, map); + } else if (userByUserName.getCountyCode().substring(4).equals("00") && !userByUserName.getCountyCode().substring(2).equals("0000")) { List> countyByCityCode = sysUserService.findCountyByCityCode(userByUserName.getCountyCode()); - map.put("county",countyByCityCode); - TokenAuthenticationService.addAuthentication(response, auth.getName(),auth.getAuthorities(),userByUserName,map); - }else { - map.put("county",null); - TokenAuthenticationService.addAuthentication(response, auth.getName(),auth.getAuthorities(),userByUserName,map); + map.put("county", countyByCityCode); + TokenAuthenticationService.addAuthentication(response, auth.getName(), auth.getAuthorities(), userByUserName, map); + } else { + map.put("county", null); + TokenAuthenticationService.addAuthentication(response, auth.getName(), auth.getAuthorities(), userByUserName, map); } } /** * 验证失败后调用 + * * @param request * @param response * @param failed * @throws IOException */ @Override - protected void unsuccessfulAuthentication(HttpServletRequest request, - HttpServletResponse response, - AuthenticationException failed) throws IOException { + protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) throws IOException { Locale locale = LocaleContextHolder.getLocale(); response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Credentials", "false");