完成用户对用户登录和发布动态的数据分析

# Conflicts:
#	src/main/java/com/bao/dating/config/WebConfig.java
#	src/main/java/com/bao/dating/controller/UserController.java
#	src/main/java/com/bao/dating/mapper/UserMapper.java
#	src/main/java/com/bao/dating/service/UserService.java
#	src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
#	src/main/resources/com/bao/dating/mapper/UserMapper.xml

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>
@@ -57,6 +62,12 @@
             <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>
             <groupId>org.junit.platform</groupId>
@@ -71,12 +82,25 @@
             <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>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <!-- WebSocket 起步依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
        <!--   阿里云相关依赖     -->
         <dependency>
             <groupId>com.aliyun.oss</groupId>
@@ -154,6 +178,12 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

src/main/java/com/bao/dating/DatingApplication.java

@@ -5,12 +5,38 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
 @MapperScan("com.bao.dating.mapper")
 @SpringBootApplication
 @EnableScheduling
 public class DatingApplication {
     public static void main(String[] args) {
         SpringApplication.run(DatingApplication.class, args);
+        // 读取并打印 ciallo.txt 文件内容
+        printCialloFile();
     }
 
+    /**
+     * 读取并打印 ciallo.txt 文件内容
+     */
+    private static void printCialloFile() {
+        try (InputStream inputStream = DatingApplication.class.getClassLoader().getResourceAsStream("ciallo.txt");
+             BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                System.out.println(line);
+            }
+        } catch (IOException e) {
+            System.err.println("读取 ciallo.txt 文件时发生错误: " + e.getMessage());
+        }
+    }
 }

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 {
+}

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);
+    }
+}

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();
+    }
+
+}

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;
-    }
-
-}

src/main/java/com/bao/dating/common/Post.java

@@ -1,16 +0,0 @@
-package com.bao.dating.common;
-
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-/**
- * 动态表
- */
-@Data
-public class Post {
-    private Long post_id;         // 动态ID
-    private String content;  // 动态内容
-    private Long user_id;     // 发布人ID
-    private LocalDateTime created_at; // 创建时间
-}

src/main/java/com/bao/dating/common/aliyun/SmsUtil.java

@@ -75,6 +75,8 @@ public class SmsUtil {
                     .setTemplateCode(templateCode != null ? templateCode : this.templateCode)
                     .setTemplateParam(templateParam);
 
+            log.error("TemplateParam 实际值 = {}", templateParam);
+
             SendSmsResponse response = client.sendSms(sendSmsRequest);
             
             if ("OK".equals(response.getBody().getCode())) {
@@ -145,6 +147,7 @@ public class SmsUtil {
         jsonBuilder.append("}");
         return sendSms(phoneNumber, templateCode, jsonBuilder.toString());
     }
+
 }
 
 

src/main/java/com/bao/dating/common/ip2location/Ip2LocationConfig.java

@@ -0,0 +1,14 @@
+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;
+}

src/main/java/com/bao/dating/common/result/ChatSendResult.java

@@ -0,0 +1,15 @@
+package com.bao.dating.common.result;
+
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import lombok.Data;
+
+/**
+ * 聊天发送结果
+ * @author KilLze
+ */
+@Data
+public class ChatSendResult {
+    private boolean success;
+    private String message;
+    private ChatRecordsVO record;
+}

src/main/java/com/bao/dating/common/result/PageResult.java

@@ -0,0 +1,28 @@
+package com.bao.dating.common.result;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PageResult<T> {
+    /** 总记录数 */
+    private Long total;
+    /** 当前页码 */
+    private Integer page;
+    /** 每页大小 */
+    private Integer size;
+    /** 总页数 */
+    private Integer pages;
+    /** 当前页数据 */
+    private List<T> records;
+
+    public PageResult(Long total, Integer page, Integer size, List<T> records) {
+        this.total = total;
+        this.page = page;
+        this.size = size;
+        this.records = records;
+        // 计算总页数
+        this.pages = (int) Math.ceil((double) total / size);
+    }
+}

src/main/java/com/bao/dating/config/RedisConfig.java

@@ -7,20 +7,25 @@ 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<String, Object> redisTemplate = new RedisTemplate<>();
+    public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        // 创建RedisTemplate对象
+        RedisTemplate redisTemplate = new RedisTemplate<>();
+        // 设置redis的连接工厂对象
         redisTemplate.setConnectionFactory(redisConnectionFactory);
 
-        // 设置key的序列化器
+        // 设置redis key的序列化器
         redisTemplate.setKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        
         // 设置value的序列化器
         redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        // 设置hash类型的key和value的序列化器
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
         redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
 
         redisTemplate.afterPropertiesSet();

src/main/java/com/bao/dating/config/WebConfig.java

@@ -30,7 +30,12 @@ public class WebConfig implements WebMvcConfigurer {
                 // 忽略的接口
                 .excludePathPatterns(
                         "/user/login",
-                        "/api/verification/send-email-code"
+                        "/user/register",
+                        "/user/emailLogin",
+                        "/api/verification/send-email-code",
+                        "/ip/location",
+                        "/user/login",
+                        "/user/sendCode"
                 );
     }
 }

src/main/java/com/bao/dating/config/WebSocketConfig.java

@@ -0,0 +1,35 @@
+package com.bao.dating.config;
+
+
+import com.bao.dating.controller.websocket.ChatWebSocketHandler;
+import com.bao.dating.interceptor.WsAuthInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+/**
+ * WebSocket 配置类
+ * @author lenovo
+ */
+@Configuration
+@EnableWebSocket
+public class WebSocketConfig implements WebSocketConfigurer {
+    @Autowired
+    private ChatWebSocketHandler chatWebSocketHandler;
+
+    @Autowired
+    private WsAuthInterceptor wsAuthInterceptor;
+
+    /**
+     * 注册 WebSocket 处理器
+     * @param registry
+     */
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(chatWebSocketHandler, "/ws/chat")
+                .addInterceptors(wsAuthInterceptor)
+                .setAllowedOrigins("*");
+    }
+}

src/main/java/com/bao/dating/controller/ChatController.java

@@ -0,0 +1,104 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.common.result.PageResult;
+import com.bao.dating.context.UserContext;
+import com.bao.dating.pojo.dto.*;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.pojo.vo.ChatSessionsVO;
+import com.bao.dating.service.ChatService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 聊天控制器
+ * @author lenovo
+ */
+@Slf4j
+@RestController
+@RequestMapping("/chat")
+public class ChatController {
+    @Autowired
+    private ChatService chatService;
+
+    /**
+     * 上传文件
+     * @param file 文件
+     * @return 文件URL
+     */
+    @PostMapping("/upload")
+    public Result<String> uploadVideo(@RequestParam MultipartFile file) {
+        String url = chatService.uploadChat(file);
+        return Result.success(ResultCode.SUCCESS, "文件上传成功", url);
+    }
+
+    /**
+     * 获取聊天记录
+     * @param targetUserId 目标用户ID
+     * @param pageDTO 分页参数
+     * @return 聊天记录列表
+     */
+    @GetMapping("/history/{targetUserId}")
+    public Result<List<ChatRecordsVO>> getChatHistory(
+            @PathVariable Long targetUserId,
+            ChatCursorPageDTO pageDTO){
+        Long currentUserId = UserContext.getUserId();
+        ChatHistoryQueryDTO queryDTO = new ChatHistoryQueryDTO();
+        queryDTO.setCurrentUserId(currentUserId);
+        queryDTO.setTargetUserId(targetUserId);
+        queryDTO.setCursor(pageDTO.getCursor());
+        queryDTO.setSize(pageDTO.getSize());
+        chatService.markChatMessagesAsRead(currentUserId, targetUserId);
+        List<ChatRecordsVO> history = chatService.getChatHistory(queryDTO);
+        return Result.success(ResultCode.SUCCESS, "获取聊天记录成功", history);
+    }
+
+    /**
+     * 获取会话列表
+     * @return 会话列表
+     */
+    @GetMapping("/sessions")
+    public Result<List<ChatSessionsVO>> getSessionList() {
+        Long currentUserId = UserContext.getUserId();
+        List<ChatSessionsVO> list = chatService.getSessionList(currentUserId);
+        return Result.success(ResultCode.SUCCESS, "获取会话列表成功", list);
+    }
+
+    /**
+     * 更新会话状态
+     * @param dto 会话状态
+     * @return 无
+     */
+    @PostMapping("/session/status")
+    public Result<Void> updateSessionStatus(@RequestBody ChatSessionStatusDTO dto) {
+        chatService.updateSessionStatus(UserContext.getUserId(), dto);
+        return Result.success(ResultCode.SUCCESS, null);
+    }
+    
+    /**
+     * 置顶会话
+     * @param dto 置顶状态
+     * @return 无
+     */
+    @PostMapping("/session/top")
+    public Result<Void> updateTopStatus(@RequestBody ChatSessionTopDTO dto) {
+        chatService.updateTopStatus(UserContext.getUserId(), dto);
+        return Result.success(ResultCode.SUCCESS, null);
+    }
+    
+    /**
+     * 静音会话
+     * @param dto 静音状态
+     * @return 无
+     */
+    @PostMapping("/session/mute")
+    public Result<Void> updateMuteStatus(@RequestBody ChatSessionMuteDTO dto) {
+        chatService.updateMuteStatus(UserContext.getUserId(), dto);
+        return Result.success(ResultCode.SUCCESS, null);
+    }
+}

src/main/java/com/bao/dating/controller/DataAnalysisController.java

@@ -0,0 +1,66 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.pojo.vo.DataAnalysisVO;
+import com.bao.dating.util.DataAnalysisRedisService;
+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;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+@RestController
+@RequestMapping("/dataAnalysis")
+public class DataAnalysisController {
+    @Resource
+    private DataAnalysisRedisService dataAnalysisRedisService;
+
+    /**
+     * 统计动态
+     * @param days 统计时常
+     * @return result
+     */
+    @GetMapping("/postTotal")
+    public Result<DataAnalysisVO> postDataAnalysis(@RequestParam Integer days){
+        if (checkParam(days)){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long count = dataAnalysisRedisService.countPostTotalByDays(days);
+        String timePeriod = dataAnalysisRedisService.calculateTimeRanges(LocalDateTime.now(), days);
+        DataAnalysisVO dataAnalysisVO = new DataAnalysisVO();
+        dataAnalysisVO.setTotal(count);
+        dataAnalysisVO.setTimePeriod(timePeriod);
+        return Result.success(ResultCode.SUCCESS,dataAnalysisVO);
+    }
+
+    @GetMapping("/loginUserTotal")
+    public Result<DataAnalysisVO> loginUserDataAnalysis(@RequestParam Integer days){
+        if (checkParam(days)){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long count = dataAnalysisRedisService.countLoginUserTotalByDays(days);
+        String timePeriod = dataAnalysisRedisService.calculateTimeRanges(LocalDateTime.now(), days);
+        DataAnalysisVO dataAnalysisVO = new DataAnalysisVO();
+        dataAnalysisVO.setTotal(count);
+        dataAnalysisVO.setTimePeriod(timePeriod);
+        return Result.success(ResultCode.SUCCESS,dataAnalysisVO);
+    }
+
+    /**
+     * 检验参数
+     * @param days 查询天数
+     * @return 参数是否合法
+     */
+    public Boolean checkParam(Integer days){
+        ArrayList<Integer> day = new ArrayList<>();
+        day.add(7);
+        day.add(15);
+        day.add(30);
+        day.add(365);
+        return days != null && day.contains(days);
+    }
+}

src/main/java/com/bao/dating/controller/IpLocationController.java

@@ -0,0 +1,37 @@
+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());
+        }
+    }
+}

src/main/java/com/bao/dating/controller/PostController.java

@@ -1,16 +1,17 @@
 package com.bao.dating.controller;
 
-
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.service.PostService;
+import com.bao.dating.util.DataAnalysisRedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -25,6 +26,9 @@ public class PostController {
     @Autowired
     private PostService postService;
 
+    @Resource
+    private DataAnalysisRedisService dataAnalysisRedisService;
+
     /**
      * 上传媒体文件接口 like
      * @param files 媒体文件数组
@@ -45,6 +49,9 @@ public class PostController {
     public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
         Post result = postService.createPost(postDTO);
+        //这里将发布动态操作记录到redis中
+        Long postId = result.getPostId();
+        dataAnalysisRedisService.recordPostData(postId);
         return Result.success(ResultCode.SUCCESS, "动态发布成功，等待审核。", result);
     }
 
@@ -57,7 +64,7 @@ public class PostController {
     @PostMapping("/deletePost")
     public Result<String> deleteById(@RequestBody List<Long> postIds){
         int deletedCount = postService.deletePostById(postIds);
-        return Result.success(ResultCode.SUCCESS_DELETE, deletedCount > 0 ? "成功删除" : "删除失败，该动态不存在", null);
+        return Result.success(ResultCode.SUCCESS_DELETE, "成功删除" + deletedCount + "条动态", null);
     }
 
     /**
@@ -65,7 +72,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);

src/main/java/com/bao/dating/controller/PostFavoriteController.java

@@ -2,12 +2,13 @@ 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 com.bao.dating.service.PostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -15,6 +16,13 @@ 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){
@@ -23,6 +31,13 @@ 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){
@@ -31,4 +46,21 @@ 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);
+    }
+
 }

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")

src/main/java/com/bao/dating/controller/UserController.java

@@ -1,17 +1,24 @@
 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;
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
+import com.bao.dating.pojo.dto.UserInfoDTO;
 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 com.bao.dating.util.DataAnalysisRedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * 用户接口
  *
@@ -24,6 +31,9 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    @Resource
+    private DataAnalysisRedisService dataAnalysisRedisService;
+
     /**
      * 登录
      * @param userLoginDTO 登录参数
@@ -31,9 +41,26 @@ public class UserController {
     @PostMapping("/login")
     public Result<UserLoginVO> login(@RequestBody UserLoginDTO userLoginDTO) {
         UserLoginVO userloginVO = userService.userLogin(userLoginDTO);
+        //将用户登录记录到redis中
+        if (userloginVO != null){
+            Long userId = userloginVO.getUserId();
+            dataAnalysisRedisService.recordLoginUserData(userId);
+        }
+
         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 用户信息
@@ -50,6 +77,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);
@@ -61,6 +89,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);
@@ -72,11 +101,125 @@ public class UserController {
      * @param userInfoUpdateDTO 用户信息更新参数
      * @return 更新后的用户信息
      */
+    @Log
     @PostMapping("/info/update")
-    public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
+    public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoDTO userInfoUpdateDTO) {
         Long userId = UserContext.getUserId();
         userInfoUpdateDTO.setUserId(userId);
         UserInfoVO userInfoVO =userService.updateUserInfo(userInfoUpdateDTO);
         return Result.success(ResultCode.SUCCESS, "用户信息更新成功", userInfoVO);
     }
+
+    @PostMapping("/sendCode")
+    public Result sendCode(@RequestBody Map<String, String> body) {
+        String phone = body.get("phone");
+        userService.sendSmsCode(phone);
+        return Result.success(ResultCode.SUCCESS, "验证码发送成功");
+    }
+
+    @PostMapping("/loginByCode")
+    public Result loginByCode(@RequestBody Map<String, String> body){
+        boolean ok = userService.verifyCode(body.get("phone"), body.get("code"));
+        return ok ? Result.success(ResultCode.SUCCESS, "登录成功") : Result.error(ResultCode.SYSTEM_ERROR, "登录失败");
+    }
+
+    /**
+     * 登录
+     * @param body 登录参数
+     */
+    @PostMapping("/loginPhone")
+    public Result<?> loginPhone(@RequestBody Map<String, String> body) {
+        String phone = body.get("phone");
+        String code = body.get("code");
+
+        //校验验证码
+        boolean verify  = userService.verifyCode(phone, code);
+        if (!verify){
+            return Result.error(ResultCode.SYSTEM_ERROR, "验证码错误或已过期");
+        }
+        //登录
+        UserLoginVO vo = userService.loginByPhone(phone);
+        //将用户登录操作记录到redis中
+        if (vo != null){
+            Long userId = vo.getUserId();
+            dataAnalysisRedisService.recordLoginUserData(userId);
+        }
+        return Result.success(ResultCode.SUCCESS, "登录成功", vo);
+    }
+
+    @GetMapping("/nearby")
+    public Result<List<UserInfoVO>> nearby(@RequestParam(defaultValue = "5") double  distance){
+        // 获取当前线程的用户 ID
+        Long userId = UserContext.getUserId();
+        if (userId == null) {
+            return Result.error(ResultCode.SYSTEM_ERROR, "用户未登录");
+        }
+
+        // 通过 UserID 获取当前用户的经纬度信息
+        UserInfoVO currentUser = userService.getUserInfo(userId);
+        if (currentUser == null) {
+            return Result.error(ResultCode.SYSTEM_ERROR, "用户信息获取失败");
+        }
+
+        // 获取当前用户的经纬度
+        Double latitude = currentUser.getLatitude();
+        Double longitude = currentUser.getLongitude();
+
+        // 检查经纬度是否为空
+        if (latitude == null || longitude == null) {
+            return Result.error(ResultCode.SYSTEM_ERROR, "用户经纬度信息未完善");
+        }
+
+        // 这里可以添加默认值，比如如果 latitude 或 longitude 为 null，则设置为某个默认值（例如 0）
+        latitude = (latitude != null) ? latitude : 0.0;
+        longitude = (longitude != null) ? longitude : 0.0;
+
+        // 查询附近用户
+        List<UserInfoVO> nearbyUsers = userService.findNearbyUsers(latitude, longitude, distance);
+
+        // 返回成功结果
+        return Result.success(ResultCode.SUCCESS, "查询成功", nearbyUsers);
+    }
+
+
+    /**
+     * 用户注册
+     * @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,"请先注册用户或添加邮箱");
+        }
+        //将用户登录操作记录到redis中
+        Long userId = userLoginVO.getUserId();
+        dataAnalysisRedisService.recordLoginUserData(userId);
+        return Result.success(ResultCode.SUCCESS,"用户登录成功",userLoginVO);
+    }
+
 }

src/main/java/com/bao/dating/controller/text.java

@@ -1,4 +0,0 @@
-package com.bao.dating.controller;
-
-public class text {
-}

src/main/java/com/bao/dating/controller/websocket/ChatWebSocketHandler.java

@@ -0,0 +1,165 @@
+package com.bao.dating.controller.websocket;
+
+import com.bao.dating.message.WsMessage;
+import com.bao.dating.pojo.dto.ChatRecallDTO;
+import com.bao.dating.pojo.dto.ChatRecordSendDTO;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.service.ChatService;
+import com.bao.dating.session.WsSessionManager;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+/**
+ * WebSocket处理器类
+ * @author lenovo
+ */
+@Slf4j
+@Component
+public class ChatWebSocketHandler extends TextWebSocketHandler {
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private ChatService chatService;
+
+    @Autowired
+    private WsSessionManager sessionManager;
+
+
+    /**
+     * 用户建立连接（上线）
+     * @param session WebSocketSession
+     */
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) {
+        Long userId = (Long) session.getAttributes().get("userId");
+        sessionManager.addSession(userId, session);
+        log.info("用户 " + userId + " 已上线");
+    }
+
+    /**
+     * 接收并处理消息
+     * @param session WebSocketSession
+     * @param message 消息
+     */
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception{
+        // 获取当前用户ID
+        Long senderUserId = (Long) session.getAttributes().get("userId");
+        if (senderUserId == null) {
+            log.error("WebSocket session 中未找到 userId");
+            return;
+        }
+
+        JsonNode node = objectMapper.readTree(message.getPayload());
+        String type = node.get("type").asText();
+        // 根据消息类型解析消息
+        WsMessage wsMessage = objectMapper.readValue(message.getPayload(), WsMessage.class);
+        
+        // 先获取消息类型，再根据类型进行相应处理和转换
+        if ("chat".equals(type)) {
+            // 处理私聊消息
+            WsMessage<ChatRecordSendDTO> chatWsMessage = 
+                objectMapper.convertValue(node, new TypeReference<WsMessage<ChatRecordSendDTO>>(){});
+            handlePrivateChat(session, senderUserId, chatWsMessage.getData());
+        } else if ("recall".equals(type)) {
+            // 处理撤回消息
+            WsMessage<ChatRecallDTO> recallWsMessage = 
+                objectMapper.convertValue(node, new TypeReference<WsMessage<ChatRecallDTO>>(){});
+            handleRecallMessage(session, senderUserId, recallWsMessage.getData());
+        }
+    }
+
+    /**
+     * 私聊处理
+     */
+    private void handlePrivateChat(WebSocketSession session, Long senderUserId, ChatRecordSendDTO dto) throws Exception {
+
+        // 1. 消息入库 + 会话更新
+        ChatRecordsVO chatRecordsVO = chatService.createSession(senderUserId, dto);
+        if (chatRecordsVO == null){
+            WsMessage<String> errorMsg = new WsMessage<>();
+            errorMsg.setType("error");
+            errorMsg.setData("会话已删除，无法发送消息");
+            // 返回错误信息
+            session.sendMessage(new TextMessage(objectMapper.writeValueAsString(errorMsg)));
+            return;
+        }
+        // 2. 推送给接收方
+        WebSocketSession receiverSession =
+                sessionManager.getSession(dto.getReceiverUserId());
+
+        if (receiverSession != null && receiverSession.isOpen()) {
+            WsMessage<ChatRecordsVO> pushMsg = new WsMessage<>();
+            pushMsg.setType("chat");
+            pushMsg.setData(chatRecordsVO);
+
+            receiverSession.sendMessage(
+                    new TextMessage(objectMapper.writeValueAsString(pushMsg))
+            );
+        }
+    }
+
+    /**
+     * 消息撤回处理
+     */
+    private void handleRecallMessage(WebSocketSession session, Long senderUserId, Object data) throws Exception {
+
+        // 转 DTO
+        ChatRecallDTO dto = objectMapper.convertValue(data, ChatRecallDTO.class);
+
+        // 撤回逻辑
+        boolean success = chatService.recallMessage(senderUserId, dto.getChatId());
+        // 如果返回false，说明消息撤回失败
+        if (!success) {
+            WsMessage<String> errorMsg = new WsMessage<>();
+            errorMsg.setType("error");
+            errorMsg.setData("撤回失败，消息可能无法撤回或不存在");
+            // 返回错误信息
+            session.sendMessage(new TextMessage(objectMapper.writeValueAsString(errorMsg)));
+            return;
+        }
+
+        // 创建撤回通知消息
+        WsMessage<ChatRecallDTO> pushMsg = new WsMessage<>();
+        pushMsg.setType("recall");
+        pushMsg.setData(dto);
+
+        // 通知自己
+        if (session.isOpen()) {
+            session.sendMessage(new TextMessage(objectMapper.writeValueAsString(pushMsg)));
+        }
+
+        // 通知对方
+        WebSocketSession receiverSession =
+                sessionManager.getSession(dto.getReceiverUserId());
+
+        if (receiverSession != null && receiverSession.isOpen()) {
+            receiverSession.sendMessage(new TextMessage(objectMapper.writeValueAsString(pushMsg))
+            );
+        }
+    }
+
+
+    /**
+     * 用户断开连接（下线）
+     * @param session WebSocketSession
+     * @param status 断开原因
+     */
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status){
+        // 下线处理
+        Long userId = (Long) session.getAttributes().get("userId");
+        sessionManager.removeSession(userId);
+        log.info("用户 " + userId + " 已下线");
+    }
+}

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);
     }
 
     /**

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 redisTemplate;
+
     /**
      * 在请求处理之前进行拦截
      * 从请求头或URL参数中获取token，验证其有效性，并将用户ID保存到ThreadLocal中
@@ -45,15 +52,40 @@ 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);
-            log.info("用户: {}", userId);
+            Long userId = Long.valueOf(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));
+            UserContext.setUserId(userId);
             return true;
         } catch (Exception e) {
             log.error("Token 校验失败: {}", e.getMessage());

src/main/java/com/bao/dating/interceptor/WsAuthInterceptor.java

@@ -0,0 +1,111 @@
+package com.bao.dating.interceptor;
+
+import com.bao.dating.util.JwtUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * WebSocket 认证拦截器
+ */
+@Slf4j
+@Component
+public class WsAuthInterceptor implements HandshakeInterceptor {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+    /**
+     * 拦截WebSocket连接请求
+     */
+    @Override
+    public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws Exception {
+        log.info("开始WebSocket握手认证");
+        
+        // 获取请求参数
+        if (!(request instanceof ServletServerHttpRequest)) {
+            log.error("WebSocket握手失败：非HTTP请求");
+            return false;
+        }
+
+        // 获取HttpServletRequest对象
+        HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
+
+        // 从URL参数中获取token
+        String token = servletRequest.getParameter("token");
+        
+        if (StringUtils.isBlank(token)) {
+            log.error("WebSocket握手失败：令牌丢失");
+            return false;
+        }
+
+        try {
+            // 验证 token 是否有效（包括是否过期）
+            if (!JwtUtil.validateToken(token)) {
+                log.error("Token无效或已过期: {}", token);
+                return false;
+            }
+
+            // 检查 token 是否在黑名单中
+            String blacklistKey = "jwt:blacklist:" + token;
+            Object blacklistToken = redisTemplate.opsForValue().get(blacklistKey);
+            if (blacklistToken != null) {
+                log.error("Token已在黑名单中: {}", token);
+                return false;
+            }
+
+            // 验证token并获取用户ID
+            String userIdStr = JwtUtil.getSubjectFromToken(token);
+            
+            if (StringUtils.isBlank(userIdStr) || !userIdStr.matches("\\d+")) {
+                log.error("无效的用户ID格式: {}", userIdStr);
+                return false;
+            }
+            
+            Long userId = Long.valueOf(userIdStr);
+
+            // 从Redis获取存储的token进行比对
+            String redisTokenKey = "login:token:" + userId;
+            Object redisTokenObj = redisTemplate.opsForValue().get(redisTokenKey);
+            String redisToken = redisTokenObj != null ? redisTokenObj.toString() : null;
+            log.info("Redis中存储的token: {}", redisToken != null ? "存在" : "不存在");
+
+            // 验证Redis中的token是否存在且匹配
+            if (redisToken == null || !redisToken.equals(token)) {
+                log.error("登录已失效 - Redis中token不存在或不匹配");
+                return false;
+            }
+
+            log.info("WebSocket认证成功，用户ID: {}", userId);
+            // 将用户ID保存到attributes中
+            attributes.put("userId", userId);
+            return true;
+        }
+        catch (NumberFormatException e) {
+            log.error("用户ID格式转换异常: {}", e.getMessage());
+            return false;
+        }
+        catch (Exception e) {
+            log.error("WebSocket握手失败：{}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) {
+        if (exception != null) {
+            log.error("WebSocket握手后出现异常：", exception);
+        } else {
+            log.info("WebSocket握手完成");
+        }
+    }
+}

src/main/java/com/bao/dating/mapper/ChatRecordsMapper.java

@@ -0,0 +1,51 @@
+package com.bao.dating.mapper;
+
+
+import com.bao.dating.pojo.dto.ChatHistoryQueryDTO;
+import com.bao.dating.pojo.dto.ChatMarkReadDTO;
+import com.bao.dating.pojo.entity.ChatRecords;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface ChatRecordsMapper {
+    /**
+     * 插入聊天记录
+     * @param chatRecords 聊天记录
+     * @return 影响行数
+     */
+    int insert(ChatRecords chatRecords);
+
+    /**
+     * 根据时间游标查询聊天记录
+     * @param queryDTO 查询参数
+     * @return 聊天记录列表
+     */
+    List<ChatRecords> selectChatHistoryByCursor(ChatHistoryQueryDTO queryDTO);
+
+    /**
+     * 标记聊天记录为已读
+     * @param markReadDTO 标记参数
+     * @return 影响行数
+     */
+    int markMessagesAsRead(ChatMarkReadDTO markReadDTO);
+
+    /**
+     * 根据ID查询聊天记录
+     * @param chatId 聊天记录ID
+     * @return 聊天记录
+     */
+    ChatRecords selectById(@Param("chatId") Long chatId);
+
+    /**
+     * 撤回聊天记录
+     * @param chatId 聊天记录ID
+     * @param senderUserId 发送者ID
+     * @return 影响行数
+     */
+    int recallMessage(@Param("chatId") Long chatId,
+                      @Param("senderUserId") Long senderUserId);
+}

src/main/java/com/bao/dating/mapper/ChatSessionsMapper.java

@@ -0,0 +1,88 @@
+package com.bao.dating.mapper;
+
+
+import com.bao.dating.pojo.entity.ChatRecords;
+import com.bao.dating.pojo.entity.ChatSessions;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface ChatSessionsMapper {
+
+    /**
+     * 如果发送方存在会话则更新，不存在则创建
+     * @param chatSessions 会话
+     * @return 影响行数
+     */
+    int upsertSessionForSender(ChatSessions chatSessions);
+
+    /**
+     * 获取会话
+     * @param userId 用户ID
+     * @param targetUserId 目标用户ID
+     * @return 会话
+     */
+    @Select("SELECT * FROM chat_sessions WHERE user_id = #{userId} AND target_user_id = #{targetUserId} LIMIT 1")
+    ChatSessions getSession(@Param("userId") Long userId, @Param("targetUserId") Long targetUserId);
+
+    /**
+     * 如果接收方存在会话则更新，不存在则创建
+     * @param chatSessions 会话
+     * @return 影响行数
+     */
+    int upsertSessionForReceiver(ChatSessions chatSessions);
+
+    /**
+     *  清空会话的未读数
+     *  @param userId 用户ID
+     *  @param targetUserId 目标用户ID
+     *  @return 影响行数
+     */
+    int clearUnreadCount(
+            @Param("userId") Long userId,
+            @Param("targetUserId") Long targetUserId
+    );
+
+    /**
+     * 查询当前用户的会话列表
+     * @param userId 当前用户ID
+     * @return 会话列表
+     */
+    List<ChatSessions> selectSessionsByUserId(@Param("userId") Long userId);
+
+    /**
+     * 更新会话状态
+     * @param userId 用户ID
+     * @param targetUserId 目标用户ID
+     * @param sessionStatus 会话状态
+     * @return 影响行数
+     */
+    int updateSessionStatus(@Param("userId") Long userId,
+                            @Param("targetUserId") Long targetUserId,
+                            @Param("sessionStatus") Integer sessionStatus);
+
+    /**
+     * 更新会话置顶状态
+     * @param userId 用户ID
+     * @param targetUserId 目标用户ID
+     * @param topStatus 置顶状态
+     * @return 影响行数
+     */
+    int updateTopStatus(@Param("userId") Long userId,
+                        @Param("targetUserId") Long targetUserId,
+                        @Param("topStatus") Integer topStatus);
+
+    /**
+     * 更新会话免打扰状态
+     * @param userId 用户ID
+     * @param targetUserId 目标用户ID
+     * @param muteStatus 免打扰状态
+     * @return 影响行数
+     */
+    int updateMuteStatus(@Param("userId") Long userId,
+                         @Param("targetUserId") Long targetUserId,
+                         @Param("muteStatus") Integer muteStatus);
+}

src/main/java/com/bao/dating/mapper/CommentsMapper.java

@@ -5,17 +5,24 @@ import com.bao.dating.pojo.entity.Comments;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
-
+@Mapper
 public interface CommentsMapper {
     // 添加评论
-    @Insert("INSERT INTO comments(content, user_id, post_id, created_at) VALUES(#{content}, #{user_id}, #{post_id}, #{created_at})")
+    @Insert("INSERT INTO dating.comments(content, user_id, post_id, created_at) VALUES(#{content}, #{user_id}, #{post_id}, #{created_at})")
     int addComment(Comments comments);
 
     // 删除评论
-    @Delete("DELETE FROM comments WHERE user_id = #{user_id}")
+    @Delete("DELETE FROM dating.comments WHERE user_id = #{user_id}")
     int deleteComments(@Param("user_id") Long user_id);
 
     // 根据动态ID查询评论列表
-    @Select("SELECT * FROM comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
+    @Select("SELECT * FROM dating.comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
     List<Comments> getCommentsByPostId(@Param("post_id") Long post_id);
+
+    /**
+     * 根据动态ID批量删除评论
+     * @param postIds
+     * @return
+     */
+    int deleteCommentsByPostIds(@Param("postIds") List<Long> postIds);
 }

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);
+
+}

src/main/java/com/bao/dating/mapper/PostFavoriteMapper.java

@@ -1,5 +1,6 @@
 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;
@@ -10,6 +11,18 @@ import java.util.List;
 public interface    PostFavoriteMapper {
     //查询当前已收藏所有用户
     List<Long> selectUserIDByPostID(@Param("postId") Long postId);
+    //添加收藏
     int addPostFavorite(PostFavorite postFavorite);
+    //删除收藏
     int deletePostFavorite(@Param("postId") Long postId);
+
+    /**
+     * 批量删除收藏
+     * @param postIds
+     * @return
+     */
+    int deleteFavoritesByPostIds(@Param("postIds") List<Long> postIds);
+
+    //查询用户所有收藏
+    List<Post> showAllFavorites(@Param("userid")Long userid);
 }

src/main/java/com/bao/dating/mapper/PostLikeMapper.java

@@ -4,6 +4,8 @@ import com.bao.dating.pojo.entity.PostLike;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface PostLikeMapper {
     /**
@@ -31,4 +33,12 @@ public interface PostLikeMapper {
      * @return
      */
     int deleteByPostIdAndUserId(@Param("postId") Long postId, @Param("userId") Long userId);
+
+    /**
+     * 批量删除点赞记录
+     *
+     * @param postIds
+     * @return
+     */
+    int deleteLikesByPostIds(@Param("postIds") List<Long> postIds);
 }

src/main/java/com/bao/dating/mapper/PostMapper.java

@@ -21,11 +21,12 @@ public interface PostMapper {
     void insert(Post post);
 
     /**
-     * 根据ID删除动态
+     * 根据ID修改动态状态
      *
      * @param postIds 动态ID
+     * @param userId 用户ID
      */
-    int deletePostByIds(List<Long> postIds);
+    int updatePublicById(@Param("postIds") List<Long> postIds, @Param("userId") Long userId);
     
     /**
      * 根据动态ID删除收藏记录

src/main/java/com/bao/dating/mapper/UserMapper.java

@@ -1,10 +1,13 @@
 package com.bao.dating.mapper;
 
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
+import com.bao.dating.pojo.dto.UserInfoDTO;
 import com.bao.dating.pojo.entity.User;
+import com.bao.dating.pojo.vo.UserInfoVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 用户Mapper
  * @author KilLze
@@ -32,7 +35,37 @@ public interface UserMapper {
      * 更新用户信息
      * @param userInfoUpdateDTO 用户信息更新参数
      */
-    void updateUserInfoByUserId(UserInfoUpdateDTO userInfoUpdateDTO);
+    void updateUserInfoByUserId(UserInfoDTO userInfoUpdateDTO);
 
+    /**
+     * 添加用户
+     * @param user 用户对象
+     * @return 受影响行数
+     */
+    int saveUser(User user);
 
+    /**
+     * 查询最大用户id
+     * @return 用户id
+     */
+    Long selectMaxId();
+
+    /**
+     * 根据邮箱查询用户
+     * @param email 用户邮箱
+     * @return 用户信息
+     */
+    User selectByUserEmailUser(@Param("userEmail") String email);
+
+    User selectByPhone(@Param("phone") String phone);
+
+    /**
+     * 根据经纬度范围查询用户
+     * @param minLat 最小纬度
+     * @param maxLat 最大纬度
+     * @param minLng 最小经度
+     * @param maxLng 最大经度
+     * @return 用户列表
+     */
+    List<UserInfoVO> findByLatLngRange(@Param("minLat") double minLat, @Param("maxLat") double maxLat, @Param("minLng") double minLng, @Param("maxLng") double maxLng);
 }

src/main/java/com/bao/dating/message/WsMessage.java

@@ -0,0 +1,17 @@
+package com.bao.dating.message;
+
+import lombok.Data;
+
+/**
+ * WebSocket 消息
+ * @author KilLze
+ */
+@Data
+public class WsMessage<T> {
+
+    /** 消息类型：chat / read / system */
+    private String type;
+
+    /** 消息体 */
+    private T data;
+}

src/main/java/com/bao/dating/pojo/dto/ChatCursorPageDTO.java

@@ -0,0 +1,25 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录分页参数
+ * @author lenovo
+ */
+@Data
+public class ChatCursorPageDTO {
+
+    /**
+     * 时间游标：最后一条消息的发送时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+    private LocalDateTime cursor;
+
+    /**
+     * 拉取条数
+     */
+    private Integer size;
+}

src/main/java/com/bao/dating/pojo/dto/ChatHistoryQueryDTO.java

@@ -0,0 +1,17 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录查询参数
+ * @author KilLze
+ */
+@Data
+public class ChatHistoryQueryDTO {
+    private Long currentUserId;
+    private Long targetUserId;
+    private LocalDateTime cursor;
+    private Integer size;
+}

src/main/java/com/bao/dating/pojo/dto/ChatMarkReadDTO.java

@@ -0,0 +1,16 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录已读参数
+ * @author lenovo
+ */
+@Data
+public class ChatMarkReadDTO {
+    private Long senderUserId;
+    private Long receiverUserId;
+    private LocalDateTime readTime;
+}

src/main/java/com/bao/dating/pojo/dto/ChatRecallDTO.java

@@ -0,0 +1,13 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 聊天记录撤回参数
+ * @author lenovo
+ */
+@Data
+public class ChatRecallDTO {
+    private Long chatId;
+    private Long receiverUserId;
+}

src/main/java/com/bao/dating/pojo/dto/ChatRecordSendDTO.java

@@ -0,0 +1,17 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 聊天记录发送数据传输对象
+ * @author KilLze
+ */
+@Data
+public class ChatRecordSendDTO {
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+}

src/main/java/com/bao/dating/pojo/dto/ChatSessionMuteDTO.java

@@ -0,0 +1,13 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 聊天会话静音参数
+ * @author lenovo
+ */
+@Data
+public class ChatSessionMuteDTO {
+    private Long targetUserId;
+    private Integer muteStatus;
+}

src/main/java/com/bao/dating/pojo/dto/ChatSessionStatusDTO.java

@@ -0,0 +1,13 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 会话状态参数
+ * @author lenovo
+ */
+@Data
+public class ChatSessionStatusDTO {
+    private Long targetUserId;
+    private Integer sessionStatus;
+}

src/main/java/com/bao/dating/pojo/dto/ChatSessionTopDTO.java

@@ -0,0 +1,13 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 会话置顶参数
+ * @author lenovo
+ */
+@Data
+public class ChatSessionTopDTO {
+    private Long targetUserId;
+    private Integer topStatus;
+}

src/main/java/com/bao/dating/pojo/dto/UserInfoDTO.java

@@ -2,16 +2,17 @@ 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;
 
 /**
- * 用户信息更新数据传输对象
+ * 用户信息数据传输对象
  * @author KilLze
  */
 @Data
-public class UserInfoUpdateDTO {
+public class UserInfoDTO implements Serializable {
     private Long userId;
     private String userName;
     private String nickname;

src/main/java/com/bao/dating/pojo/entity/ChatRecords.java

@@ -0,0 +1,35 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录表
+ * @author lenovo
+ */
+@Data
+public class ChatRecords {
+    /** 聊天记录ID */
+    private Long chatId;
+    /** 发送者用户ID */
+    private Long senderUserId;
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+    /** 阅读状态 （0-未读，1-已读） */
+    private Integer readStatus;
+    /** 阅读时间 */
+    private LocalDateTime readTime;
+    /** 发送时间 */
+    private LocalDateTime sendTime;
+    /** 消息状态 （1-正常，2-已撤回，3-已删除） */
+    private Integer messageStatus;
+    /** 创建时间 */
+    private LocalDateTime createdAt;
+    /** 更新时间 */
+    private LocalDateTime updatedAt;
+}

src/main/java/com/bao/dating/pojo/entity/ChatSessions.java

@@ -0,0 +1,40 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 会话表
+ * @author KilLze
+ */
+@Data
+public class ChatSessions {
+    /** 会话ID */
+    private Long sessionId;
+    /** 所属用户ID */
+    private Long userId;
+    /** 目标用户ID */
+    private Long targetUserId;
+    /** 会话名称 */
+    private String sessionName;
+    /** 最后一条消息ID （关联chat_records.chat_id） */
+    private Long lastMessageId;
+    /** 最后一条消息内容 */
+    private String lastMessageContent;
+    /** 最后一条消息时间 */
+    private LocalDateTime lastMessageTime;
+    /** 未读消息数量 */
+    private Integer unreadCount;
+    /** 会话状态 （1-正常，2-已隐藏，3-已删除） */
+    private Integer sessionStatus;
+    /** 置顶状态 （0-未置顶，1-已置顶） */
+    private Integer topStatus;
+    /** 免打扰状态 （0-正常提醒，1-免打扰） */
+    private Integer muteStatus;
+    /** 创建时间 */
+    private LocalDateTime createdAt;
+    /** 更新时间 */
+    private LocalDateTime updatedAt;
+
+}

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;
+}

src/main/java/com/bao/dating/pojo/entity/User.java

@@ -43,4 +43,8 @@ public class User implements Serializable {
     private String userEmail;
 
     private String userPhone;
+
+    private Double latitude;   // 纬度
+
+    private Double longitude;  // 经度
 }

src/main/java/com/bao/dating/pojo/vo/ChatRecordsVO.java

@@ -0,0 +1,29 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 聊天记录返回数据
+ * @author KilLze
+ */
+@Data
+public class ChatRecordsVO {
+    /** 聊天记录ID */
+    private Long chatId;
+    /** 发送者用户ID */
+    private Long senderUserId;
+    /** 接收者用户ID */
+    private Long receiverUserId;
+    /** 消息内容 */
+    private String messageContent;
+    /** 消息类型 （1-文本消息，2-文件消息） */
+    private Integer messageType;
+    /** 阅读状态 （0-未读，1-已读） */
+    private Integer readStatus;
+    /** 发送时间 */
+    private LocalDateTime sendTime;
+    /** 消息状态 （1-正常，2-已撤回，3-已删除） */
+    private Integer messageStatus;
+}

src/main/java/com/bao/dating/pojo/vo/ChatSessionsVO.java

@@ -0,0 +1,32 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 会话信息
+ * @author KilLze
+ */
+@Data
+public class ChatSessionsVO {
+
+    /** 会话ID */
+    private Long sessionId;
+    /** 对方用户ID */
+    private Long targetUserId;
+    /** 会话名称 */
+    private String sessionName;
+    /** 对方用户头像 */
+    private String avatarUrl;
+    /** 最后一条消息内容 */
+    private String lastMessageContent;
+    /** 最后一条消息时间 */
+    private LocalDateTime lastMessageTime;
+    /** 未读消息数量 */
+    private Integer unreadCount;
+    /** 置顶状态 */
+    private Integer topStatus;
+    /** 免打扰状态 */
+    private Integer muteStatus;
+}

src/main/java/com/bao/dating/pojo/vo/DataAnalysisVO.java

@@ -0,0 +1,11 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class DataAnalysisVO {
+    //所有总数
+    private Long total;
+    //时间段
+    private String timePeriod;
+}

src/main/java/com/bao/dating/pojo/vo/IpLocationVO.java

@@ -0,0 +1,30 @@
+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;
+}

src/main/java/com/bao/dating/pojo/vo/UserInfoVO.java

@@ -24,4 +24,6 @@ public class UserInfoVO implements Serializable {
     private String signature;
     private LocalDateTime updatedAt;
     private LocalDateTime createdAt;
+    private Double latitude;
+    private Double longitude;
 }

src/main/java/com/bao/dating/service/ChatService.java

@@ -0,0 +1,82 @@
+package com.bao.dating.service;
+
+import com.bao.dating.common.result.PageResult;
+import com.bao.dating.pojo.dto.*;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.pojo.vo.ChatSessionsVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 聊天服务
+ * @author lenovo
+ */
+public interface ChatService {
+    /**
+     * 消息入库，如果会话不存在则创建会话
+     * @param senderUserId 发送方用户ID
+     * @param dto 发送参数
+     * @return 聊天记录VO
+     */
+    ChatRecordsVO createSession(Long senderUserId, ChatRecordSendDTO dto);
+
+    /**
+     * 上传媒体文件
+     * @param file 文件
+     * @return 文件URL列表
+     */
+    String uploadChat(MultipartFile file);
+
+    /**
+     * 获取聊天记录
+     * @param dto 查询参数
+     * @return 聊天记录列表
+     */
+    List<ChatRecordsVO> getChatHistory(ChatHistoryQueryDTO dto);
+
+
+    /**
+     * 标记聊天记录为已读
+     * @param currentUserId 当前用户ID
+     * @param targetUserId 目标用户ID
+     */
+    void markChatMessagesAsRead(Long currentUserId, Long targetUserId);
+
+    /**
+     * 获取会话列表
+     * @param currentUserId 当前用户ID
+     * @return 会话列表
+     */
+    List<ChatSessionsVO> getSessionList(Long currentUserId);
+
+    /**
+     * 更新会话状态
+     * @param userId 用户ID
+     * @param dto 更新参数
+     */
+    void updateSessionStatus(Long userId, ChatSessionStatusDTO dto);
+
+    /**
+     * 置顶会话
+     * @param userId 用户ID
+     * @param dto 置顶参数
+     */
+    void updateTopStatus(Long userId, ChatSessionTopDTO dto);
+
+    /**
+     * 免打扰会话
+     * @param userId 用户ID
+     * @param dto 免打扰参数
+     */
+    void updateMuteStatus(Long userId, ChatSessionMuteDTO dto);
+
+    /**
+     * 撤回消息
+     * @param senderUserId 发送方ID
+     * @param chatId 聊天记录ID
+     * @return 撤回结果
+     */
+    boolean recallMessage(Long senderUserId, Long chatId);
+}

src/main/java/com/bao/dating/service/Ip2LocationClientService.java

@@ -0,0 +1,7 @@
+package com.bao.dating.service;
+
+import com.bao.dating.pojo.vo.IpLocationVO;
+
+public interface Ip2LocationClientService {
+    IpLocationVO getIpLocation(String ip)throws Exception;
+}

src/main/java/com/bao/dating/service/PostFavoriteService.java

@@ -1,10 +1,13 @@
 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);
 }

src/main/java/com/bao/dating/service/PostService.java

@@ -27,7 +27,7 @@ public interface PostService {
     Post createPost(PostRequestDTO postRequestDTO);
 
     /**
-     * 批量删除动态
+     * 批量删除动态（将动态状态改为已删除）
      * @param postIds 动态ID
      * @return 删除的动态对象
      */

src/main/java/com/bao/dating/service/UserService.java

@@ -1,11 +1,13 @@
 package com.bao.dating.service;
 
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
+import com.bao.dating.pojo.dto.UserInfoDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 用户服务接口
  * @author KilLze
@@ -18,6 +20,13 @@ public interface UserService {
      */
     UserLoginVO userLogin(UserLoginDTO userLoginDTO);
 
+    /**
+     * 退出登录
+     * @param token 登录凭证
+     * @return 注册结果
+     */
+    void logout(String token);
+
     /**
      * 查询个人信息
      * @param userId 动态ID
@@ -44,5 +53,43 @@ public interface UserService {
      * @param userInfoUpdateDTO 用户信息
      * @return 更新后的用户信息
      */
-    UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
+    UserInfoVO updateUserInfo(UserInfoDTO userInfoUpdateDTO);
+
+    /**
+     * 用户注册
+     * @param userName 用户名称
+     * @param userPassword 用户密码
+     * @return 用户信息
+     */
+    Boolean registerUser(String userName, String userPassword);
+
+    /**
+     * 邮箱登录
+     * @param email 邮箱
+     * @param code 验证码
+     * @return 登录结果
+     */
+    UserLoginVO emailLogin(String email, String code);
+
+    /**
+     * 根据用户ID查询用户信息
+     * @param userId 用户ID
+     * @return 用户
+     */
+    UserInfoDTO getUserInfoById(Long userId);
+
+    void sendSmsCode(String phone);
+
+    boolean verifyCode(String phone, String code);
+
+    UserLoginVO loginByPhone(String phone);
+
+    /**
+     * 获取指定经纬度范围内的用户
+     * @param lat 用户纬度
+     * @param lng 用户经度
+     * @param radiusKm 半径 km
+     * @return 用户列表
+     */
+    List<UserInfoVO> findNearbyUsers(double lat,double lng,double  radiusKm);
 }

src/main/java/com/bao/dating/service/impl/ChatServiceImpl.java

@@ -0,0 +1,325 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.common.aliyun.AliOssUtil;
+import com.bao.dating.common.result.AliOssResult;
+import com.bao.dating.context.UserContext;
+import com.bao.dating.mapper.ChatRecordsMapper;
+import com.bao.dating.mapper.ChatSessionsMapper;
+import com.bao.dating.pojo.dto.*;
+import com.bao.dating.pojo.entity.ChatRecords;
+import com.bao.dating.pojo.entity.ChatSessions;
+import com.bao.dating.pojo.vo.ChatRecordsVO;
+import com.bao.dating.pojo.vo.ChatSessionsVO;
+import com.bao.dating.service.ChatService;
+import com.bao.dating.service.UserService;
+import com.bao.dating.util.FileUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+
+/**
+ * 聊天服务实现类
+ * @author lenovo
+ */
+@Slf4j
+@Service
+public class ChatServiceImpl implements ChatService {
+    @Autowired
+    private ChatRecordsMapper chatRecordsMapper;
+
+    @Autowired
+    private ChatSessionsMapper chatSessionsMapper;
+
+    @Autowired
+    private AliOssUtil ossUtil;
+
+    @Autowired
+    private UserService userService;
+
+    /**
+     * 消息入库，如果会话不存在则创建会话
+     * @param senderUserId 发送者用户ID
+     * @param dto 消息
+     * @return 聊天记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ChatRecordsVO createSession(Long senderUserId, ChatRecordSendDTO dto) {
+
+        ChatSessions session = chatSessionsMapper.getSession(senderUserId, dto.getReceiverUserId());
+        if (session != null && session.getSessionStatus() == 3) {
+            log.warn("会话已删除，无法发送消息");
+            return null;
+        }
+
+        ChatRecords record = new ChatRecords();
+        record.setSenderUserId(senderUserId);
+        record.setReceiverUserId(dto.getReceiverUserId());
+        record.setMessageContent(dto.getMessageContent());
+        record.setMessageType(dto.getMessageType());
+        record.setReadStatus(0);
+        record.setMessageStatus(1);
+        record.setSendTime(LocalDateTime.now());
+
+        // 插入消息记录
+        chatRecordsMapper.insert(record);
+
+        // 创建发送方会话
+        ChatSessions sessions = new ChatSessions();
+        sessions.setUserId(senderUserId);
+        sessions.setTargetUserId(dto.getReceiverUserId());
+        // 获取接收方昵称作为发送方会话名称
+        try {
+            UserInfoDTO receiverNicknameInfo = userService.getUserInfoById(dto.getReceiverUserId());
+            if (receiverNicknameInfo != null && receiverNicknameInfo.getNickname() != null) {
+                sessions.setSessionName(receiverNicknameInfo.getNickname());
+            } else {
+                log.warn("接收用户ID获取用户信息时出现错误: {} , 使用默认id", dto.getReceiverUserId());
+                sessions.setSessionName("用户" + dto.getReceiverUserId());
+            }
+        } catch (Exception e) {
+            log.error("接收用户ID获取用户信息时出现错误: {} , 使用默认id", dto.getReceiverUserId(), e);
+            sessions.setSessionName("用户" + dto.getReceiverUserId());
+        }
+        sessions.setLastMessageId(record.getChatId());
+        sessions.setLastMessageContent(record.getMessageContent());
+        sessions.setLastMessageTime(record.getSendTime());
+
+        chatSessionsMapper.upsertSessionForSender(sessions);
+
+        // 创建接收方会话
+        sessions.setUserId(dto.getReceiverUserId());
+        sessions.setTargetUserId(senderUserId);
+        try {
+            UserInfoDTO senderNicknameInfo = userService.getUserInfoById(senderUserId);
+            if (senderNicknameInfo != null && senderNicknameInfo.getNickname() != null) {
+                sessions.setSessionName(senderNicknameInfo.getNickname());
+            } else {
+                log.warn("接收用户ID获取用户信息时出现错误: {} , 使用默认id", senderUserId);
+                sessions.setSessionName("用户" + senderUserId);
+            }
+        } catch (Exception e) {
+            log.error("接收用户ID获取用户信息时出现错误: {} , 使用默认id", senderUserId, e);
+            sessions.setSessionName("用户" + senderUserId);
+        }
+
+        chatSessionsMapper.upsertSessionForReceiver(sessions);
+
+        // 3. 返回 VO
+        ChatRecordsVO vo = new ChatRecordsVO();
+        BeanUtils.copyProperties(record, vo);
+        return vo;
+    }
+
+    /**
+     * 上传媒体文件
+     * @return 上传后的文件URL
+     */
+    @Override
+    public String uploadChat(MultipartFile file) {
+        // 参数校验
+        if (file == null || file.isEmpty()) {
+            throw new RuntimeException("文件不存在");
+        }
+
+        String originalFilename = file.getOriginalFilename();
+        if (originalFilename == null) {
+            throw new RuntimeException("文件名非法");
+        }
+
+        String fileType = FileUtil.getFileType(originalFilename);
+        // 仅支持图片和视频文件上传
+        if (!AliOssResult.IMAGE.equals(fileType) && !AliOssResult.VIDEO.equals(fileType)) {
+            throw new RuntimeException("仅支持图片和视频文件上传");
+        }
+
+        //生成 OSS 路径
+        String extension = FileUtil.getFileExtension(originalFilename);
+        String fileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
+        Long userId = UserContext.getUserId();
+        String objectKey = "chat/" + userId + "/" + fileName;
+
+        try {
+            byte[] fileBytes = file.getBytes();
+            String ossUrl = ossUtil.upload(fileBytes, objectKey);
+
+            if (ossUrl == null || ossUrl.isEmpty()) {
+                throw new RuntimeException("图片上传失败");
+            }
+
+            return ossUrl;
+
+        } catch (Exception e) {
+            throw new RuntimeException("上传图片失败", e);
+        }
+    }
+
+    /**
+     * 获取聊天记录
+     * @return 聊天记录列表
+     */
+    @Override
+    public List<ChatRecordsVO> getChatHistory(ChatHistoryQueryDTO dto) {
+
+        Integer size = dto.getSize();
+        if (size == null || size < 1 || size > 100) {
+            dto.setSize(50);
+        }
+
+        // 查询聊天记录
+        List<ChatRecords> records = chatRecordsMapper.selectChatHistoryByCursor(dto);
+
+        // 倒序
+        Collections.reverse(records);
+
+        return records.stream().map(record -> {
+            ChatRecordsVO vo = new ChatRecordsVO();
+            BeanUtils.copyProperties(record, vo);
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 标记聊天消息为已读
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void markChatMessagesAsRead(Long currentUserId, Long targetUserId) {
+        // 更新 chat_records：把对方发给我的未读消息设为已读
+        ChatMarkReadDTO markReadDTO = new ChatMarkReadDTO();
+        // 因为读的是对方发给我的消息所以要把填入的参数反过来
+        markReadDTO.setSenderUserId(targetUserId);
+        markReadDTO.setReceiverUserId(currentUserId);
+        markReadDTO.setReadTime(LocalDateTime.now());
+
+        chatRecordsMapper.markMessagesAsRead(markReadDTO);
+
+        // 更新 chat_sessions：清空当前会话的未读数
+        chatSessionsMapper.clearUnreadCount(
+                currentUserId,
+                targetUserId
+        );
+    }
+
+    /**
+     * 获取会话列表
+     * @return 会话列表
+     */
+    @Override
+    public List<ChatSessionsVO> getSessionList(Long currentUserId) {
+        List<ChatSessions> sessions = chatSessionsMapper.selectSessionsByUserId(currentUserId);
+
+        return sessions.stream().map(session -> {
+            ChatSessionsVO vo = new ChatSessionsVO();
+            BeanUtils.copyProperties(session, vo);
+
+            UserInfoDTO targetUser = userService.getUserInfoById(session.getTargetUserId());
+            if (targetUser != null){
+                vo.setSessionName(targetUser.getNickname());
+                vo.setAvatarUrl(targetUser.getAvatarUrl());
+            }else {
+                vo.setSessionName("用户" + session.getTargetUserId());
+                vo.setAvatarUrl(null);
+            }
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 更新会话状态
+     * @param userId 用户ID
+     * @param dto 会话状态
+     */
+    @Override
+    public void updateSessionStatus(Long userId, ChatSessionStatusDTO dto) {
+        chatSessionsMapper.updateSessionStatus(
+                userId,
+                dto.getTargetUserId(),
+                dto.getSessionStatus()
+        );
+    }
+
+    /**
+     * 置顶会话
+     * @param userId 用户ID
+     * @param dto 置顶状态
+     */
+    @Override
+    public void updateTopStatus(Long userId, ChatSessionTopDTO dto) {
+        chatSessionsMapper.updateTopStatus(
+                userId,
+                dto.getTargetUserId(),
+                dto.getTopStatus()
+        );
+    }
+
+    /**
+     * 免打扰会话
+     * @param userId 用户ID
+     * @param dto 免打扰状态
+     */
+    @Override
+    public void updateMuteStatus(Long userId, ChatSessionMuteDTO dto) {
+        chatSessionsMapper.updateMuteStatus(
+                userId,
+                dto.getTargetUserId(),
+                dto.getMuteStatus()
+        );
+    }
+
+
+    /**
+     * 撤回消息
+     * @param senderUserId 发送者用户ID
+     * @param chatId 聊天记录ID
+     * @return 是否成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean recallMessage(Long senderUserId, Long chatId) {
+
+        // 查询聊天记录
+        ChatRecords record = chatRecordsMapper.selectById(chatId);
+        // 消息不存在
+        if (record == null) {
+            log.info("消息不存在，chatId: {}", chatId);
+            return false;
+        }
+
+        // 只能撤回自己发的
+        if (!record.getSenderUserId().equals(senderUserId)) {
+            log.info("不能撤回别人发的消息，chatId: {}，当前用户: {}，消息发送者: {}", chatId, senderUserId, record.getSenderUserId());
+            return false;
+        }
+
+        // 已撤回或已删除
+        if (record.getMessageStatus() != 1) {
+            log.info("消息已撤回或已删除，chatId: {}，当前状态: {}", chatId, record.getMessageStatus());
+            return false;
+        }
+
+        // 时间限制（2 分钟）
+        Duration duration = Duration.between(record.getSendTime(), LocalDateTime.now());
+        if (duration.toMinutes() > 2) {
+            log.info("消息已超过 2 分钟，不能撤回，chatId: {}，发送时间: {}", chatId, record.getSendTime());
+            return false;
+        }
+
+        return chatRecordsMapper.recallMessage(chatId, senderUserId) > 0;
+    }
+}

src/main/java/com/bao/dating/service/impl/Ip2LocationClientServiceImpl.java

@@ -0,0 +1,67 @@
+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());
+                }
+            }
+        }
+    }
+
+}

src/main/java/com/bao/dating/service/impl/PostFavoriteServiceImpl.java

@@ -4,6 +4,7 @@ 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;
@@ -58,4 +59,18 @@ 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);
+    }
 }

src/main/java/com/bao/dating/service/impl/PostServiceImpl.java

@@ -4,17 +4,22 @@ import com.bao.dating.common.aliyun.GreenImageScan;
 import com.bao.dating.common.aliyun.GreenTextScan;
 import com.bao.dating.common.result.GreenAuditResult;
 import com.bao.dating.context.UserContext;
+import com.bao.dating.mapper.CommentsMapper;
+import com.bao.dating.mapper.PostFavoriteMapper;
+import com.bao.dating.mapper.PostLikeMapper;
 import com.bao.dating.mapper.PostMapper;
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.service.PostService;
 import com.bao.dating.common.aliyun.AliOssUtil;
+import com.bao.dating.service.UserService;
 import com.bao.dating.util.FileUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -43,6 +48,15 @@ public class PostServiceImpl implements PostService {
     @Autowired
     private PostMapper postMapper;
 
+    @Autowired
+    private PostLikeMapper postLikeMapper;
+
+    @Autowired
+    private PostFavoriteMapper postFavoriteMapper;
+
+    @Autowired
+    private CommentsMapper commentsMapper;
+
     /**
      * 上传媒体文件
      * @param files 媒体文件数组
@@ -177,7 +191,7 @@ public class PostServiceImpl implements PostService {
     }
 
     /**
-     * 批量删除动态
+     * 批量删除动态（将动态状态改为已删除）
      *
      * @param postIds 动态ID
      * @return 删除的动态对象
@@ -188,7 +202,11 @@ public class PostServiceImpl implements PostService {
         // 判断用户权限
         Long userId = UserContext.getUserId();
 
-        // 遍历所有要删除的帖子ID，验证权限并删除相关记录
+        if (CollectionUtils.isEmpty(postIds)) {
+            return 0;
+        }
+        
+        // 遍历所有要删除的帖子ID，验证权限
         for (Long postId : postIds) {
             Post post = postMapper.selectById(postId);
             if (post == null) {
@@ -198,15 +216,20 @@ public class PostServiceImpl implements PostService {
             if (post.getUserId() == null || !post.getUserId().equals(userId)) {
                 throw new RuntimeException("无权限删除此动态");
             }
-            // 删除相关的收藏记录
-            postMapper.deletePostFavoriteByPostId(postId);
-            // 删除相关的点赞记录
-            postMapper.deletePostLikeByPostId(postId);
-            // 删除相关的评论记录
-            postMapper.deleteCommentsByPostId(postId);
         }
-        // 批量删除动态
-        return postMapper.deletePostByIds(postIds);
+        
+        int affected = postMapper.updatePublicById(postIds, userId);
+
+        if (affected == 0) {
+            throw new RuntimeException("未删除任何动态，可能无权限或动态不存在");
+        }
+
+        // 删除动态下的评论、点赞、收藏
+        commentsMapper.deleteCommentsByPostIds(postIds);
+        postLikeMapper.deleteLikesByPostIds(postIds);
+        postFavoriteMapper.deleteFavoritesByPostIds(postIds);
+
+        return affected;
     }
 
     /**

src/main/java/com/bao/dating/service/impl/UserServiceImpl.java

@@ -3,30 +3,35 @@ package com.bao.dating.service.impl;
 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.aliyun.SmsUtil;
 import com.bao.dating.common.result.AliOssResult;
 import com.bao.dating.common.result.GreenAuditResult;
 import com.bao.dating.context.UserContext;
 import com.bao.dating.mapper.UserMapper;
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
+import com.bao.dating.pojo.dto.UserInfoDTO;
 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 com.bao.dating.service.UserService;
+import com.bao.dating.service.VerificationCodeService;
+import com.bao.dating.util.*;
+import com.bao.dating.util.CodeUtil;
 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.data.redis.core.StringRedisTemplate;
 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;
 
 /**
  * 用户服务实现类
@@ -36,6 +41,10 @@ import java.util.UUID;
 @Service
 public class UserServiceImpl implements UserService {
 
+
+    @Autowired
+    private SmsUtil smsUtil;
+
     @Autowired
     private AliOssUtil ossUtil;
 
@@ -45,9 +54,18 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private GreenImageScan greenImageScan;
 
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Autowired
+    private VerificationCodeService verificationCodeService;
+
     /**
      * 用户登录
      *
@@ -76,6 +94,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());
@@ -84,6 +111,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);
+    }
+
     /**
      * 获取用户信息
      *
@@ -189,13 +239,14 @@ public class UserServiceImpl implements UserService {
         }
     }
 
+
     /**
      * 更新用户信息
      *
      * @param userInfoUpdateDTO 用户信息更新参数
      */
     @Override
-    public UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO) {
+    public UserInfoVO updateUserInfo(UserInfoDTO userInfoUpdateDTO) {
         Long userId = userInfoUpdateDTO.getUserId();
         User user = userMapper.selectByUserId(userId);
         if (user == null) {
@@ -275,4 +326,163 @@ public class UserServiceImpl implements UserService {
         BeanUtils.copyProperties(updatedUser, userInfoVO);
         return userInfoVO;
     }
+
+
+    /**
+     * 用户注册
+     * @param userName 用户名称
+     * @param userPassword 用户密码
+     * @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;
+    }
+
+    /**
+     * 根据用户ID获取用户昵称和头像
+     *
+     * @param userId 用户ID
+     * @return 用户昵称
+     */
+    @Override
+    public UserInfoDTO getUserInfoById(Long userId) {
+        // 查询数据库获取昵称
+        User user = userMapper.selectByUserId(userId);
+        if (user == null) {
+            throw new RuntimeException("没有此用户");
+        }
+        UserInfoDTO dto = new UserInfoDTO();
+        dto.setUserId(user.getUserId());
+        dto.setNickname(user.getNickname());
+        return dto;
+    }
+
+    // 发送短信验证码
+    @Override
+    public void sendSmsCode(String phone) {
+        //防刷：60 秒内只能发一次
+        String key = "sms:code:" + phone;
+        Boolean exists  = stringRedisTemplate.hasKey(key);
+        if (Boolean.TRUE.equals(exists)){
+            throw new RuntimeException("请勿频繁发送验证码");
+        }
+
+        // 生成验证码
+        String code = CodeUtil.generateCode();
+        // 发送短信
+        smsUtil.sendVerificationCode(phone, code);
+        //存 Redis（5分钟过期）
+        stringRedisTemplate.opsForValue()
+                .set(key,code, 5, TimeUnit.MINUTES);
+    }
+
+    // 校验验证码
+    @Override
+    public boolean verifyCode(String phone, String code) {
+
+        String key = "sms:code:" + phone;
+        String realCode  = stringRedisTemplate.opsForValue().get(key);
+        //过期，未发送
+        if (realCode ==null){
+            return false;
+        }
+        //不匹配
+        if (!realCode.equals(code)){
+            return false;
+        }
+        // 校验成功，删除验证码（一次性）
+        stringRedisTemplate.delete(key);
+        return true;
+    }
+
+    @Override
+    public UserLoginVO loginByPhone(String phone) {
+        //根据手机号查询用户
+        User user = userMapper.selectByPhone(phone);
+        //创建token
+        String token = JwtUtil.generateToken(user.getUserId().toString());
+        //封装返回结果
+        UserLoginVO VO = new UserLoginVO();
+        VO.setUserId(user.getUserId());
+        VO.setToken(token);
+        return VO;
+
+    }
+
+    @Override
+    public List<UserInfoVO> findNearbyUsers(double lat, double lng, double radiusKm) {
+       //先用经纬度范围筛选（矩形框，提高性能）
+        double delta = radiusKm / 111.0; // 1° ≈ 111km
+        double minLat = lat - delta;// 最小纬度
+        double maxLat = lat + delta;// 最大纬度
+        double minLng = lng - delta;// 最小经度
+        double maxLng = lng + delta;// 最大经度
+
+        // 打印经纬度范围
+        System.out.println("Min Latitude: " + minLat + ", Max Latitude: " + maxLat);
+        System.out.println("Min Longitude: " + minLng + ", Max Longitude: " + maxLng);
+
+        List<UserInfoVO> byLatLngRange = userMapper.findByLatLngRange(minLat, maxLat, minLng, maxLng);
+
+        //精确计算距离，筛选在半径内的用户
+        List<UserInfoVO> result = new ArrayList<>();
+        for (UserInfoVO u:byLatLngRange){
+            // 检查用户是否有经纬度信息
+            if (u.getLatitude() != null && u.getLongitude() != null) {
+                double distance  = DistanceUtil.calculate(lat, lng, u.getLatitude(), u.getLongitude());
+                if (distance <= radiusKm){
+                    result.add(u);
+                }
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/bao/dating/session/WsSessionManager.java

@@ -0,0 +1,51 @@
+package com.bao.dating.session;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * WebSocketSession 管理类
+ * @author KilLze
+ */
+@Component
+public class WsSessionManager {
+
+    private final Map<Long, WebSocketSession> SESSION_MAP = new ConcurrentHashMap<>();
+    /**
+     * 添加 WebSocketSession
+     * @param userId 用户ID
+     * @param session WebSocketSession
+     */
+    public void addSession(Long userId, WebSocketSession session) {
+        SESSION_MAP.put(userId, session);
+    }
+
+    /**
+     * 移除 WebSocketSession
+     * @param userId 用户ID
+     */
+    public void removeSession(Long userId) {
+        SESSION_MAP.remove(userId);
+    }
+
+    /**
+     * 获取 WebSocketSession
+     * @param userId 用户ID
+     * @return WebSocketSession
+     */
+    public WebSocketSession getSession(Long userId) {
+        return SESSION_MAP.get(userId);
+    }
+
+    /**
+     * 判断用户是否在线
+     * @param userId 用户ID
+     * @return true-在线，false-离线
+     */
+    public boolean isOnline(Long userId) {
+        return SESSION_MAP.containsKey(userId);
+    }
+}

src/main/java/com/bao/dating/util/CodeUtil.java

@@ -0,0 +1,12 @@
+package com.bao.dating.util;
+
+import java.util.Random;
+
+public class CodeUtil {
+    // 生成6位数字验证码
+    public static String generateCode() {
+        Random random = new Random();
+        int code=100000+random.nextInt(900000);
+        return String.valueOf(code);
+    }
+}

src/main/java/com/bao/dating/util/DataAnalysisRedisService.java

@@ -0,0 +1,101 @@
+package com.bao.dating.util;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 基于redis的数据分析工具 -统计动态总数和登录人数
+ */
+@Component
+public class DataAnalysisRedisService {
+    // Redis Key 定义
+    //动态总数
+    private static final String REDIS_KEY_POST_TOTAL = "data:post:total";
+    //活跃人数
+    private static final String REDIS_KEY_LOGIN_USER_TOTAL = "data:loginUser:total";
+
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    /**
+     * 记录动态向redis中添加数据
+     * @param postId 动态id
+     */
+    public void recordPostData(Long postId) {
+        // 获取当前毫秒级时间戳（作为Sorted Set的score）
+        long currentTimestamp = System.currentTimeMillis();
+        // 1. 记录动态数据
+        redisTemplate.opsForZSet().add(REDIS_KEY_POST_TOTAL, postId, currentTimestamp);
+        // 可选：设置Key的过期时间（1年+1天，避免数据无限累积）
+        setKeyExpire(REDIS_KEY_POST_TOTAL);
+    }
+
+    /**
+     * 记录动态向redis中添加数据
+     * @param userId 用户id
+     */
+    public void recordLoginUserData(Long userId) {
+        // 获取当前毫秒级时间戳（作为Sorted Set的score）
+        long currentTimestamp = System.currentTimeMillis();
+        // 1. 记录动态数据
+        redisTemplate.opsForZSet().add(REDIS_KEY_LOGIN_USER_TOTAL, userId, currentTimestamp);
+        // 可选：设置Key的过期时间（1年+1天，避免数据无限累积）
+        setKeyExpire(REDIS_KEY_LOGIN_USER_TOTAL);
+    }
+
+    /**
+     * 设置Redis Key的过期时间（1年+1天，确保1年内的数据都能被查询）
+     */
+    private void setKeyExpire(String redisKey) {
+        if (Boolean.FALSE.equals(redisTemplate.hasKey(redisKey))) {
+            redisTemplate.expire(redisKey, 366, TimeUnit.DAYS);
+        }
+    }
+
+    /**
+     * 统计指定时间段内发布的动态
+     * @param days 指定时间段
+     * @return 总数
+     */
+    public Long countPostTotalByDays(int days) {
+        // 1. 计算时间范围：结束时间=当前时间，起始时间=当前时间 - N天的毫秒数
+        long endTimestamp = System.currentTimeMillis();
+        long startTimestamp = endTimestamp - (long) days * 24 * 60 * 60 * 1000;
+        // 2.  key min max - 统计指定score范围内的成员数量（高效，直接返回数量）
+        return redisTemplate.opsForZSet().count(REDIS_KEY_POST_TOTAL, startTimestamp, endTimestamp);
+    }
+
+    public Long countLoginUserTotalByDays(int days) {
+        // 1. 计算时间范围：结束时间=当前时间，起始时间=当前时间 - N天的毫秒数
+        long endTimestamp = System.currentTimeMillis();
+        long startTimestamp = endTimestamp - (long) days * 24 * 60 * 60 * 1000;
+        // 2. key min max - 统计指定score范围内的成员数量（高效，直接返回数量）
+        return redisTemplate.opsForZSet().count(REDIS_KEY_LOGIN_USER_TOTAL, startTimestamp, endTimestamp);
+    }
+
+    /**
+     * 核心方法：传入当前时间，返回各时间段的结果
+     * @param currentDateTime 当前时间（LocalDateTime类型，可直接通过LocalDateTime.now()获取）
+     */
+    public  String calculateTimeRanges(LocalDateTime currentDateTime,int days) {
+        // 1. 计算各时间段的起始时间（当前时间往前推对应时长）
+        LocalDateTime sevenDaysAgo = currentDateTime.minusDays(7);
+        LocalDateTime fifteenDaysAgo = currentDateTime.minusDays(15);
+        LocalDateTime thirtyDaysAgo = currentDateTime.minusDays(30);
+        LocalDateTime oneYearAgo = currentDateTime.minusYears(1);
+        if (days == 7)
+            return sevenDaysAgo + " - " + currentDateTime;
+        if (days == 15)
+            return fifteenDaysAgo + " - " + currentDateTime;
+        if (days == 30)
+            return thirtyDaysAgo + " - " + currentDateTime;
+        if (days == 365)
+            return oneYearAgo + " - " + currentDateTime;
+        return null;
+    }
+
+}

src/main/java/com/bao/dating/util/DistanceUtil.java

@@ -0,0 +1,29 @@
+package com.bao.dating.util;
+
+//Haversine 公式（标准写法）
+
+public class DistanceUtil {
+    private static final double EARTH_RADIUS = 6371.0; // 地球半径 km
+
+    /**
+     * 计算两点之间距离（单位：km）
+     */
+    public static double calculate(
+            double lat1, double lon1,
+            double lat2, double lon2) {
+
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+
+        lat1 = Math.toRadians(lat1);
+        lat2 = Math.toRadians(lat2);
+
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+                + Math.cos(lat1) * Math.cos(lat2)
+                * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+        return EARTH_RADIUS * c;
+    }
+}

src/main/java/com/bao/dating/util/MD5Util.java

@@ -9,7 +9,6 @@ import java.security.NoSuchAlgorithmException;
  * @author KilLze
  */
 public class MD5Util {
-    
     /**
      * 对字符串进行MD5加密
      * @param input 待加密的字符串
@@ -19,7 +18,6 @@ public class MD5Util {
         if (input == null || input.isEmpty()) {
             return null;
         }
-        
         try {
             MessageDigest md = MessageDigest.getInstance("MD5");
             byte[] digest = md.digest(input.getBytes());
@@ -28,7 +26,6 @@ public class MD5Util {
             throw new RuntimeException("MD5算法不可用", e);
         }
     }
-    
     /**
      * 对字符串进行MD5加密（带盐值）
      * @param input 待加密的字符串
@@ -44,7 +41,6 @@ public class MD5Util {
         }
         return encrypt(input + salt);
     }
-    
     /**
      * 验证字符串与MD5值是否匹配
      * @param input 原始字符串
@@ -57,7 +53,6 @@ public class MD5Util {
         }
         return encrypt(input).equalsIgnoreCase(md5Hash);
     }
-    
     /**
      * 验证字符串与MD5值是否匹配（带盐值）
      * @param input 原始字符串
@@ -74,7 +69,6 @@ public class MD5Util {
         }
         return encryptWithSalt(input, salt).equalsIgnoreCase(md5Hash);
     }
-    
     /**
      * 将字节数组转换为十六进制字符串
      * @param bytes 字节数组
@@ -88,6 +82,3 @@ public class MD5Util {
         return sb.toString();
     }
 }
-
-
-

src/main/resources/application.yml

@@ -2,6 +2,11 @@ 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
@@ -64,3 +69,11 @@ 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  # 请求超时时间（毫秒）
+

src/main/resources/ciallo.txt

@@ -0,0 +1,9 @@
+
+    ▄▄▄▄      ██               ▄▄▄▄      ▄▄▄▄                                        ▄▄                                                       ▄▄
+  ██▀▀▀▀█     ▀▀               ▀▀██      ▀▀██                                       ██          ▄▄                                             ██
+ ██▀        ████      ▄█████▄    ██        ██       ▄████▄     ▄▄▄                 ▄█▀         ▄█▀             ██    █▄      ▄▄▄█              ▀█▄       ▄▄▄▄
+ ██           ██      ▀ ▄▄▄██    ██        ██      ██▀  ▀██   ▀   ▀▀▄▄   ▄         ██        ▄█▀        ██     ██    ██  ▄▄█▀▀▀                 ██     █▀▀  ▀█▄     █▄
+ ██▄          ██     ▄██▀▀▀██    ██        ██      ██    ██           ▀▀▀          ██       ▄█▄▄▄▄▄     ▀▀     ██ ██ ██  ▀▀█▄▄▄                 ██    █▀      █  ▀▀████▀
+  ██▄▄▄▄█  ▄▄▄██▄▄▄  ██▄▄▄███    ██▄▄▄     ██▄▄▄   ▀██▄▄██▀                        ▀█▄     ▀▀▀▀▀▀▀▀            ██▄██▄██      ▀▀▀█              ▄█▀                 █▀▀█
+    ▀▀▀▀   ▀▀▀▀▀▀▀▀   ▀▀▀▀ ▀▀     ▀▀▀▀      ▀▀▀▀     ▀▀▀▀                           ██                         ▀▀▀ ▀▀▀                         ██
+                                                                                     ▀▀                                                       ▀▀

src/main/resources/com/bao/dating/mapper/ChatRecordsMapper.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bao.dating.mapper.ChatRecordsMapper">
+
+    <!-- 插入聊天记录 -->
+    <insert id="insert" useGeneratedKeys="true" keyProperty="chatId">
+        INSERT INTO chat_records
+        (
+            sender_user_id,
+            receiver_user_id,
+            message_content,
+            message_type,
+            read_status,
+            send_time,
+            message_status,
+            created_at,
+            updated_at
+        )
+        VALUES
+            (
+                #{senderUserId},
+                #{receiverUserId},
+                #{messageContent},
+                #{messageType},
+                #{readStatus},
+                #{sendTime},
+                #{messageStatus},
+                NOW(),
+                NOW()
+            )
+    </insert>
+
+    <!-- 根据两个用户ID查询聊天记录 (按发送时间倒序) - PageHelper 会自动处理分页 -->
+    <select id="selectChatHistoryByCursor" resultType="com.bao.dating.pojo.entity.ChatRecords">
+        SELECT
+        chat_id, sender_user_id, receiver_user_id, message_content, message_type,
+        read_status, read_time, send_time, message_status, created_at, updated_at
+        FROM chat_records
+        WHERE
+            message_status = 1
+        AND (
+            (sender_user_id = #{currentUserId} AND receiver_user_id = #{targetUserId})
+            OR
+            (sender_user_id = #{targetUserId} AND receiver_user_id = #{currentUserId})
+        )
+        <if test="cursor != null">
+            AND send_time &lt; #{cursor}
+        </if>
+        ORDER BY send_time DESC
+        LIMIT #{size}
+    </select>
+
+    <!-- 标记消息为已读 -->
+    <update id="markMessagesAsRead">
+        UPDATE chat_records
+        SET
+            read_status = 1,
+            read_time = #{readTime},
+            updated_at = NOW()
+        WHERE
+            sender_user_id = #{senderUserId}
+          AND receiver_user_id = #{receiverUserId}
+          AND read_status = 0
+          AND message_status = 1
+    </update>
+
+    <!-- 根据ID查询聊天记录 -->
+    <select id="selectById" resultType="com.bao.dating.pojo.entity.ChatRecords">
+        SELECT
+            chat_id,
+            sender_user_id,
+            receiver_user_id,
+            send_time,
+            message_status
+        FROM chat_records
+        WHERE chat_id = #{chatId}
+    </select>
+
+    <!-- 撤回消息 -->
+    <update id="recallMessage">
+        UPDATE chat_records
+        SET
+            message_status = 2,
+            updated_at = NOW()
+        WHERE
+            chat_id = #{chatId}
+          AND sender_user_id = #{senderUserId}
+          AND message_status = 1
+    </update>
+
+</mapper>

src/main/resources/com/bao/dating/mapper/ChatSessionsMapper.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bao.dating.mapper.ChatSessionsMapper">
+
+    <!-- 插入或更新发送方会话 -->
+    <insert id="upsertSessionForSender" parameterType="com.bao.dating.pojo.entity.ChatSessions">
+        INSERT INTO chat_sessions
+        (user_id, target_user_id, session_name, last_message_id, last_message_content, last_message_time,
+        unread_count, session_status, top_status, mute_status, created_at, updated_at)
+        VALUES
+        (
+            #{userId}, #{targetUserId}, #{sessionName}, #{lastMessageId}, #{lastMessageContent}, #{lastMessageTime},
+            0, 1, 0, 0, NOW(), NOW()
+        )
+        ON DUPLICATE KEY UPDATE
+        last_message_id = VALUES(last_message_id),
+        last_message_content = VALUES(last_message_content),
+        last_message_time = VALUES(last_message_time),
+        unread_count = 0,
+        updated_at = NOW();
+    </insert>
+
+    <!-- 插入或更新接收方会话 -->
+    <insert id="upsertSessionForReceiver" parameterType="com.bao.dating.pojo.entity.ChatSessions">
+        INSERT INTO chat_sessions
+        (user_id, target_user_id, session_name, last_message_id, last_message_content, last_message_time,
+        unread_count, session_status, top_status, mute_status, created_at, updated_at)
+        VALUES
+        (
+            #{userId}, #{targetUserId}, #{sessionName}, #{lastMessageId}, #{lastMessageContent}, #{lastMessageTime},
+            1, 1, 0, 0, NOW(), NOW()
+        )
+        ON DUPLICATE KEY UPDATE
+        last_message_id = VALUES(last_message_id),
+        last_message_content = VALUES(last_message_content),
+        last_message_time = VALUES(last_message_time),
+        unread_count = unread_count + 1,
+        updated_at = NOW();
+    </insert>
+
+    <!-- 清空未读消息数 -->
+    <update id="clearUnreadCount">
+        UPDATE chat_sessions
+        SET
+            unread_count = 0,
+            updated_at = NOW()
+        WHERE
+            user_id = #{userId}
+          AND target_user_id = #{targetUserId}
+          AND session_status = 1
+    </update>
+
+    <!-- 查询会话列表 -->
+    <select id="selectSessionsByUserId" resultType="com.bao.dating.pojo.entity.ChatSessions">
+        SELECT session_id, target_user_id, session_name, last_message_content,
+               last_message_time, unread_count, top_status, mute_status
+        FROM chat_sessions
+        WHERE user_id = #{userId}
+          AND session_status in (1,2)
+        ORDER BY top_status DESC, last_message_time DESC
+    </select>
+
+    <!-- 更新会话状态 -->
+    <update id="updateSessionStatus">
+        UPDATE chat_sessions
+        SET session_status = #{sessionStatus},
+            updated_at = NOW()
+        WHERE user_id = #{userId}
+          AND target_user_id = #{targetUserId}
+    </update>
+
+    <!-- 置顶会话 -->
+    <update id="updateTopStatus">
+        UPDATE chat_sessions
+        SET top_status = #{topStatus},
+            updated_at = NOW()
+        WHERE user_id = #{userId}
+          AND target_user_id = #{targetUserId}
+    </update>
+
+    <!-- 静音会话 -->
+    <update id="updateMuteStatus">
+        UPDATE chat_sessions
+        SET mute_status = #{muteStatus},
+            updated_at = NOW()
+        WHERE user_id = #{userId}
+          AND target_user_id = #{targetUserId}
+    </update>
+
+</mapper>

src/main/resources/com/bao/dating/mapper/CommentsMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bao.dating.mapper.CommentsMapper">
+
+    <!-- 批量删除动态下的所有评论 -->
+    <delete id="deleteCommentsByPostIds">
+        DELETE FROM comments
+        WHERE post_id IN
+        <foreach collection="postIds" item="postId" open="(" close=")" separator=",">
+            #{postId}
+        </foreach>
+    </delete>
+
+</mapper>

src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml

@@ -14,4 +14,18 @@
     <select id="selectUserIDByPostID" resultType="java.lang.Long">
         SELECT user_id FROM post_favorite WHERE post_id = #{postId}
     </select>
+
+    <!--批量删除动态收藏-->
+    <delete id="deleteFavoritesByPostIds">
+        DELETE FROM post_favorite
+        WHERE post_id IN
+        <foreach collection="postIds" item="postId" open="(" close=")" separator=",">
+            #{postId}
+        </foreach>
+    </delete>
+
+    <!-- 查询所有收藏动态 -->
+    <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>

src/main/resources/com/bao/dating/mapper/PostLikeMapper.xml

@@ -14,4 +14,14 @@
     <delete id="deleteByPostIdAndUserId">
         delete from dating.post_like where post_id = #{postId} and user_id = #{userId}
     </delete>
+
+    <!--批量删除点赞记录-->
+    <delete id="deleteLikesByPostIds">
+        DELETE FROM post_like
+        WHERE post_id IN
+        <foreach collection="postIds" item="postId" open="(" close=")" separator=",">
+            #{postId}
+        </foreach>
+    </delete>
+
 </mapper>

src/main/resources/com/bao/dating/mapper/PostMapper.xml

@@ -28,13 +28,20 @@
          #{isPublic}, 0, 0, #{createdAt}, #{updatedAt})
     </insert>
 
-    <!--动态删除-->
-    <delete id="deletePostByIds">
-        DELETE FROM post WHERE post_id IN
+    <!--修改动态状态-->
+    <update id="updatePublicById">
+        UPDATE post
+        <set>
+            is_public = 3,
+            updated_at = NOW()
+        </set>
+        WHERE post_id IN
         <foreach item="postId" index="index" collection="postIds" separator="," open="(" close=")">
             #{postId}
         </foreach>
-    </delete>
+        AND user_id = #{userId}
+    </update>
+    
     <!--删除收藏记录-->
     <delete id="deletePostFavoriteByPostId">
         DELETE FROM post_favorite WHERE post_id = #{postId}

src/main/resources/com/bao/dating/mapper/UserMapper.xml

@@ -3,6 +3,10 @@
         "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">
@@ -28,6 +32,8 @@
         <result property="signature" column="signature"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
+        <result property="latitude" column="user_latitude"/>
+        <result property="longitude" column="user_longitude"/>
     </resultMap>
     <select id="selectByUserId" resultMap="UserResultMap">
         SELECT
@@ -41,8 +47,20 @@
             hobbies,
             signature,
             created_at,
-            updated_at
-            FROM user WHERE user_id = #{userId}
+            updated_at,
+            user_latitude,
+            user_longitude
+        FROM dating.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更新动态-->
@@ -75,5 +93,42 @@
         WHERE user_id = #{userId}
     </update>
 
+    <select id="selectByPhone" resultType="com.bao.dating.pojo.entity.User">
+        select * from dating.user where user_phone =#{phone}
+    </select>
+    <resultMap id="UserInfoVOResultMap" type="com.bao.dating.pojo.vo.UserInfoVO">
+        <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickname" column="nickname"/>
+        <result property="avatarUrl" column="avatar_url"/>
+        <result property="backgroundUrl" column="background_url"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+        <result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToJsonTypeHandler"/>
+        <result property="signature" column="signature"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+        <result property="latitude" column="user_latitude"/>
+        <result property="longitude" column="user_longitude"/>
+    </resultMap>
+
+    <select id="findByLatLngRange" resultMap="UserInfoVOResultMap">
+        SELECT
+            user_id,
+            user_name,
+            nickname,
+            avatar_url,
+            background_url,
+            gender,
+            birthday,
+            hobbies,
+            signature,
+            created_at,
+            updated_at,
+            user_latitude,
+            user_longitude
+        FROM user WHERE user_latitude BETWEEN #{minLat} AND #{maxLat} AND user_longitude BETWEEN #{minLng} AND #{maxLng}
+    </select>
+
 
 </mapper>