优化

internal/service/api_token.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"kra/internal/biz"
+	"kra/internal/service/dto"
 )
 
 type TokenService struct {
@@ -16,12 +17,12 @@ func NewTokenService(uc *biz.TokenUsecase, issuer biz.TokenIssuer) *TokenService
 	return &TokenService{uc: uc, issuer: issuer}
 }
 
-func tokenDTO(v *biz.APIToken) map[string]any {
-	var user any = nil
+func tokenDTO(v *biz.APIToken) *dto.APITokenResponse {
+	var user *dto.UserResponse
 	if v.User != nil {
 		user = convertUser(v.User)
 	}
-	return map[string]any{"ID": v.ID, "CreatedAt": v.CreatedAt, "UpdatedAt": v.UpdatedAt, "DeletedAt": nil, "userId": v.UserID, "authorityId": v.AuthorityID, "token": v.Token, "status": v.Status, "expiresAt": v.ExpiresAt, "remark": v.Remark, "user": user}
+	return &dto.APITokenResponse{ID: v.ID, CreatedAt: v.CreatedAt, UpdatedAt: v.UpdatedAt, DeletedAt: nil, UserID: v.UserID, AuthorityID: v.AuthorityID, Token: v.Token, Status: v.Status, ExpiresAt: v.ExpiresAt, Remark: v.Remark, User: user}
 }
 
 func (s *TokenService) CreateAPIToken(ctx context.Context, userID, authorityID uint, days int, remark string) (string, error) {
@@ -39,12 +40,12 @@ func (s *TokenService) CreateAPIToken(ctx context.Context, userID, authorityID u
 	}
 	return issued.Value, nil
 }
-func (s *TokenService) APITokens(ctx context.Context, page, size int, userID uint, status *bool) ([]map[string]any, int64, error) {
+func (s *TokenService) APITokens(ctx context.Context, page, size int, userID uint, status *bool) ([]*dto.APITokenResponse, int64, error) {
 	items, total, err := s.uc.ListAPITokens(ctx, page, size, userID, status)
 	if err != nil {
 		return nil, 0, err
 	}
-	out := make([]map[string]any, 0, len(items))
+	out := make([]*dto.APITokenResponse, 0, len(items))
 	for _, v := range items {
 		out = append(out, tokenDTO(v))
 	}