From bdc19166a337a22d6664d715ebe9cbada2a2c210 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Tue, 25 Jun 2024 15:48:19 +0800 Subject: [PATCH] merge main& solve conflict --- .../org/cmh/backend/Config/CorsConfig.java | 0 .../controller/UserController.java | 57 +++++++++++++++++++ .../backend/authentication/model/User.java | 53 +++++++++++------ .../repository/UserRepository.java | 5 ++ .../authentication/service/UserService.java | 8 +++ 5 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/cmh/backend/Config/CorsConfig.java create mode 100644 src/main/java/org/cmh/backend/authentication/controller/UserController.java diff --git a/src/main/java/org/cmh/backend/Config/CorsConfig.java b/src/main/java/org/cmh/backend/Config/CorsConfig.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java new file mode 100644 index 0000000..dafa20e --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -0,0 +1,57 @@ +package org.cmh.backend.authentication.controller; + +import org.cmh.backend.authentication.model.User; +import org.cmh.backend.authentication.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +import static org.springframework.http.ResponseEntity.ok; + +@RestController +@RequestMapping("/users") +public class UserController { + @Autowired + private UserService userService; + + + @PostMapping("/tmdshabi") + public ResponseEntity login(@RequestBody Map credentials) { + String username = credentials.get("username"); + String password = credentials.get("password"); + System.out.println(username); + System.out.println(password); + System.out.println("hahaha"); + return ResponseEntity.notFound().build(); + } + @PostMapping("/hahaha") + public ResponseEntity hahaha(@RequestBody Map credentials){ + String username = credentials.get("username"); + String password = credentials.get("password"); + System.out.println(username); + System.out.println(password); + System.out.println("hahaha"); + System.out.println("hahaha"); + User user = new User(); + user.setUsername(username); + user.setPassword(password); + return ResponseEntity.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; + } +} 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 ba9aa53..eca7e54 100644 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ b/src/main/java/org/cmh/backend/authentication/model/User.java @@ -4,36 +4,53 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import lombok.Getter; +import lombok.Setter; + @Entity public class User { + @Setter + @Getter @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Setter + @Getter private String username; + @Setter + @Getter private String password; + @Setter + @Getter + private String name; + @Getter + @Setter + private String organization; + private String gender; + @Setter + @Getter + private String email; + @Getter + @Setter + private String phone; + @Getter + @Setter + private String pname; + + public User() { - public Long getId() { - return id; } - public void setId(Long id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { + public User(String username, String password, String name, String organization, String gender, String email, String phone, String pname) { this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { this.password = password; + this.name = name; + this.organization = organization; + this.gender = gender; + this.email = email; + this.phone = phone; + this.pname = pname; } + } \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java index 2c5116e..7cbf159 100644 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java @@ -5,4 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { User findByUsername(String username); + User findByIdAndUsername(long id, String username); + User findByName(String name); + User findByUsernameAndPassword(String username, String password); + User findByGender(String gender); + User save(User user); } diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java index 30e5134..45f5df4 100644 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ b/src/main/java/org/cmh/backend/authentication/service/UserService.java @@ -13,4 +13,12 @@ public class UserService { public User getUserByUsername(String username) { return userRepository.findByUsername(username); } + public User getUserByUsernameAndPassword(String username, String password) { + return userRepository.findByUsernameAndPassword(username, password); + } + + public User RegisterUser(User user) { + User savedUser = userRepository.save(user); + return savedUser; + } }