From acea479f839f9d3368f0b579a6bbced60090b0c8 Mon Sep 17 00:00:00 2001
From: "mail_yanpeng@163.com" <yyyq94581017>
Date: Wed, 14 Aug 2019 15:05:21 +0800
Subject: [PATCH] es index

---
 conf/app.conf                 |  2 +-
 controllers/BlogController.go | 20 ++++++++++++++++++--
 routers/BlogRouter.go         |  1 +
 service/BlogService.go        | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index bf2fce5..a4fd382 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -13,7 +13,7 @@ host = aiprose.com
 httpport = 8082
 uploadDir = "static/upload/"
 imgUrlPrefix = "http://localhost:8082/static/upload/"
-dburl = "booszy@tcp(47.98.109.5:3306)"
+dburl = "booszy@tcp(localhost:3306)"
 
 [prod]
 httpport = 8082
diff --git a/controllers/BlogController.go b/controllers/BlogController.go
index 91d8e7f..232aa04 100644
--- a/controllers/BlogController.go
+++ b/controllers/BlogController.go
@@ -130,8 +130,7 @@ func (this *BlogController) Get() {
 	if blogs, err := blogService.TopBlogByUser(blog.UserId); err == nil {
 		this.Data["Top"] = blogs
 	}
-	//utils.Index()
-	utils.ESSave(blog)
+
 	this.Data["Blog"] = blog
 	this.Data["UserId"] = this.GetSession("userid")
 	this.Data["HeadImg"] = this.GetSession("headimg")
@@ -236,3 +235,20 @@ func (this *BlogController) Search() {
 	this.Data["json"] = models.ReurnData("", blog)
 	this.ServeJSON()
 }
+
+func (this *BlogController) SyncBlog() {
+	utils.Index()
+	blogService := service.BlogService{}
+	list, err := blogService.AllBlogs()
+	var i = 0
+	if err != nil {
+		this.Data["json"] = models.ReurnError(500,"");
+		this.ServeJSON()
+	}
+	for index := range list {
+		utils.ESSave(list[index])
+		i++
+	}
+	this.Data["json"] = models.ReurnData("",i)
+	this.ServeJSON()
+}
diff --git a/routers/BlogRouter.go b/routers/BlogRouter.go
index 0a6a62b..623b002 100644
--- a/routers/BlogRouter.go
+++ b/routers/BlogRouter.go
@@ -14,4 +14,5 @@ func init() {
 	beego.Router("/blogs", &controllers.BlogController{}, "get:BlogsPage")
 	beego.Router("/blog/new", &controllers.BlogController{}, "get:New")
 	beego.Router("/open/blog/search", &controllers.BlogController{}, "get:Search")
+	beego.Router("/es/blog/index", &controllers.BlogController{}, "put:SyncBlog")
 }
diff --git a/service/BlogService.go b/service/BlogService.go
index f2ccd51..73ca55d 100644
--- a/service/BlogService.go
+++ b/service/BlogService.go
@@ -133,6 +133,21 @@ func (this *BlogService) FindBlogs(num int, size int, cat int64, flag int) (*uti
 	return page, nil
 }
 
+
+func (this *BlogService) AllBlogs() ([]*models.Blog, error) {
+
+	var blogs []*models.Blog
+	o := orm.NewOrm()
+	qs := o.QueryTable(&models.Blog{})
+	qs = qs.Filter("Delflag", 0)
+	_, err := qs.All(&blogs)
+	if err != nil {
+		return nil, err
+	}
+	return blogs, nil
+}
+
+
 func (this *BlogService) SaveBlog(blog *models.Blog, strs []string) error {
 	o := orm.NewOrm()
 	o.Begin()