fix:mod修改

go.sum

@@ -4,8 +4,9 @@ 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/jybase v0.0.0-20230309052843-0fd5150fe8dd h1:FSf+wCV2/fm5gH4ynJhxFkuQ6HJdEqsM1m2IqhGl9gk=
+app.yhyue.com/moapp/jybase v0.0.0-20230309052843-0fd5150fe8dd/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 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=

public/db.go

@@ -1,14 +1,13 @@
 package public
 
 import (
-	"log"
-	"strings"
-
 	util "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/esv1"
+	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"
+	"log"
 )
 
 var (
@@ -61,8 +60,10 @@ type mgoConf struct {
 }
 
 type esConf struct {
-	Address string
-	Size    int
+	Address  string
+	Size     int
+	UserName string
+	Password string
 }
 type redisConf struct {
 	Address string
@@ -85,11 +86,8 @@ func init() {
 		}
 
 		if DbConf.Elasticsearch.Doc != nil {
-			EsDoc = &elastic.Elastic{
-				Addrs:  strings.Split(DbConf.Elasticsearch.Doc.Address, ","),
-				I_size: DbConf.Elasticsearch.Doc.Size,
-			}
-			EsDoc.InitElasticSize()
+			es.InitElasticSizeByAuth(DbConf.Elasticsearch.Doc.Address, DbConf.Elasticsearch.Doc.Size,
+				DbConf.Elasticsearch.Doc.UserName, DbConf.Elasticsearch.Doc.Password)
 			log.Println("初始化 doc elasticsearch")
 		}