GetCAPTCHA 添加 bark 通知功能

Signed-off-by: allan716 <[email protected]>

cmd/GetCAPTCHA/backend/config/config.go

@@ -7,12 +7,13 @@ import (
 )
 
 type Config struct {
-	EveryTime              string
-	SSHKeyFullPath         string
-	SSHKeyPwd              string
-	CloneProjectDesSaveDir string
-	GitProjectUrl          string
-	DesURL                 string
+	EveryTime                     string
+	SSHKeyFullPath                string
+	SSHKeyPwd                     string
+	CloneProjectDesSaveDir        string
+	GitProjectUrl                 string
+	DesURL                        string
+	WhenSubSupplierInvalidWebHook string
 }
 
 // GetConfig 统一获取配置的接口

cmd/GetCAPTCHA/backend/get_code.go

@@ -3,7 +3,7 @@ package backend
 import (
 	b64 "encoding/base64"
 	"errors"
-	"fmt"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/rod_helper"
 	"github.com/go-rod/rod/lib/proto"
 	"regexp"
@@ -12,7 +12,7 @@ import (
 
 func GetCode(codeUrl string) (string, error) {
 
-	fmt.Println("Start Get Code...")
+	log_helper.GetLogger().Infoln("Start Get Code...")
 	browser, err := rod_helper.NewBrowser("", false)
 	if err != nil {
 		return "", err
@@ -48,7 +48,7 @@ func GetCode(codeUrl string) (string, error) {
 
 	sEnc := b64.StdEncoding.EncodeToString([]byte(code))
 
-	fmt.Println("End Get Code")
+	log_helper.GetLogger().Infoln("End Get Code")
 
 	return sEnc, nil
 }

cmd/GetCAPTCHA/backend/git_helper.go

@@ -1,9 +1,9 @@
 package backend
 
 import (
-	"fmt"
 	"github.com/allanpk716/ChineseSubFinder/cmd/GetCAPTCHA/backend/config"
 	"github.com/allanpk716/ChineseSubFinder/internal/common"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/my_util"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/something_static"
 	"github.com/go-git/go-git/v5"
@@ -16,7 +16,7 @@ import (
 
 func GitProcess(config config.Config, enString string) error {
 
-	fmt.Println("Now Time", time.Now().Format("2006-01-02 15:04:05"))
+	log_helper.GetLogger().Infoln("Now Time", time.Now().Format("2006-01-02 15:04:05"))
 	nowTime := time.Now().Format("2006-01-02")
 
 	// 实例化登录密钥
@@ -30,7 +30,7 @@ func GitProcess(config config.Config, enString string) error {
 	var w *git.Worktree
 	if my_util.IsDir(config.CloneProjectDesSaveDir) == true {
 		// 需要 pull
-		fmt.Println("Pull Start...")
+		log_helper.GetLogger().Infoln("Pull Start...")
 		r, err = git.PlainOpen(config.CloneProjectDesSaveDir)
 		if err != nil {
 			return err
@@ -45,10 +45,10 @@ func GitProcess(config config.Config, enString string) error {
 				return err
 			}
 		}
-		fmt.Println("Pull End")
+		log_helper.GetLogger().Infoln("Pull End")
 	} else {
 		// 需要 clone
-		fmt.Println("PlainClone Start...")
+		log_helper.GetLogger().Infoln("PlainClone Start...")
 
 		r, err = git.PlainClone(config.CloneProjectDesSaveDir, false, &git.CloneOptions{
 			Auth:     publicKeys,
@@ -58,7 +58,7 @@ func GitProcess(config config.Config, enString string) error {
 		if err != nil {
 			return err
 		}
-		fmt.Println("PlainClone End")
+		log_helper.GetLogger().Infoln("PlainClone End")
 
 	}
 	// 存储外部传入的字符串到文件
@@ -68,11 +68,11 @@ func GitProcess(config config.Config, enString string) error {
 	}
 	if bok == false {
 		// 说明无需继续，因为文件没有变化
-		fmt.Println("Code not change, Skip This Time")
+		log_helper.GetLogger().Infoln("Code not change, Skip This Time")
 		return nil
 	}
 
-	fmt.Println("Write File Done")
+	log_helper.GetLogger().Infoln("Write File Done")
 	w, err = r.Worktree()
 	if err != nil {
 		return err
@@ -82,7 +82,7 @@ func GitProcess(config config.Config, enString string) error {
 		return err
 	}
 	status, err := w.Status()
-	fmt.Println("Status", status)
+	log_helper.GetLogger().Infoln("Status", status)
 	commit, err := w.Commit("update", &git.CommitOptions{
 		Author: &object.Signature{
 			Name:  "haha",
@@ -97,7 +97,7 @@ func GitProcess(config config.Config, enString string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("Commit Done")
+	log_helper.GetLogger().Infoln("Commit Done")
 	err = r.Push(&git.PushOptions{
 		Auth: publicKeys,
 	})
@@ -105,7 +105,7 @@ func GitProcess(config config.Config, enString string) error {
 		return err
 	}
 
-	fmt.Println("Push Done.")
+	log_helper.GetLogger().Infoln("Push Done.")
 
 	return nil
 }

cmd/GetCAPTCHA/main.go

@@ -1,14 +1,17 @@
 package main
 
 import (
-	"fmt"
 	"github.com/allanpk716/ChineseSubFinder/cmd/GetCAPTCHA/backend"
 	"github.com/allanpk716/ChineseSubFinder/cmd/GetCAPTCHA/backend/config"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
+	"github.com/allanpk716/ChineseSubFinder/internal/pkg/notify_center"
 	"github.com/robfig/cron/v3"
 )
 
 func main() {
 
+	notify_center.Notify = notify_center.NewNotifyCenter(config.GetConfig().WhenSubSupplierInvalidWebHook)
+
 	// 任务还没执行完，下一次执行时间到来，下一次执行就跳过不执行
 	c := cron.New(cron.WithChain(cron.SkipIfStillRunning(cron.DefaultLogger)))
 	// 定时器
@@ -16,18 +19,18 @@ func main() {
 
 		err := Process()
 		if err != nil {
-			fmt.Println(err.Error())
+			log_helper.GetLogger().Errorln(err.Error())
 			return
 		}
 	})
 	if err != nil {
-		fmt.Println("cron entryID:", entryID, "Error:", err)
+		log_helper.GetLogger().Errorln("cron entryID:", entryID, "Error:", err)
 		return
 	}
 	// 先执行一次
 	err = Process()
 	if err != nil {
-		fmt.Println(err.Error())
+		log_helper.GetLogger().Errorln(err.Error())
 		return
 	}
 
@@ -38,7 +41,18 @@ func main() {
 
 func Process() error {
 
-	fmt.Println("-----------------------------------------")
+	var err error
+	notify_center.Notify.Clear()
+	defer func() {
+
+		if err != nil {
+			notify_center.Notify.Add("GetSubhdCode", err.Error())
+		}
+
+		notify_center.Notify.Send()
+	}()
+
+	log_helper.GetLogger().Infoln("-----------------------------------------")
 
 	codeB64, err := backend.GetCode(config.GetConfig().DesURL)
 	if err != nil {