wip:中标企业过滤

jyBXCore/entity/entity.go

@@ -0,0 +1,7 @@
+package entity
+
+import "regexp"
+
+var (
+	RegWinner = regexp.MustCompile(".+[司院厂所心处普学]$")
+)

jyBXCore/rpc/etc/bxcore.yaml

@@ -2,7 +2,9 @@ Name: bxcore.rpc
 ListenOn: 0.0.0.0:8004
 Etcd:
   Hosts:
-    - 127.0.0.1:2379
+  - 192.168.3.207:2379
+  - 192.168.3.165:2379
+  - 192.168.3.204:2379
   Key: bxcore.rpc
 Timeout: 12000
 WebRpcPort: 8016
@@ -14,15 +16,21 @@ LabelUrl:
 DefaultSearchCacheTime: 24
 LimitSearchText:
   Flag: true
-  Count: 40
+  Count: 200
   TimeOut: 60
   Percentage: 80
-  NoLogin: 1
+  NoLogin: 5
   UserIds:
     - 581858dbc9ebc2132200002e
     - 5cc02842c9ebc2227593893d
   Msg: f 开关状态：%s //-2 从配置文件重置，-1 关闭，1 打开<br><br>c 并发数：%d //-2 不限制并发数，-1 无条件直接限制，>0 限制并发数<br><br>t 个人查询限制时间：%ds //-1 不限制<br><br>
   LimitKey: mobile_limit_%s
+  ForPayer: 2
+  WebhookURL:
+    - https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=78864582-d770-452f-a55d-e8d17c647f31
+  LimitItems:
+    - detail
+    - filetext
 SearchTypeSwitch: true
 FileSignBool: true
 PaySearchLimit:
@@ -49,7 +57,9 @@ ContextOldVipLimit: 1664553600
 Middleground:
   Etcd:
     Hosts:
-      - 192.168.3.206:2379
+      - 192.168.3.207:2379
+      - 192.168.3.165:2379
+      - 192.168.3.204:2379
   PowerCheckCenterKey: powercheck.rpc #权益校验中台
   UserCenterKey: usercenter.rpc #用户中台rpc
   ResourceCenterKey: resource.rpc #资源中台rpc
@@ -70,3 +80,6 @@ Stages:
     - "签合同##"
     - "已结束"
     - "终止参标"
+SearchWinner:
+  Switch: true
+  RegWinner: ".+[司院厂所心处普行]$"

jyBXCore/rpc/init/init.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"regexp"
 	"time"
 
 	"app.yhyue.com/moapp/jypkg/middleground"
@@ -86,4 +87,8 @@ func init() {
 		RegUserCenter(C.Middleground.UserCenterKey).
 		RegPowerCheckCenter(C.Middleground.PowerCheckCenterKey).
 		RegResourceCenter(C.Middleground.ResourceCenterKey)
+	//正则 winner
+	if C.SearchWinner.RegWinner != "" {
+		entity.RegWinner = regexp.MustCompile(C.SearchWinner.RegWinner)
+	}
 }

jyBXCore/rpc/internal/config/config.go

@@ -60,7 +60,11 @@ type Config struct {
 		ExecutionNum int
 		Wait         int
 	}
-	Stages []string
+	Stages       []string
+	SearchWinner struct {
+		Switch    bool
+		RegWinner string
+	}
 }
 type Db struct {
 	Mysql     entity.Mysql      `json:"mysql"`

jyBXCore/rpc/util/search.go

@@ -1,6 +1,7 @@
 package util
 
 import (
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/entity"
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/init"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/config"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/type/bxcore"
@@ -254,6 +255,12 @@ func SearchListFormat(userid, subInformation, propertyForm, industry string, rep
 						winnerId = entIdList[wk]
 					}
 				}
+				if IC.C.SearchWinner.Switch && winnerId == "" {
+					continue
+				}
+				if entity.RegWinner.MatchString(wv) {
+					continue
+				}
 				searchList.WinnerInfo = append(searchList.WinnerInfo, &bxcore.WinnerInfo{
 					Winner:       wv,                                                                                                     //中标企业 需要单独处理
 					WinnerTel:    MC.ObjToString(v["winnertel"]),                                                                         //中标企业联系电话