xservice/xservice-auth-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:鉴权校验

Browse Source
This commit is contained in:
Xiang
2026-03-20 11:21:59 +08:00
parent 77769558ac
commit 22f0b546ad
14 changed files with 81 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xs-service/src/main/java/com/xiang/xservice/auth/service/convert/XUserConvert.java
View File

@@ -1,6 +1,6 @@
package com.xiang.xservice.auth.service.convert;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
@@ -17,7 +17,7 @@ public interface XUserConvert {
XUser toDO (UserAddRequest request);
XUser toDO (UserUpdateRequest request);
PageInfo<UserResp> toPage(PageInfo<XUser> list);
UserResp toResp(XUser user);
Page<UserResp> toPage(Page<XUser> page);
}

6
xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java
View File

@@ -1,5 +1,7 @@
package com.xiang.xservice.auth.service.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xiang.xservice.auth.service.entity.XUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -10,7 +12,7 @@ import java.util.List;
@Repository
@Mapper
public interface XUserMapper {
public interface XUserMapper extends BaseMapper<XUser> {
/**
* 根据用户名查询用户
@@ -38,7 +40,7 @@ public interface XUserMapper {
* @param user
* @return
*/
List<XUser> getUserList(XUser user);
Page<XUser> getUserList(XUser user);
/**
* 查询用户详情

4
xs-service/src/main/java/com/xiang/xservice/auth/service/service/XUserService.java
View File

@@ -1,6 +1,6 @@
package com.xiang.xservice.auth.service.service;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xiang.xservice.auth.api.dto.req.LoginRequest;
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
@@ -23,7 +23,7 @@ public interface XUserService {
RegisterResp userRegister(RegisterRequest request);
PageInfo<UserResp> getUserList(UserQueryRequest request);
Page<UserResp> getUserList(UserQueryRequest request);
UserResp getUserInfo(Long id);

19
xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java
View File

@@ -1,8 +1,10 @@
package com.xiang.xservice.auth.service.service.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.xiang.xmc.service.cache.service.IRedisService;
import com.xiang.xservice.auth.api.code.Code01UserErrorCode;
import com.xiang.xservice.auth.api.code.Code02RoleErrorCode;
import com.xiang.xservice.auth.api.code.Code03DeptErrorCode;
@@ -41,7 +43,6 @@ import com.xiang.xservice.auth.service.service.XUserService;
import com.xiang.xservice.basic.enums.DelStatusEnum;
import com.xiang.xservice.basic.exception.BusinessException;
import com.xiang.xservice.basic.utils.PrimaryKeyUtils;
import com.xiang.xservice.cache.service.IRedisService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -220,14 +221,10 @@ public class XUserServiceImpl implements XUserService {
}
@Override
public PageInfo<UserResp> getUserList(UserQueryRequest request) {
PageHelper.startPage(request.getCurrent(), request.getPageSize());
List<XUser> userList = userMapper.getUserList(userConvert.toDO(request));
if (CollectionUtils.isEmpty(userList)) {
return new PageInfo<>();
}
PageInfo<XUser> pageInfo = new PageInfo<>(userList);
return userConvert.toPage(pageInfo);
public Page<UserResp> getUserList(UserQueryRequest request) {
Page<XUser> page = new Page<>(request.getCurrent(), request.getPageSize());
LambdaQueryWrapper<XUser> lambdaQueryWrapper = Wrappers.lambdaQuery();
return userConvert.toPage(userMapper.selectPage(page, lambdaQueryWrapper));
}
@Override

2
xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/captcha/NormalCaptchaImage.java
View File

@@ -1,12 +1,12 @@
package com.xiang.xservice.auth.service.service.impl.captcha;
import com.xiang.xmc.service.cache.service.IRedisService;
import com.xiang.xservice.auth.api.dto.req.CaptchaImageRequest;
import com.xiang.xservice.auth.api.dto.resp.CaptchaDTO;
import com.xiang.xservice.auth.service.constants.RedisConstant;
import com.xiang.xservice.auth.service.enums.CaptchaTypeEnum;
import com.xiang.xservice.auth.service.service.ICaptchaService;
import com.xiang.xservice.basic.utils.RandomCodeUtils;
import com.xiang.xservice.cache.service.IRedisService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

2
xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/captcha/NumberCaptchaCode.java
View File

@@ -1,12 +1,12 @@
package com.xiang.xservice.auth.service.service.impl.captcha;
import com.xiang.xmc.service.cache.service.IRedisService;
import com.xiang.xservice.auth.api.dto.req.CaptchaImageRequest;
import com.xiang.xservice.auth.api.dto.resp.CaptchaDTO;
import com.xiang.xservice.auth.service.constants.RedisConstant;
import com.xiang.xservice.auth.service.enums.CaptchaTypeEnum;
import com.xiang.xservice.auth.service.service.ICaptchaService;
import com.xiang.xservice.basic.utils.RandomCodeUtils;
import com.xiang.xservice.cache.service.IRedisService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;