feat:go mod 升级

jyBXCore/go.mod

@@ -3,7 +3,7 @@ module jyBXCore
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463
+	app.yhyue.com/moapp/jybase v0.0.0-20230509102020-7c97492d5b78
 	app.yhyue.com/moapp/jylogx v0.0.0-20230506054359-10daf2b78830
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447

jyBXCore/go.sum

@@ -4,8 +4,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220415064050-37ce64b3e2d4/go.mod h1:qNRA0sHu
 app.yhyue.com/moapp/jybase v0.0.0-20220418104200-46c3fff161c7/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
-app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463 h1:HhRvi41wOfoneH+lFMagIFfG2W20cxFzg24Iv827vi8=
-app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
+app.yhyue.com/moapp/jybase v0.0.0-20230509102020-7c97492d5b78 h1:sXhW2zCfk0vSUiUgKkvCViDEhndC7KYRLFGfIzYJPrM=
+app.yhyue.com/moapp/jybase v0.0.0-20230509102020-7c97492d5b78/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jylog v0.0.0-20230506054155-60c3d54a2cf6 h1:12S79ie1pYijx5Ax3XJXEHQEQ0qvz2k1iJbgTkqQXwM=
 app.yhyue.com/moapp/jylog v0.0.0-20230506054155-60c3d54a2cf6/go.mod h1:hlsdPMebg8N90L57xkxJdVVFuvtlT8SuZLM6hY+jB44=
 app.yhyue.com/moapp/jylogx v0.0.0-20230506054359-10daf2b78830 h1:+ubh8vHWA6049k+Qa1vKfgTnFTeEkO9FVYX1G0Lenzs=

jyBXCore/rpc/model/es/es.go

@@ -79,7 +79,7 @@ func (e *SearchByES) GetAllByNgramWithCount() (int64, *[]map[string]interface{})
 			queryStr = queryStr[:len(queryStr)-1] + `,"from":` + strconv.Itoa(e.Start) + `,"size":` + strconv.Itoa(e.Limit) + "}"
 		}
 		logx.Info("queryStr:", queryStr)
-		return elastic.GetWithCount(e.Index, e.IType, queryStr)
+		return elastic.GetWithCount(e.Index, e.IType, e.Query, queryStr)
 	} else {
 		return 0, nil
 	}