From 60d451cbe97028dfe5135c1ddcf94d8bcc491964 Mon Sep 17 00:00:00 2001 From: menghao <1584479611@qq.com> Date: Tue, 20 Jan 2026 15:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E5=86=99=E5=85=A5=E3=80=81=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E7=AE=A1=E7=90=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/RoomsController.java | 2 ++ ruoyi-admin/src/main/resources/application.yml | 2 +- .../ruoyi/common/core/domain/model/RegisterBody.java | 2 +- .../framework/web/service/SysRegisterService.java | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java index 8108a8e..89155ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java @@ -2,6 +2,8 @@ package com.ruoyi.web.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 3fc7bbf..bc7105e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -72,7 +72,7 @@ spring: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 0 + database: 1 # 密码 password: # 连接超时时间 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java index 69ac005..ac89b20 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java @@ -14,7 +14,7 @@ public class RegisterBody extends LoginBody return userLevel; } - public void setUserLevel(String role) + public void setUserLevel(String userLevel) { this.userLevel = userLevel; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index 486af4e..e53e7aa 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -79,7 +79,10 @@ public class SysRegisterService sysUser.setNickName(username); sysUser.setPwdUpdateDate(DateUtils.getNowDate()); sysUser.setPassword(SecurityUtils.encryptPassword(password)); + // 1. 设置用户等级字段 sysUser.setUserLevel(registerBody.getUserLevel()); + + // 2. 执行注册，成功后 sysUser 会获得自增的 userId boolean regFlag = userService.registerUser(sysUser); if (!regFlag) { @@ -87,6 +90,22 @@ public class SysRegisterService } else { + // 3. 【核心修改】自动绑定角色关联表 sys_user_role + // 根据你的业务约定进行角色映射 + Long[] roleIds = new Long[1]; + String level = registerBody.getUserLevel(); + + if ("1".equals(level)) { + roleIds[0] = 1L; // 管理员角色ID + } else if ("2".equals(level)) { + roleIds[0] = 100L; // 主持人角色ID + } else { + roleIds[0] = 2L; // 默认为普通角色 + } + + // 将用户 ID 与角色 ID 绑定到 sys_user_role 表 + userService.insertUserAuth(sysUser.getUserId(), roleIds); + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"))); } }