From 36c61554f78faaf68a38ee6bcef5fcf84fbf6aba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 11 九月 2024 10:49:05 +0800
Subject: [PATCH] oss表增加逻辑删除,保证同步删除失败下一次也能继续
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index 4d4b072..e0ef425 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -19,8 +19,12 @@
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.SysUserRole;
import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.enums.RoleType;
import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.mapper.SysUserRoleMapper;
import org.dromara.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -37,6 +41,7 @@
private final ISysUserService userService;
private final SysUserMapper userMapper;
private final CaptchaProperties captchaProperties;
+ private final SysUserRoleMapper userRoleMapper;
/**
* 娉ㄥ唽
@@ -50,7 +55,7 @@
boolean captchaEnabled = captchaProperties.getEnable();
// 楠岃瘉鐮佸紑鍏�
- if (captchaEnabled) {
+ if (!captchaEnabled) {
validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid());
}
SysUserBo sysUser = new SysUserBo();
@@ -70,6 +75,11 @@
if (!regFlag) {
throw new UserException("user.register.error");
}
+ SysUserVo sysUserVo = userMapper.selectUserByUserName(username);
+ SysUserRole userRole = new SysUserRole();
+ userRole.setUserId(sysUserVo.getUserId());
+ userRole.setRoleId(Long.valueOf(RoleType.VIDEO.getType()));
+ userRoleMapper.insert(userRole);
recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
}
--
Gitblit v1.8.0