Ver código fonte

refactor(aodun): 优化域名白名单处理逻辑

-移除 unused 的 json 包导入
- 将 DomainResponse 结构体中的 Msg 类型从 json.RawMessage 改为 string
-修正域名白名单 API 请求中的参数格式
- 更新 API 错误处理,增加对 data 字段的输出
- 替换域名白名单 API 的用户名和密码
- 移除调试用的 spew.Dump 打印语句
fusu 1 mês atrás
pai
commit
928c55c3bd

+ 1 - 3
api/v1/aodun.go

@@ -1,7 +1,5 @@
 package v1
 
-import "encoding/json"
-
 type GetTokenRespone struct {
 	Code        int    `json:"code"`                 // 操作结果代码;0成功,其他失败
 	Msg         string `json:"msg,omitempty"`        // 操作结果描述或错误原因 (omitempty 表示如果字段为空则在 JSON 中忽略)
@@ -30,7 +28,7 @@ type IpResponse struct {
 }
 type DomainResponse struct {
 	Code        int    `json:"err"`
-	Msg         json.RawMessage `json:"msg,omitempty"`
+	Msg         string `json:"msg,omitempty"`
 	Data        string `json:"data,omitempty"`
 }
 

+ 2 - 2
config/local.yml

@@ -95,8 +95,8 @@ aodunIp:
   Url: "https://115.238.186.169:16008"
 
 domainWhite:
-  username: "zznet_api"
-  password: "Nbgaofang.com!@#4"
+  username: "自用_高防产品"
+  password: "bduaSDxGvWc5ALWl"
 # RabbitMQ Configuration
 rabbitmq:
   host: "110.42.96.15"

+ 2 - 2
config/prod.yml

@@ -97,8 +97,8 @@ aodunIp:
   Url: "https://115.238.186.169:16008"
 
 domainWhite:
-  username: "zznet_api"
-  password: "Nbgaofang.com!@#4"
+  username: "自用_高防产品"
+  password: "bduaSDxGvWc5ALWl"
 
 rabbitmq:
   host: "110.42.96.15"

+ 4 - 3
internal/service/aodun.go

@@ -100,7 +100,7 @@ func (s *aoDunService) sendDomainFormData(ctx context.Context,domain string,ip s
 	formData.Set("username", s.domainUserName)
 	formData.Set("password", s.domainPassword)
 	formData.Add("do_main_list[name][]", domain)
-	formData.Add("do_main_list[ip][]", ip)
+	formData.Add("do_main_list[ip]", ip)
 	encodedData := formData.Encode()
 
 	req, err := http.NewRequest("POST", URL, bytes.NewBuffer([]byte(encodedData)))
@@ -279,11 +279,12 @@ func (s *aoDunService) DomainWhiteList(ctx context.Context, domain string, ip st
 	if err := json.Unmarshal(resBody, &res); err != nil {
 		return fmt.Errorf("反序列化响应 JSON 失败 ( 内容: %s): %w", string(resBody), err)
 	}
+
 	if res.Code != 200 && apiType == "add" {
-		return fmt.Errorf("API 错误: code %d, msg '%s'", res.Code, res.Msg)
+		return fmt.Errorf("API 错误: code %d, msg '%s', data '%s", res.Code, res.Msg, res.Data)
 	}
 	if res.Code != 600 && apiType == "del" {
-		return fmt.Errorf("API 错误: code %d, msg '%s'", res.Code, res.Msg)
+		return fmt.Errorf("API 错误: code %d, msg '%s', data '%s", res.Code, res.Msg, res.Data)
 	}
 	return nil
 }

+ 0 - 3
internal/service/webforwarding.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/davecgh/go-spew/spew"
 	v1 "github.com/go-nunu/nunu-layout-advanced/api/v1"
 	"github.com/go-nunu/nunu-layout-advanced/internal/model"
 	"github.com/go-nunu/nunu-layout-advanced/internal/repository"
@@ -311,7 +310,6 @@ func (s *webForwardingService) AddWebForwarding(ctx context.Context, req *v1.Web
 	if err != nil {
 		return err
 	}
-	spew.Dump(req.WebForwardingData.Domain)
 	if req.WebForwardingData.Domain != "" {
 		// 异步任务:将域名添加到白名单
 		doMain, err := s.wafformatter.ConvertToWildcardDomain(ctx, req.WebForwardingData.Domain)
@@ -322,7 +320,6 @@ func (s *webForwardingService) AddWebForwarding(ctx context.Context, req *v1.Web
 		if err != nil {
 			return err
 		}
-		spew.Dump(ip,"=================================")
 		go s.publishDomainWhitelistTask(doMain,ip, "add")
 	}