33333333333

ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java

@@ -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));

ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiRegisterUser.java

@@ -8,6 +8,7 @@ import javax.validation.constraints.NotEmpty;
 @Data
 @Schema(description = "注册模型")
 public class CaiRegisterUser {
+    private boolean systemOp;
     @Schema(description = "手机号登录名")
     @NotEmpty(message = "手机号不能为空")
     private String username;
@@ -20,6 +21,6 @@ public class CaiRegisterUser {
     @Schema(description = "验证码")
     @NotEmpty(message = "验证码不能为空")
     private String code;
-    @Schema(description = "邀请人ID")
+    @Schema(description = "邀请人ID(实际是code)")
     private String inviteId;
 }