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

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

pom.xml

@@ -71,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>
@@ -148,6 +155,12 @@
             <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/OperateLogAspect.java

@@ -1,62 +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.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-
-@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

@@ -19,6 +19,14 @@ public enum ResultCode {
     FORBIDDEN(403, "无权限"),
     /** 数据不存在 */
     NOT_FOUND(404, "数据不存在"),
+    /** 验证码已发送 */
+    CODE_SENT(200, "验证码已发送"),
+    /** 验证码错误 */
+    CODE_ERROR(400, "验证码错误"),
+    /** 验证码已过期 */
+    CODE_EXPIRED(400, "验证码已过期"),
+    /** 验证码发送失败 */
+    CODE_SEND_FAIL(500, "验证码发送失败"),
     /** 系统异常 */
     SYSTEM_ERROR(500, "系统异常"),
     /** 操作失败 */

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

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

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/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,7 +54,6 @@ public class PostController {
      * @param postIds 动态ID
      * @return 删除结果
      */
-    @Log
     @PostMapping("/deletePost")
     public Result<String> deleteById(@RequestBody List<Long> postIds){
         int deletedCount = postService.deletePostById(postIds);
@@ -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,12 +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 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
@@ -15,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){
@@ -23,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){
@@ -31,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/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;
@@ -13,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+
 /**
  * 用户接口
  *
@@ -51,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);
@@ -63,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);
@@ -75,7 +73,6 @@ public class UserController {
      * @param userInfoUpdateDTO 用户信息更新参数
      * @return 更新后的用户信息
      */
-    @Log
     @PostMapping("/info/update")
     public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
         Long userId = UserContext.getUserId();
@@ -83,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/controller/VerificationCodeController.java

@@ -0,0 +1,90 @@
+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/interceptor/TokenInterceptor.java

@@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.bao.dating.context.UserContext;
 import com.bao.dating.util.JwtUtil;
-import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
@@ -51,8 +50,8 @@ public class TokenInterceptor implements HandlerInterceptor {
             
             // 解析 token
             String userId = JwtUtil.getSubjectFromToken(token);
-
             log.info("用户: {}", userId);
+            
             // 保存 userId 到 ThreadLocal
             UserContext.setUserId(Long.valueOf(userId));
             return true;

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,6 +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);
+    //查询用户所有收藏
+    List<Post> showAllFavorites(@Param("userid")Long userid);
 }

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

@@ -1,28 +0,0 @@
-package com.bao.dating.pojo.entity;
-
-import lombok.Data;
-import java.time.LocalDateTime;
-
-/**
- * 操作日志
- * @author KilLze
- */
-@Data
-public class OperateLog {
-    /** 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/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;
@@ -45,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/VerificationCodeService.java

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

@@ -1,5 +1,7 @@
 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;
@@ -13,6 +15,7 @@ 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;
@@ -48,6 +51,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private VerificationCodeService verificationCodeService;
+
     /**
      * 用户登录
      *
@@ -275,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/java/com/bao/dating/service/impl/VerificationCodeServiceImpl.java

@@ -0,0 +1,122 @@
+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/resources/application.yml

@@ -8,8 +8,8 @@ spring:
     password: JoyeeServe2025
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
-    host: 127.0.0.1
+    host: 110.42.41.177
-    port: 6379
+    port: 6389
     password: ""
     database: 0
     timeout: 10000
@@ -65,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/PostFavoriteMapper.xml

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

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

@@ -0,0 +1,304 @@
+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

@@ -0,0 +1,91 @@
+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,3 +75,4 @@ public class EmailAndSmsTest {
 
 
 
+