From 536f29e37573dd82efd22bb13a9769af09f31b2b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 21 Aug 2025 20:03:45 +0800
Subject: [PATCH] 1
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWelcomeConfig.java | 5 ++
ruoyi-admin/src/main/java/com/ruoyi/im/config/AddTeamMembersRequest.java | 4 ++
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java | 72 +++++++++++++++++++++++++++++++++---
4 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/config/AddTeamMembersRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/im/config/AddTeamMembersRequest.java
index abae4c2..0c937bc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/config/AddTeamMembersRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/config/AddTeamMembersRequest.java
@@ -3,8 +3,10 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.sun.istack.internal.NotNull;
+import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
@@ -14,6 +16,8 @@
@Data
@Builder
+@NoArgsConstructor // 添加无参构造函数
+@AllArgsConstructor // 添加全参构造函数（这样Builder也可以工作）
public class AddTeamMembersRequest {
private String groupId;//群id
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 f252b5e..5e4bb33 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,5 +1,7 @@
package com.ruoyi.im.service.impl;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,19 +9,23 @@
import com.netease.nim.server.sdk.core.YunxinApiHttpClient;
import com.netease.nim.server.sdk.core.YunxinApiResponse;
import com.netease.nim.server.sdk.core.exception.YunxinSdkException;
+import com.netease.nim.server.sdk.core.http.HttpMethod;
+import com.netease.nim.server.sdk.im.v2.friend.FriendV2UrlContext;
+import com.netease.nim.server.sdk.im.v2.team.TeamV2UrlContext;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.im.comm.Result;
-import com.ruoyi.im.config.AppAuthConfig;
-import com.ruoyi.im.config.DynamicRequestBodyBuilder;
-import com.ruoyi.im.config.NeteaseResponse;
-import com.ruoyi.im.config.UpdateUserInfoRequest;
+import com.ruoyi.im.config.*;
import com.ruoyi.im.dto.UpdateUserBusinessDto;
+import com.ruoyi.im.service.NeteaseTeamService;
+import com.ruoyi.system.domain.GroupWelcomeConfig;
+import com.ruoyi.system.domain.NeteaseTeam;
import com.ruoyi.system.domain.UserAccount;
import com.ruoyi.im.service.ImApiServcie;
import com.ruoyi.im.dto.RegisterDto;
import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
+import com.ruoyi.system.service.GroupWelcomeConfigService;
import com.ruoyi.system.service.UserAccountService;
import com.ruoyi.im.util.SymmetricCryptoUtil;
import lombok.extern.slf4j.Slf4j;
@@ -58,7 +64,10 @@
public class ImApiServcieImpl implements ImApiServcie {
@Autowired
private UserAccountService userAccountService;
-
+ @Autowired
+ GroupWelcomeConfigService groupWelcomeConfigService;
+ @Autowired
+ NeteaseTeamService neteaseTeamService;
@Autowired
private JdbcTemplate jdbcTemplate;
@@ -83,6 +92,7 @@
private static final String ENCRYPTED_PASSWORD = SymmetricCryptoUtil.encryptPassword(DEFAULT_PASSWORD); // 密码加密一次，多次使用
private static final String YUNXIN_CREATE_PATH = "/user/create.action";
+ private static final String FRIENDS_PATH = "/im/v2.1/friends";
@Value("${netease.im.api-head-portrait-url}")
private String headPortraitUrl;
@@ -135,6 +145,19 @@
int code = json.getIntValue("code");
if (code == 200) {
+ GroupWelcomeConfig groupWelcomeConfig = groupWelcomeConfigService.getOne(new LambdaQueryWrapper<>(GroupWelcomeConfig.class)
+ .eq(GroupWelcomeConfig::getConfigurationName, "IM-BASICS").last(" limit 1"));
+ if(ObjectUtil.isNotEmpty(groupWelcomeConfig)){
+ //添加默认好友
+ addFriends(userAccount.getAccount(),groupWelcomeConfig.getUserAccid());
+ //加入默认群聊
+ List<String> accountList = new ArrayList<>();
+ accountList.add(userAccount.getAccount());
+ AddTeamMembersRequest request = new AddTeamMembersRequest();
+ request.setInviteAccountIds(accountList);
+ request.setOperatorId(groupWelcomeConfig.getUserAccid());
+ neteaseTeamService.inviteTeamMembers(request);
+ }
return Result.success("注册成功");
} else if (code == 414) {
// 手动触发回滚（事务注解会自动处理）
@@ -146,7 +169,6 @@
log.error("云信注册失败，响应: {}, traceId: {}", data, response.getTraceId());
return Result.error("注册失败，错误码: " + code);
}
-
} catch (YunxinSdkException e) {
// 云信调用异常时回滚事务
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -548,4 +570,42 @@
return Result.success("所有云信账号注册成功");
}
+
+ public void addFriends(String accountId,String userAccid){
+ try {
+
+ Map<String, String> queryParams = null;
+ Map<String, Object> map = new HashMap<>();
+ map.put("account_id",accountId);
+ map.put("friend_account_id",userAccid);
+ JSONObject jsonBody = JSONObject.parseObject(JSONObject.toJSONString(map));
+
+
+ YunxinApiResponse apiResponse = yunxinClient.executeV2Api(
+ HttpMethod.POST,
+ FRIENDS_PATH,
+ FRIENDS_PATH,
+ queryParams,
+ jsonBody.toJSONString()
+ );
+ // 检查所有响应结果
+ String data = apiResponse.getData();
+ JSONObject json = JSONObject.parseObject(data);
+ int code = json.getIntValue("code");
+ if (code != 200) {
+ log.error("云信账号注册添加默认好友失败");
+ }
+ } catch (YunxinSdkException e) {
+ // 云信调用异常时回滚事务
+ e.printStackTrace();
+ log.error("网易云信创建用户加群服务调用异常 traceId:");
+ } catch (Exception e) {
+ // 其他异常同样回滚
+ e.printStackTrace();
+ log.error("创建用户加群过程发生未知异常", e);
+ }
+ }
+
+
+
}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java
index 020d0df..ed72cf7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java
@@ -266,7 +266,7 @@
.operatorId(request.getOperatorId())
.msg(request.getMsg())
.teamId(Long.getLong(neteaseTeam.getTid()))
- .teamType(request.getTeamType())
+ .teamType(neteaseTeam.getTeamType())
.build();
String jsonBody = JSONUtils.toJSONString(build);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWelcomeConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWelcomeConfig.java
index 95542fa..68f1092 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWelcomeConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWelcomeConfig.java
@@ -27,6 +27,11 @@
private String websiteName;
/**
+ * 配置名称
+ */
+ private String configurationName = "IM-BASICS";
+
+ /**
* 群组ID
*/
private String groupId;
--
Gitblit v1.9.3