Merge branch 'main' into personal/heshunme/auth-restart-1

# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/UserController.java
#	src/main/resources/application.properties

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

@@ -1,13 +1,109 @@
 package org.cmh.backend.authentication.controller;
 
 
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.cmh.backend.Utils.JwtUtil;
+import org.cmh.backend.Utils.JwtVerify;
+import org.cmh.backend.authentication.dto.*;
+import org.cmh.backend.authentication.model.UserHS;
+import org.cmh.backend.authentication.service.UserService;
+import org.cmh.backend.authentication.service.VerificationCodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 class AuthenticationController {
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private VerificationCodeService verificationCodeService;
+
     @GetMapping("/hello")
-    public String hello(){
+    public String hello() {
         return "Hello SpringBoot!";
     }
-}
+
+
+    @PostMapping("/register")
+    public ResponseEntity<RegisterResponse> register(@RequestBody RegisterRequest request) {
+        try {
+            boolean isRegistered = userService.registerUser(request);
+            if (isRegistered) {
+                return new ResponseEntity<>(new RegisterResponse("注册成功"), HttpStatus.OK);
+            } else {
+                return new ResponseEntity<>(new RegisterResponse("注册失败:用户已存在"), HttpStatus.BAD_REQUEST);
+            }
+        } catch (IllegalArgumentException e) {
+            return new ResponseEntity<>(new RegisterResponse("注册失败:输入格式有误"), HttpStatus.BAD_REQUEST);
+        } catch (Exception e) {
+            return new ResponseEntity<>(new RegisterResponse("注册失败:服务器错误"), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+
+    }
+
+    @PostMapping("/login")
+    public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest loginRequest) {
+        boolean isValidUser = userService.loginUser(loginRequest.getUsername(), loginRequest.getPassword());
+
+        if (isValidUser) {
+            return new ResponseEntity<>(new LoginResponse("登录成功", JwtUtil.generateToken(loginRequest.getUsername())), HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(new LoginResponse("用户名或密码错误", null), HttpStatus.UNAUTHORIZED);
+        }
+    }
+
+    @GetMapping("/userProfile")
+    public ResponseEntity<UserProfileResponse> getUserProfile(@RequestParam String token) {
+        if (JwtUtil.isTokenValid(token)) {
+            UserHS user = userService.getUserByUsername(JwtUtil.extractUsername(token));
+            if (user != null) {
+                UserProfileResponse response = new UserProfileResponse(
+                        user.getUsername(),
+                        user.getNickname(),
+                        user.getGender(),
+                        user.getPhoneNumber(),
+                        user.getEmail(),
+                        user.getDepartment(),
+                        user.getRole(),
+                        user.getCreatedAt()
+                );
+                if (user.getSuperAdmin()) {
+                    response.setDepartment("超级管理员");
+                    response.setRole("超级管理员");
+                }
+                return new ResponseEntity<>(response, HttpStatus.OK);
+            }
+        }
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+
+    @PostMapping("/manageUserProfile")
+    @JwtVerify
+    public ResponseEntity<Object> manageUserProfile(@RequestBody ManageUserProfileRequest userProfileRequest) {
+        String username = JwtUtil.extractUsername(userProfileRequest.getToken());
+        boolean succeeded = userService.updateUserProfile(username, userProfileRequest);
+        if (succeeded) {
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+    }
+
+    @PostMapping("/changePassword")
+    @JwtVerify
+    public ResponseEntity<Object> changePassword(@RequestBody ChangePasswordRequest changePasswordRequest) {
+        if (userService.changePassword(JwtUtil.extractUsername(changePasswordRequest.getToken()), changePasswordRequest)) {
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
+        return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+    }
+
+    @GetMapping("/getVerificationCode")
+    public ResponseEntity<VerificationCodeResponse> getVerificationCode() {
+        return new ResponseEntity<>(verificationCodeService.provideVerificationCode(), HttpStatus.OK);
+    }
+
+
+}

src/main/java/org/cmh/backend/authentication/dto/ChangePasswordRequest.java

@@ -0,0 +1,12 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.cmh.backend.Utils.JwtRequest;
+
+@Getter
+@Setter
+public class ChangePasswordRequest extends JwtRequest {
+    private String currentPassword;
+    private String newPassword;
+}

src/main/java/org/cmh/backend/authentication/dto/LoginRequest.java

@@ -0,0 +1,12 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class LoginRequest {
+    private String username;
+    private String password;
+    private String verificationCode;
+}

src/main/java/org/cmh/backend/authentication/dto/LoginResponse.java

@@ -0,0 +1,13 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class LoginResponse {
+    private String message;
+    private String token;
+}

src/main/java/org/cmh/backend/authentication/dto/ManageUserProfileRequest.java

@@ -0,0 +1,16 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.cmh.backend.Utils.JwtRequest;
+
+@Getter
+@Setter
+public class ManageUserProfileRequest extends JwtRequest {
+    private String nickname;
+    private String gender;
+    private String phoneNumber;
+    private String email;
+    private String department;
+    private String role;
+}

src/main/java/org/cmh/backend/authentication/dto/RegisterRequest.java

@@ -0,0 +1,13 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class RegisterRequest {
+    private String username;
+    private String password;
+    private String phoneNumber;
+    private String verificationCode;
+}

src/main/java/org/cmh/backend/authentication/dto/RegisterResponse.java

@@ -0,0 +1,12 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class RegisterResponse {
+    private String message;
+}

src/main/java/org/cmh/backend/authentication/dto/UserProfileResponse.java

@@ -0,0 +1,21 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class UserProfileResponse {
+    private String username;
+    private String nickname;
+    private String gender;
+    private String phoneNumber;
+    private String email;
+    private String department;
+    private String role;
+    private LocalDateTime createdAt;
+}

src/main/java/org/cmh/backend/authentication/dto/VerificationCodeResponse.java

@@ -0,0 +1,13 @@
+package org.cmh.backend.authentication.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class VerificationCodeResponse {
+    private String code;
+    private String path;
+}

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

@@ -1,39 +0,0 @@
-package org.cmh.backend.authentication.model;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-@Entity
-public class User {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String username;
-    private String password;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-}

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

@@ -0,0 +1,29 @@
+package org.cmh.backend.authentication.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Setter
+@Getter
+@Entity
+public class UserHS {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String username;
+    private String password;
+    private String nickname;
+    private String gender;
+    private String phoneNumber;
+    private String email;
+    private String department;
+    private String role;
+    private LocalDateTime createdAt;
+    private Boolean superAdmin = false;
+}

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

@@ -1,8 +1,8 @@
 package org.cmh.backend.authentication.repository;
 
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.authentication.model.UserHS;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface UserRepository extends JpaRepository<User, Long> {
-    User findByUsername(String username);
+public interface UserRepository extends JpaRepository<UserHS, Long> {
+    UserHS findByUsername(String username);
 }

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

@@ -1,16 +1,117 @@
 package org.cmh.backend.authentication.service;
 
-import org.cmh.backend.authentication.model.User;
+import org.cmh.backend.authentication.dto.ChangePasswordRequest;
+import org.cmh.backend.authentication.dto.ManageUserProfileRequest;
+import org.cmh.backend.authentication.dto.RegisterRequest;
+import org.cmh.backend.authentication.model.UserHS;
 import org.cmh.backend.authentication.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.regex.Pattern;
+
 @Service
 public class UserService {
     @Autowired
     private UserRepository userRepository;
 
-    public User getUserByUsername(String username) {
+    private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+
+    public UserHS getUserByUsername(String username) {
         return userRepository.findByUsername(username);
     }
-}
+
+    public boolean registerUser(RegisterRequest request) {
+        String username = request.getUsername();
+        String password = request.getPassword();
+        String phoneNumber = request.getPhoneNumber();
+        // 验证用户名是否已存在
+        if (userRepository.findByUsername(username) != null) {
+            return false; // 用户已存在
+        }
+
+        // 验证输入格式
+        if (!isValidUsername(username) || !isValidPassword(password) || !isValidContactInfo(phoneNumber)) {
+            throw new IllegalArgumentException();
+        }
+
+        // 加密密码
+        String encodedPassword = passwordEncoder.encode(password);
+
+        // 创建新用户
+        UserHS newUser = new UserHS();
+        newUser.setUsername(username);
+        newUser.setPassword(encodedPassword);
+        newUser.setPhoneNumber(phoneNumber);
+        newUser.setCreatedAt(LocalDateTime.now());
+
+        userRepository.save(newUser);
+
+        return true;
+    }
+
+    public boolean loginUser(String username, String password) {
+        UserHS user = userRepository.findByUsername(username);
+        return user != null && passwordEncoder.matches(password, user.getPassword());
+    }
+
+    public boolean updateUserProfile(String username, ManageUserProfileRequest request) {
+        UserHS user = userRepository.findByUsername(username);
+        if (user != null) {
+            user.setNickname(request.getNickname());
+            user.setGender(request.getGender());
+            user.setPhoneNumber(request.getPhoneNumber());
+            user.setEmail(request.getEmail());
+            user.setDepartment(request.getDepartment());
+            user.setRole(request.getRole());
+            try {
+                userRepository.save(user);
+            } catch (Exception e) {
+                return false;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean changePassword(String username, ChangePasswordRequest request) {
+        UserHS user = userRepository.findByUsername(username);
+        if (user != null) {
+            if (passwordEncoder.matches(request.getCurrentPassword(), user.getPassword())) {
+                if (isValidPassword(request.getNewPassword())) {
+                    String encodedPassword = passwordEncoder.encode(request.getNewPassword());
+                    user.setPassword(encodedPassword);
+                    try {
+                        userRepository.save(user);
+                    } catch (Exception e) {
+                        return false;
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    // 验证用户名格式
+    private boolean isValidUsername(String username) {
+        return username != null && username.length() >= 3 && username.length() <= 20;
+    }
+
+    // 验证密码格式
+    private boolean isValidPassword(String password) {
+        return password != null && password.length() >= 4;
+    }
+
+    // 验证联系方式格式（假设为电话号码）
+    private boolean isValidContactInfo(String contactInfo) {
+        String regex = "^\\+?[0-9. ()-]{7,25}$"; // 电话号码验证
+        return contactInfo != null && Pattern.matches(regex, contactInfo);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package org.cmh.backend.authentication.service;
+
+import jakarta.annotation.PostConstruct;
+import lombok.Getter;
+import org.cmh.backend.authentication.dto.VerificationCodeResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.stream.Stream;
+
+@Service
+public class VerificationCodeService {
+
+    @Value("${verification.code.images.path}")
+    private String verificationCodeImagesPath;
+
+    @Getter
+    private List<String> verificationCodeList = new ArrayList<>();
+
+    @PostConstruct
+    public void init() {
+        loadVerificationCodeImages();
+    }
+
+    private void loadVerificationCodeImages() {
+        try (Stream<Path> paths = Files.list(Paths.get(verificationCodeImagesPath))) {
+            paths.filter(path -> path.toString().endsWith(".png"))
+                    .forEach(path -> verificationCodeList.add(path.getFileName().toString()));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public VerificationCodeResponse provideVerificationCode() {
+        if (verificationCodeList.isEmpty()) {
+            return null;
+        }
+        Random random = new Random();
+        int code = random.nextInt(random.nextInt(verificationCodeList.size()));
+        String selectedCode = verificationCodeList.get(code);
+        return new VerificationCodeResponse(selectedCode.split("\\.")[0], "/verificationCodeImages/" + selectedCode);
+    }
+
+}