0.2.0-beta4 (#20)

* ## 0.2.0-beta3 * ## 0.2.0-beta4
glennliao · Jun 4, 2023 · b2285c7 · b2285c7
1 parent 0b96d1c
commit b2285c7
Show file tree

Hide file tree

Showing 57 changed files with 307 additions and 218 deletions.
diff --git a/@doc/access.md b/@doc/access.md
diff --git a/@doc/action.md b/@doc/action.md
diff --git a/@doc/doc_ref.md b/@doc/doc_ref.md
diff --git a/@doc/faq.md b/@doc/faq.md
diff --git a/@doc/functions.md b/@doc/functions.md
diff --git a/@doc/query.md b/@doc/query.md
diff --git a/@doc/roadmap.md b/@doc/roadmap.md
diff --git a/@doc/v0.2.md b/@doc/v0.2.md
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/README.zh-CN.md b/README.zh-CN.md
diff --git a/action/action.go b/action/action.go
diff --git a/action/hook.go b/action/hook.go
diff --git a/action/node.go b/action/node.go
@@ -41,6 +41,17 @@ func newNode(key string, req []model.Map, structure *config.Structure, executor
 		Key: key, req: req, structure: structure, executor: executor,
 	}
 
+	n.Data = []model.Map{}
+	n.Where = []model.Map{}
+
+	// ?
+	for _ = range n.req {
+
+		n.Data = append(n.Data, model.Map{})
+		n.Where = append(n.Where, model.Map{})
+
+	}
+
 	if strings.HasSuffix(key, consts.ListKeySuffix) {
 		n.Key = key[0 : len(key)-len(consts.ListKeySuffix)]
 		n.IsList = true
@@ -51,13 +62,11 @@ func newNode(key string, req []model.Map, structure *config.Structure, executor
 
 // parse req data to data/where
 func (n *Node) parseReq(method string) {
-	n.Data = []model.Map{}
-	n.Where = []model.Map{}
 
 	for i, item := range n.req {
 
-		n.Data = append(n.Data, model.Map{})
-		n.Where = append(n.Where, model.Map{})
+		//n.Data = append(n.Data, model.Map{})
+		//n.Where = append(n.Where, model.Map{})
 
 		for key, val := range item {
 
@@ -101,8 +110,6 @@ func (n *Node) parse(ctx context.Context, method string) error {
 	n.tableName = access.Name
 	n.RowKey = access.RowKey
 
-	n.parseReq(method)
-
 	// 0. 角色替换
 
 	err = n.roleUpdate()
@@ -137,6 +144,8 @@ func (n *Node) parse(ctx context.Context, method string) error {
 	// 3. get where by accessCondition
 	err = n.whereUpdate(ctx, method, accessRoles)
 
+	n.parseReq(method)
+
 	return err
 }
 
@@ -329,11 +338,12 @@ func (n *Node) do(ctx context.Context, method string) (ret model.Map, err error)
 		return nil, err
 	}
 
+	var rowKeyVal model.Map
+	var rowKey string
+
 	switch method {
 	case http.MethodPost:
 
-		var rowKeyVal model.Map
-
 		access, err := n.action.actionConfig.GetAccessConfig(n.Key, true)
 		if err != nil {
 			return nil, err
@@ -358,30 +368,7 @@ func (n *Node) do(ctx context.Context, method string) (ret model.Map, err error)
 			}
 		}
 
-		ret, err := executor.GetActionExecutor(n.executor).Do(ctx, executor.ActionExecutorReq{
-			Method: method,
-			Table:  n.tableName,
-			Data:   n.Data,
-			Where:  nil,
-		})
-
-		if err != nil {
-			return nil, err
-		}
-
-		if len(n.Data) > 0 { //多条插入时返回值已经应该无意义了
-
-			jsonStyle := n.action.JsonFieldStyle
-			if rowKeyVal != nil {
-				for k, v := range rowKeyVal {
-					if k == consts.RowKey {
-						ret[jsonStyle(ctx, n.tableName, access.RowKey)] = v
-					} else {
-						ret[jsonStyle(ctx, n.tableName, k)] = v
-					}
-				}
-			}
-		}
+		rowKey = access.RowKey
 
 	case http.MethodPut:
 	case http.MethodDelete:
@@ -401,6 +388,20 @@ func (n *Node) do(ctx context.Context, method string) (ret model.Map, err error)
 		return nil, err
 	}
 
+	if len(n.Data) == 1 {
+
+		jsonStyle := n.action.JsonFieldStyle
+		if rowKeyVal != nil {
+			for k, v := range rowKeyVal {
+				if k == consts.RowKey {
+					ret[jsonStyle(ctx, n.tableName, rowKey)] = v
+				} else {
+					ret[jsonStyle(ctx, n.tableName, k)] = v
+				}
+			}
+		}
+	}
+
 	n.Ret = ret
 
 	err = EmitHook(ctx, AfterExecutorDo, n, method)

diff --git a/apijson.go b/apijson.go
diff --git a/config/access.go b/config/access.go
diff --git a/config/access_config.go b/config/access_config.go
diff --git a/config/action_config.go b/config/action_config.go
diff --git a/config/config.go b/config/config.go
@@ -78,7 +78,7 @@ func New() *Config {
 
 func (c *Config) ReLoad() {
 
-	c.Access.accessConfigMap = make(map[string]AccessConfig)
+	accessConfigMap := make(map[string]AccessConfig)
 
 	ctx := context.Background()
 
@@ -108,10 +108,12 @@ func (c *Config) ReLoad() {
 					access.FieldsGet[role].MaxCount = &defaultMaxCount
 				}
 			}
-			c.Access.accessConfigMap[access.Alias] = access
+			accessConfigMap[access.Alias] = access
 		}
 	}
 
+	c.Access.accessConfigMap = accessConfigMap
+
 	requestListProvider := requestListProviderMap[c.RequestListProvider]
 	if requestListProvider != nil {
 		requestList := requestListProvider(ctx)

diff --git a/config/dbmeta.go b/config/dbmeta.go
diff --git a/config/executor/action.go b/config/executor/action.go
diff --git a/config/executor/query.go b/config/executor/query.go
diff --git a/config/field.go b/config/field.go
diff --git a/config/functions.go b/config/functions.go
diff --git a/config/query_config.go b/config/query_config.go
diff --git a/config/request_config.go b/config/request_config.go
diff --git a/config/rowkeygen.go b/config/rowkeygen.go
diff --git a/config/tables/table.go b/config/tables/table.go
diff --git a/consts/access.go b/consts/access.go
diff --git a/consts/errors.go b/consts/errors.go
diff --git a/consts/node.go b/consts/node.go
diff --git a/drivers/config/goframe/config.go b/drivers/config/goframe/config.go
diff --git a/drivers/executor/goframe/driver.go b/drivers/executor/goframe/driver.go
diff --git a/drivers/goframe/all.go b/drivers/goframe/all.go
@@ -0,0 +1,21 @@
+package goframe
+
+import (
+	"github.com/glennliao/apijson-go/config"
+	"github.com/glennliao/apijson-go/config/executor"
+	gfConfig "github.com/glennliao/apijson-go/drivers/goframe/config"
+	gfExecutor "github.com/glennliao/apijson-go/drivers/goframe/executor"
+)
+
+func init() {
+
+	config.RegAccessListProvider(gfConfig.ProviderName, gfConfig.AccessListDBProvider)
+	config.RegRequestListProvider(gfConfig.ProviderName, gfConfig.RequestListProvider)
+
+	config.RegDbMetaProvider(gfConfig.ProviderName, gfConfig.DbMetaProvider)
+
+	executor.RegQueryExecutor("default", gfExecutor.New)
+	executor.RegActionExecutor("default", &gfExecutor.ActionExecutor{})
+
+	// todo 添加未配置driver时的报错信息, 而不是 invalid memory address or nil pointer dereference
+}