diff --git a/.qoder/repowiki/zh/content/部署与配置/配置文件详解.md b/.qoder/repowiki/zh/content/部署与配置/配置文件详解.md index 51353f7..a873bd7 100644 --- a/.qoder/repowiki/zh/content/部署与配置/配置文件详解.md +++ b/.qoder/repowiki/zh/content/部署与配置/配置文件详解.md @@ -231,7 +231,7 @@ proxies = [] ```go func GetProxyInfo() ProxyInfo { return ProxyInfo{ - Url: env.Get("proxyUrl", "https://share.proxy.qg.net/get?key=7ASQH2BI&num=2&area=&isp=0&format=txt&seq=\\r\\n&distinct=false"), + Url: env.Get("proxyUrl", "https://share.proxy.qg.net/get?key=7ASQH2BI&num=2&area=&isp=0&format=txt&seq=\\n&distinct=false"), AuthKey: env.Get("proxyAuthKey", "7ASQH2BI"), AuthPwd: env.Get("proxyAuthPwd", "34D6652FE7B6"), } diff --git a/deploy/Dockerfile b/deploy/Dockerfile index efb2dca..59ddb31 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -22,7 +22,7 @@ ENV TZ=Asia/Shanghai \ shopAddr="" \ proxy="" \ proxyName="qkgo" \ - proxyUrl="https://share.proxy.qg.net/get?key=7ASQH2BI&num=2&area=&isp=0&format=txt&seq=\r\n&distinct=false" \ + proxyUrl="https://share.proxy.qg.net/get?key=7ASQH2BI&num=2&area=&isp=0&format=txt&seq=\n&distinct=false" \ proxyAuthKey="7ASQH2BI" \ proxyAuthPwd="34D6652FE7B6" diff --git a/internal/config/proxy.go b/internal/config/proxy.go index 619c35f..37715fc 100644 --- a/internal/config/proxy.go +++ b/internal/config/proxy.go @@ -10,7 +10,7 @@ type ProxyInfo struct { func GetProxyInfo() ProxyInfo { return ProxyInfo{ - Url: env.Get("proxyUrl", "https://share.proxy.qg.net/get?key=7ASQH2BI&num=2&area=&isp=0&format=txt&seq=\\r\\n&distinct=false"), + Url: env.Get("proxyUrl", "https://share.proxy.qg.net/get?key=7ASQH2BI&num=2&area=&isp=0&format=txt&seq=\\n&distinct=false"), AuthKey: env.Get("proxyAuthKey", "7ASQH2BI"), AuthPwd: env.Get("proxyAuthPwd", "34D6652FE7B6"), } diff --git a/internal/proxy/proxy_pool.go b/internal/proxy/proxy_pool.go index f11a390..40678f6 100644 --- a/internal/proxy/proxy_pool.go +++ b/internal/proxy/proxy_pool.go @@ -32,14 +32,13 @@ type Pool struct { var ( globalProxyPool *Pool - once sync.Once ) // GetGlobalProxyPool 获取全局代理池实例 func GetGlobalProxyPool() *Pool { - once.Do(func() { + sync.OnceFunc(func() { globalProxyPool = NewProxyPool() - }) + })() return globalProxyPool } diff --git a/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go b/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go index bcb2756..3244482 100644 --- a/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go +++ b/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go @@ -8,6 +8,7 @@ import ( "gateway/internal/models/road" "gateway/internal/otelTrace" "gateway/internal/utils" + "gateway/internal/utils/useragent" "net/url" "regexp" "sort" @@ -104,6 +105,7 @@ func (s *SendCardTaskTypeFlyFishV2) HandleSendCardTask(ctx context.Context, orde SetHeader("accept", "application/json, text/javascript, */*; q=0.01"). SetHeader("content-type", "application/x-www-form-urlencoded; charset=UTF-8"). SetHeader("origin", "https://apify.fkpay.online"). + SetHeader("user-agent", useragent.GetUserAgentByPlatform(useragent.PlatformPhone)). SetHeader("referer", "https://apify.fkpay.online/show.html?orderId=FY17568845864231914279"). SetTimeout(time.Second * 20).OnBeforeRequest(func(client *resty.Client, request *resty.Request) error { proxy, _ := utils.GetProxy(ctx, utils.GenerateId(), "SendCardTaskTypeFlyFishV2_cardTask") diff --git a/internal/utils/proxy_pool.go b/internal/utils/proxy_pool.go index a2ee71a..f4caf97 100644 --- a/internal/utils/proxy_pool.go +++ b/internal/utils/proxy_pool.go @@ -442,7 +442,8 @@ func (p *OrderBasedProxyStrategy) tryGetProxy(ctx context.Context) ([]string, er return []string{}, fmt.Errorf("获取代理IP失败") } - proxyIPs := strings.Split(proxyIP, "\n") + proxyIPs := strutil.SplitAndTrim(proxyIP, "\n") + slice.ForEach(proxyIPs, func(index int, item string) { proxyIPs[index] = strutil.Trim(item) }) diff --git a/main.go b/main.go index 08376d7..bfc588b 100644 --- a/main.go +++ b/main.go @@ -14,11 +14,10 @@ import ( "gateway/internal/service/supplier/third_party" "gateway/internal/service/supplier/third_party/queue" "gateway/internal/utils" - "log" - _ "net/http/pprof" - "github.com/beego/beego/v2/server/web" _ "github.com/go-sql-driver/mysql" + "log" + _ "net/http/pprof" ) func main() {