es升级

jyinfomatch/master/src/config.json

@@ -3,7 +3,7 @@
   "MatchColl": "usermail",
   "DurationMinutes": 60,
   "ElasticPoolSize": 1,
-  "Elasticsearch": "http://192.168.3.128:9800",
+  "Elasticsearch": "http://192.168.3.241:9205",
   "ExcludeColl": "exclude",
   "Fields": {
     "_id": 1,
@@ -103,5 +103,8 @@
     "city",
     "buyerclass",
     "currency"
-  ]
+  ],
+  "Version": "v7",
+  "UserName": "",
+  "Password": ""
 }

jyinfomatch/master/src/config/config.go

@@ -1,4 +1,3 @@
-//
 package config
 
 import (
@@ -36,6 +35,9 @@ type sysConfig struct {
 	RedisServers    string
 	SaveSize        int
 	StringFields    []string
+	Version         string
+	UserName        string
+	Password        string
 }
 
 type baseDB struct {

jyinfomatch/master/src/main.go

@@ -3,21 +3,22 @@ package main
 import (
 	. "config"
 	"difficult"
+	elastic "es"
 	"flag"
 	"log"
-	"qfw/util/elastic"
 	"qfw/util/redis"
 	"qyfw"
 	"time"
 )
 
-//初始化
+// 初始化
 func init() {
-	elastic.InitElasticSize(SysConfig.Elasticsearch, SysConfig.ElasticPoolSize)
+	// elastic.InitElasticSize(SysConfig.Elasticsearch, SysConfig.ElasticPoolSize)
+	elastic.NewEs(SysConfig.Version, SysConfig.Elasticsearch, SysConfig.ElasticPoolSize, SysConfig.UserName, SysConfig.Password)
 	redis.InitRedis(SysConfig.RedisServers)
 }
 
-//主应用，定时任务
+// 主应用，定时任务
 func main() {
 	m := flag.Int("m", 0, "1-非定时任务模式")
 	flag.Parse()
@@ -31,7 +32,7 @@ func main() {
 	}
 }
 
-//开始定时任务
+// 开始定时任务
 func run() {
 	nexttime := time.Duration(SysConfig.DurationMinutes) * time.Minute
 	now := time.Now()