重构单点-2

pjcloud-auth/src/main/java/com/bsd/pjcloud/auth/endpoint/PjcloudTokenEndpoint.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.dto.UserTokenDTO;
 import com.bsd.pjcloud.admin.api.entity.SysOauthClientDetails;
 import com.bsd.pjcloud.admin.api.entity.SysTenant;
+import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteClientDetailsService;
 import com.bsd.pjcloud.admin.api.feign.RemoteTenantService;
 import com.bsd.pjcloud.admin.api.vo.TokenVO;
@@ -116,10 +117,11 @@ public class PjcloudTokenEndpoint {
 						.build())
 				.build();
 
-
+		SysUser sysUser = userTokenDTO.getSysUser();
 		// 构建用户信息 , 这里只拼接了  UserTokenDTO 中的 username 和 authorities ，其他字段写死，可以自行场地；
-		PjcloudUser pigUser = new PjcloudUser(1L, userTokenDTO.getUsername(),1L,null,"","","", "", 1L
-				, "", true, true,"1", true,false, userTokenDTO.getAuthorities()
+		PjcloudUser pigUser = new PjcloudUser(sysUser.getUserId(),sysUser.getUsername(),sysUser.getDeptId(),sysUser.getPhone()
+				,sysUser.getAvatar(),sysUser.getNickname(),sysUser.getName(), sysUser.getEmail(), sysUser.getTenantId()
+				, sysUser.getPassword(), true, true,"1", true,false, userTokenDTO.getAuthorities()
 				.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toList()));
 
 		Authentication usernamePasswordAuthentication = new UsernamePasswordAuthenticationToken(pigUser, StrUtil.EMPTY);