添加默认 Role, 并修改 SelectDictAttrProcessor 中前端 select 标签中不同 role 对应的值

web/src/main/java/cn/reghao/bnt/web/account/model/constant/RoleType.java

@@ -7,11 +7,15 @@ package cn.reghao.bnt.web.account.model.constant;
  * @date 2021-04-05 02:22:44
  */
 public enum RoleType {
-    ROLE_ADMIN("管理员"),
+    ROLE_ADMIN("超级管理员"),
     ROLE_USER("普通用户"),
-    ROLE_BACKEND("后端"),
-    ROLE_FRONTEND("前端"),
-    ROLE_TEST("测试");
+    ROLE_TNB("tnb 用户"),
+    ROLE_SPIDER("spider 用户"),
+    ROLE_OSS("oss 用户"),
+    ROLE_DEVOPS("devops 用户"),
+    ROLE_DEVOPS_BACKEND("后端"),
+    ROLE_DEVOPS_FRONTEND("前端"),
+    ROLE_DEVOPS_TEST("测试");
 
     private final String desc;
 

web/src/main/java/cn/reghao/bnt/web/template/attribute/SelectDictAttrProcessor.java

@@ -71,13 +71,13 @@ public class SelectDictAttrProcessor extends AbstractAttributeTagProcessor {
                 if ("ENVIRONMENT".equals(attr)) {
                     for (RoleType roleType : RoleType.values()) {
                         String role = roleType.name();
-                        if (role.equals(RoleType.ROLE_ADMIN.name())) {
+                        if (role.equals(RoleType.ROLE_DEVOPS.name())) {
                             Map<String, Object> map1 = new HashMap<>();
                             for (EnvType envType : EnvType.values()) {
                                 map1.put(envType.name(), envType.name());
                             }
                             map.put(role, map1);
-                        } else if (role.equals(RoleType.ROLE_BACKEND.name()) || role.equals(RoleType.ROLE_FRONTEND.name())) {
+                        } else if (role.equals(RoleType.ROLE_DEVOPS_BACKEND.name()) || role.equals(RoleType.ROLE_DEVOPS_FRONTEND.name())) {
                             Map<String, Object> map1 = new HashMap<>();
                             map1.put(EnvType.uat.name(), EnvType.uat.name());
                             map1.put(EnvType.test.name(), EnvType.test.name());
@@ -91,17 +91,17 @@ public class SelectDictAttrProcessor extends AbstractAttributeTagProcessor {
                 } else {
                     for (RoleType roleType : RoleType.values()) {
                         String role = roleType.name();
-                        if (role.equals(RoleType.ROLE_ADMIN.name())) {
+                        if (role.equals(RoleType.ROLE_DEVOPS.name())) {
                             Map<String, Object> map1 = new HashMap<>();
                             for (AppType appType : AppType.values()) {
                                 map1.put(appType.name(), appType.name());
                             }
                             map.put(role, map1);
-                        } else if (role.equals(RoleType.ROLE_BACKEND.name())) {
+                        } else if (role.equals(RoleType.ROLE_DEVOPS_BACKEND.name())) {
                             Map<String, Object> map1 = new HashMap<>();
                             map1.put(AppType.dotnetCore.name(), AppType.dotnetCore.getName());
                             map.put(role, map1);
-                        } else if (role.equals(RoleType.ROLE_FRONTEND.name())) {
+                        } else if (role.equals(RoleType.ROLE_DEVOPS_FRONTEND.name())) {
                             Map<String, Object> map1 = new HashMap<>();
                             map1.put(AppType.npm.name(), AppType.npm.getName());
                             map.put(role, map1);

web/src/main/java/cn/reghao/bnt/web/util/DefaultSetting.java

@@ -16,7 +16,7 @@ public class DefaultSetting {
         Set<String> roles = UserContext.getUserRoles();
         if (roles.contains(RoleType.ROLE_ADMIN.name())) {
             return EnvType.test.name();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name()) || roles.contains(RoleType.ROLE_FRONTEND.name())) {
+        } else if (roles.contains(RoleType.ROLE_DEVOPS_BACKEND.name()) || roles.contains(RoleType.ROLE_DEVOPS_FRONTEND.name())) {
             return EnvType.test.name();
         }
 
@@ -28,9 +28,9 @@ public class DefaultSetting {
         Set<String> roles = UserContext.getUserRoles();
         if (roles.contains(RoleType.ROLE_ADMIN.name())) {
             defaultAppType = AppType.dotnetCore.getName();
-        } else if (roles.contains(RoleType.ROLE_BACKEND.name())) {
+        } else if (roles.contains(RoleType.ROLE_DEVOPS_BACKEND.name())) {
             defaultAppType = AppType.dotnetCore.getName();
-        } else if (roles.contains(RoleType.ROLE_FRONTEND.name())) {
+        } else if (roles.contains(RoleType.ROLE_DEVOPS_FRONTEND.name())) {
             defaultAppType = AppType.npm.getName();
         }