修改bug

convenient/domain_gateway/configuration/configuration.go

@@ -83,7 +83,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 		Url(http.MethodPost, "/configuration/create").
 		Post(gateway.NewPostRequest("",
 			gateway.PostRequestWithUrlTransferFunc(
-				func(c *api.Context, _ string, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
+				func(c *api.Context, _ string, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
 					jsonBody, err := c.GetJsonBody()
 					if err != nil {
 						return "", err
@@ -128,7 +128,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 		Url(http.MethodPost, "/configuration/delete").
 		Post(gateway.NewPostRequest("",
 			gateway.PostRequestWithUrlTransferFunc(
-				func(c *api.Context, _ string, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
+				func(c *api.Context, _ string, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
 					jsonBody, err := c.GetJsonBody()
 					if err != nil {
 						return "", err
@@ -173,7 +173,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 		Url(http.MethodGet, "/configuration/values").
 		Get(gateway.NewGetRequest("",
 			gateway.GetRequestWithUrlTransferFunc(
-				func(c *api.Context, _ string, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
+				func(c *api.Context, _ string, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
 					queryParams := c.GetQueryParams()
 
 					serviceShortName := queryParams.Get("serviceShortName")

convenient/domain_gateway/sql_executor/sql_executor.go

@@ -74,7 +74,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 		Url(http.MethodPost, "/sql/execute").
 		Post(gateway.NewPostRequest("",
 			gateway.PostRequestWithUrlTransferFunc(
-				func(c *api.Context, _ string, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
+				func(c *api.Context, _ string, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
 					jsonBody, err := c.GetJsonBody()
 					if err != nil {
 						return "", err
@@ -113,7 +113,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 					return serviceUrl, nil
 				}),
 			gateway.PostRequestWithBodyForm(
-				func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
+				func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
 					err := gateway.AddJsonBodyTenantIDAndUserID(c, "", "executorId")
 					if err != nil {
 						return nil, err
@@ -139,7 +139,7 @@ func BuildGateway(gw *gateway.Gateway, opts ...Option) {
 		Url(http.MethodGet, "/sql/execute/log").
 		Get(gateway.NewGetRequest("",
 			gateway.GetRequestWithUrlTransferFunc(
-				func(c *api.Context, _ string, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
+				func(c *api.Context, _ string, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (string, error) {
 					queryParams := c.GetQueryParams()
 
 					serviceShortName := queryParams.Get("serviceShortName")

convenient/gwtools/entity_crud.go

@@ -80,7 +80,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		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)
+				innerBuilder, err := createOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -93,14 +93,14 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		copyBuilder.
 			Post(gateway.NewPostRequest(params.ServiceVersionedUrl+domainPath+"/create",
-				gateway.PostRequestWithBodyForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
-					_, err := gateway.FormJsonBodyWithTenantIDAndUserIDFunc("tenantId", "createUserId")(c, historyRequest, resultMap)
+				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 {
 						return nil, err
 					}
 
 					if createOptions.beforeBuilderCallback != nil {
-						innerBuilder, err := createOptions.beforeBuilderCallback(copyBuilder, c)
+						innerBuilder, err := createOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 						if err != nil {
 							return nil, err
 						}
@@ -125,9 +125,9 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 		copyBuilder := builder.Url(http.MethodDelete, domainPath+"/delete")
 
 		queryParamsFormOption := gateway.DeleteRequestWithQueryParamsForm(
-			func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
+			func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
 				if deleteOptions.beforeBuilderCallback != nil {
-					innerBuilder, err := deleteOptions.beforeBuilderCallback(copyBuilder, c)
+					innerBuilder, err := deleteOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 					if err != nil {
 						return nil, err
 					}
@@ -140,7 +140,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		deleteRequestCallback := 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)
+				innerBuilder, err := deleteOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -164,7 +164,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		putRequestCallback := 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)
+				innerBuilder, err := updateOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -176,14 +176,14 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.Put(gateway.NewPutRequest(params.ServiceVersionedUrl+domainPath+"/update",
-			gateway.PutRequestWithBodyForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
-				_, err := gateway.FormJsonBodyWithTenantIDAndUserIDFunc("", "updateUserId")(c, historyRequest, resultMap)
+			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 {
 					return nil, err
 				}
 
 				if updateOptions.beforeBuilderCallback != nil {
-					innerBuilder, err := updateOptions.beforeBuilderCallback(copyBuilder, c)
+					innerBuilder, err := updateOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 					if err != nil {
 						return nil, err
 					}
@@ -209,7 +209,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		getRequestCallback := 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)
+				innerBuilder, err := queryOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -221,14 +221,14 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.Get(gateway.NewGetRequest(params.ServiceVersionedUrl+domainPath+"/query",
-			gateway.GetRequestWithQueryParamsForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
-				_, err := gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", "")(c, historyRequest, resultMap)
+			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 {
 					return nil, err
 				}
 
 				if queryOptions.beforeBuilderCallback != nil {
-					innerBuilder, err := queryOptions.beforeBuilderCallback(copyBuilder, c)
+					innerBuilder, err := queryOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 					if err != nil {
 						return nil, err
 					}
@@ -247,9 +247,9 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		copyBuilder := builder.Url(http.MethodGet, domainPath+"/get")
 
-		formQueryParamsOption := gateway.GetRequestWithQueryParamsForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
+		formQueryParamsOption := gateway.GetRequestWithQueryParamsForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
 			if getByIDOptions.beforeBuilderCallback != nil {
-				innerBuilder, err := getByIDOptions.beforeBuilderCallback(copyBuilder, c)
+				innerBuilder, err := getByIDOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return nil, err
 				}
@@ -262,7 +262,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 
 		getRequestCallback := 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)
+				innerBuilder, err := getByIDOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -279,7 +279,7 @@ func (params *EntityCRUDParams) crud(builder *gateway.Builder) {
 	}
 }
 
-type EntityCRUDBuilderCallback func(builder *gateway.Builder, c *api.Context) (*gateway.Builder, error)
+type EntityCRUDBuilderCallback 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)

convenient/gwtools/value_object_crud.go

@@ -68,7 +68,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 
 		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)
+				innerBuilder, err := createOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -80,14 +80,14 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.Post(gateway.NewPostRequest(params.ServiceVersionedUrl+domainPath+"/create",
-			gateway.PostRequestWithBodyForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
-				_, err := gateway.FormJsonBodyWithTenantIDAndUserIDFunc("tenantId", "createUserId")(c, historyRequest, resultMap)
+			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 {
 					return nil, err
 				}
 
 				if createOptions.beforeBuilderCallback != nil {
-					innerBuilder, err := createOptions.beforeBuilderCallback(copyBuilder, c)
+					innerBuilder, err := createOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 					if err != nil {
 						return nil, err
 					}
@@ -111,14 +111,14 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 
 		copyBuilder := builder.Url(http.MethodPost, domainPath+"/delete")
 
-		formBodyOption := gateway.PostRequestWithBodyForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
+		formBodyOption := gateway.PostRequestWithBodyForm(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (any, error) {
 			jsonBody, err := c.GetJsonBody()
 			if err != nil {
 				return nil, err
 			}
 
 			if deleteOptions.beforeBuilderCallback != nil {
-				innerBuilder, err := deleteOptions.beforeBuilderCallback(copyBuilder, c)
+				innerBuilder, err := deleteOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return nil, err
 				}
@@ -131,7 +131,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 
 		postRequestCallback := 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)
+				innerBuilder, err := deleteOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -155,7 +155,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 
 		getRequestCallback := 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)
+				innerBuilder, err := queryOptions.afterBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 				if err != nil {
 					return err
 				}
@@ -167,14 +167,14 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 		}
 
 		copyBuilder.Get(gateway.NewGetRequest(params.ServiceVersionedUrl+domainPath+"/query",
-			gateway.GetRequestWithQueryParamsForm(func(c *api.Context, historyRequest []gateway.BuilderRequest, resultMap map[string]any) (map[string]string, error) {
-				_, err := gateway.FormQueryParamsWithTenantIDAndUserIDFunc("tenantId", "")(c, historyRequest, resultMap)
+			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 {
 					return nil, err
 				}
 
 				if queryOptions.beforeBuilderCallback != nil {
-					innerBuilder, err := queryOptions.beforeBuilderCallback(copyBuilder, c)
+					innerBuilder, err := queryOptions.beforeBuilderCallback(copyBuilder, c, historyRequests, resultMap)
 					if err != nil {
 						return nil, err
 					}
@@ -188,7 +188,7 @@ func (params *ValueObjectCRUDParams) crud(builder *gateway.Builder) {
 	}
 }
 
-type ValueObjectCRUDBuilderCallback func(builder *gateway.Builder, c *api.Context) (*gateway.Builder, error)
+type ValueObjectCRUDBuilderCallback 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)

framework/gateway/builder_request.go

@@ -5,14 +5,14 @@ import (
 	"git.sxidc.com/go-tools/utils/http_client"
 )
 
-type UrlTransferFunc func(c *api.Context, url string, historyRequest []BuilderRequest, resultMap map[string]any) (string, error)
-type HeadersFormFunc func(c *api.Context, historyRequest []BuilderRequest, resultMap map[string]any) (map[string]string, error)
-type BodyFormFunc func(c *api.Context, historyRequest []BuilderRequest, resultMap map[string]any) (any, error)
-type QueryParamsFormFunc func(c *api.Context, historyRequest []BuilderRequest, resultMap map[string]any) (map[string]string, error)
-type PathParamsFormFunc func(c *api.Context, historyRequest []BuilderRequest, resultMap map[string]any) (map[string]string, error)
+type UrlTransferFunc func(c *api.Context, url string, historyRequests []BuilderRequest, resultMap map[string]any) (string, error)
+type HeadersFormFunc func(c *api.Context, historyRequests []BuilderRequest, resultMap map[string]any) (map[string]string, error)
+type BodyFormFunc func(c *api.Context, historyRequests []BuilderRequest, resultMap map[string]any) (any, error)
+type QueryParamsFormFunc func(c *api.Context, historyRequests []BuilderRequest, resultMap map[string]any) (map[string]string, error)
+type PathParamsFormFunc func(c *api.Context, historyRequests []BuilderRequest, resultMap map[string]any) (map[string]string, error)
 
 func FormJsonBodyWithTenantIDAndUserIDFunc(tenantIDFieldName string, userIDFieldName string) BodyFormFunc {
-	return func(c *api.Context, historyRequest []BuilderRequest, resultMap map[string]any) (any, error) {
+	return func(c *api.Context, historyRequests []BuilderRequest, resultMap map[string]any) (any, error) {
 		err := AddJsonBodyTenantIDAndUserID(c, tenantIDFieldName, userIDFieldName)
 		if err != nil {
 			return nil, err
@@ -28,7 +28,7 @@ func FormJsonBodyWithTenantIDAndUserIDFunc(tenantIDFieldName string, userIDField
 }
 
 func FormQueryParamsWithTenantIDAndUserIDFunc(tenantIDFieldName string, userIDFieldName string) QueryParamsFormFunc {
-	return func(c *api.Context, historyRequest []BuilderRequest, resultMap map[string]any) (map[string]string, error) {
+	return func(c *api.Context, historyRequests []BuilderRequest, resultMap map[string]any) (map[string]string, error) {
 		err := AddQueryParamsTenantIDAndUserID(c, tenantIDFieldName, userIDFieldName)
 		if err != nil {
 			return nil, err
@@ -39,7 +39,7 @@ func FormQueryParamsWithTenantIDAndUserIDFunc(tenantIDFieldName string, userIDFi
 }
 
 type BuilderRequest interface {
-	Request(c *api.Context, request *http_client.Request, historyRequest []BuilderRequest, resultMap map[string]any) (BuilderRequest, error)
+	Request(c *api.Context, request *http_client.Request, historyRequests []BuilderRequest, resultMap map[string]any) (BuilderRequest, error)
 	Response() *http_client.Response
 }
 
@@ -100,18 +100,18 @@ func NewPostRequest(url string, opts ...PostRequestOption) *PostRequest {
 	}
 }
 
-func (req *PostRequest) Request(c *api.Context, request *http_client.Request, historyRequest []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
-	url, err := req.options.urlTransferFunc(c, req.url, historyRequest, resultMap)
+func (req *PostRequest) Request(c *api.Context, request *http_client.Request, historyRequests []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
+	url, err := req.options.urlTransferFunc(c, req.url, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	headers, err := req.options.headersFormFunc(c, historyRequest, resultMap)
+	headers, err := req.options.headersFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	body, err := req.options.bodyFormFunc(c, historyRequest, resultMap)
+	body, err := req.options.bodyFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
@@ -204,23 +204,23 @@ func NewDeleteRequest(url string, opts ...DeleteRequestOption) *DeleteRequest {
 	}
 }
 
-func (req *DeleteRequest) Request(c *api.Context, request *http_client.Request, historyRequest []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
-	url, err := req.options.urlTransferFunc(c, req.url, historyRequest, resultMap)
+func (req *DeleteRequest) Request(c *api.Context, request *http_client.Request, historyRequests []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
+	url, err := req.options.urlTransferFunc(c, req.url, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	headers, err := req.options.headersFormFunc(c, historyRequest, resultMap)
+	headers, err := req.options.headersFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	pathParams, err := req.options.pathParamsFormFunc(c, historyRequest, resultMap)
+	pathParams, err := req.options.pathParamsFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	queryParams, err := req.options.queryParamsFormFunc(c, historyRequest, resultMap)
+	queryParams, err := req.options.queryParamsFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
@@ -306,18 +306,18 @@ func NewPutRequest(url string, opts ...PutRequestOption) *PutRequest {
 	}
 }
 
-func (req *PutRequest) Request(c *api.Context, request *http_client.Request, historyRequest []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
-	url, err := req.options.urlTransferFunc(c, req.url, historyRequest, resultMap)
+func (req *PutRequest) Request(c *api.Context, request *http_client.Request, historyRequests []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
+	url, err := req.options.urlTransferFunc(c, req.url, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	headers, err := req.options.headersFormFunc(c, historyRequest, resultMap)
+	headers, err := req.options.headersFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	body, err := req.options.bodyFormFunc(c, historyRequest, resultMap)
+	body, err := req.options.bodyFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
@@ -413,23 +413,23 @@ func NewGetRequest(url string, opts ...GetRequestOption) *GetRequest {
 	}
 }
 
-func (req *GetRequest) Request(c *api.Context, request *http_client.Request, historyRequest []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
-	url, err := req.options.urlTransferFunc(c, req.url, historyRequest, resultMap)
+func (req *GetRequest) Request(c *api.Context, request *http_client.Request, historyRequests []BuilderRequest, resultMap map[string]any) (BuilderRequest, error) {
+	url, err := req.options.urlTransferFunc(c, req.url, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	headers, err := req.options.headersFormFunc(c, historyRequest, resultMap)
+	headers, err := req.options.headersFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	pathParams, err := req.options.pathParamsFormFunc(c, historyRequest, resultMap)
+	pathParams, err := req.options.pathParamsFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}
 
-	queryParams, err := req.options.queryParamsFormFunc(c, historyRequest, resultMap)
+	queryParams, err := req.options.queryParamsFormFunc(c, historyRequests, resultMap)
 	if err != nil {
 		return nil, err
 	}