persist login info and add logout function

.github/workflows/go_fir_cli_build.yml

@@ -1,4 +1,4 @@
-name: go_fir_cli build
+name: go-fir-cli build
 on:
   release:
     types: [created]
@@ -25,4 +25,4 @@ jobs:
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
           goversion: "1.19.1"
-          binary_name: "go_fir_cli"
+          binary_name: "go-fir-cli"

.gitignore

@@ -1,7 +1,7 @@
 icon.png
 qr.png
-go_fir_cli
-go_fir_cli.exe
+go-fir-cli
+go-fir-cli.exe
 test.go
 *.apk
 *.ipa

README.md

@@ -15,6 +15,8 @@ go-fir-cli 只实现了 fir-cli 的部分功能, 并无计划实现全部功能,
 由于作者不善 golang, 所以大部分代码皆来自于 Copilot 和 chatGPT 生成, 作者仅在此基础上做了一些修改与调试, 以便于使用. 如果您在使用中发现任何问题, 欢迎提 issue 或者 pr.
 
 ## 更新说明
+- 0.0.7 支持了持久化登录
+- 0.0.6 支持了windows平台
 - 0.0.5 支持了上传进度条显示
 - 0.0.4 支持了 arm64 的二进制文件, 上传时会有命令行的提示
 - 0.0.3 支持了 企业微信、飞书和钉钉的通知机器人
@@ -51,7 +53,7 @@ go-fir-cli 只实现了 fir-cli 的部分功能, 并无计划实现全部功能,
 
 ### 检测API 是否可用
 
-```bash  
+```bash
 ./go-fir-cli login -t 您的API_TOKEN
 
 # 如
@@ -79,4 +81,3 @@ go-fir-cli 只实现了 fir-cli 的部分功能, 并无计划实现全部功能,
 ### 自行编译
 
 下载好代码 安装好依赖即可运行 go build
-

api/rio_api.go

@@ -10,8 +10,8 @@ import (
 	"path"
 	"time"
 
-	"betaqr.com/go_fir_cli/analysis"
-	"betaqr.com/go_fir_cli/constants"
+	"github.com/PGYER/go-fir-cli/analysis"
+	"github.com/PGYER/go-fir-cli/constants"
 	"github.com/cheggaaa/pb"
 	"github.com/go-resty/resty/v2"
 )

constants/constants.go

@@ -1,4 +1,4 @@
 package constants
 
-const VERSION = "0.0.4"
+const VERSION = "0.0.6"
 const USER_AGENT = "go-fir-" + VERSION

go.mod

@@ -1,4 +1,4 @@
-module betaqr.com/go_fir_cli
+module github.com/PGYER/go-fir-cli
 
 go 1.19
 

main.go

@@ -1,23 +1,24 @@
 package main
 
 import (
-	"betaqr.com/go_fir_cli/api"
-	"betaqr.com/go_fir_cli/constants"
-	"betaqr.com/go_fir_cli/notifiers"
-	"betaqr.com/go_fir_cli/utils"
 	"fmt"
-	"github.com/skip2/go-qrcode"
-	"gopkg.in/urfave/cli.v1"
 	"io/ioutil"
 	"os"
+
+	"github.com/PGYER/go-fir-cli/api"
+	"github.com/PGYER/go-fir-cli/constants"
+	"github.com/PGYER/go-fir-cli/notifiers"
+	"github.com/PGYER/go-fir-cli/utils"
+	"github.com/skip2/go-qrcode"
+	"gopkg.in/urfave/cli.v1"
 )
 
 func main() {
 	initCli()
 }
 func initCli() {
 	app := cli.NewApp()
-	app.Name = "go_fir_cli"
+	app.Name = "go-fir-cli"
 
 	app.Usage = "完成 fir.im 的命令行操作"
 	app.Version = constants.VERSION
@@ -31,22 +32,23 @@ func initCli() {
 
 	app.Commands = []cli.Command{
 		initLogin(),
+		logoutCommand(),
 		testWebhook(),
 		uploadFile(),
 		cli.Command{
 			Name:      "version",
 			ShortName: "v",
-			Usage:     "查看 go_fir_cli 版本",
+			Usage:     "查看 go-fir-cli 版本",
 			Action: func(c *cli.Context) error {
 				fmt.Println(constants.VERSION)
 				return nil
 			},
 		},
 		cli.Command{
 			Name:  "upgrade",
-			Usage: "如何升级 go_fir_cli",
+			Usage: "如何升级 go-fir-cli",
 			Action: func(c *cli.Context) error {
-				fmt.Println("请访问 https://github.com/PGYER/go-fir-cli/releases 下载对应版本, 并替换原有的 go_fir_cli 文件")
+				fmt.Println("请访问 https://github.com/PGYER/go-fir-cli/releases 下载对应版本, 并替换原有的 go-fir-cli 文件")
 				return nil
 			},
 		},
@@ -65,13 +67,28 @@ func initLogin() cli.Command {
 				Usage: "fir.im 的 api token",
 			},
 		},
+
 		Action: func(c *cli.Context) error {
 			api_token := c.String("token")
 			fir_api := &api.FirApi{}
 			if err := fir_api.Login(api_token); err != nil {
+				fmt.Println("登录失败, 请检查 token 是否正确")
+			} else {
+				fmt.Println(fir_api.Email + " 登录成功")
 				return utils.SaveToLocal(fir_api.Email, api_token)
 			}
-			fmt.Println(fir_api.Email)
+			return nil
+		},
+	}
+}
+
+func logoutCommand() cli.Command {
+	return cli.Command{
+		Name:  "logout",
+		Usage: "退出登录",
+		Action: func(c *cli.Context) error {
+			utils.DelConfig()
+			fmt.Println("已经退出登录")
 			return nil
 		},
 	}
@@ -114,7 +131,7 @@ func testWebhook() cli.Command {
 func uploadFile() cli.Command {
 	return cli.Command{
 		Name:  "upload",
-		Usage: "上传文件, 例如 go_fir_cli -t FIR_TOKEN upload -f FILE_PATH -c CHANGELOG",
+		Usage: "上传文件, 例如 go-fir-cli -t FIR_TOKEN upload -f FILE_PATH -c CHANGELOG",
 
 		Flags: []cli.Flag{
 			cli.StringFlag{

notifiers/dingtalk.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"time"
 
-	"betaqr.com/go_fir_cli/api"
+	"github.com/PGYER/go-fir-cli/api"
 	"github.com/go-resty/resty/v2"
 )
 

notifiers/lark.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"betaqr.com/go_fir_cli/api"
+	"github.com/PGYER/go-fir-cli/api"
 	"github.com/go-resty/resty/v2"
 )
 

notifiers/wecom.go

@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"time"
 
-	"betaqr.com/go_fir_cli/api"
+	"github.com/PGYER/go-fir-cli/api"
 	"github.com/go-resty/resty/v2"
 )
 

utils/token.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 )
 
+const CONFIG_FILE = ".go-fir-cli"
+
 func LoadLocalToken() string {
 	config, err := LoadLocalConfig()
 	if err != nil {
@@ -15,12 +17,25 @@ func LoadLocalToken() string {
 	return config["token"]
 }
 
+func DelConfig() error {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return err
+	}
+	tokenPath := filepath.Join(home, CONFIG_FILE)
+	// 如果存在, 则删除文件
+	if _, err := os.Stat(tokenPath); err == nil {
+		return os.Remove(tokenPath)
+	}
+	return nil
+}
+
 func LoadLocalConfig() (map[string]string, error) {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return nil, err
 	}
-	tokenPath := filepath.Join(home, ".fir-cli")
+	tokenPath := filepath.Join(home, CONFIG_FILE)
 	raw, err := os.ReadFile(tokenPath)
 	if err != nil {
 		return nil, err
@@ -45,6 +60,6 @@ func SaveToLocal(email string, token string) error {
 	if err != nil {
 		return err
 	}
-	tokenPath := filepath.Join(home, ".fir-cli")
+	tokenPath := filepath.Join(home, CONFIG_FILE)
 	return os.WriteFile(tokenPath, []byte(raw), 0644)
 }