diff --git a/src/main/java/com/project/ding/domain/dto/LoginDTO.java b/src/main/java/com/project/ding/domain/dto/LoginDTO.java index 937959b..86b758b 100644 --- a/src/main/java/com/project/ding/domain/dto/LoginDTO.java +++ b/src/main/java/com/project/ding/domain/dto/LoginDTO.java @@ -11,4 +11,5 @@ public class LoginDTO { private String token; // JWT 令牌 private String name; // 用户姓名 private List roles; // 用户角色列表 + private UserDTO user; //用户详细信息 } \ No newline at end of file diff --git a/src/main/java/com/project/ding/domain/service/impl/AuthDomainServiceImpl.java b/src/main/java/com/project/ding/domain/service/impl/AuthDomainServiceImpl.java index 4ea3d80..e2db61e 100644 --- a/src/main/java/com/project/ding/domain/service/impl/AuthDomainServiceImpl.java +++ b/src/main/java/com/project/ding/domain/service/impl/AuthDomainServiceImpl.java @@ -29,6 +29,9 @@ public class AuthDomainServiceImpl implements AuthDomainService { @Autowired private AuthenticationManager authenticationManager; + @Autowired + private SearchUserDomainServiceImpl searchUserDomainServiceImpl; + @Autowired private JwtUtils jwtUtils; @@ -67,6 +70,7 @@ public class AuthDomainServiceImpl implements AuthDomainService { .token(token) .name(user.getName()) .roles(roles) + .user(searchUserDomainServiceImpl.buildDTO(user)) .build(); } @@ -98,6 +102,7 @@ public class AuthDomainServiceImpl implements AuthDomainService { .token(token) .name(user.getName()) .roles(roles) + .user(searchUserDomainServiceImpl.buildDTO(user)) .build(); } } \ No newline at end of file diff --git a/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java b/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java index f8d1c7d..c206c7f 100644 --- a/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java +++ b/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java @@ -51,7 +51,7 @@ public class SearchUserDomainServiceImpl implements SearchUserDomainService { return Result.page(userDtoPage); } - private UserDTO buildDTO(UserEntity entity) { + public UserDTO buildDTO(UserEntity entity) { UserDTO dto = entity.toDTO(UserDTO::new); // 构建考试信息 dto.setNeedExamTaskCount(Long.valueOf(taskUserBaseService.count(new LambdaQueryWrapper() diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 92d68f1..1ac894b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -68,9 +68,9 @@ analysis: port: 8888 url: /word/parse ding: - appKey: ding7qohu1rhsl5cflme - appSecret: GYxRa6GLbfpDTInpAOGrdvZZDWMSJkdDsxbjxnh6kxFijnswnO9oIT6Y9d598VKp - agentId: 4244362006 + appKey: dinggl2ktuhdhoczkg2o + appSecret: nK104mgXPbkCWjX1I-EcYiubjM0FJAYcfqBKPkVcyvrBsLMF9XK1g9Qd_QVOndcK + agentId: 4283077101 algo: clusterUrl: /api/algorithm/v1/cluster baseUrl: / \ No newline at end of file