配置redis

(cherry picked from commit ae0cca5437)

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

@@ -1,33 +0,0 @@
-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",
-                        "/user/userRegister"
-                );
-    }
-}
-

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

@@ -1,33 +0,0 @@
-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,12 +34,13 @@ public class PostController {
     /**
      * 发布动态接口 - JSON格式请求
      * @param postDTO 动态信息
+     * @param userId 用户ID
      * @return 发布的动态对象
      */
     @PostMapping(consumes = "application/json")
-    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
+    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO, @RequestParam Long userId) {
         // 调用 Service 层处理发布动态业务逻辑
-        Post result = postService.createPost(postDTO);
+        Post result = postService.createPost(userId, postDTO);
         return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
     }
 

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

@@ -2,15 +2,12 @@ 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.PostFavorite;
 import com.bao.dating.pojo.entity.User;
 import com.bao.dating.service.PostFavoriteService;
 import com.bao.dating.service.PostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -34,11 +31,4 @@ public class PostFavoriteController {
         Long userId = user.getUserId();
         return postFavoriteService.deletePostFavorite(userId, postId);
     }
-    @GetMapping("/{user_id}/favorites")
-    public Result<List<Post>> getFavorites(@PathVariable("user_id")Long postId){
-        if (postId == null){
-            return Result.error(ResultCode.PARAM_ERROR);
-        }
-        return postFavoriteService.getAllFavoritePost(postId);
-    }
 }

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

@@ -24,25 +24,4 @@ public class UserController {
         UserLoginVO userloginVO = userService.userLogin(userLoginDTO);
         return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
     }
-
-    /**
-     * 用户注册
-     * @param userAccount 用户名称
-     * @param userPassword 用户密码
-     * @return 用户id
-     */
-    @PostMapping("/userRegister")
-    public Result userRegister(String userAccount, String userPassword){
-        long result = userService.userRegister(userAccount, userPassword);
-        if (result == -1){
-            return Result.error(ResultCode.SYSTEM_ERROR);
-        }
-        if (result==-2){
-            return Result.error(ResultCode.PARAM_ERROR);
-        }
-        if (result == -3){
-            return Result.error(ResultCode.FAIL,"用户名称相同");
-        }
-        return Result.success(ResultCode.SUCCESS,"注册成功",result);
-    }
 }

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

@@ -1,79 +0,0 @@
-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/PostFavoriteMapper.java

@@ -1,6 +1,5 @@
 package com.bao.dating.mapper;
 
-import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,5 +12,4 @@ public interface PostFavoriteMapper {
     List<Long> selectUserIDByPostID(@Param("postId") Long postId);
     int addPostFavorite(PostFavorite postFavorite);
     int deletePostFavorite(@Param("postId") Long postId);
-    List<Post> getAllPost(@Param("userId") Long userId);
 }

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

@@ -13,12 +13,4 @@ public interface UserMapper {
      * @return 用户
      */
     User getByUsername(String username);
-
-    /**
-     * 添加用户
-     * @param user 用户对象
-     * @return 受影响行数
-     */
-    Long insertUser(User user);
-    long getMaxUserId();
 }

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

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

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

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

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

@@ -10,5 +10,4 @@ public interface UserService {
      * @return 登录结果
      */
     UserLoginVO userLogin(UserLoginDTO userLoginDTO);
-    long userRegister(String userAccount, String userPassword);
 }

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

@@ -4,7 +4,6 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.mapper.PostFavoriteMapper;
 import com.bao.dating.mapper.PostMapper;
-import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import com.bao.dating.service.PostFavoriteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,10 +58,4 @@ public class PostFavoriteServiceImpl implements PostFavoriteService {
         postMapper.decreaseFavoriteCount(postId);
         return null;
     }
-
-    @Override
-    public Result<List<Post>> getAllFavoritePost(Long userId) {
-        List<Post> result = postFavoriteMapper.getAllPost(userId);
-        return Result.success(ResultCode.SUCCESS,"查询成功",result);
-    }
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -86,15 +85,15 @@ public class PostServiceImpl implements PostService {
     /**
      * 创建动态
      *
+     * @param userId 用户ID
      * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
     @Override
-    public Post createPost(PostRequestDTO postRequestDTO) {
+    public Post createPost(Long userId, PostRequestDTO postRequestDTO) {
 
         // 创建动态对象
         Post post = new Post();
-        Long userId = UserContext.getUserId();
         post.setUserId(userId);
         post.setContent(postRequestDTO.getContent());
         post.setTags(postRequestDTO.getTags());
@@ -166,20 +165,6 @@ 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);
     }
@@ -192,15 +177,11 @@ public class PostServiceImpl implements PostService {
      */
     @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;
@@ -219,11 +200,6 @@ public class PostServiceImpl implements PostService {
         if (post == null) {
             throw new RuntimeException("动态不存在");
         }
-        // 判断用户权限
-        Long userId = UserContext.getUserId();
-        if (post.getUserId() == null || !post.getUserId().equals(userId)){
-            throw new RuntimeException("无权限修改此动态");
-        }
         post.setContent(postRequestDTO.getContent());
         if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
             post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());

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

@@ -10,7 +10,8 @@ import com.bao.dating.util.MD5Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -29,12 +30,13 @@ public class UserServiceImpl implements UserService {
         if (user == null){
             throw new RuntimeException("用户不存在");
         }
-        // 密码校验
+        // 密码加密
         boolean match = MD5Util.verifyWithSalt(
                 userLoginDTO.getPassword(),
                 user.getSalt(),
                 user.getPasswordHash()
         );
+        // 密码校验
         if (!match){
             throw new RuntimeException("密码错误");
         }
@@ -47,38 +49,4 @@ public class UserServiceImpl implements UserService {
         userLoginVO.setToken(token);
         return userLoginVO;
     }
-
-    /**
-     * 用户注册
-     * @param userAccount 账户名称
-     * @param userPassword 密码
-     * @return 用户id
-     */
-    @Override
-    public long userRegister(String userAccount, String userPassword) {
-        //验证非空
-        if (userAccount.isEmpty() ||userPassword.isEmpty()){
-            return -2;
-        }
-        //校验账户不能重复
-        User resultUser = userMapper.getByUsername(userAccount);
-        if (resultUser!=null){
-            return -3;
-        }
-        //对密码进行加密
-        String encryptPassword = MD5Util.encryptWithSalt(userPassword, "yujian");
-        long maxUserId = userMapper.getMaxUserId();
-        User user = new User();
-        user.setUserId(maxUserId+1);
-        user.setUserName(userAccount);
-        user.setSalt("yujian");
-        user.setPasswordHash(encryptPassword);
-        user.setCreatedAt(LocalDateTime.now());
-        user.setUpdatedAt(LocalDateTime.now());
-        Long result = userMapper.insertUser(user);
-        if (result < 0){
-            return -1;
-        }
-        return user.getUserId();
-    }
 }

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

@@ -14,8 +14,4 @@
     <select id="selectUserIDByPostID" resultType="java.lang.Long">
         SELECT user_id FROM post_favorite WHERE post_id = #{postId}
     </select>
-    <!--查询用户收藏的所有动态-->
-    <select id="getAllPost" 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/UserMapper.xml

@@ -3,15 +3,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.bao.dating.mapper.UserMapper">
-    <insert id="insertUser" useGeneratedKeys="true" parameterType="com.bao.dating.pojo.entity.User">
-        insert into user(user_id,user_name,salt,password_hash,created_at,updated_at) values (#{userId},#{userName},#{salt},#{passwordHash},#{createdAt},#{updatedAt})
-    </insert>
 
      <select id="getByUsername" resultType="com.bao.dating.pojo.entity.User">
         SELECT * FROM user WHERE user_name = #{userName}
     </select>
-    <select id="getMaxUserId" resultType="java.lang.Long">
-        SELECT IFNULL(MAX(user_id), 0) AS max_id FROM user;
-    </select>
 
 </mapper>