diff --git a/cmd/buf.go b/cmd/buf.go index 1af4682..e6741fb 100644 --- a/cmd/buf.go +++ b/cmd/buf.go @@ -11,21 +11,21 @@ import ( ) func CommandBuf(root *cobra.Command) { - cmd := &cobra.Command{ - Use: "buf", - Short: "run buf commands", - RunE: commandBufE, - } + cmd := &cobra.Command{ + Use: "buf", + Short: "run buf commands", + RunE: commandBufE, + } - cmd.Flags().String("dir", ".", "Directory to run buf from") - cmd.Flags().Bool("dry-run", false, "Preview buf command without executing") + cmd.Flags().String("dir", ".", "Directory to run buf from") + cmd.Flags().Bool("dry-run", false, "Preview buf command without executing") root.AddCommand(cmd) } func commandBufE(cmd *cobra.Command, args []string) error { - dir := cmd.Flag("dir").Value.String() - dryRun, _ := cmd.Flags().GetBool("dry-run") + dir := cmd.Flag("dir").Value.String() + dryRun, _ := cmd.Flags().GetBool("dry-run") if _, err := exec.LookPath("buf"); err != nil { log.Warn("buf 命令不存在,正在安装 buf...") log.Info("go install github.com/bufbuild/buf/cmd/buf@v1.48.0") @@ -40,19 +40,19 @@ func commandBufE(cmd *cobra.Command, args []string) error { } } - // preflight: ensure buf.yaml exists - if _, err := os.Stat(filepath.Join(dir, "buf.yaml")); err != nil { - log.Warnf("未找到 %s,buf generate 可能失败", filepath.Join(dir, "buf.yaml")) - } + // preflight: ensure buf.yaml exists + if _, err := os.Stat(filepath.Join(dir, "buf.yaml")); err != nil { + log.Warnf("未找到 %s,buf generate 可能失败", filepath.Join(dir, "buf.yaml")) + } - log.Info("buf 命令已存在,正在运行 buf generate...") - log.Info("PROTOBUF GUIDE: https://buf.build/docs/best-practices/style-guide/") - if dryRun { - log.Infof("[dry-run] (cd %s && buf generate)", dir) - return nil - } - generateCmd := exec.Command("buf", "generate") - generateCmd.Dir = dir + log.Info("buf 命令已存在,正在运行 buf generate...") + log.Info("PROTOBUF GUIDE: https://buf.build/docs/best-practices/style-guide/") + if dryRun { + log.Infof("[dry-run] (cd %s && buf generate)", dir) + return nil + } + generateCmd := exec.Command("buf", "generate") + generateCmd.Dir = dir if err := generateCmd.Run(); err != nil { return fmt.Errorf("运行 buf generate 失败: %v", err) } diff --git a/templates/project/app/errorx/error.go.tpl b/templates/project/app/errorx/error.go.tpl index 9234537..5568837 100644 --- a/templates/project/app/errorx/error.go.tpl +++ b/templates/project/app/errorx/error.go.tpl @@ -1,13 +1,11 @@ package errorx import ( - "errors" "fmt" "net/http" "runtime" "strings" - "github.com/go-jet/jet/v2/qrm" "github.com/gofiber/fiber/v3" "github.com/gofiber/fiber/v3/binder" "github.com/gofiber/utils/v2" @@ -29,9 +27,9 @@ type Response struct { sql string file string - StatusCode int `json:"-" xml:"-"` - Code int `json:"code" xml:"code"` - Message string `json:"message" xml:"message"` + StatusCode int `json:"-" xml:"-"` + Code int `json:"code" xml:"code"` + Message string `json:"message" xml:"message"` Data any `json:"data,omitempty" xml:"data"` } @@ -83,11 +81,6 @@ func (r *Response) Wrap(err error) *Response { func (r *Response) format() { r.isFormat = true - if errors.Is(r.err, qrm.ErrNoRows) { - r.from(RecordNotExists) - return - } - if e, ok := r.err.(*fiber.Error); ok { r.Code = e.Code r.Message = e.Message diff --git a/templates/project/app/grpc/users/handler.go.tpl b/templates/project/app/grpc/users/handler.go.tpl index ca2ccd4..d9dfc67 100644 --- a/templates/project/app/grpc/users/handler.go.tpl +++ b/templates/project/app/grpc/users/handler.go.tpl @@ -7,7 +7,9 @@ import ( ) // @provider(grpc) userv1.RegisterUserServiceServer -type Users struct{} +type Users struct { + userv1.UnimplementedUserServiceServer +} func (u *Users) ListUsers(ctx context.Context, in *userv1.ListUsersRequest) (*userv1.ListUsersResponse, error) { // userv1.UserServiceServer diff --git a/templates/project/app/jobs/demo_job.go.tpl b/templates/project/app/jobs/demo_job.go.tpl index b377fe7..9f824ee 100644 --- a/templates/project/app/jobs/demo_job.go.tpl +++ b/templates/project/app/jobs/demo_job.go.tpl @@ -28,7 +28,7 @@ func (s DemoJob) InsertOpts() InsertOpts { func (DemoJob) Kind() string { return "demo_job" } func (a DemoJob) UniqueID() string { return a.Kind() } -var _ Worker[DemoJob] = (*SortWorker)(nil) +var _ Worker[DemoJob] = (*DemoJobWorker)(nil) // @provider(job) type DemoJobWorker struct { diff --git a/templates/project/app/jobs/demo_job_test.go.tpl b/templates/project/app/jobs/demo_job_test.go.tpl index bcdcf3e..5136787 100644 --- a/templates/project/app/jobs/demo_job_test.go.tpl +++ b/templates/project/app/jobs/demo_job_test.go.tpl @@ -4,7 +4,8 @@ import ( "context" "testing" - "{{.ModuleName}}/app/service/testx" + "{{.ModuleName}}/app/srv/services" + "{{.ModuleName}}/app/srv/testx" "{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/job" @@ -31,7 +32,7 @@ type DemoJobSuite struct { } func Test_DemoJob(t *testing.T) { - providers := testx.Default().With(Provide, models.Provide) + providers := testx.Default().With(Provide, services.Provide) testx.Serve(providers, t, func(p DemoJobSuiteInjectParams) { suite.Run(t, &DemoJobSuite{DemoJobSuiteInjectParams: p}) diff --git a/templates/project/app/models/-gitkeep b/templates/project/app/models/-gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/templates/project/app/services/demo.go.tpl b/templates/project/app/services/demo.go.tpl new file mode 100644 index 0000000..163a663 --- /dev/null +++ b/templates/project/app/services/demo.go.tpl @@ -0,0 +1,7 @@ +package services + +import "go.ipao.vip/atom/opt" + +func Provide(opts ...opt.Option) error { + return nil +} diff --git a/templates/project/app/service/event/event.go.tpl b/templates/project/app/srv/event/event.go.tpl similarity index 93% rename from templates/project/app/service/event/event.go.tpl rename to templates/project/app/srv/event/event.go.tpl index 0b2a864..2ecedba 100644 --- a/templates/project/app/service/event/event.go.tpl +++ b/templates/project/app/srv/event/event.go.tpl @@ -7,7 +7,7 @@ import ( "go.ipao.vip/atom/container" "go.ipao.vip/atom/contracts" "{{.ModuleName}}/app/events/subscribers" - "{{.ModuleName}}/app/service" + "{{.ModuleName}}/app/srv" "{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/event" "{{.ModuleName}}/providers/postgres" @@ -18,7 +18,7 @@ import ( ) func defaultProviders() container.Providers { - return service.Default(container.Providers{ + return srv.Default(container.Providers{ postgres.DefaultProvider(), }...) } diff --git a/templates/project/app/service/grpc/grpc.go.tpl b/templates/project/app/srv/grpc/grpc.go.tpl similarity index 93% rename from templates/project/app/service/grpc/grpc.go.tpl rename to templates/project/app/srv/grpc/grpc.go.tpl index 8ac10df..09fca9e 100644 --- a/templates/project/app/service/grpc/grpc.go.tpl +++ b/templates/project/app/srv/grpc/grpc.go.tpl @@ -5,7 +5,7 @@ import ( "go.ipao.vip/atom/container" "go.ipao.vip/atom/contracts" "{{.ModuleName}}/app/grpc/users" - "{{.ModuleName}}/app/service" + "{{.ModuleName}}/app/srv" "{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/grpc" "{{.ModuleName}}/providers/postgres" @@ -16,7 +16,7 @@ import ( ) func defaultProviders() container.Providers { - return service.Default(container.Providers{ + return srv.Default(container.Providers{ postgres.DefaultProvider(), grpc.DefaultProvider(), }...) diff --git a/templates/project/app/service/http/http.go.tpl b/templates/project/app/srv/http/http.go.tpl similarity index 95% rename from templates/project/app/service/http/http.go.tpl rename to templates/project/app/srv/http/http.go.tpl index 83e8c82..8aac7d1 100644 --- a/templates/project/app/service/http/http.go.tpl +++ b/templates/project/app/srv/http/http.go.tpl @@ -8,7 +8,7 @@ import ( "go.ipao.vip/atom/contracts" "{{.ModuleName}}/app/errorx" "{{.ModuleName}}/app/jobs" - "{{.ModuleName}}/app/service" + "{{.ModuleName}}/app/srv" _ "{{.ModuleName}}/docs" "{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/hashids" @@ -25,7 +25,7 @@ import ( ) func defaultProviders() container.Providers { - return service.Default(container.Providers{ + return srv.Default(container.Providers{ http.DefaultProvider(), postgres.DefaultProvider(), jwt.DefaultProvider(), diff --git a/templates/project/app/service/migrate/migrate.go.tpl b/templates/project/app/srv/migrate/migrate.go.tpl similarity index 94% rename from templates/project/app/service/migrate/migrate.go.tpl rename to templates/project/app/srv/migrate/migrate.go.tpl index ae80d02..fadb4d4 100644 --- a/templates/project/app/service/migrate/migrate.go.tpl +++ b/templates/project/app/srv/migrate/migrate.go.tpl @@ -4,7 +4,7 @@ import ( "context" "database/sql" - "{{.ModuleName}}/app/service" + "{{.ModuleName}}/app/srv" "{{.ModuleName}}/database" "{{.ModuleName}}/providers/postgres" @@ -17,7 +17,7 @@ import ( ) func defaultProviders() container.Providers { - return service.Default(container.Providers{ + return srv.Default(container.Providers{ postgres.DefaultProvider(), }...) } diff --git a/templates/project/app/service/queue/error.go.tpl b/templates/project/app/srv/queue/error.go.tpl similarity index 100% rename from templates/project/app/service/queue/error.go.tpl rename to templates/project/app/srv/queue/error.go.tpl diff --git a/templates/project/app/service/queue/river.go.tpl b/templates/project/app/srv/queue/river.go.tpl similarity index 94% rename from templates/project/app/service/queue/river.go.tpl rename to templates/project/app/srv/queue/river.go.tpl index 98c43d1..ffa0433 100644 --- a/templates/project/app/service/queue/river.go.tpl +++ b/templates/project/app/srv/queue/river.go.tpl @@ -6,8 +6,9 @@ import ( "go.ipao.vip/atom" "go.ipao.vip/atom/container" "go.ipao.vip/atom/contracts" + "{{.ModuleName}}/app/jobs" - "{{.ModuleName}}/app/service" + "{{.ModuleName}}/app/srv" "{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/job" "{{.ModuleName}}/providers/postgres" @@ -18,7 +19,7 @@ import ( ) func defaultProviders() container.Providers { - return service.Default(container.Providers{ + return srv.Default(container.Providers{ postgres.DefaultProvider(), job.DefaultProvider(), }...) diff --git a/templates/project/app/service/service.go.tpl b/templates/project/app/srv/service.go.tpl similarity index 94% rename from templates/project/app/service/service.go.tpl rename to templates/project/app/srv/service.go.tpl index 735a0cc..a0b058c 100644 --- a/templates/project/app/service/service.go.tpl +++ b/templates/project/app/srv/service.go.tpl @@ -1,4 +1,4 @@ -package service +package srv import ( "go.ipao.vip/atom/container" diff --git a/templates/project/app/service/testx/testing.go.tpl b/templates/project/app/srv/testx/testing.go.tpl similarity index 100% rename from templates/project/app/service/testx/testing.go.tpl rename to templates/project/app/srv/testx/testing.go.tpl diff --git a/templates/project/main.go.tpl b/templates/project/main.go.tpl index cb4cefb..de0e0d8 100755 --- a/templates/project/main.go.tpl +++ b/templates/project/main.go.tpl @@ -1,8 +1,8 @@ package main import ( - "{{.ModuleName}}/app/service/http" - "{{.ModuleName}}/app/service/migrate" + "{{.ModuleName}}/app/srv/http" + "{{.ModuleName}}/app/srv/migrate" log "github.com/sirupsen/logrus" "go.ipao.vip/atom"