Merge branch 'mh' of http://124.70.32.114:3100/woka/cesium-map-object into ctw

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;

ruoyi-admin/src/main/resources/application.yml

@@ -72,7 +72,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 1
     # 密码
     password:
     # 连接超时时间

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;
     }

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")));
             }
         }