Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#3388]Remove the deleted roles and permissions info during reloading role info #3419

Closed
wants to merge 7 commits into from
Closed

[#3388]Remove the deleted roles and permissions info during reloading role info #3419

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
417dedd
Remove the deleted roles and permissions info during reloading role info
Jul 20, 2020
c1fd546
Remove the deleted roles and permissions info during reloading role info
yanjunnf Jul 20, 2020
7e3961c
Merge branch 'issue-#3388' of https://github.com/yanjunnf/nacos into …
Jul 23, 2020
716f091
Merge branch 'issue-#3388' of https://github.com/yanjunnf/nacos into …
yanjunnf Jul 23, 2020
8e9f9a7
Merge branch 'issue-#3388' of https://github.com/yanjunnf/nacos into …
Jul 23, 2020
da3dbc5
Merge branch 'issue-#3388' of https://github.com/yanjunnf/nacos into …
yanjunnf Jul 23, 2020
418dab2
Merge branch 'issue-#3388' of https://github.com/yanjunnf/nacos into …
yanjunnf Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions ...le/src/main/java/com/alibaba/nacos/console/security/nacos/roles/NacosRoleServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -95,8 +96,29 @@ private void reload() {
tmpPermissionInfoMap.put(role, permissionInfoPage.getPageItems());
}

Iterator<String> roleIt = roleSet.iterator();
while (roleIt.hasNext()) {
String role = roleIt.next();
if (!tmpRoleSet.contains(role)) {
roleIt.remove();
}
}
roleSet.addAll(tmpRoleSet);

for (Iterator<Map.Entry<String, List<RoleInfo>>> roleInfoIt = roleInfoMap.entrySet().iterator(); roleInfoIt.hasNext();) {
Map.Entry<String, List<RoleInfo>> item = roleInfoIt.next();
if (!tmpRoleInfoMap.containsKey(item.getKey())) {
roleInfoIt.remove();
}
}
roleInfoMap.putAll(tmpRoleInfoMap);

for (Iterator<Map.Entry<String, List<PermissionInfo>>> permissionIt = permissionInfoMap.entrySet().iterator(); permissionIt.hasNext();) {
Map.Entry<String, List<PermissionInfo>> item = permissionIt.next();
if (!tmpPermissionInfoMap.containsKey(item.getKey())) {
permissionIt.remove();
}
}
permissionInfoMap.putAll(tmpPermissionInfoMap);
} catch (Exception e) {
Loggers.AUTH.warn("[LOAD-ROLES] load failed", e);
Expand Down