diff --git a/src/main/java/com/qyft/gd/system/controller/AuthController.java b/src/main/java/com/qyft/gd/system/controller/AuthController.java index 4a9b235..11d9beb 100644 --- a/src/main/java/com/qyft/gd/system/controller/AuthController.java +++ b/src/main/java/com/qyft/gd/system/controller/AuthController.java @@ -5,15 +5,15 @@ import com.qyft.gd.system.common.result.Result; import com.qyft.gd.system.common.result.ResultCode; import com.qyft.gd.system.common.utils.JwtUtil; import com.qyft.gd.system.model.entity.User; +import com.qyft.gd.system.model.form.LoginForm; import com.qyft.gd.system.service.UserService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Objects; @@ -32,14 +32,11 @@ public class AuthController { @Operation(summary = "账号密码登录") @PostMapping("/login") - public Result login( - @Parameter(description = "用户名", example = "admin") @RequestParam String username, - @Parameter(description = "密码", example = "123456") @RequestParam String password - ) { + public Result login(@RequestBody LoginForm loginForm) { // 查找用户 - User user = userService.findByUsername(username); - if (user != null && !Objects.equals(user.getIsDeleted(), DeletedEnum.ENABLE.getValue()) && user.getPassword().equals(password)) { - String token = JwtUtil.createJWE(user.getUsername()); + User user = userService.findByUsername(loginForm.getUsername()); + if (user != null && !Objects.equals(user.getIsDeleted(), DeletedEnum.ENABLE.getValue()) && user.getPassword().equals(loginForm.getPassword())) { + String token = JwtUtil.createJWE(loginForm.getUsername()); return Result.success("Bearer " + token); } return Result.failed(ResultCode.USER_PASSWORD_ERROR); diff --git a/src/main/java/com/qyft/gd/system/model/form/LoginForm.java b/src/main/java/com/qyft/gd/system/model/form/LoginForm.java new file mode 100644 index 0000000..899bda2 --- /dev/null +++ b/src/main/java/com/qyft/gd/system/model/form/LoginForm.java @@ -0,0 +1,22 @@ +package com.qyft.gd.system.model.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +/** + * 用户登录表单 + */ +@Schema(description = "用户登录") +@Data +public class LoginForm { + + @NotBlank() + @Schema(description = "用户名", example = "admin") + private String username; + + @NotBlank() + @Schema(description = "用户密码", example = "12345") + private String password; + +}