Merge pull request #469 from go-admin-team/dev

DEV (#468)
This commit is contained in:
wenjianzhang authored and GitHub committed 2021-06-30 22:48:45 +08:00
commit 1295b1fd35
16 files changed
+185 -116

No files matched your search

File renamed without changes.
+2 -2
View File
@@ -208,7 +208,7 @@ func (e SysUser) Delete(c *gin.Context) {
// @Security Bearer // @Security Bearer
func (e SysUser) InsetAvatar(c *gin.Context) { func (e SysUser) InsetAvatar(c *gin.Context) {
s := service.SysUser{} s := service.SysUser{}
req := dto.SysUserControl{} req := dto.UpdateSysUserAvatarReq{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
MakeService(&s.Service). MakeService(&s.Service).
@@ -237,7 +237,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
req.UserId = p.UserId req.UserId = p.UserId
req.Avatar = "/" + filPath req.Avatar = "/" + filPath
err = s.Update(&req, p) err = s.UpdateSysUserAvatar(&req, p)
if err != nil { if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
return return
+17
View File
@@ -54,6 +54,23 @@ func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
model.Password = s.Password model.Password = s.Password
} }
type UpdateSysUserAvatarReq struct {
UserId int `json:"userId" comment:"用户ID" vd:"required"` // 用户ID
Avatar string `json:"avatar" comment:"头像" vd:"required"`
common.ControlBy
}
func (s *UpdateSysUserAvatarReq) GetId() interface{} {
return s.UserId
}
func (s *UpdateSysUserAvatarReq) Generate(model *models.SysUser) {
if s.UserId != 0 {
model.UserId = s.UserId
}
model.Avatar = s.Avatar
}
type UpdateSysUserStatusReq struct { type UpdateSysUserStatusReq struct {
UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
Status string `json:"status" comment:"状态" binding:"required"` Status string `json:"status" comment:"状态" binding:"required"`
+24
View File
@@ -107,6 +107,30 @@ func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error
return nil return nil
} }
// UpdateSysUserAvatar 更新用户头像
func (e *SysUser) UpdateSysUserAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
var err error
var model models.SysUser
db := e.Orm.Scopes(
actions.Permission(model.TableName(), p),
).First(&model, c.GetId())
if err = db.Error; err != nil {
e.Log.Errorf("Service UpdateSysUser error: %s", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
c.Generate(&model)
err = e.Orm.Save(&model).Error
if err != nil {
e.Log.Errorf("Service UpdateSysUser error: %s", err)
return err
}
return nil
}
// UpdateSysUserStatus 更新用户状态 // UpdateSysUserStatus 更新用户状态
func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error { func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
var err error var err error
+21 -14
View File
@@ -168,6 +168,7 @@ func (e Gen) GenApiToFile(c *gin.Context) {
func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
e.Context = c e.Context = c
log := e.GetLogger() log := e.GetLogger()
tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
basePath := "template/v4/" basePath := "template/v4/"
routerFile := basePath + "no_actions/router_check_role.go.template" routerFile := basePath + "no_actions/router_check_role.go.template"
@@ -223,8 +224,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
_ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/")
_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/" + tab.PackageName+ "/")
_ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) err = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName + "/" + tab.MLTBName+ "/")
if err != nil {
log.Error(err)
e.Error(500, err, fmt.Sprintf("views目录创建失败!错误详情:%s", err.Error()))
return
}
var b1 bytes.Buffer var b1 bytes.Buffer
err = t1.Execute(&b1, tab) err = t1.Execute(&b1, tab)
@@ -240,13 +246,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
err = t6.Execute(&b6, tab) err = t6.Execute(&b6, tab)
var b7 bytes.Buffer var b7 bytes.Buffer
err = t7.Execute(&b7, tab) err = t7.Execute(&b7, tab)
pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.TBName+".go")
pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+".go") pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.TBName+".go")
pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.TBName+".go")
pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.PackageName+"/"+tab.MLTBName+".js")
pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.PackageName+"/"+tab.MLTBName+"/index.vue")
pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.TBName+".go")
pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.ModuleName+".go") pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.TBName+".go")
} }
@@ -365,19 +371,20 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
table := tools.SysTables{} table := tools.SysTables{}
id, err := pkg.StringToInt(c.Param("tableId")) id, err := pkg.StringToInt(c.Param("tableId"))
if err != nil{ if err != nil {
e.Logger.Error(err) e.Logger.Error(err)
e.Error(500,err,fmt.Sprintf("tableId参数解析失败!错误详情:%s", err.Error())) e.Error(500, err, fmt.Sprintf("tableId参数解析失败!错误详情:%s", err.Error()))
return return
} }
table.TableId = id table.TableId = id
tab, _ := table.Get(e.Orm) tab, _ := table.Get(e.Orm)
tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
Mmenu := dto.SysMenuControl{} Mmenu := dto.SysMenuControl{}
Mmenu.Title = tab.TableComment Mmenu.Title = tab.TableComment
Mmenu.Icon = "pass" Mmenu.Icon = "pass"
Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1) Mmenu.Path = "/" +tab.MLTBName
Mmenu.MenuType = "M" Mmenu.MenuType = "M"
Mmenu.Action = "无" Mmenu.Action = "无"
Mmenu.ParentId = 0 Mmenu.ParentId = 0
@@ -393,13 +400,13 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
Cmenu.MenuName = tab.ClassName + "Manage" Cmenu.MenuName = tab.ClassName + "Manage"
Cmenu.Title = tab.TableComment Cmenu.Title = tab.TableComment
Cmenu.Icon = "pass" Cmenu.Icon = "pass"
Cmenu.Path = tab.TBName Cmenu.Path = "/" + tab.PackageName + "/" + tab.MLTBName
Cmenu.MenuType = "C" Cmenu.MenuType = "C"
Cmenu.Action = "无" Cmenu.Action = "无"
Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list" Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list"
Cmenu.ParentId = Mmenu.MenuId Cmenu.ParentId = Mmenu.MenuId
Cmenu.NoCache = false Cmenu.NoCache = false
Cmenu.Component = "/" + tab.ModuleFrontName + "/index" Cmenu.Component = "/" + tab.PackageName + "/" + tab.MLTBName + "/index"
Cmenu.Sort = 0 Cmenu.Sort = 0
Cmenu.Visible = "0" Cmenu.Visible = "0"
Cmenu.IsFrame = "0" Cmenu.IsFrame = "0"
+37 -37
View File
@@ -6,43 +6,43 @@ import (
) )
type SysColumns struct { type SysColumns struct {
ColumnId int `gorm:"primaryKey;autoIncrement" json:"columnId"` ColumnId int `gorm:"primaryKey;autoIncrement" json:"columnId"`
TableId int `gorm:"" json:"tableId"` TableId int `gorm:"" json:"tableId"`
ColumnName string `gorm:"size:128;" json:"columnName"` ColumnName string `gorm:"size:128;" json:"columnName"`
ColumnComment string `gorm:"column:column_comment;size:128;" json:"columnComment"` ColumnComment string `gorm:"column:column_comment;size:128;" json:"columnComment"`
ColumnType string `gorm:"column:column_type;size:128;" json:"columnType"` ColumnType string `gorm:"column:column_type;size:128;" json:"columnType"`
GoType string `gorm:"column:go_type;size:128;" json:"goType"` GoType string `gorm:"column:go_type;size:128;" json:"goType"`
GoField string `gorm:"column:go_field;size:128;" json:"goField"` GoField string `gorm:"column:go_field;size:128;" json:"goField"`
JsonField string `gorm:"column:json_field;size:128;" json:"jsonField"` JsonField string `gorm:"column:json_field;size:128;" json:"jsonField"`
IsPk string `gorm:"column:is_pk;size:4;" json:"isPk"` IsPk string `gorm:"column:is_pk;size:4;" json:"isPk"`
IsIncrement string `gorm:"column:is_increment;size:4;" json:"isIncrement"` IsIncrement string `gorm:"column:is_increment;size:4;" json:"isIncrement"`
IsRequired string `gorm:"column:is_required;size:4;" json:"isRequired"` IsRequired string `gorm:"column:is_required;size:4;" json:"isRequired"`
IsInsert string `gorm:"column:is_insert;size:4;" json:"isInsert"` IsInsert string `gorm:"column:is_insert;size:4;" json:"isInsert"`
IsEdit string `gorm:"column:is_edit;size:4;" json:"isEdit"` IsEdit string `gorm:"column:is_edit;size:4;" json:"isEdit"`
IsList string `gorm:"column:is_list;size:4;" json:"isList"` IsList string `gorm:"column:is_list;size:4;" json:"isList"`
IsQuery string `gorm:"column:is_query;size:4;" json:"isQuery"` IsQuery string `gorm:"column:is_query;size:4;" json:"isQuery"`
QueryType string `gorm:"column:query_type;size:128;" json:"queryType"` QueryType string `gorm:"column:query_type;size:128;" json:"queryType"`
HtmlType string `gorm:"column:html_type;size:128;" json:"htmlType"` HtmlType string `gorm:"column:html_type;size:128;" json:"htmlType"`
DictType string `gorm:"column:dict_type;size:128;" json:"dictType"` DictType string `gorm:"column:dict_type;size:128;" json:"dictType"`
Sort int `gorm:"column:sort;" json:"sort"` Sort int `gorm:"column:sort;" json:"sort"`
List string `gorm:"column:list;size:1;" json:"list"` List string `gorm:"column:list;size:1;" json:"list"`
Pk bool `gorm:"column:pk;size:1;" json:"pk"` Pk bool `gorm:"column:pk;size:1;" json:"pk"`
Required bool `gorm:"column:required;size:1;" json:"required"` Required bool `gorm:"column:required;size:1;" json:"required"`
SuperColumn bool `gorm:"column:super_column;size:1;" json:"superColumn"` SuperColumn bool `gorm:"column:super_column;size:1;" json:"superColumn"`
UsableColumn bool `gorm:"column:usable_column;size:1;" json:"usableColumn"` UsableColumn bool `gorm:"column:usable_column;size:1;" json:"usableColumn"`
Increment bool `gorm:"column:increment;size:1;" json:"increment"` Increment bool `gorm:"column:increment;size:1;" json:"increment"`
Insert bool `gorm:"column:insert;size:1;" json:"insert"` Insert bool `gorm:"column:insert;size:1;" json:"insert"`
Edit bool `gorm:"column:edit;size:1;" json:"edit"` Edit bool `gorm:"column:edit;size:1;" json:"edit"`
Query bool `gorm:"column:query;size:1;" json:"query"` Query bool `gorm:"column:query;size:1;" json:"query"`
Remark string `gorm:"column:remark;size:255;" json:"remark"` Remark string `gorm:"column:remark;size:255;" json:"remark"`
FkTableName string `gorm:"" json:"fkTableName"` FkTableName string `gorm:"" json:"fkTableName"`
FkTableNameClass string `gorm:"" json:"fkTableNameClass"` FkTableNameClass string `gorm:"" json:"fkTableNameClass"`
FkTableNamePackage string `gorm:"" json:"fkTableNamePackage"` FkTableNamePackage string `gorm:"" json:"fkTableNamePackage"`
FkCol []SysColumns `gorm:"-" json:"fkCol"` FkCol []SysColumns `gorm:"-" json:"fkCol"`
FkLabelId string `gorm:"" json:"fkLabelId"` FkLabelId string `gorm:"" json:"fkLabelId"`
FkLabelName string `gorm:"size:255;" json:"fkLabelName"` FkLabelName string `gorm:"size:255;" json:"fkLabelName"`
CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"` CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"`
UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"` UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"`
models.BaseModel models.BaseModel
} }
+5 -3
View File
@@ -12,6 +12,7 @@ import (
type SysTables struct { type SysTables struct {
TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码
TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称
MLTBName string `gorm:"-" json:"-"` //表名称
TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 TableComment string `gorm:"size:255;" json:"tableComment"` //表备注
ClassName string `gorm:"size:255;" json:"className"` //类名 ClassName string `gorm:"size:255;" json:"className"` //类名
TplCategory string `gorm:"size:255;" json:"tplCategory"` // TplCategory string `gorm:"size:255;" json:"tplCategory"` //
@@ -188,16 +189,17 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) {
t, ok := tableMap[e.Columns[i].FkTableName] t, ok := tableMap[e.Columns[i].FkTableName]
if ok { if ok {
e.Columns[i].FkTableNameClass = t.ClassName e.Columns[i].FkTableNameClass = t.ClassName
e.Columns[i].FkTableNamePackage = t.ModuleName t.MLTBName = strings.Replace(t.TBName, "_", "-", -1)
e.Columns[i].FkTableNamePackage = t.MLTBName
} else { } else {
tableNameList := strings.Split(e.Columns[i].FkTableName, "_") tableNameList := strings.Split(e.Columns[i].FkTableName, "_")
e.Columns[i].FkTableNameClass = "" e.Columns[i].FkTableNameClass = ""
e.Columns[i].FkTableNamePackage = "" //e.Columns[i].FkTableNamePackage = ""
for a := 0; a < len(tableNameList); a++ { for a := 0; a < len(tableNameList); a++ {
strStart := string([]byte(tableNameList[a])[:1]) strStart := string([]byte(tableNameList[a])[:1])
strEnd := string([]byte(tableNameList[a])[1:]) strEnd := string([]byte(tableNameList[a])[1:])
e.Columns[i].FkTableNameClass += strings.ToUpper(strStart) + strEnd e.Columns[i].FkTableNameClass += strings.ToUpper(strStart) + strEnd
e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd) //e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd)
} }
} }
} }
+1 -1
View File
@@ -2,7 +2,7 @@ package global
const ( const (
// Version go-admin version info // Version go-admin version info
Version = "2.0.0-beta.7" Version = "2.0.0-beta.8"
) )
var ( var (
+5 -5
View File
@@ -48,11 +48,11 @@ settings:
demo: demo:
name: data name: data
cache: cache:
redis: # redis:
addr: 127.0.0.1:6379 # addr: 127.0.0.1:6379
password: xxxxxx # password: xxxxxx
db: 2 # db: 2
# memory: '' key存在即可 memory: '' key存在即可
queue: queue:
memory: memory:
poolSize: 100 poolSize: 100
+18 -6
View File
@@ -1,13 +1,23 @@
package dto package dto
import ( import (
"errors"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"go-admin/app/{{.PackageName}}/models" "go-admin/app/{{.PackageName}}/models"
"go-admin/common/dto" "go-admin/common/dto"
common "go-admin/common/models" 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 { type {{.ClassName}}Search struct {
@@ -26,7 +36,7 @@ type {{.ClassName}}Order struct {
{{- $tablename := .TBName -}} {{- $tablename := .TBName -}}
{{- range .Columns -}} {{- range .Columns -}}
{{.GoField}} {{.GoType}} `form:"{{.JsonField}}Order" search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"` {{.GoField}} {{.GoType}} `form:"{{.JsonField}}Order" search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"`
{{- end }} {{ end }}
} }
func (m *{{.ClassName}}Search) GetNeedSearch() interface{} { func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
@@ -47,9 +57,10 @@ type {{.ClassName}}Control struct {
{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
{{- end -}} {{- end -}}
{{- end }} {{- end }}
common.ControlBy
} }
func (s *{{.ClassName}}Control) Generate(model *models.SysConfig) { func (s *{{.ClassName}}Control) Generate(model *models.{{.ClassName}}) {
{{- range .Columns -}} {{- range .Columns -}}
{{$x := .Pk}} {{$x := .Pk}}
{{- if ($x) }} {{- if ($x) }}
@@ -74,6 +85,7 @@ func (s *{{.ClassName}}Control) GetId() interface{} {
type {{.ClassName}}ById struct { type {{.ClassName}}ById struct {
Id int `uri:"id"` Id int `uri:"id"`
Ids []int `json:"ids"` Ids []int `json:"ids"`
common.ControlBy
} }
func (s *{{.ClassName}}ById) GetId() interface{} { func (s *{{.ClassName}}ById) GetId() interface{} {
+5 -5
View File
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询{{.ClassName}}列表 // 查询{{.ClassName}}列表
export function list{{.ClassName}}(query) { export function list{{.ClassName}}(query) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}', url: '/api/v1/{{.MLTBName}}',
method: 'get', method: 'get',
params: query params: query
}) })
@@ -12,7 +12,7 @@ export function list{{.ClassName}}(query) {
// 查询{{.ClassName}}详细 // 查询{{.ClassName}}详细
export function get{{.ClassName}} ({{.PkJsonField}}) { export function get{{.ClassName}} ({{.PkJsonField}}) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, url: '/api/v1/{{.MLTBName}}/' + {{.PkJsonField}},
method: 'get' method: 'get'
}) })
} }
@@ -21,7 +21,7 @@ export function get{{.ClassName}} ({{.PkJsonField}}) {
// 新增{{.ClassName}} // 新增{{.ClassName}}
export function add{{.ClassName}}(data) { export function add{{.ClassName}}(data) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}', url: '/api/v1/{{.MLTBName}}',
method: 'post', method: 'post',
data: data data: data
}) })
@@ -30,7 +30,7 @@ export function add{{.ClassName}}(data) {
// 修改{{.ClassName}} // 修改{{.ClassName}}
export function update{{.ClassName}}(data) { export function update{{.ClassName}}(data) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}/'+data.{{.PkJsonField}}, url: '/api/v1/{{.MLTBName}}/'+data.{{.PkJsonField}},
method: 'put', method: 'put',
data: data data: data
}) })
@@ -39,7 +39,7 @@ export function update{{.ClassName}}(data) {
// 删除{{.ClassName}} // 删除{{.ClassName}}
export function del{{.ClassName}}(data) { export function del{{.ClassName}}(data) {
return request({ return request({
url: '/api/v1/{{.ModuleName}}', url: '/api/v1/{{.MLTBName}}',
method: 'delete', method: 'delete',
data: data data: data
}) })
+12 -11
View File
@@ -1,9 +1,9 @@
package apis package apis
import ( import (
"github.com/gin-gonic/gin/binding" "fmt"
"net/http"
"github.com/gin-gonic/gin/binding"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "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}}/models"
"go-admin/app/{{.PackageName}}/service" "go-admin/app/{{.PackageName}}/service"
"go-admin/app/{{.PackageName}}/service/dto" "go-admin/app/{{.PackageName}}/service/dto"
"go-admin/common/actions"
) )
type {{.ClassName}} struct { type {{.ClassName}} struct {
@@ -54,7 +55,7 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { 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 return
} }
@@ -69,7 +70,7 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) {
// @Success 200 {object} response.Response{data=models.{{.ClassName}}} "{"code": 200, "data": [...]}" // @Success 200 {object} response.Response{data=models.{{.ClassName}}} "{"code": 200, "data": [...]}"
// @Router /api/v1/{{.ModuleName}}/{id} [get] // @Router /api/v1/{{.ModuleName}}/{id} [get]
// @Security Bearer // @Security Bearer
func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { func (e {{.ClassName}}) Get(c *gin.Context) {
req := dto.{{.ClassName}}ById{} req := dto.{{.ClassName}}ById{}
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
err := e.MakeContext(c). err := e.MakeContext(c).
@@ -87,7 +88,7 @@ func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
if err != nil { 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 return
} }
@@ -122,7 +123,7 @@ func (e {{.ClassName}}) Insert(c *gin.Context) {
err = s.Insert(&req) err = s.Insert(&req)
if err != nil { 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 return
} }
@@ -140,7 +141,7 @@ func (e {{.ClassName}}) Insert(c *gin.Context) {
// @Router /api/v1/{{.ModuleName}}/{id} [put] // @Router /api/v1/{{.ModuleName}}/{id} [put]
// @Security Bearer // @Security Bearer
func (e {{.ClassName}}) Update(c *gin.Context) { func (e {{.ClassName}}) Update(c *gin.Context) {
req := dto.{{.ClassName}}Control){} req := dto.{{.ClassName}}Control{}
s := service.{{.ClassName}}{} s := service.{{.ClassName}}{}
err := e.MakeContext(c). err := e.MakeContext(c).
MakeOrm(). MakeOrm().
@@ -157,10 +158,10 @@ func (e {{.ClassName}}) Update(c *gin.Context) {
err = s.Update(&req, p) err = s.Update(&req, p)
if err != nil { 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 return
} }
e.OK( object.GetId(), "修改成功") e.OK( req.GetId(), "修改成功")
} }
// Delete 删除{{.TableComment}} // Delete 删除{{.TableComment}}
@@ -190,8 +191,8 @@ func (e {{.ClassName}}) Delete(c *gin.Context) {
err = s.Remove(&req, p) err = s.Remove(&req, p)
if err != nil { 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 return
} }
e.OK( control.GetId(), "删除成功") e.OK( req.GetId(), "删除成功")
} }
@@ -15,12 +15,12 @@ func init() {
// register{{.ClassName}}Router // register{{.ClassName}}Router
func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
api := apis.{{.ClassName}}{} 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)
} }
} }
@@ -14,12 +14,12 @@ func init() {
// register{{.ClassName}}Router // register{{.ClassName}}Router
func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
api := apis.{{.ClassName}}{} 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)
} }
} }
+8 -8
View File
@@ -8,6 +8,7 @@ import (
"go-admin/app/{{.PackageName}}/models" "go-admin/app/{{.PackageName}}/models"
"go-admin/app/{{.PackageName}}/service/dto" "go-admin/app/{{.PackageName}}/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto" cDto "go-admin/common/dto"
) )
@@ -61,7 +62,7 @@ func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error {
var err error var err error
var data models.{{.ClassName}} var data models.{{.ClassName}}
c.Generate(&data) c.Generate(&data)
err := e.Orm.Create(c&data).Error err = e.Orm.Create(&data).Error
if err != nil { if err != nil {
e.Log.Errorf("{{.ClassName}}Service Insert error:%s \r\n", err) e.Log.Errorf("{{.ClassName}}Service Insert error:%s \r\n", err)
return err return err
@@ -70,15 +71,15 @@ func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error {
} }
// Update 修改{{.ClassName}}对象 // 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 err error
var model = models.{{.ClassName}} var data = models.{{.ClassName}}{}
e.Orm.Scopes( e.Orm.Scopes(
actions.Permission(data.TableName(), p), 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 { if db.Error != nil {
e.Log.Errorf("{{.ClassName}}Service Save error:%s \r\n", err) e.Log.Errorf("{{.ClassName}}Service Save error:%s \r\n", err)
return err return err
@@ -90,9 +91,8 @@ func (e *{{.ClassName}}) Update(c *models.{{.ClassName}}, p *actions.DataPermiss
return nil return nil
} }
// Remove{{.ClassName}} 删除{{.ClassName}} // Remove 删除{{.ClassName}}
func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error { func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error {
var err error
var data models.{{.ClassName}} var data models.{{.ClassName}}
db := e.Orm.Model(&data). db := e.Orm.Model(&data).
+18 -12
View File
@@ -153,11 +153,11 @@
{{- $x := .IsInsert -}} {{- $x := .IsInsert -}}
{{- if (eq $x "1") -}} {{- if (eq $x "1") -}}
{{- if (.Pk) }} {{- 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 }} {{- else }}
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}"> <el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
{{ if eq "input" .HtmlType -}} {{ if eq "input" .HtmlType -}}
@@ -229,10 +229,11 @@
</template> </template>
<script> <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}} {{range .Columns}}
{{- if ne .FkTableName "" -}} {{- if ne .FkTableName "" -}}
import {list{{.FkTableNameClass}} } from '@/api/{{ .FkTableNamePackage}}' import {list{{.FkTableNameClass}} } from '@/api/{{ $package }}/{{ .FkTableNamePackage}}'
{{ end -}} {{ end -}}
{{- end -}} {{- end -}}
@@ -423,7 +424,7 @@
if (this.form.{{.PkJsonField}} !== undefined) { if (this.form.{{.PkJsonField}} !== undefined) {
update{{.ClassName}}(this.form).then(response => { update{{.ClassName}}(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess('修改成功') this.msgSuccess(response.msg)
this.open = false this.open = false
this.getList() this.getList()
} else { } else {
@@ -433,7 +434,7 @@
} else { } else {
add{{.ClassName}}(this.form).then(response => { add{{.ClassName}}(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess('新增成功') this.msgSuccess(response.msg)
this.open = false this.open = false
this.getList() this.getList()
} else { } else {
@@ -454,9 +455,14 @@
type: 'warning' type: 'warning'
}).then(function () { }).then(function () {
return del{{.ClassName}}( { 'ids': Ids }) 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 () { }).catch(function () {
}) })
} }