加注释

目前除登录以外的所有操作都会经过拦截器，可以在WebConfig中设置拦截器忽略的接口
获取用户id不需要手动输入了，直接通过UserContext获取当前登录的用户id
为动态删除，动态修改等我负责的功能添加身份验证，用户id不匹配则会跳出异常
增加token过期验证

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

@@ -1,14 +1,26 @@
 package com.bao.dating.common;
 
+/**
+ * 响应状态码枚举
+ */
 public enum ResultCode {
+    /** 成功 */
     SUCCESS(200, "成功"),
+    /** 请求已成功处理 */
     SUCCESS_REVIEW(201, "请求已成功处理"),
+    /** 删除成功 */
     SUCCESS_DELETE(204, "删除成功"),
+    /** 参数错误 */
     PARAM_ERROR(400, "参数错误"),
+    /** 未登录或 Token 失效 */
     UNAUTHORIZED(401, "未登录或 Token 失效"),
+    /** 无权限 */
     FORBIDDEN(403, "无权限"),
+    /** 数据不存在 */
     NOT_FOUND(404, "数据不存在"),
+    /** 系统异常 */
     SYSTEM_ERROR(500, "系统异常"),
+    /** 操作失败 */
     FAIL(500, "操作失败");
 
     private final int code;

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

@@ -0,0 +1,31 @@
+package com.bao.dating.config;
+
+
+import com.bao.dating.interceptor.TokenInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private TokenInterceptor tokenInterceptor;
+
+    /**
+     * 添加拦截器到Spring MVC配置中
+     * @param registry 拦截器注册中心
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        //注册自定义拦截器对象
+        registry.addInterceptor(tokenInterceptor)
+                // 拦截所有请求
+                .addPathPatterns("/**")
+                // 忽略的接口
+                .excludePathPatterns(
+                        "/user/login"
+                );
+    }
+}

src/main/java/com/bao/dating/context/UserContext.java

@@ -0,0 +1,33 @@
+package com.bao.dating.context;
+
+/**
+ * 用户上下文类
+ * @author lenovo
+ */
+public class UserContext {
+
+    private static final ThreadLocal<Long> userHolder = new ThreadLocal<>();
+
+    /**
+     * 设置当前线程的用户ID
+     * @param userId 用户ID
+     */
+    public static void setUserId(Long userId) {
+        userHolder.set(userId);
+    }
+
+    /**
+     * 获取当前线程的用户ID
+     * @return 当前用户ID，如果未设置则返回null
+     */
+    public static Long getUserId() {
+        return userHolder.get();
+    }
+
+    /**
+     * 清除当前线程的用户ID
+     */
+    public static void clear() {
+        userHolder.remove();
+    }
+}

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

@@ -34,13 +34,12 @@ public class PostController {
     /**
      * 发布动态接口 - JSON格式请求
      * @param postDTO 动态信息
-     * @param userId 用户ID
      * @return 发布的动态对象
      */
-    @PostMapping(consumes = "application/json")
-    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO, @RequestParam Long userId) {
+    @PostMapping( "/createPost")
+    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
-        Post result = postService.createPost(userId, postDTO);
+        Post result = postService.createPost(postDTO);
         return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
     }
 
@@ -50,8 +49,8 @@ public class PostController {
      * @param postIds 动态ID
      * @return 删除结果
      */
-    @DeleteMapping
-    public Result<String> deleteById(@RequestParam List<Long> postIds){
+    @PostMapping("/deletePost")
+    public Result<String> deleteById(@RequestBody List<Long> postIds){
         int deletedCount = postService.deletePostById(postIds);
         return Result.success(ResultCode.SUCCESS_DELETE, deletedCount > 0 ? "成功删除" : "删除失败，该动态不存在", null);
     }
@@ -61,7 +60,7 @@ public class PostController {
      * @param postId 动态ID
      * @return 动态对象
      */
-    @GetMapping("/{postId}")
+    @PostMapping("/{postId}")
     public Result<PostEditVO> getPostById(@PathVariable Long postId) {
         PostEditVO postEditVO = postService.getPostForEdit(postId);
         return Result.success(ResultCode.SUCCESS,"查询成功", postEditVO);
@@ -73,7 +72,7 @@ public class PostController {
      * @param postRequestDTO 动态信息
      * @return 更新后的动态对象
      */
-    @PutMapping("/{postId}")
+    @PostMapping("/{postId}/updatePost")
     public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
         PostEditVO result = postService.updatePost(postId, postRequestDTO);
         return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);

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

@@ -1,9 +1,18 @@
 package com.bao.dating.controller;
 
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.context.UserContext;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 @RestController
 @RequestMapping("/user")
@@ -11,4 +20,47 @@ public class UserController {
 
     @Autowired
     private UserService userService;
+
+    /**
+     * 登录
+     * @param userLoginDTO 登录参数
+     */
+    @PostMapping("/login")
+    public Result<UserLoginVO> login(@RequestBody UserLoginDTO userLoginDTO) {
+        UserLoginVO userloginVO = userService.userLogin(userLoginDTO);
+        return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
+    }
+
+    /**
+     * 获取用户信息
+     * @return 用户信息
+     */
+    @GetMapping("/info")
+    public Result<UserInfoVO> getUserInfo() {
+        Long userId = UserContext.getUserId();
+        UserInfoVO userInfoVO = userService.getUserInfo(userId);
+        return Result.success(ResultCode.SUCCESS, "获取用户信息成功", userInfoVO);
+    }
+
+    /**
+     * 上传头像接口
+     * @param file 头像文件
+     * @return 上传后的文件URL列表
+     */
+    @PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
+    public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
+        String fileUrl = userService.uploadAvatar(file);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "头像上传成功", fileUrl);
+    }
+
+    /**
+     * 上传背景接口
+     * @param file 背景文件
+     * @return 上传后的文件URL列表
+     */
+    @PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
+    public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
+        String fileUrl = userService.uploadBackground(file);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "背景上传成功", fileUrl);
+    }
 }

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

@@ -0,0 +1,79 @@
+package com.bao.dating.interceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.bao.dating.context.UserContext;
+import com.bao.dating.util.JwtUtil;
+import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+/**
+ * HttpToken拦截器类
+ * 用于拦截请求并验证JWT token的有效性，同时从token中解析用户信息
+ */
+@Slf4j
+@Component
+public class TokenInterceptor implements HandlerInterceptor {
+    /**
+     * 在请求处理之前进行拦截
+     * 从请求头或URL参数中获取token，验证其有效性，并将用户ID保存到ThreadLocal中
+     * @param request HTTP请求对象
+     * @param response HTTP响应对象
+     * @param handler 处理器
+     * @return 验证通过返回true，否则返回false
+     * @throws Exception 异常
+     */
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+
+        //判断当前拦截到的是Controller的方法还是其他资源
+        if (!(handler instanceof HandlerMethod)) {
+            //当前拦截到的不是动态方法，直接放行
+            return true;
+        }
+        // 从 header 获取 token
+        String token = request.getHeader("token");
+        
+        try {
+            log.info("jwt校验: {}", token);
+            
+            // 验证 token 是否有效（包括是否过期）
+            if (!JwtUtil.validateToken(token)) {
+                log.error("Token 无效或已过期");
+                response.setStatus(401);
+                return false;
+            }
+            
+            // 解析 token
+            String userId = JwtUtil.getSubjectFromToken(token);
+            log.info("用户: {}", userId);
+            
+            // 保存 userId 到 ThreadLocal
+            UserContext.setUserId(Long.valueOf(userId));
+            return true;
+        } catch (Exception e) {
+            log.error("Token 校验失败: {}", e.getMessage());
+            response.setStatus(401);
+            return false;
+        }
+    }
+
+    /**
+     * 在请求完成之后执行清理工作
+     * 清除保存在ThreadLocal中的用户ID，防止内存泄漏
+     * @param request HTTP请求对象
+     * @param response HTTP响应对象
+     * @param handler 处理器
+     * @param ex 异常对象
+     * @throws Exception 异常
+     */
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        UserContext.clear();
+    }
+
+}

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

@@ -20,7 +20,7 @@ public interface PostMapper {
      *
      * @param postIds 动态ID
      */
-    int deletePostByIds(@Param("postIds") List<Long> postIds);
+    int deletePostByIds(List<Long> postIds);
 
     /**
      * 根据ID查询动态
@@ -28,7 +28,7 @@ public interface PostMapper {
      * @param postId
      * @return
      */
-    Post selectById(@Param("postId") Long postId);
+    Post selectById(Long postId);
 
     /**
      * 根据ID更新动态

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

@@ -1,7 +1,25 @@
 package com.bao.dating.mapper;
 
+import com.bao.dating.pojo.entity.User;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface UserMapper {
+
+    /**
+     * 根据用户名查询用户
+     *
+     * @param username 用户名
+     * @return 用户
+     */
+    User getByUsername(String username);
+
+    /**
+     * 根据用户id查询用户信息
+     *
+     * @param userid 用户id
+     * @return 用户
+     */
+    User selectByUserId(Long userid);
 }

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

@@ -0,0 +1,14 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户登录数据传输对象
+ */
+@Data
+public class UserLoginDTO implements Serializable {
+    private String username;
+    private String password;
+}

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

@@ -38,4 +38,8 @@ public class User implements Serializable {
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;
+
+    private String userEmail;
+
+    private String userPhone;
 }

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

@@ -0,0 +1,24 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 用户信息VO
+ */
+@Data
+public class UserInfoVO {
+    private Long userId;
+    private String nickname;
+    private String avatarUrl;
+    private String backgroundUrl;
+    private Integer gender;
+    private LocalDate birthday;
+    private List<String> hobbies;
+    private String signature;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}

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

@@ -17,11 +17,10 @@ public interface PostService {
 
     /**
      * 创建动态
-     * @param userId 用户ID
      * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
-    Post createPost(Long userId, PostRequestDTO postRequestDTO);
+    Post createPost(PostRequestDTO postRequestDTO);
 
     /**
      * 批量删除动态

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

@@ -1,4 +1,38 @@
 package com.bao.dating.service;
 
+import com.bao.dating.pojo.dto.UserLoginDTO;
+import com.bao.dating.pojo.vo.PostEditVO;
+import com.bao.dating.pojo.vo.UserInfoVO;
+import com.bao.dating.pojo.vo.UserLoginVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
 public interface UserService {
+    /**
+     * 登录
+     * @param userLoginDTO 登录参数
+     * @return 登录结果
+     */
+    UserLoginVO userLogin(UserLoginDTO userLoginDTO);
+
+    /**
+     * 查询个人信息
+     * @param userId 动态ID
+     */
+    UserInfoVO getUserInfo(Long userId);
+
+    /**
+     * 上传头像
+     * @param file 头像文件
+     * @return 上传后的文件URL列表
+     */
+    String uploadAvatar(MultipartFile file);
+
+    /**
+     * 上传背景
+     * @param file 背景文件
+     * @return 上传后的文件URL列表
+     */
+    String uploadBackground(MultipartFile file);
 }

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

@@ -2,6 +2,7 @@ package com.bao.dating.service.impl;
 
 import com.bao.dating.common.aliyun.GreenImageScan;
 import com.bao.dating.common.aliyun.GreenTextScan;
+import com.bao.dating.context.UserContext;
 import com.bao.dating.mapper.PostMapper;
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
@@ -19,10 +20,7 @@ import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 动态服务实现类
@@ -51,49 +49,70 @@ public class PostServiceImpl implements PostService {
      */
     @Override
     public List<String> uploadMedia(MultipartFile[] files) {
+        // 如果没有文件，则返回空列表
+        if (files == null || files.length == 0) {
+            return Collections.emptyList();
+        }
+        // 创建媒体文件列表
         List<String> mediaUrls = new ArrayList<>();
-        if (files != null && files.length > 0) {
+
             for (MultipartFile file : files) {
-                if (!file.isEmpty()) {
+                // 跳过空文件
+                if (file == null || file.isEmpty()) {
+                    continue;
+                }
+                // 获取文件名并跳过空文件
+                String originalFilename = file.getOriginalFilename();
+                if (originalFilename == null) {
+                    continue;
+                }
+                // 校验文件类型
+                String fileType = FileUtil.getFileType(originalFilename);
+                if (!"image".equals(fileType) && !"video".equals(fileType)) {
+                    throw new RuntimeException("不支持的文件类型：" + originalFilename);
+                }
+
+                // 创建目录
+                String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
+                // 获取文件扩展名
+                String extension = FileUtil.getFileExtension(originalFilename);
+                // 生成唯一文件名
+                String newFileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
+                // 获取用户ID
+                Long userId = UserContext.getUserId();
+                // 创建文件名
+                String fileName = "post/" + userId + "/" + dir + "/" + newFileName;
+
                     try {
-                        // 根据文件扩展名判断文件类型
-                        String fileType = FileUtil.getFileType(file.getOriginalFilename());
-                        // 创建目录
-                        String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
-                        // 生成唯一文件名
-                        String newFileName = UUID.randomUUID().toString() + "." + FileUtil.getFileExtension(file.getOriginalFilename());
-                        String fileName = "post/" + dir + "/" + newFileName;
                         // 获取文件字节数据
                         byte[] fileBytes = file.getBytes();
-                        // 根据文件类型处理
-                        String ossUrl = "";
-                        if ("image".equals(fileType) || "video".equals(fileType)) {
-                            // 上传图片或视频
-                            ossUrl = ossUtil.upload(fileBytes, fileName);
+                        // 上传图片或视频
+                        String ossUrl = ossUtil.upload(fileBytes, fileName);
+                        if (ossUrl == null || ossUrl.isEmpty()) {
+                            throw new RuntimeException("文件上传失败：" + originalFilename);
                         }
                         // 添加上传后的 URL
                         mediaUrls.add(ossUrl);
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        // 统一异常处理
+                        throw new RuntimeException("上传媒体文件失败：" + originalFilename, e);
                     }
                 }
-            }
-        }
         return mediaUrls;
     }
 
     /**
      * 创建动态
      *
-     * @param userId 用户ID
      * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
     @Override
-    public Post createPost(Long userId, PostRequestDTO postRequestDTO) {
+    public Post createPost(PostRequestDTO postRequestDTO) {
 
         // 创建动态对象
         Post post = new Post();
+        Long userId = UserContext.getUserId();
         post.setUserId(userId);
         post.setContent(postRequestDTO.getContent());
         post.setTags(postRequestDTO.getTags());
@@ -165,6 +184,20 @@ public class PostServiceImpl implements PostService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deletePostById(List<Long> postIds) {
+        // 判断用户权限
+        Long userId = UserContext.getUserId();
+
+        // 遍历所有要删除的帖子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("无权限删除此动态");
+            }
+        }
         // 批量删除动态
         return postMapper.deletePostByIds(postIds);
     }
@@ -173,15 +206,19 @@ public class PostServiceImpl implements PostService {
      * 查询动态详情（用于编辑）
      *
      * @param postId 动态ID
-     * @return
+     * @return 动态详情
      */
     @Override
     public PostEditVO getPostForEdit(Long postId) {
-
         Post post = postMapper.selectById(postId);
         if (post == null) {
             throw new RuntimeException("动态不存在");
         }
+        // 判断用户权限
+        Long userId = UserContext.getUserId();
+        if (post.getUserId() == null || !post.getUserId().equals(userId)){
+            throw new RuntimeException("无权限查看此动态");
+        }
         PostEditVO postEditVO = new PostEditVO();
         BeanUtils.copyProperties(post, postEditVO);
         return postEditVO;
@@ -191,7 +228,7 @@ public class PostServiceImpl implements PostService {
      * 修改动态
      * @param postId 动态ID
      * @param postRequestDTO 修改的动态数据传输对象
-     * @return
+     * @return 修改的动态对象
      */
     @Override
     public PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO) {
@@ -200,10 +237,14 @@ public class PostServiceImpl implements PostService {
         if (post == null) {
             throw new RuntimeException("动态不存在");
         }
-        post.setContent(postRequestDTO.getContent());
-        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
-            post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
+        // 判断用户权限
+        Long userId = UserContext.getUserId();
+        if (post.getUserId() == null || !post.getUserId().equals(userId)){
+            throw new RuntimeException("无权限修改此动态");
         }
+        post.setContent(postRequestDTO.getContent());
+        // 如果请求中的mediaOssKeys不为null（即使是空列表），则更新为新值
+        post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
 
         // 1. 文本内容审核
         Map textResult;
@@ -215,11 +256,11 @@ public class PostServiceImpl implements PostService {
         // 文本审核结果
         String textSuggestion = (String) textResult.get("suggestion");
 
-        // 2. 图片审核（如果有）
-        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
+        // 2. 图片审核（如果有媒体文件）
+        if (post.getMediaOssKeys() != null && !post.getMediaOssKeys().isEmpty()) {
             Map imageResult;
             try {
-                imageResult = greenImageScan.imageScan(postRequestDTO.getMediaOssKeys());
+                imageResult = greenImageScan.imageScan(post.getMediaOssKeys());
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

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

@@ -1,13 +1,160 @@
 package com.bao.dating.service.impl;
 
+import com.bao.dating.common.aliyun.AliOssUtil;
+import com.bao.dating.context.UserContext;
 import com.bao.dating.mapper.UserMapper;
+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.util.FileUtil;
+import com.bao.dating.util.JwtUtil;
+import com.bao.dating.util.MD5Util;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.UUID;
 
 @Service
 public class UserServiceImpl implements UserService {
 
+    @Autowired
+    private AliOssUtil ossUtil;
+
     @Autowired
     private UserMapper userMapper;
+
+    /**
+     * 用户登录
+     * @param userLoginDTO
+     * @return 登录信息
+     */
+    @Override
+    public UserLoginVO userLogin(UserLoginDTO userLoginDTO) {
+        // 参数校验
+        if (userLoginDTO == null || userLoginDTO.getUsername() == null || userLoginDTO.getPassword() == null) {
+            throw new RuntimeException("用户名或密码不能为空");
+        }
+        // 查询用户
+        User user = userMapper.getByUsername(userLoginDTO.getUsername());
+        if (user == null){
+            throw new RuntimeException("用户不存在");
+        }
+        // 密码校验
+        boolean match = MD5Util.verifyWithSalt(
+                userLoginDTO.getPassword(),
+                user.getSalt(),
+                user.getPasswordHash()
+        );
+        if (!match){
+            throw new RuntimeException("密码错误");
+        }
+        // 生成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;
+    }
+
+    /**
+     * 获取用户信息
+     * @param userId
+     * @return 用户信息
+     */
+    @Override
+    public UserInfoVO getUserInfo(Long userId) {
+        User user = userMapper.selectByUserId(userId);
+        if (user == null){
+            throw new RuntimeException("用户不存在");
+        }
+        UserInfoVO userInfoVO = new UserInfoVO();
+        BeanUtils.copyProperties(user, userInfoVO);
+        return userInfoVO;
+    }
+
+    @Override
+    public String uploadAvatar(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 (!"image".equals(fileType)) {
+            throw new RuntimeException("仅支持图片上传");
+        }
+
+        //生成 OSS 路径
+        String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
+        String extension = FileUtil.getFileExtension(originalFilename);
+        String fileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
+        Long userId = UserContext.getUserId();
+        String objectKey = "user/" + userId + "/avatar/"  + 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);
+        }
+    }
+
+    @Override
+    public String uploadBackground(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 (!"image".equals(fileType)) {
+            throw new RuntimeException("仅支持图片上传");
+        }
+
+        //生成 OSS 路径
+        String extension = FileUtil.getFileExtension(originalFilename);
+        String fileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
+        Long userId = UserContext.getUserId();
+        String objectKey = "user/" + userId + "/background/" + 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);
+        }
+    }
 }

src/main/resources/application.yml

@@ -7,6 +7,19 @@ spring:
     username: root
     password: JoyeeServe2025
     driver-class-name: com.mysql.cj.jdbc.Driver
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password: ""
+    database: 0
+    timeout: 10000
+    # 连接池配置（lettuce是Spring Boot默认Redis客户端，性能更优）
+    lettuce:
+      pool:
+        max-active: 8    # 连接池最大连接数（默认8，可根据业务并发调整）
+        max-wait: -1     # 连接池最大阻塞等待时间（毫秒，-1表示无限制）
+        max-idle: 8      # 连接池最大空闲连接数（默认8）
+        min-idle: 1      # 连接池最小空闲连接数（默认0，建议设置1-4，提高连接复用率）
   # 邮箱SMTP配置
   mail:
     host: smtp.163.com  # QQ邮箱SMTP服务器地址

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

@@ -4,5 +4,43 @@
 
 <mapper namespace="com.bao.dating.mapper.UserMapper">
 
+    <!--根据用户名查询用户-->
+    <select id="getByUsername" resultType="com.bao.dating.pojo.entity.User">
+        SELECT
+            user_id,
+            user_name,
+            password_hash,
+            salt,
+            nickname
+        FROM user WHERE user_name = #{userName}
+    </select>
+
+    <!--根据用户id查询用户信息-->
+    <resultMap id="UserResultMap" type="com.bao.dating.pojo.entity.User">
+        <id property="userId" column="user_id"/>
+        <result property="nickname" column="nickname"/>
+        <result property="avatarUrl" column="avatar_url"/>
+        <result property="backgroundUrl" column="background_url"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+        <result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToVarcharTypeHandler"/>
+        <result property="signature" column="signature"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+    </resultMap>
+    <select id="selectByUserId" resultMap="UserResultMap">
+        SELECT
+            user_id,
+            nickname,
+            avatar_url,
+            background_url,
+            gender,
+            birthday,
+            hobbies,
+            signature,
+            created_at,
+            updated_at
+            FROM user WHERE user_id = #{userId}
+    </select>
 
 </mapper>