diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index ca67883e..49041d39 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -59,10 +59,10 @@ public class UserController { @Operation(summary = "用户分页列表") @GetMapping("/page") @Log(value = "用户分页列表", module = LogModuleEnum.USER) - public PageResult listPagedUsers( + public PageResult getUserPage( UserPageQuery queryParams ) { - IPage result = userService.listPagedUsers(queryParams); + IPage result = userService.getUserPage(queryParams); return PageResult.success(result); } @@ -89,9 +89,9 @@ public class UserController { @Operation(summary = "修改用户") @PutMapping(value = "/{userId}") @PreAuthorize("@ss.hasPerm('sys:user:edit')") - public Result updateUser( + public Result updateUser( @Parameter(description = "用户ID") @PathVariable Long userId, - @RequestBody @Validated UserForm userForm) { + @RequestBody @Valid UserForm userForm) { boolean result = userService.updateUser(userId, userForm); return Result.judge(result); } diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java index 2d6c3fed..ac96a464 100644 --- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -30,7 +30,7 @@ public interface UserMapper extends BaseMapper { * @return */ @DataPermission(deptAlias = "u") - Page listPagedUsers(Page page, UserPageQuery queryParams); + Page getUserPage(Page page, UserPageQuery queryParams); /** * 获取用户表单详情 diff --git a/src/main/java/com/youlai/boot/system/service/UserService.java b/src/main/java/com/youlai/boot/system/service/UserService.java index 2b0cc7ce..9c083488 100644 --- a/src/main/java/com/youlai/boot/system/service/UserService.java +++ b/src/main/java/com/youlai/boot/system/service/UserService.java @@ -29,7 +29,7 @@ public interface UserService extends IService { * * @return */ - IPage listPagedUsers(UserPageQuery queryParams); + IPage getUserPage(UserPageQuery queryParams); /** diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index 0bf510e5..a08e0cfc 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.core.security.util.JwtUtils; import com.youlai.boot.system.enums.ContactType; import com.youlai.boot.common.model.Option; import com.youlai.boot.shared.mail.service.MailService; @@ -33,11 +34,16 @@ import com.youlai.boot.system.service.RoleMenuService; import com.youlai.boot.system.service.RoleService; import com.youlai.boot.system.service.UserRoleService; import com.youlai.boot.system.service.UserService; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.http.HttpHeaders; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import java.util.Arrays; import java.util.Collections; @@ -83,14 +89,14 @@ public class UserServiceImpl extends ServiceImpl implements Us * @return {@link IPage} 用户分页列表 */ @Override - public IPage listPagedUsers(UserPageQuery queryParams) { + public IPage getUserPage(UserPageQuery queryParams) { // 参数构建 int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize(); Page page = new Page<>(pageNum, pageSize); // 查询数据 - Page userPage = this.baseMapper.listPagedUsers(page, queryParams); + Page userPage = this.baseMapper.getUserPage(page, queryParams); // 实体转换 return userConverter.toPageVo(userPage); @@ -311,10 +317,18 @@ public class UserServiceImpl extends ServiceImpl implements Us } String newPassword = data.getNewPassword(); - return this.update(new LambdaUpdateWrapper() + boolean result= this.update(new LambdaUpdateWrapper() .eq(User::getId, userId) .set(User::getPassword, passwordEncoder.encode(newPassword)) ); + if(result){ + String token = SecurityUtils.getTokenFromRequest(); + if (StrUtil.isNotBlank(token)) { + SecurityUtils.invalidateToken(token); + } + } + + return result; } /** diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 6013111a..988b7f07 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -5,7 +5,7 @@ - SELECT u.id, u.username,