feat: update

cmd/buf.go

@@ -11,21 +11,21 @@ import (
 )
 
 func CommandBuf(root *cobra.Command) {
-    cmd := &cobra.Command{
+	cmd := &cobra.Command{
-        Use:   "buf",
+		Use:   "buf",
-        Short: "run buf commands",
+		Short: "run buf commands",
-        RunE:  commandBufE,
+		RunE:  commandBufE,
-    }
+	}
 
-    cmd.Flags().String("dir", ".", "Directory to run buf from")
+	cmd.Flags().String("dir", ".", "Directory to run buf from")
-    cmd.Flags().Bool("dry-run", false, "Preview buf command without executing")
+	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()
+	dir := cmd.Flag("dir").Value.String()
-    dryRun, _ := cmd.Flags().GetBool("dry-run")
+	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
+	// preflight: ensure buf.yaml exists
-    if _, err := os.Stat(filepath.Join(dir, "buf.yaml")); err != nil {
+	if _, err := os.Stat(filepath.Join(dir, "buf.yaml")); err != nil {
-        log.Warnf("未找到 %s，buf generate 可能失败", filepath.Join(dir, "buf.yaml"))
+		log.Warnf("未找到 %s，buf generate 可能失败", filepath.Join(dir, "buf.yaml"))
-    }
+	}
 
-    log.Info("buf 命令已存在，正在运行 buf generate...")
+	log.Info("buf 命令已存在，正在运行 buf generate...")
-    log.Info("PROTOBUF GUIDE: https://buf.build/docs/best-practices/style-guide/")
+	log.Info("PROTOBUF GUIDE: https://buf.build/docs/best-practices/style-guide/")
-    if dryRun {
+	if dryRun {
-        log.Infof("[dry-run] (cd %s && buf generate)", dir)
+		log.Infof("[dry-run] (cd %s && buf generate)", dir)
-        return nil
+		return nil
-    }
+	}
-    generateCmd := exec.Command("buf", "generate")
+	generateCmd := exec.Command("buf", "generate")
-    generateCmd.Dir = dir
+	generateCmd.Dir = dir
 	if err := generateCmd.Run(); err != nil {
 		return fmt.Errorf("运行 buf generate 失败: %v", err)
 	}

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:"-"`
+	StatusCode int    `json:"-"              xml:"-"`
-	Code       int    `json:"code" xml:"code"`
+	Code       int    `json:"code"           xml:"code"`
-	Message    string `json:"message" xml:"message"`
+	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

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

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 {

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})

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
+}

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(),
 	}...)
 }

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(),
 	}...)

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(),

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(),
 	}...)
 }

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(),
 	}...)

templates/project/app/srv/service.go.tpl

@@ -1,4 +1,4 @@
-package service
+package srv
 
 import (
 	"go.ipao.vip/atom/container"

templates/project/main.go.tpl

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"{{.ModuleName}}/app/service/http"
+	"{{.ModuleName}}/app/srv/http"
-	"{{.ModuleName}}/app/service/migrate"
+	"{{.ModuleName}}/app/srv/migrate"
 
 	log "github.com/sirupsen/logrus"
 	"go.ipao.vip/atom"