From a6cccb61898d86a8df204a8cc3a5f7aeb78a51cf Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Wed, 1 Sep 2021 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pload_local_apapter.go => upload_local.go} |  0
 ...t_cos_adapter.go => upload_tencent_cos.go} |  0
 template/vm/go/service.template               | 20 +++++++++----------
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename app/common/adapter/{upload_local_apapter.go => upload_local.go} (100%)
 rename app/common/adapter/{upload_tencent_cos_adapter.go => upload_tencent_cos.go} (100%)

diff --git a/app/common/adapter/upload_local_apapter.go b/app/common/adapter/upload_local.go
similarity index 100%
rename from app/common/adapter/upload_local_apapter.go
rename to app/common/adapter/upload_local.go
diff --git a/app/common/adapter/upload_tencent_cos_adapter.go b/app/common/adapter/upload_tencent_cos.go
similarity index 100%
rename from app/common/adapter/upload_tencent_cos_adapter.go
rename to app/common/adapter/upload_tencent_cos.go
diff --git a/template/vm/go/service.template b/template/vm/go/service.template
index 28e97c9..03fdca7 100644
--- a/template/vm/go/service.template
+++ b/template/vm/go/service.template
@@ -49,37 +49,37 @@ var {{.table.ClassName}} = new({{$structName}})
 
 // GetList 获取任务列表
 func (s *{{$structName}}) GetList(req *dao.{{.table.ClassName}}SearchReq) (total, page int, list []*model.{{.table.ClassName}}, err error) {
-	model := dao.{{.table.ClassName}}.Ctx(req.Ctx)
+	m := dao.{{.table.ClassName}}.Ctx(req.Ctx)
 	if req != nil {
 	{{range $index, $column := .table.Columns}} {{if eq $column.IsQuery "1"}}
         {{if eq $column.QueryType "LIKE"}}
             if req.{{$column.GoField}} != "" {
-                model = model.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" like ?", "%"+req.{{$column.GoField}}+"%")
+                m = m.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" like ?", "%"+req.{{$column.GoField}}+"%")
             } {{end}}
         {{if eq $column.QueryType "EQ"}} {{if eq $column.GoType "string"}}
             if req.{{$column.GoField}} != "" {
-                model = model.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" = ?", req.{{$column.GoField}})
+                m = m.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" = ?", req.{{$column.GoField}})
             }
         {{else if and (eq $column.GoType "Time") (eq $column.ColumnName "created_at")}}
             if req.BeginTime != "" {
-                model = model.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" >=", req.BeginTime)
+                m = m.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" >=", req.BeginTime)
             }
             if req.EndTime != "" {
-                model = model.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" <", req.EndTime)
+                m = m.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" <", req.EndTime)
             }
         {{else if or (eq $column.GoType "int") (eq $column.GoType "int64") (eq $column.GoType "uint") (eq $column.GoType "uint64") }}
             if req.{{$column.GoField}} != "" {
-                model = model.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" = ?", req.{{$column.GoField}})
+                m = m.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" = ?", req.{{$column.GoField}})
             }
         {{end}} {{end}}
         {{if and (eq $column.QueryType "BETWEEN") (eq $column.ColumnType "datetime") }}
             if req.{{$column.GoField}} != nil {
-                model = model.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" >= ? AND "+dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" < ?", req.{{$column.GoField}}, req.{{$column.GoField}}.Add(gtime.D))
+                m = m.Where(dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" >= ? AND "+dao.{{$.table.ClassName}}.Columns.{{$column.GoField}}+" < ?", req.{{$column.GoField}}, req.{{$column.GoField}}.Add(gtime.D))
             }
         {{end}}
     {{end}}{{end}}
 	}
-	total, err = model.Count()
+	total, err = m.Count()
 	if err != nil {
 		g.Log().Error(err)
 		err = gerror.New("获取总行数失败")
@@ -97,13 +97,13 @@ func (s *{{$structName}}) GetList(req *dao.{{.table.ClassName}}SearchReq) (total
     if req.OrderBy!=""{
         order = req.OrderBy
     }
-    err = model.Page(page, req.PageSize).Order(order).Scan(&list)
+    err = m.Page(page, req.PageSize).Order(order).Scan(&list)
     {{else}}
 	order:= "{{$pk}} asc"
 	if req.OrderBy!=""{
 		order = req.OrderBy
 	}
-	err = model.Order(order).Scan(&list)
+	err = m.Order(order).Scan(&list)
     {{end}}
 	if err != nil {
 		g.Log().Error(err)