add top

baishuihu/api/article.go

@@ -22,6 +22,7 @@ func Article(r *GinRouter) {
 	r.GET("/article/detail/:id", ArticleDetail)
 	r.POSTJWT("/article/update", UpdateArticle)
 	r.GET("/article/search", ArticleSearch)
+	r.POSTJWT("/article/top", ArticleTop)
 
 }
 
@@ -60,7 +61,7 @@ func ArticleList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		Size:        size,
 		Query:       query,
 		Project:     ArticleProjects,
-		Sort:        bson.D{bson.E{Key: "sort", Value: 1}, bson.E{Key: "createTime", Value: -1}},
+		Sort:        bson.D{bson.E{Key: "sort", Value: -1}, bson.E{Key: "createTime", Value: -1}},
 	})
 }
 
@@ -131,10 +132,42 @@ func ArticleSearch(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		Size:        size,
 		Query:       query,
 		Project:     ArticleProjects,
-		Sort:        bson.D{bson.E{Key: "sort", Value: 1}, bson.E{Key: "createTime", Value: -1}},
+		Sort:        bson.D{bson.E{Key: "sort", Value: -1}, bson.E{Key: "createTime", Value: -1}},
 	})
 	if err != nil {
 		return nil, errors.New("查询字符不正确")
 	}
 	return result, err
 }
+
+type ArticlTopReq struct {
+	Id  primitive.ObjectID
+	Cid primitive.ObjectID
+}
+
+func ArticleTop(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	// id cid
+	var req ArticlTopReq
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		return nil, errors.New("参数错误！")
+	}
+
+	// 查询该分类排列最前面一条的sort
+	article := model.Article{}
+	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+		CollectName: repo.CollectionArticle,
+		Query:       repo.Map{"cid": req.Cid},
+		Project:     []string{"sort"},
+		Sort:        bson.M{"sort": -1},
+	}, &article)
+	if err != nil {
+		return nil, err
+	}
+	sort := 0
+	if ok {
+		sort = *article.Sort
+	}
+	sort++
+	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionArticle, req.Id.Hex(), &model.Article{Sort: &sort})
+}

baishuihu/api/banner.go

@@ -19,6 +19,7 @@ func Banner(r *GinRouter) {
 	r.GET("/banner/list", BannerList)
 	r.GET("/banner/detail/:id", BannerDetail)
 	r.POSTJWT("/banner/update", UpdateBanner)
+	r.POSTJWT("/banner/top", BannerTop)
 }
 
 func CreateBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
@@ -63,7 +64,7 @@ func BannerList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		Page:        page,
 		Size:        size,
 		Query:       query,
-		Sort:        bson.D{bson.E{Key: "sort", Value: 1}, bson.E{Key: "createTime", Value: -1}},
+		Sort:        bson.D{bson.E{Key: "sort", Value: -1}, bson.E{Key: "createTime", Value: -1}},
 	})
 }
 
@@ -109,3 +110,33 @@ func UpdateBanner(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	}
 	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), collection, cate.Id.Hex(), &cate)
 }
+
+type BannerTopReq struct {
+	Id primitive.ObjectID
+}
+
+func BannerTop(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	// id cid
+	var req BannerTopReq
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		return nil, errors.New("参数错误！")
+	}
+
+	// 查询该分类排列最前面一条的sort
+	banner := model.Banner{}
+	ok, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+		CollectName: repo.CollectionBanner,
+		Project:     []string{"sort"},
+		Sort:        bson.M{"sort": -1},
+	}, &banner)
+	if err != nil {
+		return nil, err
+	}
+	sort := 0
+	if ok {
+		sort = *banner.Sort
+	}
+	sort++
+	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionBanner, req.Id.Hex(), &model.Banner{Sort: &sort})
+}

baishuihu/db/db.go

@@ -9,8 +9,9 @@ import (
 )
 
 type MongoDB struct {
-	Client   *mongo.Client
-	Database *mongo.Database
+	Client    *mongo.Client
+	Database  *mongo.Database
+	Databases map[string]*mongo.Database //所有数据库
 }
 
 var GMongoDb *MongoDB
@@ -18,6 +19,20 @@ var GMongoDb *MongoDB
 func (db *MongoDB) GetCollection(name string) *mongo.Collection {
 	return db.Database.Collection(name)
 }
+func (db *MongoDB) GetDbCollection(dbname string, name string) *mongo.Collection {
+	if len(dbname) < 1 {
+		return db.GetCollection(name)
+	}
+	return db.GetOrCreateDatabase(dbname).Collection(name)
+}
+func (db *MongoDB) GetOrCreateDatabase(name string) *mongo.Database {
+	datab := db.Databases[name]
+	if datab == nil {
+		datab = db.Client.Database(name)
+		db.Databases[name] = datab
+	}
+	return datab
+}
 
 // 从config-service中获取配置，创建
 func NewConfigMongoDB(bus *comm.NatsBus, config *conf.AppConf) *MongoDB {

baishuihu/db/model/article.go

@@ -10,14 +10,15 @@ import (
 // db.getCollection(users).createIndex({loginName: 1}, {unique: true})
 // db.getCollection(article).createIndex({cid: 1})
 type Article struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Cid        primitive.ObjectID `bson:"cid,omitempty" json:"cid"`     // 分类id
-	Title      string             `bson:"title,omitempty" json:"title"` // 不为空
-	Type       string             `bson:"type,omitempty" json:"type"`   // 类型与category对应 list,detail,download
-	Cover      string             `bson:"cover,omitempty" json:"cover"`
-	Summary    string             `bson:"summary,omitempty" json:"summary"` // 文章摘要
-	Content    string             `bson:"content,omitempty" json:"content"`
-	Sort       *int               `bson:"sort,omitempty" json:"sort"` // 排序，使用创建时间联合排序。排序按升序排，默认为0
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
+	Id      primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	Cid     primitive.ObjectID `bson:"cid,omitempty" json:"cid"`     // 分类id
+	Title   string             `bson:"title,omitempty" json:"title"` // 不为空
+	Type    string             `bson:"type,omitempty" json:"type"`   // 类型与category对应 list,detail,download
+	Cover   string             `bson:"cover,omitempty" json:"cover"`
+	Summary string             `bson:"summary,omitempty" json:"summary"` // 文章摘要
+	Content string             `bson:"content,omitempty" json:"content"`
+	// 如果有置顶功能，则查询出最新一条的sort值，sort+1更新要置顶的，按降序排
+	Sort       *int      `bson:"sort,omitempty" json:"sort"` // 排序，使用创建时间联合排序。排序按升序排，默认为0
+	CreateTime time.Time `bson:"createTime,omitempty" json:"createTime"`
+	UpdateTime time.Time `bson:"updateTime,omitempty" json:"updateTime"`
 }

baishuihu/db/repo/repo.go

@@ -44,9 +44,11 @@ type PageSearchOptions struct {
 }
 
 type DocSearchOptions struct {
+	Db          string
 	CollectName string
 	Query       Map
 	Project     []string
+	Sort        bson.M
 }
 
 func NewDocSearchOptions(filter Map, project []string) *DocSearchOptions {
@@ -123,8 +125,12 @@ func RepoUpdateSetDocProps(ctx *RepoSession, collectName string, idstr string, u
 
 func RepoSeachDoc(ctx *RepoSession, param *DocSearchOptions, v interface{}) (bool, error) {
 
-	colls := ctx.Client.GetCollection(param.CollectName)
+	colls := ctx.Client.GetDbCollection(param.Db, param.CollectName)
+
 	opt := &options.FindOneOptions{}
+	if param.Sort != nil {
+		opt.SetSort(param.Sort)
+	}
 	if len(param.Project) > 0 {
 		prj := bson.M{}
 		for _, v := range param.Project {