diff --git a/.gitignore b/.gitignore index a2d92ec..8274d57 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,6 @@ pnpm-debug.log* *.sln *.sw? /ui/node +/logs +/LOGGING_HOME_IS_UNDEFINED +*.log \ No newline at end of file diff --git a/src/main/java/com/xuxd/kafka/console/service/impl/AclServiceImpl.java b/src/main/java/com/xuxd/kafka/console/service/impl/AclServiceImpl.java index 77c9f37..a99c055 100644 --- a/src/main/java/com/xuxd/kafka/console/service/impl/AclServiceImpl.java +++ b/src/main/java/com/xuxd/kafka/console/service/impl/AclServiceImpl.java @@ -88,9 +88,15 @@ public class AclServiceImpl implements AclService, SmartInitializingSingleton { List aclBindingList = entry.isNull() ? aclConsole.getAclList(null) : aclConsole.getAclList(entry); List entryList = aclBindingList.stream().map(x -> AclEntry.valueOf(x)).collect(Collectors.toList()); Map> entryMap = entryList.stream().collect(Collectors.groupingBy(AclEntry::getPrincipal)); - Map>> resultMap = new HashMap<>(); + Map resultMap = new HashMap<>(); entryMap.forEach((k, v) -> { Map> map = v.stream().collect(Collectors.groupingBy(e -> e.getResourceType() + "#" + e.getName())); + if (k.equals(kafkaConfig.getAdminUsername())) { + Map map2 = new HashMap<>(map); + Map userMap = new HashMap<>(); + userMap.put("role", "admin"); + map2.put("USER", userMap); + } resultMap.put(k, map); }); if (entry.isNull() || StringUtils.isNotBlank(entry.getPrincipal())) { @@ -98,7 +104,15 @@ public class AclServiceImpl implements AclService, SmartInitializingSingleton { detailList.values().forEach(u -> { if (!resultMap.containsKey(u.name()) && !u.credentialInfos().isEmpty()) { - resultMap.put(u.name(), Collections.emptyMap()); + if (!u.name().equals(kafkaConfig.getAdminUsername())) { + resultMap.put(u.name(), Collections.emptyMap()); + } else { + Map map2 = new HashMap<>(); + Map userMap = new HashMap<>(); + userMap.put("role", "admin"); + map2.put("USER", userMap); + resultMap.put(u.name(), map2); + } } }); } diff --git a/ui/src/router/index.js b/ui/src/router/index.js index 1bf47e4..55152dc 100644 --- a/ui/src/router/index.js +++ b/ui/src/router/index.js @@ -28,7 +28,8 @@ const routes = [ ]; const router = new VueRouter({ - mode: "history", + // mode: "history", + mode: "hash", base: process.env.BASE_URL, routes, }); diff --git a/ui/src/views/acl/Acl.vue b/ui/src/views/acl/Acl.vue index c2836cf..78bc53f 100644 --- a/ui/src/views/acl/Acl.vue +++ b/ui/src/views/acl/Acl.vue @@ -53,7 +53,11 @@ > - +