浏览代码

refactor(cdn): 修改访问日志接口返回类型

- 将 GetAccessLog 接口的返回类型从 []cdn.Data 改为 cdn.Data
- 相应地修改了 cdnService 和 cdnLogService 中的实现
- 这个改动统一了访问日志数据的返回结构,提高了代码
fusu 1 周之前
父节点
当前提交
e628025eb4
共有 2 个文件被更改,包括 11 次插入10 次删除
  1. 7 6
      internal/service/api/flexCdn/cdn.go
  2. 4 4
      internal/service/api/waf/cdnlog.go

+ 7 - 6
internal/service/api/flexCdn/cdn.go

@@ -8,6 +8,7 @@ import (
 	"github.com/go-nunu/nunu-layout-advanced/api/v1/cdn"
 	"github.com/go-nunu/nunu-layout-advanced/internal/repository/api/flexCdn"
 	"github.com/go-nunu/nunu-layout-advanced/internal/service"
+
 	"github.com/spf13/viper"
 	"strings"
 )
@@ -74,7 +75,7 @@ type CdnService interface {
 	// 修改IP
 	EditIpItem(ctx context.Context, req v1.AddIpItem) error
 	// 获取访问日志
-	GetAccessLog(ctx context.Context, req cdn.Request) ([]cdn.Data, error)
+	GetAccessLog(ctx context.Context, req cdn.Request) (cdn.Data, error)
 }
 
 func NewCdnService(
@@ -1184,7 +1185,7 @@ func (s *cdnService) EditIpItem(ctx context.Context, req v1.AddIpItem) error {
 }
 
 // 获取访问日志
-func (s *cdnService) GetAccessLog(ctx context.Context, req cdn.Request) ([]cdn.Data, error) {
+func (s *cdnService) GetAccessLog(ctx context.Context, req cdn.Request) (cdn.Data, error) {
 	formData := map[string]interface{}{
 		"serverId": req.ServerID,
 		"size":     req.Size,
@@ -1199,14 +1200,14 @@ func (s *cdnService) GetAccessLog(ctx context.Context, req cdn.Request) ([]cdn.D
 	apiUrl := s.Url + "HTTPAccessLogService/listHTTPAccessLogs"
 	resBody, err := s.sendDataWithTokenRetry(ctx, formData, apiUrl)
 	if err != nil {
-		return nil, err
+		return cdn.Data{}, err
 	}
-	var res v1.GeneralResponse[[]cdn.Data]
+	var res v1.GeneralResponse[cdn.Data]
 	if err := json.Unmarshal(resBody, &res); err != nil {
-		return nil, fmt.Errorf("反序列化响应 JSON 失败 (内容: %s): %w", string(resBody), err)
+		return cdn.Data{}, fmt.Errorf("反序列化响应 JSON 失败 (内容: %s): %w", string(resBody), err)
 	}
 	if res.Code != 200 {
-		return nil, fmt.Errorf("API 错误: code %d, msg '%s'", res.Code, res.Message)
+		return cdn.Data{}, fmt.Errorf("API 错误: code %d, msg '%s'", res.Code, res.Message)
 	}
 	return res.Data, nil
 }

+ 4 - 4
internal/service/api/waf/cdnlog.go

@@ -10,7 +10,7 @@ import (
 )
 
 type CdnLogService interface {
-	GetAccessLog(ctx *gin.Context,req v1.GetCdnLog) ([]cdnStruct.Data, error)
+	GetAccessLog(ctx *gin.Context,req v1.GetCdnLog) (cdnStruct.Data, error)
 }
 func NewCdnLogService(
     service *service.Service,
@@ -40,10 +40,10 @@ type cdnLogService struct {
 }
 
 
-func (s *cdnLogService) GetAccessLog(ctx *gin.Context,req v1.GetCdnLog) ([]cdnStruct.Data, error) {
+func (s *cdnLogService) GetAccessLog(ctx *gin.Context,req v1.GetCdnLog) (cdnStruct.Data, error) {
 	serverId, err := s.ccIpList.GetServerId(ctx,req.WebId)
 	if err != nil {
-		return nil, err
+		return cdnStruct.Data{}, err
 	}
 
 	logData, err := s.cdn.GetAccessLog(ctx,cdnStruct.Request{
@@ -59,7 +59,7 @@ func (s *cdnLogService) GetAccessLog(ctx *gin.Context,req v1.GetCdnLog) ([]cdnSt
 	})
 
 	if err != nil {
-		return nil, err
+		return cdnStruct.Data{}, err
 	}
 	return logData, nil