From 90bd42d488c77c360a5df7f38862baae2f7fe1b3 Mon Sep 17 00:00:00 2001
From: Echo <1711788888@qq.com>
Date: Sat, 6 Sep 2025 21:46:57 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=88=86=E7=B1=BB=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v1/category/category.go  | 11 +++++++++++
 model/category/category.go   |  2 ++
 router/category/category.go  |  5 +++--
 service/category/category.go | 12 +++++++++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

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
+}