diff --git a/app/controller/admin/cms_news.go b/app/controller/admin/cms_news.go index 351ae07..ee045e6 100644 --- a/app/controller/admin/cms_news.go +++ b/app/controller/admin/cms_news.go @@ -1,7 +1,9 @@ package admin import ( + "gfast/app/service/admin/cms_service" "gfast/library/response" + "github.com/gogf/gf/frame/g" "github.com/gogf/gf/net/ghttp" ) @@ -14,5 +16,13 @@ func (c *CmsNews) List(r *ghttp.Request) { //添加信息 func (c *CmsNews) Add(r *ghttp.Request) { //获取可选栏目 + menus, err := cms_service.GetPublishableMenuList() + if err != nil { + response.FailJson(true, r, err.Error()) + } + res := g.Map{ + "menus": menus, + } + response.SusJson(true, r, "添加信息", res) } diff --git a/app/service/admin/cms_service/menu.go b/app/service/admin/cms_service/menu.go index d2ec569..8053ddc 100644 --- a/app/service/admin/cms_service/menu.go +++ b/app/service/admin/cms_service/menu.go @@ -37,8 +37,7 @@ func GetPublishableMenuList() (list []*cms_category.Entity, err error) { //获取所有菜单列表 func GetMenuList() (list []*cms_category.Entity, err error) { - return - //return cms_category.GetList() + return cms_category.GetList() } //保存栏目操作 diff --git a/go.mod b/go.mod index 11599ad..ef94ee1 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/casbin/casbin/v2 v2.1.2 github.com/go-ole/go-ole v1.2.4 // indirect github.com/goflyfox/gtoken v1.3.12 - github.com/gogf/gf v1.11.5 + github.com/gogf/gf v1.11.6 github.com/mojocn/base64Captcha v1.3.0 github.com/mssola/user_agent v0.5.1 github.com/shirou/gopsutil v2.20.2+incompatible diff --git a/go.sum b/go.sum index e933290..3843a9e 100644 --- a/go.sum +++ b/go.sum @@ -20,10 +20,14 @@ github.com/gf-third/yaml v1.0.1 h1:pqD4ix+65DqGphU1MDnToPZfGYk0tuuwRzuTSl3g0d0= github.com/gf-third/yaml v1.0.1/go.mod h1:t443vj0txEw3+E0MOtkr83kt+PrZg2I8SRuYfn85NM0= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/goflyfox/gtoken v1.3.12 h1:ewet3ZzkfBIuOKkJ2T9uErheDAu/TxnyrmMmEaof2F8= github.com/goflyfox/gtoken v1.3.12/go.mod h1:KPGDYrhvNzcfqFJz4/rE6x0SyURAuAxfRNhwMxGbFxk= github.com/gogf/gf v1.11.5 h1:e6HB9x1QZ6EFD3eEWXDCsFeVs7KxNtmWQRVNh2c0+bQ= github.com/gogf/gf v1.11.5/go.mod h1:iuHZkqyEfxFtpwRYboAU7409O/sfdy79YTpY8si332I= +github.com/gogf/gf v1.11.6 h1:UfYtAQkhXmZtYFMGant1Tdh8azZrWUJrYTGAyS3FloA= +github.com/gogf/gf v1.11.6/go.mod h1:q6WSyX5jyJbUki7l66lpfsXvf2GeDEOgXNRz9Nb61qo= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=