## 0.2.0-alpha

Author: glennliao

action/action.go

@@ -30,7 +30,7 @@ type Action struct {
 	// 关闭 request 验证开关, 默认否
 	NoRequestVerify bool
 
-	Access *config.Access
+	//Access *config.Access
 
 	// dbFieldStyle 数据库字段命名风格 请求传递到数据库中
 	DbFieldStyle config.FieldStyle

action/node.go

@@ -30,7 +30,7 @@ type Node struct {
 
 	keyNode map[string]*Node
 
-	access *config.Access
+	//access *config.Access
 }
 
 func newNode(key string, req []model.Map, structure *config.Structure, executor string) Node {
@@ -80,7 +80,7 @@ func (n *Node) parse(ctx context.Context, method string) error {
 	if strings.HasSuffix(key, consts.ListKeySuffix) {
 		key = key[0 : len(key)-2]
 	}
-	access, err := n.access.GetAccess(key, true)
+	access, err := n.action.actionConfig.GetAccessConfig(key, true)
 
 	if err != nil {
 		return err
@@ -145,7 +145,7 @@ func (n *Node) checkAccess(ctx context.Context, method string, accessRoles []str
 
 	// todo 可配置单次的内容, 而非直接使用整个的
 
-	role, err := n.action.Access.DefaultRoleFunc(ctx, config.RoleReq{
+	role, err := n.action.actionConfig.DefaultRoleFunc()(ctx, config.RoleReq{
 		AccessName: n.TableName,
 		Method:     method,
 		NodeRole:   n.Role,
@@ -177,7 +177,7 @@ func (n *Node) checkAccess(ctx context.Context, method string, accessRoles []str
 			NodeReq:             item,
 		}
 
-		err := n.action.Access.ConditionFunc(ctx, conditionReq, condition)
+		err := n.action.actionConfig.ConditionFunc(ctx, conditionReq, condition)
 
 		if err != nil {
 			return err
@@ -306,7 +306,7 @@ func (n *Node) do(ctx context.Context, method string, dataIndex int) (ret model.
 
 		var rowKeyVal model.Map
 
-		access, err := n.access.GetAccess(n.Key, true)
+		access, err := n.action.actionConfig.GetAccessConfig(n.Key, true)
 		if err != nil {
 			return nil, err
 		}

config/action_config.go

@@ -6,7 +6,7 @@ import (
 )
 
 type ActionConfig struct {
-	requestConfig    RequestConfig
+	requestConfig    *RequestConfig
 	access           *Access
 	functions        *Functions
 	rowKeyGenFuncMap map[string]RowKeyGenFuncHandler
@@ -33,6 +33,10 @@ func (c *ActionConfig) GetRequest(tag string, method string, version string) (*R
 	return c.requestConfig.GetRequest(tag, method, version)
 }
 
+func (c *ActionConfig) ConditionFunc(ctx context.Context, req ConditionReq, condition *ConditionRet) error {
+	return c.access.ConditionFunc(ctx, req, condition)
+}
+
 func (c *ActionConfig) RowKeyGen(ctx context.Context, genFuncName string, accessName string, data model.Map) (model.Map, error) {
 	if f, exists := c.rowKeyGenFuncMap[genFuncName]; exists {
 		req := &RowKeyGenReq{

config/config.go

@@ -114,6 +114,14 @@ func (c *Config) ReLoad() {
 		maxTreeWidth:    c.MaxTreeWidth,
 		defaultRoleFunc: c.Access.DefaultRoleFunc,
 	}
+
+	c.actionConfig = &ActionConfig{
+		requestConfig:    c.requestConfig,
+		access:           c.Access,
+		functions:        c.Functions,
+		rowKeyGenFuncMap: c.rowKeyGenFuncMap,
+		defaultRoleFunc:  c.Access.DefaultRoleFunc,
+	}
 }
 
 func (c *Config) QueryConfig() *QueryConfig {

config/request_config.go

@@ -10,14 +10,13 @@ import (
 )
 
 type Request struct {
-	Debug       int8
-	Version     string
-	Method      string
-	Tag         string
-	StructureDb map[string]any        `orm:"structure"`
-	Structure   map[string]*Structure `orm:"-"`
-	Detail      string
-	CreatedAt   *gtime.Time
+	Debug     int8
+	Version   string
+	Method    string
+	Tag       string
+	Structure map[string]*Structure
+	Detail    string
+	CreatedAt *gtime.Time
 	// 节点执行顺序
 	ExecQueue []string
 	Executor  map[string]string
@@ -51,35 +50,40 @@ func NewRequestConfig(requestList []Request) *RequestConfig {
 		item := _item
 		tag, _ := getTag(item.Tag)
 
-		if strings.ToLower(tag) != tag {
-			// 本身大写, 如果没有外层, 则套一层
-			if _, ok := item.StructureDb[tag]; !ok {
-				item.StructureDb = map[string]any{
-					tag: item.StructureDb,
-				}
-			}
+		if item.Structure == nil {
+			item.Structure = make(map[string]*Structure)
 		}
 
-		item.Structure = make(map[string]*Structure)
-		//for k, v := range item.StructureDb {
-		//	structure := Structure{}
-		//	err := gconv.Scan(v, &structure)
-		//	if err != nil {
-		//		panic(err)
-		//	}
-		//
-		//	if structure.Must != nil {
-		//		structure.Must = strings.Split(structure.Must[0], ",")
-		//	}
-		//	if structure.Refuse != nil {
-		//		structure.Refuse = strings.Split(structure.Refuse[0], ",")
+		// provider处理
+		//if strings.ToLower(tag) != tag {
+		//	// 本身大写, 如果没有外层, 则套一层
+		//	if _, ok := item.Structure[tag]; !ok {
+		//		item.Structure = map[string]any{
+		//			tag: item.Structure,
+		//		}
 		//	}
-		//
-		//	item.Structure[k] = &structure
 		//}
 
+		for k, v := range item.Structure {
+			structure := Structure{}
+			err := gconv.Scan(v, &structure)
+			if err != nil {
+				panic(err)
+			}
+
+			if structure.Must != nil {
+				structure.Must = strings.Split(structure.Must[0], ",")
+			}
+			if structure.Refuse != nil {
+				structure.Refuse = strings.Split(structure.Refuse[0], ",")
+			}
+
+			item.Structure[k] = &structure
+		}
+
 		if len(item.ExecQueue) > 0 {
-			item.ExecQueue = strings.Split(item.ExecQueue[0], ",")
+			// todo db provider处理
+			//item.ExecQueue = strings.Split(item.ExecQueue[0], ",")
 		} else {
 			item.ExecQueue = []string{tag}
 		}

drivers/framework_goframe/gf.go

@@ -102,6 +102,10 @@ func (gf *GF) commonResponse(handler func(ctx context.Context, req model.Map) (r
 				}
 			}
 
+			if err != nil {
+				panic(err)
+			}
+
 		})
 
 		if err != nil {

query/node_struct.go

@@ -123,6 +123,10 @@ func (h *structNode) result() {
 		}
 
 		n.ret = retList
+
+		if len(n.ret.([]model.Map)) == 0 {
+			n.ret = []model.Map{}
+		}
 	} else {
 
 		retMap := model.Map{}