From 4a79b4c9bc6f9f1c6c0f2d8b5edf755535ba2ad1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 24 Aug 2025 03:43:43 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java | 207 +++++++++++++++++++++++++++++----------------------
1 files changed, 116 insertions(+), 91 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 5e4bb33..21eb1a9 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
@@ -19,12 +19,14 @@
import com.ruoyi.im.config.*;
import com.ruoyi.im.dto.UpdateUserBusinessDto;
import com.ruoyi.im.service.NeteaseTeamService;
+import com.ruoyi.imenum.ErrorCodeEnum;
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.mapper.NeteaseTeamMapper;
import com.ruoyi.system.service.GroupWelcomeConfigService;
import com.ruoyi.system.service.UserAccountService;
import com.ruoyi.im.util.SymmetricCryptoUtil;
@@ -71,7 +73,10 @@
@Autowired
private JdbcTemplate jdbcTemplate;
+ @Autowired
+ private NeteaseTeamMapper neteaseTeamMapper;
+ @Resource
private final YunxinApiHttpClient yunxinClient;
// 使用构造函数注入（推荐）
@@ -102,38 +107,39 @@
@Override
- @Transactional(rollbackFor = Exception.class) // 添加事务注解确保操作原子性
+ @Transactional(rollbackFor = Exception.class)
public Result register(RegisterDto dto) {
+ // 验证手机号是否已存在
+ List<UserAccount> accounts = userAccountService.list(
+ new LambdaQueryWrapper<>(UserAccount.class)
+ .eq(UserAccount::getAccount, dto.getAccount())
+ );
+
+ if (!CollectionUtils.isEmpty(accounts)) {
+ return Result.error("账号已被注册！");
+ }
+
+ // 创建本地用户账户记录
+ UserAccount userAccount = new UserAccount();
+ userAccount.setAccount(dto.getAccount());
+ userAccount.setPhoneNumber(dto.getAccount());
+ userAccount.setCloudMessageAccount(dto.getAccount());
+ userAccount.setPassword(SymmetricCryptoUtil.encryptPassword(dto.getPassword()));
+ userAccount.setCreateTime(new Date());
+ userAccount.setNickname(dto.getNickname());
+ userAccount.setCreateTime(new Date());
+ userAccount.setUpdateTime(new Date());
+
+ if (!userAccountService.save(userAccount)) {
+ throw new RuntimeException("保存用户账户失败");
+ }
+
try {
- // 验证手机号是否已存在（数据库唯一索引提供最终保障）
- List<UserAccount> accounts = userAccountService.list(
- new LambdaQueryWrapper<>(UserAccount.class)
- .eq(UserAccount::getAccount, dto.getAccount())
- );
-
- if (!CollectionUtils.isEmpty(accounts)) {
- return Result.error("手机号已注册！");
- }
-
- // 创建本地用户账户记录
- UserAccount userAccount = new UserAccount();
- userAccount.setAccount(dto.getAccount());
- userAccount.setPhoneNumber(dto.getAccount());
- userAccount.setCloudMessageAccount(dto.getAccount());
- userAccount.setPassword(SymmetricCryptoUtil.encryptPassword(dto.getPassword()));
- userAccount.setCreateTime(new Date());
- userAccount.setNickname(dto.getAccount());
-
-
- if (!userAccountService.save(userAccount)) {
- return Result.error("注册失败，请重试");
- }
-
// 注册云信账号（远程调用）
Map<String, String> paramMap = new HashMap<>();
paramMap.put("accid", dto.getAccount());
- if(StringUtils.isNotEmpty(dto.getName())){
- paramMap.put("name", dto.getName());
+ if(StringUtils.isNotEmpty(dto.getNickname())){
+ paramMap.put("name", dto.getNickname());
}
paramMap.put("token", dto.getPassword());
@@ -144,41 +150,35 @@
JSONObject json = JSONObject.parseObject(data);
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);
+ if (code != 200) {
+ String errorMsg = "";
+ if(code == 102405){
+ errorMsg = "用户已存在";
}
- return Result.success("注册成功");
- } else if (code == 414) {
- // 手动触发回滚（事务注解会自动处理）
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return Result.error("账号已被注册！");
- } else {
- // 其他错误码同样触发回滚
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error("云信注册失败，响应: {}, traceId: {}", data, response.getTraceId());
- return Result.error("注册失败，错误码: " + code);
+ log.error("-----------注册账号异常："+ErrorCodeEnum.getByCode(code).getComment()+"----im信息："+ErrorCodeEnum.getByCode(code).getDesc());
+ throw new RuntimeException(errorMsg);
}
- } catch (YunxinSdkException e) {
- // 云信调用异常时回滚事务
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error("云信服务调用异常 traceId: {}", e.getTraceId(), e);
- return Result.error("注册失败，系统异常");
+
+ // 注册成功后的其他操作
+ GroupWelcomeConfig groupWelcomeConfig = groupWelcomeConfigService.getOne(new LambdaQueryWrapper<>(GroupWelcomeConfig.class)
+ .eq(GroupWelcomeConfig::getConfigurationName, "IM-BASICS").last(" limit 1"));
+
+ NeteaseTeam neteaseTeam = neteaseTeamMapper.selectOne(new LambdaQueryWrapper<NeteaseTeam>().eq(NeteaseTeam::getTid,groupWelcomeConfig.getGroupId()));
+ if(ObjectUtil.isNotEmpty(groupWelcomeConfig) || ObjectUtil.isNotEmpty(neteaseTeam)){
+ addFriends(userAccount.getAccount(),groupWelcomeConfig.getUserAccid());
+ List<String> accountList = new ArrayList<>();
+ accountList.add(userAccount.getAccount());
+ AddTeamMembersRequest request = new AddTeamMembersRequest();
+ request.setInviteAccountIds(accountList);
+ request.setGroupId(neteaseTeam.getId().toString());
+ neteaseTeamService.inviteTeamMembers(request);
+ }
+ return Result.success("注册成功");
+
} catch (Exception e) {
- // 其他异常同样回滚
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error("注册过程发生未知异常", e);
- return Result.error("注册失败，请重试");
+ log.error("注册过程发生异常", e);
+ // 将异常包装为Result并抛出RuntimeException触发回滚
+ throw new RuntimeException(Result.error("注册失败: " + e.getMessage()).toString(), e);
}
}
@@ -275,18 +275,24 @@
httpPatch.setHeader("CheckSum", checkSum);
// 构建请求体
- UpdateUserInfoRequest builder = new UpdateUserInfoRequest();
- if(StringUtils.isNotEmpty(dto.getMobile())){
- builder.setMobile(dto.getMobile());
- }else if(StringUtils.isNotEmpty(dto.getName())){
- builder.setName(dto.getName());
- }else if(StringUtils.isNotEmpty(dto.getSign())){
- builder.setSign(dto.getSign());
- }else if(StringUtils.isNotEmpty(dto.getAvatar())){
- builder.setAvatar(dto.getAvatar());
- }
- String body = builder.build();
- String jsonBody = objectMapper.writeValueAsString(body);
+// 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());
+ String jsonBody = objectMapper.writeValueAsString(requestBody);
+// String jsonBody = objectMapper.writeValueAsString(body);
httpPatch.setEntity(new StringEntity(jsonBody, StandardCharsets.UTF_8));
// 执行请求
@@ -298,11 +304,11 @@
if (neteaseResponse.isSuccess()) {
result.put("success", true);
- result.put("message", "头像更新成功");
+ result.put("message", "更新成功");
result.put("data", neteaseResponse.getData());
} else {
result.put("success", false);
- result.put("message", "头像更新失败: " + neteaseResponse.getMsg());
+ result.put("message", "更新失败: " + neteaseResponse.getMsg());
result.put("errorCode", neteaseResponse.getCode());
}
@@ -332,9 +338,11 @@
UpdateUserBusinessDto dto = new UpdateUserBusinessDto();
if(StringUtils.isNotEmpty(vo.getPhoneNumber())){
dto.setMobile(vo.getPhoneNumber());
- }else if(StringUtils.isNotEmpty(vo.getNickname())){
+ }
+ if(StringUtils.isNotEmpty(vo.getNickname())){
dto.setName(vo.getNickname());
- }else if(StringUtils.isNotEmpty(vo.getSignature())){
+ }
+ if(StringUtils.isNotEmpty(vo.getSignature())){
dto.setSign(vo.getSignature());
}
Map<String, Object> map = updateUserAvatar(vo.getAccountId(), dto);
@@ -343,11 +351,25 @@
AjaxResult ajaxResult = updateAccountProperties(vo.getAccountId(), vo);
if(ajaxResult.isSuccess()){
UserAccount userAccount = userAccountService.getById(vo.getId());
- userAccount.setPhoneNumber(vo.getPhoneNumber());
- userAccount.setAccount(vo.getAccountId());
- userAccount.setNickname(vo.getNickname());
- userAccount.setPassword(SymmetricCryptoUtil.encryptPassword(vo.getPassword()));
- userAccount.setSignature(vo.getSignature());
+ if (StringUtils.isNotBlank(vo.getPhoneNumber())) {
+ userAccount.setPhoneNumber(vo.getPhoneNumber());
+ }
+
+ if (StringUtils.isNotBlank(vo.getAccountId())) {
+ userAccount.setAccount(vo.getAccountId());
+ }
+
+ if (StringUtils.isNotBlank(vo.getNickname())) {
+ userAccount.setNickname(vo.getNickname());
+ }
+
+ if (StringUtils.isNotBlank(vo.getPassword())) {
+ userAccount.setPassword(SymmetricCryptoUtil.encryptPassword(vo.getPassword()));
+ }
+
+ if (StringUtils.isNotBlank(vo.getSignature())) {
+ userAccount.setSignature(vo.getSignature());
+ }
userAccount.setUpdateTime(new Date());
userAccountService.updateById(userAccount);
}else{
@@ -391,7 +413,8 @@
if(null != vo.getStatus() && vo.getStatus() == 0){
builder.setEnabled(false);
builder.setNeedKick(true);
- }else if(StringUtils.isNotEmpty(vo.getPassword())){
+ }
+ if(StringUtils.isNotEmpty(vo.getPassword())){
builder.setToken(vo.getPassword());
}
// 只设置需要的字段
@@ -427,6 +450,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result batchRegister(RegisterDto dto) {
if(dto.getType() == 2){
return register(dto);
@@ -461,7 +485,7 @@
return yunxinResult;
}
- return Result.success("成功批量注册 " + count + " 个账号");
+ return Result.success("成功批量注册 " + count + " 个账号",yunxinResult.getData());
} catch (Exception e) {
// 其他异常，触发回滚
@@ -553,21 +577,22 @@
.map(CompletableFuture::join)
.collect(Collectors.toList());
+ List<String> acccountList = new ArrayList<>();
// 检查所有响应结果
for (YunxinApiResponse response : responses) {
String data = response.getData();
JSONObject json = JSONObject.parseObject(data);
int code = json.getIntValue("code");
- if (code != 200) {
- // 记录具体的错误信息
- String errorAccid = json.getString("accid"); // 如果返回了accid
- log.error("云信账号注册失败，accid: {}, 响应: {}, traceId: {}", errorAccid, data, response.getTraceId());
- // 返回第一个遇到的错误
- return Result.error("云信注册失败，错误码: " + code + (errorAccid != null ? ", 账号: " + errorAccid : ""));
- }
- }
+ JSONObject info = json.getJSONObject("info");
+ String accid = info.getString("accid");
- return Result.success("所有云信账号注册成功");
+ if (code != 200) {
+ log.error("-----------云信账号注册失败："+ ErrorCodeEnum.getByCode(code).getComment()+"----im信息："+ErrorCodeEnum.getByCode(code).getDesc());
+ return Result.error("云信注册失败:"+ErrorCodeEnum.getByCode(code).getComment());
+ }
+ acccountList.add(accid);
+ }
+ return Result.success(acccountList);
}
--
Gitblit v1.9.3