添加接口

client/data_container.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
 	"net/url"
+	"strconv"
 )
 
 const (
@@ -67,7 +68,7 @@ func (c *Client) DeleteDataContainer(token string, baseUrl string, namespace str
 	return nil
 }
 
-func (c *Client) GetDataContainers(token string, baseUrl string, namespace string, dataSource string, name string) ([]DataContainerInfo, error) {
+func (c *Client) GetDataContainers(token string, baseUrl string, namespace string, dataSource string, name string, pageNo int, pageSize int) ([]DataContainerInfo, error) {
 	fullUrl, err := url.JoinPath(baseUrl, getDataContainersUrl)
 	if err != nil {
 		return nil, err
@@ -79,6 +80,8 @@ func (c *Client) GetDataContainers(token string, baseUrl string, namespace strin
 		"namespace":  namespace,
 		"dataSource": dataSource,
 		"name":       name,
+		"pageNo":     strconv.Itoa(pageNo),
+		"pageSize":   strconv.Itoa(pageSize),
 	}, resp)
 	if err != nil {
 		return nil, err

client/data_source.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
 	"net/url"
+	"strconv"
 )
 
 const (
@@ -66,7 +67,7 @@ func (c *Client) DeleteDataSource(token string, baseUrl string, namespace string
 	return nil
 }
 
-func (c *Client) GetDataSources(token string, baseUrl string, namespace string, name string, typeStr string) ([]DataSourceInfo, error) {
+func (c *Client) GetDataSources(token string, baseUrl string, namespace string, name string, typeStr string, pageNo int, pageSize int) ([]DataSourceInfo, error) {
 	fullUrl, err := url.JoinPath(baseUrl, getDataSourcesUrl)
 	if err != nil {
 		return nil, err
@@ -78,6 +79,8 @@ func (c *Client) GetDataSources(token string, baseUrl string, namespace string,
 		"namespace": namespace,
 		"name":      name,
 		"type":      typeStr,
+		"pageNo":    strconv.Itoa(pageNo),
+		"pageSize":  strconv.Itoa(pageSize),
 	}, resp)
 	if err != nil {
 		return nil, err

client/execute_sql_log.go

@@ -0,0 +1,41 @@
+package client
+
+import (
+	"fmt"
+	"git.sxidc.com/go-tools/api_binding/http_binding/response"
+	"net/url"
+	"strconv"
+)
+
+const (
+	getExecuteSqlLogsUrl = "/ds/api/v1/exec/sql/log/query"
+)
+
+func (c *Client) GetExecuteSqlLogs(token string, baseUrl string, namespace string, dataSource string,
+	executor string, startExecuteTime string, endExecuteTime string, pageNo int, pageSize int) ([]ExecuteSqlLogInfo, error) {
+	fullUrl, err := url.JoinPath(baseUrl, getExecuteSqlLogsUrl)
+	if err != nil {
+		return nil, err
+	}
+
+	resp := new(response.InfosResponse[ExecuteSqlLogInfo])
+
+	err = c.get(token, fullUrl, map[string]string{
+		"namespace":        namespace,
+		"dataSource":       dataSource,
+		"executor":         executor,
+		"startExecuteTime": startExecuteTime,
+		"endExecuteTime":   endExecuteTime,
+		"pageNo":           strconv.Itoa(pageNo),
+		"pageSize":         strconv.Itoa(pageSize),
+	}, resp)
+	if err != nil {
+		return nil, err
+	}
+
+	if !resp.Success {
+		return nil, fmt.Errorf(resp.Msg)
+	}
+
+	return resp.Infos, nil
+}

client/infos.go

@@ -37,3 +37,11 @@ type SqlInfo struct {
 	Creator     string `json:"creator"`
 	CreatedTime string `json:"createdTime"`
 }
+
+type ExecuteSqlLogInfo struct {
+	Namespace   string `json:"namespace"`
+	DataSource  string `json:"dataSource"`
+	SQL         string `json:"sql"`
+	Executor    string `json:"executor"`
+	ExecuteTime string `json:"executeTime"`
+}

client/namespace.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
 	"net/url"
+	"strconv"
 )
 
 const (
@@ -56,7 +57,7 @@ func (c *Client) DeleteNamespace(token string, baseUrl string, name string) erro
 	return nil
 }
 
-func (c *Client) GetNamespaces(token string, baseUrl string, name string) ([]NamespaceInfo, error) {
+func (c *Client) GetNamespaces(token string, baseUrl string, name string, pageNo int, pageSize int) ([]NamespaceInfo, error) {
 	fullUrl, err := url.JoinPath(baseUrl, getNamespacesUrl)
 	if err != nil {
 		return nil, err
@@ -65,7 +66,9 @@ func (c *Client) GetNamespaces(token string, baseUrl string, name string) ([]Nam
 	resp := new(response.InfosResponse[NamespaceInfo])
 
 	err = c.get(token, fullUrl, map[string]string{
-		"name": name,
+		"name":     name,
+		"pageNo":   strconv.Itoa(pageNo),
+		"pageSize": strconv.Itoa(pageSize),
 	}, resp)
 	if err != nil {
 		return nil, err

client/sql.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
 	"net/url"
+	"strconv"
 )
 
 const (
@@ -129,7 +130,7 @@ func (c *Client) DeleteSql(token string, baseUrl string, namespace string, dataS
 	return nil
 }
 
-func (c *Client) GetSqls(token string, baseUrl string, namespace string, dataSource string, name string) ([]SqlInfo, error) {
+func (c *Client) GetSqls(token string, baseUrl string, namespace string, dataSource string, name string, pageNo int, pageSize int) ([]SqlInfo, error) {
 	fullUrl, err := url.JoinPath(baseUrl, getSqlsUrl)
 	if err != nil {
 		return nil, err
@@ -141,6 +142,8 @@ func (c *Client) GetSqls(token string, baseUrl string, namespace string, dataSou
 		"namespace":  namespace,
 		"dataSource": dataSource,
 		"name":       name,
+		"pageNo":     strconv.Itoa(pageNo),
+		"pageSize":   strconv.Itoa(pageSize),
 	}, resp)
 	if err != nil {
 		return nil, err

client/token.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"git.sxidc.com/go-tools/api_binding/http_binding/response"
 	"net/url"
+	"strconv"
 )
 
 const (
@@ -59,7 +60,7 @@ func (c *Client) DeleteToken(token string, baseUrl string, name string) error {
 	return nil
 }
 
-func (c *Client) GetTokens(token string, baseUrl string, name string) ([]TokenInfo, error) {
+func (c *Client) GetTokens(token string, baseUrl string, name string, pageNo int, pageSize int) ([]TokenInfo, error) {
 	fullUrl, err := url.JoinPath(baseUrl, getTokensUrl)
 	if err != nil {
 		return nil, err
@@ -68,7 +69,9 @@ func (c *Client) GetTokens(token string, baseUrl string, name string) ([]TokenIn
 	resp := new(response.InfosResponse[TokenInfo])
 
 	err = c.get(token, fullUrl, map[string]string{
-		"name": name,
+		"name":     name,
+		"pageNo":   strconv.Itoa(pageNo),
+		"pageSize": strconv.Itoa(pageSize),
 	}, resp)
 	if err != nil {
 		return nil, err