调整网关请求接口

convenient/domain_gateway/configuration/configuration.go

@@ -120,7 +120,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 
 				return serviceUrl, nil
 			},
-		}, nil).
+		}).
 		Build(createMiddlewares...)
 
 	// 删除
@@ -165,7 +165,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 
 				return serviceUrl, nil
 			},
-		}, nil).
+		}).
 		Build(deleteMiddlewares...)
 
 	// 查询
@@ -207,7 +207,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 
 				return serviceUrl, nil
 			},
-		}, nil).
+		}).
 		Build(queryMiddlewares...)
 
 	// 查询注册的服务

convenient/domain_gateway/sql_executor/sql_executor.go

@@ -131,7 +131,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 
 				return jsonBody.Map(), nil
 			},
-		}, nil).
+		}).
 		Build(executeSqlMiddlewares...)
 
 	builder.
@@ -173,7 +173,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 				return serviceUrl, nil
 			},
 			QueryParamsFormFunc: gateway.FormQueryParamsWithTenantIDAndUserIDFunc("", "executorId"),
-		}, nil).
+		}).
 		Build(sqlExecuteLogMiddlewares...)
 
 	// 查询注册的服务

convenient/gwtools/entity_crud/entity_crud.go

@@ -78,19 +78,6 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 
 		copyBuilder := builder.Url(http.MethodPost, domainPath+"/create")
 
-		postRequestCallback := func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-			if createOptions.afterBuilderCallback != nil {
-				innerBuilder, err := createOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-				if err != nil {
-					return err
-				}
-
-				copyBuilder = innerBuilder
-			}
-
-			return nil
-		}
-
 		copyBuilder.
 			Post(&gateway.PostRequest{
 				Url: simple.ServiceVersionedUrl + domainPath + "/create",
@@ -117,7 +104,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 					return jsonBody.Map(), nil
 				},
 				HeadersFormFunc: nil,
-			}, postRequestCallback).
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if createOptions.afterBuilderCallback != nil {
+						innerBuilder, err := createOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
+
+						copyBuilder = innerBuilder
+					}
+
+					return nil
+				})).
 			Build(createMiddlewares...)
 	}
 
@@ -142,18 +141,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 
 					return c.GetQueryParams().Map(), nil
 				},
-			}, func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-				if deleteOptions.afterBuilderCallback != nil {
-					innerBuilder, err := deleteOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-					if err != nil {
-						return err
-					}
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if deleteOptions.afterBuilderCallback != nil {
+						innerBuilder, err := deleteOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
 
-					copyBuilder = innerBuilder
-				}
+						copyBuilder = innerBuilder
+					}
 
-				return nil
-			}).
+					return nil
+				})).
 			Build(deleteMiddlewares...)
 	}
 
@@ -188,18 +188,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 
 					return jsonBody.Map(), nil
 				},
-			}, func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-				if updateOptions.afterBuilderCallback != nil {
-					innerBuilder, err := updateOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-					if err != nil {
-						return err
-					}
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if updateOptions.afterBuilderCallback != nil {
+						innerBuilder, err := updateOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
 
-					copyBuilder = innerBuilder
-				}
+						copyBuilder = innerBuilder
+					}
 
-				return nil
-			}).
+					return nil
+				})).
 			Build(updateMiddlewares...)
 	}
 
@@ -230,18 +231,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 					return c.GetQueryParams().Map(), nil
 				},
 				PathParamsFormFunc: nil,
-			}, func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-				if queryOptions.afterBuilderCallback != nil {
-					innerBuilder, err := queryOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-					if err != nil {
-						return err
-					}
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if queryOptions.afterBuilderCallback != nil {
+						innerBuilder, err := queryOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
 
-					copyBuilder = innerBuilder
-				}
+						copyBuilder = innerBuilder
+					}
 
-				return nil
-			}).
+					return nil
+				})).
 			Build(queryMiddlewares...)
 	}
 
@@ -271,18 +273,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 					return c.GetQueryParams().Map(), nil
 				},
 				PathParamsFormFunc: nil,
-			}, func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-				if getByIDOptions.afterBuilderCallback != nil {
-					innerBuilder, err := getByIDOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-					if err != nil {
-						return err
-					}
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if getByIDOptions.afterBuilderCallback != nil {
+						innerBuilder, err := getByIDOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
 
-					copyBuilder = innerBuilder
-				}
+						copyBuilder = innerBuilder
+					}
 
-				return nil
-			}).
+					return nil
+				})).
 			Build(getByIDMiddlewares...)
 	}
 }

convenient/gwtools/pass_through/pass_through.go

@@ -83,13 +83,13 @@ func (params *PassThroughParams) passThrough(builder *gateway.Builder, middlewar
 
 	switch req := params.Request.(type) {
 	case *gateway.PostRequest:
-		copyBuilder = copyBuilder.Post(req, nil)
+		copyBuilder = copyBuilder.Post(req)
 	case *gateway.DeleteRequest:
-		copyBuilder = copyBuilder.Delete(req, nil)
+		copyBuilder = copyBuilder.Delete(req)
 	case *gateway.PutRequest:
-		copyBuilder = copyBuilder.Put(req, nil)
+		copyBuilder = copyBuilder.Put(req)
 	case *gateway.GetRequest:
-		copyBuilder = copyBuilder.Get(req, nil)
+		copyBuilder = copyBuilder.Get(req)
 	default:
 		panic("不支持的请求类型")
 	}
@@ -121,13 +121,13 @@ func (params *OnePassThroughParams) passThrough(builder *gateway.Builder, middle
 
 	switch req := params.RequestItem.Request.(type) {
 	case *gateway.PostRequest:
-		copyBuilder = copyBuilder.Post(req, params.RequestItem.RequestResponseCallback)
+		copyBuilder = copyBuilder.Post(req, gateway.WithRequestResponseCallback(params.RequestItem.RequestResponseCallback))
 	case *gateway.DeleteRequest:
-		copyBuilder = copyBuilder.Delete(req, params.RequestItem.RequestResponseCallback)
+		copyBuilder = copyBuilder.Delete(req, gateway.WithRequestResponseCallback(params.RequestItem.RequestResponseCallback))
 	case *gateway.PutRequest:
-		copyBuilder = copyBuilder.Put(req, params.RequestItem.RequestResponseCallback)
+		copyBuilder = copyBuilder.Put(req, gateway.WithRequestResponseCallback(params.RequestItem.RequestResponseCallback))
 	case *gateway.GetRequest:
-		copyBuilder = copyBuilder.Get(req, params.RequestItem.RequestResponseCallback)
+		copyBuilder = copyBuilder.Get(req, gateway.WithRequestResponseCallback(params.RequestItem.RequestResponseCallback))
 	default:
 		panic("不支持的请求类型")
 	}
@@ -160,13 +160,13 @@ func (params *CommonPassThroughParams) passThrough(builder *gateway.Builder, mid
 	for _, requestItem := range params.RequestItems {
 		switch req := requestItem.Request.(type) {
 		case *gateway.PostRequest:
-			copyBuilder = copyBuilder.Post(req, requestItem.RequestResponseCallback)
+			copyBuilder = copyBuilder.Post(req, gateway.WithRequestResponseCallback(requestItem.RequestResponseCallback))
 		case *gateway.DeleteRequest:
-			copyBuilder = copyBuilder.Delete(req, requestItem.RequestResponseCallback)
+			copyBuilder = copyBuilder.Delete(req, gateway.WithRequestResponseCallback(requestItem.RequestResponseCallback))
 		case *gateway.PutRequest:
-			copyBuilder = copyBuilder.Put(req, requestItem.RequestResponseCallback)
+			copyBuilder = copyBuilder.Put(req, gateway.WithRequestResponseCallback(requestItem.RequestResponseCallback))
 		case *gateway.GetRequest:
-			copyBuilder = copyBuilder.Get(req, requestItem.RequestResponseCallback)
+			copyBuilder = copyBuilder.Get(req, gateway.WithRequestResponseCallback(requestItem.RequestResponseCallback))
 		default:
 			panic("不支持的请求类型")
 		}

convenient/gwtools/relation/many2many/many2many.go

@@ -46,7 +46,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodPost, leftDomainPath+rightDomainPath+"/update").
 				Post(&gateway.PostRequest{
 					Url: simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/update",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -56,7 +56,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/query").
 				Get(&gateway.GetRequest{
 					Url: simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/query",
-				}, nil).
+				}).
 				Build()
 		}
 	}
@@ -68,7 +68,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodPost, rightDomainPath+leftDomainPath+"/update").
 				Post(&gateway.PostRequest{
 					Url: simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/update",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -78,7 +78,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/query").
 				Get(&gateway.GetRequest{
 					Url: simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/query",
-				}, nil).
+				}).
 				Build()
 		}
 	}

convenient/gwtools/relation/one2many/one2many.go

@@ -46,7 +46,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodPost, leftDomainPath+rightDomainPath+"/update").
 				Post(&gateway.PostRequest{
 					Url: simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/update",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -56,7 +56,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/query").
 				Get(&gateway.GetRequest{
 					Url: simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/query",
-				}, nil).
+				}).
 				Build()
 		}
 	}
@@ -68,7 +68,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodPost, rightDomainPath+leftDomainPath+"/update").
 				Post(&gateway.PostRequest{
 					Url: simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/update",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -78,7 +78,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/query").
 				Get(&gateway.GetRequest{
 					Url: simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/query",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -89,7 +89,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Get(&gateway.GetRequest{
 					Url:                 simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/queryWith",
 					QueryParamsFormFunc: gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", ""),
-				}, nil).
+				}).
 				Build()
 		}
 	}

convenient/gwtools/relation/one2one/one2one.go

@@ -46,7 +46,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodPost, leftDomainPath+rightDomainPath+"/update").
 				Post(&gateway.PostRequest{
 					Url: simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/update",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -56,7 +56,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodGet, leftDomainPath+rightDomainPath+"/query").
 				Get(&gateway.GetRequest{
 					Url: simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/query",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -67,7 +67,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Get(&gateway.GetRequest{
 					Url:                 simple.ServiceVersionedUrl + leftDomainPath + rightDomainPath + "/queryWith",
 					QueryParamsFormFunc: gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", ""),
-				}, nil).
+				}).
 				Build()
 		}
 	}
@@ -79,7 +79,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodPost, rightDomainPath+leftDomainPath+"/update").
 				Post(&gateway.PostRequest{
 					Url: simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/update",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -89,7 +89,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Url(http.MethodGet, rightDomainPath+leftDomainPath+"/query").
 				Get(&gateway.GetRequest{
 					Url: simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/query",
-				}, nil).
+				}).
 				Build()
 		}
 
@@ -100,7 +100,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 				Get(&gateway.GetRequest{
 					Url:                 simple.ServiceVersionedUrl + rightDomainPath + leftDomainPath + "/queryWith",
 					QueryParamsFormFunc: gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", ""),
-				}, nil).
+				}).
 				Build()
 		}
 	}

convenient/gwtools/value_object_crud/value_object_crud.go

@@ -66,19 +66,6 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 
 		copyBuilder := builder.Url(http.MethodPost, domainPath+"/create")
 
-		postRequestCallback := func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-			if createOptions.afterBuilderCallback != nil {
-				innerBuilder, err := createOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-				if err != nil {
-					return err
-				}
-
-				copyBuilder = innerBuilder
-			}
-
-			return nil
-		}
-
 		copyBuilder.
 			Post(&gateway.PostRequest{
 				Url: simple.ServiceVersionedUrl + domainPath + "/create",
@@ -105,7 +92,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 					return jsonBody.Map(), nil
 				},
 				HeadersFormFunc: nil,
-			}, postRequestCallback).
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if createOptions.afterBuilderCallback != nil {
+						innerBuilder, err := createOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
+
+						copyBuilder = innerBuilder
+					}
+
+					return nil
+				})).
 			Build(createMiddlewares...)
 	}
 
@@ -136,18 +135,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 					return jsonBody.Map(), nil
 				},
 				HeadersFormFunc: nil,
-			}, func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-				if deleteOptions.afterBuilderCallback != nil {
-					innerBuilder, err := deleteOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-					if err != nil {
-						return err
-					}
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if deleteOptions.afterBuilderCallback != nil {
+						innerBuilder, err := deleteOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
 
-					copyBuilder = innerBuilder
-				}
+						copyBuilder = innerBuilder
+					}
 
-				return nil
-			}).
+					return nil
+				})).
 			Build(deleteMiddlewares...)
 	}
 
@@ -177,18 +177,19 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 
 					return c.GetQueryParams().Map(), nil
 				},
-			}, func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
-				if queryOptions.afterBuilderCallback != nil {
-					innerBuilder, err := queryOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
-					if err != nil {
-						return err
-					}
+			}, gateway.WithRequestResponseCallback(
+				func(c *api.Context, response *http_client.Response, historyRequests []gateway.BuilderRequest, resultMap map[string]any) error {
+					if queryOptions.afterBuilderCallback != nil {
+						innerBuilder, err := queryOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
+						if err != nil {
+							return err
+						}
 
-					copyBuilder = innerBuilder
-				}
+						copyBuilder = innerBuilder
+					}
 
-				return nil
-			}).
+					return nil
+				})).
 			Build(queryMiddlewares...)
 	}
 }

framework/gateway/builder.go

@@ -40,24 +40,41 @@ func (builder *Builder) Url(httpMethod string, relativePath string) *Builder {
 	return copyBuilder
 }
 
-func (builder *Builder) Post(request *PostRequest, requestCallbackFunc RequestResponseCallback) *Builder {
-	return builder.request(request, requestCallbackFunc)
+type RequestOption func(options *RequestOptions)
+
+type RequestOptions struct {
+	requestResponseCallback RequestResponseCallback
+}
+
+func WithRequestResponseCallback(callback RequestResponseCallback) RequestOption {
+	return func(options *RequestOptions) {
+		options.requestResponseCallback = callback
+	}
 }
 
-func (builder *Builder) Delete(request *DeleteRequest, requestCallbackFunc RequestResponseCallback) *Builder {
-	return builder.request(request, requestCallbackFunc)
+func (builder *Builder) Post(request *PostRequest, opts ...RequestOption) *Builder {
+	return builder.request(request, opts...)
 }
 
-func (builder *Builder) Put(request *PutRequest, requestCallbackFunc RequestResponseCallback) *Builder {
-	return builder.request(request, requestCallbackFunc)
+func (builder *Builder) Delete(request *DeleteRequest, opts ...RequestOption) *Builder {
+	return builder.request(request, opts...)
 }
 
-func (builder *Builder) Get(request *GetRequest, requestCallbackFunc RequestResponseCallback) *Builder {
-	return builder.request(request, requestCallbackFunc)
+func (builder *Builder) Put(request *PutRequest, opts ...RequestOption) *Builder {
+	return builder.request(request, opts...)
 }
 
-func (builder *Builder) request(builderRequest BuilderRequest, requestCallbackFunc RequestResponseCallback) *Builder {
-	return builder.addRequest(newBuilderRequestItem(builderRequest, requestCallbackFunc))
+func (builder *Builder) Get(request *GetRequest, opts ...RequestOption) *Builder {
+	return builder.request(request, opts...)
+}
+
+func (builder *Builder) request(builderRequest BuilderRequest, opts ...RequestOption) *Builder {
+	options := new(RequestOptions)
+	for _, opt := range opts {
+		opt(options)
+	}
+
+	return builder.addRequest(newBuilderRequestItem(builderRequest, options))
 }
 
 func (builder *Builder) GlobalRequestCallback(globalRequestResponseCallback GlobalRequestResponseCallback) *Builder {
@@ -100,8 +117,8 @@ func (builder *Builder) Build(middlewares ...api.Handler) {
 
 				historyRequests = append(historyRequests, requestWithResponse)
 
-				if requestItem.requestResponseCallback != nil {
-					err := requestItem.requestResponseCallback(c, requestWithResponse.Response(), historyRequests, resultMap)
+				if requestItem.options.requestResponseCallback != nil {
+					err := requestItem.options.requestResponseCallback(c, requestWithResponse.Response(), historyRequests, resultMap)
 					if err != nil {
 						builder.params.responseErrorCallback(c, errors.New(err.Error()))
 						return

framework/gateway/builder_request_item.go

@@ -1,13 +1,13 @@
 package gateway
 
 type builderRequestItem struct {
-	builderRequest          BuilderRequest
-	requestResponseCallback RequestResponseCallback
+	builderRequest BuilderRequest
+	options        *RequestOptions
 }
 
-func newBuilderRequestItem(builderRequest BuilderRequest, requestResponseCallback RequestResponseCallback) *builderRequestItem {
+func newBuilderRequestItem(builderRequest BuilderRequest, options *RequestOptions) *builderRequestItem {
 	return &builderRequestItem{
-		builderRequest:          builderRequest,
-		requestResponseCallback: requestResponseCallback,
+		builderRequest: builderRequest,
+		options:        options,
 	}
 }