Merge branch 'dev_v1.1.30_wh' of BaseService/jyMicroservices into feature/v1.1.30

jyBXCore/rpc/etc/bxcore.yaml

@@ -49,4 +49,5 @@ Middleground:
   PowerCheckCenterKey: powercheck.rpc #权益校验中台
   UserCenterKey: usercenter.rpc #用户中台rpc
   ResourceCenterKey: resource.rpc #资源中台rpc
-ResourceCode: "cb_zy_code"
+ResourceCode: "cb_zy_code"
+SearchConcurrency: 20

jyBXCore/rpc/init/init.go

@@ -20,6 +20,7 @@ var (
 	logc           entity.Logc
 	SearchLimitKey = "jy_limitSearchText_new" // 全文或附件搜索限制
 	Middleground   *middleground.Middleground
+	Search_Thread  chan bool
 )
 
 func init() {
@@ -35,7 +36,7 @@ func init() {
 	RedisInit(&DB.Redis)
 	//初始es
 	EsInit(&DB.Es)
-
+	Search_Thread = make(chan bool, C.SearchConcurrency)
 	//初始化标签
 	LabelInit()
 	//

jyBXCore/rpc/internal/config/config.go

@@ -52,7 +52,8 @@ type Config struct {
 		UserCenterKey       string
 		ResourceCenterKey   string
 	}
-	ResourceCode string
+	ResourceCode      string
+	SearchConcurrency int64
 }
 
 type Db struct {

jyBXCore/rpc/internal/logic/polymerizesearchlogic.go

@@ -2,11 +2,11 @@ package logic
 
 import (
 	"context"
+	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/entity"
+	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/internal/svc"
 	"jyBXCore/rpc/type/bxcore"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type PolymerizeSearchLogic struct {
@@ -29,8 +29,15 @@ func (l *PolymerizeSearchLogic) PolymerizeSearch(in *bxcore.PolymerizeSearchReq)
 	if in.SearchCode == "" {
 		return &bxcore.PolymerizeSearchResp{}, nil
 	}
+	data := &bxcore.SearchReturn{}
+
 	ks := entity.NewKeyWordsSearch()
-	data := ks.PolymerizeSearch(in)
+	IC.Search_Thread <- true
+	data = ks.PolymerizeSearch(v)
+	defer func() {
+		<-IC.Search_Thread
+	}()
+
 	return &bxcore.PolymerizeSearchResp{
 		ErrCode: 0,
 		ErrMsg:  "",