just query ok

glennliao · glennliao · commit 37b7ab218ba7 · 2023-03-06T17:21:49.000+08:00
diff --git a/apijson.go b/apijson.go
@@ -46,7 +46,7 @@ func (a *ApiJson) Use(p ...func(ctx context.Context, a *ApiJson)) *ApiJson {
 }
 
 func (a *ApiJson) Load() {
-
+	a.config.Load()
 }
 
 func (a *ApiJson) Config() *config.Config {
diff --git a/config/config.go b/config/config.go
@@ -39,3 +39,12 @@ func New() *Config {
 
 	return a
 }
+
+func (c *Config) Load() {
+
+	c.Access.accessConfigMap = make(map[string]AccessConfig)
+
+	for _, access := range c.AccessList {
+		c.Access.accessConfigMap[access.Alias] = access
+	}
+}
diff --git a/query/node.go b/query/node.go
@@ -22,6 +22,13 @@ const (
 	NodeTypeFunc          // functions 节点
 )
 
+type nodeHandler interface {
+	parse()
+	fetch()
+	result()
+	nodeType() int
+}
+
 type Node struct {
 	ctx          context.Context
 	queryContext *Query
@@ -64,6 +71,8 @@ type Node struct {
 
 	total     int64 // 数据总条数
 	needTotal bool
+
+	nodeHandler nodeHandler
 }
 
 // NodeRef 节点依赖引用
@@ -222,7 +231,7 @@ func (n *Node) parse() {
 			return
 		}
 
-		if n.queryContext.NoAccessVerify != false {
+		if n.queryContext.NoAccessVerify == false {
 			has, condition, err := hasAccess(n, tableKey)
 			if err != nil {
 				n.err = err
diff --git a/query/node_func.go b/query/node_func.go
@@ -0,0 +1 @@
+package query
diff --git a/query/node_query.go b/query/node_query.go
@@ -0,0 +1,25 @@
+package query
+
+type queryNode struct {
+	node *Node
+}
+
+func newQueryNode(n *Node) queryNode {
+	return queryNode{node: n}
+}
+
+func (q *queryNode) parse() {
+
+}
+
+func (q *queryNode) fetch() {
+
+}
+
+func (q *queryNode) result() {
+
+}
+
+func (q *queryNode) nodeType() int {
+	return NodeTypeQuery
+}
diff --git a/query/node_ref.go b/query/node_ref.go
@@ -0,0 +1 @@
+package query
diff --git a/query/node_struct.go b/query/node_struct.go
@@ -0,0 +1 @@
+package query
diff --git a/test/z_main_test.go b/test/z_main_test.go
@@ -11,6 +11,7 @@ import (
 	_ "github.com/gogf/gf/contrib/drivers/sqlite/v2" // need import for sqlite
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
+	"log"
 	"strings"
 	"testing"
 )
@@ -61,6 +62,14 @@ func init() {
 		}
 
 		a.Config().AccessList = accessList
+		a.Config().AccessList = []config.AccessConfig{
+			{
+				Name:   "user",
+				Alias:  "User",
+				Get:    []string{"UNKNOWN"},
+				RowKey: "id",
+			},
+		}
 
 		// request
 		var requestList []config.Request
@@ -113,26 +122,27 @@ func TestQuery(t *testing.T) {
 
 	ctx := gctx.New()
 	q := query.New(ctx, model.Map{
-		"user": model.Map{
+		"User": model.Map{
 			"id":      "123",
 			"id{}":    []string{"123", "456"},
 			"id>":     "222",
-			"@column": "id,userId",
+			"@column": "id",
 		},
-		"user[]": model.Map{
+		"User[]": model.Map{
+			"@column": "id",
 			//"userId": "123",
 		},
-		//"t_todo":  model.Map{},
-		//"_access": model.Map{},
 	})
 
-	q.NoAccessVerify = true //config.AccessVerify
+	q.NoAccessVerify = true
 	q.Access = a.Config().Access
+	q.Access.NoVerify = true
+	q.Config = a.Config()
 
 	result, err := q.Result()
 
 	if err != nil {
-		panic(err)
+		log.Fatalf("%+v", err)
 	}
 
 	g.Dump(result)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (a ApiJson) Use(p ...func(ctx context.Context, a ApiJson)) *ApiJson {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func (a *ApiJson) Load() {`
`49`		`-`
	`49`	`+ a.config.Load()`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (a ApiJson) Config() config.Config {`