update

baishuihu/api/banner.go

@@ -5,6 +5,7 @@ import (
 	"baishuihu/db/repo"
 	"baishuihu/log"
 	"errors"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -18,10 +19,14 @@ func Banner(r *GinRouter) {
 	r.GET("/banner/list", BannerList)
 	r.GET("/banner/detail/:id", BannerDetail)
 	r.POSTJWT("/banner/update", UpdateBanner)
-
 }
 
 func CreateBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	collection := repo.CollectionBanner
+	if strings.Contains(c.Request.URL.Path, "/nav") {
+		collection = repo.CollectionNav
+	}
+
 	var banner model.Banner
 	err := c.ShouldBindJSON(&banner)
 	if err != nil {
@@ -30,22 +35,31 @@ func CreateBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	}
 	banner.CreateTime = time.Now()
 	banner.UpdateTime = time.Now()
-	return repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionBanner, &banner)
+	return repo.RepoAddDoc(apictx.CreateRepoCtx(), collection, &banner)
 }
 
 func DeleteBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	collection := repo.CollectionBanner
+	if strings.Contains(c.Request.URL.Path, "/nav") {
+		collection = repo.CollectionNav
+	}
 	_id := c.Param("id")
 	id, _ := primitive.ObjectIDFromHex(_id)
 	if id.IsZero() {
 		return nil, errors.New("id错误")
 	}
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionBanner, _id)
+	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), collection, _id)
 }
 
 func BannerList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	collection := repo.CollectionBanner
+	if strings.Contains(c.Request.URL.Path, "/nav") {
+		collection = repo.CollectionNav
+	}
+
 	page, size, query := UtilQueryPageSize(c)
 	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-		CollectName: repo.CollectionBanner,
+		CollectName: collection,
 		Page:        page,
 		Size:        size,
 		Query:       query,
@@ -54,6 +68,10 @@ func BannerList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 }
 
 func BannerDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	collection := repo.CollectionBanner
+	if strings.Contains(c.Request.URL.Path, "/nav") {
+		collection = repo.CollectionNav
+	}
 	_id := c.Param("id")
 	id, _ := primitive.ObjectIDFromHex(_id)
 	if id.IsZero() {
@@ -61,7 +79,7 @@ func BannerDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	}
 	cate := &model.Banner{}
 	found, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-		CollectName: repo.CollectionBanner,
+		CollectName: collection,
 		Query:       repo.Map{"_id": id},
 	}, cate)
 	if err != nil {
@@ -76,6 +94,10 @@ func BannerDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 }
 
 func UpdateBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	collection := repo.CollectionBanner
+	if strings.Contains(c.Request.URL.Path, "/nav") {
+		collection = repo.CollectionNav
+	}
 	var cate model.Banner
 	err := c.ShouldBindJSON(&cate)
 	if err != nil {
@@ -85,5 +107,5 @@ func UpdateBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	if cate.Id.IsZero() {
 		return nil, errors.New("id错误")
 	}
-	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionBanner, cate.Id.Hex(), &cate)
+	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), collection, cate.Id.Hex(), &cate)
 }

baishuihu/api/nav.go

@@ -0,0 +1,9 @@
+package api
+
+func Nav(r *GinRouter) {
+	r.POSTJWT("/nav/create", CreateBanner)
+	r.POSTJWT("/nav/delete/:id", DeleteBanner)
+	r.GET("/nav/list", BannerList)
+	r.GET("/nav/detail/:id", BannerDetail)
+	r.POSTJWT("/nav/update", UpdateBanner)
+}

baishuihu/api/router.go

@@ -16,6 +16,7 @@ func RegRouters(svc *Service) {
 	Article(root)
 	Banner(root)
 	Upload(root)
+	Nav(root)
 	// 临时展示接口
 	root.GET("/printr", Printr)
 

baishuihu/db/model/category.go

@@ -8,15 +8,16 @@ import (
 
 // db.getCollection(category).createIndexes([{pid: 1}, {isHome: 1}])
 type Category struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Pid        string             `bson:"pid,omitempty" json:"pid"` // 分类的上层id // 默认为top
-	Name       string             `bson:"name,omitempty" json:"name"`
-	SubName    string             `bson:"subName,omitempty" json:"subName"` // 副标题
-	Cover      string             `bson:"cover,omitempty" json:"cover"`
-	Sort       *int               `bson:"sort,omitempty" json:"sort"`     // 排序，使用创建时间联合排序。排序按升序排，默认为0
-	Type       string             `bson:"type,omitempty" json:"type"`     // 分类类型 list,detail,download
-	Lang       string             `bson:"lang,omitempty" json:"lang"`     // cn en
-	IsHome     *bool              `bson:"isHome,omitempty" json:"isHome"` // 是否展示到首页
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
+	Id      primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	Pid     string             `bson:"pid,omitempty" json:"pid"` // 分类的上层id // 默认为top
+	Name    string             `bson:"name,omitempty" json:"name"`
+	SubName string             `bson:"subName,omitempty" json:"subName"` // 副标题
+	Cover   string             `bson:"cover,omitempty" json:"cover"`
+	Sort    *int               `bson:"sort,omitempty" json:"sort"`     // 排序，使用创建时间联合排序。排序按升序排，默认为0
+	Type    string             `bson:"type,omitempty" json:"type"`     // 分类类型 list,detail,download
+	Lang    string             `bson:"lang,omitempty" json:"lang"`     // cn en
+	IsHome  *bool              `bson:"isHome,omitempty" json:"isHome"` // 是否展示到首页
+	// IsNav      *bool              `bson:"isNav,omitempty" json:"isNav"`   // 是否是导航页
+	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
+	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
 }

baishuihu/db/repo/repo.go

@@ -22,6 +22,7 @@ const (
 	CollectionArticle  = "article"
 	CollectionBanner   = "banner"
 	CollectionReport   = "report"
+	CollectionNav      = "nav"
 )
 
 type Map map[string]interface{}