From a5682e8d96f0dc97b9f8119b3ef0e2ab61506a7b Mon Sep 17 00:00:00 2001 From: Lemon <1730392988@qq.com> Date: Sat, 24 Jul 2021 19:23:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/UsersController.java | 8 +++++++ .../auth/entity/dto/UpdatePasswordReq.java | 21 +++++++++++++++++++ .../time/store/auth/service/UsersService.java | 14 +++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java diff --git a/src/main/java/com/time/store/auth/controller/UsersController.java b/src/main/java/com/time/store/auth/controller/UsersController.java index 40c4dd9..fe36eab 100644 --- a/src/main/java/com/time/store/auth/controller/UsersController.java +++ b/src/main/java/com/time/store/auth/controller/UsersController.java @@ -3,6 +3,7 @@ package com.time.store.auth.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.time.store.auth.entity.dto.AddUserReq; +import com.time.store.auth.entity.dto.UpdatePasswordReq; import com.time.store.auth.entity.dto.UpdateUserReq; import com.time.store.auth.entity.dto.UserPageReq; import com.time.store.auth.service.UsersService; @@ -74,4 +75,11 @@ public class UsersController { public void deleteUser(@PathVariable("id") Integer id) { usersService.removeById(id); } + /** + * 修改密码 + */ + @PutMapping("/updatePassword") + public void updatePassword(@RequestBody @Validated UpdatePasswordReq updatePasswordReq){ + usersService.updatePassword(updatePasswordReq); + } } diff --git a/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java b/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java new file mode 100644 index 0000000..e8b82f2 --- /dev/null +++ b/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java @@ -0,0 +1,21 @@ +package com.time.store.auth.entity.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +@Data +public class UpdatePasswordReq { + private Integer id; + + + /** + * 旧密码 + */ + @NotBlank + private String password; + /** + * 新密码 + */ + @NotBlank + private String newPassword; +} diff --git a/src/main/java/com/time/store/auth/service/UsersService.java b/src/main/java/com/time/store/auth/service/UsersService.java index 3138422..7335dc6 100644 --- a/src/main/java/com/time/store/auth/service/UsersService.java +++ b/src/main/java/com/time/store/auth/service/UsersService.java @@ -3,6 +3,7 @@ package com.time.store.auth.service; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,6 +21,7 @@ import com.time.store.core.util.AssertUtil; import com.time.store.core.util.AuthUtil; import com.time.store.store.entity.bo.StoreInfo; import com.time.store.store.service.StoreInfoService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -42,6 +44,7 @@ import java.util.UUID; * @since 2021-04-25 */ @Service +@Slf4j public class UsersService extends ServiceImpl implements IService { @Autowired @@ -136,5 +139,16 @@ public class UsersService extends ServiceImpl implements ISe return baseMapper.updateById(users); } + /** + * 修改密码 + */ + public void updatePassword(UpdatePasswordReq updatePasswordReq){ + Users user = baseMapper.selectById(updatePasswordReq.getId()); + AssertUtil.isTrue(passwordEncoder.matches(user.getPassword(),updatePasswordReq.getPassword()), "密码错误:" ); + Users u = new Users(); + u.setId(updatePasswordReq.getId()); + u.setPassword(updatePasswordReq.getNewPassword()); + baseMapper.updateById(u); + } } -- Gitee From 3fdb5d7e7bb189bc9bcb7bff8651965a8cc20f05 Mon Sep 17 00:00:00 2001 From: Lemon <1730392988@qq.com> Date: Sat, 24 Jul 2021 19:32:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/time/store/auth/controller/UsersController.java | 3 ++- src/main/java/com/time/store/auth/mapper/UsersMapper.java | 2 +- src/main/java/com/time/store/auth/service/UsersService.java | 2 +- src/main/resources/mapper/auth/UsersMapper.xml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/time/store/auth/controller/UsersController.java b/src/main/java/com/time/store/auth/controller/UsersController.java index fe36eab..9c29f3f 100644 --- a/src/main/java/com/time/store/auth/controller/UsersController.java +++ b/src/main/java/com/time/store/auth/controller/UsersController.java @@ -2,6 +2,7 @@ package com.time.store.auth.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.time.store.auth.entity.bo.Users; import com.time.store.auth.entity.dto.AddUserReq; import com.time.store.auth.entity.dto.UpdatePasswordReq; import com.time.store.auth.entity.dto.UpdateUserReq; @@ -35,7 +36,7 @@ public class UsersController { * @status done */ @GetMapping("/page") - public Page page(UserPageReq users) { + public Page page(UserPageReq users) { return usersService.pageUser(users); } diff --git a/src/main/java/com/time/store/auth/mapper/UsersMapper.java b/src/main/java/com/time/store/auth/mapper/UsersMapper.java index dcbef68..3e0f15d 100644 --- a/src/main/java/com/time/store/auth/mapper/UsersMapper.java +++ b/src/main/java/com/time/store/auth/mapper/UsersMapper.java @@ -26,6 +26,6 @@ public interface UsersMapper extends BaseMapper { * @param users * @return */ - Page pageUser(@Param("page")IPage page, @Param("users") UserPageReq users); + Page pageUser(@Param("page")IPage page, @Param("users") UserPageReq users); } diff --git a/src/main/java/com/time/store/auth/service/UsersService.java b/src/main/java/com/time/store/auth/service/UsersService.java index 7335dc6..fffee08 100644 --- a/src/main/java/com/time/store/auth/service/UsersService.java +++ b/src/main/java/com/time/store/auth/service/UsersService.java @@ -117,7 +117,7 @@ public class UsersService extends ServiceImpl implements ISe * @param users * @return */ - public Page pageUser(UserPageReq users){ + public Page pageUser(UserPageReq users){ IPage iPage=new Page<>(users.getCurrent(),users.getSize()); return baseMapper.pageUser(iPage,users); } diff --git a/src/main/resources/mapper/auth/UsersMapper.xml b/src/main/resources/mapper/auth/UsersMapper.xml index 9885809..14a08c9 100644 --- a/src/main/resources/mapper/auth/UsersMapper.xml +++ b/src/main/resources/mapper/auth/UsersMapper.xml @@ -28,7 +28,7 @@ and psd_wrong_time < 5 limit 1; - SELECT -- Gitee From 71d0bfa4ad00f64010ecda404c0106778be93916 Mon Sep 17 00:00:00 2001 From: Lemon <1730392988@qq.com> Date: Sat, 24 Jul 2021 19:37:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/time/store/auth/entity/dto/UpdatePasswordReq.java | 2 +- src/main/java/com/time/store/auth/service/UsersService.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java b/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java index e8b82f2..e89a259 100644 --- a/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java +++ b/src/main/java/com/time/store/auth/entity/dto/UpdatePasswordReq.java @@ -5,7 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; @Data public class UpdatePasswordReq { - private Integer id; + /** diff --git a/src/main/java/com/time/store/auth/service/UsersService.java b/src/main/java/com/time/store/auth/service/UsersService.java index fffee08..8a996c2 100644 --- a/src/main/java/com/time/store/auth/service/UsersService.java +++ b/src/main/java/com/time/store/auth/service/UsersService.java @@ -143,10 +143,11 @@ public class UsersService extends ServiceImpl implements ISe * 修改密码 */ public void updatePassword(UpdatePasswordReq updatePasswordReq){ - Users user = baseMapper.selectById(updatePasswordReq.getId()); + + Users user = baseMapper.selectById(AuthUtil.getCurrUserId()); AssertUtil.isTrue(passwordEncoder.matches(user.getPassword(),updatePasswordReq.getPassword()), "密码错误:" ); Users u = new Users(); - u.setId(updatePasswordReq.getId()); + u.setId(AuthUtil.getCurrUserId()); u.setPassword(updatePasswordReq.getNewPassword()); baseMapper.updateById(u); -- Gitee From 2f02597b72eccb5aa5775ee4205039f8ed4c4106 Mon Sep 17 00:00:00 2001 From: Lemon <1730392988@qq.com> Date: Sat, 24 Jul 2021 19:42:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/time/store/auth/service/UsersService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/time/store/auth/service/UsersService.java b/src/main/java/com/time/store/auth/service/UsersService.java index 8a996c2..f621639 100644 --- a/src/main/java/com/time/store/auth/service/UsersService.java +++ b/src/main/java/com/time/store/auth/service/UsersService.java @@ -3,7 +3,6 @@ package com.time.store.auth.service; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -21,7 +20,6 @@ import com.time.store.core.util.AssertUtil; import com.time.store.core.util.AuthUtil; import com.time.store.store.entity.bo.StoreInfo; import com.time.store.store.service.StoreInfoService; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -44,7 +42,6 @@ import java.util.UUID; * @since 2021-04-25 */ @Service -@Slf4j public class UsersService extends ServiceImpl implements IService { @Autowired @@ -143,7 +140,6 @@ public class UsersService extends ServiceImpl implements ISe * 修改密码 */ public void updatePassword(UpdatePasswordReq updatePasswordReq){ - Users user = baseMapper.selectById(AuthUtil.getCurrUserId()); AssertUtil.isTrue(passwordEncoder.matches(user.getPassword(),updatePasswordReq.getPassword()), "密码错误:" ); Users u = new Users(); @@ -151,5 +147,6 @@ public class UsersService extends ServiceImpl implements ISe u.setPassword(updatePasswordReq.getNewPassword()); baseMapper.updateById(u); - } + } + } -- Gitee