修复token

修复AI的小巧思3
删除AI的小巧思2
2026-01-20 17:11:20 +08:00 · 2026-01-20 15:16:05 +08:00 · 2026-01-20 15:13:58 +08:00 · 2026-01-20 15:13:35 +08:00 · 2026-01-20 14:57:58 +08:00 · 2026-01-20 14:51:53 +08:00
92 changed files with 4665 additions and 52 deletions
--- a/GIT_CONVENTION.md
+++ b/GIT_CONVENTION.md
@@ -0,0 +1,482 @@
+# Git 使用规范
+
+## 目录
+- [分支命名规范](#分支命名规范)
+- [提交信息规范](#提交信息规范)
+- [工作流程](#工作流程)
+- [代码审查](#代码审查)
+- [最佳实践](#最佳实践)
+
+---
+
+## 分支命名规范
+
+### 分支类型
+
+#### 1. 主分支
+- **master/main**: 生产环境分支，只接受合并，不允许直接提交
+- **develop/dev**: 开发主分支，用于集成所有功能
+
+#### 2. 功能分支 (Feature)
+```
+feature/功能名称
+feature/功能名称-简短描述
+```
+**示例：**
+- `feature/user-login`
+- `feature/payment-integration`
+- `feature/contacts-friends`
+
+#### 3. 修复分支 (Bugfix)
+```
+bugfix/问题描述
+fix/问题描述
+```
+**示例：**
+- `bugfix/login-error`
+- `fix/memory-leak`
+
+#### 4. 热修复分支 (Hotfix)
+```
+hotfix/问题描述
+```
+**示例：**
+- `hotfix/critical-security-patch`
+- `hotfix/payment-bug`
+
+#### 5. 发布分支 (Release)
+```
+release/版本号
+```
+**示例：**
+- `release/v1.0.0`
+- `release/v2.1.0`
+
+### 命名规则
+- 使用小写字母
+- 多个单词用连字符 `-` 分隔
+- 避免使用下划线 `_` 或空格
+- 分支名要有意义，能清楚表达分支用途
+- 避免使用特殊字符：`~`, `^`, `:`, `?`, `*`, `[`, `\`
+
+---
+
+## 提交信息规范
+
+### 提交信息格式
+```
+<type>(<scope>): <subject>
+
+<body>
+
+<footer>
+```
+
+### Type 类型
+
+| 类型 | 说明 | 示例 |
+|------|------|------|
+| `feat` | 新功能 | `feat: 添加用户登录功能` |
+| `fix` | 修复bug | `fix: 修复登录验证失败问题` |
+| `docs` | 文档更新 | `docs: 更新API文档` |
+| `style` | 代码格式调整（不影响功能） | `style: 格式化代码` |
+| `refactor` | 代码重构 | `refactor: 重构用户服务类` |
+| `perf` | 性能优化 | `perf: 优化数据库查询性能` |
+| `test` | 测试相关 | `test: 添加用户登录单元测试` |
+| `chore` | 构建/工具/依赖更新 | `chore: 更新依赖包版本` |
+| `ci` | CI/CD相关 | `ci: 配置GitHub Actions` |
+| `build` | 构建系统相关 | `build: 更新Maven配置` |
+
+### Scope 范围（可选）
+- 指定修改的模块或文件
+- 示例：`feat(user): 添加用户注册功能`
+
+### Subject 主题
+- 简短描述，不超过50个字符
+- 使用中文或英文，保持项目统一
+- 首字母小写，结尾不加句号
+- 使用祈使语气（如：添加、修复、更新）
+
+### Body 正文（可选）
+- 详细描述修改内容
+- 说明为什么修改，如何修改
+- 每行不超过72个字符
+- 用空行与 subject 分隔
+
+### Footer 页脚（可选）
+- 关联Issue：`Closes #123`
+- 破坏性变更：`BREAKING CHANGE: 修改了API接口`
+
+### 提交信息示例
+
+#### 简单提交
+```
+feat: 添加联系人管理功能
+```
+
+#### 带scope的提交
+```
+feat(user): 添加用户头像上传功能
+```
+
+#### 详细提交
+```
+feat(contact): 添加联系人管理功能
+
+- 实现联系人列表查询
+- 添加联系人添加/删除接口
+- 集成Redis缓存优化性能
+
+Closes #45
+```
+
+#### 修复提交
+```
+fix: 修复登录验证失败问题
+
+修复了当用户密码包含特殊字符时验证失败的问题
+
+Fixes #67
+```
+
+---
+
+## 工作流程
+
+### 1. 创建功能分支
+
+```bash
+# 从develop分支创建新分支
+git checkout develop
+git pull origin develop
+git checkout -b feature/your-feature-name
+```
+
+### 2. 开发过程
+
+```bash
+# 经常提交代码
+git add .
+git commit -m "feat: 实现XXX功能"
+
+# 定期同步主分支
+git checkout develop
+git pull origin develop
+git checkout feature/your-feature-name
+git merge develop
+```
+
+### 3. 提交前检查
+
+```bash
+# 检查代码状态
+git status
+
+# 查看修改内容
+git diff
+
+# 查看提交历史
+git log --oneline
+```
+
+### 4. 推送分支
+
+```bash
+# 首次推送
+git push -u origin feature/your-feature-name
+
+# 后续推送
+git push
+```
+
+### 5. 合并到主分支
+
+```bash
+# 方式1: 通过Pull Request（推荐）
+# 在Git平台创建PR，代码审查后合并
+
+# 方式2: 本地合并（不推荐，除非紧急情况）
+git checkout develop
+git pull origin develop
+git merge feature/your-feature-name
+git push origin develop
+```
+
+### 6. 清理分支
+
+```bash
+# 删除本地分支
+git branch -d feature/your-feature-name
+
+# 删除远程分支
+git push origin --delete feature/your-feature-name
+```
+
+---
+
+## 代码审查
+
+### Pull Request 规范
+
+#### PR标题格式
+```
+[类型] 简短描述
+```
+**示例：**
+- `[Feature] 添加联系人管理功能`
+- `[Fix] 修复登录验证问题`
+- `[Refactor] 重构用户服务类`
+
+#### PR描述模板
+```markdown
+## 变更说明
+简要描述本次PR的主要变更内容
+
+## 变更类型
+- [ ] 新功能
+- [ ] Bug修复
+- [ ] 代码重构
+- [ ] 文档更新
+- [ ] 性能优化
+- [ ] 其他
+
+## 测试说明
+描述如何测试这些变更
+
+## 相关Issue
+关联的Issue编号: #123
+
+## 截图（如适用）
+[添加相关截图]
+```
+
+### 审查检查清单
+
+#### 提交者
+- [ ] 代码符合项目规范
+- [ ] 已添加必要的测试
+- [ ] 已更新相关文档
+- [ ] 提交信息清晰明确
+- [ ] 无编译错误和警告
+- [ ] 已进行自测
+
+#### 审查者
+- [ ] 代码逻辑正确
+- [ ] 代码风格一致
+- [ ] 无明显的性能问题
+- [ ] 无安全隐患
+- [ ] 测试覆盖充分
+- [ ] 文档更新完整
+
+---
+
+## 最佳实践
+
+### 1. 提交频率
+- ✅ **推荐**: 频繁提交，每次提交完成一个小功能
+- ❌ **不推荐**: 大量代码一次性提交
+
+### 2. 提交粒度
+- ✅ **推荐**: 每次提交只做一件事
+- ❌ **不推荐**: 一个提交包含多个不相关的修改
+
+### 3. 提交前检查
+```bash
+# 检查代码格式
+# 运行测试
+# 检查编译错误
+```
+
+### 4. 避免的操作
+- ❌ 不要在master/main分支直接提交
+- ❌ 不要提交临时文件、日志文件
+- ❌ 不要提交敏感信息（密码、密钥等）
+- ❌ 不要强制推送主分支 (`git push --force`)
+
+### 5. 使用 .gitignore
+确保 `.gitignore` 文件包含：
+```
+# 编译文件
+*.class
+*.jar
+*.war
+
+# IDE文件
+.idea/
+.vscode/
+*.iml
+
+# 日志文件
+*.log
+
+# 依赖目录
+node_modules/
+target/
+
+# 配置文件（包含敏感信息）
+application-local.yml
+config.properties
+```
+
+### 6. 冲突处理
+```bash
+# 拉取最新代码
+git pull origin develop
+
+# 如果有冲突，解决冲突后
+git add .
+git commit -m "fix: 解决合并冲突"
+```
+
+### 7. 撤销操作
+
+#### 撤销工作区修改
+```bash
+git checkout -- <file>
+```
+
+#### 撤销暂存区修改
+```bash
+git reset HEAD <file>
+```
+
+#### 修改最后一次提交
+```bash
+git commit --amend -m "新的提交信息"
+```
+
+#### 回退到指定提交
+```bash
+# 软回退（保留修改）
+git reset --soft <commit-hash>
+
+# 硬回退（丢弃修改）
+git reset --hard <commit-hash>
+```
+
+---
+
+## 常用命令速查
+
+### 分支操作
+```bash
+# 查看所有分支
+git branch -a
+
+# 创建分支
+git branch <branch-name>
+
+# 切换分支
+git checkout <branch-name>
+
+# 创建并切换分支
+git checkout -b <branch-name>
+
+# 删除本地分支
+git branch -d <branch-name>
+
+# 删除远程分支
+git push origin --delete <branch-name>
+```
+
+### 提交操作
+```bash
+# 查看状态
+git status
+
+# 添加文件
+git add <file>
+git add .
+
+# 提交
+git commit -m "提交信息"
+
+# 查看提交历史
+git log
+git log --oneline
+git log --graph --oneline --all
+```
+
+### 远程操作
+```bash
+# 查看远程仓库
+git remote -v
+
+# 拉取代码
+git pull origin <branch-name>
+
+# 推送代码
+git push origin <branch-name>
+
+# 获取远程更新（不合并）
+git fetch origin
+```
+
+### 其他实用命令
+```bash
+# 查看差异
+git diff
+git diff <branch1> <branch2>
+
+# 暂存修改
+git stash
+git stash pop
+
+# 查看文件历史
+git log -- <file>
+
+# 查看某行的修改历史
+git blame <file>
+```
+
+---
+
+## 版本标签规范
+
+### 标签命名
+使用语义化版本号：`v主版本号.次版本号.修订号`
+
+**示例：**
+- `v1.0.0` - 初始发布
+- `v1.1.0` - 新功能
+- `v1.1.1` - Bug修复
+- `v2.0.0` - 重大更新
+
+### 标签操作
+```bash
+# 创建标签
+git tag -a v1.0.0 -m "版本1.0.0发布"
+
+# 推送标签
+git push origin v1.0.0
+
+# 推送所有标签
+git push origin --tags
+
+# 查看标签
+git tag
+git show v1.0.0
+```
+
+---
+
+## 注意事项
+
+1. **保护主分支**: master/main 分支应该设置保护规则，禁止直接推送
+2. **定期同步**: 开发过程中定期从主分支同步代码，避免冲突积累
+3. **及时清理**: 合并后的分支及时删除，保持仓库整洁
+4. **提交前测试**: 确保代码可以正常编译和运行
+5. **代码审查**: 重要功能必须经过代码审查才能合并
+
+---
+
+## 参考资源
+
+- [Git官方文档](https://git-scm.com/doc)
+- [Conventional Commits](https://www.conventionalcommits.org/)
+- [Semantic Versioning](https://semver.org/)
+
+---
+
+**最后更新**: 2024年
+
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,13 @@
            <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>
@@ -171,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>
--- a/src/main/java/com/bao/dating/DatingApplication.java
+++ b/src/main/java/com/bao/dating/DatingApplication.java
@@ -3,6 +3,12 @@ package com.bao.dating;
 import org.mybatis.spring.annotation.MapperScan;
 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;
@@ -11,6 +17,7 @@ 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);
--- a/src/main/java/com/bao/dating/common/aliyun/SmsUtil.java
+++ b/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());
    }
+
 }


--- a/src/main/java/com/bao/dating/common/ip2location/Ip2LocationConfig.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/common/result/ChatSendResult.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/common/result/PageResult.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/bao/dating/config/AliyunOSSConfig.java
+++ b/src/main/java/com/bao/dating/config/AliyunOSSConfig.java
@@ -0,0 +1,16 @@
+package com.bao.dating.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "aliyun.oss")
+public class AliyunOSSConfig {
+    private String endpoint;
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String bucketName;
+
+}
--- a/src/main/java/com/bao/dating/config/RedisConfig.java
+++ b/src/main/java/com/bao/dating/config/RedisConfig.java
@@ -14,9 +14,9 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
@Configuration
 public class RedisConfig {
    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+    public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) {
        // 创建RedisTemplate对象
-        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        RedisTemplate redisTemplate = new RedisTemplate<>();
        // 设置redis的连接工厂对象
        redisTemplate.setConnectionFactory(redisConnectionFactory);

@@ -28,6 +28,7 @@ public class RedisConfig {
        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());

+        redisTemplate.afterPropertiesSet();
        return redisTemplate;
    }
 }
--- a/src/main/java/com/bao/dating/config/WebConfig.java
+++ b/src/main/java/com/bao/dating/config/WebConfig.java
@@ -29,7 +29,13 @@ public class WebConfig implements WebMvcConfigurer {
                .addPathPatterns("/**")
                // 忽略的接口
                .excludePathPatterns(
-                        "/user/login"
+                        "/user/login",
+                        "/user/register",
+                        "/user/emailLogin",
+                        "/api/verification/send-email-code",
+                        "/ip/location",
+                        "/user/sendCode",
+                        "/download/{postId}"
                );
    }
 }
--- a/src/main/java/com/bao/dating/config/WebSocketConfig.java
+++ b/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("*");
+    }
+}
--- a/src/main/java/com/bao/dating/context/UserContext.java
+++ b/src/main/java/com/bao/dating/context/UserContext.java
@@ -1,13 +1,15 @@
 package com.bao.dating.context;

 /**
- * 用户上下文类，用于保存当前线程的用户ID
+ * 用户上下文类，用于保存当前线程的用户ID和token
 * @author lenovo
 */
 public class UserContext {

    private static final ThreadLocal<Long> USER_HOLDER = new ThreadLocal<>();

+    private static final ThreadLocal<String> TOKEN_HOLDER = new ThreadLocal<>();
+
    /**
     * 设置当前线程的用户ID
     * @param userId 用户ID
@@ -25,9 +27,26 @@ public class UserContext {
    }

    /**
-     * 清除当前线程的用户ID
+     * 设置当前线程的token
+     * @param token 要设置的token字符串
+     */
+    public static void setToken(String token) {
+        TOKEN_HOLDER.set(token);
+    }
+
+    /**
+     * 获取当前线程的token
+     * @return 当前token，如果未设置则返回null
+     */
+    public static String getToken() {
+        return TOKEN_HOLDER.get();
+    }
+
+    /**
+     * 清除当前线程的用户ID和token
     */
    public static void clear() {
        USER_HOLDER.remove();
+        TOKEN_HOLDER.remove();
    }
 }
--- a/src/main/java/com/bao/dating/controller/AdminController.java
+++ b/src/main/java/com/bao/dating/controller/AdminController.java
@@ -0,0 +1,51 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.pojo.dto.UserBanDTO;
+import com.bao.dating.pojo.entity.UserBan;
+import com.bao.dating.service.UserBanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 管理员控制器
+ * @author lenovo
+ */
+@RestController
+@RequestMapping("/admin")
+public class AdminController {
+    @Autowired
+    private UserBanService userBanService;
+
+    /**
+     * 封禁用户
+     */
+    @PostMapping("/{userId}/ban")
+    public Result<?> banUser(@PathVariable Long userId,
+                             @RequestBody UserBanDTO userBanDTO) {
+        userBanDTO.setUserId(userId);
+        userBanService.banUser(userBanDTO);
+        return Result.success(ResultCode.SUCCESS, "封禁成功");
+    }
+
+    /**
+     * 解封用户
+     */
+    @PostMapping("/{userId}/unban")
+    public Result<?> unbanUser(@PathVariable Long userId) {
+
+        userBanService.unbanUser(userId);
+        return Result.success(ResultCode.SUCCESS, "解封成功");
+    }
+
+    /**
+     * 查询封禁状态
+     */
+    @GetMapping("/{userId}/banInfo")
+    public Result<UserBan> banInfo(@PathVariable Long userId) {
+
+        UserBan ban = userBanService.getActiveBan(userId);
+        return Result.success(ResultCode.SUCCESS, "查询成功", ban);
+    }
+}
--- a/src/main/java/com/bao/dating/controller/ChatController.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/bao/dating/controller/ContactsController.java
+++ b/src/main/java/com/bao/dating/controller/ContactsController.java
@@ -0,0 +1,100 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.context.UserContext;
+import com.bao.dating.service.ContactsService;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/contacts")
+public class ContactsController {
+    @Resource
+    private ContactsService contactsService;
+
+    /**
+     * 查询好友列表
+     * @return 响应结果
+     */
+    @GetMapping("/friends")
+    public Map<String, Object> getFriends() {
+
+        // 从UserContext获取当前用户ID
+        Long userId = UserContext.getUserId();
+        if (userId == null) {
+            Map<String, Object> error = new HashMap<>();
+            error.put("code", 401);
+            error.put("msg", "用户未授权");
+            return error;
+        }
+
+        // 查询好友列表
+        List<Map<String, Object>> friends = contactsService.getFriendsByUserId(userId);
+
+        // 构造响应
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", 200);
+        result.put("msg", "查询成功");
+        result.put("data", friends);
+        return result;
+    }
+
+
+
+    /**
+     * 拉黑联系人接口
+     * @param userId 当前用户ID
+     * @param contactUserId 被拉黑联系人ID
+     * @return 接口响应
+     */
+    @PostMapping("/blacklist/{userId}/{contactUserId}")
+    public ResponseEntity<Map<String, Object>> blacklistContact(
+            @PathVariable Long userId,
+            @PathVariable Long contactUserId) {
+        Map<String, Object> result = new HashMap<>();
+        boolean success = contactsService.blacklistContact(userId, contactUserId);
+        if (success) {
+            result.put("code", 200);
+            result.put("msg", "拉黑联系人成功");
+            result.put("data", null);
+            return ResponseEntity.ok(result);
+        } else {
+            result.put("code", 500);
+            result.put("msg", "拉黑联系人失败，联系人不存在或参数错误");
+            result.put("data", null);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+        }
+    }
+
+    /**
+     * 删除联系人接口
+     * @param userId 当前用户ID
+     * @param contactUserId 被删除联系人ID
+     * @return 接口响应
+     */
+    @PostMapping("/delete/{userId}/{contactUserId}")
+    public ResponseEntity<Map<String, Object>> deleteContact(
+            @PathVariable Long userId,
+            @PathVariable Long contactUserId) {
+        Map<String, Object> result = new HashMap<>();
+        boolean success = contactsService.deleteContact(userId, contactUserId);
+        if (success) {
+            result.put("code", 200);
+            result.put("msg", "删除联系人成功");
+            result.put("data", null);
+            return ResponseEntity.ok(result);
+        } else {
+            result.put("code", 500);
+            result.put("msg", "删除联系人失败，联系人不存在或参数错误");
+            result.put("data", null);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+        }
+    }
+}
--- a/src/main/java/com/bao/dating/controller/FriendController.java
+++ b/src/main/java/com/bao/dating/controller/FriendController.java
@@ -0,0 +1,122 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.context.UserContext;
+import com.bao.dating.service.FriendRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/friend-relation")
+public class FriendController {
+    @Autowired
+    private FriendRelationService friendRelationService;
+
+    /**
+     * 发送添加好友申请（写入数据库申请表）
+     * @param targetUserId 被申请人ID
+     * @param greeting 打招呼内容
+     * @return 操作结果
+     */
+    @PostMapping("/apply")
+    public Map<String, Object> sendFriendApply(
+            @RequestParam("targetUserId") Long targetUserId,
+            @RequestParam(value = "greeting", defaultValue = "你好，加个好友吧") String greeting) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            Long applyUserId = UserContext.getUserId();
+            if (applyUserId == null) {
+                result.put("code", 401);
+                result.put("msg", "用户未登录");
+                return result;
+            }
+            friendRelationService.addFriendApply(applyUserId, targetUserId, greeting);
+            result.put("code", 200);
+            result.put("msg", "好友申请发送成功");
+        } catch (Exception e) {
+            result.put("code", 500);
+            result.put("msg", "发送失败：" + e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 同意好友申请
+     * @param applyUserId 申请人ID
+     * @param targetUserId 被申请人ID（当前登录用户）
+     * @param contactNickname 给申请人的备注名
+     * @return 操作结果
+     */
+    @PostMapping("/agree")
+    public Map<String, Object> agreeFriendApply(
+            @RequestParam("applyUserId") Long applyUserId,
+            @RequestParam("targetUserId") Long targetUserId,
+            @RequestParam(value = "contactNickname", required = false) String contactNickname) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            // 1. 同意申请（更新申请状态+删除/标记）
+            friendRelationService.agreeFriendApply(applyUserId, targetUserId);
+            // 2. 保存好友关系到通讯录表
+            friendRelationService.addFriendRelation(targetUserId, applyUserId, contactNickname);
+            friendRelationService.addFriendRelation(applyUserId, targetUserId, null);
+            result.put("code", 200);
+            result.put("msg", "同意好友申请成功");
+        } catch (Exception e) {
+            result.put("code", 500);
+            result.put("msg", "同意失败：" + e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 查询待处理的好友申请
+     * @return 申请列表
+     */
+    @GetMapping("/apply/list")
+    public Map<String, Object> getApplyList() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            Long targetUserId = UserContext.getUserId();
+            if (targetUserId == null) {
+                result.put("code", 401);
+                result.put("msg", "用户未登录");
+                return result;
+            }
+            List<Map<String, Object>> applyList = friendRelationService.getFriendApplyList(targetUserId);
+            result.put("code", 200);
+            result.put("msg", "查询成功");
+            result.put("data", applyList);
+        } catch (Exception e) {
+            result.put("code", 500);
+            result.put("msg", "查询失败：" + e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 测试查询联系人
+     * @return 联系人列表
+     */
+    @GetMapping("/list")
+    public Map<String, Object> getFriendRelationList() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            Long userId = UserContext.getUserId();
+            if (userId == null) {
+                result.put("code", 401);
+                result.put("msg", "用户未登录");
+                return result;
+            }
+            result.put("code", 200);
+            result.put("msg", "查询成功");
+            result.put("data", friendRelationService.getFriendRelationList(userId));
+        } catch (Exception e) {
+            result.put("code", 500);
+            result.put("msg", "查询失败：" + e.getMessage());
+        }
+        return result;
+    }
+}
--- a/src/main/java/com/bao/dating/controller/IpLocationController.java
+++ b/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());
+        }
+    }
+}
--- a/src/main/java/com/bao/dating/controller/PostController.java
+++ b/src/main/java/com/bao/dating/controller/PostController.java
@@ -12,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
 import java.util.List;

 /**
@@ -31,7 +34,6 @@ public class PostController {
     * @param files 媒体文件数组
     * @return 上传后的文件URL列表
     */
-    @Log
    @PostMapping(value = "/upload", consumes = "multipart/form-data")
    public Result<List<String>> uploadMedia(@RequestParam("files") MultipartFile[] files) {
        List<String> fileUrls = postService.uploadMedia(files);
@@ -43,7 +45,6 @@ public class PostController {
     * @param postDTO 动态信息
     * @return 发布的动态对象
     */
-    @Log
    @PostMapping( "/createPost")
    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
        // 调用 Service 层处理发布动态业务逻辑
@@ -57,7 +58,6 @@ public class PostController {
     * @param postIds 动态ID
     * @return 删除结果
     */
-    @Log
    @PostMapping("/deletePost")
    public Result<String> deleteById(@RequestBody List<Long> postIds){
        int deletedCount = postService.deletePostById(postIds);
@@ -81,10 +81,25 @@ public class PostController {
     * @param postRequestDTO 动态信息
     * @return 更新后的动态对象
     */
-    @Log
    @PostMapping("/{postId}/updatePost")
    public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
        PostEditVO result = postService.updatePost(postId, postRequestDTO);
        return Result.success(ResultCode.SUCCESS, "动态更新成功", result);
    }
+
+    @GetMapping("/download/{postId}")
+    public void downloadPostImage(@PathVariable Long postId, HttpServletResponse response) throws Exception {
+        try {
+            //Service 返回已经加好水印的图片
+            BufferedImage image = postService.downloadWithWatermark(postId);
+            //设置响应头，触发浏览器下载
+            response.setContentType("image/jpeg");
+            response.setHeader("Content-Disposition", "attachment;filename=post_" + postId + ".jpg");
+            //输出到浏览器
+            ImageIO.write(image, "jpg", response.getOutputStream());
+            response.getOutputStream().flush();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
--- a/src/main/java/com/bao/dating/controller/PostFavoriteController.java
+++ b/src/main/java/com/bao/dating/controller/PostFavoriteController.java
@@ -2,11 +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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+import java.util.List;
 import java.util.Map;

@RestController
@@ -14,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){
@@ -22,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){
@@ -30,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);
+    }
+
 }
--- a/src/main/java/com/bao/dating/controller/UserController.java
+++ b/src/main/java/com/bao/dating/controller/UserController.java
@@ -1,20 +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.UserDeviceDTO;
+import com.bao.dating.pojo.dto.UserInfoDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
+import com.bao.dating.pojo.dto.UserLoginWithDeviceDTO;
+import com.bao.dating.pojo.entity.User;
+import com.bao.dating.pojo.vo.UserDeviceVO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
-import io.jsonwebtoken.Jwt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Map;

 /**
 * 用户接口
@@ -27,15 +31,15 @@ public class UserController {

    @Autowired
    private UserService userService;
-
+    
    /**
-     * 登录
+     * 简单登录（不记录设备信息）
     * @param userLoginDTO 登录参数
     */
    @PostMapping("/login")
-    public Result<UserLoginVO> login(@RequestBody UserLoginDTO userLoginDTO) {
-        UserLoginVO userloginVO = userService.userLogin(userLoginDTO);
-        return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
+    public Result<UserLoginVO> simpleLogin(@RequestBody UserLoginDTO userLoginDTO) {
+        UserLoginVO userLoginVO = userService.userLogin(userLoginDTO);
+        return Result.success(ResultCode.SUCCESS, "登录成功", userLoginVO);
    }

    /**
@@ -65,7 +69,6 @@ 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);
@@ -77,7 +80,6 @@ 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);
@@ -89,12 +91,171 @@ 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);
+        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,"请先注册用户或添加邮箱");
+        }
+        return Result.success(ResultCode.SUCCESS,"用户登录成功",userLoginVO);
+    }
+
+    /**
+     * 判断用户是否在线
+     * @param userId 用户ID
+     * @return 用户是否在线
+     */
+    @GetMapping("/{userId}/online")
+    public Result<Boolean> isUserOnline(@PathVariable Long userId) {
+
+        boolean online = userService.isUserOnline(userId);
+        return Result.success(ResultCode.SUCCESS, "查询成功", online);
+    }
+
+    /**
+     * 获取客户端IP地址
+     * @param request 请求
+     * @return IP地址
+     */
+    private String getClientIp(HttpServletRequest request) {
+        String ip = request.getHeader("X-Forwarded-For");
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        // 多个代理时，第一个IP为真实IP
+        if (ip != null && ip.contains(",")) {
+            ip = ip.split(",")[0].trim();
+        }
+        return ip;
+    }
+
+    /**
+     * 根据用户名/爱好标签搜索用户
+     *
+     * @param userName 用户名（模糊匹配）
+     * @param hobbies 爱好标签（精确匹配单个标签）
+     * @return 符合条件的用户列表
+     */
+    @GetMapping("/api/users/search")
+    public List<User> searchUsers(
+            @RequestParam(required = false) String userName,
+            @RequestParam(required = false) String hobbies) {
+        // 调用Service层的搜索方法
+        return userService.searchUsers(userName, hobbies);
+    }
 }
--- a/src/main/java/com/bao/dating/controller/websocket/ChatWebSocketHandler.java
+++ b/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 + " 已下线");
+    }
+}
--- a/src/main/java/com/bao/dating/interceptor/TokenInterceptor.java
+++ b/src/main/java/com/bao/dating/interceptor/TokenInterceptor.java
@@ -23,7 +23,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
 public class TokenInterceptor implements HandlerInterceptor {

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

    /**
     * 在请求处理之前进行拦截
@@ -44,10 +44,10 @@ public class TokenInterceptor implements HandlerInterceptor {
        }
        // 从 header 获取 token
        String token = request.getHeader("token");
-        
+
        try {
            log.info("jwt校验: {}", token);
-            
+
            // 验证 token 是否有效（包括是否过期）
            if (!JwtUtil.validateToken(token)) {
                log.error("Token无效或已过期");
@@ -66,9 +66,21 @@ public class TokenInterceptor implements HandlerInterceptor {
                response.getWriter().write("登录已失效, 请重新登录");
                return false;
            }
-            
+
            // 解析 token
-            String userId = JwtUtil.getSubjectFromToken(token);
+            Long userId = Long.valueOf(JwtUtil.getSubjectFromToken(token));
+
+            // 检查用户是否被封禁
+            String banKey = "user:ban:" + userId;
+            if (Boolean.TRUE.equals(redisTemplate.hasKey(banKey))) {
+                String reason = String.valueOf(redisTemplate.opsForValue().get(banKey));
+                log.error("用户 {} 已被封禁，原因：{}", userId, reason);
+
+                response.setStatus(403);
+                response.setContentType("application/json;charset=UTF-8");
+                response.getWriter().write("账号已被封禁：" + reason);
+                return false;
+            }

            // 从Redis获取存储的token进行比对
            Object redisTokenObj = redisTemplate.opsForValue().get("login:token:" + userId);
@@ -85,7 +97,9 @@ public class TokenInterceptor implements HandlerInterceptor {

            log.info("用户: {}", userId);
            // 保存 userId 到 ThreadLocal
-            UserContext.setUserId(Long.valueOf(userId));
+            UserContext.setUserId(userId);
+            // 保存 token 到 ThreadLocal
+            UserContext.setToken(token);
            return true;
        } catch (Exception e) {
            log.error("Token 校验失败: {}", e.getMessage());
--- a/src/main/java/com/bao/dating/interceptor/WsAuthInterceptor.java
+++ b/src/main/java/com/bao/dating/interceptor/WsAuthInterceptor.java
@@ -0,0 +1,119 @@
+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);
+
+            // 检查用户是否被封禁
+            String banKey = "user:ban:" + userId;
+            if (Boolean.TRUE.equals(redisTemplate.hasKey(banKey))) {
+                String reason = String.valueOf(redisTemplate.opsForValue().get(banKey));
+                log.error("WebSocket拒绝：用户 {} 被封禁，原因：{}", userId, reason);
+                return false;
+            }
+
+            // 从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握手完成");
+        }
+    }
+}
--- a/src/main/java/com/bao/dating/mapper/ChatRecordsMapper.java
+++ b/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);
+}
--- a/src/main/java/com/bao/dating/mapper/ChatSessionsMapper.java
+++ b/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);
+}
--- a/src/main/java/com/bao/dating/mapper/CommentsMapper.java
+++ b/src/main/java/com/bao/dating/mapper/CommentsMapper.java
@@ -5,18 +5,18 @@ 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);

    /**
--- a/src/main/java/com/bao/dating/mapper/ContactMapper.java
+++ b/src/main/java/com/bao/dating/mapper/ContactMapper.java
@@ -0,0 +1,36 @@
+package com.bao.dating.mapper;
+
+import com.bao.dating.pojo.entity.Contacts;
+import com.bao.dating.pojo.entity.User;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ContactMapper {
+    /**
+     * 根据用户ID查询好友列表（仅正常状态、非黑名单的好友）
+     * @param userId 当前用户ID
+     * @return 好友列表（包含联系人+用户基础信息）
+     */
+    List<Map<String, Object>> selectFriendsByUserId(@Param("userId") Long userId);
+
+
+    /**
+     * 拉黑联系人
+     * @param userId 当前用户ID
+     * @param contactUserId 被拉黑的联系人ID
+     * @return 影响行数
+     */
+    int blacklistContact(@Param("userId") Long userId, @Param("contactUserId") Long contactUserId);
+
+    /**
+     * 删除联系人（逻辑删除）
+     * @param userId 当前用户ID
+     * @param contactUserId 被删除的联系人ID
+     * @return 影响行数
+     */
+    int deleteContact(@Param("userId") Long userId, @Param("contactUserId") Long contactUserId);
+}
--- a/src/main/java/com/bao/dating/mapper/FriendRelationMapper.java
+++ b/src/main/java/com/bao/dating/mapper/FriendRelationMapper.java
@@ -0,0 +1,61 @@
+package com.bao.dating.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FriendRelationMapper {
+    /**
+     * 插入好友申请
+     * @param params 申请参数（匹配friend_apply表字段）
+     */
+    void insertFriendApply(Map<String, Object> params);
+
+    /**
+     * 根据申请人ID和被申请人ID查询好友申请
+     * @param applyUserId 申请人ID
+     * @param targetUserId 被申请人ID
+     * @return 好友申请记录
+     */
+    Map<String, Object> selectFriendApplyByUsers(@Param("applyUserId") Long applyUserId, @Param("targetUserId") Long targetUserId);
+
+    /**
+     * 更新好友申请状态
+     * @param params 更新参数
+     */
+    void updateFriendApplyStatus(Map<String, Object> params);
+
+    /**
+     * 删除好友申请（可选）
+     * @param params 删除条件
+     */
+    void deleteFriendApply(Map<String, Object> params);
+
+    /**
+     * 查询待处理的好友申请
+     * @param targetUserId 被申请人ID
+     * @return 申请列表
+     */
+    List<Map<String, Object>> selectFriendApplyList(@Param("targetUserId") Long targetUserId);
+
+    /**
+     * 插入联系人记录
+     * @param params 插入参数（匹配contacts表字段）
+     */
+    void insertFriendRelation(Map<String, Object> params);
+
+    /**
+     * 根据用户ID查询联系人列表
+     * @param userId 用户ID
+     * @return 联系人列表
+     */
+    List<Map<String, Object>> selectFriendRelationListByUserId(@Param("userId") Long userId);
+
+    /**
+     * 删除过期的好友申请
+     * @param days 过期天数
+     * @return 删除的记录数
+     */
+    int deleteExpiredFriendApply(@Param("days") Integer days);
+}
--- a/src/main/java/com/bao/dating/mapper/PostFavoriteMapper.java
+++ b/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;
@@ -7,10 +8,12 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;

@Mapper
-public interface PostFavoriteMapper {
+public interface    PostFavoriteMapper {
    //查询当前已收藏所有用户
    List<Long> selectUserIDByPostID(@Param("postId") Long postId);
+    //添加收藏
    int addPostFavorite(PostFavorite postFavorite);
+    //删除收藏
    int deletePostFavorite(@Param("postId") Long postId);

    /**
@@ -20,4 +23,6 @@ public interface PostFavoriteMapper {
     */
    int deleteFavoritesByPostIds(@Param("postIds") List<Long> postIds);

+    //查询用户所有收藏
+    List<Post> showAllFavorites(@Param("userid")Long userid);
 }
--- a/src/main/java/com/bao/dating/mapper/PostMapper.java
+++ b/src/main/java/com/bao/dating/mapper/PostMapper.java
@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
+import java.util.Map;

 /**
 * 动态Mapper
@@ -24,8 +25,30 @@ public interface PostMapper {
     * 根据ID修改动态状态
     *
     * @param postIds 动态ID
+     * @param userId 用户ID
     */
-    int updatePublicById(@Param("postIds") List<Long> postIds,  @Param("userId") Long userId);
+    int updatePublicById(@Param("postIds") List<Long> postIds, @Param("userId") Long userId);
+    
+    /**
+     * 根据动态ID删除收藏记录
+     *
+     * @param postId 动态ID
+     */
+    int deletePostFavoriteByPostId(Long postId);
+    
+    /**
+     * 根据动态ID删除点赞记录
+     *
+     * @param postId 动态ID
+     */
+    int deletePostLikeByPostId(Long postId);
+    
+    /**
+     * 根据动态ID删除评论记录
+     *
+     * @param postId 动态ID
+     */
+    int deleteCommentsByPostId(Long postId);

    /**
     * 根据ID查询动态
@@ -95,4 +118,12 @@ public interface PostMapper {
     * @return 影响行数
     */
    int decreaseFavoriteCount(Long postId);
+
+    /**
+     * 根据动态id查询用户名和媒体信息
+     *
+     * @param postId 动态id
+     * @return 用户名和媒体信息
+     */
+    Map<String, Object> getUsernameByUserId(Long postId);
 }
--- a/src/main/java/com/bao/dating/mapper/UserBanMapper.java
+++ b/src/main/java/com/bao/dating/mapper/UserBanMapper.java
@@ -0,0 +1,43 @@
+package com.bao.dating.mapper;
+
+import com.bao.dating.pojo.entity.UserBan;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface UserBanMapper {
+
+    /**
+     * 新增封禁记录
+     * @param userBan 封禁记录
+     * @return 影响行数
+     */
+    int insertBan(UserBan userBan);
+
+    /**
+     * 查询是否存在生效中的封禁
+     * @param userId 用户ID
+     * @return 存在返回1，不存在返回0
+     */
+    int existsActiveBan(@Param("userId") Long userId);
+
+    /**
+     * 查询生效中的封禁记录
+     * @param userId 用户ID
+     * @return 封禁记录
+     */
+    UserBan selectActiveBan(@Param("userId") Long userId);
+
+    /**
+     * 解封用户
+     * @param userId 用户ID
+     * @return 影响行数
+     */
+    int unbanUser(@Param("userId") Long userId);
+
+    /**
+     * 定时任务：过期自动解封
+     * @return 影响行数
+     */
+    int updateExpiredBans();
+}
--- a/src/main/java/com/bao/dating/mapper/UserMapper.java
+++ b/src/main/java/com/bao/dating/mapper/UserMapper.java
@@ -1,8 +1,12 @@
 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
@@ -31,6 +35,46 @@ 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);
+
+
+    /**
+     * 搜索用户
+     * @param userName 用户名
+     * @param hobbyTag 爱好标签
+     * @return 用户列表
+     */
+    List<User> searchUsers(@Param("userName") String userName, @Param("hobbies") String hobbyTag);
 }
--- a/src/main/java/com/bao/dating/message/WsMessage.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatCursorPageDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatHistoryQueryDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatMarkReadDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatRecallDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatRecordSendDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatSessionMuteDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatSessionStatusDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/ChatSessionTopDTO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/UserBanDTO.java
+++ b/src/main/java/com/bao/dating/pojo/dto/UserBanDTO.java
@@ -0,0 +1,13 @@
+package com.bao.dating.pojo.dto;
+import lombok.Data;
+
+/**
+ * 用户封禁数据传输对象
+ * @author KilLze
+ */
+@Data
+public class UserBanDTO {
+    private Long userId;
+    private String reason;
+    private Integer banDays;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/UserDeviceDTO.java
+++ b/src/main/java/com/bao/dating/pojo/dto/UserDeviceDTO.java
@@ -0,0 +1,51 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 用户设备DTO
+ * @author KilLze
+ */
+@Data
+public class UserDeviceDTO {
+    
+    /**
+     * 设备ID（唯一标识）
+     */
+    private String deviceId;
+    
+    /**
+     * 设备类型：1-Android, 2-iOS, 3-Web, 4-其他
+     */
+    private Integer deviceType;
+    
+    /**
+     * 设备名称（如：iPhone 14 Pro）
+     */
+    private String deviceName;
+    
+    /**
+     * 设备品牌（如：Apple, Xiaomi）
+     */
+    private String deviceBrand;
+    
+    /**
+     * 操作系统版本
+     */
+    private String osVersion;
+    
+    /**
+     * 浏览器/应用版本
+     */
+    private String appVersion;
+    
+    /**
+     * 设备IP
+     */
+    private String ipAddress;
+    
+    /**
+     * 设备位置（根据IP解析，可选）
+     */
+    private String location;
+}
--- a/src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java
+++ b/src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java
@@ -8,11 +8,11 @@ import java.time.LocalDateTime;
 import java.util.List;

 /**
- * 用户信息更新数据传输对象
+ * 用户信息数据传输对象
 * @author KilLze
 */
@Data
-public class UserInfoUpdateDTO implements Serializable {
+public class UserInfoDTO implements Serializable {
    private Long userId;
    private String userName;
    private String nickname;
--- a/src/main/java/com/bao/dating/pojo/dto/UserLoginWithDeviceDTO.java
+++ b/src/main/java/com/bao/dating/pojo/dto/UserLoginWithDeviceDTO.java
@@ -0,0 +1,51 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * 登录请求DTO（带设备信息）
+ * @author KilLze
+ */
+@Data
+public class UserLoginWithDeviceDTO {
+    
+    /**
+     * 用户名
+     */
+    private String username;
+    
+    /**
+     * 密码
+     */
+    private String password;
+    
+    /**
+     * 设备ID（唯一标识）
+     */
+    private String deviceId;
+    
+    /**
+     * 设备类型：1-Android, 2-iOS, 3-Web, 4-其他
+     */
+    private Integer deviceType;
+    
+    /**
+     * 设备名称（如：iPhone 14 Pro）
+     */
+    private String deviceName;
+    
+    /**
+     * 设备品牌（如：Apple, Xiaomi）
+     */
+    private String deviceBrand;
+    
+    /**
+     * 操作系统版本
+     */
+    private String osVersion;
+    
+    /**
+     * 浏览器/应用版本
+     */
+    private String appVersion;
+}
--- a/src/main/java/com/bao/dating/pojo/entity/ChatRecords.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/entity/ChatSessions.java
+++ b/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;
+
+}
--- a/src/main/java/com/bao/dating/pojo/entity/Contacts.java
+++ b/src/main/java/com/bao/dating/pojo/entity/Contacts.java
@@ -0,0 +1,24 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class Contacts {
+    private Long contactId;         // 通讯录记录ID
+    private Long userId;            // 当前用户ID
+    private Long contactUserId;     // 联系人用户ID
+    private String contactNickname; // 联系人备注名
+    private String contactAvatar;   // 联系人头像缓存
+    private Integer relationType;   // 关系类型（1普通好友/2特别关注/3黑名单/4陌生人）
+    private Date addTime;           // 添加时间
+    private Date lastChatTime;      // 最后聊天时间
+    private Integer contactStatus;  // 联系人状态（1正常/2已删除/3已拉黑）
+    private String contactRemark;   // 备注信息
+    private List<String> tags;      // 标签（JSON数组）
+    private Date createdAt;         // 创建时间
+    private Date updatedAt;         // 更新时间
+}
--- a/src/main/java/com/bao/dating/pojo/entity/FriendApply.java
+++ b/src/main/java/com/bao/dating/pojo/entity/FriendApply.java
@@ -0,0 +1,60 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 好友申请实体类
+ * @author KilLze
+ */
+@Data
+public class FriendApply {
+    /**
+     * 申请ID，主键
+     * 对应字段：apply_id
+     */
+    private Long applyId;
+
+    /**
+     * 申请人ID（对应user表user_id）
+     * 对应字段：apply_user_id
+     */
+    private Long applyUserId;
+
+    /**
+     * 被申请人ID（对应user表user_id）
+     * 对应字段：target_user_id
+     */
+    private Long targetUserId;
+
+    /**
+     * 打招呼内容
+     * 对应字段：greeting
+     */
+    private String greeting;
+
+    /**
+     * 申请时间
+     * 对应字段：apply_time
+     */
+    private Date applyTime;
+
+    /**
+     * 申请状态：0-待处理，1-已同意，2-已拒绝
+     * 对应字段：apply_status
+     */
+    private Byte applyStatus;
+
+    /**
+     * 创建时间
+     * 对应字段：created_at
+     */
+    private Date createdAt;
+
+    /**
+     * 更新时间
+     * 对应字段：updated_at
+     */
+    private Date updatedAt;
+}
--- a/src/main/java/com/bao/dating/pojo/entity/User.java
+++ b/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;  // 经度
 }
--- a/src/main/java/com/bao/dating/pojo/entity/UserBan.java
+++ b/src/main/java/com/bao/dating/pojo/entity/UserBan.java
@@ -0,0 +1,30 @@
+package com.bao.dating.pojo.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户封禁记录
+ * @author KilLze
+ */
+@Data
+public class UserBan {
+
+    private Long id;
+
+    private Long userId;
+
+    private String reason;
+
+    private LocalDateTime banStartTime;
+
+    private LocalDateTime banEndTime;
+
+    /**
+     * 1:封禁中 0:已解封
+     */
+    private Integer status;
+
+    private LocalDateTime createTime;
+}
--- a/src/main/java/com/bao/dating/pojo/vo/ChatRecordsVO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/vo/ChatSessionsVO.java
+++ b/src/main/java/com/bao/dating/pojo/vo/ChatSessionsVO.java
@@ -0,0 +1,34 @@
+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;
+    /** 会话状态 */
+    private Boolean online;
+}
--- a/src/main/java/com/bao/dating/pojo/vo/IpLocationVO.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/pojo/vo/UserDeviceVO.java
+++ b/src/main/java/com/bao/dating/pojo/vo/UserDeviceVO.java
@@ -0,0 +1,78 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户设备信息VO
+ * @author KilLze
+ */
+@Data
+public class UserDeviceVO {
+    
+    /**
+     * 主键ID
+     */
+    private Long id;
+    
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+    
+    /**
+     * 设备类型：1-Android, 2-iOS, 3-Web, 4-其他
+     */
+    private String deviceType;
+    
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    
+    /**
+     * 设备品牌
+     */
+    private String deviceBrand;
+    
+    /**
+     * 操作系统版本
+     */
+    private String osVersion;
+    
+    /**
+     * 应用版本
+     */
+    private String appVersion;
+    
+    /**
+     * IP地址
+     */
+    private String ipAddress;
+    
+    /**
+     * 设备位置
+     */
+    private String location;
+    
+    /**
+     * 是否当前设备
+     */
+    private Boolean isCurrent;
+    
+    /**
+     * 是否在线
+     */
+    private Boolean isOnline;
+    
+    /**
+     * 最后活跃时间
+     */
+    private LocalDateTime lastActiveAt;
+    
+    /**
+     * 登录时间
+     */
+    private LocalDateTime loginAt;
+}
--- a/src/main/java/com/bao/dating/pojo/vo/UserInfoVO.java
+++ b/src/main/java/com/bao/dating/pojo/vo/UserInfoVO.java
@@ -24,4 +24,7 @@ public class UserInfoVO implements Serializable {
    private String signature;
    private LocalDateTime updatedAt;
    private LocalDateTime createdAt;
+    private Double latitude;
+    private Double longitude;
+    private Boolean online;
 }
--- a/src/main/java/com/bao/dating/service/ChatService.java
+++ b/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);
+}
--- a/src/main/java/com/bao/dating/service/ContactsService.java
+++ b/src/main/java/com/bao/dating/service/ContactsService.java
@@ -0,0 +1,34 @@
+package com.bao.dating.service;
+
+
+import com.bao.dating.pojo.entity.User;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ContactsService {
+    /**
+     * 根据用户ID查询好友列表
+     * @param userId 用户ID
+     * @return 好友列表
+     */
+    List<Map<String, Object>> getFriendsByUserId(Long userId);
+
+
+    /**
+     * 拉黑联系人
+     * @param userId 当前用户ID
+     * @param contactUserId 被拉黑联系人ID
+     * @return 操作是否成功
+     */
+    boolean blacklistContact(Long userId, Long contactUserId);
+
+    /**
+     * 删除联系人（逻辑删除）
+     * @param userId 当前用户ID
+     * @param contactUserId 被删除联系人ID
+     * @return 操作是否成功
+     */
+    boolean deleteContact(Long userId, Long contactUserId);
+}
+
--- a/src/main/java/com/bao/dating/service/FriendRelationService.java
+++ b/src/main/java/com/bao/dating/service/FriendRelationService.java
@@ -0,0 +1,43 @@
+package com.bao.dating.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FriendRelationService {
+    /**
+     * 新增好友申请
+     * @param applyUserId 申请人ID
+     * @param targetUserId 被申请人ID
+     * @param greeting 打招呼内容
+     */
+    void addFriendApply(Long applyUserId, Long targetUserId, String greeting);
+
+    /**
+     * 同意好友申请（更新状态/删除记录）
+     * @param applyUserId 申请人ID
+     * @param targetUserId 被申请人ID
+     */
+    void agreeFriendApply(Long applyUserId, Long targetUserId);
+
+    /**
+     * 查询待处理的好友申请
+     * @param targetUserId 被申请人ID
+     * @return 申请列表
+     */
+    List<Map<String, Object>> getFriendApplyList(Long targetUserId);
+
+    /**
+     * 添加好友到通讯录表
+     * @param userId 当前用户ID
+     * @param contactUserId 联系人ID
+     * @param contactNickname 备注名
+     */
+    void addFriendRelation(Long userId, Long contactUserId, String contactNickname);
+
+    /**
+     * 查询用户的联系人列表
+     * @param userId 当前用户ID
+     * @return 联系人列表
+     */
+    List<Map<String, Object>> getFriendRelationList(Long userId);
+}
--- a/src/main/java/com/bao/dating/service/Ip2LocationClientService.java
+++ b/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;
+}
--- a/src/main/java/com/bao/dating/service/PostFavoriteService.java
+++ b/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);
 }
--- a/src/main/java/com/bao/dating/service/PostService.java
+++ b/src/main/java/com/bao/dating/service/PostService.java
@@ -5,6 +5,7 @@ import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.vo.PostEditVO;
 import org.springframework.web.multipart.MultipartFile;

+import java.awt.image.BufferedImage;
 import java.util.List;

 /**
@@ -55,4 +56,11 @@ public interface PostService {
     * @return 用户id
     */
    Long selectUserIdByPostId(Long postId);
+
+    /**
+     * 下载动态图片并添加水印
+     * @param postId 动态ID
+     * @return 带水印的图片
+     */
+    BufferedImage downloadWithWatermark(Long postId) throws Exception;
 }
--- a/src/main/java/com/bao/dating/service/UserBanService.java
+++ b/src/main/java/com/bao/dating/service/UserBanService.java
@@ -0,0 +1,31 @@
+package com.bao.dating.service;
+
+import com.bao.dating.pojo.dto.UserBanDTO;
+import com.bao.dating.pojo.entity.UserBan;
+
+/**
+ * 用户封禁服务接口
+ * @author KilLze
+ */
+public interface UserBanService {
+
+    /**
+     * 封禁用户
+     * @param userBanDTO 用户封禁信息
+     *
+     */
+    void banUser(UserBanDTO userBanDTO);
+
+    /**
+     * 解封用户
+     * @param userId 用户ID
+     */
+    void unbanUser(Long userId);
+
+    /**
+     * 查询封禁信息
+     * @param userId 用户ID
+     * @return 封禁信息
+     */
+    UserBan getActiveBan(Long userId);
+}
--- a/src/main/java/com/bao/dating/service/UserService.java
+++ b/src/main/java/com/bao/dating/service/UserService.java
@@ -1,11 +1,14 @@
 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.entity.User;
 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
@@ -51,5 +54,58 @@ 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);
+
+    /**
+     * 判断用户是否在线
+     * @param userId 用户ID
+     * @return 是否在线
+     */
+    boolean isUserOnline(Long userId);
+
+    /**
+     * 搜索用户
+     * @param userName 用户名（模糊）
+     * @param hobbies 爱好标签（精确）
+     * @return 用户列表
+     */
+    List<User> searchUsers(String userName, String hobbies);
 }
--- a/src/main/java/com/bao/dating/service/impl/ChatServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/ChatServiceImpl.java
@@ -0,0 +1,326 @@
+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);
+            }
+            vo.setOnline(userService.isUserOnline(vo.getTargetUserId()));
+            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;
+    }
+}
--- a/src/main/java/com/bao/dating/service/impl/ContactServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/ContactServiceImpl.java
@@ -0,0 +1,53 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.mapper.ContactMapper;
+import com.bao.dating.service.ContactsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ContactServiceImpl implements ContactsService {
+    @Autowired
+    private ContactMapper contactMapper;
+
+    @Override
+    public List<Map<String, Object>> getFriendsByUserId(Long userId) {
+        // 直接调用Mapper查询，无额外封装
+        return contactMapper.selectFriendsByUserId(userId);
+    }
+
+    /**
+     * 拉黑联系人
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean blacklistContact(Long userId, Long contactUserId) {
+        // 参数校验
+        if (userId == null || contactUserId == null || userId.equals(contactUserId)) {
+            return false;
+        }
+        // 执行拉黑操作
+        int affectRows = contactMapper.blacklistContact(userId, contactUserId);
+        return affectRows > 0;
+    }
+
+    /**
+     * 删除联系人
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteContact(Long userId, Long contactUserId) {
+        // 参数校验
+        if (userId == null || contactUserId == null || userId.equals(contactUserId)) {
+            return false;
+        }
+        // 执行删除操作
+        int affectRows = contactMapper.deleteContact(userId, contactUserId);
+        return affectRows > 0;
+    }
+}
--- a/src/main/java/com/bao/dating/service/impl/FriendRelationServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/FriendRelationServiceImpl.java
@@ -0,0 +1,81 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.mapper.FriendRelationMapper;
+import com.bao.dating.service.FriendRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class FriendRelationServiceImpl implements FriendRelationService {
+
+    @Autowired
+    private FriendRelationMapper friendRelationMapper;
+
+    /**
+     * 新增好友申请（写入数据库）
+     */
+    @Override
+    public void addFriendApply(Long applyUserId, Long targetUserId, String greeting) {
+        // 检查是否已存在待处理的申请
+        Map<String, Object> existingApply = friendRelationMapper.selectFriendApplyByUsers(applyUserId, targetUserId);
+        if (existingApply != null) {
+            throw new RuntimeException("好友申请已存在，请勿重复发送");
+        }
+        
+        Map<String, Object> params = new HashMap<>();
+        params.put("apply_user_id", applyUserId);
+        params.put("target_user_id", targetUserId);
+        params.put("greeting", greeting);
+        friendRelationMapper.insertFriendApply(params);
+    }
+
+    /**
+     * 同意好友申请（更新状态为已同意，也可直接删除）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void agreeFriendApply(Long applyUserId, Long targetUserId) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("apply_user_id", applyUserId);
+        params.put("target_user_id", targetUserId);
+        params.put("apply_status", 1); // 1-已同意
+        friendRelationMapper.updateFriendApplyStatus(params);
+        // 也可选择直接删除申请记录：friendRelationMapper.deleteFriendApply(params);
+    }
+
+    /**
+     * 查询待处理的好友申请
+     */
+    @Override
+    public List<Map<String, Object>> getFriendApplyList(Long targetUserId) {
+        return friendRelationMapper.selectFriendApplyList(targetUserId);
+    }
+
+    /**
+     * 添加好友到通讯录表（严格匹配contacts表字段）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addFriendRelation(Long userId, Long contactUserId, String contactNickname) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("user_id", userId);
+        params.put("contact_user_id", contactUserId);
+        params.put("contact_nickname", contactNickname);
+        params.put("relation_type", 1); // 1-普通好友
+        params.put("contact_status", 1); // 1-正常
+        friendRelationMapper.insertFriendRelation(params);
+    }
+
+    /**
+     * 查询用户的联系人列表
+     */
+    @Override
+    public List<Map<String, Object>> getFriendRelationList(Long userId) {
+        return friendRelationMapper.selectFriendRelationListByUserId(userId);
+    }
+}
--- a/src/main/java/com/bao/dating/service/impl/Ip2LocationClientServiceImpl.java
+++ b/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());
+                }
+            }
+        }
+    }
+
+}
--- a/src/main/java/com/bao/dating/service/impl/PostFavoriteServiceImpl.java
+++ b/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);
+    }
 }
--- a/src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
@@ -10,11 +10,13 @@ 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.entity.User;
 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 com.bao.dating.util.WatermarkUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;

+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -57,6 +60,9 @@ public class PostServiceImpl implements PostService {
    @Autowired
    private CommentsMapper commentsMapper;

+    @Autowired
+    private WatermarkUtil watermarkUtil;
+
    /**
     * 上传媒体文件
     * @param files 媒体文件数组
@@ -205,6 +211,19 @@ public class PostServiceImpl implements PostService {
        if (CollectionUtils.isEmpty(postIds)) {
            return 0;
        }
+        
+        // 遍历所有要删除的帖子ID，验证权限
+        for (Long postId : postIds) {
+            Post post = postMapper.selectById(postId);
+            if (post == null) {
+                throw new RuntimeException("动态不存在");
+            }
+            // 验证用户权限
+            if (post.getUserId() == null || !post.getUserId().equals(userId)) {
+                throw new RuntimeException("无权限删除此动态");
+            }
+        }
+        
        int affected = postMapper.updatePublicById(postIds, userId);

        if (affected == 0) {
@@ -331,4 +350,61 @@ public class PostServiceImpl implements PostService {
        return postMapper.selectUserIdByPostId(postId);
    }

+    /**
+     * 下载动态图片并添加水印
+     *
+     * @param postId 动态ID
+     * @return 带水印的图片
+     * @throws Exception
+     */
+    @Override
+    public BufferedImage downloadWithWatermark(Long postId) throws Exception {
+        // 一次性查出 动态图片 + 作者信息
+        Map<String, Object> map = postMapper.getUsernameByUserId(postId);
+
+        if (map == null || map.isEmpty()) {
+            Post post = postMapper.selectById(postId);
+            if (post == null) {
+                throw new RuntimeException("未找到指定postId的帖子: " + postId);
+            }
+            throw new RuntimeException("未找到与postId相关的用户和媒体信息: " + postId);
+        }
+
+        String mediaUrl = (String) map.get("media_oss_keys");
+        String username = (String) map.get("user_name");
+        Object userIdObj = map.get("user_id");
+
+        if (mediaUrl == null || username == null || userIdObj == null) {
+            throw new RuntimeException("用户或媒体信息不完整: " + map);
+        }
+
+        mediaUrl = mediaUrl.trim();
+        if (mediaUrl.isEmpty()) {
+            throw new RuntimeException("媒体URL为空，postId: " + postId);
+        }
+
+        Long userId = userIdObj instanceof Number
+                ? ((Number) userIdObj).longValue()
+                : Long.valueOf(userIdObj.toString());
+
+        // 解析 OSS ObjectKey（支持完整URL和直接存key两种）
+        String cleanUrl = mediaUrl.split("\\?")[0]; // 去掉 ? 后面的参数
+        String objectKey;
+
+        if (cleanUrl.startsWith("http")) {
+            // https://xxx.oss-cn-xxx.aliyuncs.com/post/xxx.jpg → post/xxx.jpg
+            objectKey = cleanUrl.substring(cleanUrl.indexOf(".com/") + 5);
+        } else {
+            objectKey = cleanUrl;
+        }
+
+        if (objectKey.trim().isEmpty()) {
+            throw new RuntimeException("解析后的ObjectKey为空，url: " + mediaUrl);
+        }
+
+        // 下载并动态加水印（只给下载的人看，OSS原图不改，数据库不动）
+        return watermarkUtil.downloadAndWatermark(objectKey, username, userId);
+    }
+
+
 }
--- a/src/main/java/com/bao/dating/service/impl/UserBanServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/UserBanServiceImpl.java
@@ -0,0 +1,74 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.mapper.UserBanMapper;
+import com.bao.dating.pojo.dto.UserBanDTO;
+import com.bao.dating.pojo.entity.UserBan;
+import com.bao.dating.service.UserBanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class UserBanServiceImpl implements UserBanService {
+
+    @Autowired
+    private UserBanMapper userBanMapper;
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    @Override
+    public void banUser(UserBanDTO userBanDTO) {
+
+        // 已被封禁，直接拒绝
+        if (userBanMapper.existsActiveBan(userBanDTO.getUserId()) > 0) {
+            throw new RuntimeException("用户已处于封禁状态");
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime endTime = userBanDTO.getBanDays() == null ? null : now.plusDays(userBanDTO.getBanDays());
+
+        // 1. 写数据库
+        UserBan ban = new UserBan();
+        ban.setUserId(userBanDTO.getUserId());
+        ban.setReason(userBanDTO.getReason());
+        ban.setBanStartTime(now);
+        ban.setBanEndTime(endTime);
+        ban.setStatus(1);
+        userBanMapper.insertBan(ban);
+
+        // 2. 写 Redis
+        String key = "user:ban:" + userBanDTO.getUserId();
+        if (userBanDTO.getBanDays() == null) {
+            redisTemplate.opsForValue().set(key, userBanDTO.getReason());
+        } else {
+            redisTemplate.opsForValue().set(key, userBanDTO.getReason(), userBanDTO.getBanDays(), TimeUnit.DAYS);
+        }
+
+        // 3. 踢下线
+        redisTemplate.delete("login:token:" + userBanDTO.getUserId());
+    }
+
+    /**
+     * 解封用户
+     */
+    @Override
+    public void unbanUser(Long userId) {
+        // 更新数据库
+        userBanMapper.unbanUser(userId);
+
+        // 删除 Redis
+        redisTemplate.delete("user:ban:" + userId);
+    }
+
+    /**
+     * 获取用户封禁信息
+     */
+    @Override
+    public UserBan getActiveBan(Long userId) {
+        return userBanMapper.selectActiveBan(userId);
+    }
+}
--- a/src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
@@ -3,24 +3,29 @@ 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.config.RedisConfig;
 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 com.bao.dating.util.UserBanUtil;
 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;

@@ -37,6 +42,11 @@ import java.util.concurrent.TimeUnit;
@Service
 public class UserServiceImpl implements UserService {

+
+
+    @Autowired
+    private SmsUtil smsUtil;
+
    @Autowired
    private AliOssUtil ossUtil;

@@ -52,6 +62,15 @@ public class UserServiceImpl implements UserService {
    @Autowired
    private UserMapper userMapper;

+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Autowired
+    private VerificationCodeService verificationCodeService;
+
+    @Autowired
+    private UserBanUtil userBanValidator;
+
    /**
     * 用户登录
     *
@@ -78,6 +97,8 @@ public class UserServiceImpl implements UserService {
        if (!match) {
            throw new RuntimeException("密码错误");
        }
+        // 用户封禁验证
+        userBanValidator.validateUserNotBanned(user.getUserId());
        // 生成token
        String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));

@@ -104,6 +125,9 @@ public class UserServiceImpl implements UserService {
    @Override
    public void logout(String token) {
        Claims claims = JwtUtil.getClaimsFromToken(token);
+        // 获取token信息
+        String subject = claims.getSubject();
+        // 获取token的过期时间
        Date expiration = claims.getExpiration();
        // 判断 token 是否已过期
        long ttl = expiration.getTime() - System.currentTimeMillis();
@@ -112,6 +136,10 @@ public class UserServiceImpl implements UserService {
            return;
        }

+        // 从Redis中删除登录token记录
+        String loginTokenKey = "login:token:" + subject;
+        redisTemplate.delete(loginTokenKey);
+
        String logoutKey = "jwt:blacklist:" + token;
        redisTemplate.opsForValue().set(
                logoutKey,
@@ -225,13 +253,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) {
@@ -311,4 +340,189 @@ 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;
+    }
+
+    @Override
+    public boolean isUserOnline(Long userId) {
+        if (userId == null) {
+            return false;
+        }
+
+        // 1. 是否被封禁
+        String banKey = "user:ban:" + userId;
+        if (Boolean.TRUE.equals(redisTemplate.hasKey(banKey))) {
+            return false;
+        }
+
+        // 2. 是否存在登录 token
+        String tokenKey = "login:token:" + userId;
+        Boolean online = redisTemplate.hasKey(tokenKey);
+
+        return Boolean.TRUE.equals(online);
+    }
+
+
+    @Override
+    public List<User> searchUsers(String userName, String hobbies) {
+        // 调用Mapper层的查询方法
+        return userMapper.searchUsers(userName, hobbies);
+    }
+}
--- a/src/main/java/com/bao/dating/session/WsSessionManager.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/bao/dating/task/FriendApplyCleanupTask.java
+++ b/src/main/java/com/bao/dating/task/FriendApplyCleanupTask.java
@@ -0,0 +1,36 @@
+package com.bao.dating.task;
+
+import com.bao.dating.mapper.FriendRelationMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 好友申请清理定时任务
+ * 定时清理数据库中超过7天未处理的好友申请
+ * @author KilLze
+ */
+@Slf4j
+@Component
+public class FriendApplyCleanupTask {
+
+    @Autowired
+    private FriendRelationMapper friendRelationMapper;
+
+    /**
+     * 定时清理过期的好友申请
+     * 每1分钟执行一次，清理创建时间超过7天的未处理申请
+     */
+    @Scheduled(fixedRate = 60000) // 每1分钟执行一次
+    public void cleanupExpiredFriendApply() {
+        log.info("开始执行好友申请清理任务");
+        try {
+            // 删除创建时间超过7天的未处理申请（apply_status = 0）
+            int deletedCount = friendRelationMapper.deleteExpiredFriendApply(7);
+            log.info("好友申请清理任务执行完成，删除了 {} 条过期记录", deletedCount);
+        } catch (Exception e) {
+            log.error("好友申请清理任务执行失败", e);
+        }
+    }
+}
--- a/src/main/java/com/bao/dating/task/UserBanScheduleTask.java
+++ b/src/main/java/com/bao/dating/task/UserBanScheduleTask.java
@@ -0,0 +1,26 @@
+package com.bao.dating.task;
+
+import com.bao.dating.mapper.UserBanMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class UserBanScheduleTask {
+
+    @Autowired
+    private UserBanMapper userBanMapper;
+
+    /**
+     * 每天凌晨 3 点同步过期封禁
+     */
+    @Scheduled(cron = "0 0 3 * * ?")
+    public void syncExpiredUserBan() {
+        int rows = userBanMapper.updateExpiredBans();
+        log.info("封禁同步任务执行完成，解封 {} 个用户", rows);
+    }
+}
--- a/src/main/java/com/bao/dating/util/CodeUtil.java
+++ b/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);
+    }
+}
--- a/src/main/java/com/bao/dating/util/DistanceUtil.java
+++ b/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;
+    }
+}
--- a/src/main/java/com/bao/dating/util/EmailUtil.java
+++ b/src/main/java/com/bao/dating/util/EmailUtil.java
@@ -84,6 +84,7 @@ public class EmailUtil {
        } catch (MessagingException e) {
            log.error("HTML邮件发送失败，收件人：{}，异常信息：{}", to, e.getMessage(), e);
            return false;
+
        }
    }

@@ -173,6 +174,7 @@ public class EmailUtil {
        }
        log.info("批量邮件发送完成，总数：{}，成功：{}", toList.length, successCount);
        return successCount;
+
    }
 }

--- a/src/main/java/com/bao/dating/util/MD5Util.java
+++ b/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 字节数组
--- a/src/main/java/com/bao/dating/util/UserBanUtil.java
+++ b/src/main/java/com/bao/dating/util/UserBanUtil.java
@@ -0,0 +1,65 @@
+package com.bao.dating.util;
+
+import com.bao.dating.context.UserContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 用户封禁验证工具类
+ * 提供统一的用户封禁状态检查功能
+ *
+ * @author KilLze
+ */
+@Component
+public class UserBanUtil {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    /**
+     * 验证指定用户是否被封禁
+     *
+     * @param userId 用户ID
+     * @throws RuntimeException 如果用户被封禁则抛出异常
+     */
+    public void validateUserNotBanned(Long userId) {
+        String banKey = "user:ban:" + userId;
+        if (Boolean.TRUE.equals(redisTemplate.hasKey(banKey))) {
+            String reason = (String) redisTemplate.opsForValue().get(banKey);
+            
+            // 获取剩余过期时间（秒）
+            Long ttlSeconds = redisTemplate.getExpire(banKey, TimeUnit.SECONDS);
+            String remainingTime = "";
+            if (ttlSeconds != null && ttlSeconds > 0) {
+                long days = ttlSeconds / (24 * 3600);
+                long hours = (ttlSeconds % (24 * 3600)) / 3600;
+                long minutes = (ttlSeconds % 3600) / 60;
+                
+                if (days > 0) {
+                    remainingTime = "，剩余时间：" + days + "天" + hours + "小时";
+                } else if (hours > 0) {
+                    remainingTime = "，剩余时间：" + hours + "小时" + minutes + "分钟";
+                } else {
+                    remainingTime = "，剩余时间：" + minutes + "分钟";
+                }
+            } else {
+                remainingTime = "，永久封禁";
+            }
+            
+            throw new RuntimeException("账号已被封禁，原因：" + reason + remainingTime);
+        }
+    }
+
+    /**
+     * 验证当前登录用户是否被封禁
+     *
+     * @throws RuntimeException 如果用户被封禁则抛出异常
+     */
+    public void validateCurrentUserNotBanned() {
+        Long userId = UserContext.getUserId();
+        validateUserNotBanned(userId);
+    }
+}
--- a/src/main/java/com/bao/dating/util/WatermarkUtil.java
+++ b/src/main/java/com/bao/dating/util/WatermarkUtil.java
@@ -0,0 +1,64 @@
+    package com.bao.dating.util;
+
+    import com.aliyun.oss.OSS;
+    import com.aliyun.oss.OSSClientBuilder;
+    import com.bao.dating.config.AliyunOSSConfig;
+    import com.bao.dating.mapper.PostMapper;
+    import org.springframework.beans.factory.annotation.Autowired;
+    import org.springframework.stereotype.Component;
+
+    import javax.imageio.ImageIO;
+    import java.awt.*;
+    import java.awt.image.BufferedImage;
+    import java.io.InputStream;
+
+    @Component
+    public class WatermarkUtil {
+
+        @Autowired
+        private AliyunOSSConfig aliyunOSSConfig;
+
+
+        public BufferedImage downloadAndWatermark(String objectKey, String username, Long userId) throws Exception {
+            OSS ossClient = new OSSClientBuilder().build(
+                    aliyunOSSConfig.getEndpoint(),
+                    aliyunOSSConfig.getAccessKeyId(),
+                    aliyunOSSConfig.getAccessKeySecret()
+            );
+
+            InputStream inputStream = ossClient.getObject(aliyunOSSConfig.getBucketName(), objectKey).getObjectContent();
+            BufferedImage image = ImageIO.read(inputStream);
+            Graphics2D g2d = image.createGraphics();
+
+            g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+            // 字体小一点
+            Font font = new Font("微软雅黑", Font.BOLD, 24);
+            g2d.setFont(font);
+
+            String text = "作者：" + username + " (ID:" + userId + ")";
+
+            FontMetrics fm = g2d.getFontMetrics();
+            int textWidth = fm.stringWidth(text);
+            int textHeight = fm.getHeight();
+
+            // 右下角留边距
+            int x = image.getWidth() - textWidth - 20;
+            int y = image.getHeight() - 20;
+
+            // 黑色描边
+            g2d.setColor(Color.BLACK);
+            g2d.drawString(text, x - 1, y - 1);
+            g2d.drawString(text, x + 1, y - 1);
+            g2d.drawString(text, x - 1, y + 1);
+            g2d.drawString(text, x + 1, y + 1);
+
+            // 白色正文
+            g2d.setColor(Color.WHITE);
+            g2d.drawString(text, x, y);
+
+            g2d.dispose();
+            ossClient.shutdown();
+            return image;
+        }
+    }
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -44,7 +44,6 @@ spring:
          connectiontimeout: 10000  # 连接超时时间（毫秒）
          timeout: 10000  # 读取超时时间（毫秒）
          writetimeout: 10000  # 写入超时时间（毫秒）
-
 # MyBatis 配置
 mybatis:
  mapper-locations: classpath:mapper/*.xml
@@ -70,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  # 请求超时时间（毫秒）
+
--- a/src/main/resources/com/bao/dating/mapper/ChatRecordsMapper.xml
+++ b/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>
--- a/src/main/resources/com/bao/dating/mapper/ChatSessionsMapper.xml
+++ b/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>
--- a/src/main/resources/com/bao/dating/mapper/ContactMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/ContactMapper.xml
@@ -0,0 +1,49 @@
+<?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.ContactMapper">
+    <select id="selectFriendsByUserId" resultType="java.util.Map">
+        SELECT c.contact_id,
+               c.user_id,
+               c.contact_user_id,
+               c.contact_nickname,
+               c.relation_type,
+               c.add_time,
+               u.user_name,
+               u.nickname,
+               u.avatar_url,
+               u.signature
+        FROM contacts c
+                 LEFT JOIN user u ON c.contact_user_id = u.user_id
+        WHERE c.user_id = #{userId}
+          AND c.contact_status = 1 -- 正常状态
+          AND c.relation_type != 3  -- 排除黑名单
+          AND c.user_id != c.contact_user_id -- 排除自己
+    </select>
+
+
+    <!-- 拉黑联系人：更新relation_type为3（黑名单）、contact_status为3（已拉黑） -->
+    <update id="blacklistContact">
+        UPDATE contacts
+        SET relation_type = 3,
+            contact_status = 3,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE user_id = #{userId}
+          AND contact_user_id = #{contactUserId}
+          AND contact_status != 2
+    </update>
+
+    <!-- 删除联系人：更新contact_status为2（已删除） -->
+    <update id="deleteContact">
+        UPDATE contacts
+        SET contact_status = 2,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE user_id = #{userId}
+          AND contact_user_id = #{contactUserId}
+          AND contact_status != 2
+    </update>
+</mapper>
+
+
+
--- a/src/main/resources/com/bao/dating/mapper/FriendRelationMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/FriendRelationMapper.xml
@@ -0,0 +1,130 @@
+<?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.FriendRelationMapper">
+    <!-- 插入好友申请 -->
+    <insert id="insertFriendApply" parameterType="java.util.Map">
+        INSERT INTO friend_apply (
+            apply_user_id,
+            target_user_id,
+            greeting,
+            apply_time,
+            apply_status,
+            created_at,
+            updated_at
+        ) VALUES (
+                     #{apply_user_id},
+                     #{target_user_id},
+                     #{greeting},
+                     NOW(),
+                     0,
+                     NOW(),
+                     NOW()
+                 )
+    </insert>
+
+    <!-- 更新好友申请状态 -->
+    <update id="updateFriendApplyStatus" parameterType="java.util.Map">
+        UPDATE friend_apply
+        SET apply_status = #{apply_status},
+            updated_at = NOW()
+        WHERE apply_user_id = #{apply_user_id}
+          AND target_user_id = #{target_user_id}
+          AND apply_status = 0
+    </update>
+
+    <!-- 删除好友申请（可选） -->
+    <delete id="deleteFriendApply" parameterType="java.util.Map">
+        DELETE FROM friend_apply
+        WHERE apply_user_id = #{apply_user_id}
+          AND target_user_id = #{target_user_id}
+    </delete>
+
+    <!-- 根据申请人ID和被申请人ID查询好友申请 -->
+    <select id="selectFriendApplyByUsers" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            apply_id,
+            apply_user_id,
+            target_user_id,
+            greeting,
+            apply_time,
+            apply_status,
+            created_at,
+            updated_at
+        FROM friend_apply
+        WHERE apply_user_id = #{applyUserId}
+          AND target_user_id = #{targetUserId}
+          AND apply_status = 0
+    </select>
+
+    <!-- 查询待处理的好友申请 -->
+    <select id="selectFriendApplyList" parameterType="java.lang.Long" resultType="java.util.Map">
+        SELECT
+            apply_id,
+            apply_user_id,
+            target_user_id,
+            greeting,
+            apply_time,
+            apply_status,
+            created_at,
+            updated_at
+        FROM friend_apply
+        WHERE target_user_id = #{targetUserId}
+          AND apply_status = 0
+        ORDER BY apply_time DESC
+    </select>
+
+    <!-- 插入联系人记录（方法名同步修改，字段名不变） -->
+    <insert id="insertFriendRelation" parameterType="java.util.Map">
+        INSERT INTO contacts (
+            user_id,
+            contact_user_id,
+            contact_nickname,
+            relation_type,
+            contact_status,
+            add_time,
+            created_at,
+            updated_at
+        ) VALUES (
+                     #{user_id},
+                     #{contact_user_id},
+                     #{contact_nickname},
+                     #{relation_type},
+                     #{contact_status},
+                     NOW(),
+                     NOW(),
+                     NOW()
+                 )
+    </insert>
+
+    <!-- 查询联系人列表（方法名同步修改，字段名不变） -->
+    <select id="selectFriendRelationListByUserId" parameterType="java.lang.Long" resultType="java.util.Map">
+        SELECT
+            contact_id,
+            user_id,
+            contact_user_id,
+            contact_nickname,
+            contact_avatar,
+            relation_type,
+            add_time,
+            last_chat_time,
+            contact_status,
+            contact_remark,
+            tags,
+            created_at,
+            updated_at
+        FROM contacts
+        WHERE user_id = #{userId}
+          AND contact_status = 1
+        ORDER BY add_time DESC
+    </select>
+
+    <!-- 删除过期的好友申请 -->
+    <delete id="deleteExpiredFriendApply" parameterType="java.lang.Integer">
+        DELETE FROM friend_apply
+        WHERE apply_status = 0
+          AND created_at &lt; DATE_SUB(NOW(), INTERVAL #{days} DAY)
+    </delete>
+
+</mapper>
--- a/src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml
@@ -24,4 +24,8 @@
        </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>
--- a/src/main/resources/com/bao/dating/mapper/PostMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/PostMapper.xml
@@ -41,6 +41,19 @@
        </foreach>
        AND user_id = #{userId}
    </update>
+    
+    <!--删除收藏记录-->
+    <delete id="deletePostFavoriteByPostId">
+        DELETE FROM post_favorite WHERE post_id = #{postId}
+    </delete>
+    <!--删除点赞记录-->
+    <delete id="deletePostLikeByPostId">
+        DELETE FROM post_like WHERE post_id = #{postId}
+    </delete>
+    <!--动态评论删除-->
+    <delete id="deleteCommentsByPostId">
+        DELETE FROM comments WHERE post_id = #{postId}
+    </delete>

    <!--动态查询-->
    <resultMap id="PostResultMap" type="com.bao.dating.pojo.entity.Post">
@@ -122,5 +135,11 @@
    <select id="selectFavoriteCount" resultType="java.lang.Integer">
        select dating.post.favorite_count from dating.post where post.post_id = #{postId}
    </select>
+    <select id="getUsernameByUserId" resultType="map">
+        SELECT u.user_name, u.user_id, p.media_oss_keys
+        FROM post p 
+        LEFT JOIN user u ON p.user_id = u.user_id 
+        WHERE p.post_id = #{postId}
+    </select>

 </mapper>
--- a/src/main/resources/com/bao/dating/mapper/UserBanMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/UserBanMapper.xml
@@ -0,0 +1,50 @@
+<?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.UserBanMapper">
+
+    <!--  向数据库中添加用户封禁信息 -->
+    <insert id="insertBan" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO user_ban
+            (user_id, reason, ban_start_time, ban_end_time, status)
+        VALUES
+            (#{userId}, #{reason}, #{banStartTime}, #{banEndTime}, #{status})
+    </insert>
+
+    <!--  查询指定用户是否存在未过期的封禁信息 -->
+    <select id="existsActiveBan" resultType="int">
+        SELECT COUNT(1)
+        FROM user_ban
+        WHERE user_id = #{userId}
+          AND status = 1
+        LIMIT 1
+    </select>
+
+    <!--   查询指定用户是否存在未过期的封禁信息 -->
+    <select id="selectActiveBan" resultType="com.bao.dating.pojo.entity.UserBan">
+        SELECT *
+        FROM user_ban
+        WHERE user_id = #{userId}
+          AND status = 1
+        LIMIT 1
+    </select>
+
+     <!--   解封指定用户 -->
+    <update id="unbanUser">
+        UPDATE user_ban
+        SET status = 0
+        WHERE user_id = #{userId}
+          AND status = 1
+    </update>
+
+     <!--   批量更新已过期的封禁信息 -->
+    <update id="updateExpiredBans">
+        UPDATE user_ban
+        SET status = 0
+        WHERE status = 1
+          AND ban_end_time IS NOT NULL
+          AND ban_end_time &lt; NOW()
+    </update>
+
+</mapper>
--- a/src/main/resources/com/bao/dating/mapper/UserDeviceMapper.xml
+++ b/src/main/resources/com/bao/dating/mapper/UserDeviceMapper.xml
@@ -0,0 +1,86 @@
+<?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.UserDeviceMapper">
+
+    <!--插入设备信息-->
+    <insert id="insert" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO user_device (
+            user_id, device_id, device_type, device_name, device_brand,
+            os_version, app_version, ip_address, location, token,
+            status, is_current, last_active_at, login_at, created_at
+        ) VALUES (
+            #{userId}, #{deviceId}, #{deviceType}, #{deviceName}, #{deviceBrand},
+            #{osVersion}, #{appVersion}, #{ipAddress}, #{location}, #{token},
+            #{status}, #{isCurrent}, #{lastActiveAt}, #{loginAt}, NOW()
+        )
+    </insert>
+
+    <!--根据设备ID查询-->
+    <select id="selectByDeviceId" resultType="com.bao.dating.pojo.entity.UserDevice">
+        SELECT * FROM user_device WHERE device_id = #{deviceId}
+    </select>
+
+    <!--根据用户ID查询所有设备-->
+    <select id="selectByUserId" resultType="com.bao.dating.pojo.vo.UserDeviceVO">
+        SELECT 
+            id, device_id, device_type, device_name, device_brand,
+            os_version, app_version, ip_address, location,
+            is_current = 1 as is_current,
+            status = 1 as is_online,
+            last_active_at, login_at
+        FROM user_device 
+        WHERE user_id = #{userId} 
+        ORDER BY is_current DESC, last_active_at DESC
+    </select>
+
+    <!--更新设备状态-->
+    <update id="updateStatus">
+        UPDATE user_device SET status = #{status} WHERE device_id = #{deviceId}
+    </update>
+
+    <!--更新最后活跃时间-->
+    <update id="updateLastActiveAt">
+        UPDATE user_device SET last_active_at = NOW() WHERE device_id = #{deviceId}
+    </update>
+
+    <!--清除用户当前设备标记-->
+    <update id="clearCurrentDevice">
+        UPDATE user_device SET is_current = 0 WHERE user_id = #{userId}
+    </update>
+
+    <!--设置当前设备-->
+    <update id="setCurrentDevice">
+        UPDATE user_device SET is_current = 1 WHERE device_id = #{deviceId}
+    </update>
+
+    <!--根据Token查询-->
+    <select id="selectByToken" resultType="com.bao.dating.pojo.entity.UserDevice">
+        SELECT * FROM user_device WHERE token = #{token}
+    </select>
+
+    <!--更新设备信息-->
+    <update id="update" parameterType="com.bao.dating.pojo.entity.UserDevice">
+        UPDATE user_device SET
+            device_name = #{deviceName},
+            device_brand = #{deviceBrand},
+            os_version = #{osVersion},
+            app_version = #{appVersion},
+            ip_address = #{ipAddress},
+            location = #{location},
+            last_active_at = NOW()
+        WHERE device_id = #{deviceId}
+    </update>
+
+    <!--删除设备-->
+    <delete id="deleteByDeviceId">
+        DELETE FROM user_device WHERE device_id = #{deviceId}
+    </delete>
+
+    <!--删除用户所有设备-->
+    <delete id="deleteByUserId">
+        DELETE FROM user_device WHERE user_id = #{userId}
+    </delete>
+
+</mapper>
--- a/src/main/resources/com/bao/dating/mapper/UserMapper.xml
+++ b/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更新动态-->
@@ -74,4 +92,55 @@
        </set>
        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>
+
+    <!-- 搜索用户：支持用户名模糊匹配、爱好标签精确匹配 -->
+    <select id="searchUsers" resultMap="UserResultMap">
+        SELECT * FROM user
+        WHERE 1=1
+        <!-- 用户名模糊搜索 -->
+        <if test="userName != null and userName != ''">
+            AND user_name LIKE CONCAT('%', #{userName}, '%')
+        </if>
+        <!-- 爱好标签搜索：MySQL 8.0+ 支持JSON_CONTAINS -->
+        <if test="hobbies != null and hobbies != ''">
+            AND JSON_CONTAINS(hobbies, CONCAT('"', #{hobbies}, '"'))
+        </if>
+    </select>
 </mapper>
--- a/src/main/resources/db/user_device.sql
+++ b/src/main/resources/db/user_device.sql
@@ -0,0 +1,22 @@
+-- 用户设备登录记录表
+CREATE TABLE IF NOT EXISTS `user_device` (
+    `id` BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID',
+    `user_id` BIGINT NOT NULL COMMENT '用户ID',
+    `device_id` VARCHAR(64) NOT NULL COMMENT '设备唯一标识',
+    `device_type` TINYINT DEFAULT 4 COMMENT '设备类型：1-Android, 2-iOS, 3-Web, 4-其他',
+    `device_name` VARCHAR(128) DEFAULT NULL COMMENT '设备名称',
+    `device_brand` VARCHAR(64) DEFAULT NULL COMMENT '设备品牌',
+    `os_version` VARCHAR(32) DEFAULT NULL COMMENT '操作系统版本',
+    `app_version` VARCHAR(32) DEFAULT NULL COMMENT '应用版本',
+    `ip_address` VARCHAR(64) DEFAULT NULL COMMENT 'IP地址',
+    `location` VARCHAR(128) DEFAULT NULL COMMENT '设备位置',
+    `token` VARCHAR(512) DEFAULT NULL COMMENT '登录Token',
+    `status` TINYINT DEFAULT 1 COMMENT '在线状态：1-在线, 0-离线',
+    `is_current` TINYINT DEFAULT 0 COMMENT '是否当前设备：1-是, 0-否',
+    `last_active_at` DATETIME DEFAULT NULL COMMENT '最后活跃时间',
+    `login_at` DATETIME DEFAULT NULL COMMENT '登录时间',
+    `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    UNIQUE KEY `uk_device_id` (`device_id`),
+    KEY `idx_user_id` (`user_id`),
+    KEY `idx_token` (`token`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户登录设备记录表';
Author	SHA1	Message	Date
lihaiyang	5e434e401a	修复token	2026-01-20 17:11:20 +08:00
KilLze	2224b43fcb	修复AI的小巧思3	2026-01-20 15:16:05 +08:00
KilLze	9c1b701594	删除AI的小巧思2	2026-01-20 15:13:58 +08:00
KilLze	b77952164b	删除AI的小巧思	2026-01-20 15:13:35 +08:00
KilLze	5210ea9554	把日志记录入库删了（）	2026-01-20 14:57:58 +08:00
bao	6b7f6947db	合并	2026-01-20 14:51:53 +08:00
bao	1f81b6fbc1	feat: 添加用户封禁管理功能	2026-01-20 14:45:01 +08:00
bao	d53bc3966c	Merge origin/123321 into master	2026-01-19 08:25:02 +08:00
KilLze	39af4e6596	修该死的bug	2026-01-14 11:44:36 +08:00
KilLze	ea5c95584d	优化会话列表，添加用户在线状态	2026-01-14 11:31:10 +08:00
KilLze	e170016019	完成用户在线状态查询	2026-01-14 11:21:06 +08:00
yang	88abc41a9e	下载图片+水印(作者ID+作者名)	2026-01-13 13:48:26 +08:00
bao	e4f1385411	更新联系人相关功能：添加联系人控制器、服务层和Mapper实现	2026-01-13 11:22:44 +08:00
KilLze	6d95b8d391	完成数据库定时解封低频同步（凌晨3点），主要还是依赖redis实时同步	2026-01-13 01:34:05 +08:00
KilLze	1c2a4edae9	完成用户封禁，解封，封禁查询（由于没有管理员，所以现在先用普通用户测试封禁）	2026-01-13 01:29:34 +08:00
KilLze	088c94e723	用户封禁拦截器，登录验证完成	2026-01-13 00:32:30 +08:00
KilLze	a3d0d7423c	用户封禁拦截器，登录验证完成	2026-01-13 00:32:17 +08:00
KilLze	4f94c43f94	修bug	2026-01-11 00:57:29 +08:00
KilLze	7a8a03510c	修bug	2026-01-11 00:28:23 +08:00
KilLze	2189575659	修bug	2026-01-11 00:25:19 +08:00
bao	e9d20ccf6c	feat:修复接口	2026-01-09 15:41:14 +08:00
bao	d70ca89707	merge feature-init into master # 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	2026-01-09 15:35:31 +08:00
bao	a4faa11036	feat: update user module on feature-init	2026-01-09 15:22:18 +08:00
bao	2811a987c0	merge: 合并feature-WebSocket分支到master	2026-01-09 09:46:55 +08:00
bao	88579a382e	merge: 合并feature-ip-location分支到master	2026-01-09 09:40:39 +08:00
bao	4f36dd9aeb	merge: 合并feature/contacts-friends分支到master	2026-01-09 09:07:12 +08:00
yang	290db24bc4	查询附近的人（可以查看版）	2026-01-08 10:10:25 +08:00
bao	7c0bfbc1de	feat: 添加联系人管理和好友关系功能	2026-01-08 10:06:49 +08:00
yang	31b0dffd68	查询附近的人（可以查看版）	2026-01-08 10:06:03 +08:00
yang	31fd23afa8	查询附近的人（可以查看版）	2026-01-08 10:05:58 +08:00
yang	d8d46ab089	查询附近的人（可以查看版）	2026-01-08 10:00:27 +08:00
lanyangyang-yzx	5624e598ec	完成用户邮箱登录和获得ip地址	2026-01-08 08:36:28 +08:00
KilLze	cf6f9b8b7c	完成消息撤回功能	2026-01-08 01:20:11 +08:00
KilLze	0a17eb8deb	简单优化	2026-01-08 00:07:25 +08:00
KilLze	448ce1d3d6	完成聊天文件上传OSS	2026-01-08 00:06:10 +08:00
KilLze	a4e66b39d1	完成会话状态更新、置顶状态更新、免打扰状态更新	2026-01-07 23:35:49 +08:00
KilLze	0a1425c7ab	Ciallo～(∠·ω< )⌒★	2026-01-07 22:59:46 +08:00
KilLze	21c0a94a5d	优化会话，当对删除的会话发送信息时返回error	2026-01-07 03:43:33 +08:00
KilLze	b6953cb8d0	完成会话列表查询并校验会话状态	2026-01-07 03:33:34 +08:00
KilLze	f6769c8c69	完成会话列表查询	2026-01-07 02:58:44 +08:00
KilLze	5e1f3b7e8a	优化代码	2026-01-07 01:36:23 +08:00
KilLze	e30a0dba97	优化代码	2026-01-07 01:12:28 +08:00
KilLze	74d47d586f	加注释	2026-01-07 00:49:32 +08:00
KilLze	0bb69075f7	完成进入会话消息自动已读	2026-01-07 00:47:38 +08:00
KilLze	1d179da910	将查询历史消息修改为只查询消息，不进行多余操作	2026-01-06 23:38:11 +08:00
KilLze	c0969406b3	完成历史信息查询，并且可以通过内容模糊查询，通过时间查询，通过消息类型查询	2026-01-06 04:18:30 +08:00
KilLze	2a9acb946e	优化代码，顺便准备写历史聊天记录查询	2026-01-06 02:25:36 +08:00
KilLze	fb2b7823b8	完成创建会话添加对方昵称	2026-01-05 22:48:53 +08:00
KilLze	951cd7249d	完成基本对话功能、消息入库和创建会话功能	2026-01-05 21:33:03 +08:00