diff --git a/admin/.eslintrc.cjs b/admin/.eslintrc.cjs index fa81252..757d58a 100644 --- a/admin/.eslintrc.cjs +++ b/admin/.eslintrc.cjs @@ -20,7 +20,7 @@ module.exports = { printWidth: 100, proseWrap: 'preserve', bracketSameLine: false, - endOfLine: 'lf', + endOfLine: 'auto', tabWidth: 4, useTabs: false, trailingComma: 'none' diff --git a/admin/.prettierrc b/admin/.prettierrc index f37c5f4..3d2745f 100644 --- a/admin/.prettierrc +++ b/admin/.prettierrc @@ -4,7 +4,7 @@ "printWidth": 100, "proseWrap": "preserve", "bracketSameLine": false, - "endOfLine": "lf", + "endOfLine": "auto", "tabWidth": 4, "useTabs": false, "trailingComma": "none" diff --git a/server/config/config.go b/server/config/config.go index e8fcff9..8bc1b2c 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -92,7 +92,7 @@ func loadConfig(envPath string) envConfig { Secret: "UVTIyzCy", // Redis键前缀 - RedisPrefix: "Like:", + RedisPrefix: "x:", // 上传图片限制 UploadImageSize: 1024 * 1024 * 10, // 上传视频限制 diff --git a/server/generator/tpl_utils/templates/gocode/controller.go.tpl b/server/generator/tpl_utils/templates/gocode/controller.go.tpl index 493b1b0..f5c0e47 100644 --- a/server/generator/tpl_utils/templates/gocode/controller.go.tpl +++ b/server/generator/tpl_utils/templates/gocode/controller.go.tpl @@ -39,6 +39,16 @@ func (hd {{{ title (toCamelCase .ModuleName) }}}Handler) List(c *gin.Context) { response.CheckAndRespWithData(c, res, err) } +// @Summary {{{ .FunctionName }}}列表-所有 +// @Tags {{{ .ModuleName }}}-{{{ .FunctionName }}} +// @Produce json +// @Success 200 {object} []{{{ title (toCamelCase .EntityName) }}}Resp "成功" +// @Router /api/{{{ .ModuleName }}}/list [get] +func (hd {{{ title (toCamelCase .ModuleName) }}}Handler) ListAll(c *gin.Context) { + res, err := hd.Service.List(page, listReq) + response.CheckAndRespWithData(c, res, err) +} + // @Summary {{{ .FunctionName }}}详情 // @Tags {{{ .ModuleName }}}-{{{ .FunctionName }}} // @Produce json diff --git a/server/generator/tpl_utils/templates/gocode/model.go.tpl b/server/generator/tpl_utils/templates/gocode/model.go.tpl index f3b8434..63f1172 100644 --- a/server/generator/tpl_utils/templates/gocode/model.go.tpl +++ b/server/generator/tpl_utils/templates/gocode/model.go.tpl @@ -4,7 +4,11 @@ package model type {{{ title (toCamelCase .EntityName) }}} struct { {{{- range .Columns }}} {{{- if not (contains $.SubTableFields .ColumnName) }}} - {{{ title (toCamelCase .GoField) }}} {{{ if eq .GoType "core.TsTime" }}} int64 {{{ else }}} {{{ .GoType }}} {{{ end }}} `gorm:"{{{ if .IsPk }}}primarykey;{{{ end }}}comment:'{{{ .ColumnComment }}}'"` // {{{ .ColumnComment }}} + {{{ if eq .GoType "core.TsTime" }}} + {{{ title (toCamelCase .GoField) }}} int64 `gorm:"{{{ if eq .GoField "create_time" }}}autoCreateTime;{{{ else }}}{{{if eq .GoField "update_time"}}}autoUpdateTime;{{{ end }}}{{{ end }}}comment:'{{{ .ColumnComment }}}'"` // {{{ .ColumnComment }}} + {{{ else }}} + {{{ title (toCamelCase .GoField) }}} {{{ .GoType }}} `gorm:"{{{ if .IsPk }}}primarykey;{{{ end }}}comment:'{{{ .ColumnComment }}}'"` // {{{ .ColumnComment }}} + {{{- end }}} {{{- end }}} {{{- end }}} } diff --git a/server/generator/tpl_utils/templates/gocode/route.go.tpl b/server/generator/tpl_utils/templates/gocode/route.go.tpl index 339bb2a..71a6141 100644 --- a/server/generator/tpl_utils/templates/gocode/route.go.tpl +++ b/server/generator/tpl_utils/templates/gocode/route.go.tpl @@ -21,6 +21,7 @@ import ( {{{.ModuleName }}}:edit {{{.ModuleName }}}:del {{{.ModuleName }}}:list +{{{.ModuleName }}}:listAll {{{.ModuleName }}}:detail */ @@ -35,6 +36,7 @@ func {{{ title (toCamelCase .ModuleName) }}}Route(rg *gin.RouterGroup) { rg = rg.Group("/", middleware.TokenAuth()) rg.GET("/{{{ .ModuleName }}}/list", handle.List) + rg.GET("/{{{ .ModuleName }}}/listAll", handle.ListAll) rg.GET("/{{{ .ModuleName }}}/detail", handle.Detail) rg.POST("/{{{ .ModuleName }}}/add", handle.Add) rg.POST("/{{{ .ModuleName }}}/edit", handle.Edit) diff --git a/server/generator/tpl_utils/templates/gocode/service.go.tpl b/server/generator/tpl_utils/templates/gocode/service.go.tpl index 1141574..c361a47 100644 --- a/server/generator/tpl_utils/templates/gocode/service.go.tpl +++ b/server/generator/tpl_utils/templates/gocode/service.go.tpl @@ -9,6 +9,8 @@ import ( type I{{{ title (toCamelCase .EntityName) }}}Service interface { List(page request.PageReq, listReq {{{ title (toCamelCase .EntityName) }}}ListReq) (res response.PageResp, e error) + ListAll() (res []{{{ title (toCamelCase .EntityName) }}}Resp, e error) + Detail(id int) (res {{{ title (toCamelCase .EntityName) }}}Resp, e error) Add(addReq {{{ title (toCamelCase .EntityName) }}}AddReq) (e error) Edit(editReq {{{ title (toCamelCase .EntityName) }}}EditReq) (e error) @@ -70,6 +72,17 @@ func (Service {{{ toCamelCase .EntityName }}}Service) List(page request.PageReq, Lists: resps, }, nil } +//ListAll {{{ .FunctionName }}}列表 +func (Service {{{ toCamelCase .EntityName }}}Service) ListAll() (res []{{{ title (toCamelCase .EntityName) }}}Resp, e error) { + var objs model.{{{ title (toCamelCase .EntityName) }}} + + err := Service.db.Find(&objs).Error + if e = response.CheckErr(err, "ListAll Find err"); e != nil { + return + } + response.Copy(&res, objs) + return res, nil +} //Detail {{{ .FunctionName }}}详情 func (Service {{{ toCamelCase .EntityName }}}Service) Detail(id int) (res {{{ title (toCamelCase .EntityName) }}}Resp, e error) { diff --git a/server/generator/tpl_utils/templates/vue/api.ts.tpl b/server/generator/tpl_utils/templates/vue/api.ts.tpl index 9617572..94db8c2 100644 --- a/server/generator/tpl_utils/templates/vue/api.ts.tpl +++ b/server/generator/tpl_utils/templates/vue/api.ts.tpl @@ -1,9 +1,13 @@ import request from '@/utils/request' // {{{.FunctionName}}}列表 -export function {{{.ModuleName}}}_lists(params?: Record) { +export function {{{.ModuleName}}}_list(params?: Record) { return request.get({ url: '/{{{.ModuleName}}}/list', params }) } +// {{{.FunctionName}}}列表-所有 +export function {{{.ModuleName}}}_list_all(params?: Record) { + return request.get({ url: '/{{{.ModuleName}}}/listAll', params }) +} // {{{.FunctionName}}}详情 export function {{{.ModuleName}}}_detail(params: Record) { diff --git a/server/generator/tpl_utils/templates/vue/index.vue.tpl b/server/generator/tpl_utils/templates/vue/index.vue.tpl index 65261fa..3f12f5e 100644 --- a/server/generator/tpl_utils/templates/vue/index.vue.tpl +++ b/server/generator/tpl_utils/templates/vue/index.vue.tpl @@ -121,7 +121,7 @@ /> -