wangshan 4 hónapja
szülő
commit
39166a9b2d
4 módosított fájl, 7 hozzáadás és 7 törlés
  1. 1 1
      go.mod
  2. 2 2
      go.sum
  3. 2 2
      jyBXCore/rpc/service/purchase.go
  4. 2 2
      jyBXCore/rpc/service/service.go

+ 1 - 1
go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20250219114929-2abd3672b53b
 	app.yhyue.com/moapp/jylogx v0.0.0-20230522075659-ae6fbedb92bc
-	app.yhyue.com/moapp/jypkg v1.33.1
+	app.yhyue.com/moapp/jypkg v1.33.2
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21

+ 2 - 2
go.sum

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloO
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
 app.yhyue.com/moapp/jylogx v0.0.0-20230522075659-ae6fbedb92bc h1:QEwc+V6ZTvk3VMFiMgPYJpsAVqRvTeIMupVfpO5PQYk=
 app.yhyue.com/moapp/jylogx v0.0.0-20230522075659-ae6fbedb92bc/go.mod h1:5xAagkwCYnqG5VEHnOV2AqD6DiR169qvOjYKaHMHecU=
-app.yhyue.com/moapp/jypkg v1.33.1 h1:fji5APMWLeAHdB7is9VjXd7zU3Iqa7dOPRpOhYxZbII=
-app.yhyue.com/moapp/jypkg v1.33.1/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.2 h1:NqtGHlrkgu89T7Km6Kcid309n9LB/CMKHFafnwQtO1A=
+app.yhyue.com/moapp/jypkg v1.33.2/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

+ 2 - 2
jyBXCore/rpc/service/purchase.go

@@ -647,7 +647,7 @@ func (p *Purchase) FilterCriteriaFormat() {
 		//主关键词词组
 		if p.SearchMode == 1 {
 			if ikWords := util.HttpEs(p.KeyWords, "ik_smart", IC.DB.Es.Addr); ikWords != "" {
-				p.KeyWords = jy.KeywordsProcessing(ikWords, IC.C.JYKeyMark)
+				p.KeyWords = jy.KeywordsProcessing(ikWords, p.KeyWords, IC.C.JYKeyMark)
 			}
 		}
 		searchWords = append(searchWords, p.KeyWords)
@@ -671,7 +671,7 @@ func (p *Purchase) FilterCriteriaFormat() {
 			for _, awv := range strings.Split(p.AdditionalWords, ",") {
 				if strings.TrimSpace(awv) != "" {
 					if ikWords := util.HttpEs(awv, "ik_smart", IC.DB.Es.Addr); ikWords != "" {
-						addWords = append(addWords, jy.KeywordsProcessing(ikWords, IC.C.JYKeyMark))
+						addWords = append(addWords, jy.KeywordsProcessing(ikWords, awv, IC.C.JYKeyMark))
 					}
 				}
 			}

+ 2 - 2
jyBXCore/rpc/service/service.go

@@ -148,7 +148,7 @@ func (kws *KeyWordsSearch) GetSearchKeyWordsQueryStr(in *bxcore.SearchReq) (sear
 	if in.KeyWords != "" {
 		if in.SearchMode == 1 {
 			if ikWords := util.HttpEs(in.KeyWords, "ik_smart", IC.DB.Es.Addr); ikWords != "" {
-				in.KeyWords = jy.KeywordsProcessing(ikWords, IC.C.JYKeyMark)
+				in.KeyWords = jy.KeywordsProcessing(ikWords, in.KeyWords, IC.C.JYKeyMark)
 			}
 		}
 		searchWords = append(searchWords, in.KeyWords)
@@ -162,7 +162,7 @@ func (kws *KeyWordsSearch) GetSearchKeyWordsQueryStr(in *bxcore.SearchReq) (sear
 			for _, awv := range strings.Split(in.AdditionalWords, ",") {
 				if strings.TrimSpace(awv) != "" {
 					if ikWords := util.HttpEs(awv, "ik_smart", IC.DB.Es.Addr); ikWords != "" {
-						addWords = append(addWords, jy.KeywordsProcessing(ikWords, IC.C.JYKeyMark))
+						addWords = append(addWords, jy.KeywordsProcessing(ikWords, awv, IC.C.JYKeyMark))
 					}
 				}
 			}