修bug

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

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

@@ -28,7 +28,7 @@ public class PostController {
     @PostMapping(value = "/upload", consumes = "multipart/form-data")
     public Result<List<String>> uploadMedia(@RequestParam("files") MultipartFile[] files) {
         List<String> fileUrls = postService.uploadMedia(files);
-        return Result.success(ResultCode.SUCCESS_REVIEW, "文件上传成功", fileUrls);
+        return Result.success(ResultCode.SUCCESS, "文件上传成功", fileUrls);
     }
 
     /**
@@ -40,7 +40,7 @@ public class PostController {
     public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
         // 调用 Service 层处理发布动态业务逻辑
         Post result = postService.createPost(postDTO);
-        return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
+        return Result.success(ResultCode.SUCCESS, "动态发布成功，等待审核。", result);
     }
 
     /**
@@ -75,6 +75,6 @@ public class PostController {
     @PostMapping("/{postId}/updatePost")
     public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
         PostEditVO result = postService.updatePost(postId, postRequestDTO);
-        return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);
+        return Result.success(ResultCode.SUCCESS, "动态更新成功", result);
     }
 }

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

@@ -3,6 +3,7 @@ package com.bao.dating.controller;
 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.entity.User;
 import com.bao.dating.pojo.vo.UserInfoVO;
@@ -50,7 +51,7 @@ public class UserController {
     @PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
     public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadAvatar(file);
-        return Result.success(ResultCode.SUCCESS_REVIEW, "头像上传成功", fileUrl);
+        return Result.success(ResultCode.SUCCESS, "头像上传成功", fileUrl);
     }
 
     /**
@@ -61,6 +62,19 @@ public class UserController {
     @PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
     public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
         String fileUrl = userService.uploadBackground(file);
-        return Result.success(ResultCode.SUCCESS_REVIEW, "背景上传成功", fileUrl);
+        return Result.success(ResultCode.SUCCESS, "背景上传成功", fileUrl);
+    }
+
+    /**
+     * 更新用户信息
+     * @param userInfoUpdateDTO 用户信息更新参数
+     * @return 更新后的用户信息
+     */
+    @PostMapping("/info/update")
+    public Result userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
+        Long userId = UserContext.getUserId();
+        userInfoUpdateDTO.setUserId(userId);
+        userService.updateUserInfo(userInfoUpdateDTO);
+        return Result.success(ResultCode.SUCCESS, "用户信息更新成功", null);
     }
 }

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

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

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

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

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

@@ -1,8 +1,9 @@
 package com.bao.dating.mapper;
 
+import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
+import com.bao.dating.pojo.entity.Post;
 import com.bao.dating.pojo.entity.User;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface UserMapper {
@@ -22,4 +23,11 @@ public interface UserMapper {
      * @return 用户
      */
     User selectByUserId(Long userid);
+
+    /**
+     * 更新用户信息
+     * @param userInfoUpdateDTO
+     */
+    void updateUserInfoByUserId(UserInfoUpdateDTO userInfoUpdateDTO);
+
 }

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

@@ -0,0 +1,20 @@
+package com.bao.dating.pojo.dto;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class UserInfoUpdateDTO {
+    private Long userId;
+    private String nickname;
+    private String avatarUrl;
+    private String backgroundUrl;
+    private Integer gender;
+    private LocalDate birthday;
+    private List<String> hobbies;
+    private String signature;
+    private LocalDateTime updatedAt;
+}

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

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

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

@@ -19,6 +19,6 @@ public class UserInfoVO {
     private LocalDate birthday;
     private List<String> hobbies;
     private String signature;
-    private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
+    private LocalDateTime createdAt;
 }

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

@@ -1,5 +1,6 @@
 package com.bao.dating.service;
 
+import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.pojo.vo.UserInfoVO;
@@ -35,4 +36,10 @@ public interface UserService {
      * @return 上传后的文件URL列表
      */
     String uploadBackground(MultipartFile file);
+
+    /**
+     * 更新用户信息
+     * @param userInfoUpdateDTO 用户信息
+     */
+    void updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
 }

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

@@ -1,10 +1,14 @@
 package com.bao.dating.service.impl;
 
 import com.bao.dating.common.aliyun.AliOssUtil;
+import com.bao.dating.common.aliyun.GreenImageScan;
+import com.bao.dating.common.aliyun.GreenTextScan;
 import com.bao.dating.context.UserContext;
 import com.bao.dating.mapper.UserMapper;
+import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
 import com.bao.dating.pojo.dto.UserLoginDTO;
 import com.bao.dating.pojo.entity.User;
+import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.pojo.vo.UserInfoVO;
 import com.bao.dating.pojo.vo.UserLoginVO;
 import com.bao.dating.service.UserService;
@@ -14,11 +18,16 @@ import com.bao.dating.util.MD5Util;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 @Service
@@ -27,11 +36,18 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private AliOssUtil ossUtil;
 
+    @Autowired
+    private GreenTextScan greenTextScan;
+
+    @Autowired
+    private GreenImageScan greenImageScan;
+
     @Autowired
     private UserMapper userMapper;
 
     /**
      * 用户登录
+     *
      * @param userLoginDTO
      * @return 登录信息
      */
@@ -43,7 +59,7 @@ public class UserServiceImpl implements UserService {
         }
         // 查询用户
         User user = userMapper.getByUsername(userLoginDTO.getUsername());
-        if (user == null){
+        if (user == null) {
             throw new RuntimeException("用户不存在");
         }
         // 密码校验
@@ -52,7 +68,7 @@ public class UserServiceImpl implements UserService {
                 user.getSalt(),
                 user.getPasswordHash()
         );
-        if (!match){
+        if (!match) {
             throw new RuntimeException("密码错误");
         }
         // 生成token
@@ -67,13 +83,14 @@ public class UserServiceImpl implements UserService {
 
     /**
      * 获取用户信息
+     *
      * @param userId
      * @return 用户信息
      */
     @Override
     public UserInfoVO getUserInfo(Long userId) {
         User user = userMapper.selectByUserId(userId);
-        if (user == null){
+        if (user == null) {
             throw new RuntimeException("用户不存在");
         }
         UserInfoVO userInfoVO = new UserInfoVO();
@@ -103,7 +120,7 @@ public class UserServiceImpl implements UserService {
         String extension = FileUtil.getFileExtension(originalFilename);
         String fileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
         Long userId = UserContext.getUserId();
-        String objectKey = "user/" + userId + "/avatar/"  + fileName;
+        String objectKey = "user/" + userId + "/avatar/" + fileName;
 
         try {
             byte[] fileBytes = file.getBytes();
@@ -157,4 +174,83 @@ public class UserServiceImpl implements UserService {
             throw new RuntimeException("上传图片失败", e);
         }
     }
+
+    /**
+     * 更新用户信息
+     *
+     * @param userInfoUpdateDTO
+     * @return 用户信息
+     */
+    @Override
+    public void 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 ("block".equals(suggestion)) {
+                throw new RuntimeException("用户信息包含违规内容，修改失败");
+            }
+            if ("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 ("block".equals(suggestion)) {
+                throw new RuntimeException("头像或背景图不合规，修改失败");
+            }
+            if ("review".equals(suggestion)) {
+                throw new RuntimeException("头像或背景图需要人工审核，暂无法修改");
+            }
+        }
+
+        userInfoUpdateDTO.setUpdatedAt(LocalDateTime.now());
+
+        // 更新数据库
+        userMapper.updateUserInfoByUserId(userInfoUpdateDTO);
+    }
 }

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

@@ -23,7 +23,7 @@
         <result property="backgroundUrl" column="background_url"/>
         <result property="gender" column="gender"/>
         <result property="birthday" column="birthday"/>
-        <result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToVarcharTypeHandler"/>
+        <result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToJsonTypeHandler"/>
         <result property="signature" column="signature"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
@@ -43,4 +43,33 @@
             FROM user WHERE user_id = #{userId}
     </select>
 
+    <!--根据ID更新动态-->
+    <update id="updateUserInfoByUserId">
+        UPDATE user
+        <set>
+            <if test="nickname != null">
+                nickname = #{nickname},
+            </if>
+            <if test="avatarUrl != null">
+                avatar_url = #{avatarUrl},
+            </if>
+            <if test="backgroundUrl != null">
+                background_url = #{backgroundUrl},
+            </if>
+            <if test="gender != null">
+                gender = #{gender},
+            </if>
+            <if test="birthday != null">
+                birthday = #{birthday},
+            </if>
+            <if test="hobbies != null">
+                hobbies = #{hobbies, typeHandler=com.bao.dating.handler.ListToJsonTypeHandler},
+            </if>
+            <if test="signature != null">
+                signature = #{signature},
+            </if>
+            updated_at = #{updatedAt}
+        </set>
+        WHERE user_id = #{userId}
+    </update>
 </mapper>