修改网关接口

convenient/gwtools/entity_crud/entity_crud.go

@@ -94,7 +94,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithBeforeRequestCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 								if createOptions.beforeBuilderCallback != nil {
-									return createOptions.beforeBuilderCallback(requestBuilder)
+									return createOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 								}
 
 								return nil
@@ -102,7 +102,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if createOptions.afterBuilderCallback != nil {
-									err := createOptions.afterBuilderCallback(requestBuilder)
+									err := createOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -135,7 +135,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithBeforeRequestCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 								if deleteOptions.beforeBuilderCallback != nil {
-									err := deleteOptions.beforeBuilderCallback(requestBuilder)
+									err := deleteOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -146,7 +146,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if deleteOptions.afterBuilderCallback != nil {
-									err := deleteOptions.afterBuilderCallback(requestBuilder)
+									err := deleteOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -175,7 +175,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						},
 						gateway.WithBeforeRequestCallback(func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 							if updateOptions.beforeBuilderCallback != nil {
-								err := updateOptions.beforeBuilderCallback(requestBuilder)
+								err := updateOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 								if err != nil {
 									return err
 								}
@@ -186,7 +186,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if updateOptions.afterBuilderCallback != nil {
-									err := updateOptions.afterBuilderCallback(requestBuilder)
+									err := updateOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -215,7 +215,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						},
 						gateway.WithBeforeRequestCallback(func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 							if queryOptions.beforeBuilderCallback != nil {
-								err := queryOptions.beforeBuilderCallback(requestBuilder)
+								err := queryOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 								if err != nil {
 									return err
 								}
@@ -226,7 +226,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if queryOptions.afterBuilderCallback != nil {
-									err := queryOptions.afterBuilderCallback(requestBuilder)
+									err := queryOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -256,7 +256,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithBeforeRequestCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 								if getByIDOptions.beforeBuilderCallback != nil {
-									err := getByIDOptions.beforeBuilderCallback(requestBuilder)
+									err := getByIDOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -267,7 +267,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if getByIDOptions.afterBuilderCallback != nil {
-									err := getByIDOptions.afterBuilderCallback(requestBuilder)
+									err := getByIDOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -280,7 +280,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	}
 }
 
-type RequestBuilderCallback func(requestBuilder *gateway.RequestBuilder) error
+type RequestBuilderCallback func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error
 
 type GlobalOption func(options *GlobalOptions)
 type CreateOption func(options *CreateOptions)

convenient/gwtools/pass_through/pass_through.go

@@ -516,19 +516,24 @@ func (params *Simple) passThrough(builder *gateway.Builder, httpMethod string, o
 				}
 			}
 
+			requestOptions := make([]gateway.RequestOption, 0)
+
 			if options.beforeRequestCallback != nil {
-				err := options.beforeRequestCallback(requestBuilder)
-				if err != nil {
-					requestBuilder.ResponseError(err)
-					return
-				}
+				requestOptions = append(requestOptions, gateway.WithBeforeRequestCallback(
+					func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
+						err := options.beforeRequestCallback(c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
+
+						return nil
+					}))
 			}
 
-			requestOptions := make([]gateway.RequestOption, 0)
 			if options.afterRequestCallback != nil {
 				requestOptions = append(requestOptions, gateway.WithRequestResponseCallback(
 					func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
-						err := options.afterRequestCallback(requestBuilder)
+						err := options.afterRequestCallback(c, historyRequests, resultMap)
 						if err != nil {
 							return err
 						}
@@ -562,7 +567,7 @@ func (params *Simple) passThrough(builder *gateway.Builder, httpMethod string, o
 		}, options.middlewares...)
 }
 
-type RequestBuilderCallback func(requestBuilder *gateway.RequestBuilder) error
+type RequestBuilderCallback func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error
 
 type Option func(options *Options)
 

convenient/gwtools/value_object_crud/value_object_crud.go

@@ -80,7 +80,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithBeforeRequestCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 								if createOptions.beforeBuilderCallback != nil {
-									err := createOptions.beforeBuilderCallback(requestBuilder)
+									err := createOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -91,7 +91,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if createOptions.afterBuilderCallback != nil {
-									err := createOptions.afterBuilderCallback(requestBuilder)
+									err := createOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -121,7 +121,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithBeforeRequestCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 								if deleteOptions.beforeBuilderCallback != nil {
-									err := deleteOptions.beforeBuilderCallback(requestBuilder)
+									err := deleteOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -132,7 +132,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if deleteOptions.afterBuilderCallback != nil {
-									err := deleteOptions.afterBuilderCallback(requestBuilder)
+									err := deleteOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -162,7 +162,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithBeforeRequestCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error {
 								if queryOptions.beforeBuilderCallback != nil {
-									err := queryOptions.beforeBuilderCallback(requestBuilder)
+									err := queryOptions.beforeBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -173,7 +173,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 						gateway.WithRequestResponseCallback(
 							func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any, response *http_client.Response) error {
 								if queryOptions.afterBuilderCallback != nil {
-									err := queryOptions.afterBuilderCallback(requestBuilder)
+									err := queryOptions.afterBuilderCallback(c, historyRequests, resultMap)
 									if err != nil {
 										return err
 									}
@@ -186,7 +186,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	}
 }
 
-type RequestBuilderCallback func(requestBuilder *gateway.RequestBuilder) error
+type RequestBuilderCallback func(c *api.Context, historyRequests []gateway.Request, resultMap map[string]any) error
 
 type GlobalOption func(options *GlobalOptions)
 type CreateOption func(options *CreateOptions)