代码调整

pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java

@@ -31,6 +31,15 @@ public interface UserFeignClient {
     @GetMapping("/getUserByName/{loginName}")
     HttpResult<UserDTO> getUserByName(@PathVariable("loginName") String loginName);
 
+    /**
+     * 根据手机号查询用户信息
+     *
+     * @param phone 登录名
+     * @return 用户基本信息
+     */
+    @GetMapping("/getUserByPhone/{phone}")
+    HttpResult<UserDTO> getUserByPhone(@PathVariable("phone")String phone);
+
     /**
      * 认证后根据用户名判断用户状态
      * @param loginName 登录名
@@ -55,4 +64,6 @@ public interface UserFeignClient {
      */
     @PostMapping("/userByIdList")
     HttpResult<List<User>> getUserByIdList(@RequestBody List<String> ids);
+
+
 }

pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/UserFeignClientFallbackFactory.java

@@ -43,6 +43,12 @@ public class UserFeignClientFallbackFactory implements FallbackFactory<UserFeign
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public HttpResult<UserDTO> getUserByPhone(String phone) {
+                log.error("{}异常，降级处理，异常为：{}","根据手机号查询用户信息",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public HttpResult<Boolean> judgeUserStatus(String loginName) {
                 log.error("{}异常，降级处理，异常为：{}","认证后根据用户名判断用户状态",cause.toString());

pqs-user/user-api/src/main/java/com/njcn/user/enums/UserResponseEnum.java

@@ -24,6 +24,7 @@ public enum UserResponseEnum {
     LOGIN_USERNAME_INVALID("A0101", "用户名非法"),
     LOGIN_USER_INDEX_INVALID("A0101", "用户索引非法"),
     LOGIN_PHONE_NOT_FOUND("A0101", "手机号不存在"),
+    LOGIN_PHONE_NOT_REGISTER("A0101", "手机号未注册"),
     KEY_WRONG("A0101","登录密码/验证码为空"),
     LOGIN_WRONG_PWD("A0101", "用户名密码错误"),
     LOGIN_WRONG_PHONE_CODE("A0101", "短信验证码错误"),

pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/AuthClient.java

@@ -58,12 +58,12 @@ public class AuthClient  {
     private String authorities;
 
     /**
-     * 认证令牌时效
+     * 认证令牌时效 单位：秒
      */
     private Integer accessTokenValidity;
 
     /**
-     * 刷新令牌时效
+     * 刷新令牌时效 单位：秒
      */
     private Integer refreshTokenValidity;
 

pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java

@@ -80,6 +80,24 @@ public class UserController extends BaseController {
         }
     }
 
+
+    @OperateInfo
+    @ApiIgnore
+    @GetMapping("/getUserByPhone/{phone}")
+    @ApiOperation("根据手机号查询用户信息")
+    @ApiImplicitParam(name = "phone", value = "手机号", required = true)
+    public HttpResult<UserDTO> getUserByPhone(@PathVariable String phone) {
+        RequestUtil.saveLoginName(phone);
+        String methodDescribe = getMethodDescribe("getUserByPhone");
+        LogUtil.njcnDebug(log, "{},手机号为：{}", methodDescribe, phone);
+        UserDTO user = userService.loadUserByPhone(phone);
+        if (Objects.isNull(user)) {
+            throw new BusinessException(UserResponseEnum.LOGIN_PHONE_NOT_REGISTER);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, user, methodDescribe);
+        }
+    }
+
     @OperateInfo
     @GetMapping("/judgeUserStatus/{loginName}")
     @ApiOperation("认证后根据用户名判断用户状态")

pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java

@@ -27,6 +27,14 @@ public interface IUserService extends IService<User> {
      */
     UserDTO getUserByName(String loginName);
 
+    /**
+     * 根据手机号查询用户信息
+     *
+     * @param phone 登录名
+     * @return 用户基本信息
+     */
+    UserDTO loadUserByPhone(String phone);
+
     /**
      * 认证结束后，判断用户状态是否能正常访问系统
      * @param loginName 登录名
@@ -160,4 +168,6 @@ public interface IUserService extends IService<User> {
     String exportUser(UserParam.UserQueryParam queryParam,String methodDescribe);
 
     boolean activateUser(String id);
+
+
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java

@@ -98,6 +98,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return new UserDTO(user.getId(), user.getLoginName(), user.getName(), user.getPassword(), roleNames, userSet.getSecretKey(), userSet.getStandBy(), user.getDeptId(), user.getType());
     }
 
+    @Override
+    public UserDTO loadUserByPhone(String phone) {
+        User user = getUserByPhone(phone,false,null);
+        if (Objects.isNull(user)) {
+            return null;
+        }
+        List<String> roleNames = roleService.getRoleNameByUserId(user.getId());
+        UserSet userSet = userSetService.lambdaQuery().eq(UserSet::getUserId, user.getId()).one();
+        return new UserDTO(user.getId(), user.getLoginName(), user.getName(), user.getPassword(), roleNames, userSet.getSecretKey(), userSet.getStandBy(), user.getDeptId(), user.getType());
+    }
+
     @Override
     public void judgeUserStatus(String loginName) {
         User user = getUserByLoginName(loginName);