From 2160f80eaa4a9a2b62fc58bb06335493cee4528f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 28 Aug 2025 02:33:03 +0800
Subject: [PATCH] 1

---
 ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
index 21eb1a9..ada2ea4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
@@ -1,9 +1,11 @@
 package com.ruoyi.im.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netease.nim.server.sdk.core.BizName;
 import com.netease.nim.server.sdk.core.YunxinApiHttpClient;
@@ -274,25 +276,9 @@
             httpPatch.setHeader("CurTime", curTime);
             httpPatch.setHeader("CheckSum", checkSum);
 
-            // 构建请求体
-//            UpdateUserInfoRequest builder = new UpdateUserInfoRequest();
-//            if(StringUtils.isNotEmpty(dto.getMobile())){
-//                builder.setMobile(dto.getMobile());
-//            }
-//            if(StringUtils.isNotEmpty(dto.getName())){
-//                builder.setName(dto.getName());
-//            }
-//            if(StringUtils.isNotEmpty(dto.getSign())){
-//                builder.setSign(dto.getSign());
-//            }
-//            if(StringUtils.isNotEmpty(dto.getAvatar())){
-//                builder.setAvatar(dto.getAvatar());
-//            }
-//            String body = builder.build();
             UpdateUserInfoRequest requestBody = new UpdateUserInfoRequest(dto.getAvatar(),
-                    dto.getName(),dto.getSign(),dto.getEmail(),dto.getMobile());
+                    dto.getName(),dto.getSign(),dto.getEmail(),dto.getMobile(),dto.getGender());
             String jsonBody = objectMapper.writeValueAsString(requestBody);
-//            String jsonBody = objectMapper.writeValueAsString(body);
             httpPatch.setEntity(new StringEntity(jsonBody, StandardCharsets.UTF_8));
 
             // 执行请求
@@ -345,6 +331,9 @@
         if(StringUtils.isNotEmpty(vo.getSignature())){
             dto.setSign(vo.getSignature());
         }
+        if(ObjectUtil.isNotEmpty(vo.getGender())){
+            dto.setGender(vo.getGender());
+        }
         Map<String, Object> map = updateUserAvatar(vo.getAccountId(), dto);
         //更新用户属性 状态 密码
         if ((Boolean) map.get("success")) {
@@ -370,6 +359,7 @@
                 if (StringUtils.isNotBlank(vo.getSignature())) {
                     userAccount.setSignature(vo.getSignature());
                 }
+                userAccount.setStatus(vo.getStatus());
                 userAccount.setUpdateTime(new Date());
                 userAccountService.updateById(userAccount);
             }else{
@@ -410,16 +400,14 @@
 
             // 创建构建器实例
             DynamicRequestBodyBuilder builder = new DynamicRequestBodyBuilder();
-            if(null != vo.getStatus() && vo.getStatus() == 0){
+            if(null != vo.getStatus() && vo.getStatus() == 1){
                 builder.setEnabled(false);
                 builder.setNeedKick(true);
-            }
-            if(StringUtils.isNotEmpty(vo.getPassword())){
+            }else if(StringUtils.isNotEmpty(vo.getPassword())){
                 builder.setToken(vo.getPassword());
             }
             // 只设置需要的字段
-            String body = builder.build();
-            String jsonBody = objectMapper.writeValueAsString(body);
+            String jsonBody = builder.build();
             httpPatch.setEntity(new StringEntity(jsonBody, StandardCharsets.UTF_8));
 
             // 执行请求

--
Gitblit v1.9.3