diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java index dafa20e..a243730 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; +import static org.springframework.http.ResponseEntity.badRequest; import static org.springframework.http.ResponseEntity.ok; @RestController @@ -26,7 +27,7 @@ public class UserController { System.out.println("hahaha"); return ResponseEntity.notFound().build(); } - @PostMapping("/hahaha") + @PostMapping("/checkLogin") public ResponseEntity hahaha(@RequestBody Map credentials){ String username = credentials.get("username"); String password = credentials.get("password"); @@ -37,21 +38,23 @@ public class UserController { User user = new User(); user.setUsername(username); user.setPassword(password); - return ResponseEntity.ok(user); + return ok(user); } - @PostMapping("/register") - public ResponseEntity register(@RequestBody Map credentials) { - String username = credentials.get("username"); - String password = credentials.get("password"); - String name = credentials.get("name"); - String organization = credentials.get("organization"); - String gender = credentials.get("gender"); - String email = credentials.get("email"); - String phone = credentials.get("phone"); - String pname = credentials.get("pname");; - User user = new User(username, password, name, organization, gender, email,phone,pname); - if(userService.RegisterUser(user) != null); - return null; + @PostMapping("/checkRegister") + public String register(@RequestBody User user) { +// String username = user.getUsername(); +// String password = user.getPassword(); +// String name = user.getName(); +// String organization = user.getOrganization(); +// String gender = user.getGender(); +// String email = user.getEmail(); +// String phone = user.getPhone(); +// String pname = user.getPname(); + + if(userService.RegisterUser(user) != null){ + return "注册成功"; + } + return "注册错误"; } } diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java index eca7e54..7692661 100644 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ b/src/main/java/org/cmh/backend/authentication/model/User.java @@ -27,6 +27,8 @@ public class User { @Getter @Setter private String organization; + @Setter + @Getter private String gender; @Setter @Getter