feat:es升级

entbase/src/config.json

@@ -26,10 +26,6 @@
     "userName": "admin",
     "password": "123456"
   },
-  "elasticsearch": {
-    "address": "http://192.168.3.128:9800",
-    "size": 2
-  },
   "redisAddrs": "other=192.168.3.206:1712,session=192.168.3.11:1713,newother=192.168.3.206:1712",
   "mysql": {
     "dbName": "jianyu",

entbase/src/go.mod

@@ -3,8 +3,8 @@ module entbase/src
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230330033418-1a2badb5d6b0
+	app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e
+	app.yhyue.com/moapp/jypkg v0.0.0-20230417095606-8e072b743903
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/dchest/captcha v1.0.0
 	github.com/gogf/gf/v2 v2.0.6
@@ -50,9 +50,11 @@ require (
 	github.com/howeyc/fsnotify v0.9.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/longbridgeapp/sqlparser v0.3.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -63,6 +65,7 @@ require (
 	github.com/nsqio/go-nsq v1.1.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/olivere/elastic v6.2.37+incompatible // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
 	github.com/openzipkin/zipkin-go v0.4.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

entbase/src/go.sum

@@ -4,10 +4,11 @@ app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 h1:cCmWQW8D
 app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547/go.mod h1:JvIs8uKjdT963+7JnZGIEcL4ctBiBjwkoz0kNyigE78=
 app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Yd0gsI12FU=
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230330033418-1a2badb5d6b0 h1:hpqaArpHMehl+DFMKwO0D+9O3CLSy3UsUevGnNo+8BA=
-app.yhyue.com/moapp/jypkg v0.0.0-20230330033418-1a2badb5d6b0/go.mod h1:cWnWKx0bOu5dHKAVAoYFRCDqEWDw2lOVWUAA5a0u+74=
+app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e h1:BZEMetT36NokzQwEDRGHbQ5c/2A3cRQ12Z+rw0I5xhQ=
+app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
+app.yhyue.com/moapp/jypkg v0.0.0-20230417095606-8e072b743903 h1:W3xAAMC+9l8lfSpbERDFPj/gWn8syohir2bOJHvKcTU=
+app.yhyue.com/moapp/jypkg v0.0.0-20230417095606-8e072b743903/go.mod h1:UDW1R1aXQ19dB4QNcCy2E2ckAbtB2oo/7W4pA95i2BE=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -519,6 +520,7 @@ github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
@@ -947,6 +949,7 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U=
 github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
+github.com/olivere/elastic/v7 v7.0.22 h1:esBA6JJwvYgfms0EVlH7Z+9J4oQ/WUADF2y/nCNDw7s=
 github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

entbase/src/main.go

@@ -13,7 +13,6 @@ import (
 	"net/rpc"
 
 	"app.yhyue.com/moapp/jybase/endless"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	mg "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
@@ -75,9 +74,6 @@ func init() {
 		MaxIdleConns: Config.Base.MaxIdleConns,
 	}
 	Base.Init()
-
-	//初始化elastic
-	elastic.InitElasticSize(Config.Elasticsearch.Address, Config.Elasticsearch.Size)
 }
 
 func main() {

entniche/src/db/db.go

@@ -12,7 +12,7 @@ import (
 
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"

entniche/src/service/customer/project.go

@@ -5,7 +5,7 @@ import (
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	. "app.yhyue.com/moapp/jypkg/ent/util"
 	. "entniche/src/db"
 	"fmt"

entniche/src/service/subscribe/subscribe.go

@@ -13,7 +13,7 @@ import (
 
 	. "app.yhyue.com/moapp/jybase/api"
 	qutil "app.yhyue.com/moapp/jybase/common"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	. "app.yhyue.com/moapp/jypkg/ent/entity"

entniche_new/src/db.json

@@ -38,7 +38,10 @@
 	"elasticsearch": {
 		"main": {
 			"address": "http://192.168.3.206:9800",
-	    	"size": 5
+	    	"size": 5,
+			"version": "v7",
+			"userName":"",
+			"password":""
 		}
     },
     "redis": {

entniche_new/src/db/db.go

@@ -1,11 +1,12 @@
 package public
 
 import (
-	"app.yhyue.com/moapp/jypkg/compatible"
 	"entniche_new/src/config"
 	"fmt"
 	"log"
 
+	"app.yhyue.com/moapp/jypkg/compatible"
+
 	m "app.yhyue.com/moapp/jybase/mongodb"
 
 	util "app.yhyue.com/moapp/jybase/common"
@@ -13,7 +14,7 @@ import (
 
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -55,8 +56,11 @@ type mgoConf struct {
 }
 
 type esConf struct {
-	Address string
-	Size    int
+	Address  string
+	Size     int
+	Version  string
+	UserName string
+	Password string
 }
 type redisConf struct {
 	Address string
@@ -75,7 +79,7 @@ func init() {
 	if DbConf != nil {
 		fmt.Println(DbConf.Elasticsearch.Main)
 		if DbConf.Elasticsearch.Main != nil {
-			elastic.InitElasticSize(DbConf.Elasticsearch.Main.Address, DbConf.Elasticsearch.Main.Size)
+			elastic.NewEs(DbConf.Elasticsearch.Main.Version, DbConf.Elasticsearch.Main.Address, DbConf.Elasticsearch.Main.Size, DbConf.Elasticsearch.Main.UserName, DbConf.Elasticsearch.Main.Password)
 			log.Println("初始化 elasticsearch")
 		}
 		//初始化redis

entniche_new/src/entity/aggsSearchUtil.go

@@ -1,42 +1,11 @@
 package entity
 
 import (
-	"fmt"
-	"log"
-	"runtime"
-
-	elastic1 "app.yhyue.com/moapp/esv1/gopkg.in/olivere/elastic.v1"
-	util "app.yhyue.com/moapp/jybase/common"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 )
 
 //聚合查询
-func GetAggs(index, itype, query string) (aggs elastic1.Aggregations, count int64) {
-	fmt.Println(query)
-	defer util.Catch()
-	client := elastic.GetEsConn()
-	defer func() {
-		go elastic.DestoryEsConn(client)
-	}()
-	if client != nil {
-		defer func() {
-			if r := recover(); r != nil {
-				log.Println("[E]", r)
-				for skip := 1; ; skip++ {
-					_, file, line, ok := runtime.Caller(skip)
-					if !ok {
-						break
-					}
-					go log.Printf("%v,%v\n", file, line)
-				}
-			}
-		}()
-		searchResult, err := client.Search().Index(index).Type(itype).Source(query).Do()
-		if err != nil {
-			log.Println("从ES查询出错", err.Error())
-		}
-		count = searchResult.Hits.TotalHits
-		aggs = searchResult.Aggregations
-	}
+func GetAggs(index, itype, query string) (aggs elastic.Aggregations, count int64) {
+	aggs, count, _ = elastic.GetAggs(index, itype, query)
 	return
 }

entniche_new/src/entity/followProject.go

@@ -16,7 +16,7 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jybase/rpc"
 
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	. "app.yhyue.com/moapp/jypkg/ent/util"
 	db "app.yhyue.com/moapp/jypkg/ent/util"

entniche_new/src/entity/portrait.go

@@ -10,7 +10,7 @@ import (
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/ent/util"

entniche_new/src/entity/portraitBuyerSearch.go

@@ -13,7 +13,7 @@ import (
 
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jypkg/ent/util"
 )
 

entniche_new/src/entity/portraitWinnerSearch.go

@@ -11,7 +11,7 @@ import (
 
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	db "app.yhyue.com/moapp/jypkg/ent/util"
 )
 

entniche_new/src/entity/portrait_screen.go

@@ -11,7 +11,7 @@ import (
 
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jypkg/ent/util"
 )
 

entniche_new/src/go.mod

@@ -3,9 +3,8 @@ module entniche_new/src
 go 1.18
 
 require (
-	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d
-	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230322023912-c14ab6d0814c
+	app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e
+	app.yhyue.com/moapp/jypkg v0.0.0-20230417095606-8e072b743903
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/gogf/gf/v2 v2.0.6
 	github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed
@@ -14,6 +13,7 @@ require (
 )
 
 require (
+	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
@@ -52,9 +52,11 @@ require (
 	github.com/howeyc/fsnotify v0.9.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/longbridgeapp/sqlparser v0.3.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -65,6 +67,7 @@ require (
 	github.com/nsqio/go-nsq v1.1.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/olivere/elastic v6.2.37+incompatible // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
 	github.com/openzipkin/zipkin-go v0.4.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

entniche_new/src/go.sum

@@ -4,10 +4,11 @@ app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 h1:cCmWQW8D
 app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547/go.mod h1:JvIs8uKjdT963+7JnZGIEcL4ctBiBjwkoz0kNyigE78=
 app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Yd0gsI12FU=
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230322023912-c14ab6d0814c h1:fzwcVu7xXHK78P3CZCp/j89htu3mKRSTEsv27qpciPE=
-app.yhyue.com/moapp/jypkg v0.0.0-20230322023912-c14ab6d0814c/go.mod h1:cWnWKx0bOu5dHKAVAoYFRCDqEWDw2lOVWUAA5a0u+74=
+app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e h1:BZEMetT36NokzQwEDRGHbQ5c/2A3cRQ12Z+rw0I5xhQ=
+app.yhyue.com/moapp/jybase v0.0.0-20230417095507-cf35f190347e/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
+app.yhyue.com/moapp/jypkg v0.0.0-20230417095606-8e072b743903 h1:W3xAAMC+9l8lfSpbERDFPj/gWn8syohir2bOJHvKcTU=
+app.yhyue.com/moapp/jypkg v0.0.0-20230417095606-8e072b743903/go.mod h1:UDW1R1aXQ19dB4QNcCy2E2ckAbtB2oo/7W4pA95i2BE=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -518,6 +519,7 @@ github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
@@ -946,6 +948,7 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U=
 github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
+github.com/olivere/elastic/v7 v7.0.22 h1:esBA6JJwvYgfms0EVlH7Z+9J4oQ/WUADF2y/nCNDw7s=
 github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

entniche_new/src/service/customer/customer.go

@@ -1,8 +1,6 @@
 package customer
 
 import (
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"database/sql"
 	"encoding/json"
 	"entniche_new/src/config"
@@ -10,12 +8,14 @@ import (
 	"fmt"
 	"log"
 	"math"
-	"runtime"
 	"strconv"
 	"strings"
 	"time"
 
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+
+	elastic "app.yhyue.com/moapp/jybase/es"
 
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 
@@ -24,8 +24,6 @@ import (
 	. "app.yhyue.com/moapp/jybase/date"
 	. "app.yhyue.com/moapp/jypkg/ent/entity"
 	. "app.yhyue.com/moapp/jypkg/ent/util"
-
-	elastic1 "app.yhyue.com/moapp/esv1/gopkg.in/olivere/elastic.v1"
 )
 
 const (
@@ -1043,62 +1041,13 @@ type Bucket struct {
 }
 
 // 聚合查询
-func GetAggs(index, itype, query string) (aggs elastic1.Aggregations, res []map[string]interface{}, count int64, msg string) {
+func GetAggs(index, itype, query string) (aggs elastic.Aggregations, res []map[string]interface{}, count int64, msg string) {
 	count = elastic.Count(index, itype, query)
 	if count > config.Config.ItemsNumber {
 		msg = "搜索目标过于宽泛，请缩小搜索范围。"
 		return
 	}
-	defer qutil.Catch()
-	client := elastic.GetEsConn()
-	defer func() {
-		go elastic.DestoryEsConn(client)
-	}()
-	if client != nil {
-		defer func() {
-			if r := recover(); r != nil {
-				for skip := 1; ; skip++ {
-					_, file, line, ok := runtime.Caller(skip)
-					if !ok {
-						break
-					}
-					go log.Printf("%v,%v\n", file, line)
-				}
-			}
-		}()
-		searchResult, err := client.Search().Index(index).Type(itype).Source(query).Do()
-		if searchResult.TimedOut {
-			//请求超时
-			log.Println(err, "____________:::", searchResult.TimedOut)
-			return
-		}
-		if err != nil {
-			log.Println("从ES查询出错", err.Error())
-		}
-		aggs = searchResult.Aggregations
-		if searchResult.Hits != nil {
-			resNum := len(searchResult.Hits.Hits)
-			if resNum < 10000 {
-				res = make([]map[string]interface{}, resNum)
-				for i, hit := range searchResult.Hits.Hits {
-					parseErr := json.Unmarshal(*hit.Source, &res[i])
-					if parseErr == nil && hit.Highlight != nil && res[i] != nil {
-
-						res[i]["highlight"] = map[string][]string(hit.Highlight)
-					}
-					if hit.Source != nil && res[i] != nil {
-						data := map[string]interface{}{}
-						dataByte, _ := hit.Source.MarshalJSON()
-						json.Unmarshal(dataByte, &data)
-						res[i]["source"] = data
-					}
-
-				}
-			} else {
-				log.Println("查询结果太多，查询到：", resNum, "条")
-			}
-		}
-	}
+	aggs, _, res = elastic.GetAggs(index, itype, query)
 	return
 }
 

entniche_new/src/service/customer/entiy.go

@@ -2,7 +2,7 @@ package customer
 
 import (
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"

entniche_new/src/service/customer/project.go

@@ -2,7 +2,7 @@ package customer
 
 import (
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	. "entniche_new/src/db"
 	"fmt"
 	"math"

entniche_new/src/service/follow/project.go

@@ -12,7 +12,7 @@ import (
 
 	"app.yhyue.com/moapp/jybase/redis"
 
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 
 	. "app.yhyue.com/moapp/jybase/api"
 	qutil "app.yhyue.com/moapp/jybase/common"

entniche_new/src/service/subscribe/subscribe.go

@@ -14,7 +14,7 @@ import (
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	. "app.yhyue.com/moapp/jybase/mongodb"