From e45e84c53a97b4fea8357a67e1413bf26a11575c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=AD=90=E5=85=B4?= Date: Fri, 5 Jul 2024 16:34:34 +0800 Subject: [PATCH] =?UTF-8?q?revert=20=EF=BC=9A=E5=8F=96=E6=B6=88=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E9=82=A3=E6=98=AF=E6=97=A7=E7=9A=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert Merge remote-tracking branch 'origin/personal/lsd/UserManagement' # Conflicts: # src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java # src/main/java/org/cmh/backend/authentication/repository/UserRepository.java # src/main/java/org/cmh/backend/authentication/service/UserService.java --- pom.xml | 6 -- .../TenantManagementController.java | 48 ------------- .../controller/UserManagementController.java | 52 -------------- .../backend/UserManagement/model/Tenant.java | 33 --------- .../backend/UserManagement/model/User.java | 68 ------------------- .../TenantManagementRepository.java | 15 ---- .../repository/UserManagementRepository.java | 22 ------ .../service/TenantManagementService.java | 27 -------- .../service/UserManagementService.java | 31 --------- .../controller/UserController.java | 39 ----------- .../service/AuthenticationService.java | 0 11 files changed, 341 deletions(-) delete mode 100644 src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/model/Tenant.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/model/User.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java delete mode 100644 src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java delete mode 100644 src/main/java/org/cmh/backend/authentication/controller/UserController.java create mode 100644 src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java diff --git a/pom.xml b/pom.xml index 6c0c137..39cc9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -128,12 +128,6 @@ spring-boot-testcontainers test - - org.springframework.boot - spring-boot-devtools - true - - org.mybatis.spring.boot mybatis-spring-boot-starter-test diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java deleted file mode 100644 index f31a1f9..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.cmh.backend.UserManagement.controller; - -import jakarta.transaction.Transactional; -import org.cmh.backend.UserManagement.model.Tenant; -import org.cmh.backend.UserManagement.service.TenantManagementService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import java.util.List; - -@RestController -public class TenantManagementController { - @Autowired - private TenantManagementService tenantManagementService; - - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/addTenant") - public Tenant addTenant(@RequestBody Tenant tenant) { - Tenant tenant1=tenantManagementService.registerTenant(tenant); - System.out.println(tenant.toString()); - return tenant1; - } - - @CrossOrigin(origins = "http://localhost:5173") - @GetMapping("/getAllTenant") - public List getAll() { - List tenantList=tenantManagementService.findAll(); - return tenantList; - } - - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/updateTenant") - public Tenant update(@RequestBody Tenant tenant) { - System.out.println(tenant); - tenantManagementService.update(tenant); - return tenant; - } - - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/deleteTenant") - @Transactional - public boolean delete(@RequestBody Tenant tenant) { - System.out.println(tenant); - tenantManagementService.delete(tenant.getName()); - return true; - } - -} - diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java deleted file mode 100644 index e6ca4a3..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.cmh.backend.UserManagement.controller; - -import jakarta.transaction.Transactional; -import org.cmh.backend.UserManagement.service.UserManagementService; -import org.cmh.backend.UserManagement.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import java.util.List; - -@RestController -public class UserManagementController { - @Autowired - private UserManagementService userManagementService; - - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/addUser") - public User addUser(@RequestBody User user) { - User user1=userManagementService.registerUser(user); - if(user1 != null){ - System.out.println(user1); - return user1; - }else{ - return null; - } - } - - @CrossOrigin(origins = "http://localhost:5173") - @GetMapping("/getAll") - public List getAll() { - List userList=userManagementService.findAll(); - return userList; - } - - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/update") - public User update(@RequestBody User user) { - System.out.println(user); - userManagementService.update(user); - return user; - } - - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/delete") - @Transactional - public boolean delete(@RequestBody User user) { - System.out.println(user); - userManagementService.delete(user.getAccount()); - return true; - } - -} - diff --git a/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java b/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java deleted file mode 100644 index 8782fa0..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.cmh.backend.UserManagement.model; - - -import jakarta.persistence.*; -import lombok.Getter; -import lombok.Setter; - -@Table(name="tenant") -@Entity -public class Tenant { - @Id - @Getter - @Setter - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Getter - @Setter - private String contact; - @Getter - @Setter - private String phone; - @Getter - @Setter - private String name; - @Getter - @Setter - private String manager; - @Getter - @Setter - private String symbol; - -} diff --git a/src/main/java/org/cmh/backend/UserManagement/model/User.java b/src/main/java/org/cmh/backend/UserManagement/model/User.java deleted file mode 100644 index 373eaf7..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/model/User.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.cmh.backend.UserManagement.model; - -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 account; - @Setter - @Getter - private String password; - @Setter - @Getter - private String name; - @Getter - @Setter - private String organization; - @Setter - @Getter - private String gender; - @Setter - @Getter - private String email; - @Getter - @Setter - private String phone; - - public User() { - - } - - public User(String account, String password, String name, String organization, String gender, String email, String phone) { - this.account = account; - this.password = password; - this.name = name; - this.organization = organization; - this.gender = gender; - this.email = email; - this.phone = phone; - - } - - @Override - public String toString() { - return "User{" + - "id=" + id + - ", account='" + account + '\'' + - ", password='" + password + '\'' + - ", name='" + name + '\'' + - ", organization='" + organization + '\'' + - ", gender='" + gender + '\'' + - ", email='" + email + '\'' + - ", phone='" + phone + '\'' + - '}'; - } - -} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java deleted file mode 100644 index 979fa88..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.cmh.backend.UserManagement.repository; -import org.cmh.backend.UserManagement.model.Tenant; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -public interface TenantManagementRepository extends JpaRepository{ - Tenant findByName(String name); - Tenant save(Tenant tenant); - - List findAll(); - - Tenant findTenantById(Long id); - - Tenant deleteByName(String Name); -} diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java deleted file mode 100644 index 250e33e..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.cmh.backend.UserManagement.repository; - - -import org.cmh.backend.UserManagement.model.User; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface UserManagementRepository extends JpaRepository { - User findByName(String name); - User findByAccountAndPassword(String name,String password); - User save(User user); - - List findAll(); - - User findUserById(Long id); - - User deleteByAccount(String account); - -} diff --git a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java deleted file mode 100644 index ba77df5..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.cmh.backend.UserManagement.service; - -import org.cmh.backend.UserManagement.model.Tenant; -import org.cmh.backend.UserManagement.repository.TenantManagementRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; - -@Service -public class TenantManagementService { - - @Autowired - private TenantManagementRepository tenantManagementRepository; - - public Tenant registerTenant(Tenant tenant) { - Tenant savedTenant = tenantManagementRepository.save(tenant); - return savedTenant; - } - - public List findAll(){ - return tenantManagementRepository.findAll(); - } - - public Tenant update(Tenant tenant){return tenantManagementRepository.save(tenant);} - - public Tenant delete(String name){return tenantManagementRepository.deleteByName(name);} -} diff --git a/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java deleted file mode 100644 index 1bd84b9..0000000 --- a/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.cmh.backend.UserManagement.service; - -import org.cmh.backend.UserManagement.repository.UserManagementRepository; -import org.cmh.backend.UserManagement.model.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; - -@Service -public class UserManagementService { - - @Autowired - private UserManagementRepository userManagementRepository; - - - public User registerUser(User user) { - User savedUser = userManagementRepository.save(user); - return savedUser; - } - - public List findAll(){ - return userManagementRepository.findAll(); - } - - public User findUserById(Long id){return userManagementRepository.findUserById(id);} - - public User update(User user){return userManagementRepository.save(user);} - - public User delete(String account){return userManagementRepository.deleteByAccount(account);} - -} diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java deleted file mode 100644 index 0a0700c..0000000 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.cmh.backend.authentication.controller; - -import org.cmh.backend.UserManagement.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 -public class UserController { - - @Autowired - private UserService userService; - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/checkLogin") - public ResponseEntity login(@RequestBody Map credentials) { - String account = credentials.get("account"); - String password = credentials.get("password"); - - User user = userService.getUserByAccountAndPassword(account, password); - return ok(user); - - } - @CrossOrigin(origins = "http://localhost:5173") - @PostMapping("/checkRegister") - public String register(@RequestBody User user) { - - if(userService.registerUser(user) != null){ - return "注册成功"; - }else - return "注册错误"; - } - - -} diff --git a/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java b/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java new file mode 100644 index 0000000..e69de29