From bac47d9749b6ccb819ee76b21c2224b736ab3df8 Mon Sep 17 00:00:00 2001
From: MiLla <18826902282@163.com>
Date: Tue, 25 Jun 2024 16:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BD=86User=E4=B8=ADusername?=
 =?UTF-8?q?=E6=84=8F=E4=B9=89=E4=B8=8D=E5=A4=9F=E6=98=8E=E7=A1=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=83=B3=E6=94=B9=E6=88=90accout,=E6=AD=A4=E7=89=88=E4=BD=9C?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserController.java            | 33 ++++++++++---------
 .../backend/authentication/model/User.java    |  2 ++
 2 files changed, 20 insertions(+), 15 deletions(-)

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<User> hahaha(@RequestBody Map<String, String> 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<User> register(@RequestBody Map<String, String> 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