From 1748ac45ea7e9b67728a515cd7ede095b980a9ef Mon Sep 17 00:00:00 2001 From: Lemon <1730392988@qq.com> Date: Thu, 22 Jul 2021 17:27:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../time/store/order/controller/OrderShipmentController.java | 2 +- .../java/com/time/store/order/mapper/OrderShipmentMapper.java | 2 +- .../java/com/time/store/order/service/OrderShipmentService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/time/store/order/controller/OrderShipmentController.java b/src/main/java/com/time/store/order/controller/OrderShipmentController.java index 38f7b30..3f98f80 100644 --- a/src/main/java/com/time/store/order/controller/OrderShipmentController.java +++ b/src/main/java/com/time/store/order/controller/OrderShipmentController.java @@ -40,7 +40,7 @@ public class OrderShipmentController { * @status done */ @GetMapping("page") - public Page page(@Validated OrderShipmentPageReq orderShipmentPageReq) { + public Page page(@Validated OrderShipmentPageReq orderShipmentPageReq) { return orderShipmentService.pageOrderShipment(orderShipmentPageReq); } /** diff --git a/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java b/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java index 1395640..6258c35 100644 --- a/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java +++ b/src/main/java/com/time/store/order/mapper/OrderShipmentMapper.java @@ -14,5 +14,5 @@ public interface OrderShipmentMapper extends BaseMapper { * @param orderShipmentPageReq * @return */ - Page pageOrderShipment(@Param("orderShipmentPageReq") OrderShipmentPageReq orderShipmentPageReq,@Param("page") Page page); + Page pageOrderShipment(@Param("orderShipmentPageReq") OrderShipmentPageReq orderShipmentPageReq,@Param("page") Page page); } diff --git a/src/main/java/com/time/store/order/service/OrderShipmentService.java b/src/main/java/com/time/store/order/service/OrderShipmentService.java index 305ef92..062767e 100644 --- a/src/main/java/com/time/store/order/service/OrderShipmentService.java +++ b/src/main/java/com/time/store/order/service/OrderShipmentService.java @@ -48,7 +48,7 @@ public class OrderShipmentService extends ServiceImpl pageOrderShipment(OrderShipmentPageReq orderShipmentPageReq) { + public Page pageOrderShipment(OrderShipmentPageReq orderShipmentPageReq) { Page page = new Page<>(); page.setCurrent(orderShipmentPageReq.getCurrent()); page.setSize(orderShipmentPageReq.getSize()); -- Gitee 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 2/2] =?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