yjp il y a 1 an
Parent
commit
3016cc818f

+ 9 - 10
client/data_container.go

@@ -3,7 +3,6 @@ package client
 import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
-	"git.sxidc.com/service-supports/ds-sdk/client/request"
 	"net/url"
 )
 
@@ -21,11 +20,11 @@ func (c *Client) CreateDataContainer(token string, baseUrl string, namespace str
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.CreateDataContainerRequest{
-		Namespace:  namespace,
-		DataSource: dataSource,
-		Name:       name,
-		Spec:       spec,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace":  namespace,
+		"dataSource": dataSource,
+		"name":       name,
+		"spec":       spec,
 	}, resp)
 	if err != nil {
 		return err
@@ -46,10 +45,10 @@ func (c *Client) DeleteDataContainer(token string, baseUrl string, namespace str
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.DeleteDataContainerRequest{
-		Namespace:  namespace,
-		DataSource: dataSource,
-		Name:       name,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace":  namespace,
+		"dataSource": dataSource,
+		"name":       name,
 	}, resp)
 	if err != nil {
 		return err

+ 8 - 9
client/data_source.go

@@ -3,7 +3,6 @@ package client
 import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
-	"git.sxidc.com/service-supports/ds-sdk/client/request"
 	"net/url"
 )
 
@@ -21,11 +20,11 @@ func (c *Client) CreateDataSource(token string, baseUrl string, namespace string
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.CreateDataSourceRequest{
-		Namespace: namespace,
-		Name:      name,
-		Type:      typeStr,
-		Spec:      spec,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace": namespace,
+		"name":      name,
+		"type":      typeStr,
+		"spec":      spec,
 	}, resp)
 	if err != nil {
 		return err
@@ -46,9 +45,9 @@ func (c *Client) DeleteDataSource(token string, baseUrl string, namespace string
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.DeleteDataSourceRequest{
-		Namespace: namespace,
-		Name:      name,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace": namespace,
+		"name":      name,
 	}, resp)
 	if err != nil {
 		return err

+ 4 - 5
client/namespace.go

@@ -3,7 +3,6 @@ package client
 import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
-	"git.sxidc.com/service-supports/ds-sdk/client/request"
 	"net/url"
 )
 
@@ -21,8 +20,8 @@ func (c *Client) CreateNamespace(token string, baseUrl string, name string) erro
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.CreateNamespaceRequest{
-		Name: name,
+	err = c.post(token, fullUrl, map[string]any{
+		"name": name,
 	}, resp)
 	if err != nil {
 		return err
@@ -43,8 +42,8 @@ func (c *Client) DeleteNamespace(token string, baseUrl string, name string) erro
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.DeleteNamespaceRequest{
-		Name: name,
+	err = c.post(token, fullUrl, map[string]any{
+		"name": name,
 	}, resp)
 	if err != nil {
 		return err

+ 0 - 16
client/request/data_container.go

@@ -1,16 +0,0 @@
-package request
-
-type (
-	CreateDataContainerRequest struct {
-		Namespace  string `json:"namespace"`
-		DataSource string `json:"dataSource"`
-		Name       string `json:"name"`
-		Spec       string `json:"spec"`
-	}
-
-	DeleteDataContainerRequest struct {
-		Namespace  string `json:"namespace"`
-		DataSource string `json:"dataSource"`
-		Name       string `json:"name"`
-	}
-)

+ 0 - 15
client/request/data_source.go

@@ -1,15 +0,0 @@
-package request
-
-type (
-	CreateDataSourceRequest struct {
-		Namespace string `json:"namespace"`
-		Name      string `json:"name"`
-		Type      string `json:"type"`
-		Spec      string `json:"spec"`
-	}
-
-	DeleteDataSourceRequest struct {
-		Namespace string `json:"namespace"`
-		Name      string `json:"name"`
-	}
-)

+ 0 - 11
client/request/namespace.go

@@ -1,11 +0,0 @@
-package request
-
-type (
-	CreateNamespaceRequest struct {
-		Name string `json:"name"`
-	}
-
-	DeleteNamespaceRequest struct {
-		Name string `json:"name"`
-	}
-)

+ 0 - 34
client/request/sql.go

@@ -1,34 +0,0 @@
-package request
-
-type (
-	ExecuteRawSqlRequest struct {
-		Namespace  string `json:"namespace"`
-		DataSource string `json:"dataSource"`
-		Sql        string `json:"sql"`
-	}
-
-	ParseSqlSpecRequest struct {
-		Spec          string         `json:"sql"`
-		ExecuteParams map[string]any `json:"executeParams"`
-	}
-
-	CreateSqlRequest struct {
-		Namespace  string `json:"namespace"`
-		DataSource string `json:"dataSource"`
-		Name       string `json:"name"`
-		Spec       string `json:"sql"`
-	}
-
-	DeleteSqlRequest struct {
-		Namespace  string `json:"namespace"`
-		DataSource string `json:"dataSource"`
-		Name       string `json:"name"`
-	}
-
-	ExecuteSqlRequest struct {
-		Namespace     string         `json:"namespace"`
-		DataSource    string         `json:"dataSource"`
-		Name          string         `json:"name"`
-		ExecuteParams map[string]any `json:"executeParams"`
-	}
-)

+ 0 - 11
client/request/token.go

@@ -1,11 +0,0 @@
-package request
-
-type (
-	GenerateTokenRequest struct {
-		Name string `json:"name"`
-	}
-
-	DeleteTokenRequest struct {
-		Name string `json:"name"`
-	}
-)

+ 21 - 22
client/sql.go

@@ -3,7 +3,6 @@ package client
 import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
-	"git.sxidc.com/service-supports/ds-sdk/client/request"
 	"net/url"
 )
 
@@ -28,10 +27,10 @@ func (c *Client) ExecuteRawSql(token string, baseUrl string,
 		Results []map[string]any `json:"results"`
 	})
 
-	err = c.post(token, fullUrl, &request.ExecuteRawSqlRequest{
-		Namespace:  namespace,
-		DataSource: dataSource,
-		Sql:        sql,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace":  namespace,
+		"dataSource": dataSource,
+		"sql":        sql,
 	}, resp)
 	if err != nil {
 		return nil, err
@@ -55,9 +54,9 @@ func (c *Client) ParseSqlSpec(token string, baseUrl string, specJson string, exe
 		Parsed string `json:"parsed"`
 	})
 
-	err = c.post(token, fullUrl, &request.ParseSqlSpecRequest{
-		Spec:          specJson,
-		ExecuteParams: executeParams,
+	err = c.post(token, fullUrl, map[string]any{
+		"sql":           specJson,
+		"executeParams": executeParams,
 	}, resp)
 	if err != nil {
 		return "", err
@@ -78,11 +77,11 @@ func (c *Client) CreateSql(token string, baseUrl string, namespace string, dataS
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.CreateSqlRequest{
-		Namespace:  namespace,
-		DataSource: dataSource,
-		Name:       name,
-		Spec:       spec,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace":  namespace,
+		"dataSource": dataSource,
+		"name":       name,
+		"sql":        spec,
 	}, resp)
 	if err != nil {
 		return err
@@ -103,10 +102,10 @@ func (c *Client) DeleteSql(token string, baseUrl string, namespace string, dataS
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.DeleteSqlRequest{
-		Namespace:  namespace,
-		DataSource: dataSource,
-		Name:       name,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace":  namespace,
+		"dataSource": dataSource,
+		"name":       name,
 	}, resp)
 	if err != nil {
 		return err
@@ -155,11 +154,11 @@ func (c *Client) ExecuteSql(token string, baseUrl string,
 		Results []map[string]any `json:"results"`
 	})
 
-	err = c.post(token, fullUrl, &request.ExecuteSqlRequest{
-		Namespace:     namespace,
-		DataSource:    dataSource,
-		Name:          name,
-		ExecuteParams: executeParams,
+	err = c.post(token, fullUrl, map[string]any{
+		"namespace":     namespace,
+		"dataSource":    dataSource,
+		"name":          name,
+		"executeParams": executeParams,
 	}, resp)
 	if err != nil {
 		return nil, err

+ 4 - 5
client/token.go

@@ -3,7 +3,6 @@ package client
 import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
-	"git.sxidc.com/service-supports/ds-sdk/client/request"
 	"net/url"
 )
 
@@ -24,8 +23,8 @@ func (c *Client) GenerateToken(token string, baseUrl string, name string) (strin
 		Token string `json:"token"`
 	})
 
-	err = c.post(token, fullUrl, &request.GenerateTokenRequest{
-		Name: name,
+	err = c.post(token, fullUrl, map[string]any{
+		"name": name,
 	}, resp)
 	if err != nil {
 		return "", err
@@ -46,8 +45,8 @@ func (c *Client) DeleteToken(token string, baseUrl string, name string) error {
 
 	resp := new(response.MsgResponse)
 
-	err = c.post(token, fullUrl, &request.DeleteTokenRequest{
-		Name: name,
+	err = c.post(token, fullUrl, map[string]any{
+		"name": name,
 	}, resp)
 	if err != nil {
 		return err