用户退出功能实现

用户退出将Redis的token自动添加到黑名单
优化喵
2026-01-02 12:46:44 +08:00 · 2026-01-02 11:56:21 +08:00 · 2026-01-02 11:40:14 +08:00 · 2026-01-02 11:09:12 +08:00 · 2026-01-02 10:38:00 +08:00 · 2026-01-01 21:26:09 +08:00
38 changed files with 332 additions and 1080 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,11 @@
            <version>3.5.10</version>
        </dependency>

+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
@@ -56,6 +61,12 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
+        
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+        </dependency>

        <!-- JUnit Platform Launcher for resolving junit-platform-launcher:1.8.2 issue -->
        <dependency>
@@ -71,13 +82,6 @@
            <version>3.12.0</version>
        </dependency>

-        <!-- OkHttp（用于调用API） -->
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.12.0</version>
-        </dependency>
-
        <!-- AOP起步依赖 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -155,12 +159,6 @@
            <artifactId>spring-boot-starter-mail</artifactId>
        </dependency>

-        <!-- Redis 依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
    </dependencies>
    <dependencyManagement>
        <dependencies>
--- a/src/main/java/com/bao/dating/anno/Log.java
+++ b/src/main/java/com/bao/dating/anno/Log.java
@@ -0,0 +1,11 @@
+package com.bao.dating.anno;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Log {
+}
--- a/src/main/java/com/bao/dating/aspect/LoggingAspect.java
+++ b/src/main/java/com/bao/dating/aspect/LoggingAspect.java
@@ -0,0 +1,48 @@
+package com.bao.dating.aspect;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.springframework.stereotype.Component;
+
+/**
+ * 日志切面
+ * @author KilLze
+ */
+@Aspect
+@Component
+@Slf4j
+public class LoggingAspect {
+    @Pointcut("execution(* com.bao.dating.service.impl.*.*(..))")
+    private void pt(){}
+
+    /**
+     * 方法执行前执行
+     * @param joinPoint 方法参数
+     */
+    @Before("pt()")
+    public void logBeforeMethod(JoinPoint joinPoint){
+        // 获取方法名
+        String methodName = joinPoint.getSignature().getName();
+        // 获取参数
+        Object[] args = joinPoint.getArgs();
+        log.info("方法 {} 开始执行，参数: {}", methodName, args);
+    }
+
+    /**
+     * 方法执行成功后执行
+     * @param joinPoint 方法参数
+     */
+    @AfterReturning(pointcut = "pt()", returning = "result")
+    public void logAfterMethod(JoinPoint joinPoint, Object result){
+        String methodName = joinPoint.getSignature().getName();
+        log.info("方法 {} 执行成功,返回值: {}", methodName, result);
+    }
+
+    @AfterThrowing(pointcut = "pt()", throwing = "exception")
+    public void logAfterThrowing(JoinPoint joinPoint, Exception exception){
+        String methodName = joinPoint.getSignature().getName();
+        log.error("方法 {} 执行异常", methodName, exception);
+    }
+}
--- a/src/main/java/com/bao/dating/aspect/OperateLogAspect.java
+++ b/src/main/java/com/bao/dating/aspect/OperateLogAspect.java
@@ -0,0 +1,64 @@
+package com.bao.dating.aspect;
+
+
+import com.bao.dating.context.UserContext;
+import com.bao.dating.mapper.OperateLogMapper;
+import com.bao.dating.pojo.entity.OperateLog;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+/**
+ * 记录操作日志
+ * @author KilLze
+ */
+@Slf4j
+@Aspect
+@Component
+public class OperateLogAspect {
+
+    @Autowired
+    private OperateLogMapper operateLogMapper;
+
+    @Around("@annotation(com.bao.dating.anno.Log)")
+    public Object logOperate(ProceedingJoinPoint pjp) throws Throwable{
+
+        // 记录方法开始的时间
+        long startTime = System.currentTimeMillis();
+
+        // 执行目标方法
+        Object result = pjp.proceed();
+
+        long endTime = System.currentTimeMillis();
+        long costTime = endTime - startTime;
+
+
+        // 构建日志对象
+        OperateLog operatelog = new OperateLog();
+        operatelog.setOperateUserId(getUserId());
+        operatelog.setOperateTime(LocalDateTime.now());
+        operatelog.setClassName(pjp.getTarget().getClass().getName());
+        operatelog.setMethodName(pjp.getSignature().getName());
+        operatelog.setMethodParams(Arrays.toString(pjp.getArgs()));
+        operatelog.setReturnValue(result != null ? result.toString() : "void");
+        operatelog.setCostTime(costTime);
+
+        log.info("记录操作日志: {}", operatelog);
+
+        operateLogMapper.insert(operatelog);
+
+        return result;
+    }
+
+    private Long getUserId() {
+        return UserContext.getUserId();
+    }
+
+}
--- a/src/main/java/com/bao/dating/aspect/RecordTimeAspect.java
+++ b/src/main/java/com/bao/dating/aspect/RecordTimeAspect.java
@@ -1,31 +0,0 @@
-package com.bao.dating.aspect;
-
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.stereotype.Component;
-
-/**
- *  记录方法运行耗时
- *   @author KilLze
- */
-@Slf4j
-@Aspect
-@Component
-public class RecordTimeAspect {
-    @Around("execution(* com.bao.dating.service.impl.*.*(..))")
-    public Object recordTime(ProceedingJoinPoint pjp) throws Throwable {
-        //1. 记录方法运行的开始时间
-        long begin = System.currentTimeMillis();
-
-        //2. 执行原始的方法
-        Object result = pjp.proceed();
-
-        //3. 记录方法运行的结束时间, 记录耗时
-        long end = System.currentTimeMillis();
-        log.info("方法 {} 执行耗时: {}ms", pjp.getSignature() ,end-begin);
-        return  result;
-    }
-
-}
--- a/src/main/java/com/bao/dating/common/ResultCode.java
+++ b/src/main/java/com/bao/dating/common/ResultCode.java
@@ -19,14 +19,6 @@ public enum ResultCode {
    FORBIDDEN(403, "无权限"),
    /** 数据不存在 */
    NOT_FOUND(404, "数据不存在"),
-    /** 验证码已发送 */
-    CODE_SENT(200, "验证码已发送"),
-    /** 验证码错误 */
-    CODE_ERROR(400, "验证码错误"),
-    /** 验证码已过期 */
-    CODE_EXPIRED(400, "验证码已过期"),
-    /** 验证码发送失败 */
-    CODE_SEND_FAIL(500, "验证码发送失败"),
    /** 系统异常 */
    SYSTEM_ERROR(500, "系统异常"),
    /** 操作失败 */
--- a/src/main/java/com/bao/dating/common/aliyun/SmsUtil.java
+++ b/src/main/java/com/bao/dating/common/aliyun/SmsUtil.java
@@ -149,4 +149,3 @@ public class SmsUtil {



-
--- a/src/main/java/com/bao/dating/common/ip2location/Ip2LocationConfig.java
+++ b/src/main/java/com/bao/dating/common/ip2location/Ip2LocationConfig.java
@@ -1,14 +0,0 @@
-package com.bao.dating.common.ip2location;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "ip2location.api")
-public class Ip2LocationConfig {
-    private String key;
-    private String url;
-    private int timeout;
-}
--- a/src/main/java/com/bao/dating/config/RedisConfig.java
+++ b/src/main/java/com/bao/dating/config/RedisConfig.java
@@ -0,0 +1,29 @@
+package com.bao.dating.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * Redis 配置类
+ * @author KilLze
+ */
+@Configuration
+public class RedisConfig {
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        // 创建RedisTemplate对象
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        // 设置redis的连接工厂对象
+        redisTemplate.setConnectionFactory(redisConnectionFactory);
+
+        // key 使用 String
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+
+        return redisTemplate;
+    }
+}
--- a/src/main/java/com/bao/dating/config/WebConfig.java
+++ b/src/main/java/com/bao/dating/config/WebConfig.java
@@ -29,7 +29,7 @@ public class WebConfig implements WebMvcConfigurer {
                .addPathPatterns("/**")
                // 忽略的接口
                .excludePathPatterns(
-                        "/user/login","/user/register","/user/emailLogin","/ip/location"
+                        "/user/login"
                );
    }
 }
--- a/src/main/java/com/bao/dating/controller/IpLocationController.java
+++ b/src/main/java/com/bao/dating/controller/IpLocationController.java
@@ -1,37 +0,0 @@
-package com.bao.dating.controller;
-
-import com.bao.dating.common.Result;
-import com.bao.dating.common.ResultCode;
-import com.bao.dating.pojo.vo.IpLocationVO;
-import com.bao.dating.service.Ip2LocationClientService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/ip")
-public class IpLocationController {
-    @Autowired
-    private Ip2LocationClientService ip2LocationClientService;
-    /**
-     * 前端访问接口，获取IP地址位置信息
-     * @param ip 可选参数，要查询的IP地址
-     * @return IP位置信息（JSON格式）
-     */
-    @GetMapping("/location")
-    public Result<?> getIpLocation(@RequestParam(required = false) String ip) {
-        if (ip.isEmpty()){
-            return Result.error(ResultCode.PARAM_ERROR);
-        }
-        try {
-            // 调用工具类获取API响应
-            IpLocationVO ipLocationVo = ip2LocationClientService.getIpLocation(ip);
-            return Result.success(ResultCode.SUCCESS,ipLocationVo);
-        } catch (Exception e) {
-            // 异常处理：返回错误信息（实际项目建议封装统一响应格式）
-            return Result.error(ResultCode.SYSTEM_ERROR,e.getMessage());
-        }
-    }
-}
--- a/src/main/java/com/bao/dating/controller/PostController.java
+++ b/src/main/java/com/bao/dating/controller/PostController.java
@@ -1,6 +1,7 @@
 package com.bao.dating.controller;


+import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.pojo.dto.PostRequestDTO;
@@ -30,6 +31,7 @@ public class PostController {
     * @param files 媒体文件数组
     * @return 上传后的文件URL列表
     */
+    @Log
    @PostMapping(value = "/upload", consumes = "multipart/form-data")
    public Result<List<String>> uploadMedia(@RequestParam("files") MultipartFile[] files) {
        List<String> fileUrls = postService.uploadMedia(files);
@@ -41,6 +43,7 @@ public class PostController {
     * @param postDTO 动态信息
     * @return 发布的动态对象
     */
+    @Log
    @PostMapping( "/createPost")
    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
        // 调用 Service 层处理发布动态业务逻辑
@@ -54,6 +57,7 @@ public class PostController {
     * @param postIds 动态ID
     * @return 删除结果
     */
+    @Log
    @PostMapping("/deletePost")
    public Result<String> deleteById(@RequestBody List<Long> postIds){
        int deletedCount = postService.deletePostById(postIds);
@@ -65,7 +69,7 @@ public class PostController {
     * @param postId 动态ID
     * @return 动态对象
     */
-    @PostMapping("/{postId}")
+    @GetMapping("/{postId}")
    public Result<PostEditVO> getPostById(@PathVariable Long postId) {
        PostEditVO postEditVO = postService.getPostForEdit(postId);
        return Result.success(ResultCode.SUCCESS,"查询成功", postEditVO);
@@ -77,6 +81,7 @@ public class PostController {
     * @param postRequestDTO 动态信息
     * @return 更新后的动态对象
     */
+    @Log
    @PostMapping("/{postId}/updatePost")
    public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
        PostEditVO result = postService.updatePost(postId, postRequestDTO);
--- a/src/main/java/com/bao/dating/controller/PostFavoriteController.java
+++ b/src/main/java/com/bao/dating/controller/PostFavoriteController.java
@@ -2,13 +2,11 @@ package com.bao.dating.controller;

 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
-import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.User;
 import com.bao.dating.service.PostFavoriteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

-import java.util.List;
 import java.util.Map;

@RestController
@@ -16,13 +14,6 @@ import java.util.Map;
 public class PostFavoriteController {
    @Autowired
    private PostFavoriteService postFavoriteService;
-
-    /**
-     * 收藏
-     * @param postId 动态ID
-     * @param user 当前登录用户对象
-     * @return 结果
-     */
    @PostMapping("/{post_id}/favorites")
    public Result<Map<String,Long>> addPostFavorite(@PathVariable("post_id")Long postId, User user){
        if (user == null){
@@ -31,13 +22,6 @@ public class PostFavoriteController {
        Long userId = user.getUserId();
        return postFavoriteService.postFavorite(userId,postId);
    }
-
-    /**
-     * 取消收藏
-     * @param postId 动态id
-     * @param user 登录用户
-     * @return 结果
-     */
    @DeleteMapping("/{post_id}/favorites")
    public Result<?> deletePostFavorite(@PathVariable("post_id")Long postId, User user){
        if (user == null){
@@ -46,21 +30,4 @@ public class PostFavoriteController {
        Long userId = user.getUserId();
        return postFavoriteService.deletePostFavorite(userId, postId);
    }
-
-    /**
-     * 展示所有收藏
-     * @param user 当前登录用户
-     * @return 结果
-     */
-    @GetMapping("/showFavorites")
-    public Result<List<Post>> showPostFavorites(@RequestBody User user){
-        //校验参数
-        if (user == null){
-            return Result.error(ResultCode.PARAM_ERROR);
-        }
-        Long userId = user.getUserId();
-        List<Post> posts = postFavoriteService.selectAllFavorites(userId);
-        return Result.success(ResultCode.SUCCESS,posts);
-    }
-
 }
--- a/src/main/java/com/bao/dating/controller/PostLikeController.java
+++ b/src/main/java/com/bao/dating/controller/PostLikeController.java
@@ -2,13 +2,11 @@ package com.bao.dating.controller;

 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
-import com.bao.dating.mapper.PostLikeMapper;
 import com.bao.dating.service.PostLikeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

 import java.util.Map;
-import java.util.Objects;

@RestController
@RequestMapping("/posts")
--- a/src/main/java/com/bao/dating/controller/UserController.java
+++ b/src/main/java/com/bao/dating/controller/UserController.java
@@ -1,5 +1,6 @@
 package com.bao.dating.controller;

+import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.context.UserContext;
@@ -8,10 +9,12 @@ import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
+import io.jsonwebtoken.Jwt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import javax.servlet.http.HttpServletRequest;

 /**
 * 用户接口
@@ -35,6 +38,17 @@ public class UserController {
        return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
    }

+    /**
+     * 退出登录
+     * 从请求头中获取token并将其加入黑名单
+     */
+    @PostMapping("/logout")
+    public Result<Void> logout(HttpServletRequest request) {
+        String token = request.getHeader("token");
+        userService.logout(token);
+        return Result.success(ResultCode.SUCCESS,"退出登录成功",null);
+    }
+
    /**
     * 获取用户信息
     * @return 用户信息
@@ -51,6 +65,7 @@ public class UserController {
     * @param file 头像文件
     * @return 上传后的文件URL列表
     */
+    @Log
    @PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
    public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
        String fileUrl = userService.uploadAvatar(file);
@@ -62,6 +77,7 @@ public class UserController {
     * @param file 背景文件
     * @return 上传后的文件URL列表
     */
+    @Log
    @PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
    public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
        String fileUrl = userService.uploadBackground(file);
@@ -73,6 +89,7 @@ public class UserController {
     * @param userInfoUpdateDTO 用户信息更新参数
     * @return 更新后的用户信息
     */
+    @Log
    @PostMapping("/info/update")
    public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
        Long userId = UserContext.getUserId();
@@ -80,42 +97,4 @@ public class UserController {
        UserInfoVO userInfoVO =userService.updateUserInfo(userInfoUpdateDTO);
        return Result.success(ResultCode.SUCCESS, "用户信息更新成功", userInfoVO);
    }
-
-    /**
-     * 用户注册
-     * @param userName 用户名称
-     * @param userPassword 用户密码
-     * @return 返回
-     */
-    @PostMapping("/register")
-    public Result<?> userRegister(@RequestParam String userName , @RequestParam String userPassword){
-        //校验参数是否为空
-        if (userName.isEmpty() || userPassword.isEmpty()){
-            return Result.error(ResultCode.PARAM_ERROR);
-        }
-        if (!userService.registerUser(userName,userPassword)){
-            return Result.error(ResultCode.FAIL);
-        }
-        return Result.success(ResultCode.SUCCESS,"用户注册成功",null);
-    }
-
-    /**
-     * 通过邮箱登录
-     * @param email 邮箱
-     * @param code 验证码
-     * @return 用户信息
-     */
-    @PostMapping("/emailLogin")
-    public Result<UserLoginVO> emailLogin(@RequestParam String email , @RequestParam String code){
-        //校验参数是否为空
-        if (email.isEmpty() || code.isEmpty()){
-            return Result.error(ResultCode.PARAM_ERROR);
-        }
-        UserLoginVO userLoginVO = userService.emailLogin(email, code);
-        if (userLoginVO == null){
-            return Result.error(ResultCode.FAIL,"请先注册用户或添加邮箱");
-        }
-        return Result.success(ResultCode.SUCCESS,"用户登录成功",userLoginVO);
-    }
-
 }
--- a/src/main/java/com/bao/dating/controller/VerificationCodeController.java
+++ b/src/main/java/com/bao/dating/controller/VerificationCodeController.java
@@ -1,90 +0,0 @@
-package com.bao.dating.controller;
-
-import com.bao.dating.common.Result;
-import com.bao.dating.common.ResultCode;
-import com.bao.dating.service.VerificationCodeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 验证码控制器
- * @author KilLze
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/verification")
-public class VerificationCodeController {
-
-    @Autowired
-    private VerificationCodeService verificationCodeService;
-
-    /**
-     * 发送邮箱验证码
-     * @param email 邮箱地址
-     * @return 结果
-     */
-    @PostMapping("/send-email-code")
-    public Result<String> sendEmailCode(@RequestParam String email) {
-        // 参数校验
-        if (!StringUtils.hasText(email)) {
-            return Result.error(ResultCode.PARAM_ERROR, "邮箱地址不能为空");
-        }
-        
-        // 简单的邮箱格式校验
-        if (!isValidEmail(email)) {
-            return Result.error(ResultCode.PARAM_ERROR, "邮箱格式不正确");
-        }
-        
-        // 发送验证码
-        boolean success = verificationCodeService.sendEmailCode(email);
-        
-        if (success) {
-            return Result.success(ResultCode.CODE_SENT, "验证码已发送到您的邮箱，请查收");
-        } else {
-            return Result.error(ResultCode.CODE_SEND_FAIL, "验证码发送失败，请稍后重试");
-        }
-    }
-
-    /**
-     * 验证邮箱验证码
-     * @param email 邮箱地址
-     * @param code 验证码
-     * @return 结果
-     */
-    @PostMapping("/verify-email-code")
-    public Result<String> verifyEmailCode(@RequestParam String email, @RequestParam String code) {
-        // 参数校验
-        if (!StringUtils.hasText(email)) {
-            return Result.error(ResultCode.PARAM_ERROR, "邮箱地址不能为空");
-        }
-        
-        if (!StringUtils.hasText(code)) {
-            return Result.error(ResultCode.PARAM_ERROR, "验证码不能为空");
-        }
-        
-        // 验证验证码
-        boolean success = verificationCodeService.verifyEmailCode(email, code);
-        
-        if (success) {
-            return Result.success(ResultCode.SUCCESS, "验证码验证成功");
-        } else {
-            return Result.error(ResultCode.CODE_ERROR, "验证码错误或已过期");
-        }
-    }
-
-    /**
-     * 简单的邮箱格式校验
-     * @param email 邮箱地址
-     * @return 是否有效
-     */
-    private boolean isValidEmail(String email) {
-        if (email == null || email.trim().isEmpty()) {
-            return false;
-        }
-        // 简单的邮箱格式校验：包含@和.
-        return email.contains("@") && email.contains(".") && email.length() > 5;
-    }
-}
-
--- a/src/main/java/com/bao/dating/handler/GlobalExceptionHandler.java
+++ b/src/main/java/com/bao/dating/handler/GlobalExceptionHandler.java
@@ -4,7 +4,6 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -15,7 +14,7 @@ import org.springframework.web.method.annotation.MethodArgumentTypeMismatchExcep
 import org.springframework.web.servlet.NoHandlerFoundException;

 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.stream.Collectors;

 /**
 * 全局异常处理器
@@ -32,7 +31,12 @@ public class GlobalExceptionHandler {
    @ExceptionHandler(MethodArgumentNotValidException.class)
    public Result<String> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
        log.error("参数验证失败: {}", e.getMessage());
-        return Result.error(ResultCode.PARAM_ERROR, e.getBindingResult().getFieldError().getDefaultMessage());
+        String msg = e.getBindingResult()
+                .getFieldErrors()
+                .stream()
+                .map(error -> error.getField() + "：" + error.getDefaultMessage())
+                .collect(Collectors.joining("; "));
+        return Result.error(ResultCode.PARAM_ERROR, msg);
    }

    /**
--- a/src/main/java/com/bao/dating/interceptor/TokenInterceptor.java
+++ b/src/main/java/com/bao/dating/interceptor/TokenInterceptor.java
@@ -5,7 +5,10 @@ import javax.servlet.http.HttpServletResponse;

 import com.bao.dating.context.UserContext;
 import com.bao.dating.util.JwtUtil;
+import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -18,6 +21,10 @@ import org.springframework.web.servlet.HandlerInterceptor;
@Slf4j
@Component
 public class TokenInterceptor implements HandlerInterceptor {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
    /**
     * 在请求处理之前进行拦截
     * 从请求头或URL参数中获取token，验证其有效性，并将用户ID保存到ThreadLocal中
@@ -45,13 +52,39 @@ public class TokenInterceptor implements HandlerInterceptor {
            if (!JwtUtil.validateToken(token)) {
                log.error("Token无效或已过期");
                response.setStatus(401);
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("Token无效或已过期");
+                return false;
+            }
+
+            // 检查 token 是否在黑名单中
+            Object blacklistToken = redisTemplate.opsForValue().get("jwt:blacklist:" + token);
+            if (blacklistToken != null) {
+                log.error("Token已在黑名单中");
+                response.setStatus(401);
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("登录已失效, 请重新登录");
                return false;
            }
            
            // 解析 token
            String userId = JwtUtil.getSubjectFromToken(token);
+
+            // 从Redis获取存储的token进行比对
+            Object redisTokenObj = redisTemplate.opsForValue()
+                    .get("login:token:" + userId);
+            String redisToken = redisTokenObj != null ? redisTokenObj.toString() : null;
+
+            // 验证Redis中的token是否存在且匹配
+            if (redisToken == null || !redisToken.equals(token)) {
+                log.error("登录已失效");
+                response.setStatus(401);
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("登录已失效");
+                return false;
+            }
+
            log.info("用户: {}", userId);
-            
            // 保存 userId 到 ThreadLocal
            UserContext.setUserId(Long.valueOf(userId));
            return true;
--- a/src/main/java/com/bao/dating/mapper/OperateLogMapper.java
+++ b/src/main/java/com/bao/dating/mapper/OperateLogMapper.java
@@ -0,0 +1,19 @@
+package com.bao.dating.mapper;
+
+
+import com.bao.dating.pojo.entity.OperateLog;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 操作日志Mapper
+ * @author KilLze
+ */
+@Mapper
+public interface OperateLogMapper {
+
+    @Insert("insert into operate_log (operate_user_id, operate_time, class_name, method_name, method_params, return_value, cost_time) " +
+            "values (#{operateUserId}, #{operateTime}, #{className}, #{methodName}, #{methodParams}, #{returnValue}, #{costTime});")
+    public void insert(OperateLog log);
+
+}
--- a/src/main/java/com/bao/dating/mapper/PostFavoriteMapper.java
+++ b/src/main/java/com/bao/dating/mapper/PostFavoriteMapper.java
@@ -1,6 +1,5 @@
 package com.bao.dating.mapper;

-import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -11,10 +10,6 @@ import java.util.List;
 public interface PostFavoriteMapper {
    //查询当前已收藏所有用户
    List<Long> selectUserIDByPostID(@Param("postId") Long postId);
-    //添加收藏
    int addPostFavorite(PostFavorite postFavorite);
-    //删除收藏
    int deletePostFavorite(@Param("postId") Long postId);
-    //查询用户所有收藏
-    List<Post> showAllFavorites(@Param("userid")Long userid);
 }
--- a/src/main/java/com/bao/dating/mapper/UserMapper.java
+++ b/src/main/java/com/bao/dating/mapper/UserMapper.java
@@ -3,7 +3,6 @@ package com.bao.dating.mapper;
 import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.entity.User;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;

 /**
 * 用户Mapper
@@ -34,25 +33,4 @@ public interface UserMapper {
     */
    void updateUserInfoByUserId(UserInfoUpdateDTO userInfoUpdateDTO);

-    /**
-     * 添加用户
-     * @param user 用户对象
-     * @return 受影响行数
-     */
-    int saveUser(User user);
-
-    /**
-     * 查询最大用户id
-     * @return 用户id
-     */
-    Long selectMaxId();
-
-    /**
-     * 根据邮箱查询用户
-     * @param email 用户邮箱
-     * @return 用户信息
-     */
-    User selectByUserEmailUser(@Param("userEmail") String email);
-
-
 }
--- a/src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java
+++ b/src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java
@@ -2,6 +2,7 @@ package com.bao.dating.pojo.dto;

 import lombok.Data;

+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
 * @author KilLze
 */
@Data
-public class UserInfoUpdateDTO {
+public class UserInfoUpdateDTO implements Serializable {
    private Long userId;
    private String userName;
    private String nickname;
--- a/src/main/java/com/bao/dating/pojo/entity/OperateLog.java
+++ b/src/main/java/com/bao/dating/pojo/entity/OperateLog.java
@@ -0,0 +1,30 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 操作日志
+ * @author KilLze
+ */
+@Data
+public class OperateLog implements Serializable {
+    /** ID */
+    private Long id;
+    /** 操作人ID */
+    private Long operateUserId;
+    /** 操作时间 */
+    private LocalDateTime operateTime;
+    /** 操作类名 */
+    private String className;
+    /** 操作方法名 */
+    private String methodName;
+    /** 操作方法参数 */
+    private String methodParams;
+    /** 操作方法返回值 */
+    private String returnValue;
+    /** 操作耗时 */
+    private Long costTime;
+}
--- a/src/main/java/com/bao/dating/pojo/vo/IpLocationVO.java
+++ b/src/main/java/com/bao/dating/pojo/vo/IpLocationVO.java
@@ -1,30 +0,0 @@
-package com.bao.dating.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class IpLocationVO {
-    // 国家
-    @JsonProperty("country_name")
-    private String countryName;
-    // 省份/地区
-    @JsonProperty("region_name")
-    private String regionName;
-    // 城市
-    @JsonProperty("city_name")
-    private String cityName;
-    // 纬度
-    private String latitude;
-    // 经度
-    private String longitude;
-    // ISP运营商
-    @JsonProperty("isp")
-    private String isp;
-}
--- a/src/main/java/com/bao/dating/service/Ip2LocationClientService.java
+++ b/src/main/java/com/bao/dating/service/Ip2LocationClientService.java
@@ -1,7 +0,0 @@
-package com.bao.dating.service;
-
-import com.bao.dating.pojo.vo.IpLocationVO;
-
-public interface Ip2LocationClientService {
-    IpLocationVO getIpLocation(String ip)throws Exception;
-}
--- a/src/main/java/com/bao/dating/service/PostFavoriteService.java
+++ b/src/main/java/com/bao/dating/service/PostFavoriteService.java
@@ -1,13 +1,10 @@
 package com.bao.dating.service;

 import com.bao.dating.common.Result;
-import com.bao.dating.pojo.entity.Post;

-import java.util.List;
 import java.util.Map;

 public interface PostFavoriteService {
    Result<Map<String,Long>> postFavorite(Long userid,Long postId);
    Result<?> deletePostFavorite(Long userid,Long postId);
-    List<Post> selectAllFavorites(Long userid);
 }
--- a/src/main/java/com/bao/dating/service/UserService.java
+++ b/src/main/java/com/bao/dating/service/UserService.java
@@ -2,7 +2,6 @@ package com.bao.dating.service;

 import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
-import com.bao.dating.pojo.entity.User;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import org.springframework.web.multipart.MultipartFile;
@@ -19,6 +18,13 @@ public interface UserService {
     */
    UserLoginVO userLogin(UserLoginDTO userLoginDTO);

+    /**
+     * 退出登录
+     * @param token 登录凭证
+     * @return 注册结果
+     */
+    void logout(String token);
+
    /**
     * 查询个人信息
     * @param userId 动态ID
@@ -46,19 +52,4 @@ public interface UserService {
     * @return 更新后的用户信息
     */
    UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
-
-    /**
-     * 用户注册
-     * @param userName 用户民称
-     * @return 用户信息
-     */
-    Boolean registerUser(String userName,String userPassword);
-
-    /**
-     * 邮箱登录
-     * @param email 邮箱
-     * @param code 验证码
-     * @return
-     */
-    UserLoginVO emailLogin(String email , String code);
 }
--- a/src/main/java/com/bao/dating/service/VerificationCodeService.java
+++ b/src/main/java/com/bao/dating/service/VerificationCodeService.java
@@ -1,31 +0,0 @@
-package com.bao.dating.service;
-
-/**
- * 验证码服务接口
- * @author KilLze
- */
-public interface VerificationCodeService {
-    
-    /**
-     * 发送邮箱验证码
-     * @param email 邮箱地址
-     * @return 是否发送成功
-     */
-    boolean sendEmailCode(String email);
-    
-    /**
-     * 验证邮箱验证码
-     * @param email 邮箱地址
-     * @param code 验证码
-     * @return 是否验证成功
-     */
-    boolean verifyEmailCode(String email, String code);
-    
-    /**
-     * 生成验证码
-     * @param length 验证码长度（默认6位）
-     * @return 验证码字符串
-     */
-    String generateCode(int length);
-}
-
--- a/src/main/java/com/bao/dating/service/impl/Ip2LocationClientServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/Ip2LocationClientServiceImpl.java
@@ -1,67 +0,0 @@
-package com.bao.dating.service.impl;
-
-import com.bao.dating.common.ip2location.Ip2LocationConfig;
-import com.bao.dating.pojo.vo.IpLocationVO;
-import com.bao.dating.service.Ip2LocationClientService;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import java.net.URI;
-
-@Service
-public class Ip2LocationClientServiceImpl implements Ip2LocationClientService {
-    @Autowired
-    private Ip2LocationConfig ip2LocationConfig;
-
-    // Jackson的ObjectMapper，用于JSON解析
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    /**
-     * 调用API并只返回核心位置信息
-     * @param ip 要查询的IP地址
-     * @return 精简的位置信息实体类
-     * @throws Exception 异常
-     */
-    @Override
-    public IpLocationVO getIpLocation(String ip) throws Exception {
-        // 1. 构建请求URL
-        URIBuilder uriBuilder = new URIBuilder(ip2LocationConfig.getUrl());
-        uriBuilder.addParameter("key", ip2LocationConfig.getKey());
-        if (ip != null && !ip.trim().isEmpty()) {
-            uriBuilder.addParameter("ip", ip);
-        }
-        URI uri = uriBuilder.build();
-
-        // 2. 配置超时时间（逻辑和之前一致）
-        RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectTimeout(ip2LocationConfig.getTimeout())
-                .setSocketTimeout(ip2LocationConfig.getTimeout())
-                .build();
-
-        // 3. 发送请求并解析响应
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            HttpGet httpGet = new HttpGet(uri);
-            httpGet.setConfig(requestConfig);
-
-            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
-                if (response.getStatusLine().getStatusCode() == 200) {
-                    String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8");
-                    // 核心：将完整JSON解析为只包含位置信息的VO类
-                    return objectMapper.readValue(jsonStr, IpLocationVO.class);
-                } else {
-                    throw new RuntimeException("调用API失败，状态码：" + response.getStatusLine().getStatusCode());
-                }
-            }
-        }
-    }
-
-}
--- a/src/main/java/com/bao/dating/service/impl/PostFavoriteServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/PostFavoriteServiceImpl.java
@@ -4,7 +4,6 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.mapper.PostFavoriteMapper;
 import com.bao.dating.mapper.PostMapper;
-import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import com.bao.dating.service.PostFavoriteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,18 +58,4 @@ public class PostFavoriteServiceImpl implements PostFavoriteService {
        postMapper.decreaseFavoriteCount(postId);
        return null;
    }
-
-    /**
-     * 展示所有收藏
-     * @param userid 用户id
-     * @return 查询到的结果
-     */
-
-    @Override
-    public List<Post> selectAllFavorites(Long userid) {
-        if (userid == null){
-            return null;
-        }
-        return postFavoriteMapper.showAllFavorites(userid);
-    }
 }
--- a/src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
@@ -1,12 +1,11 @@
 package com.bao.dating.service.impl;

-import com.bao.dating.common.Result;
-import com.bao.dating.common.ResultCode;
 import com.bao.dating.common.aliyun.AliOssUtil;
 import com.bao.dating.common.aliyun.GreenImageScan;
 import com.bao.dating.common.aliyun.GreenTextScan;
 import com.bao.dating.common.result.AliOssResult;
 import com.bao.dating.common.result.GreenAuditResult;
+import com.bao.dating.config.RedisConfig;
 import com.bao.dating.context.UserContext;
 import com.bao.dating.mapper.UserMapper;
 import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
@@ -15,21 +14,20 @@ import com.bao.dating.pojo.entity.User;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
-import com.bao.dating.service.VerificationCodeService;
 import com.bao.dating.util.FileUtil;
 import com.bao.dating.util.JwtUtil;
 import com.bao.dating.util.MD5Util;
+import io.jsonwebtoken.Claims;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;


 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.TimeUnit;

 /**
 * 用户服务实现类
@@ -49,10 +47,10 @@ public class UserServiceImpl implements UserService {
    private GreenImageScan greenImageScan;

    @Autowired
-    private UserMapper userMapper;
+    private RedisTemplate<String, Object> redisTemplate;

    @Autowired
-    private VerificationCodeService verificationCodeService;
+    private UserMapper userMapper;

    /**
     * 用户登录
@@ -82,6 +80,15 @@ public class UserServiceImpl implements UserService {
        }
        // 生成token
        String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
+
+        String redisKey = "login:token:" + user.getUserId();
+        redisTemplate.opsForValue().set(
+                redisKey,
+                token,
+                7,
+                TimeUnit.DAYS
+        );
+
        // 封装返回
        UserLoginVO userLoginVO = new UserLoginVO();
        userLoginVO.setUserId(user.getUserId());
@@ -90,6 +97,29 @@ public class UserServiceImpl implements UserService {
        return userLoginVO;
    }

+    /**
+     * 退出登录
+     * @param token 登录凭证
+     */
+    @Override
+    public void logout(String token) {
+        Claims claims = JwtUtil.getClaimsFromToken(token);
+        Date expiration = claims.getExpiration();
+        // 判断 token 是否已过期
+        long ttl = expiration.getTime() - System.currentTimeMillis();
+        // 如果 token 已过期，则不用处理
+        if (ttl <= 0) {
+            return;
+        }
+
+        String logoutKey = "jwt:blacklist:" + token;
+        redisTemplate.opsForValue().set(
+                logoutKey,
+                "logout",
+                ttl,
+                TimeUnit.MILLISECONDS);
+    }
+
    /**
     * 获取用户信息
     *
@@ -281,59 +311,4 @@ public class UserServiceImpl implements UserService {
        BeanUtils.copyProperties(updatedUser, userInfoVO);
        return userInfoVO;
    }
-
-    /**
-     * 查询用户
-     * @param userName 用户民称
-     * @return
-     */
-    @Override
-    public Boolean registerUser(String userName,String userPassword) {
-        //校验参数是否为空
-        if (userName.isEmpty() || userPassword.isEmpty()){
-            return false;
-        }
-        //产看数据库是否存在已注册用户
-        User user = userMapper.getByUsername(userName);
-        if (user != null){
-            return false;
-        }
-        //将用户数据存入苏数据库
-        String salt = "lyy123";
-        String passwordHash = MD5Util.encryptWithSalt(userPassword, salt);
-        //查询最大用户id
-        Long maxId = userMapper.selectMaxId();
-        User saveUser = new User();
-        saveUser.setUserId(maxId+1);
-        saveUser.setUserName(userName);
-        saveUser.setPasswordHash(passwordHash);
-        saveUser.setSalt(salt);
-        saveUser.setUpdatedAt(LocalDateTime.now());
-        saveUser.setCreatedAt(LocalDateTime.now());
-        int count = userMapper.saveUser(saveUser);
-        return count > 0;
-    }
-
-    /**
-     * 邮箱登录
-     * @param email 邮箱
-     * @param code 验证码
-     * @return 脱敏用户信息
-     */
-    @Override
-    public UserLoginVO emailLogin(String email, String code) {
-        User user = userMapper.selectByUserEmailUser(email);
-        if (user == null)
-            return null;
-        boolean flag = verificationCodeService.verifyEmailCode(email, code);
-        if (!flag)
-            return null;
-        // 生成token
-        String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
-        UserLoginVO userLoginVO = new UserLoginVO();
-        userLoginVO.setUserId(user.getUserId());
-        userLoginVO.setNickname(user.getNickname());
-        userLoginVO.setToken(token);
-        return userLoginVO;
-    }
 }
--- a/src/main/java/com/bao/dating/service/impl/VerificationCodeServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/VerificationCodeServiceImpl.java
@@ -1,122 +0,0 @@
-package com.bao.dating.service.impl;
-
-import com.bao.dating.service.VerificationCodeService;
-import com.bao.dating.util.EmailUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 验证码服务实现类
- * @author KilLze
- */
-@Slf4j
-@Service
-public class VerificationCodeServiceImpl implements VerificationCodeService {
-
-    @Autowired
-    private EmailUtil emailUtil;
-
-    @Autowired
-    private StringRedisTemplate redisTemplate;
-
-    /**
-     * Redis中验证码的key前缀
-     */
-    private static final String CODE_KEY_PREFIX = "email:code:";
-
-    /**
-     * 验证码过期时间（分钟）
-     */
-    private static final long CODE_EXPIRE_MINUTES = 10;
-
-    /**
-     * 验证码长度
-     */
-    private static final int CODE_LENGTH = 6;
-
-    /**
-     * 发送邮箱验证码
-     * @param email 邮箱地址
-     * @return 是否发送成功
-     */
-    @Override
-    public boolean sendEmailCode(String email) {
-        try {
-            // 生成验证码
-            String code = generateCode(CODE_LENGTH);
-            
-            // 存储到Redis，设置过期时间
-            String key = CODE_KEY_PREFIX + email;
-            redisTemplate.opsForValue().set(key, code, CODE_EXPIRE_MINUTES, TimeUnit.MINUTES);
-            
-            // 发送邮件
-            boolean sendResult = emailUtil.sendVerificationCode(email, code);
-            
-            if (sendResult) {
-                log.info("邮箱验证码发送成功，邮箱：{}，验证码：{}", email, code);
-                return true;
-            } else {
-                // 如果发送失败，删除Redis中的验证码
-                redisTemplate.delete(key);
-                log.error("邮箱验证码发送失败，邮箱：{}", email);
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("发送邮箱验证码异常，邮箱：{}，异常信息：{}", email, e.getMessage(), e);
-            return false;
-        }
-    }
-
-    /**
-     * 验证邮箱验证码
-     * @param email 邮箱地址
-     * @param code 验证码
-     * @return 是否验证成功
-     */
-    @Override
-    public boolean verifyEmailCode(String email, String code) {
-        try {
-            String key = CODE_KEY_PREFIX + email;
-            String storedCode = redisTemplate.opsForValue().get(key);
-            
-            if (storedCode == null) {
-                log.warn("验证码不存在或已过期，邮箱：{}", email);
-                return false;
-            }
-            
-            if (storedCode.equals(code)) {
-                // 验证成功后，删除验证码（防止重复使用）
-                redisTemplate.delete(key);
-                log.info("邮箱验证码验证成功，邮箱：{}", email);
-                return true;
-            } else {
-                log.warn("邮箱验证码错误，邮箱：{}，输入的验证码：{}，正确的验证码：{}", email, code, storedCode);
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("验证邮箱验证码异常，邮箱：{}，异常信息：{}", email, e.getMessage(), e);
-            return false;
-        }
-    }
-
-    /**
-     * 生成验证码
-     * @param length 验证码长度
-     * @return 验证码字符串
-     */
-    @Override
-    public String generateCode(int length) {
-        Random random = new Random();
-        StringBuilder code = new StringBuilder();
-        for (int i = 0; i < length; i++) {
-            code.append(random.nextInt(10)); // 生成0-9的随机数字
-        }
-        return code.toString();
-    }
-}
-
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,14 +2,19 @@ server:
  port: 8080

 spring:
+  mvc:
+    throw-exception-if-no-handler-found: true
+  web:
+    resources:
+      add-mappings: false
  datasource:
    url: jdbc:mysql://110.42.41.177:3306/dating?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: JoyeeServe2025
    driver-class-name: com.mysql.cj.jdbc.Driver
  redis:
-    host: 110.42.41.177
-    port: 6389
+    host: 127.0.0.1
+    port: 6379
    password: ""
    database: 0
    timeout: 10000
@@ -65,11 +70,3 @@ aliyun:
    region-id: cn-hangzhou
    sign-name: 速通互联验证码
    template-code: 100001
-
-# ip2location.io 相关配置
-ip2location:
-  api:
-    key: 95F4AB991174E296AFD5AD0EF927B2ED  # ip2location.io API密钥
-    url: https://api.ip2location.io/
-    timeout: 5000  # 请求超时时间（毫秒）
-
--- a/src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml
@@ -14,8 +14,4 @@
    <select id="selectUserIDByPostID" resultType="java.lang.Long">
        SELECT user_id FROM post_favorite WHERE post_id = #{postId}
    </select>
-    <!-- 查询所有收藏动态 -->
-    <select id="showAllFavorites" resultType="com.bao.dating.pojo.entity.Post">
-        SELECT * FROM post WHERE post_id IN (SELECT post_id FROM post_favorite WHERE user_id = #{userid})
-    </select>
 </mapper>
--- a/src/main/resources/com/bao/dating/mapper/UserMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/UserMapper.xml
@@ -3,10 +3,6 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

 <mapper namespace="com.bao.dating.mapper.UserMapper">
-    <!-- 向数据库中添加用户 -->
-    <insert id="saveUser">
-        insert into user(user_id,user_name,password_hash,salt,created_at,updated_at) values (#{userId},#{userName},#{passwordHash},#{salt},#{createdAt},#{updatedAt})
-    </insert>

    <!--根据用户名查询用户-->
    <select id="getByUsername" resultType="com.bao.dating.pojo.entity.User">
@@ -49,16 +45,6 @@
            FROM user WHERE user_id = #{userId}
    </select>

-    <!-- 查询最大用户id -->
-    <select id="selectMaxId" resultType="java.lang.Long">
-        SELECT MAX(user_id) FROM user
-    </select>
-
-    <!-- 根据邮箱查询用户信息 -->
-    <select id="selectByUserEmailUser" resultType="com.bao.dating.pojo.entity.User">
-        select * from user where user_email = #{userEmail}
-    </select>
-
    <!--根据ID更新动态-->
    <update id="updateUserInfoByUserId">
        UPDATE user
--- a/src/test/java/com/bao/dating/common/aliyun/OssUploadTest.java
+++ b/src/test/java/com/bao/dating/common/aliyun/OssUploadTest.java
@@ -1,304 +0,0 @@
-package com.bao.dating.common.aliyun;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.UUID;
-
-/**
- * OSS图片上传测试类
- * @author KilLze
- */
-@SpringBootTest
-public class OssUploadTest {
-
-    @Autowired
-    private AliOssUtil aliOssUtil;
-
-    /**
-     * 测试上传本地图片文件
-     */
-    @Test
-    public void testUploadLocalImage() {
-        try {
-            // 本地图片文件路径（请修改为实际存在的图片路径）
-            String localImagePath = "D:/image/image.jpg"; // 请修改为实际路径
-            
-            File imageFile = new File(localImagePath);
-            if (!imageFile.exists()) {
-                System.out.println("图片文件不存在: " + localImagePath);
-                System.out.println("请修改localImagePath为实际存在的图片路径");
-                return;
-            }
-
-            // 读取文件字节
-            byte[] imageBytes = Files.readAllBytes(Paths.get(localImagePath));
-            
-            // 生成OSS对象名称（使用时间戳和UUID确保唯一性）
-            String objectName = generateObjectName("test", "jpg");
-            
-            // 上传到OSS
-            String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-            
-            System.out.println("========== 本地图片上传测试 ==========");
-            System.out.println("本地文件路径: " + localImagePath);
-            System.out.println("文件大小: " + imageBytes.length + " 字节");
-            System.out.println("OSS对象名称: " + objectName);
-            System.out.println("文件访问URL: " + fileUrl);
-            System.out.println("上传结果: 成功");
-            System.out.println("=====================================");
-            
-        } catch (IOException e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 测试从网络URL下载图片并上传到OSS
-     */
-    @Test
-    public void testUploadImageFromUrl() {
-        try {
-            // 网络图片URL（请修改为实际的图片URL）
-            String imageUrl = "https://example.com/image.jpg"; // 请修改为实际URL
-            
-            System.out.println("========== 网络图片上传测试 ==========");
-            System.out.println("开始下载图片: " + imageUrl);
-            
-            // 从URL下载图片
-            URL url = new URL(imageUrl);
-            try (InputStream inputStream = url.openStream()) {
-                byte[] imageBytes = readAllBytes(inputStream);
-                
-                // 从URL中提取文件扩展名
-                String extension = getFileExtensionFromUrl(imageUrl);
-                if (extension.isEmpty()) {
-                    extension = "jpg"; // 默认扩展名
-                }
-                
-                // 生成OSS对象名称
-                String objectName = generateObjectName("download", extension);
-                
-                // 上传到OSS
-                String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-                
-                System.out.println("图片下载成功");
-                System.out.println("文件大小: " + imageBytes.length + " 字节");
-                System.out.println("OSS对象名称: " + objectName);
-                System.out.println("文件访问URL: " + fileUrl);
-                System.out.println("上传结果: 成功");
-            }
-            
-            System.out.println("=====================================");
-            
-        } catch (Exception e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 测试上传不同格式的图片
-     */
-    @Test
-    public void testUploadDifferentImageFormats() {
-        String[] imagePaths = {
-            "D:/test/image1.jpg",   // 请修改为实际路径
-            "D:/test/image2.png",   // 请修改为实际路径
-            "D:/test/image3.gif"    // 请修改为实际路径
-        };
-        
-        System.out.println("========== 多格式图片上传测试 ==========");
-        
-        for (String imagePath : imagePaths) {
-            try {
-                File imageFile = new File(imagePath);
-                if (!imageFile.exists()) {
-                    System.out.println("跳过不存在的文件: " + imagePath);
-                    continue;
-                }
-                
-                // 读取文件
-                byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
-                
-                // 获取文件扩展名
-                String extension = getFileExtension(imagePath);
-                
-                // 生成OSS对象名称
-                String objectName = generateObjectName("format-test", extension);
-                
-                // 上传
-                String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-                
-                System.out.println("\n文件: " + imagePath);
-                System.out.println("格式: " + extension);
-                System.out.println("大小: " + imageBytes.length + " 字节");
-                System.out.println("URL: " + fileUrl);
-                System.out.println("状态: 成功");
-                
-            } catch (Exception e) {
-                System.out.println("\n文件: " + imagePath);
-                System.out.println("状态: 失败 - " + e.getMessage());
-            }
-        }
-        
-        System.out.println("\n=====================================");
-    }
-
-    /**
-     * 测试上传图片到指定目录
-     */
-    @Test
-    public void testUploadImageToDirectory() {
-        try {
-            // 本地图片文件路径
-            String localImagePath = "D:/test/image.jpg"; // 请修改为实际路径
-            
-            File imageFile = new File(localImagePath);
-            if (!imageFile.exists()) {
-                System.out.println("图片文件不存在: " + localImagePath);
-                return;
-            }
-            
-            // 读取文件
-            byte[] imageBytes = Files.readAllBytes(Paths.get(localImagePath));
-            
-            // 上传到指定目录（例如：images/2025/12/24/xxx.jpg）
-            String directory = "images/" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
-            String fileName = UUID.randomUUID().toString() + ".jpg";
-            String objectName = directory + "/" + fileName;
-            
-            // 上传
-            String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-            
-            System.out.println("========== 目录上传测试 ==========");
-            System.out.println("目录: " + directory);
-            System.out.println("文件名: " + fileName);
-            System.out.println("完整路径: " + objectName);
-            System.out.println("文件访问URL: " + fileUrl);
-            System.out.println("上传结果: 成功");
-            System.out.println("=================================");
-            
-        } catch (Exception e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 测试使用FileInputStream上传
-     */
-    @Test
-    public void testUploadWithFileInputStream() {
-        try {
-            // 本地图片文件路径
-            String localImagePath = "D:/test/image.jpg"; // 请修改为实际路径
-            
-            File imageFile = new File(localImagePath);
-            if (!imageFile.exists()) {
-                System.out.println("图片文件不存在: " + localImagePath);
-                return;
-            }
-            
-            // 使用FileInputStream读取文件
-            try (FileInputStream fis = new FileInputStream(imageFile)) {
-                byte[] imageBytes = new byte[(int) imageFile.length()];
-                fis.read(imageBytes);
-                
-                // 生成OSS对象名称
-                String objectName = generateObjectName("stream", "jpg");
-                
-                // 上传
-                String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-                
-                System.out.println("========== FileInputStream上传测试 ==========");
-                System.out.println("文件路径: " + localImagePath);
-                System.out.println("文件大小: " + imageBytes.length + " 字节");
-                System.out.println("OSS对象名称: " + objectName);
-                System.out.println("文件访问URL: " + fileUrl);
-                System.out.println("上传结果: 成功");
-                System.out.println("===========================================");
-            }
-            
-        } catch (Exception e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 生成OSS对象名称
-     * @param prefix 前缀
-     * @param extension 文件扩展名
-     * @return 对象名称
-     */
-    private String generateObjectName(String prefix, String extension) {
-        // 格式: prefix/yyyyMMdd/HHmmss-uuid.extension
-        String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd/HHmmss"));
-        String uuid = UUID.randomUUID().toString().substring(0, 8);
-        return String.format("%s/%s-%s.%s", prefix, dateTime, uuid, extension);
-    }
-
-    /**
-     * 从文件路径获取扩展名
-     * @param filePath 文件路径
-     * @return 扩展名
-     */
-    private String getFileExtension(String filePath) {
-        int lastDot = filePath.lastIndexOf('.');
-        if (lastDot > 0 && lastDot < filePath.length() - 1) {
-            return filePath.substring(lastDot + 1).toLowerCase();
-        }
-        return "jpg"; // 默认扩展名
-    }
-
-    /**
-     * 从URL获取文件扩展名
-     * @param url URL地址
-     * @return 扩展名
-     */
-    private String getFileExtensionFromUrl(String url) {
-        try {
-            // 移除查询参数
-            String path = url.split("\\?")[0];
-            int lastDot = path.lastIndexOf('.');
-            int lastSlash = path.lastIndexOf('/');
-            
-            if (lastDot > lastSlash && lastDot < path.length() - 1) {
-                return path.substring(lastDot + 1).toLowerCase();
-            }
-        } catch (Exception e) {
-            // 忽略异常
-        }
-        return "jpg"; // 默认扩展名
-    }
-
-    /**
-     * 从InputStream读取所有字节（兼容方法）
-     * @param inputStream 输入流
-     * @return 字节数组
-     * @throws IOException IO异常
-     */
-    private byte[] readAllBytes(InputStream inputStream) throws IOException {
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        byte[] data = new byte[8192]; // 8KB缓冲区
-        int nRead;
-        while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
-            buffer.write(data, 0, nRead);
-        }
-        return buffer.toByteArray();
-    }
-}
-
--- a/src/test/java/com/bao/dating/service/VerificationCodeServiceTest.java
+++ b/src/test/java/com/bao/dating/service/VerificationCodeServiceTest.java
@@ -1,91 +0,0 @@
-package com.bao.dating.service;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * 验证码服务测试类
- * @author KilLze
- */
-@SpringBootTest
-public class VerificationCodeServiceTest {
-
-    @Autowired
-    private VerificationCodeService verificationCodeService;
-
-    /**
-     * 测试发送邮箱验证码
-     */
-    @Test
-    public void testSendEmailCode() {
-        String email = "test@example.com"; // 请修改为实际邮箱地址
-        
-        System.out.println("========== 发送邮箱验证码测试 ==========");
-        System.out.println("邮箱地址: " + email);
-        
-        boolean result = verificationCodeService.sendEmailCode(email);
-        
-        System.out.println("发送结果: " + (result ? "成功" : "失败"));
-        System.out.println("=====================================");
-    }
-
-    /**
-     * 测试验证邮箱验证码
-     */
-    @Test
-    public void testVerifyEmailCode() {
-        String email = "test@example.com"; // 请修改为实际邮箱地址
-        String code = "123456"; // 请修改为实际收到的验证码
-        
-        System.out.println("========== 验证邮箱验证码测试 ==========");
-        System.out.println("邮箱地址: " + email);
-        System.out.println("验证码: " + code);
-        
-        boolean result = verificationCodeService.verifyEmailCode(email, code);
-        
-        System.out.println("验证结果: " + (result ? "成功" : "失败"));
-        System.out.println("=====================================");
-    }
-
-    /**
-     * 测试完整流程：发送验证码 -> 验证验证码
-     */
-    @Test
-    public void testCompleteFlow() {
-        String email = "test@example.com"; // 请修改为实际邮箱地址
-        
-        System.out.println("========== 完整流程测试 ==========");
-        System.out.println("邮箱地址: " + email);
-        
-        // 1. 发送验证码
-        System.out.println("\n1. 发送验证码...");
-        boolean sendResult = verificationCodeService.sendEmailCode(email);
-        System.out.println("发送结果: " + (sendResult ? "成功" : "失败"));
-        
-        if (sendResult) {
-            // 2. 等待用户输入验证码（这里模拟，实际应该从控制台或API获取）
-            System.out.println("\n2. 请查看邮箱获取验证码，然后手动测试验证功能");
-            System.out.println("   使用 testVerifyEmailCode() 方法进行验证");
-        }
-        
-        System.out.println("\n=====================================");
-    }
-
-    /**
-     * 测试生成验证码
-     */
-    @Test
-    public void testGenerateCode() {
-        System.out.println("========== 生成验证码测试 ==========");
-        
-        // 测试不同长度的验证码
-        for (int length = 4; length <= 8; length++) {
-            String code = verificationCodeService.generateCode(length);
-            System.out.println(length + "位验证码: " + code);
-        }
-        
-        System.out.println("=====================================");
-    }
-}
-
--- a/src/test/java/com/bao/dating/util/EmailAndSmsTest.java
+++ b/src/test/java/com/bao/dating/util/EmailAndSmsTest.java
@@ -75,4 +75,3 @@ public class EmailAndSmsTest {



-
Author	SHA1	Message	Date
KilLze	60df001385	用户退出功能实现用户退出将Redis的token自动添加到黑名单	2026-01-02 12:46:44 +08:00
KilLze	27c64b1106	优化喵	2026-01-02 11:56:21 +08:00
KilLze	0762b84c36	加注释喵	2026-01-02 11:40:14 +08:00
KilLze	61d100fac0	全局异常优化	2026-01-02 11:09:12 +08:00
KilLze	8a6e44e1cb	全局日志打印	2026-01-02 10:38:00 +08:00
KilLze	a004982355	将token令牌存入redis，确保安全性	2026-01-01 21:26:09 +08:00
KilLze	3d8a32cbf7	Merge remote-tracking branch 'upstream/feature-KilLze' into feature-KilLze	2026-01-01 16:24:30 +08:00
KilLze	34f41d61e2	增加日志记录功能，现在在controller层的方法上添加@Log注解即可记录增删改的日志	2026-01-01 16:23:53 +08:00
KilLze	0d166aa400	增加日志记录功能	2026-01-01 16:19:39 +08:00
KilLze	44c0b3611d	加注释	2026-01-01 09:46:27 +08:00
KilLze	f98b0e26f2	AOP记录方法运行耗时（没事闲的）	2025-12-30 01:32:01 +08:00
KilLze	79345eb93e	添加全局异常处理器	2025-12-29 19:29:24 +08:00
KilLze	bfd6674dd9	优化sql语句	2025-12-29 19:01:40 +08:00
KilLze	70a1d0012e	添加注释，优化代码，减少魔法值	2025-12-29 17:58:40 +08:00
KilLze	cc88ec820c	随便改改	2025-12-29 17:24:07 +08:00
KilLze	0c4ddc2803	优化用添加个人信息功能	2025-12-29 17:03:06 +08:00
KilLze	f31b42a038	修bug 完成用户信息修改，以及用户信息审核	2025-12-29 15:42:20 +08:00
KilLze	9cf50ce7df	完成用户信息修改，以及用户信息审核	2025-12-29 15:34:41 +08:00
KilLze	401c2fa8bf	修bug	2025-12-29 15:16:59 +08:00
KilLze	fec7bb04b9	修bug	2025-12-29 15:16:31 +08:00
KilLze	cd0abad225	完成用户个人信息修改	2025-12-29 11:59:33 +08:00
KilLze	96b256d46e	加注释	2025-12-28 21:14:30 +08:00
KilLze	fca54a6f97	完成头像和背景上传，优化动态文件上传，修bug	2025-12-28 21:10:55 +08:00
KilLze	0f8f47de8e	用户查询个人信息功能	2025-12-28 19:57:05 +08:00
KilLze	2cb8ae5c3c	修bug，顺便修改接口名	2025-12-28 18:05:47 +08:00
KilLze	7abd6fe27d	修bug，顺便修改接口名	2025-12-28 17:53:16 +08:00
KilLze	dfc9508827	修bug，顺便修改接口名	2025-12-28 16:59:51 +08:00
KilLze	4c70bd3c6f	完成jwt拦截器和从token中获取当前登录的用户id 目前除登录以外的所有操作都会经过拦截器，可以在WebConfig中设置拦截器忽略的接口获取用户id不需要手动输入了，直接通过UserContext获取当前登录的用户id 为动态删除，动态修改等我负责的功能添加身份验证，用户id不匹配则会跳出异常增加token过期验证	2025-12-28 02:17:09 +08:00
KilLze	d3c069967e	完成jwt拦截器和从token中获取当前登录的用户id 目前除登录以外的所有操作都会经过拦截器，可以在WebConfig中设置拦截器忽略的接口获取用户id不需要手动输入了，直接通过UserContext获取当前登录的用户id 为动态删除，动态修改等我负责的功能添加身份验证，用户id不匹配则会跳出异常	2025-12-28 02:04:25 +08:00
bao	4a2aff888a	配置redis (cherry picked from commit `ae0cca5437`)	2025-12-27 19:37:01 +08:00
bao	0b0959fa80	增加User项目结构 (cherry picked from commit `c329eaef79`)	2025-12-27 19:28:19 +08:00
KilLze	4401a8a44a	用户密码登录功能完成	2025-12-27 19:25:03 +08:00