|
@@ -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
|