feat(auth): add user profile to auth token response

- Add jwt configuration in application.yaml
- Include user profile information in authentication response
- Implement user profile response DTO with role mapping
- Fix typo in UserProfileService interface and implementation class names
- Add pagination support for user list endpoint
- Configure MyBatis Plus interceptor for MariaDB
- Add MyBatis Plus JSQLParser dependency
- Implement page-based user retrieval with role information
- Remove obsolete MyBatis configuration class
- Update controller to use paginated user data
- Replace manual user conversion with constructor mapping
- Rename UserProfileServcie to UserProfileService consistently

chaos_api_data/pom.xml

@@ -48,7 +48,11 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.5.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-jsqlparser -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
         </dependency>
     </dependencies>
 </project>

chaos_api_data/src/main/java/cn/nopj/chaos_api/config/MyBatisPlusConfig.java

@@ -1,9 +0,0 @@
-package cn.nopj.chaos_api.config;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@MapperScan("cn.nopj.chaos_api.mapper")
-public class MyBatisPlusConfig {
-}

chaos_api_data/src/main/java/cn/nopj/chaos_api/mapper/UserMapper.java

@@ -3,6 +3,8 @@ package cn.nopj.chaos_api.mapper;
 import cn.nopj.chaos_api.domain.entity.Role;
 import cn.nopj.chaos_api.domain.entity.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.*;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -99,4 +101,30 @@ public interface UserMapper extends BaseMapper<User> {
                     many = @Many(select = "findRolesByUserId"))
     })
     User findUserWithRolesByUsername(String username);
+    /**
+     * 分页查询用户，并携带角色信息
+     * MyBatis-Plus 会自动处理 Page 参数进行物理分页
+     * @param page 分页对象
+     * @param keyword 搜索关键词 (可选)
+     * @return 分页后的用户列表 (包含角色)
+     */
+    @Select("""
+        <script>
+        SELECT * FROM t_user
+        <where>
+            <if test='keyword != null and keyword != ""'>
+                AND (username LIKE CONCAT('%', #{keyword}, '%') OR nickname LIKE CONCAT('%', #{keyword}, '%'))
+            </if>
+        </where>
+        ORDER BY id ASC
+        </script>
+    """)
+    @Results({
+            @Result(id = true, property = "id", column = "id"),
+            @Result(property = "username", column = "username"),
+            @Result(property = "nickname", column = "nickname"),
+            @Result(property = "roles", column = "id",
+                    many = @Many(select = "findRolesByUserId"))
+    })
+    IPage<User> selectPageWithRoles(Page<User> page, @Param("keyword") String keyword);
 }

chaos_api_domain/src/main/java/cn/nopj/chaos_api/dto/response/AuthTokenResponse.java

@@ -3,8 +3,8 @@ package cn.nopj.chaos_api.dto.response;
 import lombok.Data;
 
 @Data
-
 public class AuthTokenResponse {
     private String tokenHead;
     private String token;
+    private UserProfileResponse userProfile;
 }

chaos_api_domain/src/main/java/cn/nopj/chaos_api/dto/response/UserProfileResponse.java

@@ -1,5 +1,6 @@
 package cn.nopj.chaos_api.dto.response;
 
+import cn.nopj.chaos_api.domain.entity.User;
 import lombok.Data;
 
 import java.util.List;
@@ -10,4 +11,16 @@ public class UserProfileResponse {
     private String username;
     private String nickname;
     private List<RoleResponse> roles;
+
+    public UserProfileResponse(User user) {
+        this.id = user.getId();
+        this.username = user.getUsername();
+        this.nickname = user.getNickname();
+        this.roles = user.getRoles().stream().map(role -> {
+            RoleResponse roleResponse = new RoleResponse();
+            roleResponse.setId(role.getId());
+            roleResponse.setName(role.getName());
+            return roleResponse;
+        }).toList();
+    }
 }

chaos_api_interface/src/main/java/cn/nopj/chaos_api/service/UserProfileService.java

@@ -2,6 +2,7 @@ package cn.nopj.chaos_api.service;
 
 import cn.nopj.chaos_api.dto.request.UserProfileUpdateRequest;
 import cn.nopj.chaos_api.dto.response.UserProfileResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 
@@ -12,7 +13,7 @@ import java.util.List;
  *
  * @author nopj
  */
-public interface UserProfileServcie {
+public interface UserProfileService {
 
     /**
      * 设置用户密码
@@ -80,4 +81,13 @@ public interface UserProfileServcie {
      * @return 处理结果
      */
     UserProfileResponse updateUserProfile(String username, UserProfileUpdateRequest request);
+
+    /**
+     * 获取所有用户信息
+     *
+     * @param pageNum 页码
+     * @param pageSize 页大小
+     * @return 所有用户信息
+     */
+    IPage<UserProfileResponse> getAllUsers(Integer pageNum, Integer pageSize);
 }

chaos_api_service/src/main/java/cn/nopj/chaos_api/service/impl/UserProfileServiceImpl.java

@@ -7,7 +7,9 @@ import cn.nopj.chaos_api.dto.request.UserProfileUpdateRequest;
 import cn.nopj.chaos_api.dto.response.RoleResponse;
 import cn.nopj.chaos_api.dto.response.UserProfileResponse;
 import cn.nopj.chaos_api.mapper.UserMapper;
-import cn.nopj.chaos_api.service.UserProfileServcie;
+import cn.nopj.chaos_api.service.UserProfileService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -18,7 +20,7 @@ import java.util.List;
 
 @Slf4j
 @Service
-public class UserProfileServcieImpl implements UserProfileServcie {
+public class UserProfileServiceImpl implements UserProfileService {
     @Autowired
     private PasswordEncoder passwordEncoder;
     @Autowired
@@ -47,7 +49,7 @@ public class UserProfileServcieImpl implements UserProfileServcie {
             throw new RuntimeException("获取所有用户信息失败");
         }
 
-        return allUserWithRoles.stream().map(this::userConverterUserinfo).toList();
+        return allUserWithRoles.stream().map(UserProfileResponse::new).toList();
     }
 
     @Override
@@ -91,7 +93,7 @@ public class UserProfileServcieImpl implements UserProfileServcie {
         if (user == null) {
             throw new BizException(ErrorCode.USER_NOT_EXISTS);
         }
-        return userConverterUserinfo(user);
+        return new UserProfileResponse(user);
     }
 
     @Override
@@ -108,7 +110,7 @@ public class UserProfileServcieImpl implements UserProfileServcie {
         if (i == 0) {
             throw new BizException(ErrorCode.USER_UPDATE_NICKNAME_FAILED);
         }
-        return userConverterUserinfo(user);
+        return new UserProfileResponse(user);
     }
 
     @Override
@@ -123,7 +125,7 @@ public class UserProfileServcieImpl implements UserProfileServcie {
         if (i == 0) {
             throw new BizException(ErrorCode.USER_UPDATE_NICKNAME_FAILED);
         }
-        return userConverterUserinfo(user);
+        return new UserProfileResponse(user);
     }
 
     @Override
@@ -148,30 +150,17 @@ public class UserProfileServcieImpl implements UserProfileServcie {
         if (i == 0) {
             throw new BizException(ErrorCode.USER_UPDATE_PROFILE_FAILED);
         }
-        return userConverterUserinfo(user);
+        return new UserProfileResponse(user);
+    }
+
+    @Override
+    public IPage<UserProfileResponse> getAllUsers(Integer pageNum, Integer pageSize) {
+        Page<User> page = new Page<>(pageNum, pageSize);
+        IPage<User> userPage = userMapper.selectPageWithRoles(page, null);
+        return userPage.convert(UserProfileResponse::new);
     }
 
 
-    /**
-     * User 转 UserinfoResponse
-     * @param user  用户
-     * @return 用户信息
-     */
-    private UserProfileResponse userConverterUserinfo(User user) {
-        UserProfileResponse userProfileResponse = new UserProfileResponse();
-        userProfileResponse.setId(user.getId());
-        userProfileResponse.setUsername(user.getUsername());
-        userProfileResponse.setNickname(user.getNickname());
-        userProfileResponse.setRoles(
-                user.getRoles().stream().map(role -> {
-                    RoleResponse roleResponse = new RoleResponse();
-                    roleResponse.setId(role.getId());
-                    roleResponse.setName(role.getName());
-                    return roleResponse;
-                }).toList()
-        );
-        return userProfileResponse;
-    }
 
 
 

chaos_api_web/src/main/java/cn/nopj/chaos_api/config/MybatisPlusConfig.java

@@ -0,0 +1,21 @@
+package cn.nopj.chaos_api.config;
+
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("cn.nopj.chaos_api.mapper")
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MARIADB));
+        return interceptor;
+    }
+}

chaos_api_web/src/main/java/cn/nopj/chaos_api/controller/UserController.java

@@ -7,7 +7,8 @@ import cn.nopj.chaos_api.dto.request.UpdateUsernameRequest;
 import cn.nopj.chaos_api.dto.request.UserProfileUpdateRequest;
 import cn.nopj.chaos_api.dto.response.UserProfileResponse;
 import cn.nopj.chaos_api.model.ApiResult;
-import cn.nopj.chaos_api.service.UserProfileServcie;
+import cn.nopj.chaos_api.service.UserProfileService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,7 +27,7 @@ import java.util.List;
 @RequestMapping("/api/user")
 public class UserController {
     @Autowired
-    private UserProfileServcie userProfileServcie;
+    private UserProfileService userProfileService;
 
     /**
      * 获取所有用户信息
@@ -34,8 +35,8 @@ public class UserController {
      */
     @PreAuthorize("hasAuthority('admin')")
     @GetMapping("/all")
-    ApiResult<List<UserProfileResponse>> getAllUsers(){
+    ApiResult<IPage<UserProfileResponse>> getAllUsers(@RequestParam(defaultValue = "1" , name = "pageNum") Integer pageNum, @RequestParam(defaultValue = "10", name="pageSize") Integer pageSize){
-        return ApiResult.success(userProfileServcie.getAllUsers());
+        return ApiResult.success(userProfileService.getAllUsers(pageNum, pageSize));
     }
 
     /**
@@ -46,7 +47,7 @@ public class UserController {
     @PreAuthorize("hasAuthority('admin')")
     @PutMapping("/setUserPassword")
     ApiResult<String> setUserPassword(@RequestBody @Validated SetUserPasswordRequest request){
-        userProfileServcie.setUserPassword(request.getUserId(), request.getPassword());
+        userProfileService.setUserPassword(request.getUserId(), request.getPassword());
         return ApiResult.success("用户密码修改成功");
     }
 
@@ -57,7 +58,7 @@ public class UserController {
      */
     @PutMapping("/updateUsername")
     ApiResult<String> updateUsername(@RequestAttribute("currentUsername") String username,@RequestBody @Validated UpdateUsernameRequest request){
-        userProfileServcie.updateUsername(username, request.getUsername());
+        userProfileService.updateUsername(username, request.getUsername());
         return ApiResult.success("用户名更新成功");
     }
 
@@ -68,7 +69,7 @@ public class UserController {
      */
     @GetMapping("/profile")
     ApiResult<UserProfileResponse> getCurrentUserProfile(@RequestAttribute("currentUsername") String username){
-        return ApiResult.success(userProfileServcie.findUserWithRoles(username));
+        return ApiResult.success(userProfileService.findUserWithRoles(username));
     }
 
     /**
@@ -79,7 +80,7 @@ public class UserController {
      */
     @PatchMapping("/profile")
     ApiResult<UserProfileResponse> getUserInfo(@RequestAttribute("currentUsername") String username, @RequestBody @Validated UserProfileUpdateRequest request){
-        return ApiResult.success(userProfileServcie.updateUserProfile(username,request));
+        return ApiResult.success(userProfileService.updateUserProfile(username,request));
     }
 
     /**
@@ -89,6 +90,6 @@ public class UserController {
     @PreAuthorize("hasAuthority('admin')")
     @PutMapping("/{userId}/nickname")
     ApiResult<UserProfileResponse> setNickname(@PathVariable Long userId, @RequestBody @Validated SetUserNicknameRequest request){
-        return ApiResult.success(userProfileServcie.setUserNickname(userId,request.getNickname()));
+        return ApiResult.success(userProfileService.setUserNickname(userId,request.getNickname()));
     }
 }

chaos_api_web/src/main/java/cn/nopj/chaos_api/service/impl/AuthServiceImpl.java

@@ -6,6 +6,7 @@ import cn.nopj.chaos_api.common.exceotion.BizException;
 import cn.nopj.chaos_api.domain.entity.Role;
 import cn.nopj.chaos_api.domain.entity.User;
 import cn.nopj.chaos_api.dto.response.AuthTokenResponse;
+import cn.nopj.chaos_api.dto.response.UserProfileResponse;
 import cn.nopj.chaos_api.mapper.RoleMapper;
 import cn.nopj.chaos_api.mapper.UserMapper;
 import cn.nopj.chaos_api.service.AuthService;
@@ -79,9 +80,16 @@ public class AuthServiceImpl implements AuthService {
             if (!userDetails.isEnabled()) {
                 throw new BizException(ErrorCode.USER_NOT_ENABLED);
             }
+
+            User user = userMapper.findUserWithRolesByUsername(username);
+            UserProfileResponse userProfileResponse = new UserProfileResponse(user);
+
             AuthTokenResponse res = new AuthTokenResponse();
             res.setToken(jwtTokenUtil.generateToken(userDetails));
             res.setTokenHead(tokenHead);
+            res.setUserProfile(userProfileResponse);
+
+
             return res;
 
         }catch (BadCredentialsException | InternalAuthenticationServiceException e) {

chaos_api_web/src/main/resources/application.yaml

@@ -35,6 +35,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
+
 jwt:
   tokenHeader: Authorization
   tokenHead: Chaos

pom.xml

@@ -143,6 +143,13 @@
                 <artifactId>spring-context</artifactId>
                 <version>6.2.13</version>
             </dependency>
+
+            <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-jsqlparser -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-jsqlparser</artifactId>
+                <version>3.5.14</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>