浏览代码

重新构造包

yjp 1 年之前
父节点
当前提交
3efbee9b8d

+ 98 - 98
convenient/gwtools/entity_crud.go → convenient/gwtools/entity_crud/entity_crud.go

@@ -1,4 +1,4 @@
-package gwtools
+package entity_crud
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/api"
@@ -9,27 +9,27 @@ import (
 	"net/http"
 )
 
-func EntityCRUD(builder *gateway.Builder, params *EntityCRUDParams, opts ...any) {
-	globalOptions := new(EntityCRUDGlobalOptions)
-	createOptions := new(EntityCRUDCreateOptions)
-	deleteOptions := new(EntityCRUDDeleteOptions)
-	updateOptions := new(EntityCRUDUpdateOptions)
-	queryOptions := new(EntityCRUDQueryOptions)
-	getByIDOptions := new(EntityCRUDGetByIDOptions)
+func BindSimple(builder *gateway.Builder, params *Simple, opts ...any) {
+	globalOptions := new(GlobalOptions)
+	createOptions := new(CreateOptions)
+	deleteOptions := new(DeleteOptions)
+	updateOptions := new(UpdateOptions)
+	queryOptions := new(QueryOptions)
+	getByIDOptions := new(GetByIDOptions)
 
 	for _, opt := range opts {
 		switch o := opt.(type) {
-		case EntityCRUDGlobalOption:
+		case GlobalOption:
 			o(globalOptions)
-		case EntityCRUDCreateOption:
+		case CreateOption:
 			o(createOptions)
-		case EntityCRUDDeleteOption:
+		case DeleteOption:
 			o(deleteOptions)
-		case EntityCRUDUpdateOption:
+		case UpdateOption:
 			o(updateOptions)
-		case EntityCRUDQueryOption:
+		case QueryOption:
 			o(queryOptions)
-		case EntityCRUDGetByIDOption:
+		case GetByIDOption:
 			o(getByIDOptions)
 		default:
 			continue
@@ -43,10 +43,10 @@ func EntityCRUD(builder *gateway.Builder, params *EntityCRUDParams, opts ...any)
 	params.queryOptions = queryOptions
 	params.getByIDOptions = getByIDOptions
 
-	params.crud(builder)
+	params.bind(builder)
 }
 
-type EntityCRUDParams struct {
+type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
@@ -54,23 +54,23 @@ type EntityCRUDParams struct {
 	DomainCamelName string
 
 	// 可选配置项,通过WithXXX配置
-	globalOptions  *EntityCRUDGlobalOptions
-	createOptions  *EntityCRUDCreateOptions
-	deleteOptions  *EntityCRUDDeleteOptions
-	updateOptions  *EntityCRUDUpdateOptions
-	queryOptions   *EntityCRUDQueryOptions
-	getByIDOptions *EntityCRUDGetByIDOptions
+	globalOptions  *GlobalOptions
+	createOptions  *CreateOptions
+	deleteOptions  *DeleteOptions
+	updateOptions  *UpdateOptions
+	queryOptions   *QueryOptions
+	getByIDOptions *GetByIDOptions
 }
 
-func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
-	globalOptions := params.globalOptions
-	createOptions := params.createOptions
-	deleteOptions := params.deleteOptions
-	updateOptions := params.updateOptions
-	queryOptions := params.queryOptions
-	getByIDOptions := params.getByIDOptions
+func (simple *Simple) bind(builder *gateway.Builder) {
+	globalOptions := simple.globalOptions
+	createOptions := simple.createOptions
+	deleteOptions := simple.deleteOptions
+	updateOptions := simple.updateOptions
+	queryOptions := simple.queryOptions
+	getByIDOptions := simple.getByIDOptions
 
-	domainPath := "/" + strcase.ToLowerCamel(template.Id(params.DomainCamelName))
+	domainPath := "/" + strcase.ToLowerCamel(template.Id(simple.DomainCamelName))
 
 	// 创建
 	if !createOptions.disable {
@@ -92,7 +92,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.
-			Post(gateway.NewPostRequest(params.ServiceVersionedUrl+domainPath+"/create",
+			Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+domainPath+"/create",
 				gateway.PostRequestWithBodyForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
 					_, err := gateway.FormJsonBodyWithTenantIDAndUserIDFunc("tenantId", "createUserId")(c, historyRequests, resultMap)
 					if err != nil {
@@ -152,7 +152,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.
-			Delete(gateway.NewDeleteRequest(params.ServiceVersionedUrl+domainPath+"/delete", queryParamsFormOption), deleteRequestCallback).
+			Delete(gateway.NewDeleteRequest(simple.ServiceVersionedUrl+domainPath+"/delete", queryParamsFormOption), deleteRequestCallback).
 			Build(deleteMiddlewares...)
 	}
 
@@ -175,7 +175,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 			return nil
 		}
 
-		copyBuilder.Put(gateway.NewPutRequest(params.ServiceVersionedUrl+domainPath+"/update",
+		copyBuilder.Put(gateway.NewPutRequest(simple.ServiceVersionedUrl+domainPath+"/update",
 			gateway.PutRequestWithBodyForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
 				_, err := gateway.FormJsonBodyWithTenantIDAndUserIDFunc("", "updateUserId")(c, historyRequests, resultMap)
 				if err != nil {
@@ -220,7 +220,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 			return nil
 		}
 
-		copyBuilder.Get(gateway.NewGetRequest(params.ServiceVersionedUrl+domainPath+"/query",
+		copyBuilder.Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+domainPath+"/query",
 			gateway.GetRequestWithQueryParamsForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
 				_, err := gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", "")(c, historyRequests, resultMap)
 				if err != nil {
@@ -274,210 +274,210 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.
-			Get(gateway.NewGetRequest(params.ServiceVersionedUrl+domainPath+"/get", formQueryParamsOption), getRequestCallback).
+			Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+domainPath+"/get", formQueryParamsOption), getRequestCallback).
 			Build(getByIDMiddlewares...)
 	}
 }
 
-type EntityCRUDBuilderCallback func(builder *gateway.Builder, c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (*gateway.Builder, error)
+type BuilderCallback func(builder *gateway.Builder, c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (*gateway.Builder, error)
 
-type EntityCRUDGlobalOption func(options *EntityCRUDGlobalOptions)
-type EntityCRUDCreateOption func(options *EntityCRUDCreateOptions)
-type EntityCRUDDeleteOption func(options *EntityCRUDDeleteOptions)
-type EntityCRUDUpdateOption func(options *EntityCRUDUpdateOptions)
-type EntityCRUDQueryOption func(options *EntityCRUDQueryOptions)
-type EntityCRUDGetByIDOption func(options *EntityCRUDGetByIDOptions)
+type GlobalOption func(options *GlobalOptions)
+type CreateOption func(options *CreateOptions)
+type DeleteOption func(options *DeleteOptions)
+type UpdateOption func(options *UpdateOptions)
+type QueryOption func(options *QueryOptions)
+type GetByIDOption func(options *GetByIDOptions)
 
-type EntityCRUDGlobalOptions struct {
+type GlobalOptions struct {
 	middlewares []api.Handler
 }
 
-type EntityCRUDCreateOptions struct {
+type CreateOptions struct {
 	// 关闭创建
 	disable bool
 
 	// 创建请求前回调
-	beforeBuilderCallback EntityCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 创建请求后回调
-	afterBuilderCallback EntityCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 创建中间件
 	middlewares []api.Handler
 }
 
-type EntityCRUDDeleteOptions struct {
+type DeleteOptions struct {
 	// 关闭删除
 	disable bool
 
 	// 删除请求前回调
-	beforeBuilderCallback EntityCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 删除请求后回调
-	afterBuilderCallback EntityCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 删除中间件
 	middlewares []api.Handler
 }
 
-type EntityCRUDUpdateOptions struct {
+type UpdateOptions struct {
 	// 关闭更新
 	disable bool
 
 	// 更新请求前回调
-	beforeBuilderCallback EntityCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 更新请求后回调
-	afterBuilderCallback EntityCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 更新中间件
 	middlewares []api.Handler
 }
 
-type EntityCRUDQueryOptions struct {
+type QueryOptions struct {
 	// 关闭查询
 	disable bool
 
 	// 查询请求前回调
-	beforeBuilderCallback EntityCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 查询请求后回调
-	afterBuilderCallback EntityCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 查询中间件
 	middlewares []api.Handler
 }
 
-type EntityCRUDGetByIDOptions struct {
+type GetByIDOptions struct {
 	// 关闭根据ID查询
 	disable bool
 
 	// 根据ID请求前回调
-	beforeBuilderCallback EntityCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 根据ID请求后回调
-	afterBuilderCallback EntityCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 根据ID查询中间件
 	middlewares []api.Handler
 }
 
-func WithEntityCRUDGlobalMiddlewares(middlewares ...api.Handler) EntityCRUDGlobalOption {
-	return func(options *EntityCRUDGlobalOptions) {
+func WithGlobalMiddlewares(middlewares ...api.Handler) GlobalOption {
+	return func(options *GlobalOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithEntityCRUDBeforeCreateBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDCreateOption {
-	return func(options *EntityCRUDCreateOptions) {
+func WithBeforeCreateBuilderCallback(callbacks BuilderCallback) CreateOption {
+	return func(options *CreateOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDAfterCreateBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDCreateOption {
-	return func(options *EntityCRUDCreateOptions) {
+func WithAfterCreateBuilderCallback(callbacks BuilderCallback) CreateOption {
+	return func(options *CreateOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDCreateMiddlewares(middlewares []api.Handler) EntityCRUDCreateOption {
-	return func(options *EntityCRUDCreateOptions) {
+func WithCreateMiddlewares(middlewares []api.Handler) CreateOption {
+	return func(options *CreateOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithEntityCRUDDisableDelete() EntityCRUDDeleteOption {
-	return func(options *EntityCRUDDeleteOptions) {
+func WithDisableDelete() DeleteOption {
+	return func(options *DeleteOptions) {
 		options.disable = true
 	}
 }
 
-func WithEntityCRUDBeforeDeleteBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDDeleteOption {
-	return func(options *EntityCRUDDeleteOptions) {
+func WithBeforeDeleteBuilderCallback(callbacks BuilderCallback) DeleteOption {
+	return func(options *DeleteOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDAfterDeleteBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDDeleteOption {
-	return func(options *EntityCRUDDeleteOptions) {
+func WithAfterDeleteBuilderCallback(callbacks BuilderCallback) DeleteOption {
+	return func(options *DeleteOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDDeleteMiddlewares(middlewares []api.Handler) EntityCRUDDeleteOption {
-	return func(options *EntityCRUDDeleteOptions) {
+func WithDeleteMiddlewares(middlewares []api.Handler) DeleteOption {
+	return func(options *DeleteOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithEntityCRUDDisableUpdate() EntityCRUDUpdateOption {
-	return func(options *EntityCRUDUpdateOptions) {
+func WithDisableUpdate() UpdateOption {
+	return func(options *UpdateOptions) {
 		options.disable = true
 	}
 }
 
-func WithEntityCRUDBeforeUpdateBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDUpdateOption {
-	return func(options *EntityCRUDUpdateOptions) {
+func WithBeforeUpdateBuilderCallback(callbacks BuilderCallback) UpdateOption {
+	return func(options *UpdateOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDAfterUpdateBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDUpdateOption {
-	return func(options *EntityCRUDUpdateOptions) {
+func WithAfterUpdateBuilderCallback(callbacks BuilderCallback) UpdateOption {
+	return func(options *UpdateOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDUpdateMiddlewares(middlewares []api.Handler) EntityCRUDUpdateOption {
-	return func(options *EntityCRUDUpdateOptions) {
+func WithUpdateMiddlewares(middlewares []api.Handler) UpdateOption {
+	return func(options *UpdateOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithEntityCRUDDisableQuery() EntityCRUDQueryOption {
-	return func(options *EntityCRUDQueryOptions) {
+func WithDisableQuery() QueryOption {
+	return func(options *QueryOptions) {
 		options.disable = true
 	}
 }
 
-func WithEntityCRUDBeforeQueryBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDQueryOption {
-	return func(options *EntityCRUDQueryOptions) {
+func WithBeforeQueryBuilderCallback(callbacks BuilderCallback) QueryOption {
+	return func(options *QueryOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDAfterQueryBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDQueryOption {
-	return func(options *EntityCRUDQueryOptions) {
+func WithAfterQueryBuilderCallback(callbacks BuilderCallback) QueryOption {
+	return func(options *QueryOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDQueryMiddlewares(middlewares []api.Handler) EntityCRUDQueryOption {
-	return func(options *EntityCRUDQueryOptions) {
+func WithQueryMiddlewares(middlewares []api.Handler) QueryOption {
+	return func(options *QueryOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithEntityCRUDDisableGetByID() EntityCRUDGetByIDOption {
-	return func(options *EntityCRUDGetByIDOptions) {
+func WithDisableGetByID() GetByIDOption {
+	return func(options *GetByIDOptions) {
 		options.disable = true
 	}
 }
 
-func WithEntityCRUDBeforeGetByIDBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDGetByIDOption {
-	return func(options *EntityCRUDGetByIDOptions) {
+func WithBeforeGetByIDBuilderCallback(callbacks BuilderCallback) GetByIDOption {
+	return func(options *GetByIDOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDAfterGetByIDBuilderCallback(callbacks EntityCRUDBuilderCallback) EntityCRUDGetByIDOption {
-	return func(options *EntityCRUDGetByIDOptions) {
+func WithAfterGetByIDBuilderCallback(callbacks BuilderCallback) GetByIDOption {
+	return func(options *GetByIDOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithEntityCRUDGetByIDMiddlewares(middlewares []api.Handler) EntityCRUDGetByIDOption {
-	return func(options *EntityCRUDGetByIDOptions) {
+func WithGetByIDMiddlewares(middlewares []api.Handler) GetByIDOption {
+	return func(options *GetByIDOptions) {
 		options.middlewares = middlewares
 	}
 }

+ 9 - 21
convenient/gwtools/pass_through.go → convenient/gwtools/pass_through/pass_through.go

@@ -1,4 +1,4 @@
-package gwtools
+package pass_through
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/api"
@@ -6,46 +6,38 @@ import (
 	"net/http"
 )
 
-func PostPassThrough(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
+func Post(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodPost, middlewares...)
 }
 
-func DeletePassThrough(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
+func Delete(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodDelete, middlewares...)
 }
 
-func PutPassThrough(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
+func Put(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodPut, middlewares...)
 }
 
-func GetPassThrough(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
+func Get(builder *gateway.Builder, params *SimplePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodGet, middlewares...)
 }
 
-func PassThrough(builder *gateway.Builder, params *PassThroughParams, middlewares ...api.Handler) {
-	params.passThrough(builder, middlewares...)
-}
-
-func OnePostPassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
+func PostPassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodPost, middlewares...)
 }
 
-func OneDeletePassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
+func DeletePassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodDelete, middlewares...)
 }
 
-func OnePutPassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
+func PutPassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodPut, middlewares...)
 }
 
-func OneGetPassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
+func GetPassThrough(builder *gateway.Builder, params *SimpleOnePassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodGet, middlewares...)
 }
 
-func OnePassThrough(builder *gateway.Builder, params *OnePassThroughParams, middlewares ...api.Handler) {
-	params.passThrough(builder, middlewares...)
-}
-
 func PostCommonPassThrough(builder *gateway.Builder, params *SimpleCommonPassThroughParams, middlewares ...api.Handler) {
 	params.passThrough(builder, http.MethodPost, middlewares...)
 }
@@ -62,10 +54,6 @@ func GetCommonPassThrough(builder *gateway.Builder, params *SimpleCommonPassThro
 	params.passThrough(builder, http.MethodGet, middlewares...)
 }
 
-func CommonPassThrough(builder *gateway.Builder, params *CommonPassThroughParams, middlewares ...api.Handler) {
-	params.passThrough(builder, middlewares...)
-}
-
 type PassThroughRequestItem struct {
 	Request                 gateway.BuilderRequest
 	RequestResponseCallback gateway.RequestResponseCallback

+ 28 - 28
convenient/gwtools/many2many.go → convenient/gwtools/relation/many2many/many2many.go

@@ -1,4 +1,4 @@
-package gwtools
+package many2many
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
@@ -7,8 +7,8 @@ import (
 	"net/http"
 )
 
-func Many2Many(builder *gateway.Builder, params *Many2ManyParams, opts ...Many2ManyOption) {
-	options := new(Many2ManyOptions)
+func BindSimple(builder *gateway.Builder, params *Simple, opts ...Option) {
+	options := new(Options)
 
 	for _, opt := range opts {
 		opt(options)
@@ -16,10 +16,10 @@ func Many2Many(builder *gateway.Builder, params *Many2ManyParams, opts ...Many2M
 
 	params.options = options
 
-	params.many2many(builder)
+	params.bind(builder)
 }
 
-type Many2ManyParams struct {
+type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
@@ -30,21 +30,21 @@ type Many2ManyParams struct {
 	RightDomainCamelName string
 
 	// 可选配置项,通过WithXXX配置
-	options *Many2ManyOptions
+	options *Options
 }
 
-func (params *Many2ManyParams) many2many(builder *gateway.Builder) {
-	options := params.options
+func (simple *Simple) bind(builder *gateway.Builder) {
+	options := simple.options
 
-	leftDomainPath := "/" + strcase.ToLowerCamel(template.Id(params.LeftDomainCamelName))
-	rightDomainPath := "/" + strcase.ToLowerCamel(template.Id(params.RightDomainCamelName))
+	leftDomainPath := "/" + strcase.ToLowerCamel(template.Id(simple.LeftDomainCamelName))
+	rightDomainPath := "/" + strcase.ToLowerCamel(template.Id(simple.RightDomainCamelName))
 
 	if !options.disableLeft {
 		if !options.disableLeftUpdate {
 			// 左到右更新
 			builder.
 				Url(http.MethodPost, leftDomainPath+rightDomainPath+"/update").
-				Post(gateway.NewPostRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/update"), nil).
+				Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/update"), nil).
 				Build()
 		}
 
@@ -52,7 +52,7 @@ func (params *Many2ManyParams) many2many(builder *gateway.Builder) {
 			// 左到右查询
 			builder.
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/query").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/query"), nil).
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/query"), nil).
 				Build()
 		}
 	}
@@ -62,7 +62,7 @@ func (params *Many2ManyParams) many2many(builder *gateway.Builder) {
 			// 右到左更新
 			builder.
 				Url(http.MethodPost, rightDomainPath+leftDomainPath+"/update").
-				Post(gateway.NewPostRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/update"), nil).
+				Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/update"), nil).
 				Build()
 		}
 
@@ -70,15 +70,15 @@ func (params *Many2ManyParams) many2many(builder *gateway.Builder) {
 			// 右到左查询
 			builder.
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/query").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/query"), nil).
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/query"), nil).
 				Build()
 		}
 	}
 }
 
-type Many2ManyOption func(options *Many2ManyOptions)
+type Option func(options *Options)
 
-type Many2ManyOptions struct {
+type Options struct {
 	// 关闭左侧到右侧关联
 	disableLeft bool
 
@@ -98,38 +98,38 @@ type Many2ManyOptions struct {
 	disableRightQuery bool
 }
 
-func WithMany2ManyDisableLeft() Many2ManyOption {
-	return func(options *Many2ManyOptions) {
+func WithDisableLeft() Option {
+	return func(options *Options) {
 		options.disableLeft = true
 	}
 }
 
-func WithMany2ManyDisableRight() Many2ManyOption {
-	return func(options *Many2ManyOptions) {
+func WithDisableRight() Option {
+	return func(options *Options) {
 		options.disableRight = true
 	}
 }
 
-func WithMany2ManyDisableLeftUpdate() Many2ManyOption {
-	return func(options *Many2ManyOptions) {
+func WithDisableLeftUpdate() Option {
+	return func(options *Options) {
 		options.disableLeftUpdate = true
 	}
 }
 
-func WithMany2ManyDisableLeftQuery() Many2ManyOption {
-	return func(options *Many2ManyOptions) {
+func WithDisableLeftQuery() Option {
+	return func(options *Options) {
 		options.disableLeftQuery = true
 	}
 }
 
-func WithMany2ManyDisableRightUpdate() Many2ManyOption {
-	return func(options *Many2ManyOptions) {
+func WithDisableRightUpdate() Option {
+	return func(options *Options) {
 		options.disableRightUpdate = true
 	}
 }
 
-func WithMany2ManyDisableRightQuery() Many2ManyOption {
-	return func(options *Many2ManyOptions) {
+func WithDisableRightQuery() Option {
+	return func(options *Options) {
 		options.disableRightQuery = true
 	}
 }

+ 31 - 31
convenient/gwtools/one2many.go → convenient/gwtools/relation/one2many/one2many.go

@@ -1,4 +1,4 @@
-package gwtools
+package one2many
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
@@ -7,8 +7,8 @@ import (
 	"net/http"
 )
 
-func One2Many(builder *gateway.Builder, params *One2ManyParams, opts ...One2ManyOption) {
-	options := new(One2ManyOptions)
+func BindSimple(builder *gateway.Builder, params *Simple, opts ...Option) {
+	options := new(Options)
 
 	for _, opt := range opts {
 		opt(options)
@@ -16,10 +16,10 @@ func One2Many(builder *gateway.Builder, params *One2ManyParams, opts ...One2Many
 
 	params.options = options
 
-	params.one2many(builder)
+	params.bind(builder)
 }
 
-type One2ManyParams struct {
+type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
@@ -30,21 +30,21 @@ type One2ManyParams struct {
 	RightDomainCamelName string
 
 	// 可选配置项,通过WithXXX配置
-	options *One2ManyOptions
+	options *Options
 }
 
-func (params *One2ManyParams) one2many(builder *gateway.Builder) {
-	options := params.options
+func (simple *Simple) bind(builder *gateway.Builder) {
+	options := simple.options
 
-	leftDomainPath := "/" + strcase.ToLowerCamel(template.Id(params.LeftDomainCamelName))
-	rightDomainPath := "/" + strcase.ToLowerCamel(template.Id(params.RightDomainCamelName))
+	leftDomainPath := "/" + strcase.ToLowerCamel(template.Id(simple.LeftDomainCamelName))
+	rightDomainPath := "/" + strcase.ToLowerCamel(template.Id(simple.RightDomainCamelName))
 
 	if !options.disableLeft {
 		if !options.disableLeftUpdate {
 			// 左到右更新
 			builder.
 				Url(http.MethodPost, leftDomainPath+rightDomainPath+"/update").
-				Post(gateway.NewPostRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/update"), nil).
+				Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/update"), nil).
 				Build()
 		}
 
@@ -52,7 +52,7 @@ func (params *One2ManyParams) one2many(builder *gateway.Builder) {
 			// 左到右查询
 			builder.
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/query").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/query"), nil).
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/query"), nil).
 				Build()
 		}
 	}
@@ -62,7 +62,7 @@ func (params *One2ManyParams) one2many(builder *gateway.Builder) {
 			// 右到左更新
 			builder.
 				Url(http.MethodPost, rightDomainPath+leftDomainPath+"/update").
-				Post(gateway.NewPostRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/update"), nil).
+				Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/update"), nil).
 				Build()
 		}
 
@@ -70,7 +70,7 @@ func (params *One2ManyParams) one2many(builder *gateway.Builder) {
 			// 右到左查询
 			builder.
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/query").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/query"), nil).
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/query"), nil).
 				Build()
 		}
 
@@ -78,7 +78,7 @@ func (params *One2ManyParams) one2many(builder *gateway.Builder) {
 			// 右到左查询,携带左方信息
 			builder.
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/queryWith").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/queryWith",
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/queryWith",
 					gateway.GetRequestWithQueryParamsForm(
 						gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", ""))),
 					nil).
@@ -87,9 +87,9 @@ func (params *One2ManyParams) one2many(builder *gateway.Builder) {
 	}
 }
 
-type One2ManyOption func(options *One2ManyOptions)
+type Option func(options *Options)
 
-type One2ManyOptions struct {
+type Options struct {
 	// 关闭左侧到右侧关联
 	disableLeft bool
 
@@ -112,44 +112,44 @@ type One2ManyOptions struct {
 	disableRightWithLeftQuery bool
 }
 
-func WithOne2ManyDisableLeft() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableLeft() Option {
+	return func(options *Options) {
 		options.disableLeft = true
 	}
 }
 
-func WithOne2ManyDisableRight() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableRight() Option {
+	return func(options *Options) {
 		options.disableRight = true
 	}
 }
 
-func WithOne2ManyDisableLeftUpdate() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableLeftUpdate() Option {
+	return func(options *Options) {
 		options.disableLeftUpdate = true
 	}
 }
 
-func WithOne2ManyDisableLeftQuery() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableLeftQuery() Option {
+	return func(options *Options) {
 		options.disableLeftQuery = true
 	}
 }
 
-func WithOne2ManyDisableRightUpdate() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableRightUpdate() Option {
+	return func(options *Options) {
 		options.disableRightUpdate = true
 	}
 }
 
-func WithOne2ManyDisableRightQuery() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableRightQuery() Option {
+	return func(options *Options) {
 		options.disableRightQuery = true
 	}
 }
 
-func WithOne2ManyDisableRightWithLeftQuery() One2ManyOption {
-	return func(options *One2ManyOptions) {
+func WithDisableRightWithLeftQuery() Option {
+	return func(options *Options) {
 		options.disableRightWithLeftQuery = true
 	}
 }

+ 34 - 34
convenient/gwtools/one2one.go → convenient/gwtools/relation/one2one/one2one.go

@@ -1,4 +1,4 @@
-package gwtools
+package one2one
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
@@ -7,8 +7,8 @@ import (
 	"net/http"
 )
 
-func One2One(builder *gateway.Builder, params *One2OneParams, opts ...One2OneOption) {
-	options := new(One2OneOptions)
+func BindSimple(builder *gateway.Builder, params *Simple, opts ...Option) {
+	options := new(Options)
 
 	for _, opt := range opts {
 		opt(options)
@@ -16,10 +16,10 @@ func One2One(builder *gateway.Builder, params *One2OneParams, opts ...One2OneOpt
 
 	params.options = options
 
-	params.one2one(builder)
+	params.bind(builder)
 }
 
-type One2OneParams struct {
+type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
@@ -30,21 +30,21 @@ type One2OneParams struct {
 	RightDomainCamelName string
 
 	// 可选配置项,通过WithXXX配置
-	options *One2OneOptions
+	options *Options
 }
 
-func (params *One2OneParams) one2one(builder *gateway.Builder) {
-	options := params.options
+func (simple *Simple) bind(builder *gateway.Builder) {
+	options := simple.options
 
-	leftDomainPath := "/" + strcase.ToLowerCamel(template.Id(params.LeftDomainCamelName))
-	rightDomainPath := "/" + strcase.ToLowerCamel(template.Id(params.RightDomainCamelName))
+	leftDomainPath := "/" + strcase.ToLowerCamel(template.Id(simple.LeftDomainCamelName))
+	rightDomainPath := "/" + strcase.ToLowerCamel(template.Id(simple.RightDomainCamelName))
 
 	if !options.disableLeft {
 		if !options.disableLeftUpdate {
 			// 左到右更新
 			builder.
 				Url(http.MethodPost, leftDomainPath+rightDomainPath+"/update").
-				Post(gateway.NewPostRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/update"), nil).
+				Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/update"), nil).
 				Build()
 		}
 
@@ -52,7 +52,7 @@ func (params *One2OneParams) one2one(builder *gateway.Builder) {
 			// 左到右查询
 			builder.
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/query").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/query"), nil).
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/query"), nil).
 				Build()
 		}
 
@@ -60,7 +60,7 @@ func (params *One2OneParams) one2one(builder *gateway.Builder) {
 			// 左到右查询,携带右方信息
 			builder.
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/queryWith").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/queryWith",
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+leftDomainPath+rightDomainPath+"/queryWith",
 					gateway.GetRequestWithQueryParamsForm(
 						gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", ""))),
 					nil).
@@ -73,7 +73,7 @@ func (params *One2OneParams) one2one(builder *gateway.Builder) {
 			// 右到左更新
 			builder.
 				Url(http.MethodPost, rightDomainPath+leftDomainPath+"/update").
-				Post(gateway.NewPostRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/update"), nil).
+				Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/update"), nil).
 				Build()
 		}
 
@@ -81,7 +81,7 @@ func (params *One2OneParams) one2one(builder *gateway.Builder) {
 			// 右到左查询
 			builder.
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/query").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/query"), nil).
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/query"), nil).
 				Build()
 		}
 
@@ -89,7 +89,7 @@ func (params *One2OneParams) one2one(builder *gateway.Builder) {
 			// 右到左查询,携带左方信息
 			builder.
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/queryWith").
-				Get(gateway.NewGetRequest(params.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/queryWith",
+				Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+rightDomainPath+leftDomainPath+"/queryWith",
 					gateway.GetRequestWithQueryParamsForm(
 						gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", ""))),
 					nil).
@@ -98,9 +98,9 @@ func (params *One2OneParams) one2one(builder *gateway.Builder) {
 	}
 }
 
-type One2OneOption func(options *One2OneOptions)
+type Option func(options *Options)
 
-type One2OneOptions struct {
+type Options struct {
 	// 关闭左侧到右侧关联
 	disableLeft bool
 
@@ -126,50 +126,50 @@ type One2OneOptions struct {
 	disableRightWithLeftQuery bool
 }
 
-func WithOne2OneDisableLeft() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableLeft() Option {
+	return func(options *Options) {
 		options.disableLeft = true
 	}
 }
 
-func WithOne2OneDisableRight() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableRight() Option {
+	return func(options *Options) {
 		options.disableRight = true
 	}
 }
 
-func WithOne2OneDisableLeftUpdate() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableLeftUpdate() Option {
+	return func(options *Options) {
 		options.disableLeftUpdate = true
 	}
 }
 
-func WithOne2OneDisableLeftQuery() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableLeftQuery() Option {
+	return func(options *Options) {
 		options.disableLeftQuery = true
 	}
 }
 
-func WithOne2OneDisableRightUpdate() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableRightUpdate() Option {
+	return func(options *Options) {
 		options.disableRightUpdate = true
 	}
 }
 
-func WithOne2OneDisableRightQuery() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableRightQuery() Option {
+	return func(options *Options) {
 		options.disableRightQuery = true
 	}
 }
 
-func WithOne2OneDisableLeftWithRightQuery() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableLeftWithRightQuery() Option {
+	return func(options *Options) {
 		options.disableLeftWithRightQuery = true
 	}
 }
 
-func WithOne2OneDisableRightWithLeftQuery() One2OneOption {
-	return func(options *One2OneOptions) {
+func WithDisableRightWithLeftQuery() Option {
+	return func(options *Options) {
 		options.disableRightWithLeftQuery = true
 	}
 }

+ 64 - 64
convenient/gwtools/value_object_crud.go → convenient/gwtools/value_object_crud/value_object_crud.go

@@ -1,4 +1,4 @@
-package gwtools
+package value_object_crud
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/api"
@@ -9,21 +9,21 @@ import (
 	"net/http"
 )
 
-func ValueObjectCRUD(builder *gateway.Builder, params *ValueObjectCRUDParams, opts ...any) {
-	globalOptions := new(ValueObjectCRUDGlobalOptions)
-	createOptions := new(ValueObjectCRUDCreateOptions)
-	deleteOptions := new(ValueObjectCRUDDeleteOptions)
-	queryOptions := new(ValueObjectCRUDQueryOptions)
+func BindSimple(builder *gateway.Builder, params *Simple, opts ...any) {
+	globalOptions := new(GlobalOptions)
+	createOptions := new(CreateOptions)
+	deleteOptions := new(DeleteOptions)
+	queryOptions := new(QueryOptions)
 
 	for _, opt := range opts {
 		switch o := opt.(type) {
-		case ValueObjectCRUDGlobalOption:
+		case GlobalOption:
 			o(globalOptions)
-		case ValueObjectCRUDCreateOption:
+		case CreateOption:
 			o(createOptions)
-		case ValueObjectCRUDDeleteOption:
+		case DeleteOption:
 			o(deleteOptions)
-		case ValueObjectCRUDQueryOption:
+		case QueryOption:
 			o(queryOptions)
 		default:
 			continue
@@ -35,10 +35,10 @@ func ValueObjectCRUD(builder *gateway.Builder, params *ValueObjectCRUDParams, op
 	params.deleteOptions = deleteOptions
 	params.queryOptions = queryOptions
 
-	params.crud(builder)
+	params.bind(builder)
 }
 
-type ValueObjectCRUDParams struct {
+type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
@@ -46,19 +46,19 @@ type ValueObjectCRUDParams struct {
 	DomainCamelName string
 
 	// 可选配置项,通过WithXXX配置
-	globalOptions *ValueObjectCRUDGlobalOptions
-	createOptions *ValueObjectCRUDCreateOptions
-	deleteOptions *ValueObjectCRUDDeleteOptions
-	queryOptions  *ValueObjectCRUDQueryOptions
+	globalOptions *GlobalOptions
+	createOptions *CreateOptions
+	deleteOptions *DeleteOptions
+	queryOptions  *QueryOptions
 }
 
-func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
-	globalOptions := params.globalOptions
-	createOptions := params.createOptions
-	deleteOptions := params.deleteOptions
-	queryOptions := params.queryOptions
+func (simple *Simple) bind(builder *gateway.Builder) {
+	globalOptions := simple.globalOptions
+	createOptions := simple.createOptions
+	deleteOptions := simple.deleteOptions
+	queryOptions := simple.queryOptions
 
-	domainPath := "/" + strcase.ToLowerCamel(template.Id(params.DomainCamelName))
+	domainPath := "/" + strcase.ToLowerCamel(template.Id(simple.DomainCamelName))
 
 	// 创建
 	if !createOptions.disable {
@@ -79,7 +79,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 			return nil
 		}
 
-		copyBuilder.Post(gateway.NewPostRequest(params.ServiceVersionedUrl+domainPath+"/create",
+		copyBuilder.Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+domainPath+"/create",
 			gateway.PostRequestWithBodyForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
 				_, err := gateway.FormJsonBodyWithTenantIDAndUserIDFunc("tenantId", "createUserId")(c, historyRequests, resultMap)
 				if err != nil {
@@ -143,7 +143,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.
-			Post(gateway.NewPostRequest(params.ServiceVersionedUrl+domainPath+"/delete", formBodyOption), postRequestCallback).
+			Post(gateway.NewPostRequest(simple.ServiceVersionedUrl+domainPath+"/delete", formBodyOption), postRequestCallback).
 			Build(deleteMiddlewares...)
 	}
 
@@ -166,7 +166,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 			return nil
 		}
 
-		copyBuilder.Get(gateway.NewGetRequest(params.ServiceVersionedUrl+domainPath+"/query",
+		copyBuilder.Get(gateway.NewGetRequest(simple.ServiceVersionedUrl+domainPath+"/query",
 			gateway.GetRequestWithQueryParamsForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
 				_, err := gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", "")(c, historyRequests, resultMap)
 				if err != nil {
@@ -188,127 +188,127 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 	}
 }
 
-type ValueObjectCRUDBuilderCallback func(builder *gateway.Builder, c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (*gateway.Builder, error)
+type BuilderCallback func(builder *gateway.Builder, c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (*gateway.Builder, error)
 
-type ValueObjectCRUDGlobalOption func(options *ValueObjectCRUDGlobalOptions)
-type ValueObjectCRUDCreateOption func(options *ValueObjectCRUDCreateOptions)
-type ValueObjectCRUDDeleteOption func(options *ValueObjectCRUDDeleteOptions)
-type ValueObjectCRUDQueryOption func(options *ValueObjectCRUDQueryOptions)
+type GlobalOption func(options *GlobalOptions)
+type CreateOption func(options *CreateOptions)
+type DeleteOption func(options *DeleteOptions)
+type QueryOption func(options *QueryOptions)
 
-type ValueObjectCRUDGlobalOptions struct {
+type GlobalOptions struct {
 	middlewares []api.Handler
 }
 
-type ValueObjectCRUDCreateOptions struct {
+type CreateOptions struct {
 	// 关闭创建
 	disable bool
 
 	// 创建请求前回调
-	beforeBuilderCallback ValueObjectCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 创建请求后回调
-	afterBuilderCallback ValueObjectCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 创建中间件
 	middlewares []api.Handler
 }
 
-type ValueObjectCRUDDeleteOptions struct {
+type DeleteOptions struct {
 	// 关闭删除
 	disable bool
 
 	// 删除请求前回调
-	beforeBuilderCallback ValueObjectCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 删除请求后回调
-	afterBuilderCallback ValueObjectCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 删除中间件
 	middlewares []api.Handler
 }
 
-type ValueObjectCRUDQueryOptions struct {
+type QueryOptions struct {
 	// 关闭查询
 	disable bool
 
 	// 查询请求前回调
-	beforeBuilderCallback ValueObjectCRUDBuilderCallback
+	beforeBuilderCallback BuilderCallback
 
 	// 查询请求后回调
-	afterBuilderCallback ValueObjectCRUDBuilderCallback
+	afterBuilderCallback BuilderCallback
 
 	// 查询中间件
 	middlewares []api.Handler
 }
 
-func WithValueObjectCRUDGlobalMiddlewares(middlewares ...api.Handler) ValueObjectCRUDGlobalOption {
-	return func(options *ValueObjectCRUDGlobalOptions) {
+func WithGlobalMiddlewares(middlewares ...api.Handler) GlobalOption {
+	return func(options *GlobalOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithValueObjectCRUDBeforeCreateBuilderCallback(callbacks ValueObjectCRUDBuilderCallback) ValueObjectCRUDCreateOption {
-	return func(options *ValueObjectCRUDCreateOptions) {
+func WithBeforeCreateBuilderCallback(callbacks BuilderCallback) CreateOption {
+	return func(options *CreateOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithValueObjectCRUDAfterCreateBuilderCallback(callbacks ValueObjectCRUDBuilderCallback) ValueObjectCRUDCreateOption {
-	return func(options *ValueObjectCRUDCreateOptions) {
+func WithAfterCreateBuilderCallback(callbacks BuilderCallback) CreateOption {
+	return func(options *CreateOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithValueObjectCRUDCreateMiddlewares(middlewares []api.Handler) ValueObjectCRUDCreateOption {
-	return func(options *ValueObjectCRUDCreateOptions) {
+func WithCreateMiddlewares(middlewares []api.Handler) CreateOption {
+	return func(options *CreateOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithValueObjectCRUDDisableDelete() ValueObjectCRUDDeleteOption {
-	return func(options *ValueObjectCRUDDeleteOptions) {
+func WithDisableDelete() DeleteOption {
+	return func(options *DeleteOptions) {
 		options.disable = true
 	}
 }
 
-func WithValueObjectCRUDBeforeDeleteBuilderCallback(callbacks ValueObjectCRUDBuilderCallback) ValueObjectCRUDDeleteOption {
-	return func(options *ValueObjectCRUDDeleteOptions) {
+func WithBeforeDeleteBuilderCallback(callbacks BuilderCallback) DeleteOption {
+	return func(options *DeleteOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithValueObjectCRUDAfterDeleteBuilderCallback(callbacks ValueObjectCRUDBuilderCallback) ValueObjectCRUDDeleteOption {
-	return func(options *ValueObjectCRUDDeleteOptions) {
+func WithAfterDeleteBuilderCallback(callbacks BuilderCallback) DeleteOption {
+	return func(options *DeleteOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithValueObjectCRUDDeleteMiddlewares(middlewares []api.Handler) ValueObjectCRUDDeleteOption {
-	return func(options *ValueObjectCRUDDeleteOptions) {
+func WithDeleteMiddlewares(middlewares []api.Handler) DeleteOption {
+	return func(options *DeleteOptions) {
 		options.middlewares = middlewares
 	}
 }
 
-func WithValueObjectCRUDDisableQuery() ValueObjectCRUDQueryOption {
-	return func(options *ValueObjectCRUDQueryOptions) {
+func WithDisableQuery() QueryOption {
+	return func(options *QueryOptions) {
 		options.disable = true
 	}
 }
 
-func WithValueObjectCRUDBeforeQueryBuilderCallback(callbacks ValueObjectCRUDBuilderCallback) ValueObjectCRUDQueryOption {
-	return func(options *ValueObjectCRUDQueryOptions) {
+func WithBeforeQueryBuilderCallback(callbacks BuilderCallback) QueryOption {
+	return func(options *QueryOptions) {
 		options.beforeBuilderCallback = callbacks
 	}
 }
 
-func WithValueObjectCRUDAfterQueryBuilderCallback(callbacks ValueObjectCRUDBuilderCallback) ValueObjectCRUDQueryOption {
-	return func(options *ValueObjectCRUDQueryOptions) {
+func WithAfterQueryBuilderCallback(callbacks BuilderCallback) QueryOption {
+	return func(options *QueryOptions) {
 		options.afterBuilderCallback = callbacks
 	}
 }
 
-func WithValueObjectCRUDQueryMiddlewares(middlewares []api.Handler) ValueObjectCRUDQueryOption {
-	return func(options *ValueObjectCRUDQueryOptions) {
+func WithQueryMiddlewares(middlewares []api.Handler) QueryOption {
+	return func(options *QueryOptions) {
 		options.middlewares = middlewares
 	}
 }