瀏覽代碼

web 模块调整用户角色 RoleType

reghao 3 月之前
父節點
當前提交
fdd5a19d9f

+ 1 - 4
web/src/main/java/cn/reghao/bnt/web/admin/model/constant/RoleType.java

@@ -8,10 +8,7 @@ package cn.reghao.bnt.web.admin.model.constant;
  */
 public enum RoleType {
     ROLE_ANONYMOUS("匿名用户"),
-    ROLE_ADMIN("超级管理员"),
-    ROLE_BLOG("blog 用户"),
-    ROLE_OSS("oss 用户"),
-    ROLE_DEVOPS_ADMIN("DevOps 管理员"),
+    ROLE_DEVOPS_ADMIN("超级管理员"),
     ROLE_DEVOPS_JAVA("Java 开发"),
     ROLE_DEVOPS_DOTNET("DotNet 开发"),
     ROLE_DEVOPS_NPM("前端开发");

+ 1 - 1
web/src/main/java/cn/reghao/bnt/web/admin/service/UserMessageService.java

@@ -29,7 +29,7 @@ public class UserMessageService {
     }
 
     public List<Integer> getAdminUserId() {
-        String roleName = RoleType.ROLE_ADMIN.name();
+        String roleName = RoleType.ROLE_DEVOPS_ADMIN.name();
         return accountService.getUserIdsByRole(roleName);
     }
 

+ 2 - 2
web/src/main/java/cn/reghao/bnt/web/admin/service/impl/AccountServiceImpl.java

@@ -63,7 +63,7 @@ public class AccountServiceImpl implements AccountService {
             return Result.fail("role 不存在");
         }
 
-        String adminRole = RoleType.ROLE_ADMIN.name().replace("ROLE_", "").toLowerCase(Locale.ROOT);
+        String adminRole = RoleType.ROLE_DEVOPS_ADMIN.name().replace("ROLE_", "").toLowerCase(Locale.ROOT);
         if (createAccountDto.getRoles().contains(adminRole)) {
             return Result.fail("只有 admin 用户才能拥有 admin role");
         }
@@ -121,7 +121,7 @@ public class AccountServiceImpl implements AccountService {
             return Result.fail("角色不存在");
         }
 
-        if (roleNames.contains(RoleType.ROLE_ADMIN.name()) && countUsersByRole(adminRoleId) >= 2) {
+        if (roleNames.contains(RoleType.ROLE_DEVOPS_ADMIN.name()) && countUsersByRole(adminRoleId) >= 2) {
             return Result.fail("系统最多允许 2 个用户拥有 admin role");
         }
 

+ 1 - 1
web/src/main/java/cn/reghao/bnt/web/admin/service/impl/MenuServiceImpl.java

@@ -189,7 +189,7 @@ public class MenuServiceImpl implements MenuService {
                 .map(Role::getName)
                 .collect(Collectors.toList());
         if (list.isEmpty()) {
-            return List.of(RoleType.ROLE_ADMIN.name());
+            return List.of(RoleType.ROLE_DEVOPS_ADMIN.name());
         }
 
         return list;

+ 1 - 2
web/src/main/java/cn/reghao/bnt/web/devops/app/service/PermissionCheck.java

@@ -31,8 +31,7 @@ public class PermissionCheck {
             Set<String> userRoles = roleService.getRolesByUser(user.getId()).stream()
                     .map(Role::getName)
                     .collect(Collectors.toSet());
-            boolean isAdmin = userRoles.contains(RoleType.ROLE_ADMIN.name())
-                    || userRoles.contains(RoleType.ROLE_DEVOPS_ADMIN.name());
+            boolean isAdmin = userRoles.contains(RoleType.ROLE_DEVOPS_ADMIN.name());
             if (EnvType.prod.name().equals(env) && !isAdmin) {
                 throw new Exception("没有权限");
             }