Merge branch 'dev1.0.0' of https://app.yhyue.com/moapp/jyInfo into dev1.0.0

api/internal/handler/routes.go

@@ -82,11 +82,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/jyinfo/manage/infoList",
 				Handler: infoListHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodGet,
-				Path:    "/jyinfo/manage/infoDetail",
-				Handler: infoDetailHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/jyinfo/manage/infoDetail",

api/internal/types/types.go

@@ -17,7 +17,7 @@ type PubInfoReq struct {
 	Attach       map[string]interface{} `json:"attach,optional"`
 	Contact      Contact                `json:"contact"`
 	AppId        string                 `json:"appId"`
-	EntId        string                 `json:"entId"`
+	EntId        int64                  `json:"entId"`
 	UserId       string                 `json:"userId"`
 	ValidityTime string                 `json:"validityTime,optional"`
 	Phone        string                 `json:"phone"`
@@ -105,14 +105,14 @@ type UploadReq struct {
 
 type CommonReq struct {
 	UserId  string `json:"userId,optional"`
-	EntId   string `json:"entId,optional"`
+	EntId   int64  `json:"entId,optional"`
 	AppId   string `json:"appId"`
 	Match   string `json:"match,optional"`
 	MsgType int64  `json:"msgType,optional"`
 }
 
 type CommonRes struct {
-	Err_code int         `json:"err_code"`
-	Err_msg  string      `json:"err_msg"`
+	Err_code int         `json:"error_code"`
+	Err_msg  string      `json:"error_msg"`
 	Data     interface{} `json:"data"`
 }

api/jyinfo.api

@@ -16,7 +16,7 @@ type (
 		Attach       map[string]interface{} `json:"attach,optional"`
 		Contact      Contact                `json:"contact"`
 		AppId        string                 `json:"appId"`
-		EntId        string                 `json:"entId"`
+		EntId        int64                  `json:"entId"`
 		UserId       string                 `json:"userId"`
 		ValidityTime string                 `json:"validityTime,optional"`
 		Phone        string                 `json:"phone"`
@@ -93,14 +93,14 @@ type (
 	}
 	commonReq {
 		UserId  string `json:"userId,optional"`
-		EntId   string `json:"entId,optional"`
+		EntId   int64  `json:"entId,optional"`
 		AppId   string `json:"appId"`
 		Match   string `json:"match,optional"`
 		MsgType int64  `json:"msgType,optional"`
 	}
 	commonRes {
-		Err_code int         `json:"err_code"`
-		Err_msg  string      `json:"err_msg"`
+		Err_code int         `json:"error_code"`
+		Err_msg  string      `json:"error_msg"`
 		Data     interface{} `json:"data"`
 	}
 )
@@ -149,7 +149,7 @@ service Info-api {
 	post /jyinfo/manage/infoList (infoListReq) returns (commonRes)
 	//管理后台信息详情
 	@handler infoDetail
-	get /jyinfo/manage/infoDetail (reviewCommonReq) returns (commonRes)
+	post /jyinfo/manage/infoDetail (reviewCommonReq) returns (commonRes)
 	//管理后台审核
 	@handler infoExamine
 	post /jyinfo/manage/infoExamine (infoExamineReq) returns (commonRes)

rpc/common/internal/logic/sensitivemethodlogic.go

@@ -37,6 +37,7 @@ func (l *SensitiveMethodLogic) SensitiveMethod(in *common.SensitiveRequest) (*co
 		//isSensitive 是否有敏感词  isPublishInfo招标信息是否需要自动发布 isPublishSup 供应信息是否需要自动发布
 		isSensitive, isPublishInfo, isPublishSup bool
 	)
+	fmt.Println("接收到敏感词回调----------------------", in)
 	upData := make(map[string]interface{})
 	query := make(map[string]interface{})
 	if in.Title != nil || in.Detail != nil || in.Attachments != "" || in.AttachTxt != "" {

rpc/consumer/consumer.proto

@@ -22,7 +22,7 @@ message PublishInfoReq {
 	string attach = 13;//附件
 	string userId = 14;//用户id
 	string appId = 15;//剑鱼标识 默认10000
-	string entId = 16;//剑鱼标识 默认10000
+	int64 entId = 16;//剑鱼标识 默认10000
 
 	Contact contact = 17;
 	string deadline = 18;//信息有效期
@@ -260,7 +260,7 @@ message SupplyInfoDetailData {
 	string province = 4;//省份
 	string city = 5;//城市
 	string validityTime = 6;//有效期
-	string entId = 7;//企业id
+	int64 entId = 7;//企业id
 	string attach = 8;//附件列表
 	InfoDetailContact  infoDetailContact = 9;//联系人详情
 	string publishTime = 10;//发布时间
@@ -274,7 +274,7 @@ message OtherSupplyInfoByEnt{
 	string city = 4;
 	string publishTime = 5;
 	string createTime = 6;
-	string entId = 7;
+	int64 entId = 7;
 }
 //上传附件
 message InfoFileUploadReq {

rpc/consumer/internal/logic/supplyinfodetaillogic.go

@@ -1,10 +1,10 @@
 package logic
 
 import (
-	se "app.yhyue.com/moapp/jybase/encrypt"
-	"context"
 	"app.yhyue.com/moapp/jyInfo/rpc/model"
 	es "app.yhyue.com/moapp/jyInfo/rpc/model/es"
+	se "app.yhyue.com/moapp/jybase/encrypt"
+	"context"
 	"log"
 	"strconv"
 
@@ -49,10 +49,10 @@ func (l *SupplyInfoDetailLogic) SupplyInfoDetail(in *consumer.StatusReq) (*consu
 			conctact.Overt = mc.Int64All((*data)["contact_overt"])
 			info.InfoDetailContact = &conctact
 			info.Attach = mc.InterfaceToStr((*data)["attach"])
-			info.EntId = mc.InterfaceToStr((*data)["ent_id"])
+			info.EntId = mc.Int64All((*data)["ent_id"])
 			info.Id = in.MsgId
 			//其他供应信息
-			otherData := es.GetSupplyOtherInfoByEntid(info.EntId, 5)
+			otherData := es.GetSupplyOtherInfoByEntid(mc.InterfaceToStr(info.EntId), 5)
 			if otherData != nil && len(*otherData) > 0 {
 				for _, v := range *otherData {
 					if info.Id == se.SE.EncodeString(mc.InterfaceToStr(v["_id"])) {
@@ -65,7 +65,7 @@ func (l *SupplyInfoDetailLogic) SupplyInfoDetail(in *consumer.StatusReq) (*consu
 						City:        mc.InterfaceToStr(v["city"]),
 						PublishTime: strconv.FormatInt(mc.Int64All(v["publish_time"]), 10),
 						CreateTime:  strconv.FormatInt(mc.Int64All(v["create_time"]), 10),
-						EntId:       se.SE.EncodeString(mc.InterfaceToStr(v["ent_id"])),
+						EntId:       mc.Int64All(v["ent_id"]),
 					}
 					info.OtherSupplyInfo = append(info.OtherSupplyInfo, &otherSupplyInfo)
 				}

rpc/consumer/type/consumer/consumer.pb.go

@@ -46,7 +46,7 @@ type PublishInfoReq struct {
 	Attach    string   `protobuf:"bytes,13,opt,name=attach,proto3" json:"attach,omitempty"`      //附件
 	UserId    string   `protobuf:"bytes,14,opt,name=userId,proto3" json:"userId,omitempty"`      //用户id
 	AppId     string   `protobuf:"bytes,15,opt,name=appId,proto3" json:"appId,omitempty"`        //剑鱼标识 默认10000
-	EntId     string   `protobuf:"bytes,16,opt,name=entId,proto3" json:"entId,omitempty"`        //剑鱼标识 默认10000
+	EntId     int64    `protobuf:"varint,16,opt,name=entId,proto3" json:"entId,omitempty"`       //剑鱼标识 默认10000
 	Contact   *Contact `protobuf:"bytes,17,opt,name=contact,proto3" json:"contact,omitempty"`
 	Deadline  string   `protobuf:"bytes,18,opt,name=deadline,proto3" json:"deadline,omitempty"` //信息有效期
 	Phone     string   `protobuf:"bytes,19,opt,name=phone,proto3" json:"phone,omitempty"`       //信息有效期
@@ -190,11 +190,11 @@ func (x *PublishInfoReq) GetAppId() string {
 	return ""
 }
 
-func (x *PublishInfoReq) GetEntId() string {
+func (x *PublishInfoReq) GetEntId() int64 {
 	if x != nil {
 		return x.EntId
 	}
-	return ""
+	return 0
 }
 
 func (x *PublishInfoReq) GetContact() *Contact {
@@ -2400,7 +2400,7 @@ type SupplyInfoDetailData struct {
 	Province          string                  `protobuf:"bytes,4,opt,name=province,proto3" json:"province,omitempty"`                   //省份
 	City              string                  `protobuf:"bytes,5,opt,name=city,proto3" json:"city,omitempty"`                           //城市
 	ValidityTime      string                  `protobuf:"bytes,6,opt,name=validityTime,proto3" json:"validityTime,omitempty"`           //有效期
-	EntId             string                  `protobuf:"bytes,7,opt,name=entId,proto3" json:"entId,omitempty"`                         //企业id
+	EntId             int64                   `protobuf:"varint,7,opt,name=entId,proto3" json:"entId,omitempty"`                        //企业id
 	Attach            string                  `protobuf:"bytes,8,opt,name=attach,proto3" json:"attach,omitempty"`                       //附件列表
 	InfoDetailContact *InfoDetailContact      `protobuf:"bytes,9,opt,name=infoDetailContact,proto3" json:"infoDetailContact,omitempty"` //联系人详情
 	PublishTime       string                  `protobuf:"bytes,10,opt,name=publishTime,proto3" json:"publishTime,omitempty"`            //发布时间
@@ -2481,11 +2481,11 @@ func (x *SupplyInfoDetailData) GetValidityTime() string {
 	return ""
 }
 
-func (x *SupplyInfoDetailData) GetEntId() string {
+func (x *SupplyInfoDetailData) GetEntId() int64 {
 	if x != nil {
 		return x.EntId
 	}
-	return ""
+	return 0
 }
 
 func (x *SupplyInfoDetailData) GetAttach() string {
@@ -2528,7 +2528,7 @@ type OtherSupplyInfoByEnt struct {
 	City        string `protobuf:"bytes,4,opt,name=city,proto3" json:"city,omitempty"`
 	PublishTime string `protobuf:"bytes,5,opt,name=publishTime,proto3" json:"publishTime,omitempty"`
 	CreateTime  string `protobuf:"bytes,6,opt,name=createTime,proto3" json:"createTime,omitempty"`
-	EntId       string `protobuf:"bytes,7,opt,name=entId,proto3" json:"entId,omitempty"`
+	EntId       int64  `protobuf:"varint,7,opt,name=entId,proto3" json:"entId,omitempty"`
 }
 
 func (x *OtherSupplyInfoByEnt) Reset() {
@@ -2605,11 +2605,11 @@ func (x *OtherSupplyInfoByEnt) GetCreateTime() string {
 	return ""
 }
 
-func (x *OtherSupplyInfoByEnt) GetEntId() string {
+func (x *OtherSupplyInfoByEnt) GetEntId() int64 {
 	if x != nil {
 		return x.EntId
 	}
-	return ""
+	return 0
 }
 
 //上传附件
@@ -2848,7 +2848,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x72, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
 	0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64,
-	0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x2b, 0x0a,
+	0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x2b, 0x0a,
 	0x07, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
 	0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63,
 	0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65,
@@ -3124,7 +3124,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x79, 0x12, 0x22, 0x0a, 0x0c, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x54, 0x69, 0x6d,
 	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74,
 	0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61,
 	0x74, 0x74, 0x61, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x74, 0x74,
 	0x61, 0x63, 0x68, 0x12, 0x49, 0x0a, 0x11, 0x69, 0x6e, 0x66, 0x6f, 0x44, 0x65, 0x74, 0x61, 0x69,
 	0x6c, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
@@ -3149,7 +3149,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63,
 	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65,
-	0x6e, 0x74, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49,
+	0x6e, 0x74, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49,
 	0x64, 0x22, 0x5f, 0x0a, 0x11, 0x49, 0x6e, 0x66, 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x55, 0x70, 0x6c,
 	0x6f, 0x61, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61,
 	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4e, 0x61,

rpc/manager/internal/logic/infodetaillogic.go

@@ -100,7 +100,7 @@ func (l *InfoDetailLogic) InfoDetail(in *manager.InfoDetailReq) (*manager.InfoDe
 
 	applyInfo.UserId = se.SE.EncodeString(common.InterfaceToStr(data["user_id"])) //用户id加密
 	applyInfo.Time = common.InterfaceToStr(data["create_time"])
-	applyInfo.EntId = se.SE.EncodeString(common.InterfaceToStr(data["ent_id"])) //企业id加密
+	applyInfo.EntId = common.Int64All(data["ent_id"])
 	applyInfo.Phone = common.InterfaceToStr(data["phone"])
 	infoData.ApplyInfo = &applyInfo
 

rpc/manager/internal/logic/institutionsfreezelogic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"app.yhyue.com/moapp/jyInfo/rpc/model"
 	"app.yhyue.com/moapp/jyInfo/rpc/util"
+	mc "app.yhyue.com/moapp/jybase/common"
 	"context"
 
 	"app.yhyue.com/moapp/jyInfo/rpc/manager/internal/svc"
@@ -30,8 +31,8 @@ func (l *InstitutionsFreezeLogic) InstitutionsFreeze(in *manager.InstitutionsFre
 	// todo: add your logic here and delete this line
 	var resp manager.InfoResp
 
-	model.Mysql.SelectBySql(`UPDATE information SET status = -1 ,review_desc = "机构已冻结" WHERE status IN (0,1,2) and province =1 and is_del = 1 and app_id = ` + util.StrFormat(in.AppId) + ` and ent_id = ` + in.EntId)
-	model.Mysql.SelectBySql(`UPDATE supply_info SET status = -1 ,review_desc = "机构已冻结" WHERE status IN (0,1,2) and province =1 and is_del = 1  and app_id = ` + util.StrFormat(in.AppId) + ` and ent_id = ` + in.EntId)
+	model.Mysql.SelectBySql(`UPDATE information SET status = -1 ,review_desc = "机构已冻结" WHERE status IN (0,1,2) and province =1 and is_del = 1 and app_id = ` + util.StrFormat(in.AppId) + ` and ent_id = ` + mc.InterfaceToStr(in.EntId))
+	model.Mysql.SelectBySql(`UPDATE supply_info SET status = -1 ,review_desc = "机构已冻结" WHERE status IN (0,1,2) and province =1 and is_del = 1  and app_id = ` + util.StrFormat(in.AppId) + ` and ent_id = ` + mc.InterfaceToStr(in.EntId))
 
 	return &resp, nil
 }

rpc/manager/manager.proto

@@ -103,7 +103,7 @@ message Related{
 message ApplyInfo{
 	string userId = 1;//申请人id
 	string phone = 2;//手机号
-	string entId = 3;//发布单位
+	int64 entId = 3;//发布单位
 	string time = 4;//申请时间
 }
 
@@ -143,7 +143,7 @@ message InfoResp{
 
 message InstitutionsFreezeReq {
 	string appId = 1;//
-	string entId = 2;//
+	int64 entId = 2;//
 }
 //
 service manager {

rpc/manager/type/manager/manager.pb.go

@@ -892,7 +892,7 @@ type ApplyInfo struct {
 
 	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //申请人id
 	Phone  string `protobuf:"bytes,2,opt,name=phone,proto3" json:"phone,omitempty"`   //手机号
-	EntId  string `protobuf:"bytes,3,opt,name=entId,proto3" json:"entId,omitempty"`   //发布单位
+	EntId  int64  `protobuf:"varint,3,opt,name=entId,proto3" json:"entId,omitempty"`  //发布单位
 	Time   string `protobuf:"bytes,4,opt,name=time,proto3" json:"time,omitempty"`     //申请时间
 }
 
@@ -942,11 +942,11 @@ func (x *ApplyInfo) GetPhone() string {
 	return ""
 }
 
-func (x *ApplyInfo) GetEntId() string {
+func (x *ApplyInfo) GetEntId() int64 {
 	if x != nil {
 		return x.EntId
 	}
-	return ""
+	return 0
 }
 
 func (x *ApplyInfo) GetTime() string {
@@ -1279,8 +1279,8 @@ type InstitutionsFreezeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AppId string `protobuf:"bytes,1,opt,name=appId,proto3" json:"appId,omitempty"` //
-	EntId string `protobuf:"bytes,2,opt,name=entId,proto3" json:"entId,omitempty"` //
+	AppId string `protobuf:"bytes,1,opt,name=appId,proto3" json:"appId,omitempty"`  //
+	EntId int64  `protobuf:"varint,2,opt,name=entId,proto3" json:"entId,omitempty"` //
 }
 
 func (x *InstitutionsFreezeReq) Reset() {
@@ -1322,11 +1322,11 @@ func (x *InstitutionsFreezeReq) GetAppId() string {
 	return ""
 }
 
-func (x *InstitutionsFreezeReq) GetEntId() string {
+func (x *InstitutionsFreezeReq) GetEntId() int64 {
 	if x != nil {
 		return x.EntId
 	}
-	return ""
+	return 0
 }
 
 type InfoExamineResp_Data struct {
@@ -1502,7 +1502,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65,
+	0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65,
 	0x6e, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x4c, 0x0a, 0x06, 0x52, 0x65, 0x76, 0x69,
 	0x65, 0x77, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01,
@@ -1538,7 +1538,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x43, 0x0a, 0x15, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x46,
 	0x72, 0x65, 0x65, 0x7a, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49,
 	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14,
-	0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65,
+	0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65,
 	0x6e, 0x74, 0x49, 0x64, 0x32, 0x8c, 0x02, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
 	0x12, 0x37, 0x0a, 0x08, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x2e, 0x6d,
 	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52,