From 5892b96dc0021a11053b4ed7c214c60bf60d725d Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Mon, 30 Aug 2021 14:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90ctx?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/vm/go/controller.template | 10 +++++-----
 template/vm/go/service.template    | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/template/vm/go/controller.template b/template/vm/go/controller.template
index 6592d29..dfbdbdb 100644
--- a/template/vm/go/controller.template
+++ b/template/vm/go/controller.template
@@ -102,7 +102,7 @@ func (c *{{$structName}}) Add(r *ghttp.Request) {
     req.{{$column.GoField}} = up{{$column.GoField}}.MustToJsonString()
     {{end}}
     {{end}}
-    err := service.{{.table.ClassName}}.Add(req,r.GetCtx())
+    err := service.{{.table.ClassName}}.Add(r.GetCtx(),req)
     if err != nil {
         c.FailJsonExit(r, err.Error())
     }
@@ -113,7 +113,7 @@ func (c *{{$structName}}) Add(r *ghttp.Request) {
 // Get 获取
 func (c *{{$structName}}) Get(r *ghttp.Request) {
 	id := r.GetInt64("id")
-	info, err := service.{{.table.ClassName}}.GetInfoById(id,r.GetCtx())
+	info, err := service.{{.table.ClassName}}.GetInfoById(r.GetCtx(),id)
 	if err != nil {
 		c.FailJsonExit(r, err.Error())
 	}
@@ -151,7 +151,7 @@ func (c *{{$structName}}) Edit(r *ghttp.Request) {
     req.{{$column.GoField}} = up{{$column.GoField}}.MustToJsonString()
     {{end}}
     {{end}}
-    err := service.{{.table.ClassName}}.Edit(req,r.GetCtx())
+    err := service.{{.table.ClassName}}.Edit(r.GetCtx(),req)
     if err != nil {
         c.FailJsonExit(r, err.Error())
     }
@@ -162,7 +162,7 @@ func (c *{{$structName}}) Edit(r *ghttp.Request) {
 // Delete 删除
 func (c *{{$structName}}) Delete(r *ghttp.Request) {
 	ids := r.GetInts("ids")
-	err := service.{{.table.ClassName}}.DeleteByIds(ids,r.GetCtx())
+	err := service.{{.table.ClassName}}.DeleteByIds(r.GetCtx(),ids)
 	if err != nil {
 		c.FailJsonExit(r, err.Error())
 	}
@@ -178,7 +178,7 @@ func (c *{{$structName}})Change{{$column.GoField}}(r *ghttp.Request){
 	   if err := r.Parse(&req); err != nil {
 	       c.FailJsonExit(r, err.(gvalid.Error).FirstString())
 	   }
-	   if err := service.{{$.table.ClassName}}.Change{{$column.GoField}}(req,r.GetCtx()); err != nil {
+	   if err := service.{{$.table.ClassName}}.Change{{$column.GoField}}(r.GetCtx(),req); err != nil {
 	       c.FailJsonExit(r, err.Error())
 	   } else {
 	       c.SusJsonExit(r, "状态设置成功")
diff --git a/template/vm/go/service.template b/template/vm/go/service.template
index 6c1ad60..28e97c9 100644
--- a/template/vm/go/service.template
+++ b/template/vm/go/service.template
@@ -114,7 +114,7 @@ func (s *{{$structName}}) GetList(req *dao.{{.table.ClassName}}SearchReq) (total
 
 
 // GetInfoById 通过id获取
-func (s *{{$structName}}) GetInfoById(id int64,ctx context.Context) (info *model.{{.table.ClassName}}, err error) {
+func (s *{{$structName}}) GetInfoById(ctx context.Context,id int64) (info *model.{{.table.ClassName}}, err error) {
 	if id == 0 {
 		err = gerror.New("参数错误")
 		return
@@ -130,13 +130,13 @@ func (s *{{$structName}}) GetInfoById(id int64,ctx context.Context) (info *model
 }
 
 // Add 添加
-func (s *{{$structName}}) Add(req *dao.{{.table.ClassName}}AddReq,ctx context.Context) (err error) {
+func (s *{{$structName}}) Add(ctx context.Context,req *dao.{{.table.ClassName}}AddReq) (err error) {
 	_, err = dao.{{.table.ClassName}}.Ctx(ctx).Insert(req)
 	return
 }
 
 // Edit 修改
-func (s *{{$structName}}) Edit(req *dao.{{.table.ClassName}}EditReq,ctx context.Context) error {
+func (s *{{$structName}}) Edit(ctx context.Context,req *dao.{{.table.ClassName}}EditReq) error {
     {{ $fieldsEx:= concat "dao." $.table.ClassName ".Columns." $pkGoField }}
     {{if ne $createdAt ""}}
         {{$fieldsEx = concat "dao." $.table.ClassName ".Columns." $pkGoField  "," "dao." $.table.ClassName ".Columns." $createdAtGoField}}
@@ -148,13 +148,13 @@ func (s *{{$structName}}) Edit(req *dao.{{.table.ClassName}}EditReq,ctx context.
 
 
 // DeleteByIds 删除
-func (s *{{$structName}}) DeleteByIds(ids []int,ctx context.Context) (err error) {
+func (s *{{$structName}}) DeleteByIds(ctx context.Context,ids []int) (err error) {
 	if len(ids) == 0 {
 		err = gerror.New("参数错误")
 		return
 	}
 	{{if eq .table.TplCategory "tree"}}
-    ids, err = s.GetChildrenIds(ids,ctx)
+    ids, err = s.GetChildrenIds(ctx,ids)
     if err != nil {
         return
     }
@@ -171,7 +171,7 @@ func (s *{{$structName}}) DeleteByIds(ids []int,ctx context.Context) (err error)
 {{range $index,$column:= .table.Columns}}
 {{if and (HasSuffix $column.ColumnName "status") (eq $column.IsList "1") }}
 // Change{{$column.GoField}} 修改状态
-func (s *{{$structName}}) Change{{$column.GoField}}(req *dao.{{$.table.ClassName}}{{$column.GoField}}Req,ctx context.Context) error {
+func (s *{{$structName}}) Change{{$column.GoField}}(ctx context.Context,req *dao.{{$.table.ClassName}}{{$column.GoField}}Req) error {
 	_, err := dao.{{$.table.ClassName}}.Ctx(ctx).WherePri(req.{{$pkGoField}}).Update(g.Map{
 		dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}: req.{{$column.GoField}},
 	})
@@ -182,7 +182,7 @@ func (s *{{$structName}}) Change{{$column.GoField}}(req *dao.{{$.table.ClassName
 
 {{if eq .table.TplCategory "tree"}}
 // GetChildrenIds 通过ID获取子级ID
-func (s *{{$structName}})GetChildrenIds(ids []int,ctx context.Context) ([]int, error) {
+func (s *{{$structName}})GetChildrenIds(ctx context.Context,ids []int) ([]int, error) {
 	//获取所有
 	_,_,all, err := s.GetList(&dao.{{.table.ClassName}}SearchReq{PageReq:comModel.PageReq{Ctx: ctx}})
 	if err != nil {