修改bnug

convenient/entity_crud/simple.go

@@ -2,7 +2,6 @@ package entity_crud
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/binding"
-	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api/request"
 	"git.sxidc.com/go-framework/baize/framework/core/api/response"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
@@ -187,7 +186,7 @@ type CreateOptions struct {
 	callbacks *CreateCallbacks
 
 	// 创建中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 type DeleteOptions struct {
@@ -201,7 +200,7 @@ type DeleteOptions struct {
 	callbacks *DeleteCallbacks
 
 	// 删除中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 type UpdateOptions struct {
@@ -215,7 +214,7 @@ type UpdateOptions struct {
 	callbacks *UpdateCallbacks
 
 	// 更新中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 type QueryOptions[I any] struct {
@@ -229,7 +228,7 @@ type QueryOptions[I any] struct {
 	callbacks *QueryCallbacks[I]
 
 	// 查询中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 type GetByIDOptions[I any] struct {
@@ -240,7 +239,7 @@ type GetByIDOptions[I any] struct {
 	callbacks *GetByIDCallbacks[I]
 
 	// 根据ID查询中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 func WithDisableCreate() CreateOption {
@@ -261,7 +260,7 @@ func WithCreateCallbacks(callbacks *CreateCallbacks) CreateOption {
 	}
 }
 
-func WithCreateMiddlewares(middlewares []api.Handler) CreateOption {
+func WithCreateMiddlewares(middlewares []binding.Middleware) CreateOption {
 	return func(options *CreateOptions) {
 		options.middlewares = middlewares
 	}
@@ -285,7 +284,7 @@ func WithDeleteCallbacks(callbacks *DeleteCallbacks) DeleteOption {
 	}
 }
 
-func WithDeleteMiddlewares(middlewares []api.Handler) DeleteOption {
+func WithDeleteMiddlewares(middlewares []binding.Middleware) DeleteOption {
 	return func(options *DeleteOptions) {
 		options.middlewares = middlewares
 	}
@@ -309,7 +308,7 @@ func WithUpdateCallbacks(callbacks *UpdateCallbacks) UpdateOption {
 	}
 }
 
-func WithUpdateMiddlewares(middlewares []api.Handler) UpdateOption {
+func WithUpdateMiddlewares(middlewares []binding.Middleware) UpdateOption {
 	return func(options *UpdateOptions) {
 		options.middlewares = middlewares
 	}
@@ -333,7 +332,7 @@ func WithQueryCallbacks[I any](callbacks *QueryCallbacks[I]) QueryOption[I] {
 	}
 }
 
-func WithQueryMiddlewares[I any](middlewares []api.Handler) QueryOption[I] {
+func WithQueryMiddlewares[I any](middlewares []binding.Middleware) QueryOption[I] {
 	return func(options *QueryOptions[I]) {
 		options.middlewares = middlewares
 	}
@@ -351,7 +350,7 @@ func WithGetByIDCallbacks[I any](callbacks *GetByIDCallbacks[I]) GetByIDOption[I
 	}
 }
 
-func WithGetByIDMiddlewares[I any](middlewares []api.Handler) GetByIDOption[I] {
+func WithGetByIDMiddlewares[I any](middlewares []binding.Middleware) GetByIDOption[I] {
 	return func(options *GetByIDOptions[I]) {
 		options.middlewares = middlewares
 	}

convenient/value_object_crud/simple.go

@@ -2,7 +2,6 @@ package value_object_crud
 
 import (
 	"git.sxidc.com/go-framework/baize/framework/binding"
-	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api/request"
 	"git.sxidc.com/go-framework/baize/framework/core/api/response"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
@@ -50,7 +49,7 @@ func (simple *Simple[I]) bind(binder *binding.Binder) {
 				RequestParams:    simple.CreateJsonBody,
 				Objects:          []domain.Object{simple.ValueObject},
 				ServiceFunc:      Create(tableName, createOptions.callbacks),
-			})
+			}, createOptions.middlewares...)
 		} else {
 			binding.PostBind(binder, &binding.SimpleBindItem[any]{
 				Path:             domainPath + "/create",
@@ -58,7 +57,7 @@ func (simple *Simple[I]) bind(binder *binding.Binder) {
 				RequestParams:    simple.CreateJsonBody,
 				Objects:          []domain.Object{simple.ValueObject},
 				ServiceFunc:      CreateTx(tableName, createOptions.callbacks),
-			})
+			}, createOptions.middlewares...)
 		}
 	}
 
@@ -72,7 +71,7 @@ func (simple *Simple[I]) bind(binder *binding.Binder) {
 				BindRequestParamsFunc: request.BindJsonBody,
 				Objects:               []domain.Object{simple.ValueObject},
 				ServiceFunc:           Delete(tableName, deleteOptions.callbacks),
-			})
+			}, deleteOptions.middlewares...)
 		} else {
 			binding.PostBind(binder, &binding.SimpleBindItem[any]{
 				Path:                  domainPath + "/delete",
@@ -81,7 +80,7 @@ func (simple *Simple[I]) bind(binder *binding.Binder) {
 				BindRequestParamsFunc: request.BindJsonBody,
 				Objects:               []domain.Object{simple.ValueObject},
 				ServiceFunc:           DeleteTx(tableName, deleteOptions.callbacks),
-			})
+			}, deleteOptions.middlewares...)
 		}
 	}
 
@@ -93,7 +92,7 @@ func (simple *Simple[I]) bind(binder *binding.Binder) {
 			RequestParams:    simple.QueryQueryParams,
 			Objects:          []domain.Object{simple.ValueObject},
 			ServiceFunc:      Query(tableName, queryOptions.callbacks, queryOptions.conditionFieldCallback),
-		})
+		}, queryOptions.middlewares...)
 	}
 }
 
@@ -137,7 +136,7 @@ type CreateOptions struct {
 	callbacks *CreateCallbacks
 
 	// 创建中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 type DeleteOptions struct {
@@ -151,7 +150,7 @@ type DeleteOptions struct {
 	callbacks *DeleteCallbacks
 
 	// 删除中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 type QueryOptions[I any] struct {
@@ -165,7 +164,7 @@ type QueryOptions[I any] struct {
 	callbacks *QueryCallbacks[I]
 
 	// 查询中间件
-	middlewares []api.Handler
+	middlewares []binding.Middleware
 }
 
 func WithDisableCreate() CreateOption {
@@ -186,7 +185,7 @@ func WithCreateCallbacks(callbacks *CreateCallbacks) CreateOption {
 	}
 }
 
-func WithCreateMiddlewares(middlewares []api.Handler) CreateOption {
+func WithCreateMiddlewares(middlewares []binding.Middleware) CreateOption {
 	return func(options *CreateOptions) {
 		options.middlewares = middlewares
 	}
@@ -210,7 +209,7 @@ func WithDeleteCallbacks(callbacks *DeleteCallbacks) DeleteOption {
 	}
 }
 
-func WithDeleteMiddlewares(middlewares []api.Handler) DeleteOption {
+func WithDeleteMiddlewares(middlewares []binding.Middleware) DeleteOption {
 	return func(options *DeleteOptions) {
 		options.middlewares = middlewares
 	}
@@ -234,7 +233,7 @@ func WithQueryCallbacks[I any](callbacks *QueryCallbacks[I]) QueryOption[I] {
 	}
 }
 
-func WithQueryMiddlewares[I any](middlewares []api.Handler) QueryOption[I] {
+func WithQueryMiddlewares[I any](middlewares []binding.Middleware) QueryOption[I] {
 	return func(options *QueryOptions[I]) {
 		options.middlewares = middlewares
 	}