refactor🎨: 代码生成模版升级

template/v4/dto.go.template

@@ -1,13 +1,23 @@
 package dto
 
 import (
-    "errors"
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
 	"go-admin/app/{{.PackageName}}/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
+
+	 {{- $bb := false -}}
+	  {{- range .Columns -}}
+     {{$z := .IsQuery}}
+     {{- if ($z) }}
+     {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}}
+     {{- end -}}
+     {{- end -}}
+     {{- range .Columns -}}
+     {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}}
+     {{- end -}}
+     {{- if eq $bb true -}}
+     "time"
+     {{- end }}
 )
 
 type {{.ClassName}}Search struct {
@@ -26,7 +36,7 @@ type {{.ClassName}}Order struct {
     {{- $tablename := .TBName -}}
     {{- range .Columns -}}
     {{.GoField}} {{.GoType}} `form:"{{.JsonField}}Order"  search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"`
-    {{- end }}
+    {{ end }}
 }
 
 func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
@@ -47,9 +57,10 @@ type {{.ClassName}}Control struct {
     {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
     {{- end -}}
     {{- end }}
+    common.ControlBy
 }
 
-func (s *{{.ClassName}}Control) Generate(model *models.SysConfig)  {
+func (s *{{.ClassName}}Control) Generate(model *models.{{.ClassName}})  {
 	 {{- range .Columns -}}
     {{$x := .Pk}}
     {{- if ($x) }}
@@ -74,6 +85,7 @@ func (s *{{.ClassName}}Control) GetId() interface{} {
 type {{.ClassName}}ById struct {
 	Id  int   `uri:"id"`
     Ids []int `json:"ids"`
+    common.ControlBy
 }
 
 func (s *{{.ClassName}}ById) GetId() interface{} {

template/v4/js.go.template

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询{{.ClassName}}列表
 export function list{{.ClassName}}(query) {
     return request({
-        url: '/api/v1/{{.ModuleName}}',
+        url: '/api/v1/{{.MLTBName}}',
         method: 'get',
         params: query
     })
@@ -12,7 +12,7 @@ export function list{{.ClassName}}(query) {
 // 查询{{.ClassName}}详细
 export function get{{.ClassName}} ({{.PkJsonField}}) {
     return request({
-        url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}},
+        url: '/api/v1/{{.MLTBName}}/' + {{.PkJsonField}},
         method: 'get'
     })
 }
@@ -21,7 +21,7 @@ export function get{{.ClassName}} ({{.PkJsonField}}) {
 // 新增{{.ClassName}}
 export function add{{.ClassName}}(data) {
     return request({
-        url: '/api/v1/{{.ModuleName}}',
+        url: '/api/v1/{{.MLTBName}}',
         method: 'post',
         data: data
     })
@@ -30,7 +30,7 @@ export function add{{.ClassName}}(data) {
 // 修改{{.ClassName}}
 export function update{{.ClassName}}(data) {
     return request({
-        url: '/api/v1/{{.ModuleName}}/'+data.{{.PkJsonField}},
+        url: '/api/v1/{{.MLTBName}}/'+data.{{.PkJsonField}},
         method: 'put',
         data: data
     })
@@ -39,7 +39,7 @@ export function update{{.ClassName}}(data) {
 // 删除{{.ClassName}}
 export function del{{.ClassName}}(data) {
     return request({
-        url: '/api/v1/{{.ModuleName}}',
+        url: '/api/v1/{{.MLTBName}}',
         method: 'delete',
         data: data
     })

template/v4/no_actions/apis.go.template

@@ -1,9 +1,9 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
+    "fmt"
-	"net/http"
 
+	"github.com/gin-gonic/gin/binding"
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
@@ -12,6 +12,7 @@ import (
 	"go-admin/app/{{.PackageName}}/models"
 	"go-admin/app/{{.PackageName}}/service"
 	"go-admin/app/{{.PackageName}}/service/dto"
+	"go-admin/common/actions"
 )
 
 type {{.ClassName}} struct {
@@ -54,7 +55,7 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) {
 
 	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("获取{{.TableComment}} %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
+		e.Error(500, err, fmt.Sprintf("获取{{.TableComment}} 失败，\r\n失败信息 %s", err.Error()))
         return
 	}
 
@@ -69,7 +70,7 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) {
 // @Success 200 {object} response.Response{data=models.{{.ClassName}}} "{"code": 200, "data": [...]}"
 // @Router /api/v1/{{.ModuleName}}/{id} [get]
 // @Security Bearer
-func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
+func (e {{.ClassName}}) Get(c *gin.Context) {
 	req := dto.{{.ClassName}}ById{}
 	s := service.{{.ClassName}}{}
     err := e.MakeContext(c).
@@ -87,7 +88,7 @@ func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
 	p := actions.GetPermissionFromContext(c)
 	err = s.Get(&req, p, &object)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("获取{{.TableComment}} %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
+		e.Error(500, err, fmt.Sprintf("获取{{.TableComment}}失败，\r\n失败信息 %s", err.Error()))
         return
 	}
 
@@ -122,7 +123,7 @@ func (e {{.ClassName}}) Insert(c *gin.Context) {
 
 	err = s.Insert(&req)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("创建{{.TableComment}} %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
+		e.Error(500, err, fmt.Sprintf("创建{{.TableComment}}  失败，\r\n失败信息 %s", err.Error()))
         return
 	}
 
@@ -140,7 +141,7 @@ func (e {{.ClassName}}) Insert(c *gin.Context) {
 // @Router /api/v1/{{.ModuleName}}/{id} [put]
 // @Security Bearer
 func (e {{.ClassName}}) Update(c *gin.Context) {
-    req := dto.{{.ClassName}}Control){}
+    req := dto.{{.ClassName}}Control{}
     s := service.{{.ClassName}}{}
     err := e.MakeContext(c).
         MakeOrm().
@@ -157,10 +158,10 @@ func (e {{.ClassName}}) Update(c *gin.Context) {
 
 	err = s.Update(&req, p)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("修改{{.TableComment}} %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
+		e.Error(500, err, fmt.Sprintf("修改{{.TableComment}} 失败，\r\n失败信息 %s", err.Error()))
         return
 	}
-	e.OK( object.GetId(), "修改成功")
+	e.OK( req.GetId(), "修改成功")
 }
 
 // Delete 删除{{.TableComment}}
@@ -190,8 +191,8 @@ func (e {{.ClassName}}) Delete(c *gin.Context) {
 
 	err = s.Remove(&req, p)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("删除{{.TableComment}} %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
+		e.Error(500, err, fmt.Sprintf("删除{{.TableComment}}失败，\r\n失败信息 %s", err.Error()))
         return
 	}
-	e.OK( control.GetId(), "删除成功")
+	e.OK( req.GetId(), "删除成功")
 }

template/v4/no_actions/router_check_role.go.template

@@ -15,12 +15,12 @@ func init() {
 // register{{.ClassName}}Router
 func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := apis.{{.ClassName}}{}
-	r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/{{.MLTBName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.Get{{.ClassName}}List)
+		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get{{.ClassName}})
+		r.GET("/:id", api.Get)
-		r.POST("", api.Insert{{.ClassName}})
+		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update{{.ClassName}})
+		r.PUT("/:id", api.Update)
-		r.DELETE("", api.Delete{{.ClassName}})
+		r.DELETE("", api.Delete)
 	}
 }

template/v4/no_actions/router_no_check_role.go.template

@@ -14,12 +14,12 @@ func init() {
 // register{{.ClassName}}Router
 func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := apis.{{.ClassName}}{}
-	r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc())
+	r := v1.Group("/{{.MLTBName}}").Use(authMiddleware.MiddlewareFunc())
 	{
-		r.GET("", api.Get{{.ClassName}})
+		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get{{.ClassName}})
+		r.GET("/:id", api.Get)
-		r.POST("", api.Insert{{.ClassName}})
+		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update{{.ClassName}})
+		r.PUT("/:id", api.Update)
-		r.DELETE("", api.Delete{{.ClassName}})
+		r.DELETE("", api.Delete)
 	}
 }

template/v4/no_actions/service.go.template

@@ -8,6 +8,7 @@ import (
 
 	"go-admin/app/{{.PackageName}}/models"
 	"go-admin/app/{{.PackageName}}/service/dto"
+	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
 )
 
@@ -61,7 +62,7 @@ func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error {
     var err error
     var data models.{{.ClassName}}
     c.Generate(&data)
-	err := e.Orm.Create(c&data).Error
+	err = e.Orm.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("{{.ClassName}}Service Insert error:%s \r\n", err)
 		return err
@@ -70,15 +71,15 @@ func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error {
 }
 
 // Update 修改{{.ClassName}}对象
-func (e *{{.ClassName}}) Update(c *models.{{.ClassName}}, p *actions.DataPermission) error {
+func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}Control, p *actions.DataPermission) error {
     var err error
-    var model = models.{{.ClassName}}
+    var data = models.{{.ClassName}}{}
     e.Orm.Scopes(
             actions.Permission(data.TableName(), p),
-        ).First(&model, c.GetId())
+        ).First(&data, c.GetId())
-    c.Generate(&model)
+    c.Generate(&data)
 
-    db := e.Orm.Save(&model)
+    db := e.Orm.Save(&data)
     if db.Error != nil {
         e.Log.Errorf("{{.ClassName}}Service Save error:%s \r\n", err)
         return err
@@ -90,9 +91,8 @@ func (e *{{.ClassName}}) Update(c *models.{{.ClassName}}, p *actions.DataPermiss
     return nil
 }
 
-// Remove{{.ClassName}} 删除{{.ClassName}}
+// Remove 删除{{.ClassName}}
 func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error {
-	var err error
 	var data models.{{.ClassName}}
 
 	db := e.Orm.Model(&data).

template/v4/vue.go.template

@@ -153,11 +153,11 @@
                             {{- $x := .IsInsert -}}
                             {{- if (eq $x "1") -}}
                                 {{- if (.Pk) }}
-                                {{- else if eq .GoField "createdAt" -}}
+                                {{- else if eq .GoField "CreatedAt" -}}
-                                {{- else if eq .GoField "updatedAt" -}}
+                                {{- else if eq .GoField "UpdatedAt" -}}
-                                {{- else if eq .GoField "deletedAt" -}}
+                                {{- else if eq .GoField "DeletedAt" -}}
-                                {{- else if eq .GoField "updateBy" -}}
+                                {{- else if eq .GoField "UpdateBy" -}}
-                                {{- else if eq .GoField "createBy" -}}
+                                {{- else if eq .GoField "CreateBy" -}}
                                 {{- else }}
                                     <el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
                                         {{ if eq "input" .HtmlType -}}
@@ -229,10 +229,11 @@
 </template>
 
 <script>
-    import {add{{.ClassName}}, del{{.ClassName}}, get{{.ClassName}}, list{{.ClassName}}, update{{.ClassName}}} from '@/api/{{ .BusinessName}}'
+    import {add{{.ClassName}}, del{{.ClassName}}, get{{.ClassName}}, list{{.ClassName}}, update{{.ClassName}}} from '@/api/{{ .PackageName}}/{{ .MLTBName}}'
+    {{ $package:=.PackageName }}
     {{range .Columns}}
     {{- if ne .FkTableName "" -}}
-    import {list{{.FkTableNameClass}} } from '@/api/{{ .FkTableNamePackage}}'
+    import {list{{.FkTableNameClass}} } from '@/api/{{ $package }}/{{ .FkTableNamePackage}}'
     {{ end -}}
     {{- end -}}
 
@@ -423,7 +424,7 @@
                         if (this.form.{{.PkJsonField}} !== undefined) {
                             update{{.ClassName}}(this.form).then(response => {
                                 if (response.code === 200) {
-                                    this.msgSuccess('修改成功')
+                                    this.msgSuccess(response.msg)
                                     this.open = false
                                     this.getList()
                                 } else {
@@ -433,7 +434,7 @@
                         } else {
                             add{{.ClassName}}(this.form).then(response => {
                                 if (response.code === 200) {
-                                    this.msgSuccess('新增成功')
+                                    this.msgSuccess(response.msg)
                                     this.open = false
                                     this.getList()
                                 } else {
@@ -454,9 +455,14 @@
                     type: 'warning'
                 }).then(function () {
                       return del{{.ClassName}}( { 'ids': Ids })
-                }).then(() => {
+                }).then((response) => {
-                    this.getList()
+                   if (response.code === 200) {
-                    this.msgSuccess('删除成功')
+                     this.msgSuccess(response.msg)
+                     this.open = false
+                     this.getList()
+                   } else {
+                     this.msgError(response.msg)
+                   }
                 }).catch(function () {
                 })
             }