diff --git a/controller/admin/articleController.go b/controller/admin/articleController.go index 86ffc50..57131d4 100644 --- a/controller/admin/articleController.go +++ b/controller/admin/articleController.go @@ -1,10 +1,21 @@ package admin -import "github.com/gin-gonic/gin" +import ( + "awesomeProject/model" + + "github.com/gin-gonic/gin" +) type ArticleController struct { } +func (con ArticleController) Index(c *gin.Context) { + articleList := []model.Article{} + model.DB.Preload("ArticleCate").Find(&articleList) + c.JSON(200, articleList) + +} + func (con ArticleController) Article(c *gin.Context) { c.String(200, "管理员文章列表") } diff --git a/controller/admin/navController.go b/controller/admin/navController.go new file mode 100644 index 0000000..bd09d04 --- /dev/null +++ b/controller/admin/navController.go @@ -0,0 +1,17 @@ +package admin + +import ( + "awesomeProject/model" + + "github.com/gin-gonic/gin" +) + +type NavController struct { + BaseController +} + +func (con NavController) Index(c *gin.Context) { + navList := []model.Nav{} + model.DB.Find(&navList) + c.JSON(200, navList) +} diff --git a/model/article.go b/model/article.go index 6b03fe9..bb2739d 100644 --- a/model/article.go +++ b/model/article.go @@ -1,10 +1,11 @@ package model type Article struct { - Id int - Title string - CateId int - State int + Id int + Title string + CateId int + State int + ArticleCate ArticleCate `gorm:"foreignKey:CateId;references:State"` } func (Article) TableName() string { diff --git a/model/article_cate.go b/model/article_cate.go new file mode 100644 index 0000000..5f3b5da --- /dev/null +++ b/model/article_cate.go @@ -0,0 +1,11 @@ +package model + +type ArticleCate struct { + Id int + Title string + State int +} + +func (ArticleCate) TableName() string { + return "article_cate" +} diff --git a/model/core.go b/model/core.go index 2a3375f..2ef15b4 100644 --- a/model/core.go +++ b/model/core.go @@ -20,8 +20,8 @@ func init() { return } - // 自动创建数据表 - err = DB.AutoMigrate(&User{}) + // 自动创建所有不存在的表 + err = DB.AutoMigrate(&User{}, &Article{}, &Nav{}, &ArticleCate{}) if err != nil { fmt.Println("数据表迁移失败:", err) } else { diff --git a/model/nav.go b/model/nav.go new file mode 100644 index 0000000..2df688c --- /dev/null +++ b/model/nav.go @@ -0,0 +1,13 @@ +package model + +type Nav struct { + Id int `json:"id"` + Title string `json:"title"` + Url string `json:"url"` + Status int `json:"status"` + Sort int `json:"sort"` +} + +func (Nav) TableName() string { + return "nav" +} diff --git a/model/user.go b/model/user.go index 29bf3f0..6a9d82a 100644 --- a/model/user.go +++ b/model/user.go @@ -1,12 +1,12 @@ package model type User struct { - Id int - Name string - Age int - Email string - Password string - AddTime int + Id int `json:"id"` + Name string `json:"name"` + Age int `json:"age"` + Email string `json:"email"` + Password string `json:"password"` + AddTime int `json:"add_time"` } func (User) TableName() string { diff --git a/router/adminRouter.go b/router/adminRouter.go index af6f252..5e27324 100644 --- a/router/adminRouter.go +++ b/router/adminRouter.go @@ -22,7 +22,7 @@ func AdminRouterInit(r *gin.Engine) { adminRouter.GET("/login", admin.IndexController{}.Login) - adminRouter.GET("/article", admin.ArticleController{}.Article) + adminRouter.GET("/article", admin.ArticleController{}.Index) adminRouter.GET("/user", admin.UserController{}.Index)