diff --git a/src/main/java/com/objecteye/config/AuthenticationHeadFilter.java b/src/main/java/com/objecteye/config/AuthenticationHeadFilter.java index 984f2af..b175780 100644 --- a/src/main/java/com/objecteye/config/AuthenticationHeadFilter.java +++ b/src/main/java/com/objecteye/config/AuthenticationHeadFilter.java @@ -58,13 +58,13 @@ public class AuthenticationHeadFilter extends OncePerRequestFilter { // 是否超时(默认1小时) if (System.currentTimeMillis() > createTime + 1000 * 60 * 60) { httpServletResponse.setContentType("application/json;charset=UTF-8"); - httpServletResponse.getWriter().write("Token已过期请重新登录"); + httpServletResponse.getWriter().write("登录已过期请重新登录"); return; } } catch (Exception e) { e.printStackTrace(); httpServletResponse.setContentType("application/json;charset=UTF-8"); - httpServletResponse.getWriter().write("Useless token..."); + httpServletResponse.getWriter().write("登录信息异常"); return; } AuthenticationToken authenticationToken = new AuthenticationToken(user, "", user.getAuthorities()); diff --git a/src/main/java/com/objecteye/config/AuthenticationProviderConfig.java b/src/main/java/com/objecteye/config/AuthenticationProviderConfig.java index 2bafec4..20d4e52 100644 --- a/src/main/java/com/objecteye/config/AuthenticationProviderConfig.java +++ b/src/main/java/com/objecteye/config/AuthenticationProviderConfig.java @@ -27,15 +27,15 @@ public class AuthenticationProviderConfig implements AuthenticationProvider { */ private void defaultCheck(UserDetails user) { if (!user.isAccountNonLocked()) { - throw new LockedException("User account is locked"); + throw new LockedException("用户已被锁定"); } if (!user.isEnabled()) { - throw new DisabledException("User is disabled"); + throw new DisabledException("当前用户不可用"); } if (!user.isAccountNonExpired()) { - throw new AccountExpiredException("User account has expired"); + throw new AccountExpiredException("账号已被注销"); } } @@ -45,11 +45,11 @@ public class AuthenticationProviderConfig implements AuthenticationProvider { private void additionalAuthenticationChecks(UserDetails userDetails, AuthenticationToken authenticationToken) throws AuthenticationException { if (authenticationToken.getCredentials() == null) { - throw new BadCredentialsException("username or password is wrong!"); + throw new BadCredentialsException("登录信息错误"); } String presentedPassword = authenticationToken.getCredentials().toString(); if (!passwordEncoder.matches(presentedPassword, userDetails.getPassword())) { - throw new BadCredentialsException("username or password is wrong!"); + throw new BadCredentialsException("登录信息错误"); } } diff --git a/src/main/java/com/objecteye/handle/GlobalExceptionHandler.java b/src/main/java/com/objecteye/handle/GlobalExceptionHandler.java index 4807015..ab1565b 100644 --- a/src/main/java/com/objecteye/handle/GlobalExceptionHandler.java +++ b/src/main/java/com/objecteye/handle/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package com.objecteye.handle; import com.objecteye.common.CommonResult; +import com.objecteye.exception.CustomXException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -10,6 +11,9 @@ import javax.servlet.http.HttpServletRequest; public class GlobalExceptionHandler { @ExceptionHandler(value = Exception.class) public CommonResult globalExceptionHandler(HttpServletRequest httpServletRequest, Exception e) { + if (e instanceof CustomXException) { + return CommonResult.success(Integer.parseInt(((CustomXException) e).getCode()), ((CustomXException) e).getMsg(), null); + } return CommonResult.success(504, e.getMessage(), ""); } } diff --git a/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java b/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java index f2decb0..08ddf93 100644 --- a/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java +++ b/src/main/java/com/objecteye/utils/RabbitMQVehicleTools.java @@ -429,14 +429,13 @@ public class RabbitMQVehicleTools { // vehicle_plate_status; double vehicle_plate_numScore1 = rabbitMQVehicle.getVehicle_plate_numScore(); String vehiclePlateStatus = null; - if (vehicle_plate_numScore1 == 0) { + PlatePlateNumParams[] vehicle_plate_plateNumParams = rabbitMQVehicle.getVehicle_plate_plateNumParams(); + if (vehicle_plate_numScore1 == 0 || vehicle_plate_plateNumParams == null) { //无号牌 vehiclePlateStatus = "无号牌"; } else { - PlatePlateNumParams[] vehicle_plate_plateNumParams = rabbitMQVehicle.getVehicle_plate_plateNumParams(); String chara = null; - for (int i = 0; i < 7; i++) { - PlatePlateNumParams ppnp = vehicle_plate_plateNumParams[i]; + for (PlatePlateNumParams ppnp : vehicle_plate_plateNumParams) { double maxprob = ppnp.getMaxprob(); if (maxprob == 0) { chara = "污损号牌";