controller_adjust
Change-Id: I1929a8c33006ca473d1ca4aa451e3bedf74c0c8a
diff --git a/src/main/java/com/example/g8backend/controller/AuthController.java b/src/main/java/com/example/g8backend/controller/AuthController.java
index 5561dcd..538d433 100644
--- a/src/main/java/com/example/g8backend/controller/AuthController.java
+++ b/src/main/java/com/example/g8backend/controller/AuthController.java
@@ -1,5 +1,6 @@
package com.example.g8backend.controller;
+import com.example.g8backend.dto.ApiResponse;
import com.example.g8backend.dto.UserRegisterDTO;
import com.example.g8backend.entity.User;
import com.example.g8backend.entity.UserStats;
@@ -9,7 +10,6 @@
import com.example.g8backend.util.mailUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.ResponseEntity;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
@@ -23,80 +23,88 @@
@Autowired
private IUserService userService;
+
@Autowired
private IUserStatsService userStatsService;
+
@Autowired
private mailUtil mailUtil;
+
@Autowired
private PasswordEncoder passwordEncoder;
+
@Autowired
private JwtUtil jwtUtil;
+
@Autowired
- RedisTemplate<String, Object> redisTemplate;
+ private RedisTemplate<String, Object> redisTemplate;
// 发送验证码
@PostMapping("/send_verification_code")
- public ResponseEntity<?> sendVerificationCode(@RequestBody UserRegisterDTO registerDTO) {
+ public ApiResponse<String> sendVerificationCode(@RequestBody UserRegisterDTO registerDTO) {
if (userService.getUserByEmail(registerDTO.getEmail()) != null) {
- return ResponseEntity.badRequest().body("邮箱已存在");
+ return ApiResponse.error(400, "邮箱已存在");
}
String verificationCode = UUID.randomUUID().toString().substring(0, 6);
mailUtil.sendMail(registerDTO.getEmail(), "PT平台注册验证码", "您的验证码为：" + verificationCode + "，验证码十分钟内有效，请勿泄露。");
redisTemplate.opsForValue().set(registerDTO.getEmail(), verificationCode, 10 * 60, java.util.concurrent.TimeUnit.SECONDS);
- return ResponseEntity.ok("验证码发送成功");
+ return ApiResponse.success("验证码发送成功");
}
// 用户注册
@PostMapping("/register")
- public ResponseEntity<?> register(@RequestBody UserRegisterDTO registerDTO) {
+ public ApiResponse<String> register(@RequestBody UserRegisterDTO registerDTO) {
if (userService.getUserByName(registerDTO.getUserName()) != null) {
- return ResponseEntity.badRequest().body("用户名已存在");
+ return ApiResponse.error(400, "用户名已存在");
}
if (!redisTemplate.hasKey(registerDTO.getInvitationCode())) {
- return ResponseEntity.badRequest().body("邀请码错误");
+ return ApiResponse.error(400, "邀请码错误");
}
- if (!registerDTO.getVerificationCode().equals(redisTemplate.opsForValue().get(registerDTO.getEmail()))) {
- return ResponseEntity.badRequest().body("验证码错误");
+
+ Object cachedCode = redisTemplate.opsForValue().get(registerDTO.getEmail());
+ if (!registerDTO.getVerificationCode().equals(cachedCode)) {
+ return ApiResponse.error(400, "验证码错误");
}
+
redisTemplate.delete(registerDTO.getEmail());
User user = new User();
user.setUserName(registerDTO.getUserName());
user.setPassword(passwordEncoder.encode(registerDTO.getPassword()));
user.setEmail(registerDTO.getEmail());
-
- // passkey 用于在客户端发送announce请求时获取用户信息
user.setPasskey(UUID.randomUUID().toString().replace("-", ""));
userService.save(user);
- // 保存用户统计用户的上传量与下载量
UserStats userStats = new UserStats();
userStats.setUserId(user.getUserId());
userStats.setPasskey(user.getPasskey());
userStatsService.save(userStats);
- return ResponseEntity.ok("注册成功");
+ return ApiResponse.message("注册成功");
}
// 用户登录
@PostMapping("/login")
- public ResponseEntity<?> login(@RequestBody User user) {
+ public ApiResponse<Map<String, String>> login(@RequestBody User user) {
User existingUser = userService.getUserByEmail(user.getEmail());
if (existingUser == null || !passwordEncoder.matches(user.getPassword(), existingUser.getPassword())) {
- return ResponseEntity.badRequest().body("用户名或密码错误");
+ return ApiResponse.error(400, "用户名或密码错误");
}
+
String token = jwtUtil.generateToken(existingUser.getUserId());
Map<String, String> response = new HashMap<>();
response.put("token", token);
- return ResponseEntity.ok(response);
+
+ return ApiResponse.success(response);
}
+ // 测试 Redis
@GetMapping("/test_redis")
- public ResponseEntity<?> testRedis() {
- redisTemplate.opsForValue().get("test");
- return ResponseEntity.ok("test redis ok");
+ public ApiResponse<String> testRedis() {
+ Object value = redisTemplate.opsForValue().get("test");
+ return ApiResponse.success("test redis ok");
}
-}
\ No newline at end of file
+}