From 19c84910f89c114181500d84bbca3184f1638c91 Mon Sep 17 00:00:00 2001
From: nelson <mail_yanpeng@163.com>
Date: Sat, 18 May 2019 02:00:51 +0800
Subject: [PATCH] =?UTF-8?q?es=E5=88=9B=E5=BB=BA=E7=B4=A2=E5=BC=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/BlogController.go |  5 +++++
 main.go                       | 24 ------------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/controllers/BlogController.go b/controllers/BlogController.go
index cc0d8fd..c919d54 100644
--- a/controllers/BlogController.go
+++ b/controllers/BlogController.go
@@ -3,6 +3,7 @@ package controllers
 import (
 	"beeblog/models"
 	"beeblog/service"
+	"beeblog/utils"
 	"github.com/astaxie/beego"
 	"strconv"
 	"time"
@@ -103,6 +104,8 @@ func (this *BlogController) Get() {
 	idStr := this.Ctx.Input.Param(":id")
 	id, _ := strconv.ParseInt(idStr, 10, 64)
 	blog, err := blogService.GetBlog(id)
+	blog.User.Salt = ""
+	blog.User.UserPwd = ""
 	if err != nil {
 		this.Redirect("/404", 302)
 		return
@@ -118,6 +121,8 @@ func (this *BlogController) Get() {
 	if blogs, err := blogService.TopBlogByUser(blog.UserId); err == nil {
 		this.Data["Top"] = blogs
 	}
+	//utils.Index()
+	utils.Save(blog)
 	this.Data["Blog"] = blog
 	this.Data["UserId"] = this.GetSession("userid")
 	this.Data["HeadImg"] = this.GetSession("headimg")
diff --git a/main.go b/main.go
index 337ec24..31e9510 100644
--- a/main.go
+++ b/main.go
@@ -8,30 +8,8 @@ import (
 	"github.com/astaxie/beego/logs"
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/plugins/cors"
-	"github.com/olivere/elastic"
-	"log"
-	"os"
-	"time"
 )
 
-
-var host = "http://47.98.109.5:8209/"
-
-func connect() *elastic.Client {
-	client, err := elastic.NewClient(
-		elastic.SetURL(host),
-		elastic.SetSniff(false),
-		elastic.SetHealthcheckInterval(10*time.Second),
-		elastic.SetGzip(true),
-		elastic.SetErrorLog(log.New(os.Stderr, "ELASTIC ", log.LstdFlags)),
-		elastic.SetInfoLog(log.New(os.Stdout, "", log.LstdFlags)))
-
-	if err != nil {
-		panic(err)
-	}
-	return client
-}
-
 func init() {
 	models.RegistDB()
 	beego.InsertFilter("/*", beego.BeforeRouter, filter.LogFilter)
@@ -50,8 +28,6 @@ func main() {
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowCredentials: true,
 	}))
-	//client := connect()
-	//fmt.Println("client", client)
 	beego.Run()
 }