shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

33333333333

Browse Source
This commit is contained in:
777
2025-02-12 23:33:55 +08:00
parent 7dc7f874e4
commit 898c4b2431
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
View File

@@ -161,9 +161,11 @@ public class CaiLoginManager {
if(!caiUser.getPassword().equals(caiUser.getPasswordCheck())){
throw new ServiceException("两次输入密码不一致，请检查");
}
boolean check = smsVerifyService.check(CodeEnum.REGISTER, caiUser.getUsername(), caiUser.getCode());
if(!check){
throw new ServiceException("验证码错误");
if(!caiUser.isSystemOp()){
boolean check = smsVerifyService.check(CodeEnum.REGISTER, caiUser.getUsername(), caiUser.getCode());
if(!check){
throw new ServiceException("验证码错误");
}
}
// 加锁
String lockKey = LockManager.getRegisterLockKey(caiUser.getUsername());
@@ -178,12 +180,22 @@ public class CaiLoginManager {
}finally {
lock.unlock();
}
awardManager.giveRegisterAsync(user.getId());
if(!caiUser.isSystemOp()){
awardManager.giveRegisterAsync(user.getId());
}
if(caiUser.getInviteId() != null){
User finalUser = user;
ExecutorConstant.COMMON_EXECUTOR.execute(() -> dealInviteId(finalUser,caiUser.getInviteId(), true));
if(!caiUser.isSystemOp()){
ExecutorConstant.COMMON_EXECUTOR.execute(() -> dealInviteId(finalUser,caiUser.getInviteId(), true));
}else{
dealInviteId(finalUser,caiUser.getInviteId(), true);
}
}
if(!caiUser.isSystemOp()){
return login(user);
}else{
return null;
}
return login(user);
}
@@ -315,7 +327,7 @@ public class CaiLoginManager {
req.setAccid(add.getId()+"");
req.setToken(add.getImToken());
req.setName(add.getNickname());
YxCommonR r = imUserClient.createUser(req);
/*YxCommonR r = imUserClient.createUser(req);
if(!r.isSuccess()){
if(r.getCode() == 414){
UpdateTokenReq req1 = new UpdateTokenReq();
@@ -330,8 +342,11 @@ public class CaiLoginManager {
log.error("创建云信账号失败,{}", JSON.toJSONString(r));
throw new ServiceException("注册失败，云信异常");
}
}*/
String clientIP = "127.0.0.1";
if(!user.isSystemOp()){
clientIP = ServletUtils.getClientIP();
}
String clientIP = ServletUtils.getClientIP();
UserInfo userInfo = new UserInfo();
userInfo.setUserId(add.getId());
userInfo.setVideoIncomeRate(systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.DEFAULT_VIDEO_INCOME_RATE));