query ok

Author: glennliao

apijson.go

@@ -3,6 +3,8 @@ package apijson
 import (
 	"context"
 	"github.com/glennliao/apijson-go/config"
+	"github.com/glennliao/apijson-go/model"
+	"github.com/glennliao/apijson-go/query"
 )
 
 type Plugin interface {
@@ -52,3 +54,14 @@ func (a *ApiJson) Load() {
 func (a *ApiJson) Config() *config.Config {
 	return a.config
 }
+
+func (a *ApiJson) NewQuery(ctx context.Context, req model.Map) *query.Query {
+	q := query.New(ctx, a.Config().QueryConfig(), req)
+
+	q.DbMeta = a.config.DbMeta
+	q.Functions = a.config.Functions
+	q.DbFieldStyle = a.config.DbFieldStyle
+	q.JsonFieldStyle = a.config.JsonFieldStyle
+
+	return q
+}

config/access_config.go

@@ -56,19 +56,19 @@ func (a *AccessConfig) GetFieldsGetInByRole(role string) map[string][]string {
 	return inFieldsMap
 }
 
-func (a *Access) GetAccess(tableAlias string, accessVerify bool) (*AccessConfig, error) {
+func (a *Access) GetAccess(tableAlias string, noVerify bool) (*AccessConfig, error) {
 	tableAlias, _ = util.ParseNodeKey(tableAlias)
 	access, ok := a.accessConfigMap[tableAlias]
 
 	if !ok {
-		if accessVerify {
-			return nil, gerror.Newf("access[%s]: 404", tableAlias)
+		if noVerify {
+			return &AccessConfig{
+				Debug: 0,
+				Name:  tableAlias,
+				Alias: tableAlias,
+			}, nil
 		}
-		return &AccessConfig{
-			Debug: 0,
-			Name:  tableAlias,
-			Alias: tableAlias,
-		}, nil
+		return nil, gerror.Newf("access[%s]: 404", tableAlias)
 	}
 
 	return &access, nil

config/config.go

@@ -21,6 +21,8 @@ type Config struct {
 	AccessList []AccessConfig // todo to access
 
 	RequestConfig *RequestConfig
+
+	queryConfig *QueryConfig
 }
 
 func New() *Config {
@@ -48,4 +50,16 @@ func (c *Config) Load() {
 	for _, access := range c.AccessList {
 		c.Access.accessConfigMap[access.Alias] = access
 	}
+
+	c.queryConfig = &QueryConfig{
+		access:          c.Access,
+		functions:       c.Functions,
+		maxTreeDeep:     c.MaxTreeDeep,
+		maxTreeWidth:    c.MaxTreeWidth,
+		defaultRoleFunc: c.Access.DefaultRoleFunc,
+	}
+}
+
+func (c *Config) QueryConfig() *QueryConfig {
+	return c.queryConfig
 }

config/executor/query.go

@@ -16,19 +16,19 @@ type QueryExecutor interface {
 	SetEmptyResult()
 }
 
-type queryExecutorBuilder func(ctx context.Context, noAccessVerify bool, role string, access *config.AccessConfig, config *config.Config) (QueryExecutor, error)
+type queryExecutorBuilder func(ctx context.Context, config *config.ExecutorConfig) (QueryExecutor, error)
 
 var queryExecutorBuilderMap = map[string]queryExecutorBuilder{}
 
 func RegQueryExecutor(name string, e queryExecutorBuilder) {
 	queryExecutorBuilderMap[name] = e
 }
 
-func NewQueryExecutor(name string, ctx context.Context, noAccessVerify bool, role string, access *config.AccessConfig, config *config.Config) (QueryExecutor, error) {
+func NewQueryExecutor(name string, ctx context.Context, config *config.ExecutorConfig) (QueryExecutor, error) {
 	if v, exists := queryExecutorBuilderMap[name]; exists {
-		return v(ctx, noAccessVerify, role, access, config)
+		return v(ctx, config)
 	}
-	return queryExecutorBuilderMap["default"](ctx, noAccessVerify, role, access, config)
+	return queryExecutorBuilderMap["default"](ctx, config)
 }
 
 func QueryExecutorList() []string {

config/query_config.go

@@ -0,0 +1,114 @@
+package config
+
+import (
+	"context"
+	"github.com/glennliao/apijson-go/model"
+	"github.com/samber/lo"
+	"net/http"
+)
+
+type QueryConfig struct {
+	access          *Access
+	functions       *Functions
+	maxTreeDeep     int
+	maxTreeWidth    int
+	defaultRoleFunc DefaultRole
+}
+
+func (c *QueryConfig) NoVerify() bool {
+	return c.access.NoVerify
+}
+
+func (c *QueryConfig) DefaultRoleFunc() DefaultRole {
+	return c.defaultRoleFunc
+}
+
+func (c *QueryConfig) GetAccessConfig(key string, noVerify bool) (*AccessConfig, error) {
+	return c.access.GetAccess(key, noVerify)
+}
+
+func (c *QueryConfig) CallFunc(ctx context.Context, name string, param model.Map) (any, error) {
+	return c.functions.Call(ctx, name, param)
+}
+
+func (c *QueryConfig) MaxTreeDeep() int {
+	return c.maxTreeDeep
+}
+func (c *QueryConfig) MaxTreeWidth() int {
+	return c.maxTreeWidth
+}
+
+type ExecutorConfig struct {
+	NoVerify       bool
+	accessConfig   *AccessConfig
+	method         string
+	role           string
+	DBMeta         *DBMeta
+	DbFieldStyle   FieldStyle
+	JsonFieldStyle FieldStyle
+}
+
+func NewExecutorConfig(accessConfig *AccessConfig, method string, noVerify bool) *ExecutorConfig {
+	return &ExecutorConfig{
+		accessConfig: accessConfig,
+		method:       method,
+		NoVerify:     noVerify,
+	}
+}
+
+func (c *ExecutorConfig) SetRole(role string) {
+	c.role = role
+}
+
+func (c *ExecutorConfig) TableName() string {
+	return c.accessConfig.Name
+}
+
+func (c *ExecutorConfig) TableColumns() []string {
+	return c.DBMeta.GetTableColumns(c.accessConfig.Name)
+}
+
+func (c *ExecutorConfig) GetFieldsGetOutByRole() []string {
+	var fieldsMap map[string]string
+
+	if val, exists := c.accessConfig.FieldsGet[c.role]; exists {
+		fieldsMap = val.Out
+	} else {
+		fieldsMap = c.accessConfig.FieldsGet["default"].Out
+	}
+	return lo.Keys(fieldsMap)
+}
+
+func (c *ExecutorConfig) GetFieldsGetInByRole() map[string][]string {
+	var inFieldsMap map[string][]string
+
+	if val, exists := c.accessConfig.FieldsGet[c.role]; exists {
+		inFieldsMap = val.In
+	} else {
+		inFieldsMap = c.accessConfig.FieldsGet["default"].In
+	}
+
+	return inFieldsMap
+}
+
+func (c *ExecutorConfig) AccessRoles() []string {
+	switch c.method {
+	case http.MethodGet:
+		return c.accessConfig.Get
+	case http.MethodHead:
+		return c.accessConfig.Head
+	case http.MethodPost:
+		return c.accessConfig.Post
+	case http.MethodPut:
+		return c.accessConfig.Put
+	case http.MethodDelete:
+		return c.accessConfig.Delete
+	}
+	return []string{}
+
+}
+
+func (c *ExecutorConfig) Executor() string {
+	return c.accessConfig.Executor
+
+}

config/rowkeygen.go

@@ -8,18 +8,18 @@ import (
 
 type RowKeyGenFuncHandler func(ctx context.Context, genParam g.Map, table string, data g.Map) (g.Map, error)
 
-func (a *Config) RowKeyGen(ctx context.Context, genFuncName string, table string, data g.Map) (g.Map, error) {
-	if f, exists := a.rowKeyGenFuncMap[genFuncName]; exists {
+func (c *Config) RowKeyGen(ctx context.Context, genFuncName string, table string, data g.Map) (g.Map, error) {
+	if f, exists := c.rowKeyGenFuncMap[genFuncName]; exists {
 		return f(ctx, g.Map{}, table, data)
 	}
 
 	return nil, nil
 }
 
-func (a *Config) RowKeyGenFunc(name string, f RowKeyGenFuncHandler) {
-	a.rowKeyGenFuncMap[name] = f
+func (c *Config) RowKeyGenFunc(name string, f RowKeyGenFuncHandler) {
+	c.rowKeyGenFuncMap[name] = f
 }
 
-func (a *Config) RowKeyGenList() []string {
-	return lo.Keys(a.rowKeyGenFuncMap)
+func (c *Config) RowKeyGenList() []string {
+	return lo.Keys(c.rowKeyGenFuncMap)
 }

drivers/executor_goframe/query.go

@@ -31,25 +31,18 @@ type SqlExecutor struct {
 	// 是否最终为空结果, 用于node中中断数据获取
 	WithEmptyResult bool
 
-	noAccessVerify bool
-
-	access *config.AccessConfig
-
-	config *config.Config
+	config *config.ExecutorConfig
 }
 
-func New(ctx context.Context, noAccessVerify bool, role string, access *config.AccessConfig, config *config.Config) (executor.QueryExecutor, error) {
+func New(ctx context.Context, config *config.ExecutorConfig) (executor.QueryExecutor, error) {
 
 	return &SqlExecutor{
 		ctx:             ctx,
-		Role:            role,
 		Where:           [][]any{},
 		Columns:         nil,
 		Order:           "",
 		Group:           "",
 		WithEmptyResult: false,
-		noAccessVerify:  noAccessVerify,
-		access:          access,
 		config:          config,
 	}, nil
 }
@@ -81,15 +74,15 @@ func (e *SqlExecutor) ParseCondition(conditions model.MapStrAny, accessVerify bo
 		return nil
 	}
 
-	if e.noAccessVerify { // 可任意字段搜索
+	if e.config.NoVerify { // 可任意字段搜索
 		return nil
 	}
 
-	inFieldsMap := e.access.GetFieldsGetInByRole(e.Role)
+	inFieldsMap := e.config.GetFieldsGetInByRole()
 
 	dbStyle := e.config.DbFieldStyle
 
-	tableName := e.access.Name
+	tableName := e.config.TableName()
 
 	for _, where := range e.Where {
 		k := dbStyle(e.ctx, tableName, where[0].(string))
@@ -169,7 +162,7 @@ var exp = regexp.MustCompile(`^[\s\w][\w()]+`) // 匹配 field, COUNT(field)
 func (e *SqlExecutor) ParseCtrl(ctrl model.Map) error {
 
 	fieldStyle := e.config.DbFieldStyle
-	tableName := e.access.Name
+	tableName := e.config.TableName()
 	for k, v := range ctrl {
 		// 使用;分割字段
 		fieldStr := strings.ReplaceAll(gconv.String(v), ";", ",")
@@ -203,7 +196,7 @@ func (e *SqlExecutor) ParseCtrl(ctrl model.Map) error {
 }
 
 func (e *SqlExecutor) build() *gdb.Model {
-	tableName := e.access.Name
+	tableName := e.config.TableName()
 	m := g.DB().Model(tableName).Ctx(e.ctx)
 
 	if e.Order != "" {
@@ -272,16 +265,16 @@ func (e *SqlExecutor) build() *gdb.Model {
 
 func (e *SqlExecutor) column() []string {
 
-	outFields := e.access.GetFieldsGetOutByRole(e.Role)
+	outFields := e.config.GetFieldsGetOutByRole()
 
-	tableName := e.access.Name
+	tableName := e.config.TableName()
 
 	var columns []string
 
 	if e.Columns != nil {
 		columns = e.Columns
 	} else {
-		columns = e.config.DbMeta.GetTableColumns(tableName)
+		columns = e.config.TableColumns()
 	}
 
 	var fields = make([]string, 0, len(columns))
@@ -304,7 +297,7 @@ func (e *SqlExecutor) column() []string {
 		}
 
 		// 过滤可访问字段
-		if e.noAccessVerify || lo.Contains(outFields, dbStyle(e.ctx, tableName, fieldName)) ||
+		if e.config.NoVerify || lo.Contains(outFields, dbStyle(e.ctx, tableName, fieldName)) ||
 			len(outFields) == 0 /* 数据库中未设置, 则看成全部可访问 */ {
 			fields = append(fields, column)
 		}

drivers/framework_goframe/gf.go

@@ -6,7 +6,6 @@ import (
 	"github.com/glennliao/apijson-go"
 	"github.com/glennliao/apijson-go/action"
 	"github.com/glennliao/apijson-go/model"
-	"github.com/glennliao/apijson-go/query"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -55,18 +54,10 @@ func (gf *GF) Bind(group *ghttp.RouterGroup, mode ...Mode) {
 }
 
 func (gf *GF) Get(ctx context.Context, req model.Map) (res model.Map, err error) {
-	q := query.New(ctx, req)
+	q := gf.apijson.NewQuery(ctx, req)
 	q.NoAccessVerify = gf.apijson.Config().Access.NoVerify
-	q.Access = gf.apijson.Config().Access
 	q.AccessCondition = gf.apijson.Config().Access.ConditionFunc
-
-	q.DbMeta = gf.apijson.Config().DbMeta       // todo
-	q.Functions = gf.apijson.Config().Functions // todo
-	q.DbFieldStyle = gf.apijson.Config().DbFieldStyle
-	q.JsonFieldStyle = gf.apijson.Config().JsonFieldStyle
-
 	q.Config = gf.apijson.Config()
-
 	return q.Result()
 }