diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppUserCenterController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppUserCenterController.java index d2250c8..0b7da2d 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppUserCenterController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppUserCenterController.java @@ -1,6 +1,7 @@ package com.fuyuanshen.app.controller; import com.fuyuanshen.app.model.AppRegisterBody; +import com.fuyuanshen.app.model.AppUpdatePasswordBody; import com.fuyuanshen.app.service.AppLoginService; import com.fuyuanshen.app.service.AppRegisterService; import com.fuyuanshen.common.core.domain.R; @@ -38,7 +39,7 @@ public class AppUserCenterController { * 修改密码 */ @PostMapping("/updatePassword") - public R updatePassword(@Validated @RequestBody AppRegisterBody body) { + public R updatePassword(@Validated @RequestBody AppUpdatePasswordBody body) { registerService.updatePassword(body); return R.ok(); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/model/AppUpdatePasswordBody.java b/fys-admin/src/main/java/com/fuyuanshen/app/model/AppUpdatePasswordBody.java new file mode 100644 index 0000000..926bb79 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/app/model/AppUpdatePasswordBody.java @@ -0,0 +1,12 @@ +package com.fuyuanshen.app.model; + +import lombok.Data; + +@Data +public class AppUpdatePasswordBody { + + /** + * 登录密码 + */ + private String password; +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppRegisterService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppRegisterService.java index 282b15e..80f976c 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppRegisterService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppRegisterService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.fuyuanshen.app.domain.AppUser; import com.fuyuanshen.app.mapper.AppUserMapper; import com.fuyuanshen.app.model.AppRegisterBody; +import com.fuyuanshen.app.model.AppUpdatePasswordBody; import com.fuyuanshen.common.core.constant.Constants; import com.fuyuanshen.common.core.constant.GlobalConstants; import com.fuyuanshen.common.core.domain.model.RegisterBody; @@ -144,7 +145,7 @@ public class AppRegisterService { userMapper.update(updateWrapper); } - public void updatePassword(AppRegisterBody body) { + public void updatePassword(AppUpdatePasswordBody body) { String username = AppLoginHelper.getUsername(); String password = body.getPassword(); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java index 02cfa6e..59572c1 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java @@ -126,9 +126,8 @@ public class AppPasswordAuthStrategy implements IAuthStrategy { .eq(AppUser::getUserType, UserType.APP_USER.getUserType())); if (ObjectUtil.isNull(user)) { log.info("登录用户:{} 不存在.", username); -// throw new UserException("user.not.exists", phonenumber); - // 新增AppUser用户 - return null; + throw new UserException("user.not.exists", username); + } else if (SystemConstants.DISABLE.equals(user.getStatus())) { log.info("登录用户:{} 已被停用.", username); throw new UserException("user.blocked", username);