完成sql执行领域

convenient/domain_gateway/configuration.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func configurationGatewayApi(baseUrl string, builder *gateway.Builder) {
+func ConfigurationGateway(serviceVersionedUrl string, builder *gateway.Builder) {
 	gwtools.CRUD(builder, &gwtools.CRUDParams{
-		ServiceVersionedUrl: baseUrl,
+		ServiceVersionedUrl: serviceVersionedUrl,
 		DomainCamelName:     "Configuration",
 	}, gwtools.WithCRUDDisableUpdate())
 }

convenient/domain_gateway/sql_executor.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 )
 
-func sqlExecutorGatewayApi(baseUrl string, builder *gateway.Builder) {
+func SqlExecutorGateway(baseUrlNoUrlPrefix string, builder *gateway.Builder) {
 	builder.
 		Url(http.MethodPost, "/sql/execute").
 		Request(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (gateway.BuilderRequest, error) {
@@ -23,42 +23,42 @@ func sqlExecutorGatewayApi(baseUrl string, builder *gateway.Builder) {
 				bodyMap["executorName"] = userInfo.GetName()
 			}
 
-			serviceNameValue, ok := bodyMap["serviceName"]
+			urlPrefixValue, ok := bodyMap["urlPrefix"]
 			if !ok {
 				return nil, fserr.New("没有传递服务名")
 			}
 
-			serviceName, ok := serviceNameValue.(string)
+			urlPrefix, ok := urlPrefixValue.(string)
 			if !ok {
 				return nil, fserr.New("服务名不是string类型")
 			}
 
-			delete(bodyMap, "serviceName")
+			delete(bodyMap, "urlPrefix")
 
 			return &gateway.PostRequest{
-				Url:  baseUrl + "/" + serviceName + "/sql/execute",
+				Url:  baseUrlNoUrlPrefix + "/" + urlPrefix + "/api/sql/execute",
 				Body: bodyMap,
 			}, nil
 		}, nil).
 		Build()
 
 	builder.
-		Url(http.MethodPost, "/sql/execute").
+		Url(http.MethodGet, "/sql/execute/log").
 		Request(func(c *api.Context, historyRequests []gateway.BuilderRequest, resultMap map[string]any) (gateway.BuilderRequest, error) {
 			queryPrams, err := gateway.AddQueryParamsTenantIDAndUserID(c, "", "executorId")
 			if err != nil {
 				return nil, err
 			}
 
-			serviceName, ok := queryPrams["serviceName"]
+			urlPrefix, ok := queryPrams["urlPrefix"]
 			if !ok {
 				return nil, fserr.New("没有传递服务名")
 			}
 
-			delete(queryPrams, "serviceName")
+			delete(queryPrams, "urlPrefix")
 
 			return &gateway.GetRequest{
-				Url:         baseUrl + "/" + serviceName + "/sql/execute/log",
+				Url:         baseUrlNoUrlPrefix + "/" + urlPrefix + "/api/sql/execute/log",
 				QueryParams: queryPrams,
 			}, nil
 		}, nil).

framework/gateway/builder.go

@@ -3,6 +3,7 @@ package gateway
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-tools/utils/http_client"
+	"git.sxidc.com/service-supports/fserr"
 	"time"
 )
 
@@ -147,20 +148,20 @@ func (builder *Builder) Build(middlewares ...api.Handler) {
 			for _, requestItem := range builder.params.requestItems {
 				request, err := requestItem.formBuilderRequestFuc(c, historyRequests, resultMap)
 				if err != nil {
-					builder.params.responseErrorCallback(c, err)
+					builder.params.responseErrorCallback(c, fserr.New(err.Error()))
 					return
 				}
 
 				err = request.Request(httpRequest)
 				if err != nil {
-					builder.params.responseErrorCallback(c, err)
+					builder.params.responseErrorCallback(c, fserr.New(err.Error()))
 					return
 				}
 
 				if requestItem.requestResponseCallback != nil {
 					err := requestItem.requestResponseCallback(c, request.Response(), historyRequests, resultMap)
 					if err != nil {
-						builder.params.responseErrorCallback(c, err)
+						builder.params.responseErrorCallback(c, fserr.New(err.Error()))
 						return
 					}
 
@@ -170,7 +171,7 @@ func (builder *Builder) Build(middlewares ...api.Handler) {
 				if builder.params.globalRequestResponseCallback != nil {
 					err := builder.params.globalRequestResponseCallback(c, request, historyRequests, resultMap)
 					if err != nil {
-						builder.params.responseErrorCallback(c, err)
+						builder.params.responseErrorCallback(c, fserr.New(err.Error()))
 						return
 					}