调整 AccountRole 的值

common/src/main/java/cn/reghao/tnb/common/auth/AccountRole.java

@@ -5,17 +5,19 @@ package cn.reghao.tnb.common.auth;
  * @date 2024-02-14 19:13:18
  */
 public enum AccountRole {
-    oss("ROLE_OSS"),
-    exam("ROLE_EXAM"),
-    examUser("ROLE_EXAM_USER"),
-    examAdmin("ROLE_EXAM_ADMIN"),
-    disk("ROLE_DISK"),
-    user("ROLE_USER"),
-    admin("ROLE_ADMIN");
+    oss("ROLE_TNB_OSS", "tnb_oss"),
+    exam("ROLE_TNB_EXAM", "tnb_exam"),
+    examUser("ROLE_TNB_EXAM_USER", "tnb_exam_user"),
+    examAdmin("ROLE_TNB_EXAM_ADMIN", "tnb_exam_admin"),
+    disk("ROLE_TNB_DISK", "tnb_disk"),
+    user("ROLE_TNB_USER", "tnb_user"),
+    admin("ROLE_TNB_ADMIN", "tnb_admin");
 
     private final String value;
-    AccountRole(String value) {
+    private final String desc;
+    AccountRole(String value, String desc) {
         this.value = value;
+        this.desc = desc;
     }
 
     public String getName() {
@@ -25,4 +27,8 @@ public enum AccountRole {
     public String getValue() {
         return value;
     }
+
+    public String getDesc() {
+        return desc;
+    }
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/config/web/UserRoleInterceptor.java

@@ -33,7 +33,7 @@ public class UserRoleInterceptor implements HandlerInterceptor {
                     || uri.startsWith("/api/content/exam/question")
                     || uri.startsWith("/api/content/exam/paper")) {
                 if (!UserContext.getUserRoles().contains(AccountRole.examAdmin.getValue())) {
-                    String msg = "Current user not ExamAdmin";
+                    String msg = String.format("current user not grant %s role", AccountRole.examAdmin.getDesc());
                     writeResponse(response, msg);
                     return false;
                 }
@@ -41,7 +41,7 @@ public class UserRoleInterceptor implements HandlerInterceptor {
 
             if (uri.startsWith("/api/content/exam/eval")
                     && !UserContext.getUserRoles().contains(AccountRole.examUser.getValue())) {
-                String msg = "Current user not ExamUser";
+                String msg = String.format("current user not grant %s role", AccountRole.examUser.getDesc());
                 writeResponse(response, msg);
                 return false;
             }
@@ -49,7 +49,7 @@ public class UserRoleInterceptor implements HandlerInterceptor {
 
         if (uri.startsWith("/api/content/disk")
                 && !UserContext.getUserRoles().contains(AccountRole.disk.getValue())) {
-            String msg = "current user not grant ROLE_DISK";
+            String msg = String.format("current user not grant %s role", AccountRole.disk.getDesc());
             writeResponse(response, msg);
             return false;
         }