wip:文库es初始化

public/db.go

@@ -5,7 +5,6 @@ import (
 
 	util "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/es"
-	es "app.yhyue.com/moapp/jybase/esv7"
 	m "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -25,6 +24,7 @@ var (
 	//Mgo_Qyfw    m.MongodbSim
 	Other elastic.Es
 	Free  elastic.Es //登录后的免费用户搜索使用
+	Doc   elastic.Es
 )
 
 type dbConf struct {
@@ -38,9 +38,9 @@ type dbConf struct {
 	}
 	Elasticsearch struct {
 		Main  *esConf
-		Doc   *esConf
 		Other *esConf
 		Free  *esConf
+		Doc   *esConf
 	}
 	Redis struct {
 		Main  *redisConf
@@ -93,12 +93,6 @@ func init() {
 			log.Println("初始化 elasticsearch")
 		}
 
-		if DbConf.Elasticsearch.Doc != nil {
-			es.InitElasticSizeByAuth(DbConf.Elasticsearch.Doc.Address, DbConf.Elasticsearch.Doc.Size,
-				DbConf.Elasticsearch.Doc.UserName, DbConf.Elasticsearch.Doc.Password)
-			log.Println("初始化 doc elasticsearch")
-		}
-
 		if DbConf.Elasticsearch.Other != nil {
 			Other = &elastic.EsV7{
 				Address:  DbConf.Elasticsearch.Other.Address,
@@ -123,6 +117,19 @@ func init() {
 			log.Println("初始化 Free elasticsearch")
 		}
 
+		if DbConf.Elasticsearch.Doc != nil {
+			//es.InitElasticSizeByAuth(DbConf.Elasticsearch.Doc.Address, DbConf.Elasticsearch.Doc.Size,
+			//	DbConf.Elasticsearch.Doc.UserName, DbConf.Elasticsearch.Doc.Password)
+			Doc = &elastic.EsV7{
+				Address:  DbConf.Elasticsearch.Doc.Address,
+				UserName: DbConf.Elasticsearch.Doc.UserName,
+				Password: DbConf.Elasticsearch.Doc.Password,
+				Size:     DbConf.Elasticsearch.Doc.Size,
+			}
+			Doc.Init()
+			log.Println("初始化 doc elasticsearch")
+		}
+
 		//初始化redis
 		if DbConf.Redis.Main != nil {
 			log.Println("初始化 redis")