Merge branch 'dev/v1.1.29_fuwencai' of BaseService/jyMicroservices into feature/v1.1.29

jyBXBase/api/bxbase.api

@@ -94,14 +94,22 @@ type (
 	}
 	//首页最新招标信息
 	NewestReq {
-		City         string `json:"city,optional"`        //定位城市
-		IsSearch     int64  `json:"isSearch,optional"`    //是否根据定位查询es
-		UserId       string `header:"userId,optional"`    //用户id
-		AppId        string `header:"appId"`              //appId
-		EntUserId    string `header:"entUserId,optional"` //商机管理用户 用户id：entUserId
-		NewUserId    string `header:"newUserId,optional"`
-		EntId        string `header:"entId,optional"`
-		PositionType string `header:"positionType,optional"`
+		City     string `json:"city,optional"`     //定位城市
+		IsSearch int64  `json:"isSearch,optional"` //是否根据定位查询es
+		baseParam
+	}
+	baseParam {
+		AppId        string `header:"appId"`                 //剑鱼10000
+		EntId        int64  `header:"entId,optional"`        // 企业id
+		EntUserId    int64  `header:"entUserId,optional"`    // 企业下用户id
+		EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+		PositionType int64  `header:"positionType,optional"` // 职位类型 0个人 1企业
+		PositionId   int64  `header:"positionId,optional"`   //职位id
+		AccountId    int64  `header:"accountId,optional"`    //账户id
+		MgoUserId    string `header:"mgoUserId,optional"`    //原userId
+		UserId       string `header:"userId,optional"`       //用户id
+		NewUserId    int64  `header:"newUserId,optional"`    //base_user_id
+		Phone        string `header:"phone,optional"`
 	}
 	//公共接口返回
 	CommonRes {

jyBXBase/api/internal/logic/newestBiddingLogic.go

@@ -3,12 +3,10 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/rpc/bxbase"
-	"net/http"
-	"strconv"
-
 	"jyBXBase/api/internal/svc"
 	"jyBXBase/api/internal/types"
+	"jyBXBase/rpc/bxbase"
+	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -30,17 +28,20 @@ func NewNewestBiddingLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *h
 }
 
 func (l *NewestBiddingLogic) NewestBidding(req *types.NewestReq) (resp *types.CommonRes, err error) {
-	newUserId, _ := strconv.ParseInt(req.NewUserId, 10, 64)
-	positionType, _ := strconv.ParseInt(req.PositionType, 10, 64)
 	res, err0 := l.svcCtx.Bxbase.NewestBidding(l.ctx, &bxbase.NewestBiddingReq{
-		UserId:       req.UserId,
-		AppId:        req.AppId,
 		City:         req.City,
 		IsSearch:     req.IsSearch,
-		EntUserId:    req.EntUserId,
-		NewUserId:    newUserId,
 		EntId:        req.EntId,
-		PositionType: positionType,
+		EntUserId:    req.EntUserId,
+		PositionId:   req.PositionId,
+		PositionType: req.PositionType,
+		AppId:        req.AppId,
+		MgoUserId:    req.MgoUserId,
+		AccountId:    req.AccountId,
+		UserId:       req.UserId,
+		NewUserId:    req.NewUserId,
+		EntAccountId: req.EntAccountId,
+		Phone:        req.Phone,
 	})
 	if err0 != nil {
 		return &types.CommonRes{

jyBXBase/api/internal/types/types.go

@@ -85,14 +85,23 @@ type AddSearchScreen struct {
 }
 
 type NewestReq struct {
-	City         string `json:"city,optional"`        //定位城市
-	IsSearch     int64  `json:"isSearch,optional"`    //是否根据定位查询es
-	UserId       string `header:"userId,optional"`    //用户id
-	AppId        string `header:"appId"`              //appId
-	EntUserId    string `header:"entUserId,optional"` //商机管理用户 用户id：entUserId
-	NewUserId    string `header:"newUserId,optional"`
-	EntId        string `header:"entId,optional"`
-	PositionType string `header:"positionType,optional"`
+	City     string `json:"city,optional"`     //定位城市
+	IsSearch int64  `json:"isSearch,optional"` //是否根据定位查询es
+	BaseParam
+}
+
+type BaseParam struct {
+	AppId        string `header:"appId"`                 //剑鱼10000
+	EntId        int64  `header:"entId,optional"`        // 企业id
+	EntUserId    int64  `header:"entUserId,optional"`    // 企业下用户id
+	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+	PositionType int64  `header:"positionType,optional"` // 职位类型 0个人 1企业
+	PositionId   int64  `header:"positionId,optional"`   //职位id
+	AccountId    int64  `header:"accountId,optional"`    //账户id
+	MgoUserId    string `header:"mgoUserId,optional"`    //原userId
+	UserId       string `header:"userId,optional"`       //用户id
+	NewUserId    int64  `header:"newUserId,optional"`    //base_user_id
+	Phone        string `header:"phone,optional"`
 }
 
 type CommonRes struct {

jyBXBase/api/test/apitest.http

@@ -88,3 +88,44 @@ appId:10000
 "id": "63bcfd44d2d550dfc36773dd"
 }
 
+### 获取最新标讯- 未登录
+GRPC 127.0.0.1:8005/bxcol.bxbase/NewestBidding
+
+
+
+### 获取最新标讯- 登录
+GRPC 127.0.0.1:8005/bxcol.bxbase/NewestBidding
+
+{
+  "positionId": 1204781659,
+  "appId": "10000",
+  "entId": null,
+  "entUserId": null,
+  "entAccountId": null,
+  "positionType": 0,
+  "accountId": "121233",
+  "mgoUserId": "641aa7bcac1c8e639bc15cdb",
+  "userId": "641aa7bcac1c8e639bc15cdb",
+  "newUserId": 486050,
+  "phone": "18238182402"
+}
+
+###
+POST http://127.0.0.1:8006/jybx/base/newest
+Content-Type: application/json
+positionId": 1204781659,
+appId: "10000",
+entId: null,
+entUserId: null,
+entAccountId: null,
+positionType: 0,
+accountId: "121233",
+mgoUserId: "641aa7bcac1c8e639bc15cdb",
+userId: "641aa7bcac1c8e639bc15cdb",
+newUserId: 486050,
+phone: "18238182402
+
+###
+POST http://192.168.3.240:8077/jybx/base/newest
+Content-Type: application/json
+Cookie:SESSIONID=6d22fac04ab1904bbda1e536773e8c1054b91fc3;

jyBXBase/rpc/bxbase.proto

@@ -177,13 +177,18 @@ message DelSearchReq{
 
 message NewestBiddingReq{
   string  city = 1;
-  int64 isSearch = 2;
-  string  userId = 3;
-  string  appId = 4;
-  string  entUserId = 5;
-  int64 newUserId = 6;
-  string  entId=7;
-  int64 positionType = 8;
+  int64   isSearch = 2;
+  string  appId = 3  ;   //剑鱼10000
+  int64   entId = 4   ;  // 企业id
+  int64   entUserId = 5; // 企业下用户id
+  int64   entAccountId = 6; //企业账户id
+  int64   positionType = 7; // 职位类型 0个人 1企业
+  int64   positionId = 8; //职位id
+  int64   accountId = 9 ; //账户id
+  string  mgoUserId = 10;  //原userId
+  string  userId = 11 ;  //用户id
+  int64   newUserId = 12; //base_user_id
+  string  phone = 13;
 }
 
 //首页最新招标信息Resp
@@ -193,13 +198,10 @@ message NewsetBiddingResp{
   NewsetBidding data = 3;
 }
 message NewsetBidding{
-  bool  isVip = 1;//是否超级订阅用户
-  bool hasSubKeys = 2;//是否有订阅词
-  bool hasHSKeys = 3;//是否有搜索历史
-  int64 count = 4;//数据长度
-  repeated newestList list = 5;//数据
-  repeated  string  history = 6;//历史数据
-  string subFlag = 7;//当前用户订阅信息属性：m：大会员；e：商机管理；v：VIP；f：普通用户
+  int64 count = 1;//数据长度
+  repeated newestList list = 2;//数据
+  string subFlag = 3;//当前用户订阅信息属性：m：大会员；e：商机管理；v：VIP；f：普通用户
+  int64  showTip = 4;// 是否展示引导用户设置关键词
 }
 
 //
@@ -235,40 +237,40 @@ message CheckRes {
 }
 
 message AppIdReq{
-	string AppId =1;
+  string AppId = 1;
 }
 
 //剑鱼网站收录情况返回参数
 message IncludedResp{
-	int64 year =1; //年
-	int64 month =2; //月
-	int64 day =3; //日
-	float bid=4;//招标信息的数值
-	string bidUnit=5; //招标信息的数值单位
-	string bidUnitAppend=6; //招标信息的数值单位后面的加号
-	float project=7;//招标采购项目的数值
-	string projectUnit=8;//招标采购项目的数值单位
-	string projectUnitAppend=9;//招标采购项目的数值单位后面的加号
-	float ent=10; //企业数据库的数值
-	string entUnit=11;//企业数据库的数值单位
-	string entUnitAppend=12;//企业数据库的数值单位后面的加号
-	float buyer=13;//采购单位库的数值
-	string buyerUnit=14;//采购单位库的数值单位
-	string buyerUnitAppend=15;//采购单位库的数值单位后面的加号
-	float bidDayUpdate=16;//每日更新招标信息的数值
-	string bidDayUpdateUnit=17;//每日更新招标信息的数值单位
-	string bidDayUpdateUnitAppend=18;//每日更新招标信息的数值单位后面的加号
-	float bidField=19;//招标信息数据字段的数值
-	string bidFieldUnit=20;//招标信息数据字段的数值单位
-	string bidFieldUnitAppend=21;//招标信息数据字段数值单位后面的加号
-	float fieldAccuracy=22;//数据字段准确率的数值
-	string fieldAccuracyUnit=23;//数据字段准确率的数值单位
-	string fieldAccuracyUnitAppend=24;//数据字段准确率的数值单位后面的加号
-	float push=25;//推送招标信息的数值
-	string pushUnit=26;//推送招标信息的数值单位
-	string pushUnitAppend=27;//推送招标信息的数值单位后面的加号
-	string error_msg = 28;
-	int64 error_code = 29;
+  int64 year = 1; //年
+  int64 month = 2; //月
+  int64 day = 3; //日
+  float bid = 4;//招标信息的数值
+  string bidUnit = 5; //招标信息的数值单位
+  string bidUnitAppend = 6; //招标信息的数值单位后面的加号
+  float project = 7;//招标采购项目的数值
+  string projectUnit = 8;//招标采购项目的数值单位
+  string projectUnitAppend = 9;//招标采购项目的数值单位后面的加号
+  float ent = 10; //企业数据库的数值
+  string entUnit = 11;//企业数据库的数值单位
+  string entUnitAppend = 12;//企业数据库的数值单位后面的加号
+  float buyer = 13;//采购单位库的数值
+  string buyerUnit = 14;//采购单位库的数值单位
+  string buyerUnitAppend = 15;//采购单位库的数值单位后面的加号
+  float bidDayUpdate = 16;//每日更新招标信息的数值
+  string bidDayUpdateUnit = 17;//每日更新招标信息的数值单位
+  string bidDayUpdateUnitAppend = 18;//每日更新招标信息的数值单位后面的加号
+  float bidField = 19;//招标信息数据字段的数值
+  string bidFieldUnit = 20;//招标信息数据字段的数值单位
+  string bidFieldUnitAppend = 21;//招标信息数据字段数值单位后面的加号
+  float fieldAccuracy = 22;//数据字段准确率的数值
+  string fieldAccuracyUnit = 23;//数据字段准确率的数值单位
+  string fieldAccuracyUnitAppend = 24;//数据字段准确率的数值单位后面的加号
+  float push = 25;//推送招标信息的数值
+  string pushUnit = 26;//推送招标信息的数值单位
+  string pushUnitAppend = 27;//推送招标信息的数值单位后面的加号
+  string error_msg = 28;
+  int64 error_code = 29;
 }
 
 // 搜索订阅列表模式保存

jyBXBase/rpc/bxbase/bxbase.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxbase.proto
 
 package bxbase

jyBXBase/rpc/etc/bxbase.yaml

@@ -2,7 +2,7 @@ Name: bxbase.rpc
 ListenOn: 127.0.0.1:8005
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+  - 192.168.3.206:2379
   Key: bxbase.rpc
 UserCenterKey: "usercenter.rpc" #用户中台rpc
 PowerCheckCenterKey: "powercheck.rpc" #权益校验中台
@@ -12,3 +12,4 @@ Webrpcport: 8015
 BidSearchOldUserLimit: 1626105600
 FileSignBool: true
 UnitAppend: '+'
+NewsLimitNum: 50 # 移动端首页最新标讯数量限制

jyBXBase/rpc/etc/db.yaml

@@ -1,7 +1,7 @@
 mysql:
     main:
         dbName: jianyu
-        address: 192.168.3.11:3366
+        address: 192.168.3.149:3306
         userName: root
         password: Topnet123
         maxOpenConns: 5
@@ -17,7 +17,7 @@ redis:
     addr:
         - other=192.168.3.206:1712
 es:
-    addr: http://192.168.3.206:9800
+    addr: http://192.168.3.241:9205,http://192.168.3.149:9200
     size: 30
     version: v7
     userName: ""

jyBXBase/rpc/internal/config/config.go

@@ -15,6 +15,7 @@ type Config struct {
 	UserCenterKey         string
 	PowerCheckCenterKey   string
 	EntManageApplication  string
+	NewsLimitNum          int64 // 移动端首页最新标讯数量限制
 }
 
 type Db struct {

jyBXBase/rpc/internal/logic/newestbiddinglogic.go

@@ -2,19 +2,11 @@ package logic
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
-	IC "jyBXBase/rpc/init"
 	"jyBXBase/rpc/model"
 	"log"
 	"sort"
-	"strconv"
-	"strings"
 	"time"
 
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/redis"
-
 	"jyBXBase/rpc/internal/svc"
 	"jyBXBase/rpc/type/bxbase"
 
@@ -38,194 +30,88 @@ func NewNewestBiddingLogic(ctx context.Context, svcCtx *svc.ServiceContext) *New
 // 首页最新招标信息
 func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase.NewsetBiddingResp, error) {
 	t := time.Now()
-	userType := ""
-	r, i := func(in *bxbase.NewestBiddingReq) (*bxbase.NewsetBiddingResp, int) {
+	//  status : 0 -不存缓存 1-未登录用户 2-用户自己的key 3-登录用户最新标讯
+	r, status := func(in *bxbase.NewestBiddingReq) (*bxbase.NewsetBiddingResp, int) {
 		var res = &bxbase.NewsetBiddingResp{
 			Data: &bxbase.NewsetBidding{
 				List: []*bxbase.NewestList{},
 			},
 		}
-		entUserId, _ := strconv.ParseInt(in.EntUserId, 10, 64)
-		//主体处理(fType：普通用户；vType：超级订阅用户；mType：大会员用户；eType：商机管理用户)
-		if in.PositionType == 1 {
-			//主体等于企业的
-			userType = "e"
-		}
-		rks := ""
-		if userType == "e" {
-			rks = MC.If(in.UserId != "", in.EntUserId, in.City).(string)
-		} else {
-			rks = MC.If(in.UserId != "", in.UserId, in.City).(string)
-		}
-		redisKey := "p1_indexMessage_new_" + rks
+		/* 1. 未登录用户 查未登录缓存 返回  没有缓存 查最新标讯存未登录返回
+		   2. 登录用户 查count count=1 查用户缓存   缓存没数据查用户推送
+		                     count =0 查最新标讯缓存 缓存没数据查最新标讯存登录缓存 显示引导用户设置关键词
+		*/
+		// 未登录用户
 		if in.UserId == "" {
-			//未登录用户查询当天缓存
-			redisKey = fmt.Sprintf("%s_%d_%d_%d", redisKey, time.Now().Year(), time.Now().Month(), time.Now().Day())
-		}
-		redisByte, err := redis.GetBytes("other", redisKey)
-		if err == nil && redisByte != nil && len(*redisByte) > 0 {
-			err = json.Unmarshal(*redisByte, res.Data)
-			if err != nil {
-				logx.Info(fmt.Sprintf("读取缓存 序列化异常,err:%s", err.Error()))
-			}
-			if len(res.Data.List) > 0 {
-				return res, 1
+			res.Data.ShowTip = 1
+			redisKey, _ := model.GetRedisKeyTimeout(model.StatusNoLogin, in.PositionId)
+			list, err := model.GetNewsCache(redisKey)
+			if err == nil && list != nil && len(list) > 0 { // 缓存有数据可以直接返回
+				res.Data.List = list
+				res.Data.Count = int64(len(list))
+				return res, model.StatusCache
 			}
+			// 没数据查最新数据返回
+			//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
+			subtype := `"预告","公告","结果","其它"`
+			query := model.NewestQuery("", "", subtype)
+			list = model.NewestES(query)
+			res.Data.List = list
+			res.Data.Count = int64(len(list))
+			return res, model.StatusNoLogin
 		}
-		var subtype string
-		//登录用户
-		if in.UserId != "" {
-			//优先级 由测试确认  大会员 》 商机管理 》 VIP 》 普通用户 》 搜索历史
-			//获取订阅信息
-			userMap := IC.Compatible.Select(in.UserId, `{"o_jy":1,"o_vipjy":1,"i_vip_status":1,"o_member_jy":1,"i_member_status":1,"s_m_phone":1,"s_phone":1}`)
-			if userMap == nil || len(*userMap) == 0 {
-				//查询出错
-				res.ErrCode = -1
-				res.ErrMsg = fmt.Errorf("未查询到用户信息").Error()
-				return res, -1
-			}
-			//var isPayUser bool = false
-			//付费用户如果没有数据 直接返回 需求来源：测试
-			//vip用户
-			vipStatus := MC.IntAll((*userMap)["i_vip_status"])
-			//大会员用户
-			bigStatus := MC.Int64All((*userMap)["i_member_status"])
-			if bigStatus > 0 {
-				o_msgset := MC.ObjToMap((*userMap)["o_member_jy"])
-				big_items, ok := (*o_msgset)["a_items"].([]interface{})
-				//大会员推送历史
-				result := []*bxbase.NewestList{}
-				if userType == "e" {
-					result = model.GetNewestInfo(rks, "e", entUserId).GetPushHistory()
-				} else {
-					result = model.GetNewestInfo(rks, "m", in.NewUserId).GetPushHistory()
-				}
-				res.Data.Count = int64(len(result))
-				if res.Data.Count > 0 {
-					res.Data.HasSubKeys = ok && len(big_items) > 0
-					res.Data.List = result
-					res.Data.SubFlag = "m"
-				}
-				return res, 0
-			}
-			if phone := MC.If((*userMap)["s_phone"] != nil, MC.ObjToString((*userMap)["s_phone"]), MC.ObjToString((*userMap)["s_m_phone"])).(string); phone != "" && in.EntUserId != "" && in.EntId != "" {
-				//商机管理
-				entNicheInfos := IC.MainMysql.SelectBySql(`SELECT i.power_source,u.power FROM entniche_user u LEFT JOIN entniche_info i ON u.ent_id=i.id WHERE u.phone=? and  i.status=1 AND i.id = ?`, phone, in.EntId)
-				if entNicheInfos != nil && len(*entNicheInfos) > 0 {
-					entNicheInfo := (*entNicheInfos)[0]
-					//排除商机管理服务
-					if MC.IntAll(entNicheInfo["power_source"]) != 1 {
-						// 已分发权限
-						if MC.IntAll(entNicheInfo["power"]) > 0 {
-							//商机管理推送历史
-							result := model.GetNewestInfo(in.EntUserId, "e", entUserId).GetPushHistory()
-							res.Data.Count = int64(len(result))
-							if res.Data.Count > 0 {
-								res.Data.List = result
-								res.Data.SubFlag = "e"
-							}
-							return res, 0
-						}
-					}
-				}
-			}
-			if vipStatus > 0 {
-				o_msgset := MC.ObjToMap((*userMap)["o_vipjy"])
-				vip_items, ok := (*o_msgset)["a_items"].([]interface{})
-				//vip查询推送历史
-				result := []*bxbase.NewestList{}
-				if userType == "e" {
-					result = model.GetNewestInfo(rks, "e", entUserId).GetPushHistory()
-				} else {
-					result = model.GetNewestInfo(rks, "v", in.NewUserId).GetPushHistory()
-				}
-				res.Data.IsVip = true
-				res.Data.HasSubKeys = ok && len(vip_items) > 0
-				res.Data.Count = int64(len(result))
-				res.Data.List = result
-				res.Data.SubFlag = "v"
-				return res, 0
-			}
 
-			//普通用户用户- 有关键词
-			o_msgset := MC.ObjToMap((*userMap)["o_jy"])
-			items, ok := (*o_msgset)["a_key"].([]interface{})
-			if ok && len(items) > 0 {
-				//普通用户查询推送历史
-				result := []*bxbase.NewestList{}
-				if userType == "e" {
-					result = model.GetNewestInfo(rks, "e", entUserId).GetPushHistory()
-				} else {
-					result = model.GetNewestInfo(rks, "f", in.NewUserId).GetPushHistory()
-				}
-				res.Data.IsVip = false
-				res.Data.HasSubKeys = ok && len(items) > 0
-				res.Data.Count = int64(len(result))
-				res.Data.List = result
-				res.Data.SubFlag = "f"
-				return res, 0
+		// 登录用户
+		roleNewestInfo, flag := model.GetRoleNewestInfoService(in.AppId, in.MgoUserId, in.NewUserId, in.AccountId, in.EntId, in.EntUserId, in.PositionType, in.PositionId)
+		res.Data.SubFlag = flag
+		// 查count判断
+		existData := roleNewestInfo.GetPushHistoryCount()
+		if existData > 0 { // 存在推送 查推送缓存  缓存没有数据则查 推送数据
+			res.Data.ShowTip = 1 // count>0说明存在数据不用显示引导用户设置关键词
+			// 查缓存
+			redisKey, _ := model.GetRedisKeyTimeout(model.StatusLoginUser, in.PositionId)
+			list, err := model.GetNewsCache(redisKey)
+			if err == nil && list != nil && len(list) > 0 {
+				res.Data.List = list
+				res.Data.Count = int64(len(list))
+				return res, model.StatusCache
 			}
-			//搜索历史-关键词
-			hKeys := redis.GetStr("other", fmt.Sprintf("s_%s", in.UserId))
-			if hKeys != "" && len(strings.Split(hKeys, ",")) > 0 {
-				//历史搜索
-				res.Data.History = strings.Split(hKeys, ",")
-				//根据订阅词获取查询语句
-				query := model.NewestQuery("", hKeys, subtype)
-				result := model.NewestES(query)
-				res.Data.IsVip = false
-				res.Data.HasSubKeys = false
-				res.Data.Count = int64(len(result))
-				res.Data.List = result
-				return res, 0
+			//  查推送
+			list = roleNewestInfo.GetPushHistory()
+			if list != nil && len(list) > 0 {
+				res.Data.List = list
+				res.Data.Count = int64(len(list))
+				return res, model.StatusLoginUser
 			}
-		} else {
-			//未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-			subtype = `"预告","公告","结果","其它"`
 		}
-		if in.IsSearch == 2 { //定位查询（默认全国）
-			query := model.NewestQuery(rks, "", subtype)
-			result := model.NewestES(query)
-			res.Data.IsVip = false
-			res.Data.HasSubKeys = false
-			res.Data.Count = int64(len(result))
-			res.Data.List = result
-			return res, 0
+		// 等0则说明推送里面没有数据 所以去查最新标讯信息缓存 返回  缓存没有则查最新标讯信息 存到缓存里面
+		res.Data.ShowTip = 2 // 显示
+		// 查缓存
+		redisKey, _ := model.GetRedisKeyTimeout(model.StatusLogin, in.PositionId)
+		list, err := model.GetNewsCache(redisKey)
+		if err == nil && list != nil && len(list) > 0 {
+			res.Data.List = list
+			res.Data.Count = int64(len(list))
+			return res, model.StatusCache
 		}
-		return res, 0
+		//  查最新标讯
+		query := model.NewestQuery("", "", "")
+		list = model.NewestES(query)
+		res.Data.List = list
+		res.Data.Count = int64(len(list))
+		return res, model.StatusLogin
 	}(in)
-	if r.Data.Count > 0 {
+	if r.Data.Count == 0 {
+		return r, nil
+	}
+	// status : 0 -拿到的是缓存 不用再处理也不用存缓存 1-存到未登录用户 2-存到用户自己的key 3-存到登录用户最新标讯
+	if status != model.StatusCache {
 		//排序
 		sort.Slice(r.Data.List, func(i, j int) bool {
 			return r.Data.List[i].PublishTime > r.Data.List[j].PublishTime
 		})
-		//-1:程序异常 0 不存在缓存数据 1 存在缓存数据 新数据 存入缓存
-		if i == 0 {
-			rks := ""
-			if userType == "e" {
-				rks = MC.If(in.UserId != "", in.EntUserId, in.City).(string)
-			} else {
-				rks = MC.If(in.UserId != "", in.UserId, in.City).(string)
-			}
-			//rks := MC.If(in.UserId != "", in.UserId, in.City).(string)
-			b, err := json.Marshal(r.Data)
-			if err != nil {
-				r.ErrCode = -1
-				r.ErrMsg = fmt.Sprintf("保存缓存 序列化异常,err:%s", err.Error())
-			} else {
-				redisKey := "p1_indexMessage_new_" + rks
-				timeOut := 2 * 60 * 60
-				if in.UserId == "" {
-					//未登录用户缓存一天
-					timeOut = 24 * 60 * 60
-					redisKey = fmt.Sprintf("%s_%d_%d_%d", redisKey, time.Now().Year(), time.Now().Month(), time.Now().Day())
-				}
-				if err = redis.PutBytes("other", redisKey, &b, timeOut); err != nil {
-					r.ErrCode = -1
-					r.ErrMsg = fmt.Sprintf("保存缓存 redis 异常,err:%s", err.Error())
-				}
-			}
-		}
+		redisKey, timeout := model.GetRedisKeyTimeout(status, in.PositionId)
+		go model.PutNewsCache(redisKey, timeout, r.Data.List)
 	}
 	model.MakeCollection(in.UserId, r.Data.List)
 	log.Println("接口耗时：", time.Since(t).Seconds())

jyBXBase/rpc/internal/server/bxbaseserver.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxbase.proto
 
 package server

jyBXBase/rpc/jylog/logfile.log

@@ -0,0 +1,105 @@
+{"level":"info","msg":"接口耗时： 0.0254036","time":"2023-07-22 11:03:32"}
+{"caller":"serverinterceptors/statinterceptor.go:90","duration":"26.3ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:42","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Info","level":"info","msg":"127.0.0.1:47841 - /bxcol.bxbase/NewestBidding - {}","span":"a7c36d7d3730e1f3","time":"2023-07-22 11:03:32","trace":"c8550b231293006d432b63620cad7f75"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"37398.7ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:47892 - /bxcol.bxbase/NewestBidding - {}","span":"5fda1ae44a492ca4","time":"2023-07-22 11:04:59","trace":"38fdf2ce7d1dc77b8c085222c9f549ac"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:04:59"}
+{"level":"info","msg":"接口耗时： 34.5442267","time":"2023-07-22 11:04:59"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.3Mi, TotalAlloc=9.2Mi, Sys=22.5Mi, NumGC=4","time":"2023-07-22 11:05:04"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 1, drop: 0","time":"2023-07-22 11:05:06"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.0Mi, TotalAlloc=8.9Mi, Sys=22.5Mi, NumGC=4","time":"2023-07-22 11:07:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:07:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.4Mi, TotalAlloc=9.4Mi, Sys=22.5Mi, NumGC=4","time":"2023-07-22 11:08:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:08:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=4.8Mi, TotalAlloc=9.8Mi, Sys=22.5Mi, NumGC=5","time":"2023-07-22 11:09:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:09:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.2Mi, TotalAlloc=10.3Mi, Sys=22.5Mi, NumGC=5","time":"2023-07-22 11:10:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:10:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=4.8Mi, TotalAlloc=10.7Mi, Sys=22.5Mi, NumGC=6","time":"2023-07-22 11:11:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:11:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.6Mi, TotalAlloc=11.5Mi, Sys=22.5Mi, NumGC=6","time":"2023-07-22 11:12:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:12:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=4.8Mi, TotalAlloc=11.9Mi, Sys=22.5Mi, NumGC=7","time":"2023-07-22 11:13:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:13:14"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"13660.9ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:48241 - /bxcol.bxbase/NewestBidding - {}","span":"626a066f58e5ff80","time":"2023-07-22 11:14:05","trace":"422dbb5927f163fca2d32bc343453d23"}
+{"caller":"model/newestBidding.go:244","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:42","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Info","level":"info","msg":"str:{\"query\":{\"bool\":{\"must\":[{\"terms\":{\"subtype\":[\"预告\",\"公告\",\"结果\",\"其它\"]}}],\"should\":[],\"minimum_should_match\":0}},\"highlight\": {\"pre_tags\": [\"\u003ca\u003e\"],\"post_tags\": [\"\u003c/a\u003e\"],\"fields\": {\"title\": {\"fragment_size\": 0,\"number_of_fragments\": 1}}},\"_source\":[\"_id\",\"area\", \"publishtime\", \"s_subscopeclass\", \"subtype\", \"title\", \"toptype\", \"type\", \"buyerclass\",\"bidamount\",\"budget\",\"projectname\",\"buyer\",\"bidopentime\",\"s_winner\",\"filetext\",\"isValidFile\",\"spidercode\",\"site\"],\"sort\":[{\"publishtime\":\"desc\"},{\"budget\":\"desc\"}],\"from\":0,\"size\":50}","time":"2023-07-22 11:14:05"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:14:06"}
+{"level":"info","msg":"从ES查询出错 elastic: Error 405 (Method Not Allowed)","time":"2023-07-22 11:14:06"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.6Mi, TotalAlloc=12.7Mi, Sys=22.5Mi, NumGC=7","time":"2023-07-22 11:14:47"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 1, drop: 0","time":"2023-07-22 11:14:47"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 13660.0ms, med: 13660.9ms, 90th: 13660.9ms, 99th: 13660.9ms, 99.9th: 13660.9ms","time":"2023-07-22 11:15:01"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.5Mi, TotalAlloc=13.4Mi, Sys=22.5Mi, NumGC=8","time":"2023-07-22 11:15:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:15:14"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:16:01"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.9Mi, TotalAlloc=13.8Mi, Sys=22.5Mi, NumGC=8","time":"2023-07-22 11:16:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:16:14"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:17:01"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=4.9Mi, TotalAlloc=14.6Mi, Sys=26.6Mi, NumGC=9","time":"2023-07-22 11:17:13"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:17:14"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.1Mi, TotalAlloc=9.1Mi, Sys=22.2Mi, NumGC=4","time":"2023-07-22 11:19:47"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"9739.1ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:48502 - /bxcol.bxbase/NewestBidding - {}","span":"7970a775c9aff1f4","time":"2023-07-22 11:19:47","trace":"71f001cc7e12f344868aaf95665053c6"}
+{"caller":"model/newestBidding.go:244","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:42","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Info","level":"info","msg":"str:{\"query\":{\"bool\":{\"must\":[{\"terms\":{\"subtype\":[\"预告\",\"公告\",\"结果\",\"其它\"]}}],\"should\":[],\"minimum_should_match\":0}},\"highlight\": {\"pre_tags\": [\"\u003ca\u003e\"],\"post_tags\": [\"\u003c/a\u003e\"],\"fields\": {\"title\": {\"fragment_size\": 0,\"number_of_fragments\": 1}}},\"_source\":[\"_id\",\"area\", \"publishtime\", \"s_subscopeclass\", \"subtype\", \"title\", \"toptype\", \"type\", \"buyerclass\",\"bidamount\",\"budget\",\"projectname\",\"buyer\",\"bidopentime\",\"s_winner\",\"filetext\",\"isValidFile\",\"spidercode\",\"site\"],\"sort\":[{\"publishtime\":\"desc\"},{\"budget\":\"desc\"}],\"from\":0,\"size\":50}","time":"2023-07-22 11:19:47"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 9739.0ms, med: 9739.1ms, 90th: 9739.1ms, 99th: 9739.1ms, 99.9th: 9739.1ms","time":"2023-07-22 11:19:47"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 1, drop: 0","time":"2023-07-22 11:19:47"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:19:47"}
+{"level":"info","msg":"接口耗时： 92.8706255","time":"2023-07-22 11:20:12"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=6.1Mi, TotalAlloc=11.8Mi, Sys=26.3Mi, NumGC=5","time":"2023-07-22 11:20:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:20:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:20:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=6.7Mi, TotalAlloc=12.3Mi, Sys=26.3Mi, NumGC=5","time":"2023-07-22 11:21:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:21:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:21:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.0Mi, TotalAlloc=12.8Mi, Sys=26.3Mi, NumGC=6","time":"2023-07-22 11:22:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:22:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:22:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.5Mi, TotalAlloc=13.3Mi, Sys=26.3Mi, NumGC=6","time":"2023-07-22 11:23:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:23:21"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"8017.5ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:48502 - /bxcol.bxbase/NewestBidding - {}","span":"7bbc4d52e74f5010","time":"2023-07-22 11:23:45","trace":"0f7562b0431d5710cdbd055b9586e076"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:23:45"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 8017.0ms, med: 8017.5ms, 90th: 8017.5ms, 99th: 8017.5ms, 99.9th: 8017.5ms","time":"2023-07-22 11:23:55"}
+{"level":"info","msg":"接口耗时： 16.3792531","time":"2023-07-22 11:23:56"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.1Mi, TotalAlloc=14.3Mi, Sys=26.3Mi, NumGC=7","time":"2023-07-22 11:24:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 1, drop: 0","time":"2023-07-22 11:24:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:24:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.6Mi, TotalAlloc=14.8Mi, Sys=26.3Mi, NumGC=7","time":"2023-07-22 11:25:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:25:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:25:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.0Mi, TotalAlloc=15.3Mi, Sys=26.3Mi, NumGC=8","time":"2023-07-22 11:26:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:26:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:26:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.5Mi, TotalAlloc=15.8Mi, Sys=26.3Mi, NumGC=8","time":"2023-07-22 11:27:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:27:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:27:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.0Mi, TotalAlloc=16.4Mi, Sys=26.3Mi, NumGC=9","time":"2023-07-22 11:28:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:28:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:28:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.9Mi, TotalAlloc=17.2Mi, Sys=26.3Mi, NumGC=9","time":"2023-07-22 11:29:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:29:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:29:47"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=4.9Mi, TotalAlloc=17.7Mi, Sys=26.6Mi, NumGC=10","time":"2023-07-22 11:30:20"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 0, pass: 0, drop: 0","time":"2023-07-22 11:30:21"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 0.0ms, med: 0.0ms, 90th: 0.0ms, 99th: 0.0ms, 99.9th: 0.0ms","time":"2023-07-22 11:30:47"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 0, drop: 0","time":"2023-07-22 11:31:23"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.5Mi, TotalAlloc=18.3Mi, Sys=26.6Mi, NumGC=10","time":"2023-07-22 11:31:23"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"14590.2ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:49874 - /bxcol.bxbase/NewestBidding - {\"appId\":\"10000\",\"positionId\":1204781659,\"accountId\":121233,\"mgoUserId\":\"641aa7bcac1c8e639bc15cdb\",\"userId\":\"641aa7bcac1c8e639bc15cdb\",\"newUserId\":486050,\"phone\":\"18238182402\"}","span":"634bce99dfb28cc0","time":"2023-07-22 11:31:23","trace":"22b05af90fdd10649d444e8d7ff3cd0a"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:31:23"}
+{"caller":"p2c/p2c.go:181","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"p2c - conn: 192.168.3.149:8081, load: 28454, reqs: 1","time":"2023-07-22 11:31:23"}
+{"level":"info","msg":"Error 1054 (42S22): Unknown column 's_userid' in 'where clause'","time":"2023-07-22 11:31:24"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 14590.0ms, med: 14590.2ms, 90th: 14590.2ms, 99th: 14590.2ms, 99.9th: 14590.2ms","time":"2023-07-22 11:31:57"}
+{"caller":"model/newestBidding.go:244","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:42","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Info","level":"info","msg":"str:{\"query\":{\"bool\":{\"must\":[],\"should\":[],\"minimum_should_match\":0}},\"highlight\": {\"pre_tags\": [\"\u003ca\u003e\"],\"post_tags\": [\"\u003c/a\u003e\"],\"fields\": {\"title\": {\"fragment_size\": 0,\"number_of_fragments\": 1}}},\"_source\":[\"_id\",\"area\", \"publishtime\", \"s_subscopeclass\", \"subtype\", \"title\", \"toptype\", \"type\", \"buyerclass\",\"bidamount\",\"budget\",\"projectname\",\"buyer\",\"bidopentime\",\"s_winner\",\"filetext\",\"isValidFile\",\"spidercode\",\"site\"],\"sort\":[{\"publishtime\":\"desc\"},{\"budget\":\"desc\"}],\"from\":0,\"size\":50}","time":"2023-07-22 11:31:57"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:32:13"}
+{"level":"info","msg":"接口耗时： 52.9231961","time":"2023-07-22 11:32:13"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=6.1Mi, TotalAlloc=20.4Mi, Sys=26.6Mi, NumGC=11","time":"2023-07-22 11:32:21"}
+{"level":"info","msg":"Error 1054 (42S22): Unknown column 's_userid' in 'where clause'","time":"2023-07-22 11:32:21"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 1, drop: 0","time":"2023-07-22 11:32:21"}
+{"level":"info","msg":"接口耗时： 0.573379","time":"2023-07-22 11:32:21"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"2103.4ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:49874 - /bxcol.bxbase/NewestBidding - {\"appId\":\"10000\",\"positionId\":1204781659,\"accountId\":121233,\"mgoUserId\":\"641aa7bcac1c8e639bc15cdb\",\"userId\":\"641aa7bcac1c8e639bc15cdb\",\"newUserId\":486050,\"phone\":\"18238182402\"}","span":"c2c101caa912eefb","time":"2023-07-22 11:32:21","trace":"0c1791288cd9ed21ad418b4c902fa345"}
+{"caller":"stat/metrics.go:210","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(bxbase.rpc) - qps: 0.0/s, drops: 0, avg time: 2103.0ms, med: 2103.4ms, 90th: 2103.4ms, 99th: 2103.4ms, 99.9th: 2103.4ms","time":"2023-07-22 11:32:49"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"9297.1ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:49874 - /bxcol.bxbase/NewestBidding - {\"appId\":\"10000\",\"positionId\":1204781659,\"accountId\":121233,\"mgoUserId\":\"641aa7bcac1c8e639bc15cdb\",\"userId\":\"641aa7bcac1c8e639bc15cdb\",\"newUserId\":486050,\"phone\":\"18238182402\"}","span":"d0a9b8fb3f555ff3","time":"2023-07-22 11:32:49","trace":"1f622580412b759f8df4fcc5b441df23"}
+{"caller":"p2c/p2c.go:181","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"p2c - conn: 192.168.3.149:8081, load: 12394, reqs: 2","time":"2023-07-22 11:32:49"}
+{"caller":"p2c/p2c.go:181","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"p2c - conn: 192.168.3.149:8081, load: 11783, reqs: 1","time":"2023-07-22 11:35:41"}
+{"level":"info","msg":"Error 1054 (42S22): Unknown column 's_userid' in 'where clause'","time":"2023-07-22 11:35:42"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"24289.9ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:50291 - /bxcol.bxbase/NewestBidding - {\"appId\":\"10000\",\"positionId\":1204781659,\"accountId\":121233,\"mgoUserId\":\"641aa7bcac1c8e639bc15cdb\",\"userId\":\"641aa7bcac1c8e639bc15cdb\",\"newUserId\":486050,\"phone\":\"18238182402\"}","span":"8a92d3f3ca5dbbf2","time":"2023-07-22 11:36:00","trace":"d926b8a8561a113febb7e52a5555a670"}
+{"caller":"discov/publisher.go:178","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:38","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Error","level":"error","msg":"etcd publisher revoke: etcdserver: requested lease not found","time":"2023-07-22 11:36:00"}
+{"level":"info","msg":"接口耗时： 19.6529531","time":"2023-07-22 11:36:00"}
+{"caller":"stat/usage.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"CPU: 0m, MEMORY: Alloc=5.0Mi, TotalAlloc=9.5Mi, Sys=22.7Mi, NumGC=5","time":"2023-07-22 11:36:07"}
+{"caller":"load/sheddingstat.go:61","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:58","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Stat","level":"info","msg":"(rpc) shedding_stat [1m], cpu: 0, total: 1, pass: 1, drop: 0","time":"2023-07-22 11:36:08"}
+{"caller":"serverinterceptors/statinterceptor.go:88","duration":"12983.9ms","file":"D:/software/Data/gopath/pkg/mod/app.yhyue.com/moapp/jylogx@v0.0.0-20230522075659-ae6fbedb92bc/logx/logx.go:50","func":"app.yhyue.com/moapp/jylogx/logx.(*LogrusWriter).Slow","level":"warning","msg":"[RPC] slowcall - 127.0.0.1:50291 - /bxcol.bxbase/NewestBidding - {\"appId\":\"10000\",\"positionId\":1204781659,\"accountId\":121233,\"mgoUserId\":\"641aa7bcac1c8e639bc15cdb\",\"userId\":\"641aa7bcac1c8e639bc15cdb\",\"newUserId\":486050,\"phone\":\"18238182402\"}","span":"b6cc84a15f52c7bb","time":"2023-07-22 11:36:26","trace":"a763c2f797113381f079fe3893fcc350"}

jyBXBase/rpc/model/newestBidding.go

@@ -1,9 +1,12 @@
 package model
 
 import (
+	"app.yhyue.com/moapp/jybase/redis"
+	"encoding/json"
 	"fmt"
 	"jyBXBase/rpc/bxbase"
 	IC "jyBXBase/rpc/init"
+	"log"
 	"strings"
 	"time"
 
@@ -25,17 +28,22 @@ const (
 	query_bool_must     = `{"terms":{"%s":[%s]}}`
 	query_bool_must_and = `{"bool":{"must":[%s],"must_not":[%s]}}`
 	search_field        = `"_id","area", "publishtime", "s_subscopeclass", "subtype", "title", "toptype", "type", "buyerclass","bidamount","budget","projectname","buyer","bidopentime","s_winner","filetext","isValidFile","spidercode","site"`
-	query_city_hkeys    = `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match":%d}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":50}`
+	query_city_hkeys    = `{"query":{"bool":{"must":[%s],"should":[%s],"minimum_should_match":%d}},"highlight": {"pre_tags": ["<a>"],"post_tags": ["</a>"],"fields": {"title": {"fragment_size": 0,"number_of_fragments": 1}}},"_source":[` + search_field + `],"sort":[{"publishtime":"desc"},{"budget":"desc"}],"from":0,"size":%d}`
 	Pushbidding         = "global_common_data.dws_f_bid_baseinfo"
 	Province            = "province"
+	StatusNoLogin       = 1 // 1-未登录用户
+	StatusLoginUser     = 2 // 2-用户自己的key
+	StatusLogin         = 3 // 3-登录用户最新标讯
+	StatusCache         = 0 //   0 -不存缓存 本来查的就是缓存的数据
 )
 
 type NewestInfo struct {
-	TableName string
-	UserId    string
-	MysqlDb   *mysql.Mysql
-	NewUserId int64
-	PushMysql *mysql.Mysql
+	TableName    string
+	UserId       string
+	MysqlDb      *mysql.Mysql
+	NewUserId    int64
+	PushMysql    *mysql.Mysql
+	NewsLimitNum int64 // 最新标讯数量条数限制
 }
 
 var mysqlTables = map[string]string{
@@ -45,20 +53,72 @@ var mysqlTables = map[string]string{
 	"e": "push.pushentniche",
 }
 
+func GetRoleNewestInfoService(AppId, MgoUserId string, NewUserId, AccountId, EntId, EntUserId, PositionType, PositionId int64) (roleNewestInfo *NewestInfo, flag string) {
+	powerCheck := IC.Middleground.PowerCheckCenter.Check(AppId, MgoUserId, NewUserId, AccountId, EntId, PositionType, PositionId)
+	if powerCheck.Member.Status > 0 {
+		// 大会员
+		flag = "m"
+		if PositionType == int64(1) {
+			roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
+		} else {
+			roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "m", NewUserId)
+		}
+	} else if powerCheck.Entniche.Status > 0 && powerCheck.Entniche.PowerSource != 1 && powerCheck.Entniche.IsEntPower == 1 {
+		// 商机管理
+		flag = "e"
+		roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
+	} else if powerCheck.Vip.Status > 0 {
+		// 超级订阅
+		flag = "v"
+		if PositionType == int64(1) {
+			roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
+		} else {
+			roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "v", NewUserId)
+		}
+	} else {
+		// 普通用户
+		flag = "f"
+		if PositionType == int64(1) {
+			roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(EntUserId), "e", EntUserId)
+		} else {
+			roleNewestInfo = GetNewestInfo(MC.InterfaceToStr(NewUserId), "f", NewUserId)
+		}
+	}
+	return roleNewestInfo, flag
+}
 func GetNewestInfo(userId, userType string, newUserId int64) *NewestInfo {
 	nt := &NewestInfo{
-		UserId:    userId,
-		TableName: mysqlTables[userType],
-		MysqlDb:   IC.BaseServiceMysql,
-		NewUserId: newUserId,
+		UserId:       userId,
+		TableName:    mysqlTables[userType],
+		MysqlDb:      IC.BaseServiceMysql,
+		NewUserId:    newUserId,
+		NewsLimitNum: IC.C.NewsLimitNum,
 	}
 	return nt
 }
+
+// GetPushHistoryCount 缓存code  配置最新的redis code；可以感觉redis内存大小 调节redis存储；
+// 根据GetPushHistoryCount 返回值 作为列表缓存key中一个参数
+func (n *NewestInfo) GetPushHistoryCount() int64 {
+	countKey := fmt.Sprintf("push_count_%s_%s", n.TableName, n.UserId)
+	if b, err := redis.Exists("other", countKey); err == nil && b {
+		return 1
+	}
+	countSql := "SELECT COUNT(1) FROM (SELECT 1 FROM %s WHERE userid = %d LIMIT 1) AS ph"
+	//countSql := "select count(1) from %s  a  where a.userid=%d order by a.id desc"
+	countSql = fmt.Sprintf(countSql, n.TableName, n.NewUserId)
+	if c := n.MysqlDb.CountBySql(countSql); c > 0 {
+		redis.Put("other", countKey, c, 60) //过期时间走配置，比最新标讯列表缓存时间 要短1/10 尽量不超过两分钟
+		return c
+	}
+	return 0
+}
+
 func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
-	findSQL := "select a.infoid,REPLACE(a.matchkeys,'+',' ') as matchkeys,a.attachment_count,a.budget,a.bidamount from %s  a  where a.userid=%d and a.date>=%d  order by a.id desc limit 50"
+	findSQL := "select a.infoid,REPLACE(a.matchkeys,'+',' ') as matchkeys,a.attachment_count,a.budget,a.bidamount from %s  a  where a.userid=%d and a.date>=%d  order by a.id desc limit ?"
 	findSQL = fmt.Sprintf(findSQL, n.TableName, n.NewUserId, time.Now().AddDate(0, 0, -7).Unix())
 	logx.Info(n.TableName, "-------", n.NewUserId, ",findSQL:", findSQL)
-	list := n.MysqlDb.SelectBySql(findSQL)
+	list := n.MysqlDb.SelectBySql(findSQL, n.NewsLimitNum)
 	if len(*list) > 0 && list != nil {
 		m := map[string]bool{}
 		es_ids := []string{}
@@ -73,7 +133,7 @@ func (n *NewestInfo) GetPushHistory() (res []*bxbase.NewestList) {
 			//
 			infos[infoId] = &bxbase.NewestList{
 				Id:         ME.EncodeArticleId2ByCheck(MC.ObjToString(v["infoid"])),
-				Matchkeys:  strings.Split(MC.ObjToString(v["matchkeys"])," "),
+				Matchkeys:  strings.Split(MC.ObjToString(v["matchkeys"]), " "),
 				Budget:     MC.Int64All(v["budget"]),
 				Bidamount:  MC.Int64All(v["bidamount"]),
 				FileExists: MC.Int64All(v["attachment_count"]) > 0,
@@ -180,7 +240,7 @@ func NewestQuery(city, keys, subtype string) (str string) {
 	if len(bools) > 0 {
 		minimum_should_match = 1
 	}
-	str = fmt.Sprintf(query_city_hkeys, strings.Join(musts, ","), strings.Join(bools, ","), minimum_should_match)
+	str = fmt.Sprintf(query_city_hkeys, strings.Join(musts, ","), strings.Join(bools, ","), minimum_should_match, IC.C.NewsLimitNum)
 	logx.Info("str:", str)
 	return
 }
@@ -211,3 +271,49 @@ func NewestES(doSearchStr string) (res []*bxbase.NewestList) {
 	}
 	return
 }
+
+// GetRedisKeyTimeout 获取缓存的key 和超时时间
+func GetRedisKeyTimeout(status int, positionId int64) (redisKey string, timeout int) {
+	switch status {
+	case StatusNoLogin:
+		redisKey = "p1_indexMessage_new_noLogin_%d_%d_%d"
+		redisKey = fmt.Sprintf(redisKey, time.Now().Year(), time.Now().Month(), time.Now().Day())
+		timeout = 60 * 60 * 24
+	case StatusLoginUser:
+		redisKey = "p1_indexMessage_new_%d_%d_%d_%d" // 登录用户使用的缓存key
+		redisKey = fmt.Sprintf(redisKey, positionId, time.Now().Year(), time.Now().Month(), time.Now().Day())
+		timeout = 15 * 60
+	case StatusLogin:
+		redisKey = "p1_indexMessage_new_login_%d_%d_%d" // 登录用户使用的最新标讯缓存key
+		redisKey = fmt.Sprintf(redisKey, time.Now().Year(), time.Now().Month(), time.Now().Day())
+		timeout = 15 * 60
+	}
+	return
+}
+
+// PutNewsCache 存缓存
+func PutNewsCache(redisKey string, redisTimeout int, list []*bxbase.NewestList) {
+	b, err := json.Marshal(list)
+	if err != nil {
+		log.Printf("保存缓存 序列化异常,data:%s,err:%s\n", list, err.Error())
+		return
+	}
+	if err = redis.PutBytes("other", redisKey, &b, redisTimeout); err != nil {
+		log.Printf("保存缓存 redis 异常,key:%s,err:%s\n", redisKey, err.Error())
+	}
+
+}
+
+// GetNewsCache 取缓存
+func GetNewsCache(redisKey string) (list []*bxbase.NewestList, err error) {
+	redisByte, err := redis.GetBytes("other", redisKey)
+	if err != nil || redisByte == nil || len(*redisByte) == 0 {
+		return list, err
+	}
+	err = json.Unmarshal(*redisByte, &list)
+	if err != nil {
+		logx.Info(fmt.Sprintf("读取缓存 序列化异常,err:%s", err.Error()))
+		return nil, err
+	}
+	return list, nil
+}

jyBXBase/rpc/type/bxbase/bxbase.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.15.1
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.19.4
 // source: bxbase.proto
 
 package bxbase
@@ -1822,12 +1822,17 @@ type NewestBiddingReq struct {
 
 	City         string `protobuf:"bytes,1,opt,name=city,proto3" json:"city,omitempty"`
 	IsSearch     int64  `protobuf:"varint,2,opt,name=isSearch,proto3" json:"isSearch,omitempty"`
-	UserId       string `protobuf:"bytes,3,opt,name=userId,proto3" json:"userId,omitempty"`
-	AppId        string `protobuf:"bytes,4,opt,name=appId,proto3" json:"appId,omitempty"`
-	EntUserId    string `protobuf:"bytes,5,opt,name=entUserId,proto3" json:"entUserId,omitempty"`
-	NewUserId    int64  `protobuf:"varint,6,opt,name=newUserId,proto3" json:"newUserId,omitempty"`
-	EntId        string `protobuf:"bytes,7,opt,name=entId,proto3" json:"entId,omitempty"`
-	PositionType int64  `protobuf:"varint,8,opt,name=positionType,proto3" json:"positionType,omitempty"`
+	AppId        string `protobuf:"bytes,3,opt,name=appId,proto3" json:"appId,omitempty"`                //剑鱼10000
+	EntId        int64  `protobuf:"varint,4,opt,name=entId,proto3" json:"entId,omitempty"`               // 企业id
+	EntUserId    int64  `protobuf:"varint,5,opt,name=entUserId,proto3" json:"entUserId,omitempty"`       // 企业下用户id
+	EntAccountId int64  `protobuf:"varint,6,opt,name=entAccountId,proto3" json:"entAccountId,omitempty"` //企业账户id
+	PositionType int64  `protobuf:"varint,7,opt,name=positionType,proto3" json:"positionType,omitempty"` // 职位类型 0个人 1企业
+	PositionId   int64  `protobuf:"varint,8,opt,name=positionId,proto3" json:"positionId,omitempty"`     //职位id
+	AccountId    int64  `protobuf:"varint,9,opt,name=accountId,proto3" json:"accountId,omitempty"`       //账户id
+	MgoUserId    string `protobuf:"bytes,10,opt,name=mgoUserId,proto3" json:"mgoUserId,omitempty"`       //原userId
+	UserId       string `protobuf:"bytes,11,opt,name=userId,proto3" json:"userId,omitempty"`             //用户id
+	NewUserId    int64  `protobuf:"varint,12,opt,name=newUserId,proto3" json:"newUserId,omitempty"`      //base_user_id
+	Phone        string `protobuf:"bytes,13,opt,name=phone,proto3" json:"phone,omitempty"`
 }
 
 func (x *NewestBiddingReq) Reset() {
@@ -1876,48 +1881,83 @@ func (x *NewestBiddingReq) GetIsSearch() int64 {
 	return 0
 }
 
-func (x *NewestBiddingReq) GetUserId() string {
+func (x *NewestBiddingReq) GetAppId() string {
 	if x != nil {
-		return x.UserId
+		return x.AppId
 	}
 	return ""
 }
 
-func (x *NewestBiddingReq) GetAppId() string {
+func (x *NewestBiddingReq) GetEntId() int64 {
 	if x != nil {
-		return x.AppId
+		return x.EntId
 	}
-	return ""
+	return 0
 }
 
-func (x *NewestBiddingReq) GetEntUserId() string {
+func (x *NewestBiddingReq) GetEntUserId() int64 {
 	if x != nil {
 		return x.EntUserId
 	}
-	return ""
+	return 0
 }
 
-func (x *NewestBiddingReq) GetNewUserId() int64 {
+func (x *NewestBiddingReq) GetEntAccountId() int64 {
 	if x != nil {
-		return x.NewUserId
+		return x.EntAccountId
 	}
 	return 0
 }
 
-func (x *NewestBiddingReq) GetEntId() string {
+func (x *NewestBiddingReq) GetPositionType() int64 {
 	if x != nil {
-		return x.EntId
+		return x.PositionType
+	}
+	return 0
+}
+
+func (x *NewestBiddingReq) GetPositionId() int64 {
+	if x != nil {
+		return x.PositionId
+	}
+	return 0
+}
+
+func (x *NewestBiddingReq) GetAccountId() int64 {
+	if x != nil {
+		return x.AccountId
+	}
+	return 0
+}
+
+func (x *NewestBiddingReq) GetMgoUserId() string {
+	if x != nil {
+		return x.MgoUserId
 	}
 	return ""
 }
 
-func (x *NewestBiddingReq) GetPositionType() int64 {
+func (x *NewestBiddingReq) GetUserId() string {
 	if x != nil {
-		return x.PositionType
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *NewestBiddingReq) GetNewUserId() int64 {
+	if x != nil {
+		return x.NewUserId
 	}
 	return 0
 }
 
+func (x *NewestBiddingReq) GetPhone() string {
+	if x != nil {
+		return x.Phone
+	}
+	return ""
+}
+
 //首页最新招标信息Resp
 type NewsetBiddingResp struct {
 	state         protoimpl.MessageState
@@ -1987,13 +2027,10 @@ type NewsetBidding struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	IsVip      bool          `protobuf:"varint,1,opt,name=isVip,proto3" json:"isVip,omitempty"`           //是否超级订阅用户
-	HasSubKeys bool          `protobuf:"varint,2,opt,name=hasSubKeys,proto3" json:"hasSubKeys,omitempty"` //是否有订阅词
-	HasHSKeys  bool          `protobuf:"varint,3,opt,name=hasHSKeys,proto3" json:"hasHSKeys,omitempty"`   //是否有搜索历史
-	Count      int64         `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"`           //数据长度
-	List       []*NewestList `protobuf:"bytes,5,rep,name=list,proto3" json:"list,omitempty"`              //数据
-	History    []string      `protobuf:"bytes,6,rep,name=history,proto3" json:"history,omitempty"`        //历史数据
-	SubFlag    string        `protobuf:"bytes,7,opt,name=subFlag,proto3" json:"subFlag,omitempty"`        //当前用户订阅信息属性：m：大会员；e：商机管理；v：VIP；f：普通用户
+	Count   int64         `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"`     //数据长度
+	List    []*NewestList `protobuf:"bytes,2,rep,name=list,proto3" json:"list,omitempty"`        //数据
+	SubFlag string        `protobuf:"bytes,3,opt,name=subFlag,proto3" json:"subFlag,omitempty"`  //当前用户订阅信息属性：m：大会员；e：商机管理；v：VIP；f：普通用户
+	ShowTip int64         `protobuf:"varint,4,opt,name=showTip,proto3" json:"showTip,omitempty"` // 是否展示引导用户设置关键词
 }
 
 func (x *NewsetBidding) Reset() {
@@ -2028,27 +2065,6 @@ func (*NewsetBidding) Descriptor() ([]byte, []int) {
 	return file_bxbase_proto_rawDescGZIP(), []int{23}
 }
 
-func (x *NewsetBidding) GetIsVip() bool {
-	if x != nil {
-		return x.IsVip
-	}
-	return false
-}
-
-func (x *NewsetBidding) GetHasSubKeys() bool {
-	if x != nil {
-		return x.HasSubKeys
-	}
-	return false
-}
-
-func (x *NewsetBidding) GetHasHSKeys() bool {
-	if x != nil {
-		return x.HasHSKeys
-	}
-	return false
-}
-
 func (x *NewsetBidding) GetCount() int64 {
 	if x != nil {
 		return x.Count
@@ -2063,18 +2079,18 @@ func (x *NewsetBidding) GetList() []*NewestList {
 	return nil
 }
 
-func (x *NewsetBidding) GetHistory() []string {
+func (x *NewsetBidding) GetSubFlag() string {
 	if x != nil {
-		return x.History
+		return x.SubFlag
 	}
-	return nil
+	return ""
 }
 
-func (x *NewsetBidding) GetSubFlag() string {
+func (x *NewsetBidding) GetShowTip() int64 {
 	if x != nil {
-		return x.SubFlag
+		return x.ShowTip
 	}
-	return ""
+	return 0
 }
 
 //
@@ -3096,200 +3112,204 @@ var file_bxbase_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
 	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
 	0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x22, 0xe6, 0x01, 0x0a, 0x10, 0x4e, 0x65, 0x77, 0x65, 0x73,
+	0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x22, 0xfc, 0x02, 0x0a, 0x10, 0x4e, 0x65, 0x77, 0x65, 0x73,
 	0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63,
 	0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x12,
 	0x1a, 0x0a, 0x08, 0x69, 0x73, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x08, 0x69, 0x73, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x75,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65,
-	0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x74,
-	0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x6e,
-	0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x55, 0x73,
-	0x65, 0x72, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6e, 0x65, 0x77, 0x55,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x70,
-	0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x0c, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22,
-	0x71, 0x0a, 0x11, 0x4e, 0x65, 0x77, 0x73, 0x65, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e, 0x67,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
-	0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4e,
-	0x65, 0x77, 0x73, 0x65, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x22, 0xd4, 0x01, 0x0a, 0x0d, 0x4e, 0x65, 0x77, 0x73, 0x65, 0x74, 0x42, 0x69, 0x64,
-	0x64, 0x69, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x56, 0x69, 0x70, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x56, 0x69, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x61,
-	0x73, 0x53, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
-	0x68, 0x61, 0x73, 0x53, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x61,
-	0x73, 0x48, 0x53, 0x4b, 0x65, 0x79, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x68,
-	0x61, 0x73, 0x48, 0x53, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x25,
-	0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62,
-	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x6e, 0x65, 0x77, 0x65, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79,
-	0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12,
-	0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x46, 0x6c, 0x61, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x07, 0x73, 0x75, 0x62, 0x46, 0x6c, 0x61, 0x67, 0x22, 0xa6, 0x03, 0x0a, 0x0a, 0x6e, 0x65,
-	0x77, 0x65, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x12, 0x0a, 0x04,
-	0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79,
-	0x12, 0x1c, 0x0a, 0x09, 0x62, 0x69, 0x64, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x69, 0x64, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16,
-	0x0a, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
-	0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x79, 0x65, 0x72, 0x63,
-	0x6c, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75, 0x79, 0x65,
-	0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x6b,
-	0x65, 0x79, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x6b, 0x65, 0x79, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54,
-	0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69,
-	0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74,
-	0x72, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74,
-	0x72, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0c,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65,
-	0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x66, 0x69,
-	0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x43, 0x6f,
-	0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x43, 0x6f, 0x6c, 0x12, 0x12,
-	0x0a, 0x04, 0x73, 0x69, 0x74, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69,
-	0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x70, 0x69, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x64, 0x65,
-	0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x70, 0x69, 0x64, 0x65, 0x72, 0x43, 0x6f,
-	0x64, 0x65, 0x22, 0x3f, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12,
-	0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72,
-	0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72,
-	0x4d, 0x73, 0x67, 0x22, 0x52, 0x0a, 0x08, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x12,
-	0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72,
-	0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72,
-	0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x0a, 0x08, 0x41, 0x70, 0x70, 0x49, 0x64,
-	0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, 0x22, 0xd0, 0x07, 0x0a, 0x0c, 0x49, 0x6e,
-	0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x65,
-	0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x79, 0x65, 0x61, 0x72, 0x12, 0x14,
-	0x0a, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d,
-	0x6f, 0x6e, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x02, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x69, 0x64, 0x55,
-	0x6e, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x69, 0x64, 0x55, 0x6e,
-	0x69, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x69, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70,
-	0x65, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x69, 0x64, 0x55, 0x6e,
-	0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a,
-	0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65,
-	0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x69,
-	0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
-	0x55, 0x6e, 0x69, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x55,
-	0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x11, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65,
-	0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x02, 0x52,
-	0x03, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x24,
-	0x0a, 0x0d, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18,
-	0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70,
-	0x70, 0x65, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x18, 0x0d, 0x20,
-	0x01, 0x28, 0x02, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x75,
-	0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62,
-	0x75, 0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x62, 0x75, 0x79, 0x65,
-	0x72, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0f, 0x62, 0x75, 0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65,
-	0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x10, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x6e,
-	0x69, 0x74, 0x12, 0x36, 0x0a, 0x16, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x12, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x16, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x69,
-	0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x62, 0x69,
-	0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x69, 0x64, 0x46, 0x69, 0x65,
-	0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x62, 0x69,
-	0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x62, 0x69,
-	0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x62, 0x69, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x69,
-	0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, 0x18, 0x16, 0x20, 0x01, 0x28,
-	0x02, 0x52, 0x0d, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79,
-	0x12, 0x2c, 0x0a, 0x11, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63,
-	0x79, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x66, 0x69, 0x65,
-	0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x38,
-	0x0a, 0x17, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, 0x55,
-	0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x17, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, 0x55, 0x6e,
-	0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75, 0x73, 0x68,
-	0x18, 0x19, 0x20, 0x01, 0x28, 0x02, 0x52, 0x04, 0x70, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08,
-	0x70, 0x75, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x70, 0x75, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x75, 0x73, 0x68,
-	0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0e, 0x70, 0x75, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x1c, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1d, 0x0a,
-	0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x1d, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x51, 0x0a, 0x0f,
-	0x53, 0x61, 0x76, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12,
-	0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4d,
-	0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x22,
-	0x3d, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x52,
-	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79,
-	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x22, 0x59,
-	0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x65,
+	0x03, 0x52, 0x08, 0x69, 0x73, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x61,
+	0x70, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49,
+	0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e, 0x74, 0x55, 0x73,
+	0x65, 0x72, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x6e, 0x74, 0x55,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x65, 0x6e, 0x74,
+	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x0c, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a,
+	0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1c, 0x0a,
+	0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6d,
+	0x67, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x6d, 0x67, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0c,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6e, 0x65, 0x77, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
+	0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x70, 0x68, 0x6f, 0x6e, 0x65, 0x22, 0x71, 0x0a, 0x11, 0x4e, 0x65, 0x77, 0x73, 0x65, 0x74, 0x42,
+	0x69, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72,
+	0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72,
+	0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x28,
+	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x62,
+	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4e, 0x65, 0x77, 0x73, 0x65, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69,
+	0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x80, 0x01, 0x0a, 0x0d, 0x4e, 0x65, 0x77,
+	0x73, 0x65, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11,
+	0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x6e, 0x65, 0x77, 0x65, 0x73, 0x74, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x46, 0x6c,
+	0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x46, 0x6c, 0x61,
+	0x67, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x68, 0x6f, 0x77, 0x54, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x07, 0x73, 0x68, 0x6f, 0x77, 0x54, 0x69, 0x70, 0x22, 0xa6, 0x03, 0x0a, 0x0a,
+	0x6e, 0x65, 0x77, 0x65, 0x73, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72,
+	0x65, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x12,
+	0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69,
+	0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x69, 0x64, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x62, 0x69, 0x64, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x75, 0x79, 0x65,
+	0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x75,
+	0x79, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73,
+	0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x70, 0x75, 0x62,
+	0x6c, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75,
+	0x73, 0x74, 0x72, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x75,
+	0x73, 0x74, 0x72, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75,
+	0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62,
+	0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x69,
+	0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
+	0x66, 0x69, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73,
+	0x43, 0x6f, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x43, 0x6f, 0x6c,
+	0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x74, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x73, 0x69, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x70, 0x69, 0x64, 0x65, 0x72, 0x43, 0x6f,
+	0x64, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x70, 0x69, 0x64, 0x65, 0x72,
+	0x43, 0x6f, 0x64, 0x65, 0x22, 0x3f, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07,
+	0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65,
+	0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x52, 0x0a, 0x08, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65,
 	0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07,
 	0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65,
 	0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xab, 0x05, 0x0a, 0x06, 0x62, 0x78,
-	0x62, 0x61, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x6c, 0x61, 0x62, 0x65, 0x6c,
-	0x12, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64, 0x6c, 0x61, 0x62, 0x65,
-	0x6c, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4c,
-	0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x2e, 0x62, 0x78, 0x63,
-	0x6f, 0x6c, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x47, 0x65, 0x74,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x3b,
-	0x0a, 0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x2e,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x0a, 0x08, 0x41, 0x70, 0x70,
+	0x49, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x70, 0x70, 0x49, 0x64, 0x22, 0xd0, 0x07, 0x0a, 0x0c,
+	0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04,
+	0x79, 0x65, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x79, 0x65, 0x61, 0x72,
+	0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x69,
+	0x64, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x69, 0x64,
+	0x55, 0x6e, 0x69, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x69, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x41,
+	0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x69, 0x64,
+	0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72,
+	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x07, 0x70, 0x72, 0x6f,
+	0x6a, 0x65, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x55,
+	0x6e, 0x69, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65,
+	0x63, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63,
+	0x74, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x11, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70,
+	0x70, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x02, 0x52, 0x03, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69,
+	0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74,
+	0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e,
+	0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x69, 0x74,
+	0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x18,
+	0x0d, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09,
+	0x62, 0x75, 0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x62, 0x75, 0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x62, 0x75,
+	0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x0f, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0f, 0x62, 0x75, 0x79, 0x65, 0x72, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70,
+	0x70, 0x65, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x62, 0x69, 0x64, 0x44,
+	0x61, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x69, 0x64, 0x44,
+	0x61, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x11, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x10, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x55, 0x6e, 0x69, 0x74, 0x12, 0x36, 0x0a, 0x16, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x12,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x62, 0x69, 0x64, 0x44, 0x61, 0x79, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+	0x62, 0x69, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08,
+	0x62, 0x69, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x69, 0x64, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x62, 0x69, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x2e, 0x0a, 0x12,
+	0x62, 0x69, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65,
+	0x6e, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x62, 0x69, 0x64, 0x46, 0x69, 0x65,
+	0x6c, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x24, 0x0a, 0x0d,
+	0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, 0x18, 0x16, 0x20,
+	0x01, 0x28, 0x02, 0x52, 0x0d, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61,
+	0x63, 0x79, 0x12, 0x2c, 0x0a, 0x11, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72,
+	0x61, 0x63, 0x79, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x66,
+	0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, 0x55, 0x6e, 0x69, 0x74,
+	0x12, 0x38, 0x0a, 0x17, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63,
+	0x79, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x17, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79,
+	0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x75,
+	0x73, 0x68, 0x18, 0x19, 0x20, 0x01, 0x28, 0x02, 0x52, 0x04, 0x70, 0x75, 0x73, 0x68, 0x12, 0x1a,
+	0x0a, 0x08, 0x70, 0x75, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x70, 0x75, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x70, 0x75,
+	0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x1b, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0e, 0x70, 0x75, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x41, 0x70, 0x70, 0x65,
+	0x6e, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18,
+	0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12,
+	0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x1d, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x51,
+	0x0a, 0x0f, 0x53, 0x61, 0x76, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x65,
+	0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x4d, 0x6f, 0x64,
+	0x65, 0x22, 0x3d, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x64,
+	0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65,
+	0x22, 0x59, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x6f, 0x64, 0x65,
+	0x52, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17,
+	0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0xab, 0x05, 0x0a, 0x06,
+	0x62, 0x78, 0x62, 0x61, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x12, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64, 0x6c, 0x61,
+	0x62, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41,
+	0x64, 0x64, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x12, 0x44, 0x0a, 0x0e, 0x47, 0x65,
+	0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x2e, 0x62,
+	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x47,
+	0x65, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x12, 0x3b, 0x0a, 0x0b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x15, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c,
+	0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x35, 0x0a,
+	0x08, 0x42, 0x43, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f,
+	0x6c, 0x2e, 0x42, 0x43, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e,
 	0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61, 0x62,
-	0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x08, 0x42,
-	0x43, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e,
-	0x42, 0x43, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x62, 0x78,
-	0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x12, 0x3e, 0x0a, 0x0c, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x16, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x73, 0x43, 0x6f, 0x6c,
-	0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x62, 0x78, 0x63,
-	0x6f, 0x6c, 0x2e, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x12, 0x26, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x2e, 0x62, 0x78, 0x63,
-	0x6f, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x62, 0x78, 0x63,
-	0x6f, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x0a, 0x53, 0x68,
-	0x6f, 0x77, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x14, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
-	0x2e, 0x53, 0x68, 0x6f, 0x77, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x14,
-	0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x53, 0x65, 0x61, 0x72, 0x63,
-	0x68, 0x52, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63,
-	0x68, 0x12, 0x13, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64, 0x53, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x43,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x33, 0x0a, 0x0b, 0x43, 0x68, 0x65, 0x63,
-	0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x13, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e,
-	0x41, 0x64, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x0f, 0x2e, 0x62,
-	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x12, 0x32, 0x0a,
-	0x09, 0x44, 0x65, 0x6c, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x13, 0x2e, 0x62, 0x78, 0x63,
-	0x6f, 0x6c, 0x2e, 0x44, 0x65, 0x6c, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a,
-	0x10, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x12, 0x42, 0x0a, 0x0d, 0x4e, 0x65, 0x77, 0x65, 0x73, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69,
-	0x6e, 0x67, 0x12, 0x17, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4e, 0x65, 0x77, 0x65, 0x73,
-	0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x62, 0x78,
-	0x63, 0x6f, 0x6c, 0x2e, 0x4e, 0x65, 0x77, 0x73, 0x65, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e,
-	0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x08, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
-	0x64, 0x12, 0x0f, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x70, 0x70, 0x49, 0x64, 0x52,
-	0x65, 0x71, 0x1a, 0x13, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x6e, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x62, 0x78, 0x62,
-	0x61, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x52, 0x65, 0x73, 0x12, 0x3e, 0x0a, 0x0c, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x73, 0x43,
+	0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x62,
+	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x12, 0x26, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x2e, 0x62,
+	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x0e, 0x2e, 0x62,
+	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x0a,
+	0x53, 0x68, 0x6f, 0x77, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x14, 0x2e, 0x62, 0x78, 0x63,
+	0x6f, 0x6c, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71,
+	0x1a, 0x14, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x53, 0x65, 0x61,
+	0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x53, 0x65, 0x61,
+	0x72, 0x63, 0x68, 0x12, 0x13, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x64, 0x64, 0x53,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x10, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c,
+	0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x12, 0x33, 0x0a, 0x0b, 0x43, 0x68,
+	0x65, 0x63, 0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x13, 0x2e, 0x62, 0x78, 0x63, 0x6f,
+	0x6c, 0x2e, 0x41, 0x64, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x0f,
+	0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x12,
+	0x32, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x13, 0x2e, 0x62,
+	0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x44, 0x65, 0x6c, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65,
+	0x71, 0x1a, 0x10, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x52, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x0d, 0x4e, 0x65, 0x77, 0x65, 0x73, 0x74, 0x42, 0x69, 0x64,
+	0x64, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4e, 0x65, 0x77,
+	0x65, 0x73, 0x74, 0x42, 0x69, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e,
+	0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x4e, 0x65, 0x77, 0x73, 0x65, 0x74, 0x42, 0x69, 0x64, 0x64,
+	0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x30, 0x0a, 0x08, 0x49, 0x6e, 0x63, 0x6c, 0x75,
+	0x64, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x41, 0x70, 0x70, 0x49,
+	0x64, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x6c, 0x2e, 0x49, 0x6e, 0x63,
+	0x6c, 0x75, 0x64, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x62,
+	0x78, 0x62, 0x61, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

jyBXBase/rpc/type/bxbase/bxbase_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.15.1
+// - protoc             v3.19.4
 // source: bxbase.proto
 
 package bxbase