From 2cf298759c2a29063fa2c8771904a95ee687bec7 Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Fri, 16 Aug 2024 00:57:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(user):=20=E7=AE=80=E5=8C=96=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E5=99=A8=E5=92=8C=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=B9=B6?=
=?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B3=A8=E9=87=8A=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 合并登录和注册请求模型，统一参数处理- 删除未使用的字段和导入语句，优化代码
-调整方法注释格式，提升可读性和一致性
- 实体类 `User` 移除 `name` 字段，避免冗余
BREAKING CHANGE: `User` 实体类移除 `name` 字段，可能影响依赖此字段的数据库查询。请确保更新相关代码以适应这一变更。
---
.../sims/controller/AdminController.java | 1 +
.../sims/controller/UserController.java | 104 ++++++++++--------
.../java/top/suyiiyii/sims/entity/User.java | 1 -
3 files changed, 59 insertions(+), 47 deletions(-)
diff --git a/src/main/java/top/suyiiyii/sims/controller/AdminController.java b/src/main/java/top/suyiiyii/sims/controller/AdminController.java
index dfff8af..64594df 100644
--- a/src/main/java/top/suyiiyii/sims/controller/AdminController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/AdminController.java
@@ -46,3 +46,4 @@ public class AdminController {
return Result.success(userList);
}
}
+**/
\ No newline at end of file
diff --git a/src/main/java/top/suyiiyii/sims/controller/UserController.java b/src/main/java/top/suyiiyii/sims/controller/UserController.java
index 90c05fa..ac530d4 100644
--- a/src/main/java/top/suyiiyii/sims/controller/UserController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/UserController.java
@@ -1,6 +1,7 @@
package top.suyiiyii.sims.controller;
import cn.hutool.core.util.StrUtil;
+import jakarta.validation.constraints.Null;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -11,8 +12,6 @@ import top.suyiiyii.sims.exception.ServiceException;
import top.suyiiyii.sims.service.RoleService;
import top.suyiiyii.sims.service.UserService;
-import java.util.List;
-
/**
* @Author tortoise
@@ -29,71 +28,60 @@ public class UserController {
UserService userService;
@Autowired
RoleService roleService;
-@AuthAccess
+
+ @AuthAccess
@GetMapping("/")
- public Result hello(){
+ public Result hello() {
return Result.success("success");
}
@PostMapping("/login")
- public Result login(LoginRequest request){
+ public Result<LoginResponse> login(@RequestBody LoginRequest request) {
- if(StrUtil.isBlank(request.getUsername())||StrUtil.isBlank(request.getPassword())){
+ if (StrUtil.isBlank(request.getUsername()) || StrUtil.isBlank(request.getPassword())) {
return Result.error("用户名或密码不能为空");
}
User user = userService.login(request.getUsername(), request.getPassword());
- return Result.success(user);
- }
-
- @Data
- public static class LoginRequest{
- public String username;
- public String password;
- }
-
- @Data
- public static class LoginResponse{
- public String token;
+ return Result.success(new LoginResponse());
}
@PostMapping("/register")
- public Result register(@RequestBody User user){
- if(StrUtil.isBlank(user.getUsername())||StrUtil.isBlank(user.getPassword())){
+ public Result<Null> register(@RequestBody RegisterRequest request) {
+ if (StrUtil.isBlank(request.getUsername()) || StrUtil.isBlank(request.getPassword())) {
return Result.error("用户名或密码不能为空");
}
- if(user.getPassword() == null || user.getPassword().length() < 3) {
+ if (request.getPassword() == null || request.getPassword().length() < 3) {
throw new ServiceException("密码长度不能小于3位");
}
- user =userService.register(user);
+ userService.register(new User());
- return Result.success(user);
+ return Result.success();
}
-
-
-
@PostMapping("/add")
public Result add(@RequestBody User user) {
- userService.addUser(user);
+ userService.addUser(user);
return Result.success();
}
+
@PostMapping("/delete")
public Result delete(@RequestBody User user) {
userService.deleteUser(user.getId());
return Result.success("删除成功");
}
+
/**
+ * @param user
* @author: tortoise
* @date: 2024/8/14 13:34
- * @Description: 更新用户信息,自己改的(不包括密码)
- * @param user
+ * @Description: 更新用户信息, 自己改的(不包括密码)
* @return: top.suyiiyii.sims.common.Result
*/
@PostMapping("/update")
@@ -101,48 +89,72 @@ public class UserController {
userService.updateUser(user);
return Result.success("更新成功");
}
+
@PostMapping("/select")
public Result select(@RequestBody User user) {
return Result.success(userService.selectById(user.getId()));
}
+
@PostMapping("/selectByUsername")
public Result selectByUsername(@RequestBody User user) {
return Result.success(userService.selectByUsername(user.getUsername()));
}
-/**
- * @author: tortoise
- * @date: 2024/8/14 13:48
- * @Description: TODO 用户更新密码
- * @param user
- * @return: top.suyiiyii.sims.common.Result
- */
+
+ /**
+ * @param user
+ * @author: tortoise
+ * @date: 2024/8/14 13:48
+ * @Description: TODO 用户更新密码
+ * @return: top.suyiiyii.sims.common.Result
+ */
@PostMapping("/updatePassword")
public Result updatePassword(@RequestBody User user) {
- if(StrUtil.isBlank(user.getPassword())){
+ if (StrUtil.isBlank(user.getPassword())) {
return Result.error("密码不能为空");
}
User user1 = userService.selectByUsername(user.getUsername());
//验证原密码是否正确
- if(!user.getPassword().equals(user1.getPassword())){
+ if (!user.getPassword().equals(user1.getPassword())) {
return Result.error("原密码错误");
}
userService.updatePassword(user);
return Result.success("更新成功");
}
-/**
- * @author: tortoise
- * @date: 2024/8/14 13:48
- * @Description: TODO 管理员修改密码
- * @param user
- * @return: top.suyiiyii.sims.common.Result
- */
+
+ /**
+ * @param user
+ * @author: tortoise
+ * @date: 2024/8/14 13:48
+ * @Description: TODO 管理员修改密码
+ * @return: top.suyiiyii.sims.common.Result
+ */
@PostMapping("/updatePasswordByAdmin")
public Result updatePasswordByAdmin(@RequestBody User user) {
- if(StrUtil.isBlank(user.getPassword())){
+ if (StrUtil.isBlank(user.getPassword())) {
return Result.error("密码不能为空");
}
userService.updatePassword(user);
return Result.success("更新成功");
}
+ @Data
+ public static class RegisterRequest {
+ private String username;
+ private String password;
+ private String email;
+ private String grade;
+ private String group;
+ }
+
+ @Data
+ public static class LoginRequest {
+ public String username;
+ public String password;
+ }
+
+ @Data
+ public static class LoginResponse {
+ public String token;
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/top/suyiiyii/sims/entity/User.java b/src/main/java/top/suyiiyii/sims/entity/User.java
index 104e94d..58126ac 100644
--- a/src/main/java/top/suyiiyii/sims/entity/User.java
+++ b/src/main/java/top/suyiiyii/sims/entity/User.java
@@ -28,7 +28,6 @@ public class User {
private Integer userId;
private String username;
private String password;
- private String name;
private String email;
private String grade;
private String group;