文章管理

app/controller/admin/cms_model.go

@@ -0,0 +1,17 @@
+package admin
+
+import (
+	"gfast/library/response"
+	"github.com/gogf/gf/net/ghttp"
+)
+
+type CmsModel struct{}
+
+func (c *CmsModel) List(r *ghttp.Request) {
+	response.FailJson(true, r, "功能开发中...")
+}
+
+//添加模型
+func (c *CmsModel) Add(r *ghttp.Request) {
+	response.FailJson(true, r, "功能开发中...")
+}

app/controller/admin/cms_news.go

@@ -7,6 +7,12 @@ import (
 
 type CmsNews struct{}
 
-func (c CmsNews) NewsList(r *ghttp.Request) {
+func (c *CmsNews) List(r *ghttp.Request) {
 	response.SusJson(true, r, "信息列表")
 }
+
+//添加信息
+func (c *CmsNews) Add(r *ghttp.Request) {
+	//获取可选栏目
+
+}

app/model/admin/cms_category/cms_category.go

@@ -23,7 +23,7 @@ type ReqSearchList struct {
 
 //添加请求参数
 type ReqAdd struct {
-	ParentId            uint64 `p:"parent_id" v:"integer|min:0#父级ID不能为空|父级ID必须为大于等于0的整数"`
+	ParentId            int64  `p:"parent_id" v:"integer|min:0#父级ID不能为空|父级ID必须为大于等于0的整数"`
 	Name                string `p:"name" v:"required#栏目名称不能为空"`
 	Alias               string `p:"alias"`
 	CateType            uint   `p:"cate_type" v:"required|in:1,2,3,4#请选择栏目类型|栏目类型只能在1-4之间"`
@@ -56,27 +56,13 @@ func GetList() (list []*Entity, err error) {
 	if err != nil {
 		g.Log().Error()
 		err = gerror.New("获取菜单数据失败")
+		return
 	}
 	//缓存数据
 	cache.Set(cache_service.AdminCmsMenu, list, 0, cache_service.AdminCmsTag)
 	return
 }
 
-//获取频道列表
-func GetListChannel() (list []*Entity, err error) {
-	listAll, err := GetList()
-	if err != nil {
-		return
-	}
-	list = make([]*Entity, 0, len(listAll))
-	for _, v := range listAll {
-		if v.Status == 1 && v.CateType == ChannelCateType {
-			list = append(list, v)
-		}
-	}
-	return
-}
-
 //保存栏目操作
 func AddSave(req *ReqAdd) (id int64, err error) {
 	var entity Entity

app/model/admin/cms_category/cms_category_entity.go

@@ -12,7 +12,7 @@ import (
 // Entity is the golang structure for table cms_category.
 type Entity struct {
 	Id             uint64  `orm:"id,primary"      json:"id"`              // 分类id
-	ParentId       uint64  `orm:"parent_id"       json:"parent_id"`       // 分类父id
+	ParentId       int64   `orm:"parent_id"       json:"parent_id"`       // 分类父id
 	Status         uint    `orm:"status"          json:"status"`          // 状态,1:发布,0:不发布
 	DeleteTime     uint    `orm:"delete_time"     json:"delete_time"`     // 删除时间
 	ListOrder      float64 `orm:"list_order"      json:"list_order"`      // 排序

app/service/admin/cms_service/menu.go

@@ -6,12 +6,39 @@ import (
 
 //获取频道列表
 func GetMenuListChannel() (list []*cms_category.Entity, err error) {
-	return cms_category.GetListChannel()
+	//获取频道列表
+	listAll, err := GetMenuList()
+	if err != nil {
+		return
+	}
+	list = make([]*cms_category.Entity, 0, len(listAll))
+	for _, v := range listAll {
+		if v.Status == 1 && v.CateType == cms_category.ChannelCateType {
+			list = append(list, v)
+		}
+	}
+	return
+}
+
+//获取可发布文章栏目
+func GetPublishableMenuList() (list []*cms_category.Entity, err error) {
+	menuList, err := GetMenuList()
+	if err != nil {
+		return
+	}
+	list = make([]*cms_category.Entity, 0, len(menuList))
+	for _, menu := range menuList {
+		if menu.Status == 1 {
+			list = append(list, menu)
+		}
+	}
+	return
 }
 
 //获取所有菜单列表
 func GetMenuList() (list []*cms_category.Entity, err error) {
-	return cms_category.GetList()
+	return
+	//return cms_category.GetList()
 }
 
 //保存栏目操作

app/service/admin/cms_service/news.go

@@ -0,0 +1 @@
+package cms_service

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/mojocn/base64Captcha v1.3.0
 	github.com/mssola/user_agent v0.5.1
 	github.com/shirou/gopsutil v2.20.2+incompatible
+	github.com/stretchr/testify v1.5.1 // indirect
 )
 
 go 1.14

go.sum

@@ -8,6 +8,8 @@ github.com/casbin/casbin/v2 v2.1.2 h1:bTwon/ECRx9dwBy2ewRVr5OiqjeXSGiTUY74sDPQi/
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
 github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
@@ -18,17 +20,8 @@ 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/goflyfox/gtoken v1.3.9 h1:9WSFlk0R9Fy8vmbjKqR33Yqfsce9TYfn2lMwZ9zVOPU=
-github.com/goflyfox/gtoken v1.3.9/go.mod h1:AdsIiP+9xYazR69j4dN1nLYdBoC+Xh3UVUYjqOM8OJs=
-github.com/goflyfox/gtoken v1.3.11 h1:dttowT4XrxtDrmpNYCtF23mtpNW2keNR/Me5ULPsQjw=
-github.com/goflyfox/gtoken v1.3.11/go.mod h1:2oUK27DG/F+jVPCGtEWsKL5aM4zmCIg9/VREkGhIrw0=
 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.10.1 h1:mu1VWviGm8ucgFNODQnw8ourgvgNBBovbLFbot/70BY=
-github.com/gogf/gf v1.10.1/go.mod h1:/37gncPmuM06D4YSqiDze9GsasDtF2QnWkUfKeiGW/Q=
-github.com/gogf/gf v1.11.2/go.mod h1:/37gncPmuM06D4YSqiDze9GsasDtF2QnWkUfKeiGW/Q=
-github.com/gogf/gf v1.11.4 h1:/G5cRbv6wOHmJroZUu2Q1N/qqYfbgvHgKI54HhRZAh0=
-github.com/gogf/gf v1.11.4/go.mod h1:/37gncPmuM06D4YSqiDze9GsasDtF2QnWkUfKeiGW/Q=
 github.com/gogf/gf v1.11.5 h1:e6HB9x1QZ6EFD3eEWXDCsFeVs7KxNtmWQRVNh2c0+bQ=
 github.com/gogf/gf v1.11.5/go.mod h1:iuHZkqyEfxFtpwRYboAU7409O/sfdy79YTpY8si332I=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
@@ -50,8 +43,13 @@ github.com/mssola/user_agent v0.5.1 h1:sJUCUozh+j7c0dR2zMIUX5aJjoY/TNo/gXiNujoH5
 github.com/mssola/user_agent v0.5.1/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw=
 github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/shirou/gopsutil v2.20.2+incompatible h1:ucK79BhBpgqQxPASyS2cu9HX8cfDVljBN1WWFvbNvgY=
 github.com/shirou/gopsutil v2.20.2+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/image v0.0.0-20190501045829-6d32002ffd75 h1:TbGuee8sSq15Iguxu4deQ7+Bqq/d2rsQejGcEtADAMQ=
 golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
@@ -65,3 +63,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

router/router.go

@@ -27,6 +27,7 @@ func init() {
 		group.Group("/cms", func(group *ghttp.RouterGroup) {
 			group.ALL("/menu", new(admin.CmsMenu))
 			group.ALL("/news", new(admin.CmsNews))
+			group.ALL("/model", new(admin.CmsModel))
 		})
 
 		group.Group("/config", func(group *ghttp.RouterGroup) {

test/demo2_test.go

@@ -1,7 +1,6 @@
 package test
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -10,8 +9,5 @@ func TestDemo2(t *testing.T) {
 }
 
 func test21(t *testing.T) {
-	s := []int{1, 2, 3}
-	s1 := []int{0}
-	s1 = append(s1, s...)
-	fmt.Println(s1)
+
 }