소스 검색

解决登录-用户名错误、账号异常提示无法返回问题

songxinlu 3 년 전
부모
커밋
348435a913

+ 1 - 1
bus-interceptor/src/main/resources/application.properties

@@ -1 +1 @@
-url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**
+url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**,/error

+ 4 - 6
security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -161,18 +161,16 @@ public class UserManagementFacade {
         }
     }
 
-    public UserDto loadUserByUsername(String username) {
+    public CommonResult<UserDto> loadUserByUsername(String username) {
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("username", username);
         userQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<User> userList = userFacade.list(userQueryWrapper);
         if (userList.size() == 0) {
-            CommonResult.failed("用户不存在!");
-//            Asserts.fail("用户不存在!");
+            return CommonResult.failed("用户不存在!");
         }
         if (userList.size() > 1) {
-            CommonResult.failed("当前账号异常!");
-//            Asserts.fail("当前账号异常!");
+            return CommonResult.failed("当前账号异常!");
         }
 
         UserDto userDTO = new UserDto();
@@ -194,7 +192,7 @@ public class UserManagementFacade {
         BeanUtils.copyProperties(user, userDTO);
         userDTO.setUserName(user.getUsername());
         userDTO.setRoles(roleIdNames);
-        return userDTO;
+        return CommonResult.success(userDTO);
     }
 
     /**

+ 1 - 1
security-center/src/main/java/com/lantone/security/web/UserManagementController.java

@@ -55,7 +55,7 @@ public class UserManagementController {
     @ApiOperation("根据用户名获取通用用户信息")
     @PostMapping(value = "/loadByUsername")
     public CommonResult<UserDto> loadUserByUsername(@RequestParam String username) {
-        return CommonResult.success(userManagementFacade.loadUserByUsername(username));
+        return userManagementFacade.loadUserByUsername(username);
     }
 
     @ApiOperation(value = "添加用户 [by:songxl]")

+ 5 - 0
user-auth/src/main/java/com/lantone/userauth/service/impl/UserServiceImpl.java

@@ -1,8 +1,10 @@
 package com.lantone.userauth.service.impl;
 
 import com.lantone.common.api.CommonResult;
+import com.lantone.common.api.ResultCode;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.domain.UserDto;
+import com.lantone.common.exception.Asserts;
 import com.lantone.userauth.constant.MessageConstant;
 import com.lantone.userauth.domain.SecurityUser;
 import com.lantone.userauth.service.UserManagemenService;
@@ -37,6 +39,9 @@ public class UserServiceImpl implements UserDetailsService {
         UserDto userDto = null;
         if (AuthConstant.SECURITY_CENTER_CLIENT_ID.equals(clientId)) {
             CommonResult<UserDto> result = userManagemenService.loadUserByUsername(username);
+            if(ResultCode.SUCCESS.getCode()!=result.getCode()){
+                Asserts.fail(result.getMessage());
+            }
             userDto = result.getData();
         }
         if (userDto == null) {