退出接口修改

Author: imLaoYang

Diff for: ydl-sms-entity/src/main/java/com/ydl/sms/dto/UserDTO.java

@@ -0,0 +1,18 @@
+package com.ydl.sms.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserDTO {
+
+  private String userName;
+
+  private String oldPaw;
+
+  private String newPaw;
+
+}

Diff for: ydl-sms-manage/src/main/java/com/ydl/sms/config/SecurityConfig.java

@@ -77,7 +77,7 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
 
   @Bean
   public BCryptPasswordEncoder passwordEncoder() {
-    return new BCryptPasswordEncoder();
+    return new BCryptPasswordEncoder(BCryptPasswordEncoder.BCryptVersion.$2Y, 12);
   }
 
   @Override

Diff for: ydl-sms-manage/src/main/java/com/ydl/sms/controller/UserController.java

@@ -1,6 +1,7 @@
 package com.ydl.sms.controller;
 
 import com.ydl.base.R;
+import com.ydl.sms.dto.UserDTO;
 import com.ydl.sms.entity.SysUser;
 import com.ydl.sms.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +26,9 @@ public R logout() {
   }
 
   @PostMapping("updatepwd")
-  public R updatePwd(@RequestBody SysUser sysUser,String newPwd){
-    return sysUserService.updatePwd(sysUser,newPwd );
+  public R updatePwd(@RequestBody UserDTO userDTO){
+
+    return sysUserService.updatePwd(userDTO);
   }
 
 }

Diff for: ydl-sms-manage/src/main/java/com/ydl/sms/service/SysUserService.java

@@ -1,6 +1,7 @@
 package com.ydl.sms.service;
 
 import com.ydl.base.R;
+import com.ydl.sms.dto.UserDTO;
 import com.ydl.sms.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,5 +16,5 @@ public interface SysUserService extends IService<SysUser> {
 
   R logout();
 
-  R updatePwd(SysUser sysUser,String newPwd);
+  R updatePwd( UserDTO userDTO);
 }

Diff for: ydl-sms-manage/src/main/java/com/ydl/sms/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydl.base.R;
+import com.ydl.sms.dto.UserDTO;
 import com.ydl.sms.entity.SysUser;
 import com.ydl.sms.mapper.SysUserMapper;
 import com.ydl.sms.security.LoginUser;
@@ -72,30 +73,28 @@ public R logout() {
   /**
    * 修改密码
    *
-   * @param sysUser
-   * @param newPwd
    * @return
    */
   @Override
-  public R updatePwd(SysUser sysUser, String newPwd) {
-
-    SysUser user = getSysUserByUserName(sysUser.getUserName());
-    String encodePwd = sysUser.getPassword();
-    String rawPwd = user.getPassword();
-    boolean matches = bCryptPasswordEncoder.matches(rawPwd, encodePwd);
+  public R updatePwd(UserDTO userDTO) {
+
+    SysUser sysUser = getSysUserByUserName(userDTO.getUserName());
+    // 数据库密码 加密
+    String dbPwd = sysUser.getPassword();
+    // 前端传来的原密码 未加密
+    String rawPwd = userDTO.getOldPaw();
+    boolean matches = bCryptPasswordEncoder.matches(rawPwd, dbPwd);
     if (!matches) {
       return R.fail("原密码不正确");
     }
     // 改密码
-    String pwd = bCryptPasswordEncoder.encode(newPwd);
+    String pwd = bCryptPasswordEncoder.encode(userDTO.getNewPaw());
     sysUser.setPassword(pwd);
     baseMapper.updateById(sysUser);
-
     return R.success("修改密码成功");
   }
 
 
-
   private SysUser getSysUserByUserName(String userName) {
     LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SysUser::getUserName, userName);