diff --git a/api/v1/category/category.go b/api/v1/category/category.go index 7e836d1..1881fc4 100644 --- a/api/v1/category/category.go +++ b/api/v1/category/category.go @@ -196,3 +196,14 @@ func (catApi *CategoryApi) GetCategoryListPublic(context *gin.Context) { } response.OkWithData(list, context) } + +// GetArticleCategoryList 获取文章类别列表 +func (catApi *CategoryApi) GetArticleCategoryList(context *gin.Context) { + list, err := catService.GetArticleCategoryList() + if err != nil { + global.GVA_LOG.Error("获取文章类别列表失败!", zap.Error(err)) + response.FailWithMessage("获取文章类别列表失败:"+err.Error(), context) + return + } + response.OkWithData(list, context) +} diff --git a/model/category/category.go b/model/category/category.go index 7beba6a..f3a330a 100644 --- a/model/category/category.go +++ b/model/category/category.go @@ -15,6 +15,8 @@ type Category struct { Icon *string `json:"icon" form:"icon" gorm:"column:icon;comment:类别图标;"` //图标 IndexTrue *bool `json:"index" form:"index" gorm:"column:index;comment:是否首页显示;"` //是否首页显示 Url *string `json:"url" form:"url" gorm:"column:url;comment:类别链接;"` //链接 + // 是否文章分类 + IsArticle *int `json:"isArticle" form:"isArticle" gorm:"column:is_article;default:0;comment:是否文章分类;"` //是否文章分类 } // TableName 类别 Category自定义表名 categories diff --git a/router/category/category.go b/router/category/category.go index 34d7f21..f744889 100644 --- a/router/category/category.go +++ b/router/category/category.go @@ -23,7 +23,8 @@ func (s *CategoryRouter) InitCategoryRouter(Router *gin.RouterGroup, PublicRoute catRouterWithoutRecord.GET("getCategoryList", catApi.GetCategoryList) // 获取类别列表 } { - catRouterWithoutAuth.GET("getCategoryPublic", catApi.GetCategoryPublic) // 类别开放接口 - catRouterWithoutAuth.GET("/index", catApi.GetCategoryListPublic) // 获取类别列表公开接口 + catRouterWithoutAuth.GET("getCategoryPublic", catApi.GetCategoryPublic) // 类别开放接口 + catRouterWithoutAuth.GET("/index", catApi.GetCategoryListPublic) // 获取类别列表公开接口 + catRouterWithoutAuth.GET("/article/list", catApi.GetArticleCategoryList) // 获取类别列表公开接口 } } diff --git a/service/category/category.go b/service/category/category.go index b8d95e2..93771c5 100644 --- a/service/category/category.go +++ b/service/category/category.go @@ -86,10 +86,20 @@ func (catService *CategoryService) GetCategoryPublic(ctx context.Context) { } func (catService *CategoryService) GetIndexCategoryList() (list []category.Category, err error) { - err = global.GVA_DB.Model(&category.Category{}).Where("categories.index = 1").Find(&list).Error + err = global.GVA_DB.Model(&category.Category{}).Where("categories.index = 1 and categories.is_article=0").Find(&list).Error if err != nil { global.GVA_LOG.Error("获取首页分类失败", zap.Error(err)) return nil, err } return } + +// GetArticleCategoryList 获取文章分类 +func (catService *CategoryService) GetArticleCategoryList() (list []category.Category, err error) { + err = global.GVA_DB.Model(&category.Category{}).Where("categories.is_article = 1").Find(&list).Error + if err != nil { + global.GVA_LOG.Error("获取文章分类失败", zap.Error(err)) + return + } + return +}