perf: perfect ntfy

starudream · Sep 5, 2024 · 03c67f8 · 03c67f8
1 parent 65a487c
commit 03c67f8
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,13 @@
+# Sign-Task
+
+<div style="text-align: center;">
+
+![golang](https://img.shields.io/github/actions/workflow/status/starudream/sign-task/golang.yml?style=for-the-badge&logo=github&label=golang)
+![release](https://img.shields.io/github/v/release/starudream/sign-task?style=for-the-badge)
+![license](https://img.shields.io/github/license/starudream/sign-task?style=for-the-badge)
+
+![sign-task](https://socialify.git.ci/starudream/sign-task/image?font=Inter&forks=1&issues=1&language=1&name=1&owner=1&pattern=Circuit%20Board&pulls=1&stargazers=1&theme=Auto)
+
+</div>
+
+## [License](./LICENSE)
diff --git a/pkg/cfg/config_keys b/pkg/cfg/config_keys
@@ -1,11 +1,16 @@
 $.version
 $.time
 
-$.rr
-$.rr.key
-
-$.tt
-$.tt.key
+$.geetest
+$.geetest.cron
+$.geetest.cron.disable
+$.geetest.cron.spec
+$.geetest.cron.startup
+$.geetest.cron.jitter
+$.geetest.rr
+$.geetest.rr.key
+$.geetest.tt
+$.geetest.tt.key
 
 $.douyu
 $.douyu.cron

diff --git a/pkg/cfg/options.go b/pkg/cfg/options.go
@@ -10,13 +10,12 @@ var options = []yaml.EncodeOption{
 	yaml.UseLiteralStyleIfMultiline(true),
 	yaml.WithComment(yaml.CommentMap{
 		"$":          []*yaml.Comment{yaml.HeadComment("", " https://github.com/starudream/sign-task", "")},
-		"$.rr":       []*yaml.Comment{yaml.HeadComment(" 人人打码", "  http://www.rrocr.com")},
-		"$.tt":       []*yaml.Comment{yaml.HeadComment(" 套套打码", "  http://www.ttocr.com")},
-		"$.douyu":    []*yaml.Comment{yaml.HeadComment(" 斗鱼", "  https://www.douyu.com")},
-		"$.kuro":     []*yaml.Comment{yaml.HeadComment(" 库街区", "  https://www.kurobbs.com")},
-		"$.miyoushe": []*yaml.Comment{yaml.HeadComment(" 米游社", "  https://www.miyoushe.com")},
-		"$.skland":   []*yaml.Comment{yaml.HeadComment(" 森空岛", "  https://www.skland.com")},
-		"$.tieba":    []*yaml.Comment{yaml.HeadComment(" 百度贴吧", "  https://tieba.baidu.com")},
+		"$.geetest":  []*yaml.Comment{yaml.HeadComment(" 打码")},
+		"$.douyu":    []*yaml.Comment{yaml.HeadComment(" 斗鱼")},
+		"$.kuro":     []*yaml.Comment{yaml.HeadComment(" 库街区")},
+		"$.miyoushe": []*yaml.Comment{yaml.HeadComment(" 米游社")},
+		"$.skland":   []*yaml.Comment{yaml.HeadComment(" 森空岛")},
+		"$.tieba":    []*yaml.Comment{yaml.HeadComment(" 百度贴吧")},
 		"$.log":      []*yaml.Comment{yaml.HeadComment(" 日志", "  https://pkg.go.dev/github.com/starudream/go-lib/core/v2/config/global#Config")},
 		"$.ntfy":     []*yaml.Comment{yaml.HeadComment(" 通知", "  https://pkg.go.dev/github.com/starudream/go-lib/ntfy/v2#Config")},
 	}),

diff --git a/pkg/douyu/cmd/exec.go b/pkg/douyu/cmd/exec.go
@@ -18,20 +18,16 @@ var (
 	execRefreshCmd = cobra.NewCommand(func(c *cobra.Command) {
 		c.Use = "refresh <account phone>"
 		c.Short = "Exec refresh"
-		c.RunE = func(cmd *cobra.Command, args []string) (err error) {
-			rf := job.Refresh(config.GetAccountOrFirst(args...))
-			fmt.Println(rf.String())
-			return
+		c.Run = func(cmd *cobra.Command, args []string) {
+			fmt.Println(job.Refresh(config.GetAccountOrFirst(args...)).String())
 		}
 	})
 
 	execRenewalCmd = cobra.NewCommand(func(c *cobra.Command) {
 		c.Use = "renewal <account phone>"
 		c.Short = "Exec renewal"
-		c.RunE = func(cmd *cobra.Command, args []string) (err error) {
-			rn := job.Renewal(config.GetAccountOrFirst(args...))
-			fmt.Println(rn.String())
-			return
+		c.Run = func(cmd *cobra.Command, args []string) {
+			fmt.Println(job.Renewal(config.GetAccountOrFirst(args...)).String())
 		}
 	})
 )

diff --git a/pkg/douyu/douyu.go b/pkg/douyu/douyu.go
@@ -1,8 +1,6 @@
 package douyu
 
 import (
-	"fmt"
-
 	"github.com/starudream/sign-task/pkg/cron"
 	"github.com/starudream/sign-task/pkg/douyu/config"
 	"github.com/starudream/sign-task/pkg/douyu/job"
@@ -16,8 +14,6 @@ func init() {
 type douyu struct {
 }
 
-var _ cron.Job = (*douyu)(nil)
-
 func (douyu) Name() string {
 	return "douyu"
 }
@@ -28,10 +24,8 @@ func (j douyu) Do() {
 	}
 }
 
-func (douyu) do(account config.Account) {
-	rf := job.Refresh(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, rf))
+func (j douyu) do(a config.Account) {
+	util.NtfyJob(j, a.GetKey(), job.Refresh(a).String())
 
-	rn := job.Renewal(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, rn))
+	util.NtfyJob(j, a.GetKey(), job.Renewal(a).String())
 }
diff --git a/pkg/geetest/job.go b/pkg/geetest/job.go
@@ -0,0 +1,38 @@
+package geetest
+
+import (
+	"fmt"
+
+	"github.com/starudream/sign-task/pkg/cron"
+	"github.com/starudream/sign-task/util"
+)
+
+func init() {
+	cron.Register(geetest{})
+}
+
+type geetest struct{}
+
+func (geetest) Name() string {
+	return "geetest"
+}
+
+func (j geetest) Do() {
+	if TTKey() != "" {
+		point, err := TTPoint(&V3Param{})
+		if err != nil {
+			util.NtfyJob(j, "套套", fmt.Sprintf("执行失败（%s）", err))
+		} else {
+			util.NtfyJob(j, "套套", fmt.Sprintf("剩余点数：%s", point))
+		}
+	}
+
+	if RRKey() != "" {
+		point, err := RRPoint(&V3Param{})
+		if err != nil {
+			util.NtfyJob(j, "人人", fmt.Sprintf("执行失败（%s）", err))
+		} else {
+			util.NtfyJob(j, "人人", fmt.Sprintf("剩余点数：%d", point))
+		}
+	}
+}
diff --git a/pkg/geetest/rr.go b/pkg/geetest/rr.go
@@ -18,7 +18,7 @@ type rrConfig struct {
 var rr = rrConfig{}
 
 func init() {
-	_ = config.Unmarshal("rr", &rr)
+	_ = config.Unmarshal("geetest.rr", &rr)
 }
 
 func RRKey() string {

diff --git a/pkg/geetest/tt.go b/pkg/geetest/tt.go
@@ -21,7 +21,7 @@ var tt = ttConfig{
 }
 
 func init() {
-	_ = config.Unmarshal("tt", &tt)
+	_ = config.Unmarshal("geetest.tt", &tt)
 }
 
 func TTKey() string {

diff --git a/pkg/kuro/cmd/sign.go b/pkg/kuro/cmd/sign.go
@@ -19,17 +19,15 @@ var (
 		c.Use = "game <account phone>"
 		c.Short = "Sign game"
 		c.Run = func(cmd *cobra.Command, args []string) {
-			sg := job.SignGame(config.GetAccountOrFirst(args...))
-			fmt.Println(sg.String())
+			fmt.Println(job.SignGame(config.GetAccountOrFirst(args...)).String())
 		}
 	})
 
 	signForumCmd = cobra.NewCommand(func(c *cobra.Command) {
 		c.Use = "forum <account phone>"
 		c.Short = "Sign forum"
 		c.Run = func(cmd *cobra.Command, args []string) {
-			sf := job.SignForum(config.GetAccountOrFirst(args...))
-			fmt.Println(sf.String())
+			fmt.Println(job.SignForum(config.GetAccountOrFirst(args...)).String())
 		}
 	})
 )

diff --git a/pkg/kuro/kuro.go b/pkg/kuro/kuro.go
@@ -1,8 +1,6 @@
 package kuro
 
 import (
-	"fmt"
-
 	"github.com/starudream/sign-task/pkg/cron"
 	"github.com/starudream/sign-task/pkg/kuro/config"
 	"github.com/starudream/sign-task/pkg/kuro/job"
@@ -15,8 +13,6 @@ func init() {
 
 type kuro struct{}
 
-var _ cron.Job = (*kuro)(nil)
-
 func (kuro) Name() string {
 	return "kuro"
 }
@@ -27,10 +23,8 @@ func (j kuro) Do() {
 	}
 }
 
-func (kuro) do(account config.Account) {
-	sg := job.SignGame(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, sg))
+func (j kuro) do(a config.Account) {
+	util.NtfyJob(j, a.GetKey(), job.SignGame(a).String())
 
-	sf := job.SignForum(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, sf))
+	util.NtfyJob(j, a.GetKey(), job.SignForum(a).String())
 }
diff --git a/pkg/miyoushe/cmd/sign.go b/pkg/miyoushe/cmd/sign.go
@@ -24,8 +24,7 @@ var (
 			if err != nil {
 				return err
 			}
-			sg := job.SignGame(account)
-			fmt.Println(sg.String())
+			fmt.Println(job.SignGame(account).String())
 			return
 		}
 	})
@@ -34,8 +33,7 @@ var (
 		c.Use = "forum <account phone>"
 		c.Short = "Sign forum"
 		c.Run = func(cmd *cobra.Command, args []string) {
-			sf := job.SignForum(config.GetAccountOrFirst(args...))
-			fmt.Println(sf.String())
+			fmt.Println(job.SignForum(config.GetAccountOrFirst(args...)).String())
 		}
 	})
 )

diff --git a/pkg/miyoushe/miyoushe.go b/pkg/miyoushe/miyoushe.go
@@ -16,8 +16,6 @@ func init() {
 type miyoushe struct {
 }
 
-var _ cron.Job = (*miyoushe)(nil)
-
 func (miyoushe) Name() string {
 	return "miyoushe"
 }
@@ -28,16 +26,14 @@ func (j miyoushe) Do() {
 	}
 }
 
-func (miyoushe) do(account config.Account) {
-	account, err := job.Refresh(account)
+func (j miyoushe) do(a config.Account) {
+	a, err := job.Refresh(a)
 	if err != nil {
-		util.Ntfy(fmt.Sprintf("%s 执行失败（%s）", account.Phone, err))
+		util.NtfyJob(j, a.GetKey(), fmt.Sprintf("执行失败（%s）", err))
 		return
 	}
 
-	sg := job.SignGame(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, sg))
+	util.NtfyJob(j, a.GetKey(), job.SignGame(a).String())
 
-	sf := job.SignForum(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, sf))
+	util.NtfyJob(j, a.GetKey(), job.SignForum(a).String())
 }
diff --git a/pkg/skland/cmd/sign.go b/pkg/skland/cmd/sign.go
@@ -24,8 +24,7 @@ var (
 			if err != nil {
 				return err
 			}
-			sg := job.SignGame(account)
-			fmt.Println(sg.String())
+			fmt.Println(job.SignGame(account).String())
 			return
 		}
 	})

diff --git a/pkg/skland/skland.go b/pkg/skland/skland.go
@@ -15,8 +15,6 @@ func init() {
 
 type skland struct{}
 
-var _ cron.Job = (*skland)(nil)
-
 func (skland) Name() string {
 	return "skland"
 }
@@ -27,13 +25,12 @@ func (j skland) Do() {
 	}
 }
 
-func (skland) do(account config.Account) {
-	account, err := job.Refresh(account)
+func (j skland) do(a config.Account) {
+	a, err := job.Refresh(a)
 	if err != nil {
-		util.Ntfy(fmt.Sprintf("%s 执行失败（%s）", account.Phone, err))
+		util.NtfyJob(j, a.GetKey(), fmt.Sprintf("执行失败（%s）", err))
 		return
 	}
 
-	sg := job.SignGame(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, sg))
+	util.NtfyJob(j, a.GetKey(), job.SignGame(a).String())
 }
diff --git a/pkg/tieba/cmd/sign.go b/pkg/tieba/cmd/sign.go
@@ -19,8 +19,7 @@ var (
 		c.Use = "forum <account phone>"
 		c.Short = "Sign forum"
 		c.Run = func(cmd *cobra.Command, args []string) {
-			sf := job.SignForum(config.GetAccountOrFirst(args...))
-			fmt.Println(sf.String())
+			fmt.Println(job.SignForum(config.GetAccountOrFirst(args...)).String())
 		}
 	})
 )

diff --git a/pkg/tieba/tieba.go b/pkg/tieba/tieba.go
@@ -1,8 +1,6 @@
 package tieba
 
 import (
-	"fmt"
-
 	"github.com/starudream/sign-task/pkg/cron"
 	"github.com/starudream/sign-task/pkg/tieba/config"
 	"github.com/starudream/sign-task/pkg/tieba/job"
@@ -16,8 +14,6 @@ func init() {
 type tieba struct {
 }
 
-var _ cron.Job = (*tieba)(nil)
-
 func (tieba) Name() string {
 	return "tieba"
 }
@@ -28,7 +24,6 @@ func (j tieba) Do() {
 	}
 }
 
-func (tieba) do(account config.Account) {
-	sf := job.SignForum(account)
-	util.Ntfy(fmt.Sprintf("%s %s", account.Phone, sf))
+func (j tieba) do(a config.Account) {
+	util.NtfyJob(j, a.GetKey(), job.SignForum(a).String())
 }
diff --git a/pkg/xiaoheihe/xiaoheihe.go b/pkg/xiaoheihe/xiaoheihe.go
@@ -11,8 +11,6 @@ func init() {
 type xiaoheihe struct {
 }
 
-var _ cron.Job = (*xiaoheihe)(nil)
-
 func (xiaoheihe) Name() string {
 	return "xiaoheihe"
 }

diff --git a/util/ntfy.go b/util/ntfy.go
@@ -3,9 +3,12 @@ package util
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/starudream/go-lib/core/v2/slog"
 	"github.com/starudream/go-lib/ntfy/v2"
+
+	"github.com/starudream/sign-task/pkg/cron"
 )
 
 func Ntfy(text string) {
@@ -14,3 +17,7 @@ func Ntfy(text string) {
 		slog.Error("notify error: %v", err)
 	}
 }
+
+func NtfyJob(j cron.Job, k, s string) {
+	Ntfy(fmt.Sprintf("[%s] %s\n%s", j.Name(), k, s))
+}