权限配置、默认用户、角色配置.

src/main/java/com/xuxd/kafka/console/beans/LoginResult.java

@@ -2,6 +2,8 @@ package com.xuxd.kafka.console.beans;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author: xuxd
  * @date: 2023/5/14 20:44
@@ -10,4 +12,6 @@ import lombok.Data;
 public class LoginResult {
 
     private String token;
+
+    private List<String> permissions;
 }

src/main/java/com/xuxd/kafka/console/controller/UserManageController.java

@@ -1,12 +1,15 @@
 package com.xuxd.kafka.console.controller;
 
 import com.xuxd.kafka.console.aspect.annotation.ControllerLog;
+import com.xuxd.kafka.console.beans.Credentials;
 import com.xuxd.kafka.console.beans.dto.SysPermissionDTO;
 import com.xuxd.kafka.console.beans.dto.SysRoleDTO;
 import com.xuxd.kafka.console.beans.dto.SysUserDTO;
 import com.xuxd.kafka.console.service.UserManageService;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: xuxd
  * @date: 2023/4/11 21:34
@@ -74,7 +77,11 @@ public class UserManageController {
 
     @ControllerLog("更新密码")
     @PostMapping("/user/password")
-    public Object updatePassword(@RequestBody SysUserDTO userDTO) {
+    public Object updatePassword(@RequestBody SysUserDTO userDTO, HttpServletRequest request) {
+        Credentials credentials = (Credentials)request.getAttribute("credentials");
+        if (credentials != null && !credentials.isInvalid()) {
+            userDTO.setUsername(credentials.getUsername());
+        }
         return userManageService.updatePassword(userDTO);
     }
 }

src/main/java/com/xuxd/kafka/console/dao/SysPermissionMapper.java

@@ -2,6 +2,7 @@ package com.xuxd.kafka.console.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xuxd.kafka.console.beans.dos.SysPermissionDO;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 系统权限 .
@@ -9,5 +10,6 @@ import com.xuxd.kafka.console.beans.dos.SysPermissionDO;
  * @author: xuxd
  * @date: 2023/4/11 21:21
  **/
+@Mapper
 public interface SysPermissionMapper extends BaseMapper<SysPermissionDO> {
 }

src/main/java/com/xuxd/kafka/console/dao/SysRoleMapper.java

@@ -2,10 +2,12 @@ package com.xuxd.kafka.console.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xuxd.kafka.console.beans.dos.SysRoleDO;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @author: xuxd
  * @date: 2023/4/11 21:22
  **/
+@Mapper
 public interface SysRoleMapper extends BaseMapper<SysRoleDO> {
 }

src/main/java/com/xuxd/kafka/console/interceptor/AuthFilter.java

@@ -58,6 +58,7 @@ public class AuthFilter implements Filter {
             response.setStatus(HttpStatus.UNAUTHORIZED.value());
             return;
         }
+        request.setAttribute("credentials", credentials);
 
         filterChain.doFilter(servletRequest, servletResponse);
     }

src/main/java/com/xuxd/kafka/console/service/impl/AuthServiceImpl.java

@@ -4,30 +4,51 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xuxd.kafka.console.beans.Credentials;
 import com.xuxd.kafka.console.beans.LoginResult;
 import com.xuxd.kafka.console.beans.ResponseData;
+import com.xuxd.kafka.console.beans.dos.SysPermissionDO;
+import com.xuxd.kafka.console.beans.dos.SysRoleDO;
 import com.xuxd.kafka.console.beans.dos.SysUserDO;
 import com.xuxd.kafka.console.beans.dto.LoginUserDTO;
 import com.xuxd.kafka.console.config.AuthConfig;
+import com.xuxd.kafka.console.dao.SysPermissionMapper;
+import com.xuxd.kafka.console.dao.SysRoleMapper;
 import com.xuxd.kafka.console.dao.SysUserMapper;
 import com.xuxd.kafka.console.service.AuthService;
 import com.xuxd.kafka.console.utils.AuthUtil;
 import com.xuxd.kafka.console.utils.UUIDStrUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.stereotype.Service;
 
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 /**
  * @author: xuxd
  * @date: 2023/5/14 19:01
  **/
 @Slf4j
 @Service
-public class AuthServiceImpl implements AuthService {
+public class AuthServiceImpl implements AuthService, SmartInitializingSingleton {
 
     private final SysUserMapper userMapper;
 
+    private final SysRoleMapper roleMapper;
+
+    private final SysPermissionMapper permissionMapper;
+
     private final AuthConfig authConfig;
 
-    public AuthServiceImpl(SysUserMapper userMapper, AuthConfig authConfig) {
+    private final Map<Long, SysPermissionDO> permCache = new HashMap<>();
+
+    public AuthServiceImpl(SysUserMapper userMapper,
+                           SysRoleMapper roleMapper,
+                           SysPermissionMapper permissionMapper,
+                           AuthConfig authConfig) {
         this.userMapper = userMapper;
+        this.roleMapper = roleMapper;
+        this.permissionMapper = permissionMapper;
         this.authConfig = authConfig;
     }
 
@@ -48,7 +69,37 @@ public class AuthServiceImpl implements AuthService {
         credentials.setExpiration(System.currentTimeMillis() + authConfig.getExpireHours() * 3600 * 1000);
         String token = AuthUtil.generateToken(authConfig.getSecret(), credentials);
         LoginResult loginResult = new LoginResult();
+        List<String> permissions = new ArrayList<>();
+        String roleIds = userDO.getRoleIds();
+        if (StringUtils.isNotEmpty(roleIds)) {
+            List<String> roleIdList = Arrays.stream(roleIds.split(",")).map(String::trim).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
+            roleIdList.forEach(roleId -> {
+                Long rId = Long.valueOf(roleId);
+                SysRoleDO roleDO = roleMapper.selectById(rId);
+                String permissionIds = roleDO.getPermissionIds();
+                if (StringUtils.isNotEmpty(permissionIds)) {
+                    List<Long> permIds = Arrays.stream(permissionIds.split(",")).map(String::trim).
+                            filter(StringUtils::isNotEmpty).map(Long::valueOf).collect(Collectors.toList());
+                    permIds.forEach(id -> {
+                        String permission = permCache.get(id).getPermission();
+                        if (StringUtils.isNotEmpty(permission)) {
+                            permissions.add(permission);
+                        } else {
+                            log.error("角色：{}，权限id: {}，不存在", roleId, id);
+                        }
+                    });
+                }
+            });
+        }
         loginResult.setToken(token);
+        loginResult.setPermissions(permissions);
         return ResponseData.create().data(loginResult).success();
     }
+
+    @Override
+    public void afterSingletonsInstantiated() {
+        List<SysPermissionDO> roleDOS = permissionMapper.selectList(null);
+        Map<Long, SysPermissionDO> map = roleDOS.stream().collect(Collectors.toMap(SysPermissionDO::getId, Function.identity(), (e1, e2) -> e1));
+        permCache.putAll(map);
+    }
 }

src/main/java/com/xuxd/kafka/console/service/impl/UserManageServiceImpl.java

@@ -213,7 +213,9 @@ public class UserManageServiceImpl implements UserManageService {
         SysUserDO userDO = userDTO.toDO();
         userDO.setSalt(UUIDStrUtil.random());
         userDO.setPassword(UUIDStrUtil.generate(userDTO.getPassword(), userDO.getSalt()));
-        userMapper.updateById(userDO);
+        QueryWrapper<SysUserDO> wrapper = new QueryWrapper<>();
+        wrapper.eq("username", userDTO.getUsername());
+        userMapper.update(userDO, wrapper);
         return ResponseData.create().success();
     }
 }