Merge branch 'dev/v4.8.70_dx' of qmx/jy into feature/v4.8.70

src/go.sum

@@ -9,13 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6 h1:uyaBp5Iuc/Il4+O
 app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-<<<<<<< HEAD
-app.yhyue.com/moapp/jypkg v1.0.6 h1:96kLs49jrUsdeFtuGf24UdqFjpnlR6G03j0AUvUPuGI=
-app.yhyue.com/moapp/jypkg v1.0.6/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
-=======
 app.yhyue.com/moapp/jypkg v1.0.7-0.20231114011545-acf570b01ea7 h1:i7sFy+e/zjqhTQci+0x4E1qEXZOEYCIe6EDug+8LyFk=
 app.yhyue.com/moapp/jypkg v1.0.7-0.20231114011545-acf570b01ea7/go.mod h1:LuxdVd+j3uwm7N5j2hivmpPU0LJytEV7iwAIljdoc4Q=
->>>>>>> master
 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=

src/jfw/modules/publicapply/src/enterpriseSearch/entity/entQuery.go

@@ -37,7 +37,7 @@ const (
 	searchMaxLimit    = 100 //最大查询数量限制
 	freeSearchNum     = 4   //免费查询数量限制
 	entSearchCacheDB  = "other"
-	entSearchCacheKey = "entSearchIndexCache"
+	entSearchCacheKey = "entSearchIndexCache_%v"
 
 	index, itype  = "qyxy", "qyxy"
 	entQuery      = `{"query":{"bool":{"must":[%s],"must_not":[%s]}},"_source":["_id","company_name","company_status","legal_person","capital","company_address","company_shortname","company_phone","establish_date"],"sort":[{"capital":{"order":"desc"}}]}`
@@ -341,7 +341,7 @@ type entIds struct {
 }
 
 func GetEntIndexShow(isFree bool) (list *[]map[string]interface{}) {
-	bytes, err := redis.GetBytes(entSearchCacheDB, entSearchCacheKey)
+	bytes, err := redis.GetBytes(entSearchCacheDB, fmt.Sprintf(entSearchCacheKey, isFree))
 	if err == nil {
 		if err = json.Unmarshal(*bytes, &list); err == nil && list != nil && len(*list) > 0 {
 			return