yjp 1 rok temu
rodzic
commit
2dbb2a901c

+ 1 - 1
ports/client.go → client/client.go

@@ -1,4 +1,4 @@
-package ports
+package client
 
 const (
 	CompareEqual               = "equal"

+ 1 - 1
ports/client_cmd_request.go → client/client_cmd_request.go

@@ -1,4 +1,4 @@
-package ports
+package client
 
 type AutoMigrateRequest struct {
 	DatabaseID string

+ 1 - 1
ports/client_query_request.go → client/client_query_request.go

@@ -1,4 +1,4 @@
-package ports
+package client
 
 type QueryByWhereAndOrderByRequest struct {
 	DatabaseID            string

+ 1 - 1
ports/client_query_response.go → client/client_query_response.go

@@ -1,4 +1,4 @@
-package ports
+package client
 
 import (
 	"git.sxidc.com/service-supports/dps-sdk/pb/v1/response"

+ 1 - 1
ports/client_request_common.go → client/client_request_common.go

@@ -1,4 +1,4 @@
-package ports
+package client
 
 type ColumnCompare struct {
 	Column  string `json:"column"`

+ 1 - 1
ports/transaction.go → client/transaction.go

@@ -1,4 +1,4 @@
-package ports
+package client
 
 type TransactionFunc func(tx Transaction) error
 

+ 4 - 4
dps.go

@@ -2,20 +2,20 @@ package dps
 
 import (
 	"errors"
+	"git.sxidc.com/service-supports/dps-sdk/client"
 	"git.sxidc.com/service-supports/dps-sdk/dpsv1"
-	"git.sxidc.com/service-supports/dps-sdk/ports"
 	"sync"
 )
 
 var clientMapMutex sync.Mutex
-var clientMap map[string]ports.Client
+var clientMap map[string]client.Client
 
-func NewClient(address string, version string) (ports.Client, error) {
+func NewClient(address string, version string) (client.Client, error) {
 	clientMapMutex.Lock()
 	defer clientMapMutex.Unlock()
 
 	if clientMap == nil {
-		clientMap = make(map[string]ports.Client)
+		clientMap = make(map[string]client.Client)
 	}
 
 	client, ok := clientMap[version]

+ 27 - 27
dpsv1/client.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"git.sxidc.com/service-supports/dps-sdk/client"
 	"git.sxidc.com/service-supports/dps-sdk/pb/v1"
 	"git.sxidc.com/service-supports/dps-sdk/pb/v1/request"
 	"git.sxidc.com/service-supports/dps-sdk/pb/v1/response"
-	"git.sxidc.com/service-supports/dps-sdk/ports"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"reflect"
@@ -54,7 +54,7 @@ func DestroyClient(client *Client) error {
 	return nil
 }
 
-func (c *Client) AutoMigrate(req *ports.AutoMigrateRequest) error {
+func (c *Client) AutoMigrate(req *client.AutoMigrateRequest) error {
 	tableModelDescribeJsonBytes, err := json.Marshal(req.TableModelDescribe)
 	if err != nil {
 		return err
@@ -73,7 +73,7 @@ func (c *Client) AutoMigrate(req *ports.AutoMigrateRequest) error {
 	return nil
 }
 
-func (c *Client) AutoMigrateBatch(req *ports.AutoMigrateBatchRequest) error {
+func (c *Client) AutoMigrateBatch(req *client.AutoMigrateBatchRequest) error {
 	items := make([]*request.AutoMigrateItem, 0)
 	for _, reqItem := range req.Items {
 		tableModelDescribeJsonBytes, err := json.Marshal(reqItem.TableModelDescribe)
@@ -99,7 +99,7 @@ func (c *Client) AutoMigrateBatch(req *ports.AutoMigrateBatchRequest) error {
 	return nil
 }
 
-func (c *Client) Transaction(databaseID string, txFunc ports.TransactionFunc) error {
+func (c *Client) Transaction(databaseID string, txFunc client.TransactionFunc) error {
 	stream, err := c.commandServiceClient.Transaction(context.Background())
 	if err != nil {
 		return err
@@ -124,7 +124,7 @@ func (c *Client) Transaction(databaseID string, txFunc ports.TransactionFunc) er
 	return nil
 }
 
-func (c *Client) Insert(req *ports.InsertRequest) (string, error) {
+func (c *Client) Insert(req *client.InsertRequest) (string, error) {
 	tableRowJsonBytes, err := c.formTableRow(req.TableRow)
 	if err != nil {
 		return "", err
@@ -145,7 +145,7 @@ func (c *Client) Insert(req *ports.InsertRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) InsertBatch(req *ports.InsertBatchRequest) (string, error) {
+func (c *Client) InsertBatch(req *client.InsertBatchRequest) (string, error) {
 	tableItems := make([]*request.InsertTableItem, 0)
 
 	for _, reqTableItem := range req.Items {
@@ -181,7 +181,7 @@ func (c *Client) InsertBatch(req *ports.InsertBatchRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) Delete(req *ports.DeleteRequest) (string, error) {
+func (c *Client) Delete(req *client.DeleteRequest) (string, error) {
 	reply, err := c.commandServiceClient.Delete(context.Background(), &request.DeleteRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -196,7 +196,7 @@ func (c *Client) Delete(req *ports.DeleteRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) DeleteBatch(req *ports.DeleteBatchRequest) (string, error) {
+func (c *Client) DeleteBatch(req *client.DeleteBatchRequest) (string, error) {
 	tableItems := make([]*request.DeleteTableItem, 0)
 
 	for _, reqTableItem := range req.Items {
@@ -226,7 +226,7 @@ func (c *Client) DeleteBatch(req *ports.DeleteBatchRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) Update(req *ports.UpdateRequest) (string, error) {
+func (c *Client) Update(req *client.UpdateRequest) (string, error) {
 	newTableRowJsonByte, err := c.formTableRow(req.NewTableRow)
 	if err != nil {
 		return "", err
@@ -247,7 +247,7 @@ func (c *Client) Update(req *ports.UpdateRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) Replay(req *ports.ReplayRequest) (string, error) {
+func (c *Client) Replay(req *client.ReplayRequest) (string, error) {
 	reply, err := c.commandServiceClient.Replay(context.Background(), &request.ReplayRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -262,7 +262,7 @@ func (c *Client) Replay(req *ports.ReplayRequest) (string, error) {
 	return reply.Statement, nil
 }
 
-func (c *Client) QueryByWhereAndOrderBy(req *ports.QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error) {
+func (c *Client) QueryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByRequest) (string, []map[string]any, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", nil, 0, err
@@ -290,7 +290,7 @@ func (c *Client) QueryByWhereAndOrderBy(req *ports.QueryByWhereAndOrderByRequest
 	return reply.Statement, infosMap, reply.TotalCount, nil
 }
 
-func (c *Client) CommonQuery(req *ports.CommonQueryRequest) (string, []map[string]any, int64, error) {
+func (c *Client) CommonQuery(req *client.CommonQueryRequest) (string, []map[string]any, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", nil, 0, err
@@ -332,7 +332,7 @@ func (c *Client) CommonQuery(req *ports.CommonQueryRequest) (string, []map[strin
 	return reply.Statement, infosMap, reply.TotalCount, nil
 }
 
-func (c *Client) QueryByKeys(req *ports.QueryByKeysRequest) (string, map[string]any, error) {
+func (c *Client) QueryByKeys(req *client.QueryByKeysRequest) (string, map[string]any, error) {
 	reply, err := c.queryServiceClient.QueryByKeys(context.Background(), &request.QueryByKeysRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -352,7 +352,7 @@ func (c *Client) QueryByKeys(req *ports.QueryByKeysRequest) (string, map[string]
 	return reply.Statement, infoMap, nil
 }
 
-func (c *Client) CountWhere(req *ports.CountWhereRequest) (string, int64, error) {
+func (c *Client) CountWhere(req *client.CountWhereRequest) (string, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", 0, err
@@ -371,7 +371,7 @@ func (c *Client) CountWhere(req *ports.CountWhereRequest) (string, int64, error)
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCount(req *ports.CommonCountRequest) (string, int64, error) {
+func (c *Client) CommonCount(req *client.CommonCountRequest) (string, int64, error) {
 	whereJsonBytes, err := json.Marshal(req.Where)
 	if err != nil {
 		return "", 0, err
@@ -404,7 +404,7 @@ func (c *Client) CommonCount(req *ports.CommonCountRequest) (string, int64, erro
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) EventQueryByKeys(req *ports.EventQueryByKeysRequest) (string, []ports.EventInfo, int64, error) {
+func (c *Client) EventQueryByKeys(req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.EventQueryByKeys(context.Background(), &request.EventQueryByKeysRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -417,10 +417,10 @@ func (c *Client) EventQueryByKeys(req *ports.EventQueryByKeysRequest) (string, [
 		return "", nil, 0, err
 	}
 
-	return reply.Statement, ports.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
+	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CommonEventQuery(req *ports.CommonEventQueryRequest) (string, []ports.EventInfo, int64, error) {
+func (c *Client) CommonEventQuery(req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonEventQuery(context.Background(), &request.CommonEventQueryRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -438,10 +438,10 @@ func (c *Client) CommonEventQuery(req *ports.CommonEventQueryRequest) (string, [
 		return "", nil, 0, err
 	}
 
-	return reply.Statement, ports.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
+	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CountEventByKeys(req *ports.CountEventByKeysRequest) (string, int64, error) {
+func (c *Client) CountEventByKeys(req *client.CountEventByKeysRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CountEventByKeys(context.Background(), &request.CountEventByKeysRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -454,7 +454,7 @@ func (c *Client) CountEventByKeys(req *ports.CountEventByKeysRequest) (string, i
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCountEvent(req *ports.CommonCountEventRequest) (string, int64, error) {
+func (c *Client) CommonCountEvent(req *client.CommonCountEventRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonCountEvent(context.Background(), &request.CommonCountEventRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -472,7 +472,7 @@ func (c *Client) CommonCountEvent(req *ports.CommonCountEventRequest) (string, i
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) EventHistoryQueryByKeys(req *ports.EventQueryByKeysRequest) (string, []ports.EventInfo, int64, error) {
+func (c *Client) EventHistoryQueryByKeys(req *client.EventQueryByKeysRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.EventHistoryQueryByKeys(context.Background(), &request.EventQueryByKeysRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -485,10 +485,10 @@ func (c *Client) EventHistoryQueryByKeys(req *ports.EventQueryByKeysRequest) (st
 		return "", nil, 0, err
 	}
 
-	return reply.Statement, ports.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
+	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CommonEventHistoryQuery(req *ports.CommonEventQueryRequest) (string, []ports.EventInfo, int64, error) {
+func (c *Client) CommonEventHistoryQuery(req *client.CommonEventQueryRequest) (string, []client.EventInfo, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonEventHistoryQuery(context.Background(), &request.CommonEventQueryRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -506,10 +506,10 @@ func (c *Client) CommonEventHistoryQuery(req *ports.CommonEventQueryRequest) (st
 		return "", nil, 0, err
 	}
 
-	return reply.Statement, ports.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
+	return reply.Statement, client.FormEventInfoBatch(reply.Infos), reply.TotalCount, nil
 }
 
-func (c *Client) CountEventHistoryByKeys(req *ports.CountEventByKeysRequest) (string, int64, error) {
+func (c *Client) CountEventHistoryByKeys(req *client.CountEventByKeysRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CountEventHistoryByKeys(context.Background(), &request.CountEventByKeysRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,
@@ -522,7 +522,7 @@ func (c *Client) CountEventHistoryByKeys(req *ports.CountEventByKeysRequest) (st
 	return reply.Statement, reply.Count, nil
 }
 
-func (c *Client) CommonCountEventHistory(req *ports.CommonCountEventRequest) (string, int64, error) {
+func (c *Client) CommonCountEventHistory(req *client.CommonCountEventRequest) (string, int64, error) {
 	reply, err := c.eventQueryServiceClient.CommonCountEventHistory(context.Background(), &request.CommonCountEventRequest{
 		DatabaseID:            req.DatabaseID,
 		TablePrefixWithSchema: req.TablePrefixWithSchema,

+ 6 - 6
dpsv1/transaction.go

@@ -1,9 +1,9 @@
 package dpsv1
 
 import (
+	"git.sxidc.com/service-supports/dps-sdk/client"
 	"git.sxidc.com/service-supports/dps-sdk/pb/v1"
 	"git.sxidc.com/service-supports/dps-sdk/pb/v1/request"
-	"git.sxidc.com/service-supports/dps-sdk/ports"
 	"io"
 )
 
@@ -12,7 +12,7 @@ type Transaction struct {
 	client *Client
 }
 
-func (tx *Transaction) InsertTx(req *ports.InsertRequest) (string, error) {
+func (tx *Transaction) InsertTx(req *client.InsertRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -52,7 +52,7 @@ func (tx *Transaction) InsertTx(req *ports.InsertRequest) (string, error) {
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) InsertBatchTx(req *ports.InsertBatchRequest) (string, error) {
+func (tx *Transaction) InsertBatchTx(req *client.InsertBatchRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -107,7 +107,7 @@ func (tx *Transaction) InsertBatchTx(req *ports.InsertBatchRequest) (string, err
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) DeleteTx(req *ports.DeleteRequest) (string, error) {
+func (tx *Transaction) DeleteTx(req *client.DeleteRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -141,7 +141,7 @@ func (tx *Transaction) DeleteTx(req *ports.DeleteRequest) (string, error) {
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) DeleteBatchTx(req *ports.DeleteBatchRequest) (string, error) {
+func (tx *Transaction) DeleteBatchTx(req *client.DeleteBatchRequest) (string, error) {
 	var err error
 
 	defer func() {
@@ -190,7 +190,7 @@ func (tx *Transaction) DeleteBatchTx(req *ports.DeleteBatchRequest) (string, err
 	return txResponse.Statement, nil
 }
 
-func (tx *Transaction) UpdateTx(req *ports.UpdateRequest) (string, error) {
+func (tx *Transaction) UpdateTx(req *client.UpdateRequest) (string, error) {
 	var err error
 
 	defer func() {

+ 28 - 28
test/v1/sdk.go

@@ -3,12 +3,12 @@ package v1
 import (
 	"fmt"
 	"git.sxidc.com/service-supports/dps-sdk"
-	"git.sxidc.com/service-supports/dps-sdk/ports"
+	"git.sxidc.com/service-supports/dps-sdk/client"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
-var clientInstance ports.Client
+var clientInstance client.Client
 
 func initClient(t *testing.T, address string) {
 	client, err := dps.NewClient(address, "v1")
@@ -36,7 +36,7 @@ func newToolKit(t *testing.T) *ToolKit {
 	return &ToolKit{t: t}
 }
 
-func (toolKit *ToolKit) autoMigrate(req *ports.AutoMigrateRequest) *ToolKit {
+func (toolKit *ToolKit) autoMigrate(req *client.AutoMigrateRequest) *ToolKit {
 	err := clientInstance.AutoMigrate(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -45,7 +45,7 @@ func (toolKit *ToolKit) autoMigrate(req *ports.AutoMigrateRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) autoMigrateBatch(req *ports.AutoMigrateBatchRequest) *ToolKit {
+func (toolKit *ToolKit) autoMigrateBatch(req *client.AutoMigrateBatchRequest) *ToolKit {
 	err := clientInstance.AutoMigrateBatch(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -54,7 +54,7 @@ func (toolKit *ToolKit) autoMigrateBatch(req *ports.AutoMigrateBatchRequest) *To
 	return toolKit
 }
 
-func (toolKit *ToolKit) transaction(databaseID string, txFunc ports.TransactionFunc) *ToolKit {
+func (toolKit *ToolKit) transaction(databaseID string, txFunc client.TransactionFunc) *ToolKit {
 	err := clientInstance.Transaction(databaseID, txFunc)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -63,7 +63,7 @@ func (toolKit *ToolKit) transaction(databaseID string, txFunc ports.TransactionF
 	return toolKit
 }
 
-func (toolKit *ToolKit) insert(req *ports.InsertRequest) *ToolKit {
+func (toolKit *ToolKit) insert(req *client.InsertRequest) *ToolKit {
 	statement, err := clientInstance.Insert(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -74,7 +74,7 @@ func (toolKit *ToolKit) insert(req *ports.InsertRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) insertBatch(req *ports.InsertBatchRequest) *ToolKit {
+func (toolKit *ToolKit) insertBatch(req *client.InsertBatchRequest) *ToolKit {
 	statement, err := clientInstance.InsertBatch(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -85,7 +85,7 @@ func (toolKit *ToolKit) insertBatch(req *ports.InsertBatchRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) delete(req *ports.DeleteRequest) *ToolKit {
+func (toolKit *ToolKit) delete(req *client.DeleteRequest) *ToolKit {
 	statement, err := clientInstance.Delete(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -96,7 +96,7 @@ func (toolKit *ToolKit) delete(req *ports.DeleteRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) deleteBatch(req *ports.DeleteBatchRequest) *ToolKit {
+func (toolKit *ToolKit) deleteBatch(req *client.DeleteBatchRequest) *ToolKit {
 	statement, err := clientInstance.DeleteBatch(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -107,7 +107,7 @@ func (toolKit *ToolKit) deleteBatch(req *ports.DeleteBatchRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) update(req *ports.UpdateRequest) *ToolKit {
+func (toolKit *ToolKit) update(req *client.UpdateRequest) *ToolKit {
 	statement, err := clientInstance.Update(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -118,7 +118,7 @@ func (toolKit *ToolKit) update(req *ports.UpdateRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) reply(req *ports.ReplayRequest) *ToolKit {
+func (toolKit *ToolKit) reply(req *client.ReplayRequest) *ToolKit {
 	statement, err := clientInstance.Replay(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -129,7 +129,7 @@ func (toolKit *ToolKit) reply(req *ports.ReplayRequest) *ToolKit {
 	return toolKit
 }
 
-func (toolKit *ToolKit) queryByWhereAndOrderBy(req *ports.QueryByWhereAndOrderByRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) queryByWhereAndOrderBy(req *client.QueryByWhereAndOrderByRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
 	statement, infosMap, totalCount, err := clientInstance.QueryByWhereAndOrderBy(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -149,7 +149,7 @@ func (toolKit *ToolKit) queryByWhereAndOrderBy(req *ports.QueryByWhereAndOrderBy
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonQuery(req *ports.CommonQueryRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonQuery(req *client.CommonQueryRequest, retInfosMap *[]map[string]any, retTotalCount *int64) *ToolKit {
 	statement, infosMap, totalCount, err := clientInstance.CommonQuery(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -169,7 +169,7 @@ func (toolKit *ToolKit) commonQuery(req *ports.CommonQueryRequest, retInfosMap *
 	return toolKit
 }
 
-func (toolKit *ToolKit) queryByKeys(req *ports.QueryByKeysRequest, retInfoMap *map[string]any) *ToolKit {
+func (toolKit *ToolKit) queryByKeys(req *client.QueryByKeysRequest, retInfoMap *map[string]any) *ToolKit {
 	statement, infoMap, err := clientInstance.QueryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -185,7 +185,7 @@ func (toolKit *ToolKit) queryByKeys(req *ports.QueryByKeysRequest, retInfoMap *m
 	return toolKit
 }
 
-func (toolKit *ToolKit) countWhere(req *ports.CountWhereRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) countWhere(req *client.CountWhereRequest, retCount *int64) *ToolKit {
 	statement, count, err := clientInstance.CountWhere(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -200,7 +200,7 @@ func (toolKit *ToolKit) countWhere(req *ports.CountWhereRequest, retCount *int64
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCount(req *ports.CommonCountRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonCount(req *client.CommonCountRequest, retCount *int64) *ToolKit {
 	statement, count, err := clientInstance.CommonCount(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -215,7 +215,7 @@ func (toolKit *ToolKit) commonCount(req *ports.CommonCountRequest, retCount *int
 	return toolKit
 }
 
-func (toolKit *ToolKit) eventQueryByKeys(req *ports.EventQueryByKeysRequest, retInfos *[]ports.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) eventQueryByKeys(req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
 	statement, infos, totalCount, err := clientInstance.EventQueryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -224,7 +224,7 @@ func (toolKit *ToolKit) eventQueryByKeys(req *ports.EventQueryByKeysRequest, ret
 	fmt.Println(statement)
 
 	if retInfos != nil {
-		*retInfos = make([]ports.EventInfo, 0)
+		*retInfos = make([]client.EventInfo, 0)
 		*retInfos = infos
 	}
 
@@ -235,7 +235,7 @@ func (toolKit *ToolKit) eventQueryByKeys(req *ports.EventQueryByKeysRequest, ret
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonEventQuery(req *ports.CommonEventQueryRequest, retInfos *[]ports.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonEventQuery(req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
 	statement, infos, totalCount, err := clientInstance.CommonEventQuery(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -244,7 +244,7 @@ func (toolKit *ToolKit) commonEventQuery(req *ports.CommonEventQueryRequest, ret
 	fmt.Println(statement)
 
 	if retInfos != nil {
-		*retInfos = make([]ports.EventInfo, 0)
+		*retInfos = make([]client.EventInfo, 0)
 		*retInfos = infos
 	}
 
@@ -255,7 +255,7 @@ func (toolKit *ToolKit) commonEventQuery(req *ports.CommonEventQueryRequest, ret
 	return toolKit
 }
 
-func (toolKit *ToolKit) countEventByKeys(req *ports.CountEventByKeysRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) countEventByKeys(req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
 	statement, count, err := clientInstance.CountEventByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -270,7 +270,7 @@ func (toolKit *ToolKit) countEventByKeys(req *ports.CountEventByKeysRequest, ret
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCountEvent(req *ports.CommonCountEventRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonCountEvent(req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
 	statement, count, err := clientInstance.CommonCountEvent(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -285,7 +285,7 @@ func (toolKit *ToolKit) commonCountEvent(req *ports.CommonCountEventRequest, ret
 	return toolKit
 }
 
-func (toolKit *ToolKit) eventHistoryQueryByKeys(req *ports.EventQueryByKeysRequest, retInfos *[]ports.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) eventHistoryQueryByKeys(req *client.EventQueryByKeysRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
 	statement, infos, totalCount, err := clientInstance.EventHistoryQueryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -294,7 +294,7 @@ func (toolKit *ToolKit) eventHistoryQueryByKeys(req *ports.EventQueryByKeysReque
 	fmt.Println(statement)
 
 	if retInfos != nil {
-		*retInfos = make([]ports.EventInfo, 0)
+		*retInfos = make([]client.EventInfo, 0)
 		*retInfos = infos
 	}
 
@@ -305,7 +305,7 @@ func (toolKit *ToolKit) eventHistoryQueryByKeys(req *ports.EventQueryByKeysReque
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonEventHistoryQuery(req *ports.CommonEventQueryRequest, retInfos *[]ports.EventInfo, retTotalCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonEventHistoryQuery(req *client.CommonEventQueryRequest, retInfos *[]client.EventInfo, retTotalCount *int64) *ToolKit {
 	statement, infos, totalCount, err := clientInstance.CommonEventHistoryQuery(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -314,7 +314,7 @@ func (toolKit *ToolKit) commonEventHistoryQuery(req *ports.CommonEventQueryReque
 	fmt.Println(statement)
 
 	if retInfos != nil {
-		*retInfos = make([]ports.EventInfo, 0)
+		*retInfos = make([]client.EventInfo, 0)
 		*retInfos = infos
 	}
 
@@ -325,7 +325,7 @@ func (toolKit *ToolKit) commonEventHistoryQuery(req *ports.CommonEventQueryReque
 	return toolKit
 }
 
-func (toolKit *ToolKit) countEventHistoryByKeys(req *ports.CountEventByKeysRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) countEventHistoryByKeys(req *client.CountEventByKeysRequest, retCount *int64) *ToolKit {
 	statement, count, err := clientInstance.CountEventHistoryByKeys(req)
 	if err != nil {
 		toolKit.t.Fatal(err)
@@ -340,7 +340,7 @@ func (toolKit *ToolKit) countEventHistoryByKeys(req *ports.CountEventByKeysReque
 	return toolKit
 }
 
-func (toolKit *ToolKit) commonCountEventHistory(req *ports.CommonCountEventRequest, retCount *int64) *ToolKit {
+func (toolKit *ToolKit) commonCountEventHistory(req *client.CommonCountEventRequest, retCount *int64) *ToolKit {
 	statement, count, err := clientInstance.CommonCountEventHistory(req)
 	if err != nil {
 		toolKit.t.Fatal(err)

+ 106 - 106
test/v1/v1_test.go

@@ -2,14 +2,14 @@ package v1
 
 import (
 	"fmt"
-	"git.sxidc.com/service-supports/dps-sdk/ports"
+	"git.sxidc.com/service-supports/dps-sdk/client"
 	"math/rand"
 	"testing"
 	"time"
 )
 
-var tableModelDescribe = ports.TableModelDescribe{
-	Fields: []ports.TableModelField{
+var tableModelDescribe = client.TableModelDescribe{
+	Fields: []client.TableModelField{
 		{"ID", "gorm:\"primary_key;type:varchar(32);comment:id;\""},
 		{"Name", "gorm:\"not null;type:varchar(128);comment:数据库名称;\""},
 		{"Time", "gorm:\"not null;type:timestamp with time zone;comment:数据库时间;\""},
@@ -22,17 +22,17 @@ func TestAutoMigrate(t *testing.T) {
 	defer destroyClient(t)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: "test." + simpleUUID()[0:8],
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		autoMigrateBatch(&ports.AutoMigrateBatchRequest{
+		autoMigrateBatch(&client.AutoMigrateBatchRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			Items: []ports.AutoMigrateItem{
+			Items: []client.AutoMigrateItem{
 				{
 					TablePrefixWithSchema: "test." + simpleUUID()[0:8],
 					Version:               "v1",
@@ -65,16 +65,16 @@ func TestTransaction(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx ports.Transaction) error {
-			statement, err := tx.InsertTx(&ports.InsertRequest{
+		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+			statement, err := tx.InsertTx(&client.InsertRequest{
 				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
@@ -100,7 +100,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -110,8 +110,8 @@ func TestTransaction(t *testing.T) {
 		assertEqual(name, resultMap["name"], "名称不一致").
 		assertEqual(now.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum, resultMap["table_num"], "表数量不一致").
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx ports.Transaction) error {
-			statement, err := tx.UpdateTx(&ports.UpdateRequest{
+		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+			statement, err := tx.UpdateTx(&client.UpdateRequest{
 				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
@@ -137,7 +137,7 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -147,8 +147,8 @@ func TestTransaction(t *testing.T) {
 		assertEqual(newName, resultMap["name"], "名称不一致").
 		assertEqual(newNow.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(newTableNum, resultMap["table_num"], "表数量不一致").
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx ports.Transaction) error {
-			statement, err := tx.UpdateTx(&ports.UpdateRequest{
+		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+			statement, err := tx.UpdateTx(&client.UpdateRequest{
 				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
@@ -167,7 +167,7 @@ func TestTransaction(t *testing.T) {
 
 			fmt.Println(statement)
 
-			statement, err = tx.DeleteTx(&ports.DeleteRequest{
+			statement, err = tx.DeleteTx(&client.DeleteRequest{
 				DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
@@ -187,15 +187,15 @@ func TestTransaction(t *testing.T) {
 
 			return nil
 		}).
-		countWhere(&ports.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
-			Where: []ports.ColumnCompare{
+			Where: []client.ColumnCompare{
 				{
 					Column:  "id",
 					Value:   id,
-					Compare: ports.CompareEqual,
+					Compare: client.CompareEqual,
 				},
 			},
 		}, &count).
@@ -222,22 +222,22 @@ func TestTransactionBatch(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx ports.Transaction) error {
-			statement, err := tx.InsertBatchTx(&ports.InsertBatchRequest{
+		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+			statement, err := tx.InsertBatchTx(&client.InsertBatchRequest{
 				DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-				Items: []*ports.InsertTableItem{
+				Items: []*client.InsertTableItem{
 					{
 						TablePrefixWithSchema: tablePrefix,
 						Version:               "v1",
-						Items: []*ports.InsertItem{
+						Items: []*client.InsertItem{
 							{
 								KeyColumns: []string{"id"},
 								TableRow: map[string]any{
@@ -274,7 +274,7 @@ func TestTransactionBatch(t *testing.T) {
 
 			return nil
 		}).
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -284,7 +284,7 @@ func TestTransactionBatch(t *testing.T) {
 		assertEqual(name1, resultMap["name"], "名称不一致").
 		assertEqual(now1.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum1, resultMap["table_num"], "表数量不一致").
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -294,14 +294,14 @@ func TestTransactionBatch(t *testing.T) {
 		assertEqual(name2, resultMap["name"], "名称不一致").
 		assertEqual(now2.UnixMilli(), resultMap["time"].(time.Time).UnixMilli(), "时间不一致").
 		assertEqual(tableNum2, resultMap["table_num"], "表数量不一致").
-		transaction("2b78141779ee432295ca371b91c5cac7", func(tx ports.Transaction) error {
-			statement, err := tx.DeleteBatchTx(&ports.DeleteBatchRequest{
+		transaction("2b78141779ee432295ca371b91c5cac7", func(tx client.Transaction) error {
+			statement, err := tx.DeleteBatchTx(&client.DeleteBatchRequest{
 				DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-				Items: []*ports.DeleteTableItem{
+				Items: []*client.DeleteTableItem{
 					{
 						TablePrefixWithSchema: tablePrefix,
 						Version:               "v1",
-						Items: []*ports.DeleteItem{
+						Items: []*client.DeleteItem{
 							{KeyValues: map[string]string{"id": id1}},
 							{KeyValues: map[string]string{"id": id2}},
 						},
@@ -322,28 +322,28 @@ func TestTransactionBatch(t *testing.T) {
 
 			return nil
 		}).
-		countWhere(&ports.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
-			Where: []ports.ColumnCompare{
+			Where: []client.ColumnCompare{
 				{
 					Column:  "id",
 					Value:   id1,
-					Compare: ports.CompareEqual,
+					Compare: client.CompareEqual,
 				},
 			},
 		}, &count).
 		assertEqual(int64(0), count, "数量不一致").
-		countWhere(&ports.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
-			Where: []ports.ColumnCompare{
+			Where: []client.ColumnCompare{
 				{
 					Column:  "id",
 					Value:   id2,
-					Compare: ports.CompareEqual,
+					Compare: client.CompareEqual,
 				},
 			},
 		}, &count).
@@ -364,15 +364,15 @@ func TestInsert(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&ports.InsertRequest{
+		insert(&client.InsertRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -385,7 +385,7 @@ func TestInsert(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -417,21 +417,21 @@ func TestInsertBatch(t *testing.T) {
 	var totalCount int64
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insertBatch(&ports.InsertBatchRequest{
+		insertBatch(&client.InsertBatchRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			Items: []*ports.InsertTableItem{
+			Items: []*client.InsertTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
 					Version:               "v1",
-					Items: []*ports.InsertItem{
+					Items: []*client.InsertItem{
 						{
 							KeyColumns: []string{"id"},
 							TableRow: map[string]any{
@@ -455,14 +455,14 @@ func TestInsertBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByWhereAndOrderBy(&ports.QueryByWhereAndOrderByRequest{
+		queryByWhereAndOrderBy(&client.QueryByWhereAndOrderByRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
-			Where: []ports.ColumnCompare{
-				{Column: "id", Value: id1, Compare: ports.CompareEqual},
-				{Column: "name", Value: name1, Compare: ports.CompareEqual},
-				{Column: "table_num", Value: tableNum1, Compare: ports.CompareEqual},
+			Where: []client.ColumnCompare{
+				{Column: "id", Value: id1, Compare: client.CompareEqual},
+				{Column: "name", Value: name1, Compare: client.CompareEqual},
+				{Column: "table_num", Value: tableNum1, Compare: client.CompareEqual},
 			},
 			PageNo:   1,
 			PageSize: 1,
@@ -472,14 +472,14 @@ func TestInsertBatch(t *testing.T) {
 		assertEqual(name1, resultsMap[0]["name"], "名称不一致").
 		assertEqual(now1.UnixMilli(), resultsMap[0]["time"].(time.Time).Local().UnixMilli(), "时间不一致").
 		assertEqual(tableNum1, resultsMap[0]["table_num"], "表数量不一致").
-		commonQuery(&ports.CommonQueryRequest{
+		commonQuery(&client.CommonQueryRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
-			Where: []ports.ColumnCompare{
-				{Column: "id", Value: id2, Compare: ports.CompareEqual},
-				{Column: "name", Value: name2, Compare: ports.CompareEqual},
-				{Column: "table_num", Value: tableNum2, Compare: ports.CompareEqual},
+			Where: []client.ColumnCompare{
+				{Column: "id", Value: id2, Compare: client.CompareEqual},
+				{Column: "name", Value: name2, Compare: client.CompareEqual},
+				{Column: "table_num", Value: tableNum2, Compare: client.CompareEqual},
 			},
 			PageNo:   1,
 			PageSize: 1,
@@ -508,15 +508,15 @@ func TestUpdate(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&ports.InsertRequest{
+		insert(&client.InsertRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -529,7 +529,7 @@ func TestUpdate(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		update(&ports.UpdateRequest{
+		update(&client.UpdateRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -542,7 +542,7 @@ func TestUpdate(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -568,15 +568,15 @@ func TestDelete(t *testing.T) {
 	var count int64
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&ports.InsertRequest{
+		insert(&client.InsertRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -589,22 +589,22 @@ func TestDelete(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		delete(&ports.DeleteRequest{
+		delete(&client.DeleteRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		countWhere(&ports.CountWhereRequest{
+		countWhere(&client.CountWhereRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
-			Where: []ports.ColumnCompare{
+			Where: []client.ColumnCompare{
 				{
 					Column:  "id",
 					Value:   id,
-					Compare: ports.CompareEqual,
+					Compare: client.CompareEqual,
 				},
 			},
 		}, &count).
@@ -630,21 +630,21 @@ func TestDeleteBatch(t *testing.T) {
 	var count int64
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insertBatch(&ports.InsertBatchRequest{
+		insertBatch(&client.InsertBatchRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			Items: []*ports.InsertTableItem{
+			Items: []*client.InsertTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
 					Version:               "v1",
-					Items: []*ports.InsertItem{
+					Items: []*client.InsertItem{
 						{
 							KeyColumns: []string{"id"},
 							TableRow: map[string]any{
@@ -668,13 +668,13 @@ func TestDeleteBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		deleteBatch(&ports.DeleteBatchRequest{
+		deleteBatch(&client.DeleteBatchRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			Items: []*ports.DeleteTableItem{
+			Items: []*client.DeleteTableItem{
 				{
 					TablePrefixWithSchema: tablePrefix,
 					Version:               "v1",
-					Items: []*ports.DeleteItem{
+					Items: []*client.DeleteItem{
 						{KeyValues: map[string]string{"id": id1}},
 						{KeyValues: map[string]string{"id": id2}},
 					},
@@ -682,7 +682,7 @@ func TestDeleteBatch(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		commonCount(&ports.CommonCountRequest{
+		commonCount(&client.CommonCountRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -704,15 +704,15 @@ func TestReply(t *testing.T) {
 	resultMap := make(map[string]any)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&ports.InsertRequest{
+		insert(&client.InsertRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -725,14 +725,14 @@ func TestReply(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		reply(&ports.ReplayRequest{
+		reply(&client.ReplayRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		queryByKeys(&ports.QueryByKeysRequest{
+		queryByKeys(&client.QueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -759,18 +759,18 @@ func TestEventQuery(t *testing.T) {
 	newTableNum := rand.New(rand.NewSource(now.Unix())).Intn(10)
 
 	var totalCount int64
-	eventInfos := make([]ports.EventInfo, 0)
+	eventInfos := make([]client.EventInfo, 0)
 
 	newToolKit(t).
-		autoMigrate(&ports.AutoMigrateRequest{
+		autoMigrate(&client.AutoMigrateRequest{
 			DatabaseID: "2b78141779ee432295ca371b91c5cac7",
-			AutoMigrateItem: ports.AutoMigrateItem{
+			AutoMigrateItem: client.AutoMigrateItem{
 				TablePrefixWithSchema: tablePrefix,
 				Version:               "v1",
 				TableModelDescribe:    tableModelDescribe,
 			},
 		}).
-		insert(&ports.InsertRequest{
+		insert(&client.InsertRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -783,7 +783,7 @@ func TestEventQuery(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		update(&ports.UpdateRequest{
+		update(&client.UpdateRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
@@ -796,13 +796,13 @@ func TestEventQuery(t *testing.T) {
 			},
 			UserID: "test",
 		}).
-		countEventByKeys(&ports.CountEventByKeysRequest{
+		countEventByKeys(&client.CountEventByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 		}, &totalCount).
 		assertEqual(2, int(totalCount), "总数不一致").
-		commonCountEvent(&ports.CommonCountEventRequest{
+		commonCountEvent(&client.CommonCountEventRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -813,7 +813,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEvent(&ports.CommonCountEventRequest{
+		commonCountEvent(&client.CommonCountEventRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -824,7 +824,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		eventQueryByKeys(&ports.EventQueryByKeysRequest{
+		eventQueryByKeys(&client.EventQueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -845,7 +845,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[1].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[1].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[1].Value, "值为空不一致").
-		eventQueryByKeys(&ports.EventQueryByKeysRequest{
+		eventQueryByKeys(&client.EventQueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -860,7 +860,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventQuery(&ports.CommonEventQueryRequest{
+		commonEventQuery(&client.CommonEventQueryRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -880,7 +880,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventQuery(&ports.CommonEventQueryRequest{
+		commonEventQuery(&client.CommonEventQueryRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -900,20 +900,20 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		delete(&ports.DeleteRequest{
+		delete(&client.DeleteRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			Version:               "v1",
 			KeyValues:             map[string]string{"id": id},
 			UserID:                "test",
 		}).
-		countEventHistoryByKeys(&ports.CountEventByKeysRequest{
+		countEventHistoryByKeys(&client.CountEventByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
 		}, &totalCount).
 		assertEqual(3, int(totalCount), "总数不一致").
-		commonCountEventHistory(&ports.CommonCountEventRequest{
+		commonCountEventHistory(&client.CommonCountEventRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -924,7 +924,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEventHistory(&ports.CommonCountEventRequest{
+		commonCountEventHistory(&client.CommonCountEventRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -935,7 +935,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		commonCountEventHistory(&ports.CommonCountEventRequest{
+		commonCountEventHistory(&client.CommonCountEventRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -946,7 +946,7 @@ func TestEventQuery(t *testing.T) {
 			EndCreatedTime:        now.Add(time.Second).Format(time.DateTime),
 		}, &totalCount).
 		assertEqual(1, int(totalCount), "总数不一致").
-		eventHistoryQueryByKeys(&ports.EventQueryByKeysRequest{
+		eventHistoryQueryByKeys(&client.EventQueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -973,7 +973,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[2].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[2].CreateTime, "创建事件为空").
 		assertEqual("", eventInfos[2].Value, "值为空不一致").
-		eventHistoryQueryByKeys(&ports.EventQueryByKeysRequest{
+		eventHistoryQueryByKeys(&client.EventQueryByKeysRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -988,7 +988,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery(&ports.CommonEventQueryRequest{
+		commonEventHistoryQuery(&client.CommonEventQueryRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -1008,7 +1008,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery(&ports.CommonEventQueryRequest{
+		commonEventHistoryQuery(&client.CommonEventQueryRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},
@@ -1028,7 +1028,7 @@ func TestEventQuery(t *testing.T) {
 		assertEqual("test", eventInfos[0].CreatorID, "创建者ID不一致").
 		assertNotEmpty(eventInfos[0].CreateTime, "创建事件为空").
 		assertNotEmpty(eventInfos[0].Value, "值为空不一致").
-		commonEventHistoryQuery(&ports.CommonEventQueryRequest{
+		commonEventHistoryQuery(&client.CommonEventQueryRequest{
 			DatabaseID:            "2b78141779ee432295ca371b91c5cac7",
 			TablePrefixWithSchema: tablePrefix,
 			KeyValues:             []string{id},