完成用户邮箱登录和获得ip地址

完成用户信息修改，以及用户信息审核

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,6 +71,13 @@
             <version>3.12.0</version>
         </dependency>
 
+        <!-- OkHttp（用于调用API） -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
+
         <!-- AOP起步依赖 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

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/ip2location/Ip2LocationConfig.java

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

src/main/java/com/bao/dating/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

@@ -29,7 +29,7 @@ public class WebConfig implements WebMvcConfigurer {
                 .addPathPatterns("/**")
                 // 忽略的接口
                 .excludePathPatterns(
-                        "/user/login"
+                        "/user/login","/user/register","/user/emailLogin","/ip/location"
                 );
     }
 }

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

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

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

@@ -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/PostFavoriteController.java

@@ -2,11 +2,13 @@ package com.bao.dating.controller;
 
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
+import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.User;
 import com.bao.dating.service.PostFavoriteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -14,6 +16,13 @@ import java.util.Map;
 public class PostFavoriteController {
     @Autowired
     private PostFavoriteService postFavoriteService;
+
+    /**
+     * 收藏
+     * @param postId 动态ID
+     * @param user 当前登录用户对象
+     * @return 结果
+     */
     @PostMapping("/{post_id}/favorites")
     public Result<Map<String,Long>> addPostFavorite(@PathVariable("post_id")Long postId, User user){
         if (user == null){
@@ -22,6 +31,13 @@ public class PostFavoriteController {
         Long userId = user.getUserId();
         return postFavoriteService.postFavorite(userId,postId);
     }
+
+    /**
+     * 取消收藏
+     * @param postId 动态id
+     * @param user 登录用户
+     * @return 结果
+     */
     @DeleteMapping("/{post_id}/favorites")
     public Result<?> deletePostFavorite(@PathVariable("post_id")Long postId, User user){
         if (user == null){
@@ -30,4 +46,21 @@ public class PostFavoriteController {
         Long userId = user.getUserId();
         return postFavoriteService.deletePostFavorite(userId, postId);
     }
+
+    /**
+     * 展示所有收藏
+     * @param user 当前登录用户
+     * @return 结果
+     */
+    @GetMapping("/showFavorites")
+    public Result<List<Post>> showPostFavorites(@RequestBody User user){
+        //校验参数
+        if (user == null){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long userId = user.getUserId();
+        List<Post> posts = postFavoriteService.selectAllFavorites(userId);
+        return Result.success(ResultCode.SUCCESS,posts);
+    }
+
 }

src/main/java/com/bao/dating/controller/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();
@@ -97,4 +80,42 @@ public class UserController {
         UserInfoVO userInfoVO =userService.updateUserInfo(userInfoUpdateDTO);
         return Result.success(ResultCode.SUCCESS, "用户信息更新成功", userInfoVO);
     }
+
+    /**
+     * 用户注册
+     * @param userName 用户名称
+     * @param userPassword 用户密码
+     * @return 返回
+     */
+    @PostMapping("/register")
+    public Result<?> userRegister(@RequestParam String userName , @RequestParam String userPassword){
+        //校验参数是否为空
+        if (userName.isEmpty() || userPassword.isEmpty()){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        if (!userService.registerUser(userName,userPassword)){
+            return Result.error(ResultCode.FAIL);
+        }
+        return Result.success(ResultCode.SUCCESS,"用户注册成功",null);
+    }
+
+    /**
+     * 通过邮箱登录
+     * @param email 邮箱
+     * @param code 验证码
+     * @return 用户信息
+     */
+    @PostMapping("/emailLogin")
+    public Result<UserLoginVO> emailLogin(@RequestParam String email , @RequestParam String code){
+        //校验参数是否为空
+        if (email.isEmpty() || code.isEmpty()){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        UserLoginVO userLoginVO = userService.emailLogin(email, code);
+        if (userLoginVO == null){
+            return Result.error(ResultCode.FAIL,"请先注册用户或添加邮箱");
+        }
+        return Result.success(ResultCode.SUCCESS,"用户登录成功",userLoginVO);
+    }
+
 }

src/main/java/com/bao/dating/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()
-                .getFieldErrors()
-                .stream()
-                .map(error -> error.getField() + "：" + error.getDefaultMessage())
-                .collect(Collectors.joining("; "));
-        return Result.error(ResultCode.PARAM_ERROR, msg);
+        return Result.error(ResultCode.PARAM_ERROR, e.getBindingResult().getFieldError().getDefaultMessage());
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.bao.dating.mapper;
 
+import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.PostFavorite;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,14 +11,10 @@ import java.util.List;
 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> 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,11 +21,11 @@ public interface PostMapper {
     void insert(Post post);
 
     /**
-     * 根据ID修改动态状态
+     * 根据ID删除动态
      *
      * @param postIds 动态ID
      */
-    int updatePublicById(@Param("postIds") List<Long> postIds,  @Param("userId") Long userId);
+    int deletePostByIds(List<Long> postIds);
 
     /**
      * 根据ID查询动态

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

@@ -3,6 +3,7 @@ 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;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户Mapper
@@ -33,4 +34,25 @@ public interface UserMapper {
      */
     void updateUserInfoByUserId(UserInfoUpdateDTO userInfoUpdateDTO);
 
+    /**
+     * 添加用户
+     * @param user 用户对象
+     * @return 受影响行数
+     */
+    int saveUser(User user);
+
+    /**
+     * 查询最大用户id
+     * @return 用户id
+     */
+    Long selectMaxId();
+
+    /**
+     * 根据邮箱查询用户
+     * @param email 用户邮箱
+     * @return 用户信息
+     */
+    User selectByUserEmailUser(@Param("userEmail") String email);
+
+
 }

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/pojo/vo/IpLocationVO.java

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package com.bao.dating.service;
 
 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 org.springframework.web.multipart.MultipartFile;
@@ -18,13 +19,6 @@ public interface UserService {
      */
     UserLoginVO userLogin(UserLoginDTO userLoginDTO);
 
-    /**
-     * 退出登录
-     * @param token 登录凭证
-     * @return 注册结果
-     */
-    void logout(String token);
-
     /**
      * 查询个人信息
      * @param userId 动态ID
@@ -52,4 +46,19 @@ public interface UserService {
      * @return 更新后的用户信息
      */
     UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
+
+    /**
+     * 用户注册
+     * @param userName 用户民称
+     * @return 用户信息
+     */
+    Boolean registerUser(String userName,String userPassword);
+
+    /**
+     * 邮箱登录
+     * @param email 邮箱
+     * @param code 验证码
+     * @return
+     */
+    UserLoginVO emailLogin(String email , String code);
 }

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

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

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

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

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

@@ -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,21 +188,19 @@ 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);
     }
 
     /**

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

@@ -1,11 +1,12 @@
 package com.bao.dating.service.impl;
 
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
 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;
@@ -14,20 +15,21 @@ import com.bao.dating.pojo.entity.User;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
+import com.bao.dating.service.VerificationCodeService;
 import com.bao.dating.util.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;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * 用户服务实现类
@@ -47,10 +49,10 @@ public class UserServiceImpl implements UserService {
     private GreenImageScan greenImageScan;
 
     @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
+    private UserMapper userMapper;
 
     @Autowired
-    private UserMapper userMapper;
+    private VerificationCodeService verificationCodeService;
 
     /**
      * 用户登录
@@ -80,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());
@@ -97,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);
-    }
-
     /**
      * 获取用户信息
      *
@@ -311,4 +281,59 @@ public class UserServiceImpl implements UserService {
         BeanUtils.copyProperties(updatedUser, userInfoVO);
         return userInfoVO;
     }
+
+    /**
+     * 查询用户
+     * @param userName 用户民称
+     * @return
+     */
+    @Override
+    public Boolean registerUser(String userName,String userPassword) {
+        //校验参数是否为空
+        if (userName.isEmpty() || userPassword.isEmpty()){
+            return false;
+        }
+        //产看数据库是否存在已注册用户
+        User user = userMapper.getByUsername(userName);
+        if (user != null){
+            return false;
+        }
+        //将用户数据存入苏数据库
+        String salt = "lyy123";
+        String passwordHash = MD5Util.encryptWithSalt(userPassword, salt);
+        //查询最大用户id
+        Long maxId = userMapper.selectMaxId();
+        User saveUser = new User();
+        saveUser.setUserId(maxId+1);
+        saveUser.setUserName(userName);
+        saveUser.setPasswordHash(passwordHash);
+        saveUser.setSalt(salt);
+        saveUser.setUpdatedAt(LocalDateTime.now());
+        saveUser.setCreatedAt(LocalDateTime.now());
+        int count = userMapper.saveUser(saveUser);
+        return count > 0;
+    }
+
+    /**
+     * 邮箱登录
+     * @param email 邮箱
+     * @param code 验证码
+     * @return 脱敏用户信息
+     */
+    @Override
+    public UserLoginVO emailLogin(String email, String code) {
+        User user = userMapper.selectByUserEmailUser(email);
+        if (user == null)
+            return null;
+        boolean flag = verificationCodeService.verifyEmailCode(email, code);
+        if (!flag)
+            return null;
+        // 生成token
+        String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
+        UserLoginVO userLoginVO = new UserLoginVO();
+        userLoginVO.setUserId(user.getUserId());
+        userLoginVO.setNickname(user.getNickname());
+        userLoginVO.setToken(token);
+        return userLoginVO;
+    }
 }

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
@@ -70,3 +65,11 @@ aliyun:
     region-id: cn-hangzhou
     sign-name: 速通互联验证码
     template-code: 100001
+
+# ip2location.io 相关配置
+ip2location:
+  api:
+    key: 95F4AB991174E296AFD5AD0EF927B2ED  # ip2location.io API密钥
+    url: https://api.ip2location.io/
+    timeout: 5000  # 请求超时时间（毫秒）
+

src/main/resources/com/bao/dating/mapper/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="showAllFavorites" resultType="com.bao.dating.pojo.entity.Post">
+        SELECT * FROM post WHERE post_id IN (SELECT post_id FROM post_favorite WHERE user_id = #{userid})
+    </select>
 </mapper>

src/main/resources/com/bao/dating/mapper/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">

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

@@ -3,6 +3,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.bao.dating.mapper.UserMapper">
+    <!-- 向数据库中添加用户 -->
+    <insert id="saveUser">
+        insert into user(user_id,user_name,password_hash,salt,created_at,updated_at) values (#{userId},#{userName},#{passwordHash},#{salt},#{createdAt},#{updatedAt})
+    </insert>
 
     <!--根据用户名查询用户-->
     <select id="getByUsername" resultType="com.bao.dating.pojo.entity.User">
@@ -45,6 +49,16 @@
             FROM user WHERE user_id = #{userId}
     </select>
 
+    <!-- 查询最大用户id -->
+    <select id="selectMaxId" resultType="java.lang.Long">
+        SELECT MAX(user_id) FROM user
+    </select>
+
+    <!-- 根据邮箱查询用户信息 -->
+    <select id="selectByUserEmailUser" resultType="com.bao.dating.pojo.entity.User">
+        select * from user where user_email = #{userEmail}
+    </select>
+
     <!--根据ID更新动态-->
     <update id="updateUserInfoByUserId">
         UPDATE user