完成用户注册和展示用户收藏

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

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>
@@ -82,12 +71,6 @@
             <version>3.12.0</version>
         </dependency>
 
-        <!-- AOP起步依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
        <!--   阿里云相关依赖     -->
         <dependency>
             <groupId>com.aliyun.oss</groupId>
@@ -159,12 +142,6 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
-        <!-- Redis 依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
     </dependencies>
     <dependencyManagement>
         <dependencies>

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/common/ResultCode.java

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

src/main/java/com/bao/dating/common/aliyun/AliOssUtil.java

@@ -4,17 +4,16 @@ import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.OSSException;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.io.ByteArrayInputStream;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
-/**
- * 阿里云OSS工具类
- * @author KilLze
- */
 @Data
 @Slf4j
 @Component

src/main/java/com/bao/dating/common/aliyun/SmsUtil.java

@@ -149,4 +149,3 @@ public class SmsUtil {
 
 
 
-

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

@@ -1,11 +0,0 @@
-package com.bao.dating.common.result;
-
-/**
- * 阿里云 OSS 文件上传结果
- * @author KilLze
- */
-public class AliOssResult {
-    public static final String IMAGE = "image";
-    public static final String VIDEO = "video";
-
-}

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

@@ -1,15 +0,0 @@
-package com.bao.dating.common.result;
-
-/**
- * 文件上传结果
- * @author KilLze
- */
-public class FileResult {
-    public static final String JPG = "jpg";
-    public static final String JPEG = "jpeg";
-    public static final String PNG = "png";
-    public static final String GIF = "gif";
-    public static final String MP4 = "mp4";
-    public static final String AVI = "avi";
-    public static final String MOV = "mov";
-}

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

@@ -1,11 +0,0 @@
-package com.bao.dating.common.result;
-
-/**
- * 阿里云敏感内容审核结果
- * @author KilLze
- */
-public class GreenAuditResult {
-    public static final String PASS = "pass";
-    public static final String REVIEW = "review";
-    public static final String BLOCK = "block";
-}

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

@@ -1,33 +0,0 @@
-package com.bao.dating.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-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的序列化器
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        // 设置value的序列化器
-        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
-        // 设置hash类型的key和value的序列化器
-        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-        redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
-
-        return redisTemplate;
-    }
-}

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

@@ -7,10 +7,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-/**
- * WebMvc配置类
- * @author KilLze
- */
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
@@ -29,7 +25,9 @@ public class WebConfig implements WebMvcConfigurer {
                 .addPathPatterns("/**")
                 // 忽略的接口
                 .excludePathPatterns(
-                        "/user/login"
+                        "/user/login",
+                        "/user/userRegister"
                 );
     }
 }
+

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

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

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;
@@ -14,11 +13,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-/**
- * 动态接口
- *
- * @author KilLze
- */
 @RestController
 @RequestMapping("/posts")
 public class PostController {
@@ -31,11 +25,10 @@ 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);
-        return Result.success(ResultCode.SUCCESS, "文件上传成功", fileUrls);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "文件上传成功", fileUrls);
     }
 
     /**
@@ -43,12 +36,11 @@ public class PostController {
      * @param postDTO 动态信息
      * @return 发布的动态对象
      */
-    @Log
-    @PostMapping( "/createPost")
+    @PostMapping(consumes = "application/json")
     public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
         Post result = postService.createPost(postDTO);
-        return Result.success(ResultCode.SUCCESS, "动态发布成功，等待审核。", result);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
     }
 
     /**
@@ -57,11 +49,10 @@ public class PostController {
      * @param postIds 动态ID
      * @return 删除结果
      */
-    @Log
-    @PostMapping("/deletePost")
-    public Result<String> deleteById(@RequestBody List<Long> postIds){
+    @DeleteMapping
+    public Result<String> deleteById(@RequestParam 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);
     }
 
     /**
@@ -81,10 +72,9 @@ public class PostController {
      * @param postRequestDTO 动态信息
      * @return 更新后的动态对象
      */
-    @Log
-    @PostMapping("/{postId}/updatePost")
+    @PutMapping("/{postId}")
     public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
         PostEditVO result = postService.updatePost(postId, postRequestDTO);
-        return Result.success(ResultCode.SUCCESS, "动态更新成功", result);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);
     }
 }

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

@@ -2,11 +2,15 @@ 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
@@ -30,4 +34,11 @@ 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/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,26 +1,13 @@
 package com.bao.dating.controller;
 
-import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
-import com.bao.dating.context.UserContext;
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.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;
-
-/**
- * 用户接口
- *
- * @author KilLze
- */
 @RestController
 @RequestMapping("/user")
 public class UserController {
@@ -39,62 +26,23 @@ public class UserController {
     }
 
     /**
-     * 退出登录
-     * 从请求头中获取token并将其加入黑名单
+     * 用户注册
+     * @param userAccount 用户名称
+     * @param userPassword 用户密码
+     * @return 用户id
      */
-    @PostMapping("/logout")
-    public Result<Void> logout(HttpServletRequest request) {
-        String token = request.getHeader("token");
-        userService.logout(token);
-        return Result.success(ResultCode.SUCCESS,"退出登录成功",null);
-    }
-
-    /**
-     * 获取用户信息
-     * @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列表
-     */
-    @Log
-    @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, "头像上传成功", fileUrl);
-    }
-
-    /**
-     * 上传背景接口
-     * @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);
-        return Result.success(ResultCode.SUCCESS, "背景上传成功", fileUrl);
-    }
-
-    /**
-     * 更新用户信息
-     * @param userInfoUpdateDTO 用户信息更新参数
-     * @return 更新后的用户信息
-     */
-    @Log
-    @PostMapping("/info/update")
-    public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
-        Long userId = UserContext.getUserId();
-        userInfoUpdateDTO.setUserId(userId);
-        UserInfoVO userInfoVO =userService.updateUserInfo(userInfoUpdateDTO);
-        return Result.success(ResultCode.SUCCESS, "用户信息更新成功", userInfoVO);
+    @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/controller/VerificationCodeController.java

@@ -1,90 +0,0 @@
-package com.bao.dating.controller;
-
-import com.bao.dating.common.Result;
-import com.bao.dating.common.ResultCode;
-import com.bao.dating.service.VerificationCodeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 验证码控制器
- * @author KilLze
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/verification")
-public class VerificationCodeController {
-
-    @Autowired
-    private VerificationCodeService verificationCodeService;
-
-    /**
-     * 发送邮箱验证码
-     * @param email 邮箱地址
-     * @return 结果
-     */
-    @PostMapping("/send-email-code")
-    public Result<String> sendEmailCode(@RequestParam String email) {
-        // 参数校验
-        if (!StringUtils.hasText(email)) {
-            return Result.error(ResultCode.PARAM_ERROR, "邮箱地址不能为空");
-        }
-        
-        // 简单的邮箱格式校验
-        if (!isValidEmail(email)) {
-            return Result.error(ResultCode.PARAM_ERROR, "邮箱格式不正确");
-        }
-        
-        // 发送验证码
-        boolean success = verificationCodeService.sendEmailCode(email);
-        
-        if (success) {
-            return Result.success(ResultCode.CODE_SENT, "验证码已发送到您的邮箱，请查收");
-        } else {
-            return Result.error(ResultCode.CODE_SEND_FAIL, "验证码发送失败，请稍后重试");
-        }
-    }
-
-    /**
-     * 验证邮箱验证码
-     * @param email 邮箱地址
-     * @param code 验证码
-     * @return 结果
-     */
-    @PostMapping("/verify-email-code")
-    public Result<String> verifyEmailCode(@RequestParam String email, @RequestParam String code) {
-        // 参数校验
-        if (!StringUtils.hasText(email)) {
-            return Result.error(ResultCode.PARAM_ERROR, "邮箱地址不能为空");
-        }
-        
-        if (!StringUtils.hasText(code)) {
-            return Result.error(ResultCode.PARAM_ERROR, "验证码不能为空");
-        }
-        
-        // 验证验证码
-        boolean success = verificationCodeService.verifyEmailCode(email, code);
-        
-        if (success) {
-            return Result.success(ResultCode.SUCCESS, "验证码验证成功");
-        } else {
-            return Result.error(ResultCode.CODE_ERROR, "验证码错误或已过期");
-        }
-    }
-
-    /**
-     * 简单的邮箱格式校验
-     * @param email 邮箱地址
-     * @return 是否有效
-     */
-    private boolean isValidEmail(String email) {
-        if (email == null || email.trim().isEmpty()) {
-            return false;
-        }
-        // 简单的邮箱格式校验：包含@和.
-        return email.contains("@") && email.contains(".") && email.length() > 5;
-    }
-}
-

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

@@ -1,113 +0,0 @@
-package com.bao.dating.handler;
-
-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.converter.HttpMessageNotReadableException;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-import org.springframework.web.servlet.NoHandlerFoundException;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.stream.Collectors;
-
-/**
- * 全局异常处理器
- * 统一处理控制器层抛出的异常
- * @author KilLze
- */
-@Slf4j
-@RestControllerAdvice
-public class GlobalExceptionHandler {
-
-    /**
-     * 处理参数验证失败异常
-     */
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Result<String> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
-        log.error("参数验证失败: {}", e.getMessage());
-        String msg = e.getBindingResult()
-                .getFieldErrors()
-                .stream()
-                .map(error -> error.getField() + "：" + error.getDefaultMessage())
-                .collect(Collectors.joining("; "));
-        return Result.error(ResultCode.PARAM_ERROR, msg);
-    }
-
-    /**
-     * 处理请求参数缺失异常
-     */
-    @ExceptionHandler(MissingServletRequestParameterException.class)
-    public Result<String> handleMissingServletRequestParameterException(MissingServletRequestParameterException e) {
-        log.error("请求参数缺失: 参数名={}, 参数类型={}", e.getParameterName(), e.getParameterType());
-        return Result.error(ResultCode.PARAM_ERROR, "缺少必需的请求参数: " + e.getParameterName());
-    }
-
-    /**
-     * 处理请求参数类型不匹配异常
-     */
-    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
-    public Result<String> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e) {
-        log.error("请求参数类型不匹配: {}", e.getMessage());
-        return Result.error(ResultCode.PARAM_ERROR, "请求参数类型错误: " + e.getName());
-    }
-
-    /**
-     * 处理请求体缺失或格式错误异常
-     */
-    @ExceptionHandler(HttpMessageNotReadableException.class)
-    public Result<String> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
-        log.error("请求体格式错误: {}", e.getMessage());
-        return Result.error(ResultCode.PARAM_ERROR, "请求体格式错误或缺失");
-    }
-
-    /**
-     * 处理不支持的HTTP请求方法异常
-     */
-    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
-    public Result<String> handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
-        log.error("不支持的HTTP请求方法: {}", e.getMethod());
-        return Result.error(ResultCode.PARAM_ERROR, "不支持的请求方法: " + e.getMethod());
-    }
-
-    /**
-     * 处理404异常
-     */
-    @ExceptionHandler(NoHandlerFoundException.class)
-    public Result<String> handleNoHandlerFoundException(HttpServletRequest request, NoHandlerFoundException e) {
-        log.error("请求的接口不存在: {} {}", request.getMethod(), request.getRequestURI());
-        return Result.error(ResultCode.NOT_FOUND, "请求的接口不存在");
-    }
-
-    /**
-     * 处理数据库唯一约束违反异常
-     */
-    @ExceptionHandler(DuplicateKeyException.class)
-    public Result<String> handleDuplicateKeyException(DuplicateKeyException e) {
-        log.error("数据库唯一约束违反: {}", e.getMessage());
-        return Result.error(ResultCode.FAIL, "数据已存在，操作失败");
-    }
-
-    /**
-     * 处理运行时异常
-     */
-    @ExceptionHandler(RuntimeException.class)
-    public Result<String> handleRuntimeException(RuntimeException e) {
-        log.error("运行时异常: ", e);
-        return Result.error(ResultCode.SYSTEM_ERROR, e.getMessage());
-    }
-
-    /**
-     * 处理通用异常
-     */
-    @ExceptionHandler(Exception.class)
-    public Result<String> handleException(HttpServletRequest request, Exception e) {
-        log.error("系统异常 [{} {}]: ", request.getMethod(), request.getRequestURI(), e);
-        return Result.error(ResultCode.SYSTEM_ERROR, "系统内部错误");
-    }
-}

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

@@ -1,69 +0,0 @@
-package com.bao.dating.handler;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.type.MappedJdbcTypes;
-import org.apache.ibatis.type.MappedTypes;
-import org.apache.ibatis.type.TypeHandler;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-
-/**
- * List类型转换成JSON类型
- * @author KilLze
- */
-@MappedJdbcTypes(JdbcType.VARCHAR)
-@MappedTypes(List.class)
-public class ListToJsonTypeHandler implements TypeHandler<List<String>> {
-
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-    @Override
-    public void setParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
-        if (parameter == null || parameter.isEmpty()) {
-            ps.setNull(i, java.sql.Types.VARCHAR); // 或者 Types.JSON 如果数据库支持
-            return;
-        }
-        try {
-            String json = OBJECT_MAPPER.writeValueAsString(parameter);
-            ps.setString(i, json);
-        } catch (JsonProcessingException e) {
-            throw new SQLException("Error converting list to JSON", e);
-        }
-    }
-
-    @Override
-    public List<String> getResult(ResultSet rs, String columnName) throws SQLException {
-        String json = rs.getString(columnName);
-        return convertJsonToList(json);
-    }
-
-    @Override
-    public List<String> getResult(ResultSet rs, int columnIndex) throws SQLException {
-        String json = rs.getString(columnIndex);
-        return convertJsonToList(json);
-    }
-
-    @Override
-    public List<String> getResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
-        String json = cs.getString(columnIndex);
-        return convertJsonToList(json);
-    }
-
-    private List<String> convertJsonToList(String json) throws SQLException {
-        if (json == null || json.isEmpty()) {
-            return null;
-        }
-        try {
-            return OBJECT_MAPPER.readValue(json, new TypeReference<List<String>>() {});
-        } catch (JsonProcessingException e) {
-            throw new SQLException("Error converting JSON to list", e);
-        }
-    }
-}

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

@@ -6,7 +6,10 @@ import org.apache.ibatis.type.MappedJdbcTypes;
 import org.apache.ibatis.type.MappedTypes;
 import org.apache.ibatis.type.TypeHandler;
 
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -19,11 +22,6 @@ import java.util.List;
 public class ListToVarcharTypeHandler implements TypeHandler<List<String>> {
     @Override
     public void setParameter(PreparedStatement preparedStatement, int i, List<String> strings, JdbcType jdbcType) throws SQLException {
-        // 允许 null
-        if (strings == null || strings.isEmpty()) {
-            preparedStatement.setNull(i, Types.VARCHAR);
-            return;
-        }
         // 遍历List类型的入参，拼装为String类型，使用Statement对象插入数据库
         StringBuffer sb = new StringBuffer();
         for (int j = 0; j < strings.size(); j++) {

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

@@ -7,8 +7,6 @@ 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;
@@ -16,15 +14,10 @@ import org.springframework.web.servlet.HandlerInterceptor;
 /**
  * HttpToken拦截器类
  * 用于拦截请求并验证JWT token的有效性，同时从token中解析用户信息
- * @author KilLze
  */
 @Slf4j
 @Component
 public class TokenInterceptor implements HandlerInterceptor {
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
     /**
      * 在请求处理之前进行拦截
      * 从请求头或URL参数中获取token，验证其有效性，并将用户ID保存到ThreadLocal中
@@ -50,40 +43,15 @@ public class TokenInterceptor implements HandlerInterceptor {
             
             // 验证 token 是否有效（包括是否过期）
             if (!JwtUtil.validateToken(token)) {
-                log.error("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

@@ -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;
@@ -12,12 +13,5 @@ public interface PostFavoriteMapper {
     List<Long> selectUserIDByPostID(@Param("postId") Long postId);
     int addPostFavorite(PostFavorite postFavorite);
     int deletePostFavorite(@Param("postId") Long postId);
-
-    /**
-     * 批量删除收藏
-     * @param postIds
-     * @return
-     */
-    int deleteFavoritesByPostIds(@Param("postIds") List<Long> postIds);
-
+    List<Post> getAllPost(@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

@@ -6,47 +6,43 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-/**
- * 动态Mapper
- *
- * @author KilLze lanyangyang-yzx
- */
 @Mapper
 public interface PostMapper {
     /**
      * 插入动态
      *
-     * @param post 动态
+     * @param post
      */
     void insert(Post post);
 
     /**
-     * 根据ID修改动态状态
+     * 根据ID删除动态
      *
      * @param postIds 动态ID
      */
-    int updatePublicById(@Param("postIds") List<Long> postIds,  @Param("userId") Long userId);
+    int deletePostByIds(@Param("postIds") List<Long> postIds);
 
     /**
      * 根据ID查询动态
      *
-     * @param postId 动态ID
-     * @return 动态
+     * @param postId
+     * @return
      */
-    Post selectById(Long postId);
+    Post selectById(@Param("postId") Long postId);
 
     /**
      * 根据ID更新动态
      *
-     * @param post 动态
+     * @param post
+     * @return
      */
     void updateById(Post post);
 
     /**
      * 查询点赞数
      *
-     * @param postId 动态ID
-     * @return 点赞数
+     * @param postId
+     * @return
      */
     int selectLikeCount(Long postId);
 
@@ -76,8 +72,8 @@ public interface PostMapper {
     /**
      * 查询点赞数
      *
-     * @param postId 动态ID
-     * @return 点赞数
+     * @param postId
+     * @return
      */
     int selectFavoriteCount(Long postId);
 

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

@@ -1,13 +1,8 @@
 package com.bao.dating.mapper;
 
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.entity.User;
 import org.apache.ibatis.annotations.Mapper;
 
-/**
- * 用户Mapper
- * @author KilLze
- */
 @Mapper
 public interface UserMapper {
 
@@ -20,17 +15,10 @@ public interface UserMapper {
     User getByUsername(String username);
 
     /**
-     * 根据用户id查询用户信息
-     *
-     * @param userid 用户id
-     * @return 用户
+     * 添加用户
+     * @param user 用户对象
+     * @return 受影响行数
      */
-    User selectByUserId(Long userid);
-
-    /**
-     * 更新用户信息
-     * @param userInfoUpdateDTO 用户信息更新参数
-     */
-    void updateUserInfoByUserId(UserInfoUpdateDTO userInfoUpdateDTO);
-
+    Long insertUser(User user);
+    long getMaxUserId();
 }

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

@@ -7,10 +7,9 @@ import java.util.List;
 
 /**
  * 动态数据传输对象
- * @author KilLze
  */
 @Data
-public class PostRequestDTO implements Serializable{
+public class PostRequestDTO implements Serializable {
     private String content;
     private List<String> mediaOssKeys;
     private List<String> tags;

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

@@ -1,26 +0,0 @@
-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;
-
-/**
- * 用户信息更新数据传输对象
- * @author KilLze
- */
-@Data
-public class UserInfoUpdateDTO implements Serializable {
-    private Long userId;
-    private String userName;
-    private String nickname;
-    private String avatarUrl;
-    private String backgroundUrl;
-    private Integer gender;
-    private LocalDate birthday;
-    private List<String> hobbies;
-    private String signature;
-    private LocalDateTime updatedAt;
-}

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

@@ -6,7 +6,6 @@ import java.io.Serializable;
 
 /**
  * 用户登录数据传输对象
- * @author KilLze
  */
 @Data
 public class UserLoginDTO implements Serializable {

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/pojo/entity/User.java

@@ -5,7 +5,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 用户表
@@ -32,7 +31,7 @@ public class User implements Serializable {
 
     private LocalDate birthday;
 
-    private List<String> hobbies;
+    private String hobbies;
 
     private String signature;
 

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

@@ -8,7 +8,6 @@ import java.util.List;
 
 /**
  * 修改内容查询返回数据
- * @author KilLze
  */
 @Data
 public class PostEditVO implements Serializable {

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

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

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

@@ -5,7 +5,6 @@ import java.io.Serializable;
 
 /**
  * 登录返回数据
- * @author KilLze
  */
 @Data
 public class UserLoginVO implements Serializable {

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);
+    Result<List<Post>> getAllFavoritePost(Long userId);
 }

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

@@ -7,10 +7,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-/**
- * 动态服务
- * @author bao KilLze lanyangyang-yzx yang
- */
 public interface PostService {
     /**
      * 上传媒体文件
@@ -27,7 +23,7 @@ public interface PostService {
     Post createPost(PostRequestDTO postRequestDTO);
 
     /**
-     * 批量删除动态（将动态状态改为已删除）
+     * 批量删除动态
      * @param postIds 动态ID
      * @return 删除的动态对象
      */
@@ -37,7 +33,6 @@ public interface PostService {
     /**
      * 查询动态详情（用于编辑）
      * @param postId 动态ID
-     * @return 动态详情
      */
     PostEditVO getPostForEdit(Long postId);
 

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

@@ -1,15 +1,8 @@
 package com.bao.dating.service;
 
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
-import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
-import org.springframework.web.multipart.MultipartFile;
 
-/**
- * 用户服务接口
- * @author KilLze
- */
 public interface UserService {
     /**
      * 登录
@@ -17,39 +10,5 @@ public interface UserService {
      * @return 登录结果
      */
     UserLoginVO userLogin(UserLoginDTO userLoginDTO);
-
-    /**
-     * 退出登录
-     * @param token 登录凭证
-     * @return 注册结果
-     */
-    void logout(String token);
-
-    /**
-     * 查询个人信息
-     * @param userId 动态ID
-     * @return 个人信息
-     */
-    UserInfoVO getUserInfo(Long userId);
-
-    /**
-     * 上传头像
-     * @param file 头像文件
-     * @return 上传后的文件URL列表
-     */
-    String uploadAvatar(MultipartFile file);
-
-    /**
-     * 上传背景
-     * @param file 背景文件
-     * @return 上传后的文件URL列表
-     */
-    String uploadBackground(MultipartFile file);
-
-    /**
-     * 更新用户信息
-     * @param userInfoUpdateDTO 用户信息
-     * @return 更新后的用户信息
-     */
-    UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
+    long userRegister(String userAccount, String userPassword);
 }

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

@@ -1,31 +0,0 @@
-package com.bao.dating.service;
-
-/**
- * 验证码服务接口
- * @author KilLze
- */
-public interface VerificationCodeService {
-    
-    /**
-     * 发送邮箱验证码
-     * @param email 邮箱地址
-     * @return 是否发送成功
-     */
-    boolean sendEmailCode(String email);
-    
-    /**
-     * 验证邮箱验证码
-     * @param email 邮箱地址
-     * @param code 验证码
-     * @return 是否验证成功
-     */
-    boolean verifyEmailCode(String email, String code);
-    
-    /**
-     * 生成验证码
-     * @param length 验证码长度（默认6位）
-     * @return 验证码字符串
-     */
-    String generateCode(int length);
-}
-

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,10 @@ 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,36 +2,33 @@ package com.bao.dating.service.impl;
 
 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;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * 动态服务实现类
  *
- * @author KilLze yang
+ * @author KilLze
  */
 @Service
 public class PostServiceImpl implements PostService {
@@ -48,15 +45,6 @@ public class PostServiceImpl implements PostService {
     @Autowired
     private PostMapper postMapper;
 
-    @Autowired
-    private PostLikeMapper postLikeMapper;
-
-    @Autowired
-    private PostFavoriteMapper postFavoriteMapper;
-
-    @Autowired
-    private CommentsMapper commentsMapper;
-
     /**
      * 上传媒体文件
      * @param files 媒体文件数组
@@ -64,55 +52,34 @@ 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 == 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;
-
+                if (!file.isEmpty()) {
                     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 = ossUtil.upload(fileBytes, fileName);
-                        if (ossUrl == null || ossUrl.isEmpty()) {
-                            throw new RuntimeException("文件上传失败：" + originalFilename);
+                        // 根据文件类型处理
+                        String ossUrl = "";
+                        if ("image".equals(fileType) || "video".equals(fileType)) {
+                            // 上传图片或视频
+                            ossUrl = ossUtil.upload(fileBytes, fileName);
                         }
                         // 添加上传后的 URL
                         mediaUrls.add(ossUrl);
                     } catch (IOException e) {
-                        // 统一异常处理
-                        throw new RuntimeException("上传媒体文件失败：" + originalFilename, e);
+                        e.printStackTrace();
                     }
                 }
+            }
+        }
         return mediaUrls;
     }
 
@@ -159,10 +126,10 @@ public class PostServiceImpl implements PostService {
             String imageSuggestion = (String) imageResult.get("suggestion");
 
             // 根据审核结果设置状态
-            if (GreenAuditResult.BLOCK.equals(textSuggestion) || GreenAuditResult.BLOCK.equals(imageSuggestion)) {
+            if ("block".equals(textSuggestion) || "block".equals(imageSuggestion)) {
                 // 审核未通过，允许用户修改
                 post.setIsPublic(2);
-            } else if (GreenAuditResult.REVIEW.equals(textSuggestion) || GreenAuditResult.REVIEW.equals(imageSuggestion)) {
+            } else if ("review".equals(textSuggestion) || "review".equals(imageSuggestion)) {
                 // 待审核，需人工审核
                 post.setIsPublic(1);
             } else {
@@ -171,10 +138,10 @@ public class PostServiceImpl implements PostService {
             }
         } else {
             // 只有文本内容的情况
-            if (GreenAuditResult.BLOCK.equals(textSuggestion)) {
+            if ("block".equals(textSuggestion)) {
                 // 审核未通过，允许用户修改
                 post.setIsPublic(2);
-            } else if (GreenAuditResult.REVIEW.equals(textSuggestion)) {
+            } else if ("review".equals(textSuggestion)) {
                 // 待审核，需人工审核
                 post.setIsPublic(1);
             } else {
@@ -191,7 +158,7 @@ public class PostServiceImpl implements PostService {
     }
 
     /**
-     * 批量删除动态（将动态状态改为已删除）
+     * 批量删除动态
      *
      * @param postIds 动态ID
      * @return 删除的动态对象
@@ -202,28 +169,26 @@ public class PostServiceImpl implements PostService {
         // 判断用户权限
         Long userId = UserContext.getUserId();
 
-        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) {
-            throw new RuntimeException("未删除任何动态，可能无权限或动态不存在");
-        }
-
-        // 删除动态下的评论、点赞、收藏
-        commentsMapper.deleteCommentsByPostIds(postIds);
-        postLikeMapper.deleteLikesByPostIds(postIds);
-        postFavoriteMapper.deleteFavoritesByPostIds(postIds);
-
-        return affected;
+        // 批量删除动态
+        return postMapper.deletePostByIds(postIds);
     }
 
     /**
      * 查询动态详情（用于编辑）
      *
      * @param postId 动态ID
-     * @return 动态详情
+     * @return
      */
     @Override
     public PostEditVO getPostForEdit(Long postId) {
@@ -245,7 +210,7 @@ public class PostServiceImpl implements PostService {
      * 修改动态
      * @param postId 动态ID
      * @param postRequestDTO 修改的动态数据传输对象
-     * @return 修改的动态对象
+     * @return
      */
     @Override
     public PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO) {
@@ -260,8 +225,9 @@ public class PostServiceImpl implements PostService {
             throw new RuntimeException("无权限修改此动态");
         }
         post.setContent(postRequestDTO.getContent());
-        // 如果请求中的mediaOssKeys不为null（即使是空列表），则更新为新值
-        post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
+            post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
+        }
 
         // 1. 文本内容审核
         Map textResult;
@@ -273,11 +239,11 @@ public class PostServiceImpl implements PostService {
         // 文本审核结果
         String textSuggestion = (String) textResult.get("suggestion");
 
-        // 2. 图片审核（如果有媒体文件）
-        if (post.getMediaOssKeys() != null && !post.getMediaOssKeys().isEmpty()) {
+        // 2. 图片审核（如果有）
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
             Map imageResult;
             try {
-                imageResult = greenImageScan.imageScan(post.getMediaOssKeys());
+                imageResult = greenImageScan.imageScan(postRequestDTO.getMediaOssKeys());
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -285,10 +251,10 @@ public class PostServiceImpl implements PostService {
             String imageSuggestion = (String) imageResult.get("suggestion");
 
             // 根据审核结果设置状态
-            if (GreenAuditResult.BLOCK.equals(textSuggestion) || GreenAuditResult.BLOCK.equals(imageSuggestion)) {
+            if ("block".equals(textSuggestion) || "block".equals(imageSuggestion)) {
                 // 审核未通过，允许用户修改
                 post.setIsPublic(2);
-            } else if (GreenAuditResult.REVIEW.equals(textSuggestion) || GreenAuditResult.REVIEW.equals(imageSuggestion)) {
+            } else if ("review".equals(textSuggestion) || "review".equals(imageSuggestion)) {
                 // 待审核，需人工审核
                 post.setIsPublic(1);
             } else {
@@ -297,10 +263,10 @@ public class PostServiceImpl implements PostService {
             }
         } else {
             // 只有文本内容的情况
-            if (GreenAuditResult.BLOCK.equals(textSuggestion)) {
+            if ("block".equals(textSuggestion)) {
                 // 审核未通过，允许用户修改
                 post.setIsPublic(2);
-            } else if (GreenAuditResult.REVIEW.equals(textSuggestion)) {
+            } else if ("review".equals(textSuggestion)) {
                 // 待审核，需人工审核
                 post.setIsPublic(1);
             } else {

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

@@ -1,63 +1,23 @@
 package com.bao.dating.service.impl;
 
-import com.bao.dating.common.aliyun.AliOssUtil;
-import com.bao.dating.common.aliyun.GreenImageScan;
-import com.bao.dating.common.aliyun.GreenTextScan;
-import com.bao.dating.common.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.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 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.concurrent.TimeUnit;
 
-/**
- * 用户服务实现类
- *
- * @author KilLze
- */
 @Service
 public class UserServiceImpl implements UserService {
 
-    @Autowired
-    private AliOssUtil ossUtil;
-
-    @Autowired
-    private GreenTextScan greenTextScan;
-
-    @Autowired
-    private GreenImageScan greenImageScan;
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
     @Autowired
     private UserMapper userMapper;
 
-    /**
-     * 用户登录
-     *
-     * @param userLoginDTO 登录参数
-     * @return 登录信息
-     */
     @Override
     public UserLoginVO userLogin(UserLoginDTO userLoginDTO) {
         // 参数校验
@@ -66,7 +26,7 @@ public class UserServiceImpl implements UserService {
         }
         // 查询用户
         User user = userMapper.getByUsername(userLoginDTO.getUsername());
-        if (user == null) {
+        if (user == null){
             throw new RuntimeException("用户不存在");
         }
         // 密码校验
@@ -75,20 +35,11 @@ public class UserServiceImpl implements UserService {
                 user.getSalt(),
                 user.getPasswordHash()
         );
-        if (!match) {
+        if (!match){
             throw new RuntimeException("密码错误");
         }
         // 生成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());
@@ -98,217 +49,36 @@ public class UserServiceImpl implements UserService {
     }
 
     /**
-     * 退出登录
-     * @param token 登录凭证
+     * 用户注册
+     * @param userAccount 账户名称
+     * @param userPassword 密码
+     * @return 用户id
      */
     @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;
+    public long userRegister(String userAccount, String userPassword) {
+        //验证非空
+        if (userAccount.isEmpty() ||userPassword.isEmpty()){
+            return -2;
         }
-
-        String logoutKey = "jwt:blacklist:" + token;
-        redisTemplate.opsForValue().set(
-                logoutKey,
-                "logout",
-                ttl,
-                TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @param userId 用户ID
-     * @return 用户信息
-     */
-    @Override
-    public UserInfoVO getUserInfo(Long userId) {
-        User user = userMapper.selectByUserId(userId);
-        if (user == null) {
-            throw new RuntimeException("用户不存在");
+        //校验账户不能重复
+        User resultUser = userMapper.getByUsername(userAccount);
+        if (resultUser!=null){
+            return -3;
         }
-        UserInfoVO userInfoVO = new UserInfoVO();
-        BeanUtils.copyProperties(user, userInfoVO);
-        return userInfoVO;
-    }
-
-    /**
-     * 上传头像接口
-     *
-     * @param file 头像文件
-     * @return 上传后的文件URL
-     */
-    @Override
-    public String uploadAvatar(MultipartFile file) {
-        // 参数校验
-        if (file == null || file.isEmpty()) {
-            throw new RuntimeException("图片不存在");
+        //对密码进行加密
+        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;
         }
-
-        String originalFilename = file.getOriginalFilename();
-        if (originalFilename == null) {
-            throw new RuntimeException("文件名非法");
-        }
-
-        String fileType = FileUtil.getFileType(originalFilename);
-        if (!AliOssResult.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 + "/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);
-        }
-    }
-
-    /**
-     * 上传背景图片
-     *
-     * @param file 背景图片文件
-     * @return 上传后的文件URL
-     */
-    @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 (!AliOssResult.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);
-        }
-    }
-
-    /**
-     * 更新用户信息
-     *
-     * @param userInfoUpdateDTO 用户信息更新参数
-     */
-    @Override
-    public UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO) {
-        Long userId = userInfoUpdateDTO.getUserId();
-        User user = userMapper.selectByUserId(userId);
-        if (user == null) {
-            throw new RuntimeException("用户不存在");
-        }
-
-        // 将需要审核的内容合并成一个文本，用于减少调用次数
-        StringBuilder textBuilder = new StringBuilder();
-
-        if (userInfoUpdateDTO.getNickname() != null && !userInfoUpdateDTO.getNickname().isEmpty()) {
-            textBuilder.append(userInfoUpdateDTO.getNickname()).append(" ");
-        }
-        if (userInfoUpdateDTO.getHobbies() != null && !userInfoUpdateDTO.getHobbies().isEmpty()) {
-            // 将爱好列表转换为字符串，用空格分隔
-            String hobbiesStr = String.join(" ", userInfoUpdateDTO.getHobbies());
-            textBuilder.append(hobbiesStr).append(" ");
-        }
-        if (userInfoUpdateDTO.getSignature() != null && !userInfoUpdateDTO.getSignature().isEmpty()) {
-            textBuilder.append(userInfoUpdateDTO.getSignature()).append(" ");
-        }
-        // 文本审核
-        if (textBuilder.length() > 0) {
-            Map textResult;
-            try {
-                textResult = greenTextScan.greeTextScan(textBuilder.toString());
-            } catch (Exception e) {
-                throw new RuntimeException("用户信息文本审核失败");
-            }
-
-            String suggestion = (String) textResult.get("suggestion");
-
-            if (GreenAuditResult.BLOCK.equals(suggestion)) {
-                throw new RuntimeException("用户信息包含违规内容，修改失败");
-            }
-            if (GreenAuditResult.REVIEW.equals(suggestion)) {
-                throw new RuntimeException("用户信息需要人工审核，暂无法修改");
-            }
-        }
-
-        // 图片审核
-        List<String> imageKeys = new ArrayList<>();
-        if (userInfoUpdateDTO.getAvatarUrl() != null && !userInfoUpdateDTO.getAvatarUrl().isEmpty()) {
-            imageKeys.add(userInfoUpdateDTO.getAvatarUrl());
-        }
-        if (userInfoUpdateDTO.getBackgroundUrl() != null && !userInfoUpdateDTO.getBackgroundUrl().isEmpty()) {
-            imageKeys.add(userInfoUpdateDTO.getBackgroundUrl());
-        }
-        if (!imageKeys.isEmpty()) {
-            Map imageResult;
-            try {
-                imageResult = greenImageScan.imageScan(imageKeys);
-            } catch (Exception e) {
-                throw new RuntimeException("用户图片审核失败");
-            }
-
-            String suggestion = (String) imageResult.get("suggestion");
-
-            if (GreenAuditResult.BLOCK.equals(suggestion)) {
-                throw new RuntimeException("头像或背景图不合规，修改失败");
-            }
-            if (GreenAuditResult.REVIEW.equals(suggestion)) {
-                throw new RuntimeException("头像或背景图需要人工审核，暂无法修改");
-            }
-        }
-        // 默认昵称兜底
-        if (userInfoUpdateDTO.getNickname() == null || userInfoUpdateDTO.getNickname().trim().isEmpty()) {
-            userInfoUpdateDTO.setNickname(user.getUserName());
-        }
-        userInfoUpdateDTO.setUpdatedAt(LocalDateTime.now());
-
-        // 更新数据库
-        userMapper.updateUserInfoByUserId(userInfoUpdateDTO);
-
-        // 封装返回结果
-        User updatedUser = userMapper.selectByUserId(userInfoUpdateDTO.getUserId());
-        UserInfoVO userInfoVO = new UserInfoVO();
-        BeanUtils.copyProperties(updatedUser, userInfoVO);
-        return userInfoVO;
+        return user.getUserId();
     }
 }

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

@@ -1,122 +0,0 @@
-package com.bao.dating.service.impl;
-
-import com.bao.dating.service.VerificationCodeService;
-import com.bao.dating.util.EmailUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 验证码服务实现类
- * @author KilLze
- */
-@Slf4j
-@Service
-public class VerificationCodeServiceImpl implements VerificationCodeService {
-
-    @Autowired
-    private EmailUtil emailUtil;
-
-    @Autowired
-    private StringRedisTemplate redisTemplate;
-
-    /**
-     * Redis中验证码的key前缀
-     */
-    private static final String CODE_KEY_PREFIX = "email:code:";
-
-    /**
-     * 验证码过期时间（分钟）
-     */
-    private static final long CODE_EXPIRE_MINUTES = 10;
-
-    /**
-     * 验证码长度
-     */
-    private static final int CODE_LENGTH = 6;
-
-    /**
-     * 发送邮箱验证码
-     * @param email 邮箱地址
-     * @return 是否发送成功
-     */
-    @Override
-    public boolean sendEmailCode(String email) {
-        try {
-            // 生成验证码
-            String code = generateCode(CODE_LENGTH);
-            
-            // 存储到Redis，设置过期时间
-            String key = CODE_KEY_PREFIX + email;
-            redisTemplate.opsForValue().set(key, code, CODE_EXPIRE_MINUTES, TimeUnit.MINUTES);
-            
-            // 发送邮件
-            boolean sendResult = emailUtil.sendVerificationCode(email, code);
-            
-            if (sendResult) {
-                log.info("邮箱验证码发送成功，邮箱：{}，验证码：{}", email, code);
-                return true;
-            } else {
-                // 如果发送失败，删除Redis中的验证码
-                redisTemplate.delete(key);
-                log.error("邮箱验证码发送失败，邮箱：{}", email);
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("发送邮箱验证码异常，邮箱：{}，异常信息：{}", email, e.getMessage(), e);
-            return false;
-        }
-    }
-
-    /**
-     * 验证邮箱验证码
-     * @param email 邮箱地址
-     * @param code 验证码
-     * @return 是否验证成功
-     */
-    @Override
-    public boolean verifyEmailCode(String email, String code) {
-        try {
-            String key = CODE_KEY_PREFIX + email;
-            String storedCode = redisTemplate.opsForValue().get(key);
-            
-            if (storedCode == null) {
-                log.warn("验证码不存在或已过期，邮箱：{}", email);
-                return false;
-            }
-            
-            if (storedCode.equals(code)) {
-                // 验证成功后，删除验证码（防止重复使用）
-                redisTemplate.delete(key);
-                log.info("邮箱验证码验证成功，邮箱：{}", email);
-                return true;
-            } else {
-                log.warn("邮箱验证码错误，邮箱：{}，输入的验证码：{}，正确的验证码：{}", email, code, storedCode);
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("验证邮箱验证码异常，邮箱：{}，异常信息：{}", email, e.getMessage(), e);
-            return false;
-        }
-    }
-
-    /**
-     * 生成验证码
-     * @param length 验证码长度
-     * @return 验证码字符串
-     */
-    @Override
-    public String generateCode(int length) {
-        Random random = new Random();
-        StringBuilder code = new StringBuilder();
-        for (int i = 0; i < length; i++) {
-            code.append(random.nextInt(10)); // 生成0-9的随机数字
-        }
-        return code.toString();
-    }
-}
-

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

@@ -1,7 +1,5 @@
 package com.bao.dating.util;
 
-import com.bao.dating.common.result.FileResult;
-
 /**
  * 文件工具类
  * @author KilLze
@@ -15,9 +13,9 @@ public class FileUtil {
     public static String getFileType(String fileUrl) {
         String extension = getFileExtension(fileUrl);
 
-        if (FileResult.JPG.equals(extension) || FileResult.JPEG.equals(extension) || FileResult.PNG.equals(extension) || FileResult.GIF.equals(extension)) {
+        if (extension.equals("jpg") || extension.equals("jpeg") || extension.equals("png") || extension.equals("gif")) {
             return "image";
-        } else if (FileResult.MP4.equals(extension) || FileResult.AVI.equals(extension) || FileResult.MOV.equals(extension)) {
+        } else if (extension.equals("mp4") || extension.equals("avi") || extension.equals("mov")) {
             return "video";
         }
         return "unknown";

src/main/resources/application.yml

@@ -2,19 +2,14 @@ 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
     password: JoyeeServe2025
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
-    host: 110.42.41.177
-    port: 6389
+    host: 127.0.0.1
+    port: 6379
     password: ""
     database: 0
     timeout: 10000

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,14 +14,8 @@
     <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="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/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,19 +28,25 @@
          #{isPublic}, 0, 0, #{createdAt}, #{updatedAt})
     </insert>
 
-    <!--修改动态状态-->
-    <update id="updatePublicById">
-        UPDATE post
-        <set>
-            is_public = 3,
-            updated_at = NOW()
-        </set>
-        WHERE post_id IN
+    <!--动态删除-->
+    <delete id="deletePostByIds">
+        DELETE FROM post WHERE post_id IN
         <foreach item="postId" index="index" collection="postIds" separator="," open="(" close=")">
             #{postId}
         </foreach>
-        AND user_id = #{userId}
-    </update>
+    </delete>
+    <!--删除收藏记录-->
+    <delete id="1">
+        DELETE FROM post_favorite WHERE post_id = #{postId}
+    </delete>
+    <!--删除点赞记录-->
+    <delete id="2">
+        DELETE FROM post_like WHERE post_id = #{postId}
+    </delete>
+    <!--动态评论删除-->
+    <delete id="3">
+        DELETE FROM comments WHERE post_id = #{postId}
+    </delete>
 
     <!--动态查询-->
     <resultMap id="PostResultMap" type="com.bao.dating.pojo.entity.Post">
@@ -76,10 +82,10 @@
     <update id="updateById">
         UPDATE post
         <set>
-            <if test="content != null and content != '' ">
+            <if test="content != null">
                 content = #{content},
             </if>
-            <if test="tags != null and tags != '' ">
+            <if test="tags != null">
                 tags = #{tags, typeHandler=com.bao.dating.handler.ListToVarcharTypeHandler},
             </if>
             <if test="mediaOssKeys != null">

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

@@ -3,75 +3,15 @@
         "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
-            user_id,
-            user_name,
-            password_hash,
-            salt,
-            nickname
-        FROM user WHERE user_name = #{userName}
+        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>
 
-    <!--根据用户id查询用户信息-->
-    <resultMap id="UserResultMap" type="com.bao.dating.pojo.entity.User">
-        <id property="userId" column="user_id"/>
-        <result property="userName" column="user_name"/>
-        <result property="nickname" column="nickname"/>
-        <result property="avatarUrl" column="avatar_url"/>
-        <result property="backgroundUrl" column="background_url"/>
-        <result property="gender" column="gender"/>
-        <result property="birthday" column="birthday"/>
-        <result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToJsonTypeHandler"/>
-        <result property="signature" column="signature"/>
-        <result property="createdAt" column="created_at"/>
-        <result property="updatedAt" column="updated_at"/>
-    </resultMap>
-    <select id="selectByUserId" resultMap="UserResultMap">
-        SELECT
-            user_id,
-            user_name,
-            nickname,
-            avatar_url,
-            background_url,
-            gender,
-            birthday,
-            hobbies,
-            signature,
-            created_at,
-            updated_at
-            FROM user WHERE user_id = #{userId}
-    </select>
-
-    <!--根据ID更新动态-->
-    <update id="updateUserInfoByUserId">
-        UPDATE user
-        <set>
-            <if test="nickname != null">
-                nickname = #{nickname},
-            </if>
-            <if test="avatarUrl != null">
-                avatar_url = #{avatarUrl},
-            </if>
-            <if test="backgroundUrl != null">
-                background_url = #{backgroundUrl},
-            </if>
-            <if test="gender != null">
-                gender = #{gender},
-            </if>
-            <if test="birthday != null">
-                birthday = #{birthday},
-            </if>
-            <if test="hobbies != null">
-                hobbies = #{hobbies, typeHandler=com.bao.dating.handler.ListToJsonTypeHandler},
-            </if>
-            <if test="signature != null">
-                signature = #{signature},
-            </if>
-            updated_at = #{updatedAt}
-        </set>
-        WHERE user_id = #{userId}
-    </update>
 </mapper>

src/test/java/com/bao/dating/common/aliyun/OssUploadTest.java

@@ -1,304 +0,0 @@
-package com.bao.dating.common.aliyun;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.UUID;
-
-/**
- * OSS图片上传测试类
- * @author KilLze
- */
-@SpringBootTest
-public class OssUploadTest {
-
-    @Autowired
-    private AliOssUtil aliOssUtil;
-
-    /**
-     * 测试上传本地图片文件
-     */
-    @Test
-    public void testUploadLocalImage() {
-        try {
-            // 本地图片文件路径（请修改为实际存在的图片路径）
-            String localImagePath = "D:/image/image.jpg"; // 请修改为实际路径
-            
-            File imageFile = new File(localImagePath);
-            if (!imageFile.exists()) {
-                System.out.println("图片文件不存在: " + localImagePath);
-                System.out.println("请修改localImagePath为实际存在的图片路径");
-                return;
-            }
-
-            // 读取文件字节
-            byte[] imageBytes = Files.readAllBytes(Paths.get(localImagePath));
-            
-            // 生成OSS对象名称（使用时间戳和UUID确保唯一性）
-            String objectName = generateObjectName("test", "jpg");
-            
-            // 上传到OSS
-            String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-            
-            System.out.println("========== 本地图片上传测试 ==========");
-            System.out.println("本地文件路径: " + localImagePath);
-            System.out.println("文件大小: " + imageBytes.length + " 字节");
-            System.out.println("OSS对象名称: " + objectName);
-            System.out.println("文件访问URL: " + fileUrl);
-            System.out.println("上传结果: 成功");
-            System.out.println("=====================================");
-            
-        } catch (IOException e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 测试从网络URL下载图片并上传到OSS
-     */
-    @Test
-    public void testUploadImageFromUrl() {
-        try {
-            // 网络图片URL（请修改为实际的图片URL）
-            String imageUrl = "https://example.com/image.jpg"; // 请修改为实际URL
-            
-            System.out.println("========== 网络图片上传测试 ==========");
-            System.out.println("开始下载图片: " + imageUrl);
-            
-            // 从URL下载图片
-            URL url = new URL(imageUrl);
-            try (InputStream inputStream = url.openStream()) {
-                byte[] imageBytes = readAllBytes(inputStream);
-                
-                // 从URL中提取文件扩展名
-                String extension = getFileExtensionFromUrl(imageUrl);
-                if (extension.isEmpty()) {
-                    extension = "jpg"; // 默认扩展名
-                }
-                
-                // 生成OSS对象名称
-                String objectName = generateObjectName("download", extension);
-                
-                // 上传到OSS
-                String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-                
-                System.out.println("图片下载成功");
-                System.out.println("文件大小: " + imageBytes.length + " 字节");
-                System.out.println("OSS对象名称: " + objectName);
-                System.out.println("文件访问URL: " + fileUrl);
-                System.out.println("上传结果: 成功");
-            }
-            
-            System.out.println("=====================================");
-            
-        } catch (Exception e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 测试上传不同格式的图片
-     */
-    @Test
-    public void testUploadDifferentImageFormats() {
-        String[] imagePaths = {
-            "D:/test/image1.jpg",   // 请修改为实际路径
-            "D:/test/image2.png",   // 请修改为实际路径
-            "D:/test/image3.gif"    // 请修改为实际路径
-        };
-        
-        System.out.println("========== 多格式图片上传测试 ==========");
-        
-        for (String imagePath : imagePaths) {
-            try {
-                File imageFile = new File(imagePath);
-                if (!imageFile.exists()) {
-                    System.out.println("跳过不存在的文件: " + imagePath);
-                    continue;
-                }
-                
-                // 读取文件
-                byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
-                
-                // 获取文件扩展名
-                String extension = getFileExtension(imagePath);
-                
-                // 生成OSS对象名称
-                String objectName = generateObjectName("format-test", extension);
-                
-                // 上传
-                String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-                
-                System.out.println("\n文件: " + imagePath);
-                System.out.println("格式: " + extension);
-                System.out.println("大小: " + imageBytes.length + " 字节");
-                System.out.println("URL: " + fileUrl);
-                System.out.println("状态: 成功");
-                
-            } catch (Exception e) {
-                System.out.println("\n文件: " + imagePath);
-                System.out.println("状态: 失败 - " + e.getMessage());
-            }
-        }
-        
-        System.out.println("\n=====================================");
-    }
-
-    /**
-     * 测试上传图片到指定目录
-     */
-    @Test
-    public void testUploadImageToDirectory() {
-        try {
-            // 本地图片文件路径
-            String localImagePath = "D:/test/image.jpg"; // 请修改为实际路径
-            
-            File imageFile = new File(localImagePath);
-            if (!imageFile.exists()) {
-                System.out.println("图片文件不存在: " + localImagePath);
-                return;
-            }
-            
-            // 读取文件
-            byte[] imageBytes = Files.readAllBytes(Paths.get(localImagePath));
-            
-            // 上传到指定目录（例如：images/2025/12/24/xxx.jpg）
-            String directory = "images/" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
-            String fileName = UUID.randomUUID().toString() + ".jpg";
-            String objectName = directory + "/" + fileName;
-            
-            // 上传
-            String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-            
-            System.out.println("========== 目录上传测试 ==========");
-            System.out.println("目录: " + directory);
-            System.out.println("文件名: " + fileName);
-            System.out.println("完整路径: " + objectName);
-            System.out.println("文件访问URL: " + fileUrl);
-            System.out.println("上传结果: 成功");
-            System.out.println("=================================");
-            
-        } catch (Exception e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 测试使用FileInputStream上传
-     */
-    @Test
-    public void testUploadWithFileInputStream() {
-        try {
-            // 本地图片文件路径
-            String localImagePath = "D:/test/image.jpg"; // 请修改为实际路径
-            
-            File imageFile = new File(localImagePath);
-            if (!imageFile.exists()) {
-                System.out.println("图片文件不存在: " + localImagePath);
-                return;
-            }
-            
-            // 使用FileInputStream读取文件
-            try (FileInputStream fis = new FileInputStream(imageFile)) {
-                byte[] imageBytes = new byte[(int) imageFile.length()];
-                fis.read(imageBytes);
-                
-                // 生成OSS对象名称
-                String objectName = generateObjectName("stream", "jpg");
-                
-                // 上传
-                String fileUrl = aliOssUtil.upload(imageBytes, objectName);
-                
-                System.out.println("========== FileInputStream上传测试 ==========");
-                System.out.println("文件路径: " + localImagePath);
-                System.out.println("文件大小: " + imageBytes.length + " 字节");
-                System.out.println("OSS对象名称: " + objectName);
-                System.out.println("文件访问URL: " + fileUrl);
-                System.out.println("上传结果: 成功");
-                System.out.println("===========================================");
-            }
-            
-        } catch (Exception e) {
-            System.out.println("上传失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 生成OSS对象名称
-     * @param prefix 前缀
-     * @param extension 文件扩展名
-     * @return 对象名称
-     */
-    private String generateObjectName(String prefix, String extension) {
-        // 格式: prefix/yyyyMMdd/HHmmss-uuid.extension
-        String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd/HHmmss"));
-        String uuid = UUID.randomUUID().toString().substring(0, 8);
-        return String.format("%s/%s-%s.%s", prefix, dateTime, uuid, extension);
-    }
-
-    /**
-     * 从文件路径获取扩展名
-     * @param filePath 文件路径
-     * @return 扩展名
-     */
-    private String getFileExtension(String filePath) {
-        int lastDot = filePath.lastIndexOf('.');
-        if (lastDot > 0 && lastDot < filePath.length() - 1) {
-            return filePath.substring(lastDot + 1).toLowerCase();
-        }
-        return "jpg"; // 默认扩展名
-    }
-
-    /**
-     * 从URL获取文件扩展名
-     * @param url URL地址
-     * @return 扩展名
-     */
-    private String getFileExtensionFromUrl(String url) {
-        try {
-            // 移除查询参数
-            String path = url.split("\\?")[0];
-            int lastDot = path.lastIndexOf('.');
-            int lastSlash = path.lastIndexOf('/');
-            
-            if (lastDot > lastSlash && lastDot < path.length() - 1) {
-                return path.substring(lastDot + 1).toLowerCase();
-            }
-        } catch (Exception e) {
-            // 忽略异常
-        }
-        return "jpg"; // 默认扩展名
-    }
-
-    /**
-     * 从InputStream读取所有字节（兼容方法）
-     * @param inputStream 输入流
-     * @return 字节数组
-     * @throws IOException IO异常
-     */
-    private byte[] readAllBytes(InputStream inputStream) throws IOException {
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        byte[] data = new byte[8192]; // 8KB缓冲区
-        int nRead;
-        while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
-            buffer.write(data, 0, nRead);
-        }
-        return buffer.toByteArray();
-    }
-}
-

src/test/java/com/bao/dating/service/VerificationCodeServiceTest.java

@@ -1,91 +0,0 @@
-package com.bao.dating.service;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * 验证码服务测试类
- * @author KilLze
- */
-@SpringBootTest
-public class VerificationCodeServiceTest {
-
-    @Autowired
-    private VerificationCodeService verificationCodeService;
-
-    /**
-     * 测试发送邮箱验证码
-     */
-    @Test
-    public void testSendEmailCode() {
-        String email = "test@example.com"; // 请修改为实际邮箱地址
-        
-        System.out.println("========== 发送邮箱验证码测试 ==========");
-        System.out.println("邮箱地址: " + email);
-        
-        boolean result = verificationCodeService.sendEmailCode(email);
-        
-        System.out.println("发送结果: " + (result ? "成功" : "失败"));
-        System.out.println("=====================================");
-    }
-
-    /**
-     * 测试验证邮箱验证码
-     */
-    @Test
-    public void testVerifyEmailCode() {
-        String email = "test@example.com"; // 请修改为实际邮箱地址
-        String code = "123456"; // 请修改为实际收到的验证码
-        
-        System.out.println("========== 验证邮箱验证码测试 ==========");
-        System.out.println("邮箱地址: " + email);
-        System.out.println("验证码: " + code);
-        
-        boolean result = verificationCodeService.verifyEmailCode(email, code);
-        
-        System.out.println("验证结果: " + (result ? "成功" : "失败"));
-        System.out.println("=====================================");
-    }
-
-    /**
-     * 测试完整流程：发送验证码 -> 验证验证码
-     */
-    @Test
-    public void testCompleteFlow() {
-        String email = "test@example.com"; // 请修改为实际邮箱地址
-        
-        System.out.println("========== 完整流程测试 ==========");
-        System.out.println("邮箱地址: " + email);
-        
-        // 1. 发送验证码
-        System.out.println("\n1. 发送验证码...");
-        boolean sendResult = verificationCodeService.sendEmailCode(email);
-        System.out.println("发送结果: " + (sendResult ? "成功" : "失败"));
-        
-        if (sendResult) {
-            // 2. 等待用户输入验证码（这里模拟，实际应该从控制台或API获取）
-            System.out.println("\n2. 请查看邮箱获取验证码，然后手动测试验证功能");
-            System.out.println("   使用 testVerifyEmailCode() 方法进行验证");
-        }
-        
-        System.out.println("\n=====================================");
-    }
-
-    /**
-     * 测试生成验证码
-     */
-    @Test
-    public void testGenerateCode() {
-        System.out.println("========== 生成验证码测试 ==========");
-        
-        // 测试不同长度的验证码
-        for (int length = 4; length <= 8; length++) {
-            String code = verificationCodeService.generateCode(length);
-            System.out.println(length + "位验证码: " + code);
-        }
-        
-        System.out.println("=====================================");
-    }
-}
-

src/test/java/com/bao/dating/util/EmailAndSmsTest.java

@@ -75,4 +75,3 @@ public class EmailAndSmsTest {
 
 
 
-