From bab6c7bbf9a3942fa89ed399bc6c5f2971bedb15 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 30 Aug 2025 22:16:31 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BasicSetupController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/GroupWelcomeConfig.java | 5 ++
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 26 +++++++++++--
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserAccount.java | 7 +++
ruoyi-admin/src/main/java/com/ruoyi/im/dto/RegisterDto.java | 5 ++
ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java | 7 +++
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java | 51 ++++++++++++++++++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 3 -
8 files changed, 97 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
index 6def4d9..40eb0b2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
@@ -37,10 +38,7 @@
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
@RestController
@RequestMapping("/im/api")
@@ -55,6 +53,8 @@
@Autowired
UserAccountService userAccountService;
+ @Autowired
+ GroupWelcomeConfigService groupWelcomeConfigService;
@@ -78,6 +78,24 @@
}
}
+ /**
+ * 获取二维码链接和邀请码
+ */
+ @GetMapping("/getUserCodeAndUrl")
+ public Result getUserCodeAndUrl(@RequestParam("account") String account){
+ try {
+ GroupWelcomeConfig groupWelcomeConfig = groupWelcomeConfigService.getOne(new LambdaQueryWrapper<>(GroupWelcomeConfig.class)
+ .eq(GroupWelcomeConfig::getConfigurationName, "IM-BASICS").last(" limit 1"));
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>().eq(UserAccount::getAccount, account));
+ Map<String,String> map = new HashMap<>();
+ map.put("url",ObjectUtil.isNotEmpty(groupWelcomeConfig.getCodeUrl()) ? groupWelcomeConfig.getCodeUrl() : "");
+ map.put("code",userAccount.getInvitationCode());
+ return Result.success(map);
+ } catch (RuntimeException e) {
+ // 从异常消息中解析Result对象
+ return JSON.parseObject(e.getMessage(), Result.class);
+ }
+ }
/**
* 修改用户信息只有数据库
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/dto/RegisterDto.java b/ruoyi-admin/src/main/java/com/ruoyi/im/dto/RegisterDto.java
index 56e32a3..7e70c2e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/dto/RegisterDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/dto/RegisterDto.java
@@ -20,6 +20,11 @@
private Integer type;//类型 1 批量 2 单一
private Integer number;//数量
+
+ private String InvitationCode;//邀请码
+
+ // 账号类型: 0:真实 1:虚拟
+ private Integer accountType = 0;
// @NotNull(message = "验证码不能为空")
// private Integer verificationCode; // 验证码
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java b/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java
index cce30c5..635f6f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java
@@ -28,6 +28,13 @@
private String nickname;
+ // 邀请码
+ private String invitationCode;
+
+ // 邀请人账号
+ private Integer invitationAccount;
+
+
// 账号状态: 0:正常 1:禁用
private Integer status;
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 ada2ea4..41be005 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
@@ -121,6 +121,18 @@
return Result.error("账号已被注册！");
}
+ if(dto.getAccountType() == 0 && StringUtils.isEmpty(dto.getInvitationCode())){
+ return Result.error("邀请码不能为空！");
+ }
+
+ UserAccount user = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>()
+ .eq(UserAccount::getInvitationCode, dto.getInvitationCode()).last(" limit 1"));
+ if(ObjectUtil.isEmpty(user)){
+ return Result.error("邀请码错误");
+ }
+
+ String invitationCode = getInvitationCode();
+
// 创建本地用户账户记录
UserAccount userAccount = new UserAccount();
userAccount.setAccount(dto.getAccount());
@@ -131,6 +143,8 @@
userAccount.setNickname(dto.getNickname());
userAccount.setCreateTime(new Date());
userAccount.setUpdateTime(new Date());
+ userAccount.setInvitationCode(invitationCode);
+ userAccount.setInvitationAccount(user.getAccount());
if (!userAccountService.save(userAccount)) {
throw new RuntimeException("保存用户账户失败");
@@ -184,6 +198,38 @@
}
}
+ private String getInvitationCode() {
+ String invitationCode = null;
+ int maxAttempts = 100; // 最大尝试次数
+ int attempts = 0;
+
+ while (attempts < maxAttempts) {
+ invitationCode = generateInvitationCode();
+ long count = userAccountService.count(new LambdaQueryWrapper<UserAccount>()
+ .eq(UserAccount::getInvitationCode, invitationCode));
+ if(count <= 0){
+ break;
+ }
+ attempts++;
+ }
+
+ if (attempts >= maxAttempts) {
+ log.error("生成邀请码已超最大尝试次数！");
+ throw new RuntimeException("无法生成唯一的邀请码，请稍后重试");
+ }
+ return invitationCode;
+ }
+
+
+ /**
+ * 生成邀请码
+ * @return
+ */
+ public static String generateInvitationCode() {
+ Random random = new Random();
+ int code = 100000 + random.nextInt(900000);
+ return String.valueOf(code);
+ }
/**
* 优化的账号生成方法，使用雪花算法变体提高并发性能
@@ -440,6 +486,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result batchRegister(RegisterDto dto) {
+ dto.setAccountType(1);
if(dto.getType() == 2){
return register(dto);
}else{
@@ -492,7 +539,7 @@
List<UserAccount> accounts = new ArrayList<>(count);
Set<String> generatedAccounts = new HashSet<>(count); // 用于内存中去重
Random random = new Random();
-
+ String invitationCode = getInvitationCode();
for (int i = 0; i < count; i++) {
String account;
do {
@@ -510,7 +557,7 @@
userAccount.setCreateTime(new Date());
userAccount.setNickname("用户_" + account.substring(7)); // 简单生成昵称
userAccount.setAccountType(1); // 设置账号类型为1
-
+ userAccount.setInvitationCode(invitationCode);
accounts.add(userAccount);
}
return accounts;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BasicSetupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BasicSetupController.java
index b0dd8a5..4e8a938 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BasicSetupController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BasicSetupController.java
@@ -51,6 +51,7 @@
configServiceById.setWelcomeMessage(vo.getWelcomeMessage());
configServiceById.setLegalInstitution(vo.getLegalInstitution());
configServiceById.setCopyrightInfo(vo.getCopyrightInfo());
+ configServiceById.setCodeUrl(vo.getCodeUrl());
groupWelcomeConfigService.updateById(configServiceById);
return AjaxResult.success("保存成功！");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
index 8c01413..94ce615 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
@@ -28,6 +28,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -81,7 +82,6 @@
PageInfo<UserAccount> pageInfo = new PageInfo<>(list);
List<UserAccountOut> toList = ConverterUtil.convertToList(list, UserAccountOut.class);
-
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
@@ -147,6 +147,5 @@
return Result.error("注册失败，请稍后再试！");
}
}
-
}
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 68f1092..a7fcc35 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
@@ -57,6 +57,11 @@
private String copyrightInfo;
/**
+ * 二维码链接
+ */
+ private String codeUrl;
+
+ /**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserAccount.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserAccount.java
index 73bb259..dcb7d5f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserAccount.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserAccount.java
@@ -39,6 +39,13 @@
// 账号状态: 0:正常 1:禁用
private Integer status = 0;
+ // 邀请码
+ private String invitationCode;
+
+
+ // 邀请人账号
+ private String invitationAccount;
+
// 最近登录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loginTime;
--
Gitblit v1.9.3