gofumpt

longyue0521 · longyue0521 · commit 5c69535ff72b · 2025-08-18T16:13:48.000+08:00
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -34,6 +34,8 @@ jobs:
         with:
           go-version: "1.24.2"
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.62.0
+          version: v2.4.0
+          args: --timeout=10m
+          only-new-issues: true
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ logs
 .log
 .sys
 **/local.yaml
+.tool-versions
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ e2e_down:
 .PHONY:	fmt
 fmt:
 	@goimports -l -w $$(find . -type f -name '*.go'  -not -path "./.idea/*" -not -name '*.pb.go' -not -name '*mock*.go')
+	@gofumpt -l -w $$(find . -type f -name '*.go' -not -path "./.idea/*" -not -path "./**/ioc/wire_gen.go" -not -path "./**/ioc/wire.go")
 
 .PHONY:	lint
 lint:
diff --git a/api/proto/gen/chat/v1/chat.pb.go b/api/proto/gen/chat/v1/chat.pb.go
diff --git a/api/proto/gen/chat/v1/chat_grpc.pb.go b/api/proto/gen/chat/v1/chat_grpc.pb.go
diff --git a/internal/admin/mock.go b/internal/admin/mock.go
@@ -23,8 +23,7 @@ import (
 )
 
 // MockHandler 这是 mock 的东西，你在生产环境要关掉
-type MockHandler struct {
-}
+type MockHandler struct{}
 
 func NewMockHandler() *MockHandler {
 	return new(MockHandler)
diff --git a/internal/admin/mock_product.go b/internal/admin/mock_product.go
@@ -22,8 +22,7 @@ import (
 )
 
 // MockHandler 这是 mock 的东西，你在生产环境要关掉
-type MockHandler struct {
-}
+type MockHandler struct{}
 
 func NewMockHandler() *MockHandler {
 	return new(MockHandler)
diff --git a/internal/admin/provider.go b/internal/admin/provider.go
@@ -79,7 +79,6 @@ func (h *ProviderHandler) GetModel(ctx *ginx.Context, sess session.Session) (gin
 		return ginx.Result{Code: 500, Msg: "内部错误"}, err
 	}
 	return ginx.Result{
-
 		Data: ModelVO{
 			ID:          model.ID,
 			Name:        model.Name,
diff --git a/internal/repository/chat.go b/internal/repository/chat.go
@@ -36,7 +36,8 @@ type ChatRepo struct {
 }
 
 func NewChatRepo(d *dao.ChatDAO, c *cache.ChatCache) *ChatRepo {
-	return &ChatRepo{dao: d,
+	return &ChatRepo{
+		dao:   d,
 		cache: c,
 		// 目前没有别的实现，先写死
 		snGen: &sn.Generator{},
diff --git a/internal/repository/dao/invocation_config.go b/internal/repository/dao/invocation_config.go
@@ -101,7 +101,8 @@ func (p *InvocationConfigDAO) SaveVersion(ctx context.Context, version Invocatio
 			"top_p",
 			"max_tokens",
 			"status",
-			"utime"}),
+			"utime",
+		}),
 	}).Save(&version).Error
 	return version.ID, err
 }
diff --git a/internal/repository/dao/provider.go b/internal/repository/dao/provider.go
@@ -68,7 +68,6 @@ func (d *ProviderDao) GetModelByPid(ctx context.Context, pid int64) ([]Model, er
 	err := d.db.WithContext(ctx).Model(&Model{}).
 		Where("pid = ?", pid).
 		Find(&model).Error
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/repository/model.go b/internal/repository/model.go
@@ -20,8 +20,7 @@ import (
 	"github.com/ecodeclub/ai-gateway-go/internal/domain"
 )
 
-type ModelRepository struct {
-}
+type ModelRepository struct{}
 
 func NewModelRepository() *ModelRepository {
 	return &ModelRepository{}
diff --git a/internal/repository/provider.go b/internal/repository/provider.go
@@ -52,7 +52,6 @@ func (p *ProviderRepo) SaveProvider(ctx context.Context, provider domain.Provide
 		Name:   provider.Name,
 		APIKey: provider.ApiKey,
 	})
-
 	if err != nil {
 		return 0, err
 	}
diff --git a/internal/service/chat.go b/internal/service/chat.go
@@ -32,9 +32,11 @@ type ChatService struct {
 }
 
 func NewChatService(repo *repository.ChatRepo, handler llm.Handler) *ChatService {
-	return &ChatService{repo: repo,
+	return &ChatService{
+		repo:   repo,
 		handle: handler,
-		logger: elog.DefaultLogger.With(elog.String("component", "ChatService"))}
+		logger: elog.DefaultLogger.With(elog.String("component", "ChatService")),
+	}
 }
 
 func (c *ChatService) Save(ctx context.Context, chat domain.Chat) (string, error) {
diff --git a/internal/service/invocation_config.go b/internal/service/invocation_config.go
@@ -36,7 +36,8 @@ func NewInvocationConfigService(
 	return &InvocationConfigService{
 		repo:         repo,
 		bizRepo:      bizRepo,
-		providerRepo: providerRepo}
+		providerRepo: providerRepo,
+	}
 }
 
 func (s *InvocationConfigService) Save(ctx context.Context, cfg domain.InvocationConfig) (int64, error) {
diff --git a/internal/service/llm/openai/handler.go b/internal/service/llm/openai/handler.go
@@ -57,7 +57,8 @@ func (h *Handler) StreamHandle(ctx context.Context, req []domain.Message) (chan
 }
 
 func (h *Handler) recv(eventCh chan domain.StreamEvent,
-	stream *ssestream.Stream[openai.ChatCompletionChunk]) {
+	stream *ssestream.Stream[openai.ChatCompletionChunk],
+) {
 	defer close(eventCh)
 	acc := openai.ChatCompletionAccumulator{}
 
diff --git a/internal/test/init.go b/internal/test/init.go
@@ -22,10 +22,8 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-var (
-	//go:embed config.yaml
-	cfg string
-)
+//go:embed config.yaml
+var cfg string
 
 func init() {
 	// 用这种形式来规避运行部分测试加载配置失败的问题
diff --git a/internal/test/invocation_config_test.go b/internal/test/invocation_config_test.go
@@ -410,7 +410,6 @@ func (s *InvocationConfigTestSuite) TestVersion_Save() {
 				require.NoError(t, err)
 			},
 			req: admin.InvocationConfigVersionVO{
-
 				ID:           1,
 				InvID:        10,
 				ModelID:      1,
diff --git a/internal/test/provider_test.go b/internal/test/provider_test.go
@@ -58,7 +58,7 @@ func (s *ProviderTestSuite) TearDownTest() {
 		fmt.Println(err)
 	}
 	// 清空 Redis 缓存
-	s.TestApp.Rdb.FlushDB(ctx)
+	s.Rdb.FlushDB(ctx)
 }
 
 func (s *ProviderTestSuite) TestProviderSave() {

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ import (`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// MockHandler 这是 mock 的东西，你在生产环境要关掉`
`26`		`-type MockHandler struct {`
`27`		`-}`
	`26`	`+type MockHandler struct{}`
`28`	`27`
`29`	`28`	`func NewMockHandler() *MockHandler {`
`30`	`29`	`return new(MockHandler)`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ import (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// MockHandler 这是 mock 的东西，你在生产环境要关掉`
`25`		`-type MockHandler struct {`
`26`		`-}`
	`25`	`+type MockHandler struct{}`
`27`	`26`
`28`	`27`	`func NewMockHandler() *MockHandler {`
`29`	`28`	`return new(MockHandler)`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ func (h ProviderHandler) GetModel(ctx ginx.Context, sess session.Session) (gin`
`79`	`79`	`return ginx.Result{Code: 500, Msg: "内部错误"}, err`
`80`	`80`	`}`
`81`	`81`	`return ginx.Result{`
`82`		`-`
`83`	`82`	`Data: ModelVO{`
`84`	`83`	`ID: model.ID,`
`85`	`84`	`Name: model.Name,`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ type ChatRepo struct {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func NewChatRepo(d dao.ChatDAO, c cache.ChatCache) *ChatRepo {`
`39`		`- return &ChatRepo{dao: d,`
	`39`	`+ return &ChatRepo{`
	`40`	`+ dao: d,`
`40`	`41`	`cache: c,`
`41`	`42`	`// 目前没有别的实现，先写死`
`42`	`43`	`snGen: &sn.Generator{},`