From 76f7d9a2305cef3a63716864b37c84dd97eec250 Mon Sep 17 00:00:00 2001 From: yzqzss Date: Thu, 4 Jul 2024 21:34:38 +0800 Subject: [PATCH] chan: panda --- cmd/huashijie_work_go/huashijie_work_go.go | 12 ++++++++--- pkg/huashijie_api.go | 24 ++++++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/cmd/huashijie_work_go/huashijie_work_go.go b/cmd/huashijie_work_go/huashijie_work_go.go index 05e8db2..25e6997 100644 --- a/cmd/huashijie_work_go/huashijie_work_go.go +++ b/cmd/huashijie_work_go/huashijie_work_go.go @@ -25,8 +25,9 @@ var Interrupted = false var WaitClaimWorker sync.WaitGroup var WaitProcesserWorker sync.WaitGroup -// 2024/06/08 16:22:36 [huashijie_work] ... -var Logger = log.New(os.Stdout, "[huashijie_work] ", log.Ldate|log.Ltime|log.Lmsgprefix) +var project_id = "huashijie_work" + +var Logger *log.Logger var DEBUG = false func init() { @@ -41,6 +42,11 @@ func init() { if os.Getenv("DEBUG") != "" { DEBUG = true } + if os.Getenv("HSJ_ENDPOINT") == "pandapaint" { + project_id = "huashijie_work_pandapaint" + } + // 2024/06/08 16:22:36 [huashijie_work] ... + Logger = log.New(os.Stdout, "["+project_id+"] ", log.Ldate|log.Ltime|log.Lmsgprefix) } // ClaimTask 并把任务放入 task_chan @@ -167,7 +173,7 @@ func ShowStatus(t *savewebtracker.Tracker) { } func main() { - tracker := savewebtracker.GetTracker("huashijie_work", "0.3", savewebtracker.Archivist()) + tracker := savewebtracker.GetTracker(project_id, "0.3", savewebtracker.Archivist()) tracker.PING_client = GetRetryableHttpClient(10*time.Second, DEBUG) tracker.HTTP_client = GetRetryableHttpClient(10*time.Second, DEBUG) tracker.SelectBestTracker().StartSelectTrackerBackground().StartFetchProjectBackground() diff --git a/pkg/huashijie_api.go b/pkg/huashijie_api.go index 1767bb0..d89841a 100644 --- a/pkg/huashijie_api.go +++ b/pkg/huashijie_api.go @@ -5,6 +5,7 @@ import ( "io" "math/rand" "net/http" + "os" "strings" ) @@ -49,7 +50,11 @@ func EnsureConnection(client http.Client) { } func GetWorkDetailResponse(client http.Client, work_id string) ([]byte, int) { - req, err := http.NewRequest("GET", "https://app.huashijie.art/api/work/detailV2", nil) + endpoint := "https://app.huashijie.art/" + if os.Getenv("HSJ_ENDPOINT") == "pandapaint" { + endpoint = "https://api.pandapaint.net/" + } + req, err := http.NewRequest("GET", endpoint+"api/work/detailV2", nil) if err != nil { panic(err) } @@ -60,15 +65,26 @@ func GetWorkDetailResponse(client http.Client, work_id string) ([]byte, int) { q.Add("platform", "android") os_version := rand.Intn(34-28) + 28 q.Add("os_version", fmt.Sprintf("%d", os_version)) - q.Add("version_code", "241") + + if os.Getenv("HSJ_ENDPOINT") == "pandapaint" { + q.Add("version_code", "168") + } else { + q.Add("version_code", "241") + } + q.Add("device_brand", "xiaomi") device_model := XIAOMI_MODELS[rand.Intn(len(XIAOMI_MODELS))] q.Add("device_model", device_model) q.Add("token", "") - q.Add("channel", "main") + + if os.Getenv("HSJ_ENDPOINT") == "pandapaint" { + q.Add("channel", "Panda.main") + } else { + q.Add("channel", "main") + } headers := map[string][]string{ - "Referer": {"https://app.huashijie.art/"}, + "Referer": {endpoint}, "User-Agent": {"okhttp/3.12.0"}, } for k, v := range headers {