save for 调整 非全局方式使用

glennliao · glennliao · commit 40e32f1959b6 · 2023-03-03T16:40:10.000+08:00
diff --git a/action/action.go b/action/action.go
@@ -123,7 +123,6 @@ func (a *Action) Result() (model.Map, error) {
 
 	err = g.DB().Transaction(a.ctx, func(ctx context.Context, tx gdb.TX) error {
 		for _, k := range a.tagRequest.ExecQueue {
-
 			node := a.children[k]
 			ret[k], err = node.execute(ctx, a.method)
 			if err != nil {
diff --git a/action/node.go b/action/node.go
@@ -10,7 +10,6 @@ import (
 	"github.com/glennliao/apijson-go/model"
 	"github.com/glennliao/apijson-go/util"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/samber/lo"
 	"net/http"
 	"strings"
@@ -51,7 +50,7 @@ func (n *Node) parseReq(method string) {
 
 		for key, val := range item {
 			if key == consts.Role {
-				n.Role = gconv.String(val)
+				n.Role = util.String(val)
 			} else {
 				key = config.GetDbFieldStyle()(n.ctx, n.TableName, key)
 
@@ -61,8 +60,10 @@ func (n *Node) parseReq(method string) {
 					if key == n.RowKey || key == n.RowKey+"{}" {
 						if method == http.MethodPut {
 							n.Where[i][key] = val
+						} else {
+							n.Data[i][key] = val
 						}
-						// Post 暂原则上不让传递这个rowKey值
+						// Post 暂原则上不让传递这个rowKey值  // todo  可传递
 					} else {
 						n.Data[i][key] = val
 					}
@@ -129,12 +130,12 @@ func (n *Node) roleUpdate() error {
 
 	if val, exists := n.structure.Insert[consts.Role]; exists {
 		if n.Role == "" {
-			n.Role = gconv.String(val)
+			n.Role = util.String(val)
 		}
 	}
 
 	if val, exists := n.structure.Update[consts.Role]; exists {
-		n.Role = gconv.String(val)
+		n.Role = util.String(val)
 	}
 
 	return nil
diff --git a/framework/handler/handler.go b/framework/handler/handler.go
@@ -46,19 +46,47 @@ func Delete(ctx context.Context, req model.Map) (res model.Map, err error) {
 	return act.Result()
 }
 
-func Bind(group *ghttp.RouterGroup) {
-	group.POST("/get", CommonResponse(Get))
-	group.POST("/post", CommonResponse(Post))
-	group.POST("/head", CommonResponse(Head))
-	group.POST("/put", CommonResponse(Put))
-	group.POST("/delete", CommonResponse(Delete))
+type Mode = func(data gmap.ListMap, meta gmap.ListMap) gmap.ListMap
+
+func SpreadMode(data gmap.ListMap, meta gmap.ListMap) gmap.ListMap {
+
+	res := gmap.ListMap{}
+	for _, k := range data.Keys() {
+		res.Set(k, data.Get(k))
+	}
+	for _, k := range meta.Keys() {
+		res.Set(k, meta.Get(k))
+	}
+
+	return res
+}
+
+func InDataMode(data gmap.ListMap, meta gmap.ListMap) gmap.ListMap {
+	res := gmap.ListMap{}
+	res.Set("data", data)
+	for _, k := range meta.Keys() {
+		res.Set(k, meta.Get(k))
+	}
+	return res
+}
+
+func Bind(group *ghttp.RouterGroup, mode ...Mode) {
+	if len(mode) == 0 {
+		mode = []Mode{InDataMode}
+	}
+	group.POST("/get", CommonResponse(Get, mode[0]))
+	group.POST("/post", CommonResponse(Post, mode[0]))
+	group.POST("/head", CommonResponse(Head, mode[0]))
+	group.POST("/put", CommonResponse(Put, mode[0]))
+	group.POST("/delete", CommonResponse(Delete, mode[0]))
 }
 
-func CommonResponse(handler func(ctx context.Context, req model.Map) (res model.Map, err error)) func(req *ghttp.Request) {
+func CommonResponse(handler func(ctx context.Context, req model.Map) (res model.Map, err error), mode Mode) func(req *ghttp.Request) {
 	return func(req *ghttp.Request) {
-		res := gmap.ListMap{}
+		metaRes := gmap.ListMap{}
 		code := 200
 		msg := "success"
+		nodeRes := gmap.ListMap{}
 
 		err := g.Try(req.Context(), func(ctx context.Context) {
 
@@ -72,10 +100,10 @@ func CommonResponse(handler func(ctx context.Context, req model.Map) (res model.
 			}
 
 			if config.Debug {
-				sortMap(ctx, req.GetBody(), &res, ret)
+				sortMap(ctx, req.GetBody(), &metaRes, ret)
 			} else {
 				for k, v := range ret {
-					res.Set(k, v)
+					nodeRes.Set(k, v)
 				}
 			}
 
@@ -91,10 +119,12 @@ func CommonResponse(handler func(ctx context.Context, req model.Map) (res model.
 			}
 		}
 
-		res.Set("ok", code == 200)
-		res.Set("code", code)
-		res.Set("msg", msg)
-		res.Set("span", fmt.Sprintf("%s", time.Since(time.UnixMilli(req.EnterTime))))
+		metaRes.Set("ok", code == 200)
+		metaRes.Set("code", code)
+		metaRes.Set("msg", msg)
+		metaRes.Set("span", fmt.Sprintf("%s", time.Since(time.UnixMilli(req.EnterTime))))
+
+		res := mode(nodeRes, metaRes)
 		req.Response.WriteJson(res.String())
 	}
 }
diff --git a/util/conv.go b/util/conv.go
@@ -0,0 +1,7 @@
+package util
+
+import "github.com/gogf/gf/v2/util/gconv"
+
+func String(val any) string {
+	return gconv.String(val)
+}
