newQuery/newAction

Author: glennliao

apijson.go

@@ -2,6 +2,7 @@ package apijson
 
 import (
 	"context"
+	"github.com/glennliao/apijson-go/action"
 	"github.com/glennliao/apijson-go/config"
 	"github.com/glennliao/apijson-go/model"
 	"github.com/glennliao/apijson-go/query"
@@ -63,5 +64,19 @@ func (a *ApiJson) NewQuery(ctx context.Context, req model.Map) *query.Query {
 	q.DbFieldStyle = a.config.DbFieldStyle
 	q.JsonFieldStyle = a.config.JsonFieldStyle
 
+	q.NoAccessVerify = a.config.Access.NoVerify
+	q.AccessCondition = a.config.Access.ConditionFunc
+
 	return q
 }
+
+func (a *ApiJson) NewAction(ctx context.Context, method string, req model.Map) *action.Action {
+	act := action.New(ctx, method, req, a.config.RequestConfig)
+
+	act.NoAccessVerify = a.config.Access.NoVerify
+	act.DbFieldStyle = a.config.DbFieldStyle
+	act.JsonFieldStyle = a.config.JsonFieldStyle
+	act.Functions = a.config.Functions
+
+	return act
+}

config/config.go

@@ -48,6 +48,12 @@ func (c *Config) Load() {
 	c.Access.accessConfigMap = make(map[string]AccessConfig)
 
 	for _, access := range c.AccessList {
+
+		name := access.Alias
+		if name == "" {
+			name = access.Name
+		}
+
 		c.Access.accessConfigMap[access.Alias] = access
 	}
 

drivers/framework_goframe/gf.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"github.com/glennliao/apijson-go"
-	"github.com/glennliao/apijson-go/action"
 	"github.com/glennliao/apijson-go/model"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -55,9 +54,6 @@ 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 := gf.apijson.NewQuery(ctx, req)
-	q.NoAccessVerify = gf.apijson.Config().Access.NoVerify
-	q.AccessCondition = gf.apijson.Config().Access.ConditionFunc
-	q.Config = gf.apijson.Config()
 	return q.Result()
 }
 
@@ -66,29 +62,17 @@ func (gf *GF) Head(ctx context.Context, req model.Map) (res model.Map, err error
 }
 
 func (gf *GF) Post(ctx context.Context, req model.Map) (res model.Map, err error) {
-	act := action.New(ctx, http.MethodPost, req, gf.apijson.Config().RequestConfig)
-	act.NoAccessVerify = gf.apijson.Config().Access.NoVerify
-	act.DbFieldStyle = gf.apijson.Config().DbFieldStyle
-	act.JsonFieldStyle = gf.apijson.Config().JsonFieldStyle
-	act.Functions = gf.apijson.Config().Functions
+	act := gf.apijson.NewAction(ctx, http.MethodPost, req)
 	return act.Result()
 }
 
 func (gf *GF) Put(ctx context.Context, req model.Map) (res model.Map, err error) {
-	act := action.New(ctx, http.MethodPut, req, gf.apijson.Config().RequestConfig)
-	act.NoAccessVerify = gf.apijson.Config().Access.NoVerify
-	act.DbFieldStyle = gf.apijson.Config().DbFieldStyle
-	act.JsonFieldStyle = gf.apijson.Config().JsonFieldStyle
-	act.Functions = gf.apijson.Config().Functions
+	act := gf.apijson.NewAction(ctx, http.MethodPut, req)
 	return act.Result()
 }
 
 func (gf *GF) Delete(ctx context.Context, req model.Map) (res model.Map, err error) {
-	act := action.New(ctx, http.MethodDelete, req, gf.apijson.Config().RequestConfig)
-	act.NoAccessVerify = gf.apijson.Config().Access.NoVerify
-	act.DbFieldStyle = gf.apijson.Config().DbFieldStyle
-	act.JsonFieldStyle = gf.apijson.Config().JsonFieldStyle
-	act.Functions = gf.apijson.Config().Functions
+	act := gf.apijson.NewAction(ctx, http.MethodDelete, req)
 	return act.Result()
 }
 

query/query.go

@@ -50,7 +50,7 @@ type Query struct {
 	// jsonFieldStyle 数据库返回的字段
 	JsonFieldStyle config.FieldStyle
 
-	Config *config.Config
+	//Config *config.Config
 }
 
 func New(ctx context.Context, qc *config.QueryConfig, req model.Map) *Query {

test/z_main_test.go

@@ -30,33 +30,27 @@ func init() {
 		}
 
 		for _, access := range accessList {
-			name := access.Alias
-			if name == "" {
-				name = access.Name
-			}
-
-			if len(access.Get) > 0 {
+			if len(access.Get) == 1 {
 				access.Get = strings.Split(access.Get[0], ",")
 			}
-			if len(access.Head) > 0 {
+			if len(access.Head) == 1 {
 				access.Head = strings.Split(access.Head[0], ",")
 			}
-			if len(access.Gets) > 0 {
+			if len(access.Gets) == 1 {
 				access.Gets = strings.Split(access.Gets[0], ",")
 			}
-			if len(access.Heads) > 0 {
+			if len(access.Heads) == 1 {
 				access.Heads = strings.Split(access.Heads[0], ",")
 			}
-			if len(access.Post) > 0 {
+			if len(access.Post) == 1 {
 				access.Post = strings.Split(access.Post[0], ",")
 			}
-			if len(access.Put) > 0 {
+			if len(access.Put) == 1 {
 				access.Put = strings.Split(access.Put[0], ",")
 			}
-			if len(access.Delete) > 0 {
+			if len(access.Delete) == 1 {
 				access.Delete = strings.Split(access.Delete[0], ",")
 			}
-
 			accessList = append(accessList, access)
 		}