From 6f9749656390f0819aa16e015ca2989fa1978a5b Mon Sep 17 00:00:00 2001 From: yzy613 Date: Tue, 28 Feb 2023 19:14:06 +0800 Subject: [PATCH] chore: action update --- .github/workflows/go.yml | 12 +++--- internal/client/common.go | 2 +- internal/client/dnspod.go | 2 +- internal/client/public.go | 78 +++++++++++++++++++-------------------- internal/common/common.go | 8 +--- 5 files changed, 49 insertions(+), 53 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 27179f9..fa9fb1e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,10 +2,10 @@ name: Go on: push: - branches: [ master ] - tags: [ v* ] + branches: [ "master" ] + tags: [ "v*" ] pull_request: - branches: [ master ] + branches: [ "master" ] jobs: build: @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: "1.20" - name: Build client run: make -f Makefile.client @@ -28,8 +28,8 @@ jobs: - name: Build server run: make -f Makefile.server - - name: Upload release assets - uses: alexellis/upload-assets@0.3.0 + - name: Upload release binaries + uses: alexellis/upload-assets@0.4.0 if: startsWith(github.ref, 'refs/tags/v') env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/internal/client/common.go b/internal/client/common.go index 058a290..347576f 100644 --- a/internal/client/common.go +++ b/internal/client/common.go @@ -6,7 +6,7 @@ import ( ) var ( - installPath = "/etc/systemd/system/" + RunningName + ".service" + installPath = "/etc/systemd/system/" + ProjName + ".service" HttpsInsecure = false ) diff --git a/internal/client/dnspod.go b/internal/client/dnspod.go index 97fbbef..24bc01a 100644 --- a/internal/client/dnspod.go +++ b/internal/client/dnspod.go @@ -180,7 +180,7 @@ func postman(url, src string) (dst []byte, err error) { } }(req.Body) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") - req.Header.Set("User-Agent", RunningName+"/"+common.LocalVersion+" ()") + req.Header.Set("User-Agent", ProjName+"/"+common.LocalVersion+" ()") resp, err := httpClient.Do(req) if err != nil { return nil, err diff --git a/internal/client/public.go b/internal/client/public.go index 35fd944..0a40d7f 100644 --- a/internal/client/public.go +++ b/internal/client/public.go @@ -14,7 +14,7 @@ import ( ) const ( - RunningName = "ddns-watchdog-client" + ProjName = "ddns-watchdog-client" NetworkCardFileName = "network_card.json" ) @@ -33,52 +33,52 @@ type AsyncServiceCallback func(enabledServices common.Enable, ipv4, ipv6 string) func Install() (err error) { if common.IsWindows() { err = errors.New("windows 暂不支持安装到系统") - } else { - // 注册系统服务 - if Client.CheckCycleMinutes == 0 { - err = errors.New("设置一下 " + ConfDirectoryName + "/" + ConfFileName + " 的 check_cycle_minutes 吧") - return - } - wd, err := os.Getwd() - if err != nil { - return err - } - serviceContent := []byte( - "[Unit]\n" + - "Description=" + RunningName + " Service\n" + - "After=network.target\n\n" + - "[Service]\n" + - "Type=simple\n" + - "WorkingDirectory=" + wd + - "\nExecStart=" + wd + "/" + RunningName + " -c " + ConfDirectoryName + - "\nRestart=on-failure\n" + - "RestartSec=2\n\n" + - "[Install]\n" + - "WantedBy=multi-user.target\n") - err = os.WriteFile(installPath, serviceContent, 0600) - if err != nil { - return err - } - log.Println("可以使用 systemctl 控制 " + RunningName + " 服务了") + return + } + // 注册系统服务 + if Client.CheckCycleMinutes == 0 { + err = errors.New("设置一下 " + ConfDirectoryName + "/" + ConfFileName + " 的 check_cycle_minutes 吧") + return + } + wd, err := os.Getwd() + if err != nil { + return err } + serviceContent := []byte( + "[Unit]\n" + + "Description=" + ProjName + " Service\n" + + "After=network.target\n\n" + + "[Service]\n" + + "Type=simple\n" + + "WorkingDirectory=" + wd + + "\nExecStart=" + wd + "/" + ProjName + " -c " + ConfDirectoryName + + "\nRestart=on-failure\n" + + "RestartSec=2\n\n" + + "[Install]\n" + + "WantedBy=multi-user.target\n") + err = os.WriteFile(installPath, serviceContent, 0600) + if err != nil { + return err + } + log.Println("可以使用 systemctl 管理 " + ProjName + " 服务了") return } func Uninstall() (err error) { if common.IsWindows() { err = errors.New("windows 暂不支持安装到系统") - } else { - wd, err := os.Getwd() - if err != nil { - return err - } - err = os.Remove(installPath) - if err != nil { - return err - } - log.Println("卸载服务成功") - log.Println("若要完全删除,请移步到 " + wd + " 和 " + ConfDirectoryName + " 完全删除") + return + } + wd, err := os.Getwd() + if err != nil { + return err + } + err = os.Remove(installPath) + if err != nil { + return err } + log.Println("卸载服务成功") + log.Println("若要完全删除,请移步到 " + wd + " 和 " + ConfDirectoryName + " 完全删除") return } diff --git a/internal/common/common.go b/internal/common/common.go index 80e307e..7fc7e01 100644 --- a/internal/common/common.go +++ b/internal/common/common.go @@ -10,7 +10,7 @@ import ( ) const ( - LocalVersion = "1.5.4-rc1" + LocalVersion = "1.5.4" DefaultAPIUrl = "https://yzyweb.cn/ddns-watchdog" DefaultIPv6APIUrl = "https://yzyweb.cn/ddns-watchdog6" ProjectUrl = "https://github.com/yzy613/ddns-watchdog" @@ -68,11 +68,7 @@ func FormatDirectoryPath(srcPath string) (dstPath string) { } func IsWindows() bool { - if runtime.GOOS == "windows" { - return true - } else { - return false - } + return runtime.GOOS == "windows" } func IsDirExistAndCreate(dirPath string) (err error) {