完成数据库定时解封低频同步（凌晨3点），主要还是依赖redis实时同步

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

pom.xml

@@ -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>

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

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

@@ -0,0 +1,14 @@
+package com.bao.dating.common.ip2location;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "ip2location.api")
+public class Ip2LocationConfig {
+    private String key;
+    private String url;
+    private int timeout;
+}

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

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

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

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

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

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

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

@@ -29,6 +29,11 @@ public class WebConfig implements WebMvcConfigurer {
                 .addPathPatterns("/**")
                 // 忽略的接口
                 .excludePathPatterns(
+                        "/user/login",
+                        "/user/register",
+                        "/user/emailLogin",
+                        "/api/verification/send-email-code",
+                        "/ip/location",
                         "/user/login",
                         "/user/sendCode"
                 );

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

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

src/main/java/com/bao/dating/controller/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);
+    }
+}

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

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

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

@@ -0,0 +1,45 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.context.UserContext;
+import com.bao.dating.service.ContactsService;
+
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+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;
+    }
+}

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

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

@@ -0,0 +1,37 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.pojo.vo.IpLocationVO;
+import com.bao.dating.service.Ip2LocationClientService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/ip")
+public class IpLocationController {
+    @Autowired
+    private Ip2LocationClientService ip2LocationClientService;
+    /**
+     * 前端访问接口，获取IP地址位置信息
+     * @param ip 可选参数，要查询的IP地址
+     * @return IP位置信息（JSON格式）
+     */
+    @GetMapping("/location")
+    public Result<?> getIpLocation(@RequestParam(required = false) String ip) {
+        if (ip.isEmpty()){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        try {
+            // 调用工具类获取API响应
+            IpLocationVO ipLocationVo = ip2LocationClientService.getIpLocation(ip);
+            return Result.success(ResultCode.SUCCESS,ipLocationVo);
+        } catch (Exception e) {
+            // 异常处理：返回错误信息（实际项目建议封装统一响应格式）
+            return Result.error(ResultCode.SYSTEM_ERROR,e.getMessage());
+        }
+    }
+}

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

@@ -31,7 +31,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 +42,6 @@ public class PostController {
      * @param postDTO 动态信息
      * @return 发布的动态对象
      */
-    @Log
     @PostMapping( "/createPost")
     public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
@@ -57,7 +55,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,7 +78,6 @@ 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);

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

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

@@ -4,13 +4,11 @@ import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.context.UserContext;
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
+import com.bao.dating.pojo.dto.UserInfoDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
-import com.bao.dating.pojo.entity.User;
 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;
@@ -68,6 +66,7 @@ public class UserController {
      * @param file 头像文件
      * @return 上传后的文件URL列表
      */
+    @Log
     @PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
     public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadAvatar(file);
@@ -79,6 +78,7 @@ public class UserController {
      * @param file 背景文件
      * @return 上传后的文件URL列表
      */
+    @Log
     @PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
     public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadBackground(file);
@@ -90,8 +90,9 @@ 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);
@@ -164,4 +165,42 @@ public class UserController {
         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);
+    }
+
 }

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

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

src/main/java/com/bao/dating/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,7 @@ public class TokenInterceptor implements HandlerInterceptor {
 
             log.info("用户: {}", userId);
             // 保存 userId 到 ThreadLocal
-            UserContext.setUserId(Long.valueOf(userId));
+            UserContext.setUserId(userId);
             return true;
         } catch (Exception e) {
             log.error("Token 校验失败: {}", e.getMessage());

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

@@ -0,0 +1,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握手完成");
+        }
+    }
+}

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.bao.dating.mapper;
 
+import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,7 +11,9 @@ import java.util.List;
 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);
 }

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

@@ -24,8 +24,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查询动态

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

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

@@ -1,6 +1,6 @@
 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;
@@ -35,7 +35,27 @@ 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);
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/com/bao/dating/pojo/dto/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;
+}

src/main/java/com/bao/dating/pojo/dto/UserInfoDTO.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;

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

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

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

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

src/main/java/com/bao/dating/pojo/entity/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;         // 更新时间
+}

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

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

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

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

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

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

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

@@ -0,0 +1,30 @@
+package com.bao.dating.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class IpLocationVO {
+    // 国家
+    @JsonProperty("country_name")
+    private String countryName;
+    // 省份/地区
+    @JsonProperty("region_name")
+    private String regionName;
+    // 城市
+    @JsonProperty("city_name")
+    private String cityName;
+    // 纬度
+    private String latitude;
+    // 经度
+    private String longitude;
+    // ISP运营商
+    @JsonProperty("isp")
+    private String isp;
+}

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

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

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

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

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

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

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

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

@@ -1,10 +1,13 @@
 package com.bao.dating.service;
 
 import com.bao.dating.common.Result;
+import com.bao.dating.pojo.entity.Post;
 
+import java.util.List;
 import java.util.Map;
 
 public interface PostFavoriteService {
     Result<Map<String,Long>> postFavorite(Long userid,Long postId);
     Result<?> deletePostFavorite(Long userid,Long postId);
+    List<Post> selectAllFavorites(Long userid);
 }

src/main/java/com/bao/dating/service/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);
+}

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

@@ -1,8 +1,7 @@
 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;
@@ -54,7 +53,30 @@ 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);
 

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

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

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

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

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

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

@@ -0,0 +1,67 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.common.ip2location.Ip2LocationConfig;
+import com.bao.dating.pojo.vo.IpLocationVO;
+import com.bao.dating.service.Ip2LocationClientService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.net.URI;
+
+@Service
+public class Ip2LocationClientServiceImpl implements Ip2LocationClientService {
+    @Autowired
+    private Ip2LocationConfig ip2LocationConfig;
+
+    // Jackson的ObjectMapper，用于JSON解析
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    /**
+     * 调用API并只返回核心位置信息
+     * @param ip 要查询的IP地址
+     * @return 精简的位置信息实体类
+     * @throws Exception 异常
+     */
+    @Override
+    public IpLocationVO getIpLocation(String ip) throws Exception {
+        // 1. 构建请求URL
+        URIBuilder uriBuilder = new URIBuilder(ip2LocationConfig.getUrl());
+        uriBuilder.addParameter("key", ip2LocationConfig.getKey());
+        if (ip != null && !ip.trim().isEmpty()) {
+            uriBuilder.addParameter("ip", ip);
+        }
+        URI uri = uriBuilder.build();
+
+        // 2. 配置超时时间（逻辑和之前一致）
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setConnectTimeout(ip2LocationConfig.getTimeout())
+                .setSocketTimeout(ip2LocationConfig.getTimeout())
+                .build();
+
+        // 3. 发送请求并解析响应
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpGet httpGet = new HttpGet(uri);
+            httpGet.setConfig(requestConfig);
+
+            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
+                if (response.getStatusLine().getStatusCode() == 200) {
+                    String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8");
+                    // 核心：将完整JSON解析为只包含位置信息的VO类
+                    return objectMapper.readValue(jsonStr, IpLocationVO.class);
+                } else {
+                    throw new RuntimeException("调用API失败，状态码：" + response.getStatusLine().getStatusCode());
+                }
+            }
+        }
+    }
+
+}

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

@@ -4,6 +4,7 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.mapper.PostFavoriteMapper;
 import com.bao.dating.mapper.PostMapper;
+import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import com.bao.dating.service.PostFavoriteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,4 +59,18 @@ public class PostFavoriteServiceImpl implements PostFavoriteService {
         postMapper.decreaseFavoriteCount(postId);
         return null;
     }
+
+    /**
+     * 展示所有收藏
+     * @param userid 用户id
+     * @return 查询到的结果
+     */
+
+    @Override
+    public List<Post> selectAllFavorites(Long userid) {
+        if (userid == null){
+            return null;
+        }
+        return postFavoriteMapper.showAllFavorites(userid);
+    }
 }

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

@@ -205,6 +205,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) {

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

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

@@ -6,20 +6,21 @@ 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;
@@ -63,6 +64,12 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
+    @Autowired
+    private VerificationCodeService verificationCodeService;
+
+    @Autowired
+    private UserBanUtil userBanValidator;
+
     /**
      * 用户登录
      *
@@ -89,6 +96,8 @@ public class UserServiceImpl implements UserService {
         if (!match) {
             throw new RuntimeException("密码错误");
         }
+        // 用户封禁验证
+        userBanValidator.validateUserNotBanned(user.getUserId());
         // 生成token
         String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
 
@@ -236,13 +245,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) {
@@ -323,6 +333,84 @@ public class UserServiceImpl implements UserService {
         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) {
@@ -332,7 +420,7 @@ public class UserServiceImpl implements UserService {
         if (Boolean.TRUE.equals(exists)){
             throw new RuntimeException("请勿频繁发送验证码");
         }
-        
+
         // 生成验证码
         String code = CodeUtil.generateCode();
         // 发送短信
@@ -403,4 +491,4 @@ public class UserServiceImpl implements UserService {
         }
         return result;
     }
-}
+}

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

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

src/main/java/com/bao/dating/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);
+        }
+    }
+}

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

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

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 字节数组

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

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  # 请求超时时间（毫秒）
+

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

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

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

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

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

@@ -0,0 +1,25 @@
+<?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>
+</mapper>
+

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>

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>

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

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>

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">
@@ -49,6 +53,16 @@
         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更新动态-->
     <update id="updateUserInfoByUserId">
         UPDATE user
@@ -97,9 +111,9 @@
         <result property="latitude" column="user_latitude"/>
         <result property="longitude" column="user_longitude"/>
     </resultMap>
-    
+
     <select id="findByLatLngRange" resultMap="UserInfoVOResultMap">
-        SELECT 
+        SELECT
             user_id,
             user_name,
             nickname,
@@ -115,4 +129,6 @@
             user_longitude
         FROM user WHERE user_latitude BETWEEN #{minLat} AND #{maxLat} AND user_longitude BETWEEN #{minLng} AND #{maxLng}
     </select>
+
+
 </mapper>