登录功能基础完成

src/main/java/org/cmh/backend/authentication/controller/UserController.java

@@ -8,7 +8,6 @@ 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
@@ -20,39 +19,39 @@ public class UserController {
 
     @PostMapping("/tmdshabi")
     public ResponseEntity<User> login(@RequestBody Map<String, String> credentials) {
-        String username = credentials.get("username");
+        String account = credentials.get("account");
         String password = credentials.get("password");
-        System.out.println(username);
+        System.out.println(account);
         System.out.println(password);
         System.out.println("hahaha");
         return ResponseEntity.notFound().build();
     }
     @PostMapping("/checkLogin")
     public ResponseEntity<User> hahaha(@RequestBody Map<String, String> credentials){
-        String username = credentials.get("username");
+        String account = credentials.get("account");
         String password = credentials.get("password");
-        System.out.println(username);
+        System.out.println(account);
         System.out.println(password);
         System.out.println("hahaha");
         System.out.println("hahaha");
-        User user = new User();
+        User user = userService.getUserByAccountAndPassword(account, password);
-        user.setUsername(username);
+        System.out.println(user);
-        user.setPassword(password);
         return ok(user);
     }
 
     @PostMapping("/checkRegister")
     public String register(@RequestBody User user) {
-//        String username = user.getUsername();
+//        String account = user.getAccount();
 //        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){
+        System.out.println(user.toString());
+
+        if(userService.registerUser(user) != null){
             return "注册成功";
         }
         return "注册错误";

src/main/java/org/cmh/backend/authentication/model/User.java

@@ -17,7 +17,7 @@ public class User {
     private Long id;
     @Setter
     @Getter
-    private String username;
+    private String account;
     @Setter
     @Getter
     private String password;
@@ -36,23 +36,34 @@ public class User {
     @Getter
     @Setter
     private String phone;
-    @Getter
-    @Setter
-    private String pname;
 
     public User() {
 
     }
 
-    public User(String username, String password, String name, String organization, String gender, String email, String phone, String pname) {
+    public User(String account, String password, String name, String organization, String gender, String email, String phone) {
-        this.username = username;
+        this.account = account;
         this.password = password;
         this.name = name;
         this.organization = organization;
         this.gender = gender;
         this.email = email;
         this.phone = phone;
-        this.pname = pname;
+
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", account='" + account + '\'' +
+                ", password='" + password + '\'' +
+                ", name='" + name + '\'' +
+                ", organization='" + organization + '\'' +
+                ", gender='" + gender + '\'' +
+                ", email='" + email + '\'' +
+                ", phone='" + phone + '\'' +
+                '}';
     }
 
 }

src/main/java/org/cmh/backend/authentication/repository/UserRepository.java

@@ -4,10 +4,7 @@ import org.cmh.backend.authentication.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
-    User findByUsername(String username);
+    User findByAccount(String username);
-    User findByIdAndUsername(long id, String username);
+    User findByAccountAndPassword(String username, String password);
-    User findByName(String name);
-    User findByUsernameAndPassword(String username, String password);
-    User findByGender(String gender);
     User save(User user);
 }

src/main/java/org/cmh/backend/authentication/service/UserService.java

@@ -10,14 +10,14 @@ public class UserService {
     @Autowired
     private UserRepository userRepository;
 
-    public User getUserByUsername(String username) {
+    public User getUserByAccount(String account) {
-        return userRepository.findByUsername(username);
+        return userRepository.findByAccount(account);
     }
-    public User getUserByUsernameAndPassword(String username, String password) {
+    public User getUserByAccountAndPassword(String account, String password) {
-        return userRepository.findByUsernameAndPassword(username, password);
+        return userRepository.findByAccountAndPassword(account, password);
     }
 
-    public User RegisterUser(User user) {
+    public User registerUser(User user) {
         User savedUser = userRepository.save(user);
         return savedUser;
     }