merge: 合并feature-ip-location分支到feature/contacts-friends

pom.xml

@@ -26,11 +26,6 @@
             <version>3.5.10</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -61,12 +56,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <!-- JUnit Platform Launcher for resolving junit-platform-launcher:1.8.2 issue -->
         <dependency>
@@ -95,12 +84,6 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
-        <!-- WebSocket 起步依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-
        <!--   阿里云相关依赖     -->
         <dependency>
             <groupId>com.aliyun.oss</groupId>

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

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

src/main/java/com/bao/dating/anno/Log.java

@@ -1,11 +0,0 @@
-package com.bao.dating.anno;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Log {
-}

src/main/java/com/bao/dating/aspect/LoggingAspect.java

@@ -1,48 +0,0 @@
-package com.bao.dating.aspect;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.*;
-import org.springframework.stereotype.Component;
-
-/**
- * 日志切面
- * @author KilLze
- */
-@Aspect
-@Component
-@Slf4j
-public class LoggingAspect {
-    @Pointcut("execution(* com.bao.dating.service.impl.*.*(..))")
-    private void pt(){}
-
-    /**
-     * 方法执行前执行
-     * @param joinPoint 方法参数
-     */
-    @Before("pt()")
-    public void logBeforeMethod(JoinPoint joinPoint){
-        // 获取方法名
-        String methodName = joinPoint.getSignature().getName();
-        // 获取参数
-        Object[] args = joinPoint.getArgs();
-        log.info("方法 {} 开始执行，参数: {}", methodName, args);
-    }
-
-    /**
-     * 方法执行成功后执行
-     * @param joinPoint 方法参数
-     */
-    @AfterReturning(pointcut = "pt()", returning = "result")
-    public void logAfterMethod(JoinPoint joinPoint, Object result){
-        String methodName = joinPoint.getSignature().getName();
-        log.info("方法 {} 执行成功,返回值: {}", methodName, result);
-    }
-
-    @AfterThrowing(pointcut = "pt()", throwing = "exception")
-    public void logAfterThrowing(JoinPoint joinPoint, Exception exception){
-        String methodName = joinPoint.getSignature().getName();
-        log.error("方法 {} 执行异常", methodName, exception);
-    }
-}

src/main/java/com/bao/dating/aspect/OperateLogAspect.java

@@ -1,64 +0,0 @@
-package com.bao.dating.aspect;
-
-
-import com.bao.dating.context.UserContext;
-import com.bao.dating.mapper.OperateLogMapper;
-import com.bao.dating.pojo.entity.OperateLog;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-
-import java.time.LocalDateTime;
-import java.util.Arrays;
-
-/**
- * 记录操作日志
- * @author KilLze
- */
-@Slf4j
-@Aspect
-@Component
-public class OperateLogAspect {
-
-    @Autowired
-    private OperateLogMapper operateLogMapper;
-
-    @Around("@annotation(com.bao.dating.anno.Log)")
-    public Object logOperate(ProceedingJoinPoint pjp) throws Throwable{
-
-        // 记录方法开始的时间
-        long startTime = System.currentTimeMillis();
-
-        // 执行目标方法
-        Object result = pjp.proceed();
-
-        long endTime = System.currentTimeMillis();
-        long costTime = endTime - startTime;
-
-
-        // 构建日志对象
-        OperateLog operatelog = new OperateLog();
-        operatelog.setOperateUserId(getUserId());
-        operatelog.setOperateTime(LocalDateTime.now());
-        operatelog.setClassName(pjp.getTarget().getClass().getName());
-        operatelog.setMethodName(pjp.getSignature().getName());
-        operatelog.setMethodParams(Arrays.toString(pjp.getArgs()));
-        operatelog.setReturnValue(result != null ? result.toString() : "void");
-        operatelog.setCostTime(costTime);
-
-        log.info("记录操作日志: {}", operatelog);
-
-        operateLogMapper.insert(operatelog);
-
-        return result;
-    }
-
-    private Long getUserId() {
-        return UserContext.getUserId();
-    }
-
-}

src/main/java/com/bao/dating/aspect/RecordTimeAspect.java

@@ -0,0 +1,31 @@
+package com.bao.dating.aspect;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+/**
+ *  记录方法运行耗时
+ *   @author KilLze
+ */
+@Slf4j
+@Aspect
+@Component
+public class RecordTimeAspect {
+    @Around("execution(* com.bao.dating.service.impl.*.*(..))")
+    public Object recordTime(ProceedingJoinPoint pjp) throws Throwable {
+        //1. 记录方法运行的开始时间
+        long begin = System.currentTimeMillis();
+
+        //2. 执行原始的方法
+        Object result = pjp.proceed();
+
+        //3. 记录方法运行的结束时间, 记录耗时
+        long end = System.currentTimeMillis();
+        log.info("方法 {} 执行耗时: {}ms", pjp.getSignature() ,end-begin);
+        return  result;
+    }
+
+}

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

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

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

@@ -7,28 +7,23 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
-/**
- * Redis 配置类
- * @author KilLze
- */
 @Configuration
 public class RedisConfig {
+
     @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-        // 创建RedisTemplate对象
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-        // 设置redis的连接工厂对象
         redisTemplate.setConnectionFactory(redisConnectionFactory);
-
+        
-        // 设置redis key的序列化器
+        // 设置key的序列化器
         redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        
         // 设置value的序列化器
         redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
-        // 设置hash类型的key和value的序列化器
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
         redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
-
+        
         redisTemplate.afterPropertiesSet();
         return redisTemplate;
     }
-}
+}

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

@@ -1,7 +1,6 @@
 package com.bao.dating.controller;
 
 
-import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.pojo.dto.PostRequestDTO;
@@ -31,7 +30,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 +41,6 @@ public class PostController {
      * @param postDTO 动态信息
      * @return 发布的动态对象
      */
-    @Log
     @PostMapping( "/createPost")
     public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
@@ -57,11 +54,10 @@ public class PostController {
      * @param postIds 动态ID
      * @return 删除结果
      */
-    @Log
     @PostMapping("/deletePost")
     public Result<String> deleteById(@RequestBody List<Long> postIds){
         int deletedCount = postService.deletePostById(postIds);
-        return Result.success(ResultCode.SUCCESS_DELETE, "成功删除" + deletedCount + "条动态", null);
+        return Result.success(ResultCode.SUCCESS_DELETE, deletedCount > 0 ? "成功删除" : "删除失败，该动态不存在", null);
     }
 
     /**
@@ -69,7 +65,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);
@@ -81,7 +77,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/PostLikeController.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.mapper.PostLikeMapper;
 import com.bao.dating.service.PostLikeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/posts")

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

@@ -1,6 +1,5 @@
 package com.bao.dating.controller;
 
-import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.context.UserContext;
@@ -9,12 +8,10 @@ import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
-import io.jsonwebtoken.Jwt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * 用户接口
@@ -38,17 +35,6 @@ public class UserController {
         return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
     }
 
-    /**
-     * 退出登录
-     * 从请求头中获取token并将其加入黑名单
-     */
-    @PostMapping("/logout")
-    public Result<Void> logout(HttpServletRequest request) {
-        String token = request.getHeader("token");
-        userService.logout(token);
-        return Result.success(ResultCode.SUCCESS,"退出登录成功",null);
-    }
-
     /**
      * 获取用户信息
      * @return 用户信息
@@ -65,7 +51,6 @@ public class UserController {
      * @param file 头像文件
      * @return 上传后的文件URL列表
      */
-    @Log
     @PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
     public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadAvatar(file);
@@ -77,7 +62,6 @@ public class UserController {
      * @param file 背景文件
      * @return 上传后的文件URL列表
      */
-    @Log
     @PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
     public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadBackground(file);
@@ -89,7 +73,6 @@ public class UserController {
      * @param userInfoUpdateDTO 用户信息更新参数
      * @return 更新后的用户信息
      */
-    @Log
     @PostMapping("/info/update")
     public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
         Long userId = UserContext.getUserId();

src/main/java/com/bao/dating/handler/GlobalExceptionHandler.java

@@ -4,6 +4,7 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -14,7 +15,7 @@ import org.springframework.web.method.annotation.MethodArgumentTypeMismatchExcep
 import org.springframework.web.servlet.NoHandlerFoundException;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 全局异常处理器
@@ -31,12 +32,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public Result<String> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
         log.error("参数验证失败: {}", e.getMessage());
-        String msg = e.getBindingResult()
+        return Result.error(ResultCode.PARAM_ERROR, e.getBindingResult().getFieldError().getDefaultMessage());
-                .getFieldErrors()
-                .stream()
-                .map(error -> error.getField() + "：" + error.getDefaultMessage())
-                .collect(Collectors.joining("; "));
-        return Result.error(ResultCode.PARAM_ERROR, msg);
     }
 
     /**

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

@@ -5,10 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.bao.dating.context.UserContext;
 import com.bao.dating.util.JwtUtil;
-import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -21,10 +18,6 @@ import org.springframework.web.servlet.HandlerInterceptor;
 @Slf4j
 @Component
 public class TokenInterceptor implements HandlerInterceptor {
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
     /**
      * 在请求处理之前进行拦截
      * 从请求头或URL参数中获取token，验证其有效性，并将用户ID保存到ThreadLocal中
@@ -52,38 +45,13 @@ public class TokenInterceptor implements HandlerInterceptor {
             if (!JwtUtil.validateToken(token)) {
                 log.error("Token无效或已过期");
                 response.setStatus(401);
-                response.setContentType("application/json;charset=UTF-8");
-                response.getWriter().write("Token无效或已过期");
-                return false;
-            }
-
-            // 检查 token 是否在黑名单中
-            Object blacklistToken = redisTemplate.opsForValue().get("jwt:blacklist:" + token);
-            if (blacklistToken != null) {
-                log.error("Token已在黑名单中");
-                response.setStatus(401);
-                response.setContentType("application/json;charset=UTF-8");
-                response.getWriter().write("登录已失效, 请重新登录");
                 return false;
             }
             
             // 解析 token
             String userId = JwtUtil.getSubjectFromToken(token);
-
-            // 从Redis获取存储的token进行比对
-            Object redisTokenObj = redisTemplate.opsForValue().get("login:token:" + userId);
-            String redisToken = redisTokenObj != null ? redisTokenObj.toString() : null;
-
-            // 验证Redis中的token是否存在且匹配
-            if (redisToken == null || !redisToken.equals(token)) {
-                log.error("登录已失效");
-                response.setStatus(401);
-                response.setContentType("application/json;charset=UTF-8");
-                response.getWriter().write("登录已失效");
-                return false;
-            }
-
             log.info("用户: {}", userId);
+            
             // 保存 userId 到 ThreadLocal
             UserContext.setUserId(Long.valueOf(userId));
             return true;

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

@@ -18,11 +18,4 @@ public interface CommentsMapper {
     // 根据动态ID查询评论列表
     @Select("SELECT * FROM comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
     List<Comments> getCommentsByPostId(@Param("post_id") Long post_id);
-
-    /**
-     * 根据动态ID批量删除评论
-     * @param postIds
-     * @return
-     */
-    int deleteCommentsByPostIds(@Param("postIds") List<Long> postIds);
 }

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

@@ -1,19 +0,0 @@
-package com.bao.dating.mapper;
-
-
-import com.bao.dating.pojo.entity.OperateLog;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 操作日志Mapper
- * @author KilLze
- */
-@Mapper
-public interface OperateLogMapper {
-
-    @Insert("insert into operate_log (operate_user_id, operate_time, class_name, method_name, method_params, return_value, cost_time) " +
-            "values (#{operateUserId}, #{operateTime}, #{className}, #{methodName}, #{methodParams}, #{returnValue}, #{costTime});")
-    public void insert(OperateLog log);
-
-}

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

@@ -15,14 +15,6 @@ public interface PostFavoriteMapper {
     int addPostFavorite(PostFavorite postFavorite);
     //删除收藏
     int deletePostFavorite(@Param("postId") Long postId);
-
-    /**
-     * 批量删除收藏
-     * @param postIds
-     * @return
-     */
-    int deleteFavoritesByPostIds(@Param("postIds") List<Long> postIds);
-
     //查询用户所有收藏
     List<Post> showAllFavorites(@Param("userid")Long userid);
 }

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

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

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

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

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

@@ -2,7 +2,6 @@ package com.bao.dating.pojo.dto;
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -12,7 +11,7 @@ import java.util.List;
  * @author KilLze
  */
 @Data
-public class UserInfoUpdateDTO implements Serializable {
+public class UserInfoUpdateDTO {
     private Long userId;
     private String userName;
     private String nickname;

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

@@ -1,30 +0,0 @@
-package com.bao.dating.pojo.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 操作日志
- * @author KilLze
- */
-@Data
-public class OperateLog implements Serializable {
-    /** ID */
-    private Long id;
-    /** 操作人ID */
-    private Long operateUserId;
-    /** 操作时间 */
-    private LocalDateTime operateTime;
-    /** 操作类名 */
-    private String className;
-    /** 操作方法名 */
-    private String methodName;
-    /** 操作方法参数 */
-    private String methodParams;
-    /** 操作方法返回值 */
-    private String returnValue;
-    /** 操作耗时 */
-    private Long costTime;
-}

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

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

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

@@ -19,13 +19,6 @@ public interface UserService {
      */
     UserLoginVO userLogin(UserLoginDTO userLoginDTO);
 
-    /**
-     * 退出登录
-     * @param token 登录凭证
-     * @return 注册结果
-     */
-    void logout(String token);
-
     /**
      * 查询个人信息
      * @param userId 动态ID

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

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

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

@@ -7,7 +7,6 @@ import com.bao.dating.common.aliyun.GreenImageScan;
 import com.bao.dating.common.aliyun.GreenTextScan;
 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;
@@ -20,17 +19,17 @@ import com.bao.dating.service.VerificationCodeService;
 import com.bao.dating.util.FileUtil;
 import com.bao.dating.util.JwtUtil;
 import com.bao.dating.util.MD5Util;
-import io.jsonwebtoken.Claims;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * 用户服务实现类
@@ -49,9 +48,6 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private GreenImageScan greenImageScan;
 
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
     @Autowired
     private UserMapper userMapper;
 
@@ -86,15 +82,6 @@ public class UserServiceImpl implements UserService {
         }
         // 生成token
         String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
-
-        String redisKey = "login:token:" + user.getUserId();
-        redisTemplate.opsForValue().set(
-                redisKey,
-                token,
-                7,
-                TimeUnit.DAYS
-        );
-
         // 封装返回
         UserLoginVO userLoginVO = new UserLoginVO();
         userLoginVO.setUserId(user.getUserId());
@@ -103,29 +90,6 @@ public class UserServiceImpl implements UserService {
         return userLoginVO;
     }
 
-    /**
-     * 退出登录
-     * @param token 登录凭证
-     */
-    @Override
-    public void logout(String token) {
-        Claims claims = JwtUtil.getClaimsFromToken(token);
-        Date expiration = claims.getExpiration();
-        // 判断 token 是否已过期
-        long ttl = expiration.getTime() - System.currentTimeMillis();
-        // 如果 token 已过期，则不用处理
-        if (ttl <= 0) {
-            return;
-        }
-
-        String logoutKey = "jwt:blacklist:" + token;
-        redisTemplate.opsForValue().set(
-                logoutKey,
-                "logout",
-                ttl,
-                TimeUnit.MILLISECONDS);
-    }
-
     /**
      * 获取用户信息
      *

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

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

src/main/resources/application.yml

@@ -2,11 +2,6 @@ server:
   port: 8080
 
 spring:
-  mvc:
-    throw-exception-if-no-handler-found: true
-  web:
-    resources:
-      add-mappings: false
   datasource:
     url: jdbc:mysql://110.42.41.177:3306/dating?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: root

src/main/resources/ciallo.txt

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

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

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

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

@@ -14,16 +14,6 @@
     <select id="selectUserIDByPostID" resultType="java.lang.Long">
         SELECT user_id FROM post_favorite WHERE post_id = #{postId}
     </select>
-
-    <!--批量删除动态收藏-->
-    <delete id="deleteFavoritesByPostIds">
-        DELETE FROM post_favorite
-        WHERE post_id IN
-        <foreach collection="postIds" item="postId" open="(" close=")" separator=",">
-            #{postId}
-        </foreach>
-    </delete>
-
     <!-- 查询所有收藏动态 -->
     <select id="showAllFavorites" resultType="com.bao.dating.pojo.entity.Post">
         SELECT * FROM post WHERE post_id IN (SELECT post_id FROM post_favorite WHERE user_id = #{userid})

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

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

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

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