ci: use gofumpt

fufuok · Mar 17, 2024 · 80f294b · 80f294b
1 parent b800611
commit 80f294b
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 41 deletions.
diff --git a/cmder/helper.go b/cmder/helper.go
@@ -15,9 +15,7 @@ const (
 	cmdTimeout = 3 * time.Second
 )
 
-var (
-	ErrCMDTimeout = errors.New("command execution timed out")
-)
+var ErrCMDTimeout = errors.New("command execution timed out")
 
 // RunCmd 运行命令, 返回结果和状态
 func RunCmd(cmdArgs []string, timeout ...time.Duration) cmd.Status {

diff --git a/common/funcs.go b/common/funcs.go
@@ -4,9 +4,7 @@ import (
 	"github.com/fufuok/utils/xsync"
 )
 
-var (
-	// Funcs 通用函数集合, 用于远程配置获取等场景
-	Funcs = xsync.NewMapOf[string, Func]()
-)
+// Funcs 通用函数集合, 用于远程配置获取等场景
+var Funcs = xsync.NewMapOf[string, Func]()
 
 type Func func(args any) error
diff --git a/common/redis.go b/common/redis.go
@@ -10,10 +10,8 @@ import (
 
 // !!! 注意: 先执行 InitRedisDB(...) 初始化后再使用下面的方法
 
-var (
-	// RedisDB Redis 连接
-	RedisDB redis.UniversalClient
-)
+// RedisDB Redis 连接
+var RedisDB redis.UniversalClient
 
 // InitRedisDB 指定已初始化的 *redis.Client
 func InitRedisDB(rdb redis.UniversalClient) {

diff --git a/config/default.go b/config/default.go
@@ -183,6 +183,6 @@ func initDefaultConfig() {
 }
 
 func makePaths() {
-	_ = os.MkdirAll(LogPath, 0755)
-	_ = os.MkdirAll(ConfigPath, 0755)
+	_ = os.MkdirAll(LogPath, 0o755)
+	_ = os.MkdirAll(ConfigPath, 0o755)
 }
diff --git a/config/env.go b/config/env.go
@@ -8,9 +8,7 @@ import (
 	"github.com/joho/godotenv"
 )
 
-var (
-	ExtraEnvFiles []string
-)
+var ExtraEnvFiles []string
 
 // 读取 .env 配置
 // 后加载的优先, 已存在的环境变量值会被覆盖

diff --git a/config/procs.go b/config/procs.go
@@ -6,7 +6,5 @@ import (
 	"github.com/fufuok/utils"
 )
 
-var (
-	// DefaultGOMAXPROCS 缺省的并发配置, 最少 4
-	DefaultGOMAXPROCS = utils.MaxInt(runtime.NumCPU(), 4)
-)
+// DefaultGOMAXPROCS 缺省的并发配置, 最少 4
+var DefaultGOMAXPROCS = utils.MaxInt(runtime.NumCPU(), 4)
diff --git a/config/remote.go b/config/remote.go
@@ -42,7 +42,7 @@ func GetDataSource(args any) error {
 	md5Old := xhash.MustMD5Sum(params.Conf.Path)
 	md5New := xhash.MD5Hex(body)
 	if md5New != md5Old {
-		if err = os.WriteFile(params.Conf.Path, []byte(body), 0600); err != nil {
+		if err = os.WriteFile(params.Conf.Path, []byte(body), 0o600); err != nil {
 			return err
 		}
 	}

diff --git a/crontab/init.go b/crontab/init.go
@@ -9,10 +9,8 @@ import (
 	"github.com/fufuok/pkg/logger"
 )
 
-var (
-	// 定时任务调度器
-	crontab *cron.Cron
-)
+// 定时任务调度器
+var crontab *cron.Cron
 
 type M struct{}
 

diff --git a/master/pipeline.go b/master/pipeline.go
@@ -24,13 +24,15 @@ var (
 	remotePipelines []ContextFunc
 )
 
-type Stage int
-type ContextFunc func(ctx context.Context)
-type Pipeline interface {
-	Start() error
-	Runtime() error
-	Stop() error
-}
+type (
+	Stage       int
+	ContextFunc func(ctx context.Context)
+	Pipeline    interface {
+		Start() error
+		Runtime() error
+		Stop() error
+	}
+)
 
 func Register(stage Stage, sf ...Pipeline) {
 	mu.Lock()

diff --git a/web/fiber/engine/init.go b/web/fiber/engine/init.go
@@ -18,9 +18,7 @@ import (
 	"github.com/fufuok/pkg/web/fiber/response"
 )
 
-var (
-	app *fiber.App
-)
+var app *fiber.App
 
 type App func(app *fiber.App) *fiber.App
 

diff --git a/web/fiber/response/exception.go b/web/fiber/response/exception.go
@@ -12,9 +12,7 @@ const (
 	defaultErrMsg = "错误的请求"
 )
 
-var (
-	apiSuccessNil = json.MustJSON(APISuccessNilData())
-)
+var apiSuccessNil = json.MustJSON(APISuccessNilData())
 
 // APIException 通用异常处理
 func APIException(c *fiber.Ctx, code int, msg string, data any) error {

diff --git a/web/gin/engine/init.go b/web/gin/engine/init.go
@@ -12,9 +12,7 @@ import (
 	"github.com/fufuok/pkg/web/gin/middleware"
 )
 
-var (
-	app *gin.Engine
-)
+var app *gin.Engine
 
 type App func(app *gin.Engine) *gin.Engine