修改异常返回信息结果

cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java

@@ -85,7 +85,7 @@ public enum ResultCode implements IResultCode {
 	/**
 	 * 用户账号过期
 	 */
-	USER_ACCOUNT_EXPIRED(11008, "用户账号过期"),
+	USER_ACCOUNT_EXPIRED(11008, "用户账号已过期"),
 	/**
 	 * 没有该用户
 	 */

cdp-common/cdp-common-security/src/main/java/com/baiye/component/ResourceAuthExceptionEntryPoint.java

@@ -1,5 +1,6 @@
 package com.baiye.component;
 
+import com.baiye.core.base.api.ResultCode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -34,7 +35,7 @@ public class ResourceAuthExceptionEntryPoint implements AuthenticationEntryPoint
         result.put("code", HttpStatus.UNAUTHORIZED.value());
         if (e!=null){
             result.put("msg","error");
-            result.put("data",e.getMessage());
+            result.put("data", ResultCode.USER_ACCOUNT_EXPIRED.getMsg());
         }
         response.setStatus(HttpStatus.UNAUTHORIZED.value());
         PrintWriter writer = response.getWriter();

cdp-iaas/authorization-server/src/main/java/com/baiye/auth/translator/CustomWebRespExceptionTranslator.java

@@ -49,7 +49,8 @@ public class CustomWebRespExceptionTranslator implements WebResponseExceptionTra
                 return buildResponseEntity(ApiError.error(message));
 
             }
-            if (StringUtils.containsIgnoreCase(e.getMessage(), "locked")) {
+            if (StringUtils.containsIgnoreCase(e.getMessage(), "locked")
+                    || StringUtils.containsIgnoreCase(e.getMessage(), "User is disabled")) {
                 message = "用户已被锁定，请联系管理员";
                 return buildResponseEntity(ApiError.error(message));
             }

cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/UserServiceImpl.java

@@ -35,7 +35,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -54,9 +57,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- *
- * @description 用户业务实现类
  * @author Enzo
+ * @description 用户业务实现类
  * @create: 2020-08-11 16:17
  */
 @Service
@@ -67,6 +69,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     private final UserMapper userMapper;
 
+    private final CacheManager cacheManager;
     private final FileProperties properties;
     private final UserMapStruct userMapStruct;
 
@@ -358,11 +361,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     /**
      * 修改用户账号密码
+     *
      * @param userDto
      * @param encode
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @CacheEvict(key = "'username:' + #userDto.username")
     public void updatePassword(UserDto userDto, String encode) {
         boolean update = this.update(Wrappers.<User>lambdaUpdate().set(User::getPassword, encode)
                 .set(User::getPwdResetTime, LocalDateTime.now(ZoneId.systemDefault()))
@@ -374,7 +379,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         try {
             this.remoteAuthService.delete(Collections.singleton(userDto.getId()));
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new BadRequestException(ResultCode.ERROR.getMsg());
+        }
+        Cache cache = this.cacheManager.getCache(CacheKey.USER_DETAILS);
+        if (cache != null) {
+            cache.evict(userDto.getUsername());
         }
     }