Pārlūkot izejas kodu

update AccountRole.java

reghao 3 dienas atpakaļ
vecāks
revīzija
51ec90a4b3

+ 1 - 1
auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/repository/AccountRepository.java

@@ -179,7 +179,7 @@ public class AccountRepository {
     private UserAccount setAccountAuthorities(UserAccount userAccount) {
         Set<UserAuthority> set = userRoleMapper.findRolesByUserId(userAccount.getUserId()).stream()
                 .map(userRole -> {
-                    String role = AccountRole.getByName(userRole.getName()).name();
+                    String role = AccountRole.valueOf(userRole.getName()).name();
                     return new UserAuthority(role);
                 })
                 .collect(Collectors.toSet());

+ 3 - 3
common/src/main/java/cn/reghao/tnb/common/auth/AccountRole.java

@@ -20,7 +20,7 @@ public enum AccountRole {
     private static final Map<String, AccountRole> map = new HashMap<>();
     static {
         for (AccountRole role : AccountRole.values()) {
-            map.put(role.name(), role);
+            map.put(role.value, role);
         }
     }
 
@@ -32,7 +32,7 @@ public enum AccountRole {
         return value;
     }
 
-    public static AccountRole getByName(String name) {
-        return map.get(name);
+    public static AccountRole getByValue(String value) {
+        return map.get(value);
     }
 }

+ 1 - 1
user/user-service/src/main/java/cn/reghao/tnb/user/app/service/ApprovalService.java

@@ -84,7 +84,7 @@ public class ApprovalService {
                 userService.charge(userId, amount);
             } else if (UserApprovalType.applyRole.name().equals(userApprovalType.name())) {
                 String role = jsonObject.get("role").getAsString();;
-                AccountRole accountRole = AccountRole.getByName(role);
+                AccountRole accountRole = AccountRole.getByValue(role);
                 if (accountRole != null) {
                     adminAccountService.grantRole(userId, accountRole.name());
                 } else {