Browse Source

修改参数名

yjp 1 year ago
parent
commit
a7bd8ab8a1

+ 1 - 1
convenient/domain/auth/auth.go

@@ -372,7 +372,7 @@ func (simple *Simple) bind(binder *binding.Binder) {
 
 			roleIDResults, totalCount, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
 				TableName:     userAndRoleTableName,
-				SelectColumns: []string{domain.RelationColumnName(&role.Entity{})},
+				SelectClauses: []string{domain.RelationColumnName(&role.Entity{})},
 				Conditions:    sql.NewConditions().Equal(domain.RelationColumnName(&user.Entity{}), userInfo.GetID()),
 				PageNo:        0,
 				PageSize:      0,

+ 2 - 2
convenient/domain/auth/middlewares/middlewares.go

@@ -74,7 +74,7 @@ func Authentication(dbSchema string, jwtSecretKey string) binding.Middleware {
 		// 获取用户的角色
 		roleIDResults, totalCount, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
 			TableName:     domain.RelationTableName(dbSchema, &user.Entity{}, &role.Entity{}),
-			SelectColumns: []string{domain.RelationColumnName(&role.Entity{})},
+			SelectClauses: []string{domain.RelationColumnName(&role.Entity{})},
 			Conditions:    sql.NewConditions().Equal(domain.RelationColumnName(&user.Entity{}), userInfo.GetID()),
 			PageNo:        0,
 			PageSize:      0,
@@ -99,7 +99,7 @@ func Authentication(dbSchema string, jwtSecretKey string) binding.Middleware {
 		// 查找权限
 		permissionIDResult, err := database.QueryOne(dbExecutor, &sql.QueryOneExecuteParams{
 			TableName:     domain.TableName(dbSchema, &permission.Entity{}),
-			SelectColumns: []string{entity.ColumnID},
+			SelectClauses: []string{entity.ColumnID},
 			Conditions: sql.NewConditions().Equal(permission.ColumnResource, c.FullPath()).
 				Equal(permission.ColumnAction, c.Request.Method),
 		})

+ 1 - 1
convenient/domain/configuration/api.go

@@ -73,7 +73,7 @@ func (simple *Simple) bind(binder *binding.Binder) {
 
 				results, _, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
 					TableName:     configurationTableName,
-					SelectColumns: []string{ColumnValue},
+					SelectClauses: []string{ColumnValue},
 					Conditions:    conditions,
 				})
 				if err != nil {

+ 1 - 1
convenient/relation/many2many/service.go

@@ -167,7 +167,7 @@ func Query[TI any](middleTableName string,
 
 		toIDResults, totalCount, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
 			TableName:     middleTableName,
-			SelectColumns: []string{toRelationColumnName},
+			SelectClauses: []string{toRelationColumnName},
 			Conditions:    sql.NewConditions().Equal(fromRelationColumnName, fromEntity.GetID()),
 			PageNo:        queryParams.GetPageNo(),
 			PageSize:      queryParams.GetPageSize(),

+ 2 - 2
convenient/relation/remote/service.go

@@ -173,7 +173,7 @@ func QueryToExist[TI any](middleTableName string,
 
 		toIDResults, totalCount, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
 			TableName:     middleTableName,
-			SelectColumns: []string{toRelationColumnName},
+			SelectClauses: []string{toRelationColumnName},
 			Conditions:    sql.NewConditions().Equal(fromRelationColumnName, fromEntity.GetID()),
 			PageNo:        queryParams.GetPageNo(),
 			PageSize:      queryParams.GetPageSize(),
@@ -263,7 +263,7 @@ func QueryToRemote(middleTableName string, fromRemote bool, fromTableName string
 
 		toIDResults, totalCount, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
 			TableName:     middleTableName,
-			SelectColumns: []string{toRelationColumnName},
+			SelectClauses: []string{toRelationColumnName},
 			Conditions:    sql.NewConditions().Equal(fromRelationColumnName, fromEntity.GetID()),
 			PageNo:        queryParams.GetPageNo(),
 			PageSize:      queryParams.GetPageSize(),

+ 4 - 4
framework/core/infrastructure/database/sql/sql_template.go

@@ -178,7 +178,7 @@ WHERE
 
 type QueryExecuteParams struct {
 	TableName     string
-	SelectColumns []string
+	SelectClauses []string
 	*Conditions
 	OrderBy  string
 	PageNo   int
@@ -205,7 +205,7 @@ func (params QueryExecuteParams) Map() (map[string]any, error) {
 
 	return map[string]any{
 		"table_name":     params.TableName,
-		"select_columns": params.SelectColumns,
+		"select_columns": params.SelectClauses,
 		"conditions":     conditions,
 		"limit":          limit,
 		"offset":         offset,
@@ -215,7 +215,7 @@ func (params QueryExecuteParams) Map() (map[string]any, error) {
 
 type QueryOneExecuteParams struct {
 	TableName     string
-	SelectColumns []string
+	SelectClauses []string
 	*Conditions
 }
 
@@ -231,7 +231,7 @@ func (params QueryOneExecuteParams) Map() (map[string]any, error) {
 
 	return map[string]any{
 		"table_name":     params.TableName,
-		"select_columns": params.SelectColumns,
+		"select_columns": params.SelectClauses,
 		"conditions":     conditions,
 	}, nil
 }