|
@@ -1,13 +1,14 @@
|
|
package public
|
|
package public
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
+ "log"
|
|
|
|
+
|
|
util "app.yhyue.com/moapp/jybase/common"
|
|
util "app.yhyue.com/moapp/jybase/common"
|
|
- elastic "app.yhyue.com/moapp/jybase/esv1"
|
|
|
|
|
|
+ elastic "app.yhyue.com/moapp/jybase/es"
|
|
es "app.yhyue.com/moapp/jybase/esv7"
|
|
es "app.yhyue.com/moapp/jybase/esv7"
|
|
m "app.yhyue.com/moapp/jybase/mongodb"
|
|
m "app.yhyue.com/moapp/jybase/mongodb"
|
|
"app.yhyue.com/moapp/jybase/mysql"
|
|
"app.yhyue.com/moapp/jybase/mysql"
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
- "log"
|
|
|
|
)
|
|
)
|
|
|
|
|
|
var (
|
|
var (
|
|
@@ -21,8 +22,6 @@ var (
|
|
Mgo_Log m.MongodbSim
|
|
Mgo_Log m.MongodbSim
|
|
Mgo_Bidding m.MongodbSim
|
|
Mgo_Bidding m.MongodbSim
|
|
//Mgo_Qyfw m.MongodbSim
|
|
//Mgo_Qyfw m.MongodbSim
|
|
-
|
|
|
|
- EsDoc *elastic.Elastic
|
|
|
|
)
|
|
)
|
|
|
|
|
|
type dbConf struct {
|
|
type dbConf struct {
|
|
@@ -60,6 +59,7 @@ type mgoConf struct {
|
|
}
|
|
}
|
|
|
|
|
|
type esConf struct {
|
|
type esConf struct {
|
|
|
|
+ Version string
|
|
Address string
|
|
Address string
|
|
Size int
|
|
Size int
|
|
UserName string
|
|
UserName string
|
|
@@ -81,7 +81,7 @@ func init() {
|
|
util.ReadConfig("./db.json", &DbConf)
|
|
util.ReadConfig("./db.json", &DbConf)
|
|
if DbConf != nil {
|
|
if DbConf != nil {
|
|
if DbConf.Elasticsearch.Main != nil {
|
|
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")
|
|
log.Println("初始化 elasticsearch")
|
|
}
|
|
}
|
|
|
|
|