feat: update

This commit is contained in:
Rogee
2025-09-10 17:53:34 +08:00
parent 2d5bac5bf5
commit 66deb69c32
16 changed files with 52 additions and 48 deletions

View File

@@ -1,13 +1,11 @@
package errorx package errorx
import ( import (
"errors"
"fmt" "fmt"
"net/http" "net/http"
"runtime" "runtime"
"strings" "strings"
"github.com/go-jet/jet/v2/qrm"
"github.com/gofiber/fiber/v3" "github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v3/binder" "github.com/gofiber/fiber/v3/binder"
"github.com/gofiber/utils/v2" "github.com/gofiber/utils/v2"
@@ -83,11 +81,6 @@ func (r *Response) Wrap(err error) *Response {
func (r *Response) format() { func (r *Response) format() {
r.isFormat = true r.isFormat = true
if errors.Is(r.err, qrm.ErrNoRows) {
r.from(RecordNotExists)
return
}
if e, ok := r.err.(*fiber.Error); ok { if e, ok := r.err.(*fiber.Error); ok {
r.Code = e.Code r.Code = e.Code
r.Message = e.Message r.Message = e.Message

View File

@@ -7,7 +7,9 @@ import (
) )
// @provider(grpc) userv1.RegisterUserServiceServer // @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) { func (u *Users) ListUsers(ctx context.Context, in *userv1.ListUsersRequest) (*userv1.ListUsersResponse, error) {
// userv1.UserServiceServer // userv1.UserServiceServer

View File

@@ -28,7 +28,7 @@ func (s DemoJob) InsertOpts() InsertOpts {
func (DemoJob) Kind() string { return "demo_job" } func (DemoJob) Kind() string { return "demo_job" }
func (a DemoJob) UniqueID() string { return a.Kind() } func (a DemoJob) UniqueID() string { return a.Kind() }
var _ Worker[DemoJob] = (*SortWorker)(nil) var _ Worker[DemoJob] = (*DemoJobWorker)(nil)
// @provider(job) // @provider(job)
type DemoJobWorker struct { type DemoJobWorker struct {

View File

@@ -4,7 +4,8 @@ import (
"context" "context"
"testing" "testing"
"{{.ModuleName}}/app/service/testx" "{{.ModuleName}}/app/srv/services"
"{{.ModuleName}}/app/srv/testx"
"{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/app"
"{{.ModuleName}}/providers/job" "{{.ModuleName}}/providers/job"
@@ -31,7 +32,7 @@ type DemoJobSuite struct {
} }
func Test_DemoJob(t *testing.T) { 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) { testx.Serve(providers, t, func(p DemoJobSuiteInjectParams) {
suite.Run(t, &DemoJobSuite{DemoJobSuiteInjectParams: p}) suite.Run(t, &DemoJobSuite{DemoJobSuiteInjectParams: p})

View File

@@ -0,0 +1,7 @@
package services
import "go.ipao.vip/atom/opt"
func Provide(opts ...opt.Option) error {
return nil
}

View File

@@ -7,7 +7,7 @@ import (
"go.ipao.vip/atom/container" "go.ipao.vip/atom/container"
"go.ipao.vip/atom/contracts" "go.ipao.vip/atom/contracts"
"{{.ModuleName}}/app/events/subscribers" "{{.ModuleName}}/app/events/subscribers"
"{{.ModuleName}}/app/service" "{{.ModuleName}}/app/srv"
"{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/app"
"{{.ModuleName}}/providers/event" "{{.ModuleName}}/providers/event"
"{{.ModuleName}}/providers/postgres" "{{.ModuleName}}/providers/postgres"
@@ -18,7 +18,7 @@ import (
) )
func defaultProviders() container.Providers { func defaultProviders() container.Providers {
return service.Default(container.Providers{ return srv.Default(container.Providers{
postgres.DefaultProvider(), postgres.DefaultProvider(),
}...) }...)
} }

View File

@@ -5,7 +5,7 @@ import (
"go.ipao.vip/atom/container" "go.ipao.vip/atom/container"
"go.ipao.vip/atom/contracts" "go.ipao.vip/atom/contracts"
"{{.ModuleName}}/app/grpc/users" "{{.ModuleName}}/app/grpc/users"
"{{.ModuleName}}/app/service" "{{.ModuleName}}/app/srv"
"{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/app"
"{{.ModuleName}}/providers/grpc" "{{.ModuleName}}/providers/grpc"
"{{.ModuleName}}/providers/postgres" "{{.ModuleName}}/providers/postgres"
@@ -16,7 +16,7 @@ import (
) )
func defaultProviders() container.Providers { func defaultProviders() container.Providers {
return service.Default(container.Providers{ return srv.Default(container.Providers{
postgres.DefaultProvider(), postgres.DefaultProvider(),
grpc.DefaultProvider(), grpc.DefaultProvider(),
}...) }...)

View File

@@ -8,7 +8,7 @@ import (
"go.ipao.vip/atom/contracts" "go.ipao.vip/atom/contracts"
"{{.ModuleName}}/app/errorx" "{{.ModuleName}}/app/errorx"
"{{.ModuleName}}/app/jobs" "{{.ModuleName}}/app/jobs"
"{{.ModuleName}}/app/service" "{{.ModuleName}}/app/srv"
_ "{{.ModuleName}}/docs" _ "{{.ModuleName}}/docs"
"{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/app"
"{{.ModuleName}}/providers/hashids" "{{.ModuleName}}/providers/hashids"
@@ -25,7 +25,7 @@ import (
) )
func defaultProviders() container.Providers { func defaultProviders() container.Providers {
return service.Default(container.Providers{ return srv.Default(container.Providers{
http.DefaultProvider(), http.DefaultProvider(),
postgres.DefaultProvider(), postgres.DefaultProvider(),
jwt.DefaultProvider(), jwt.DefaultProvider(),

View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"database/sql" "database/sql"
"{{.ModuleName}}/app/service" "{{.ModuleName}}/app/srv"
"{{.ModuleName}}/database" "{{.ModuleName}}/database"
"{{.ModuleName}}/providers/postgres" "{{.ModuleName}}/providers/postgres"
@@ -17,7 +17,7 @@ import (
) )
func defaultProviders() container.Providers { func defaultProviders() container.Providers {
return service.Default(container.Providers{ return srv.Default(container.Providers{
postgres.DefaultProvider(), postgres.DefaultProvider(),
}...) }...)
} }

View File

@@ -6,8 +6,9 @@ import (
"go.ipao.vip/atom" "go.ipao.vip/atom"
"go.ipao.vip/atom/container" "go.ipao.vip/atom/container"
"go.ipao.vip/atom/contracts" "go.ipao.vip/atom/contracts"
"{{.ModuleName}}/app/jobs" "{{.ModuleName}}/app/jobs"
"{{.ModuleName}}/app/service" "{{.ModuleName}}/app/srv"
"{{.ModuleName}}/providers/app" "{{.ModuleName}}/providers/app"
"{{.ModuleName}}/providers/job" "{{.ModuleName}}/providers/job"
"{{.ModuleName}}/providers/postgres" "{{.ModuleName}}/providers/postgres"
@@ -18,7 +19,7 @@ import (
) )
func defaultProviders() container.Providers { func defaultProviders() container.Providers {
return service.Default(container.Providers{ return srv.Default(container.Providers{
postgres.DefaultProvider(), postgres.DefaultProvider(),
job.DefaultProvider(), job.DefaultProvider(),
}...) }...)

View File

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

View File

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