修bug

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

@@ -4,9 +4,8 @@ import com.bao.dating.anno.Log;
 import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.context.UserContext;
-import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
-import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.dto.UserInfoDTO;
+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;
@@ -93,7 +92,7 @@ public class UserController {
      */
     @Log
     @PostMapping("/info/update")
-    public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
+    public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoDTO userInfoUpdateDTO) {
         Long userId = UserContext.getUserId();
         userInfoUpdateDTO.setUserId(userId);
         UserInfoVO userInfoVO =userService.updateUserInfo(userInfoUpdateDTO);

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

@@ -1,25 +0,0 @@
-package com.bao.dating.pojo.dto;
-
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 用户信息更新数据传输对象
- * @author KilLze
- */
-@Data
-public class UserInfoUpdateDTO {
-    private Long userId;
-    private String userName;
-    private String nickname;
-    private String avatarUrl;
-    private String backgroundUrl;
-    private Integer gender;
-    private LocalDate birthday;
-    private List<String> hobbies;
-    private String signature;
-    private LocalDateTime updatedAt;
-}

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

@@ -1,9 +1,7 @@
 package com.bao.dating.service;
 
 import com.bao.dating.pojo.dto.UserInfoDTO;
-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;
@@ -79,7 +77,6 @@ public interface UserService {
      * @return 用户
      */
     UserInfoDTO getUserInfoById(Long userId);
-    UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
 
     void sendSmsCode(String phone);
 

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

@@ -1,18 +1,14 @@
 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.aliyun.SmsUtil;
 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.UserInfoDTO;
-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;
@@ -28,6 +24,7 @@ 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.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -243,100 +240,13 @@ public class UserServiceImpl implements UserService {
     }
 
 
-    /**
-     * 更新用户信息
-     * @param userInfoUpdateDTO
-     * @return
-     */
-    @Override
-    public UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO) {
-        Long userId = userInfoUpdateDTO.getUserId();
-        User user = userMapper.selectByUserId(userId);
-        if (user == null) {
-            throw new RuntimeException("用户不存在");
-        }
-
-        // 将需要审核的内容合并成一个文本，用于减少调用次数
-        StringBuilder textBuilder = new StringBuilder();
-
-        if (userInfoUpdateDTO.getNickname() != null && !userInfoUpdateDTO.getNickname().isEmpty()) {
-            textBuilder.append(userInfoUpdateDTO.getNickname()).append(" ");
-        }
-        if (userInfoUpdateDTO.getHobbies() != null && !userInfoUpdateDTO.getHobbies().isEmpty()) {
-            // 将爱好列表转换为字符串，用空格分隔
-            String hobbiesStr = String.join(" ", userInfoUpdateDTO.getHobbies());
-            textBuilder.append(hobbiesStr).append(" ");
-        }
-        if (userInfoUpdateDTO.getSignature() != null && !userInfoUpdateDTO.getSignature().isEmpty()) {
-            textBuilder.append(userInfoUpdateDTO.getSignature()).append(" ");
-        }
-        // 文本审核
-        if (textBuilder.length() > 0) {
-            Map textResult;
-            try {
-                textResult = greenTextScan.greeTextScan(textBuilder.toString());
-            } catch (Exception e) {
-                throw new RuntimeException("用户信息文本审核失败");
-            }
-
-            String suggestion = (String) textResult.get("suggestion");
-
-            if (GreenAuditResult.BLOCK.equals(suggestion)) {
-                throw new RuntimeException("用户信息包含违规内容，修改失败");
-            }
-            if (GreenAuditResult.REVIEW.equals(suggestion)) {
-                throw new RuntimeException("用户信息需要人工审核，暂无法修改");
-            }
-        }
-
-        // 图片审核
-        List<String> imageKeys = new ArrayList<>();
-        if (userInfoUpdateDTO.getAvatarUrl() != null && !userInfoUpdateDTO.getAvatarUrl().isEmpty()) {
-            imageKeys.add(userInfoUpdateDTO.getAvatarUrl());
-        }
-        if (userInfoUpdateDTO.getBackgroundUrl() != null && !userInfoUpdateDTO.getBackgroundUrl().isEmpty()) {
-            imageKeys.add(userInfoUpdateDTO.getBackgroundUrl());
-        }
-        if (!imageKeys.isEmpty()) {
-            Map imageResult;
-            try {
-                imageResult = greenImageScan.imageScan(imageKeys);
-            } catch (Exception e) {
-                throw new RuntimeException("用户图片审核失败");
-            }
-
-            String suggestion = (String) imageResult.get("suggestion");
-
-            if (GreenAuditResult.BLOCK.equals(suggestion)) {
-                throw new RuntimeException("头像或背景图不合规，修改失败");
-            }
-            if (GreenAuditResult.REVIEW.equals(suggestion)) {
-                throw new RuntimeException("头像或背景图需要人工审核，暂无法修改");
-            }
-        }
-        // 默认昵称兜底
-        if (userInfoUpdateDTO.getNickname() == null || userInfoUpdateDTO.getNickname().trim().isEmpty()) {
-            userInfoUpdateDTO.setNickname(user.getUserName());
-        }
-        userInfoUpdateDTO.setUpdatedAt(LocalDateTime.now());
-
-        // 更新数据库
-        userMapper.updateUserInfoByUserId(userInfoUpdateDTO);
-
-        // 封装返回结果
-        User updatedUser = userMapper.selectByUserId(userInfoUpdateDTO.getUserId());
-        UserInfoVO userInfoVO = new UserInfoVO();
-        BeanUtils.copyProperties(updatedUser, userInfoVO);
-        return userInfoVO;
-    }
-
     /**
      * 更新用户信息
      *
      * @param userInfoUpdateDTO 用户信息更新参数
      */
     @Override
-    public UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO) {
+    public UserInfoVO updateUserInfo(UserInfoDTO userInfoUpdateDTO) {
         Long userId = userInfoUpdateDTO.getUserId();
         User user = userMapper.selectByUserId(userId);
         if (user == null) {
@@ -417,6 +327,7 @@ public class UserServiceImpl implements UserService {
         return userInfoVO;
     }
 
+
     /**
      * 用户注册
      * @param userName 用户名称
@@ -459,11 +370,13 @@ public class UserServiceImpl implements UserService {
     @Override
     public UserLoginVO emailLogin(String email, String code) {
         User user = userMapper.selectByUserEmailUser(email);
-        if (user == null)
+        if (user == null) {
             return null;
+        }
         boolean flag = verificationCodeService.verifyEmailCode(email, code);
-        if (!flag)
+        if (!flag) {
             return null;
+        }
         // 生成token
         String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
         UserLoginVO userLoginVO = new UserLoginVO();