feats

src/main/java/com/yunzhi/nanyang/controller/LoginController.java

@@ -6,6 +6,7 @@ import com.yunzhi.nanyang.entity.SysLogin;
 import com.yunzhi.nanyang.entity.SysUser;
 import com.yunzhi.nanyang.service.ISysLoginService;
 import com.yunzhi.nanyang.service.ISysUserService;
+import com.yunzhi.nanyang.vo.ChangePassword;
 import com.yunzhi.nanyang.vo.LoginParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -89,25 +90,25 @@ public class LoginController extends BaseController {
         return ResponseBean.error(msg, ResponseBean.ERROR_AUTH_FAIL);
     }
 
-//    @PutMapping("/admin/change-password")
-//    @ApiOperation(value="修改密码", notes = "修改密码", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean changePassword(@ApiParam("修改密码参数") @RequestBody ChangePassword param) throws Exception {
-//        if (StringUtils.isEmpty(param.getOriginPassword()) || StringUtils.isEmpty(param.getNewPassword())) {
-//            return ResponseBean.error("原始密码或新密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        SysUser currentUser = getCurrentUser();
-//        SysLogin sysLogin = iSysLoginService.getByUser(currentUser.getUserId());
-//
-//        if (!checkPassword(param.getOriginPassword(), sysLogin.getPassword(), currentUser.getUserId())) {
-//            return ResponseBean.error("原始密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        sysLogin.setPassword(EncryptUtils.md5(param.getNewPassword(), currentUser.getUserId()));
-//        iSysLoginService.updateById(sysLogin);
-//
-//        return ResponseBean.success("密码修改成功");
-//    }
+    @PutMapping("/admin/change-password")
+    @ApiOperation(value="修改密码", notes = "修改密码", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean changePassword(@ApiParam("修改密码参数") @RequestBody ChangePassword param) throws Exception {
+        if (StringUtils.isEmpty(param.getOriginPassword()) || StringUtils.isEmpty(param.getNewPassword())) {
+            return ResponseBean.error("原始密码或新密码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        SysUser currentUser = currentUser();
+        SysLogin sysLogin = iSysLoginService.getExistBy("user_id", currentUser.getUserId(), false, true);
+
+        if (!checkPassword(param.getOriginPassword(), sysLogin.getPassword(), currentUser.getUserId())) {
+            return ResponseBean.error("原始密码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        sysLogin.setPassword(EncryptUtils.md5(param.getNewPassword(), currentUser.getUserId()));
+        iSysLoginService.updateById(sysLogin);
+
+        return ResponseBean.success("密码修改成功");
+    }
 
 
     private boolean checkPassword(String src, String targ, String salt) {

src/main/java/com/yunzhi/nanyang/vo/ChangePassword.java

@@ -0,0 +1,17 @@
+package com.yunzhi.nanyang.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("修改密码参数")
+@Data
+public class ChangePassword {
+
+    @ApiModelProperty("原始密码")
+    String originPassword;
+
+    @ApiModelProperty("新密码")
+    String newPassword;
+}