修改README

README.md

@@ -70,8 +70,8 @@ package main
 import (
 	"fmt"
 	"git.sxidc.com/service-supports/ds-sdk/sdk"
-	"git.sxidc.com/service-supports/ds-sdk/sdk/raw_sql_tpl"
 	"git.sxidc.com/service-supports/ds-sdk/sql"
+	"git.sxidc.com/service-supports/ds-sdk/sql/sql_tpl"
 	"strconv"
 	"time"
 )
@@ -125,10 +125,10 @@ func main() {
 		panic(err)
 	}
 
-	tableRow, err := sql.QueryOne(sdk.GetInstance(), &raw_sql_tpl.QueryOneExecuteParams{
+	tableRow, err := sql.QueryOne(sdk.GetInstance(), &sql_tpl.QueryOneExecuteParams{
 		TableName:     tableName,
 		SelectColumns: []string{"id", "name", "created_time", "last_updated_time"},
-		Conditions:    raw_sql_tpl.NewConditions().Equal("id", class.ID),
+		Conditions:    sql_tpl.NewConditions().Equal("id", class.ID),
 	})
 	if err != nil {
 		panic(err)
@@ -332,7 +332,7 @@ func UpdateEntity[T any](executor SqlExecutor, tableName string, e T) error
 是否出现错误
 
 ```go
-func Insert(executor SqlExecutor, executeParams *raw_sql_tpl.InsertExecuteParams) error
+func Insert(executor SqlExecutor, executeParams *sql_tpl.InsertExecuteParams) error
 ```
 
 通过简化的INSERT语句插入数据，简化的INSERT语句：
@@ -365,7 +365,7 @@ TableRows可以通过rat_sql_tpl中的NewTableRows()函数创建，其中Add方
 是否出现错误
 
 ```go
-func Delete(executor SqlExecutor, executeParams *raw_sql_tpl.DeleteExecuteParams) error
+func Delete(executor SqlExecutor, executeParams *sql_tpl.DeleteExecuteParams) error
 ```
 
 通过简化的DELETE语句删除数据，简化的DELETE语句：
@@ -373,9 +373,9 @@ func Delete(executor SqlExecutor, executeParams *raw_sql_tpl.DeleteExecuteParams
 ```go
 const DeleteTpl = `
 DELETE FROM
-	{{ .table_name }}
+    {{ .table_name }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
 `
 ```
 
@@ -398,7 +398,7 @@ Conditions可以通过rat_sql_tpl中的NewConditions()函数创建，其中有
 是否出现错误
 
 ```go
-func Update(executor SqlExecutor, executeParams *raw_sql_tpl.UpdateExecuteParams) error
+func Update(executor SqlExecutor, executeParams *sql_tpl.UpdateExecuteParams) error
 ```
 
 通过简化的UPDATE语句更新数据，简化的DELETE语句：
@@ -406,11 +406,11 @@ func Update(executor SqlExecutor, executeParams *raw_sql_tpl.UpdateExecuteParams
 ```go
 const UpdateTpl = `
 UPDATE
-	{{ .table_name }}
+    {{ .table_name }}
 SET
-	{{ .set_list | join "," }}
+    {{ .set_list | join "," }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
 `
 ```
 
@@ -436,7 +436,7 @@ Conditions可以通过rat_sql_tpl中的NewConditions()函数创建，其中有
 是否出现错误
 
 ```go
-func Query(executor SqlExecutor, executeParams *raw_sql_tpl.QueryExecuteParams) ([]map[string]any, int64, error)
+func Query(executor SqlExecutor, executeParams *sql_tpl.QueryExecuteParams) ([]map[string]any, int64, error)
 ```
 
 通过简化的SELETE语句查询数据，简化的SELETE语句：
@@ -444,11 +444,11 @@ func Query(executor SqlExecutor, executeParams *raw_sql_tpl.QueryExecuteParams)
 ```go
 const QueryTpl = `
 SELECT
-	{{ if .select_columns }}{{ .select_columns | join "," }}{{ else }}*{{ end }} 
+    {{ if .select_columns }}{{ .select_columns | join "," }}{{ else }}*{{ end }} 
 FROM
-	{{ .table_name }}
+    {{ .table_name }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1 
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1 
 {{ if .limit }}LIMIT {{ .limit }}{{ end }}
 {{ if .offset }}OFFSET {{ .offset }}{{ end }}
 `
@@ -478,7 +478,7 @@ Conditions可以通过rat_sql_tpl中的NewConditions()函数创建，其中有
 3. 是否出现错误
 
 ```go
-func QueryOne(executor SqlExecutor, executeParams *raw_sql_tpl.QueryOneExecuteParams) (map[string]any, error)
+func QueryOne(executor SqlExecutor, executeParams *sql_tpl.QueryOneExecuteParams) (map[string]any, error)
 ```
 
 通过简化的SELETE语句执行单查询
@@ -504,7 +504,7 @@ Conditions可以通过rat_sql_tpl中的NewConditions()函数创建，其中有
 2. 是否出现错误
 
 ```go
-func Count(executor SqlExecutor, executeParams *raw_sql_tpl.CountExecuteParams) (int64, error)
+func Count(executor SqlExecutor, executeParams *sql_tpl.CountExecuteParams) (int64, error)
 ```
 
 通过简化的COUNT语句执行计数，简化的COUNT语句
@@ -512,11 +512,11 @@ func Count(executor SqlExecutor, executeParams *raw_sql_tpl.CountExecuteParams)
 ```go
 const CountTpl = `
 SELECT
-	COUNT(*)
+    COUNT(*)
 FROM
-	{{ .table_name }}
+    {{ .table_name }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
 `
 ```
 
@@ -540,7 +540,7 @@ Conditions可以通过rat_sql_tpl中的NewConditions()函数创建，其中有
 2. 是否出现错误
 
 ```go
-func CheckExist(executor SqlExecutor, executeParams *raw_sql_tpl.CheckExistExecuteParams) (bool, error)
+func CheckExist(executor SqlExecutor, executeParams *sql_tpl.CheckExistExecuteParams) (bool, error)
 ```
 
 通过简化的COUNT语句执行存在性检查
@@ -565,7 +565,7 @@ Conditions可以通过rat_sql_tpl中的NewConditions()函数创建，其中有
 2. 是否出现错误
 
 ```go
-func CheckHasOnlyOne(executor SqlExecutor, executeParams *raw_sql_tpl.CheckHasOnlyOneExecuteParams) (bool, error)
+func CheckHasOnlyOne(executor SqlExecutor, executeParams *sql_tpl.CheckHasOnlyOneExecuteParams) (bool, error)
 ```
 
 通过简化的COUNT语句执行唯一性检查

sql/sql.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/ds-sdk/sdk"
-	"git.sxidc.com/service-supports/ds-sdk/sdk/raw_sql_tpl"
+	raw_sql_tpl2 "git.sxidc.com/service-supports/ds-sdk/sql/sql_tpl"
 	"github.com/mitchellh/mapstructure"
 	"reflect"
 	"strings"
@@ -39,7 +39,7 @@ func InsertEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		return err
 	}
 
-	tableRow := raw_sql_tpl.NewTableRows()
+	tableRow := raw_sql_tpl2.NewTableRows()
 
 	now := time.Now()
 
@@ -62,7 +62,7 @@ func InsertEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		}
 	}
 
-	executeParamsMap, err := raw_sql_tpl.InsertExecuteParams{
+	executeParamsMap, err := raw_sql_tpl2.InsertExecuteParams{
 		TableName: tableName,
 		TableRows: tableRow,
 	}.Map()
@@ -70,7 +70,7 @@ func InsertEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		return err
 	}
 
-	_, err = executor.ExecuteRawSql(raw_sql_tpl.InsertTpl, executeParamsMap)
+	_, err = executor.ExecuteRawSql(raw_sql_tpl2.InsertTpl, executeParamsMap)
 	if err != nil {
 		if strings.Contains(err.Error(), "SQLSTATE 23505") {
 			return sdk.ErrDBRecordHasExist
@@ -100,7 +100,7 @@ func DeleteEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		return err
 	}
 
-	conditions := raw_sql_tpl.NewConditions()
+	conditions := raw_sql_tpl2.NewConditions()
 
 	for _, sqlMappingColumn := range sqlMapping.ColumnMap {
 		if !sqlMappingColumn.IsKey {
@@ -120,7 +120,7 @@ func DeleteEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		}
 	}
 
-	executeParamsMap, err := raw_sql_tpl.DeleteExecuteParams{
+	executeParamsMap, err := raw_sql_tpl2.DeleteExecuteParams{
 		TableName:  tableName,
 		Conditions: conditions,
 	}.Map()
@@ -128,7 +128,7 @@ func DeleteEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		return err
 	}
 
-	_, err = executor.ExecuteRawSql(raw_sql_tpl.DeleteTpl, executeParamsMap)
+	_, err = executor.ExecuteRawSql(raw_sql_tpl2.DeleteTpl, executeParamsMap)
 	if err != nil {
 		return err
 	}
@@ -154,8 +154,8 @@ func UpdateEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		return err
 	}
 
-	tableRows := raw_sql_tpl.NewTableRows()
-	conditions := raw_sql_tpl.NewConditions()
+	tableRows := raw_sql_tpl2.NewTableRows()
+	conditions := raw_sql_tpl2.NewConditions()
 
 	now := time.Now()
 
@@ -196,7 +196,7 @@ func UpdateEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		}
 	}
 
-	executeParamsMap, err := raw_sql_tpl.UpdateExecuteParams{
+	executeParamsMap, err := raw_sql_tpl2.UpdateExecuteParams{
 		TableName:  tableName,
 		TableRows:  tableRows,
 		Conditions: conditions,
@@ -205,7 +205,7 @@ func UpdateEntity[T any](executor SqlExecutor, tableName string, e T) error {
 		return err
 	}
 
-	_, err = executor.ExecuteRawSql(raw_sql_tpl.UpdateTpl, executeParamsMap)
+	_, err = executor.ExecuteRawSql(raw_sql_tpl2.UpdateTpl, executeParamsMap)
 	if err != nil {
 		return err
 	}
@@ -213,7 +213,7 @@ func UpdateEntity[T any](executor SqlExecutor, tableName string, e T) error {
 	return nil
 }
 
-func Insert(executor SqlExecutor, executeParams *raw_sql_tpl.InsertExecuteParams) error {
+func Insert(executor SqlExecutor, executeParams *raw_sql_tpl2.InsertExecuteParams) error {
 	if executor == nil {
 		return errors.New("没有传递执行器")
 	}
@@ -227,7 +227,7 @@ func Insert(executor SqlExecutor, executeParams *raw_sql_tpl.InsertExecuteParams
 		return err
 	}
 
-	_, err = executor.ExecuteRawSql(raw_sql_tpl.InsertTpl, executeParamsMap)
+	_, err = executor.ExecuteRawSql(raw_sql_tpl2.InsertTpl, executeParamsMap)
 	if err != nil {
 		return err
 	}
@@ -235,7 +235,7 @@ func Insert(executor SqlExecutor, executeParams *raw_sql_tpl.InsertExecuteParams
 	return nil
 }
 
-func Delete(executor SqlExecutor, executeParams *raw_sql_tpl.DeleteExecuteParams) error {
+func Delete(executor SqlExecutor, executeParams *raw_sql_tpl2.DeleteExecuteParams) error {
 	if executor == nil {
 		return errors.New("没有传递执行器")
 	}
@@ -249,7 +249,7 @@ func Delete(executor SqlExecutor, executeParams *raw_sql_tpl.DeleteExecuteParams
 		return err
 	}
 
-	_, err = executor.ExecuteRawSql(raw_sql_tpl.DeleteTpl, executeParamsMap)
+	_, err = executor.ExecuteRawSql(raw_sql_tpl2.DeleteTpl, executeParamsMap)
 	if err != nil {
 		return err
 	}
@@ -257,7 +257,7 @@ func Delete(executor SqlExecutor, executeParams *raw_sql_tpl.DeleteExecuteParams
 	return nil
 }
 
-func Update(executor SqlExecutor, executeParams *raw_sql_tpl.UpdateExecuteParams) error {
+func Update(executor SqlExecutor, executeParams *raw_sql_tpl2.UpdateExecuteParams) error {
 	if executor == nil {
 		return errors.New("没有传递执行器")
 	}
@@ -271,7 +271,7 @@ func Update(executor SqlExecutor, executeParams *raw_sql_tpl.UpdateExecuteParams
 		return err
 	}
 
-	_, err = executor.ExecuteRawSql(raw_sql_tpl.UpdateTpl, executeParamsMap)
+	_, err = executor.ExecuteRawSql(raw_sql_tpl2.UpdateTpl, executeParamsMap)
 	if err != nil {
 		return err
 	}
@@ -279,7 +279,7 @@ func Update(executor SqlExecutor, executeParams *raw_sql_tpl.UpdateExecuteParams
 	return nil
 }
 
-func Query(executor SqlExecutor, executeParams *raw_sql_tpl.QueryExecuteParams) ([]map[string]any, int64, error) {
+func Query(executor SqlExecutor, executeParams *raw_sql_tpl2.QueryExecuteParams) ([]map[string]any, int64, error) {
 	if executor == nil {
 		return nil, 0, errors.New("没有传递执行器")
 	}
@@ -293,7 +293,7 @@ func Query(executor SqlExecutor, executeParams *raw_sql_tpl.QueryExecuteParams)
 		return nil, 0, err
 	}
 
-	countExecuteParamsMap, err := raw_sql_tpl.CountExecuteParams{
+	countExecuteParamsMap, err := raw_sql_tpl2.CountExecuteParams{
 		TableName:  executeParams.TableName,
 		Conditions: executeParams.Conditions,
 	}.Map()
@@ -301,12 +301,12 @@ func Query(executor SqlExecutor, executeParams *raw_sql_tpl.QueryExecuteParams)
 		return nil, 0, err
 	}
 
-	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl.QueryTpl, queryExecuteParamsMap)
+	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl2.QueryTpl, queryExecuteParamsMap)
 	if err != nil {
 		return nil, 0, err
 	}
 
-	countTableRow, err := executor.ExecuteRawSql(raw_sql_tpl.CountTpl, countExecuteParamsMap)
+	countTableRow, err := executor.ExecuteRawSql(raw_sql_tpl2.CountTpl, countExecuteParamsMap)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -314,7 +314,7 @@ func Query(executor SqlExecutor, executeParams *raw_sql_tpl.QueryExecuteParams)
 	return tableRows, int64(countTableRow[0]["count"].(float64)), nil
 }
 
-func QueryOne(executor SqlExecutor, executeParams *raw_sql_tpl.QueryOneExecuteParams) (map[string]any, error) {
+func QueryOne(executor SqlExecutor, executeParams *raw_sql_tpl2.QueryOneExecuteParams) (map[string]any, error) {
 	if executor == nil {
 		return nil, errors.New("没有传递执行器")
 	}
@@ -328,7 +328,7 @@ func QueryOne(executor SqlExecutor, executeParams *raw_sql_tpl.QueryOneExecutePa
 		return nil, err
 	}
 
-	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl.QueryTpl, executeParamsMap)
+	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl2.QueryTpl, executeParamsMap)
 	if err != nil {
 		return nil, err
 	}
@@ -340,7 +340,7 @@ func QueryOne(executor SqlExecutor, executeParams *raw_sql_tpl.QueryOneExecutePa
 	return tableRows[0], nil
 }
 
-func Count(executor SqlExecutor, executeParams *raw_sql_tpl.CountExecuteParams) (int64, error) {
+func Count(executor SqlExecutor, executeParams *raw_sql_tpl2.CountExecuteParams) (int64, error) {
 	if executor == nil {
 		return 0, errors.New("没有传递执行器")
 	}
@@ -354,7 +354,7 @@ func Count(executor SqlExecutor, executeParams *raw_sql_tpl.CountExecuteParams)
 		return 0, err
 	}
 
-	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl.CountTpl, executeParamsMap)
+	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl2.CountTpl, executeParamsMap)
 	if err != nil {
 		return 0, err
 	}
@@ -362,7 +362,7 @@ func Count(executor SqlExecutor, executeParams *raw_sql_tpl.CountExecuteParams)
 	return int64(tableRows[0]["count"].(float64)), nil
 }
 
-func CheckExist(executor SqlExecutor, executeParams *raw_sql_tpl.CheckExistExecuteParams) (bool, error) {
+func CheckExist(executor SqlExecutor, executeParams *raw_sql_tpl2.CheckExistExecuteParams) (bool, error) {
 	if executor == nil {
 		return false, errors.New("没有传递执行器")
 	}
@@ -376,7 +376,7 @@ func CheckExist(executor SqlExecutor, executeParams *raw_sql_tpl.CheckExistExecu
 		return false, err
 	}
 
-	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl.CountTpl, executeParamsMap)
+	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl2.CountTpl, executeParamsMap)
 	if err != nil {
 		return false, err
 	}
@@ -384,7 +384,7 @@ func CheckExist(executor SqlExecutor, executeParams *raw_sql_tpl.CheckExistExecu
 	return int64(tableRows[0]["count"].(float64)) > 0, nil
 }
 
-func CheckHasOnlyOne(executor SqlExecutor, executeParams *raw_sql_tpl.CheckHasOnlyOneExecuteParams) (bool, error) {
+func CheckHasOnlyOne(executor SqlExecutor, executeParams *raw_sql_tpl2.CheckHasOnlyOneExecuteParams) (bool, error) {
 	if executor == nil {
 		return false, errors.New("没有传递执行器")
 	}
@@ -398,7 +398,7 @@ func CheckHasOnlyOne(executor SqlExecutor, executeParams *raw_sql_tpl.CheckHasOn
 		return false, err
 	}
 
-	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl.CountTpl, executeParamsMap)
+	tableRows, err := executor.ExecuteRawSql(raw_sql_tpl2.CountTpl, executeParamsMap)
 	if err != nil {
 		return false, err
 	}

sdk/raw_sql_tpl/condition.go → sql/sql_tpl/condition.go

@@ -1,4 +1,4 @@
-package raw_sql_tpl
+package sql_tpl
 
 type Conditions struct {
 	Conditions []string

sdk/raw_sql_tpl/raw_sql_tpl.go → sql/sql_tpl/sql_tpl.go

@@ -1,4 +1,4 @@
-package raw_sql_tpl
+package sql_tpl
 
 import "errors"
 
@@ -6,7 +6,7 @@ const InsertTpl = `
 INSERT INTO
     {{ .table_name }} ({{ .columns | join "," }})
 VALUES
-	({{ .values | join "," }})
+    ({{ .values | join "," }})
 `
 
 type InsertExecuteParams struct {
@@ -31,9 +31,9 @@ func (params InsertExecuteParams) Map() (map[string]any, error) {
 
 const DeleteTpl = `
 DELETE FROM
-	{{ .table_name }}
+    {{ .table_name }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
 `
 
 type DeleteExecuteParams struct {
@@ -54,11 +54,11 @@ func (params DeleteExecuteParams) Map() (map[string]any, error) {
 
 const UpdateTpl = `
 UPDATE
-	{{ .table_name }}
+    {{ .table_name }}
 SET
-	{{ .set_list | join "," }}
+    {{ .set_list | join "," }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
 `
 
 type UpdateExecuteParams struct {
@@ -87,11 +87,11 @@ func (params UpdateExecuteParams) Map() (map[string]any, error) {
 
 const QueryTpl = `
 SELECT
-	{{ if .select_columns }}{{ .select_columns | join "," }}{{ else }}*{{ end }} 
+    {{ if .select_columns }}{{ .select_columns | join "," }}{{ else }}*{{ end }} 
 FROM
-	{{ .table_name }}
+    {{ .table_name }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1 
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1 
 {{ if .limit }}LIMIT {{ .limit }}{{ end }}
 {{ if .offset }}OFFSET {{ .offset }}{{ end }}
 `
@@ -148,11 +148,11 @@ func (params QueryOneExecuteParams) Map() (map[string]any, error) {
 
 const CountTpl = `
 SELECT
-	COUNT(*)
+    COUNT(*)
 FROM
-	{{ .table_name }}
+    {{ .table_name }}
 WHERE
-	{{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
+    {{ range .conditions }} {{ . }} AND {{ end }} 1 = 1
 `
 
 type CountExecuteParams struct {

sdk/raw_sql_tpl/table_row.go → sql/sql_tpl/table_row.go

@@ -1,4 +1,4 @@
-package raw_sql_tpl
+package sql_tpl
 
 type TableRows struct {
 	Rows []TableRow

sdk/raw_sql_tpl/value.go → sql/sql_tpl/value.go

@@ -1,4 +1,4 @@
-package raw_sql_tpl
+package sql_tpl
 
 import (
 	"errors"

test/sdk_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/ds-sdk/sdk"
-	"git.sxidc.com/service-supports/ds-sdk/sdk/raw_sql_tpl"
 	"git.sxidc.com/service-supports/ds-sdk/sql"
+	raw_sql_tpl2 "git.sxidc.com/service-supports/ds-sdk/sql/sql_tpl"
 	"github.com/iancoleman/strcase"
 	"math/rand"
 	"strings"
@@ -64,9 +64,9 @@ func TestBasic(t *testing.T) {
 	studentNum := rand.Int31n(100)
 	now := time.Now()
 
-	insertExecuteParams, err := raw_sql_tpl.InsertExecuteParams{
+	insertExecuteParams, err := raw_sql_tpl2.InsertExecuteParams{
 		TableName: tableName,
-		TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+		TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 			Add("name", className).
 			Add("student_num", studentNum).
 			Add("graduated_time", now).
@@ -106,7 +106,7 @@ func TestBasic(t *testing.T) {
 		}
 	}()
 
-	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.InsertTpl, insertExecuteParams)
+	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.InsertTpl, insertExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -126,7 +126,7 @@ func TestBasic(t *testing.T) {
 			defer wg.Done()
 
 			err = sdk.GetInstance().Transaction(func(tx *sdk.Transaction) error {
-				_, err := tx.ExecuteRawSql(raw_sql_tpl.InsertTpl, insertExecuteParams)
+				_, err := tx.ExecuteRawSql(raw_sql_tpl2.InsertTpl, insertExecuteParams)
 				if err != nil {
 					return err
 				}
@@ -160,9 +160,9 @@ func TestRawSqlTemplate(t *testing.T) {
 
 	now := time.Now()
 
-	insertExecuteParams, err := raw_sql_tpl.InsertExecuteParams{
+	insertExecuteParams, err := raw_sql_tpl2.InsertExecuteParams{
 		TableName: tableName,
-		TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+		TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 			Add("name", className).
 			Add("student_num", studentNum).
 			Add("graduated_time", now).
@@ -173,28 +173,28 @@ func TestRawSqlTemplate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	deleteExecuteParams, err := raw_sql_tpl.DeleteExecuteParams{
+	deleteExecuteParams, err := raw_sql_tpl2.DeleteExecuteParams{
 		TableName:  tableName,
-		Conditions: raw_sql_tpl.NewConditions().Equal("id", classID),
+		Conditions: raw_sql_tpl2.NewConditions().Equal("id", classID),
 	}.Map()
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	updateExecuteParams, err := raw_sql_tpl.UpdateExecuteParams{
+	updateExecuteParams, err := raw_sql_tpl2.UpdateExecuteParams{
 		TableName: tableName,
-		TableRows: raw_sql_tpl.NewTableRows().Add("name", newClassName).
+		TableRows: raw_sql_tpl2.NewTableRows().Add("name", newClassName).
 			Add("student_num", newStudentNum),
-		Conditions: raw_sql_tpl.NewConditions().Equal("id", classID),
+		Conditions: raw_sql_tpl2.NewConditions().Equal("id", classID),
 	}.Map()
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	queryExecuteParams, err := raw_sql_tpl.QueryExecuteParams{
+	queryExecuteParams, err := raw_sql_tpl2.QueryExecuteParams{
 		TableName:     tableName,
 		SelectColumns: []string{"id", "name", "student_num as student_num_alias", "graduated_time", "created_time", "last_updated_time"},
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),
@@ -205,10 +205,10 @@ func TestRawSqlTemplate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	newQueryExecuteParams, err := raw_sql_tpl.QueryExecuteParams{
+	newQueryExecuteParams, err := raw_sql_tpl2.QueryExecuteParams{
 		TableName:     tableName,
 		SelectColumns: []string{"id", "name", "student_num as student_num_alias", "graduated_time", "created_time", "last_updated_time"},
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", newClassName).
 			Equal("student_num", newStudentNum),
@@ -219,9 +219,9 @@ func TestRawSqlTemplate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	countExecuteParams, err := raw_sql_tpl.CountExecuteParams{
+	countExecuteParams, err := raw_sql_tpl2.CountExecuteParams{
 		TableName: tableName,
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),
@@ -230,9 +230,9 @@ func TestRawSqlTemplate(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	newCountExecuteParams, err := raw_sql_tpl.CountExecuteParams{
+	newCountExecuteParams, err := raw_sql_tpl2.CountExecuteParams{
 		TableName: tableName,
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", newClassName).
 			Equal("student_num", newStudentNum),
@@ -253,17 +253,17 @@ func TestRawSqlTemplate(t *testing.T) {
 		}
 	}()
 
-	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.InsertTpl, insertExecuteParams)
+	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.InsertTpl, insertExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	queryResults, err := sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.QueryTpl, queryExecuteParams)
+	queryResults, err := sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.QueryTpl, queryExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	countResults, err := sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.CountTpl, countExecuteParams)
+	countResults, err := sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.CountTpl, countExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -291,17 +291,17 @@ func TestRawSqlTemplate(t *testing.T) {
 		t.Fatal("查询数据不正确")
 	}
 
-	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.UpdateTpl, updateExecuteParams)
+	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.UpdateTpl, updateExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	queryResults, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.QueryTpl, newQueryExecuteParams)
+	queryResults, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.QueryTpl, newQueryExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	countResults, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.CountTpl, newCountExecuteParams)
+	countResults, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.CountTpl, newCountExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -329,7 +329,7 @@ func TestRawSqlTemplate(t *testing.T) {
 		t.Fatal("查询数据不正确")
 	}
 
-	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl.DeleteTpl, deleteExecuteParams)
+	_, err = sdk.GetInstance().ExecuteRawSql(raw_sql_tpl2.DeleteTpl, deleteExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -380,9 +380,9 @@ func TestSql(t *testing.T) {
 	newStudentNum := rand.Int31n(100)
 	now := time.Now()
 
-	insertExecuteParams, err := raw_sql_tpl.InsertExecuteParams{
+	insertExecuteParams, err := raw_sql_tpl2.InsertExecuteParams{
 		TableName: tableName,
-		TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+		TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 			Add("name", className).
 			Add("student_num", studentNum).
 			Add("graduated_time", now).
@@ -456,9 +456,9 @@ func TestSql(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = sql.Insert(sdk.GetInstance(), &raw_sql_tpl.InsertExecuteParams{
+	err = sql.Insert(sdk.GetInstance(), &raw_sql_tpl2.InsertExecuteParams{
 		TableName: tableName,
-		TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+		TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 			Add("name", className).
 			Add("student_num", studentNum).
 			Add("graduated_time", now).
@@ -469,28 +469,28 @@ func TestSql(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = sql.Update(sdk.GetInstance(), &raw_sql_tpl.UpdateExecuteParams{
+	err = sql.Update(sdk.GetInstance(), &raw_sql_tpl2.UpdateExecuteParams{
 		TableName: tableName,
-		TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+		TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 			Add("name", newClassName).
 			Add("student_num", newStudentNum),
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID),
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = sql.Delete(sdk.GetInstance(), &raw_sql_tpl.DeleteExecuteParams{
+	err = sql.Delete(sdk.GetInstance(), &raw_sql_tpl2.DeleteExecuteParams{
 		TableName: tableName,
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID),
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	_, err = sql.ExecuteRawSql(sdk.GetInstance(), raw_sql_tpl.InsertTpl, insertExecuteParams)
+	_, err = sql.ExecuteRawSql(sdk.GetInstance(), raw_sql_tpl2.InsertTpl, insertExecuteParams)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -516,9 +516,9 @@ func TestSql(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		err = sql.Insert(tx, &raw_sql_tpl.InsertExecuteParams{
+		err = sql.Insert(tx, &raw_sql_tpl2.InsertExecuteParams{
 			TableName: tableName,
-			TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+			TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 				Add("name", className).
 				Add("student_num", studentNum).
 				Add("graduated_time", now).
@@ -529,28 +529,28 @@ func TestSql(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		err = sql.Update(tx, &raw_sql_tpl.UpdateExecuteParams{
+		err = sql.Update(tx, &raw_sql_tpl2.UpdateExecuteParams{
 			TableName: tableName,
-			TableRows: raw_sql_tpl.NewTableRows().Add("id", classID).
+			TableRows: raw_sql_tpl2.NewTableRows().Add("id", classID).
 				Add("name", newClassName).
 				Add("student_num", newStudentNum),
-			Conditions: raw_sql_tpl.NewConditions().
+			Conditions: raw_sql_tpl2.NewConditions().
 				Equal("id", classID),
 		})
 		if err != nil {
 			t.Fatal(err)
 		}
 
-		err = sql.Delete(tx, &raw_sql_tpl.DeleteExecuteParams{
+		err = sql.Delete(tx, &raw_sql_tpl2.DeleteExecuteParams{
 			TableName: tableName,
-			Conditions: raw_sql_tpl.NewConditions().
+			Conditions: raw_sql_tpl2.NewConditions().
 				Equal("id", classID),
 		})
 		if err != nil {
 			t.Fatal(err)
 		}
 
-		_, err = sql.ExecuteRawSql(tx, raw_sql_tpl.InsertTpl, insertExecuteParams)
+		_, err = sql.ExecuteRawSql(tx, raw_sql_tpl2.InsertTpl, insertExecuteParams)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -571,10 +571,10 @@ func TestSql(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	tableRows, totalCount, err := sql.Query(sdk.GetInstance(), &raw_sql_tpl.QueryExecuteParams{
+	tableRows, totalCount, err := sql.Query(sdk.GetInstance(), &raw_sql_tpl2.QueryExecuteParams{
 		TableName:     tableName,
 		SelectColumns: []string{"id", "name"},
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),
@@ -603,10 +603,10 @@ func TestSql(t *testing.T) {
 		t.Fatal("查询数据不正确")
 	}
 
-	tableRow, err := sql.QueryOne(sdk.GetInstance(), &raw_sql_tpl.QueryOneExecuteParams{
+	tableRow, err := sql.QueryOne(sdk.GetInstance(), &raw_sql_tpl2.QueryOneExecuteParams{
 		TableName:     tableName,
 		SelectColumns: []string{"id", "name"},
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),
@@ -629,9 +629,9 @@ func TestSql(t *testing.T) {
 		t.Fatal("查询数据不正确")
 	}
 
-	queryCount, err := sql.Count(sdk.GetInstance(), &raw_sql_tpl.CountExecuteParams{
+	queryCount, err := sql.Count(sdk.GetInstance(), &raw_sql_tpl2.CountExecuteParams{
 		TableName: tableName,
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),
@@ -644,9 +644,9 @@ func TestSql(t *testing.T) {
 		t.Fatal("数量不正确")
 	}
 
-	exist, err := sql.CheckExist(sdk.GetInstance(), &raw_sql_tpl.CheckExistExecuteParams{
+	exist, err := sql.CheckExist(sdk.GetInstance(), &raw_sql_tpl2.CheckExistExecuteParams{
 		TableName: tableName,
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),
@@ -659,9 +659,9 @@ func TestSql(t *testing.T) {
 		t.Fatal("存在状态错误")
 	}
 
-	hasOnlyOne, err := sql.CheckHasOnlyOne(sdk.GetInstance(), &raw_sql_tpl.CheckHasOnlyOneExecuteParams{
+	hasOnlyOne, err := sql.CheckHasOnlyOne(sdk.GetInstance(), &raw_sql_tpl2.CheckHasOnlyOneExecuteParams{
 		TableName: tableName,
-		Conditions: raw_sql_tpl.NewConditions().
+		Conditions: raw_sql_tpl2.NewConditions().
 			Equal("id", classID).
 			Equal("name", className).
 			Equal("student_num", studentNum),