Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdd61ada

Browse files
committed
newQuery/newAction
1 parente93829e commitdd61ada

File tree

5 files changed

+32
-33
lines changed

5 files changed

+32
-33
lines changed

‎apijson.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package apijson
22

33
import (
44
"context"
5+
"github.com/glennliao/apijson-go/action"
56
"github.com/glennliao/apijson-go/config"
67
"github.com/glennliao/apijson-go/model"
78
"github.com/glennliao/apijson-go/query"
@@ -63,5 +64,19 @@ func (a *ApiJson) NewQuery(ctx context.Context, req model.Map) *query.Query {
6364
q.DbFieldStyle=a.config.DbFieldStyle
6465
q.JsonFieldStyle=a.config.JsonFieldStyle
6566

67+
q.NoAccessVerify=a.config.Access.NoVerify
68+
q.AccessCondition=a.config.Access.ConditionFunc
69+
6670
returnq
6771
}
72+
73+
func (a*ApiJson)NewAction(ctx context.Context,methodstring,req model.Map)*action.Action {
74+
act:=action.New(ctx,method,req,a.config.RequestConfig)
75+
76+
act.NoAccessVerify=a.config.Access.NoVerify
77+
act.DbFieldStyle=a.config.DbFieldStyle
78+
act.JsonFieldStyle=a.config.JsonFieldStyle
79+
act.Functions=a.config.Functions
80+
81+
returnact
82+
}

‎config/config.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ func (c *Config) Load() {
4848
c.Access.accessConfigMap=make(map[string]AccessConfig)
4949

5050
for_,access:=rangec.AccessList {
51+
52+
name:=access.Alias
53+
ifname=="" {
54+
name=access.Name
55+
}
56+
5157
c.Access.accessConfigMap[access.Alias]=access
5258
}
5359

‎drivers/framework_goframe/gf.go

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66
"github.com/glennliao/apijson-go"
7-
"github.com/glennliao/apijson-go/action"
87
"github.com/glennliao/apijson-go/model"
98
"github.com/gogf/gf/v2/container/gmap"
109
"github.com/gogf/gf/v2/errors/gerror"
@@ -55,9 +54,6 @@ func (gf *GF) Bind(group *ghttp.RouterGroup, mode ...Mode) {
5554

5655
func (gf*GF)Get(ctx context.Context,req model.Map) (res model.Map,errerror) {
5756
q:=gf.apijson.NewQuery(ctx,req)
58-
q.NoAccessVerify=gf.apijson.Config().Access.NoVerify
59-
q.AccessCondition=gf.apijson.Config().Access.ConditionFunc
60-
q.Config=gf.apijson.Config()
6157
returnq.Result()
6258
}
6359

@@ -66,29 +62,17 @@ func (gf *GF) Head(ctx context.Context, req model.Map) (res model.Map, err error
6662
}
6763

6864
func (gf*GF)Post(ctx context.Context,req model.Map) (res model.Map,errerror) {
69-
act:=action.New(ctx,http.MethodPost,req,gf.apijson.Config().RequestConfig)
70-
act.NoAccessVerify=gf.apijson.Config().Access.NoVerify
71-
act.DbFieldStyle=gf.apijson.Config().DbFieldStyle
72-
act.JsonFieldStyle=gf.apijson.Config().JsonFieldStyle
73-
act.Functions=gf.apijson.Config().Functions
65+
act:=gf.apijson.NewAction(ctx,http.MethodPost,req)
7466
returnact.Result()
7567
}
7668

7769
func (gf*GF)Put(ctx context.Context,req model.Map) (res model.Map,errerror) {
78-
act:=action.New(ctx,http.MethodPut,req,gf.apijson.Config().RequestConfig)
79-
act.NoAccessVerify=gf.apijson.Config().Access.NoVerify
80-
act.DbFieldStyle=gf.apijson.Config().DbFieldStyle
81-
act.JsonFieldStyle=gf.apijson.Config().JsonFieldStyle
82-
act.Functions=gf.apijson.Config().Functions
70+
act:=gf.apijson.NewAction(ctx,http.MethodPut,req)
8371
returnact.Result()
8472
}
8573

8674
func (gf*GF)Delete(ctx context.Context,req model.Map) (res model.Map,errerror) {
87-
act:=action.New(ctx,http.MethodDelete,req,gf.apijson.Config().RequestConfig)
88-
act.NoAccessVerify=gf.apijson.Config().Access.NoVerify
89-
act.DbFieldStyle=gf.apijson.Config().DbFieldStyle
90-
act.JsonFieldStyle=gf.apijson.Config().JsonFieldStyle
91-
act.Functions=gf.apijson.Config().Functions
75+
act:=gf.apijson.NewAction(ctx,http.MethodDelete,req)
9276
returnact.Result()
9377
}
9478

‎query/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type Query struct {
5050
// jsonFieldStyle 数据库返回的字段
5151
JsonFieldStyle config.FieldStyle
5252

53-
Config*config.Config
53+
//Config *config.Config
5454
}
5555

5656
funcNew(ctx context.Context,qc*config.QueryConfig,req model.Map)*Query {

‎test/z_main_test.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,27 @@ func init() {
3030
}
3131

3232
for_,access:=rangeaccessList {
33-
name:=access.Alias
34-
ifname=="" {
35-
name=access.Name
36-
}
37-
38-
iflen(access.Get)>0 {
33+
iflen(access.Get)==1 {
3934
access.Get=strings.Split(access.Get[0],",")
4035
}
41-
iflen(access.Head)>0 {
36+
iflen(access.Head)==1 {
4237
access.Head=strings.Split(access.Head[0],",")
4338
}
44-
iflen(access.Gets)>0 {
39+
iflen(access.Gets)==1 {
4540
access.Gets=strings.Split(access.Gets[0],",")
4641
}
47-
iflen(access.Heads)>0 {
42+
iflen(access.Heads)==1 {
4843
access.Heads=strings.Split(access.Heads[0],",")
4944
}
50-
iflen(access.Post)>0 {
45+
iflen(access.Post)==1 {
5146
access.Post=strings.Split(access.Post[0],",")
5247
}
53-
iflen(access.Put)>0 {
48+
iflen(access.Put)==1 {
5449
access.Put=strings.Split(access.Put[0],",")
5550
}
56-
iflen(access.Delete)>0 {
51+
iflen(access.Delete)==1 {
5752
access.Delete=strings.Split(access.Delete[0],",")
5853
}
59-
6054
accessList=append(accessList,access)
6155
}
6256

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp