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

api/internal/logic/mypublishlistlogic.go

@@ -29,7 +29,7 @@ func NewMyPublishListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MyP
 func (l *MyPublishListLogic) MyPublishList(req *types.MyPublishListReq) (resp *types.CommonRes, err error) {
 	pubList, err0 := l.svcCtx.Consumer.MyPublishList(l.ctx, &consumer.MyPublishListReq{
 		UserId:       req.UserId,
-		AppId:        common.Int64All(req.AppId),
+		AppId:        req.AppId,
 		Match:        req.Match,
 		MsgType:      common.Int64All(req.MsgType),
 		ReviewStatus: common.Int64All(req.ReviewStatus),

api/internal/logic/pubinfologic.go

@@ -83,7 +83,7 @@ func (l *PubInfoLogic) PubInfo(req *types.PubInfoReq) (resp *types.CommonRes, er
 		Detail:    req.Detail,
 		Attach:    common.MapToJson(req.Attach),
 		Contact:   &contact,
-		AppId:     common.Int64All(req.AppId),
+		AppId:     req.AppId,
 		Phone:     req.Phone,
 	})
 	if err1 != nil {

api/internal/logic/pubsupplyinfologic.go

@@ -51,7 +51,7 @@ func (l *PubSupplyInfoLogic) PubSupplyInfo(req *types.PubInfoReq) (resp *types.C
 		Detail:    req.Detail,
 		Attach:    common.MapToJson(req.Attach),
 		Contact:   &contact,
-		AppId:     common.Int64All(req.AppId),
+		AppId:     req.AppId,
 		Phone:     req.Phone,
 		Deadline:  req.ValidityTime,
 	})

api/internal/types/types.go

@@ -16,7 +16,7 @@ type PubInfoReq struct {
 	Detail       string                 `json:"detail"`
 	Attach       map[string]interface{} `json:"attach,optional"`
 	Contact      Contact                `json:"contact"`
-	AppId        int64                  `json:"appId"`
+	AppId        string                 `json:"appId"`
 	EntId        string                 `json:"entId"`
 	UserId       string                 `json:"userId"`
 	ValidityTime string                 `json:"validityTime,optional"`
@@ -32,7 +32,7 @@ type Contact struct {
 
 type MyPublishListReq struct {
 	UserId       string `json:"userId"`
-	AppId        int64  `json:"appId"`
+	AppId        string `json:"appId"`
 	Match        string `json:"match,optional"`
 	MsgType      string `json:"msgType,optional"`
 	ReviewStatus string `json:"reviewStatus,optional"`
@@ -45,17 +45,17 @@ type MyPublishCommonReq struct {
 	UserId  string `json:"userId"`
 	Type    string `json:"type"`
 	MsgType string `json:"msgType,optional"`
-	AppId   int64  `json:"appId"`
+	AppId   string `json:"appId"`
 }
 
 type ReviewCommonReq struct {
-	AppId int64  `json:"appId"`
+	AppId string `json:"appId"`
 	MsgId string `json:"msgId"`
 	Type  int64  `json:"type"`
 }
 
 type InfoListReq struct {
-	AppId          int64  `json:"appId"`
+	AppId          string `json:"appId"`
 	MsgType        int    `json:"msgType,optional"`
 	PhoneType      int    `json:"phoneType,optional"`
 	Phone          string `json:"phone,optional"`
@@ -70,7 +70,7 @@ type InfoListReq struct {
 
 type InfoExamineReq struct {
 	MsgId        string `json:"msgId"`
-	AppId        int64  `json:"appId"`
+	AppId        string `json:"appId"`
 	ReviewStatus int64  `json:"reviewStatus"`
 	ReviewDetail string `json:"reviewDetail,optional"`
 	MsgType      int64  `json:"msgType"`
@@ -78,7 +78,7 @@ type InfoExamineReq struct {
 
 type AssProjecctReq struct {
 	UserId  string `json:"userId"`
-	AppId   int64  `json:"appId"`
+	AppId   string `json:"appId"`
 	Match   string `json:"match"`
 	MsgType string `json:"msgType"`
 }
@@ -106,7 +106,7 @@ type UploadReq struct {
 type CommonReq struct {
 	UserId  string `json:"userId,optional"`
 	EntId   string `json:"entId,optional"`
-	AppId   int64  `json:"appId"`
+	AppId   string `json:"appId"`
 	Match   string `json:"match,optional"`
 	MsgType string `json:"msgType,optional"`
 }

api/jyinfo.api

@@ -15,21 +15,21 @@ type (
 		Detail       string                 `json:"detail"`
 		Attach       map[string]interface{} `json:"attach,optional"`
 		Contact      Contact                `json:"contact"`
-		AppId        int64                  `json:"appId"`
+		AppId        string                 `json:"appId"`
 		EntId        string                 `json:"entId"`
 		UserId       string                 `json:"userId"`
 		ValidityTime string                 `json:"validityTime,optional"`
 		Phone        string                 `json:"phone"`
 		EntName      string                 `json:"entName,optional"`
 	}
-	Contact {
+	Contact  {
 		Person string `json:"person"`
 		Phone  string `json:"phone"`
 		Overt  int64  `json:"overt"`
 	}
 	myPublishListReq {
 		UserId       string `json:"userId"`
-		AppId        int64  `json:"appId"`
+		AppId        string `json:"appId"`
 		Match        string `json:"match,optional"`
 		MsgType      string `json:"msgType,optional"`
 		ReviewStatus string `json:"reviewStatus,optional"`
@@ -41,15 +41,15 @@ type (
 		UserId  string `json:"userId"`
 		Type    string `json:"type"`
 		MsgType string `json:"msgType,optional"`
-		AppId   int64  `json:"appId"`
+		AppId   string `json:"appId"`
 	}
 	reviewCommonReq {
-		AppId int64  `json:"appId"`
+		AppId string `json:"appId"`
 		MsgId string `json:"msgId"`
 		Type  int64  `json:"type"`
 	}
 	infoListReq {
-		AppId          int64  `json:"appId"`
+		AppId          string `json:"appId"`
 		MsgType        int    `json:"msgType,optional"`
 		PhoneType      int    `json:"phoneType,optional"`
 		Phone          string `json:"phone,optional"`
@@ -63,14 +63,14 @@ type (
 	}
 	infoExamineReq {
 		MsgId        string `json:"msgId"`
-		AppId        int64  `json:"appId"`
+		AppId        string `json:"appId"`
 		ReviewStatus int64  `json:"reviewStatus"`
 		ReviewDetail string `json:"reviewDetail,optional"`
 		MsgType      int64  `json:"msgType"`
 	}
 	assProjecctReq {
 		UserId  string `json:"userId"`
-		AppId   int64  `json:"appId"`
+		AppId   string `json:"appId"`
 		Match   string `json:"match"`
 		MsgType string `json:"msgType"`
 	}
@@ -94,7 +94,7 @@ type (
 	commonReq {
 		UserId  string `json:"userId,optional"`
 		EntId   string `json:"entId,optional"`
-		AppId   int64  `json:"appId"`
+		AppId   string `json:"appId"`
 		Match   string `json:"match,optional"`
 		MsgType string `json:"msgType,optional"`
 	}

entity/jyInfo.sql

@@ -1,7 +1,7 @@
 CREATE TABLE `information` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '信息id',
   `ent_id` int(20) NOT NULL COMMENT '企业id',
-  `app_id` int(11) NOT NULL COMMENT 'appid 剑鱼：10000',
+  `app_id` varchar(255) NOT NULL COMMENT 'appid 剑鱼：10000',
   `user_id` varchar(25) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '发布人用户ID',
   `phone` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '手机号',
   `published` int(1) NOT NULL DEFAULT '1' COMMENT '0：全部；1：未发布；2：已发布',
@@ -11,8 +11,8 @@ CREATE TABLE `information` (
   `related_id` bigint(20) DEFAULT NULL COMMENT '关联公告id',
   `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '信息标题',
   `project_code` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '项目编号',
-  `province` varchar(4) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '项目省份',
-  `city` varchar(4) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '项目城市',
+  `province` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '项目省份',
+  `city` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '项目城市',
   `industry` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '项目行业,多个逗号分隔',
   `buyer` varchar(90) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '采购单位',
   `budget` int(11) DEFAULT NULL COMMENT '预算单位元',

entity/supply.sql

@@ -1,7 +1,7 @@
 CREATE TABLE `supply_info` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '信息id',
   `ent_id` int(20) NOT NULL COMMENT '企业id',
-  `app_id` int(11) NOT NULL COMMENT 'appid 剑鱼：10000',
+  `app_id` varchar(255) NOT NULL COMMENT 'appid 剑鱼：10000',
   `user_id` varchar(25) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '发布人用户ID',
   `phone` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '手机号',
   `published` int(1) NOT NULL DEFAULT '1' COMMENT '0：全部；1：未发布；2：已发布',

rpc/consumer/consumer.proto

@@ -21,7 +21,7 @@ message PublishInfoReq {
 
 	string attach = 13;//附件
 	string userId = 14;//用户id
-	int64 appId = 15;//剑鱼标识 默认10000
+	string appId = 15;//剑鱼标识 默认10000
 	string entId = 16;//剑鱼标识 默认10000
 	Contact contact = 17;
 	string deadline = 18;//信息有效期
@@ -49,7 +49,7 @@ message PublishId {
 //用户id:1:用户已发布信息数量Req
 message UserIdReq{
 	string userId = 1;//用户id
-	int64 appId = 2;//剑鱼标识 默认10000
+	string appId = 2;//剑鱼标识 默认10000
 	string match  = 3;
 	int64 msqType  = 4;
 }
@@ -86,7 +86,7 @@ message MyPublishListReq{
 	int64 reviewStatus = 4;//审核状态 1:待审核｜2:审核通过｜3:审核不通过
 	int64 pageSize = 5;//每页数据量，默认10
 	int64 pageIndex = 6;//页码；默认第一页
-	int64 appId = 7;//剑鱼标识 默认10000
+	string appId = 7;//剑鱼标识 默认10000
 }
 
 //我的发布列表Resp
@@ -118,7 +118,7 @@ message InfoDetailReq{
 	string userId = 1;//用户id
 	string msgId = 2;//信息id
 	int64 type = 3;//处理信息类型:0:获取发布信息详情（默认）；1：删除发布的信息；2：更新发布信息
-	int64 appId = 4;//剑鱼标识 默认10000
+	string appId = 4;//剑鱼标识 默认10000
 	int64 msgType = 5;//信息类型 1:招标信息 2:采购信息 3:供应信息
 }
 
@@ -145,7 +145,7 @@ message InfoDetailData {
 	string title = 13;//信息类型
 	string validityTime = 14;//供应信息有效期
 	string publishTime = 15;//发布时间
-	int64 appId = 16;//发布时间
+	string appId = 16;//发布时间
 
 	Related  InfoDetailRelated = 17;//关联信息
 	Review  InfoDetailReview = 18;//审核

rpc/consumer/internal/logic/infochangelogic.go

@@ -50,7 +50,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 
 		if in.MsgType == 1 || in.MsgType == 2 {
 			if _d := model.Mysql.SelectBySql(`SELECT a.*,b.title as relatedTitle FROM information a
-				LEFT JOIN information b on (a.related_id =b.id) where a.id = ? and a.app_id = ?`, mc.IntAll(msgId), in.AppId); _d != nil && len(*_d) > 0 {
+				LEFT JOIN information b on (a.related_id =b.id) where a.id = ? and a.app_id = "`+in.AppId+`"`, mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
 				data = (*_d)[0]
 				var (
 					Related consumer.Related
@@ -75,7 +75,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 			}
 
 		} else if in.MsgType == 3 {
-			if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = ?`, mc.IntAll(msgId), in.AppId); _d != nil && len(*_d) > 0 {
+			if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = "`+in.AppId+`"`, mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
 				data = (*_d)[0]
 				Results.ValidityTime = mc.InterfaceToStr(data["validity_time"])
 			} else {
@@ -86,7 +86,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 		}
 		Results.Province = mc.InterfaceToStr(data["province"])
 		Results.City = mc.InterfaceToStr(data["city"])
-		Results.AppId = mc.Int64All(data["app_id"])
+		Results.AppId = mc.InterfaceToStr(data["app_id"])
 		Results.Title = mc.InterfaceToStr(data["title"])
 		Results.MsgType = mc.Int64All(data["type"])
 

rpc/consumer/internal/logic/inforelatedlogic.go

@@ -37,8 +37,8 @@ func (l *InfoRelatedLogic) InfoRelated(in *consumer.UserIdReq) (*consumer.InfoRe
 	if in.Match != "" {
 		queryName = ` and title LIKE '%` + in.Match + `%' `
 	}
-	if in.AppId != 0 {
-		queryName = ` and app_id = ` + mc.InterfaceToStr(in.AppId)
+	if in.AppId != "" {
+		queryName = ` and app_id = "` + in.AppId + `"`
 	}
 	allData := model.Mysql.SelectBySql(`SELECT id,title from information WHERE user_id="` + in.UserId + `" and published=2 and is_del=1` + queryName + ` order by create_time desc limit 50`)
 	if allData == nil || len(*allData) == 0 {

rpc/consumer/internal/logic/mypublishlistlogic.go

@@ -40,8 +40,8 @@ func (l *MyPublishListLogic) MyPublishList(in *consumer.MyPublishListReq) (*cons
 	if in.MsgType != 0 {
 		queryName = queryName + ` and type=` + mc.InterfaceToStr(in.MsgType)
 	}
-	if in.AppId != 0 {
-		queryName = queryName + ` and app_id =` + mc.InterfaceToStr(in.AppId)
+	if in.AppId != "" {
+		queryName = queryName + ` and app_id = "` + in.AppId + `"`
 	}
 	if in.PageIndex == 1 {
 		//全部

rpc/consumer/internal/logic/publishinfologic.go

@@ -55,7 +55,7 @@ func (l *PublishInfoLogic) PublishInfo(in *consumer.PublishInfoReq) (*consumer.P
 	publishData["published"] = 1                                          // 0：全部；1：未发布；2：已发布
 	publishData["type"] = mc.IntAll(in.MsgType)                           //1:招标信息｜2:采购信息｜3:供应信息
 	publishData["ent_id"] = mc.IntAll(in.EntId)
-	publishData["app_id"] = mc.IntAll(in.AppId)
+	publishData["app_id"] = in.AppId
 	//  0：全部；1：待审核；2：待人工审核（敏感词审核不通过||敏感词审核通过）；3：自动审核通过；4：人工审核通过；-1：自动审核不通过（机构冻结）；-2：人工审核不通过；
 	publishData["status"] = 1
 	log.Println(in.MsgType, "-------------------")

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

@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.23.0
-// 	protoc        v3.15.5
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.19.4
 // source: consumer.proto
 
 package consumer
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 //信息发布Req
 type PublishInfoReq struct {
 	state         protoimpl.MessageState
@@ -45,7 +40,7 @@ type PublishInfoReq struct {
 	Detail    string   `protobuf:"bytes,12,opt,name=detail,proto3" json:"detail,omitempty"`      //正文信息
 	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     int64    `protobuf:"varint,15,opt,name=appId,proto3" json:"appId,omitempty"`       //剑鱼标识 默认10000
+	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
 	Contact   *Contact `protobuf:"bytes,17,opt,name=contact,proto3" json:"contact,omitempty"`
 	Deadline  string   `protobuf:"bytes,18,opt,name=deadline,proto3" json:"deadline,omitempty"` //信息有效期
@@ -183,11 +178,11 @@ func (x *PublishInfoReq) GetUserId() string {
 	return ""
 }
 
-func (x *PublishInfoReq) GetAppId() int64 {
+func (x *PublishInfoReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *PublishInfoReq) GetEntId() string {
@@ -406,7 +401,7 @@ type UserIdReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	UserId  string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //用户id
-	AppId   int64  `protobuf:"varint,2,opt,name=appId,proto3" json:"appId,omitempty"`  //剑鱼标识 默认10000
+	AppId   string `protobuf:"bytes,2,opt,name=appId,proto3" json:"appId,omitempty"`   //剑鱼标识 默认10000
 	Match   string `protobuf:"bytes,3,opt,name=match,proto3" json:"match,omitempty"`
 	MsqType int64  `protobuf:"varint,4,opt,name=msqType,proto3" json:"msqType,omitempty"`
 }
@@ -450,11 +445,11 @@ func (x *UserIdReq) GetUserId() string {
 	return ""
 }
 
-func (x *UserIdReq) GetAppId() int64 {
+func (x *UserIdReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *UserIdReq) GetMatch() string {
@@ -722,7 +717,7 @@ type MyPublishListReq struct {
 	ReviewStatus int64  `protobuf:"varint,4,opt,name=reviewStatus,proto3" json:"reviewStatus,omitempty"` //审核状态 1:待审核｜2:审核通过｜3:审核不通过
 	PageSize     int64  `protobuf:"varint,5,opt,name=pageSize,proto3" json:"pageSize,omitempty"`         //每页数据量，默认10
 	PageIndex    int64  `protobuf:"varint,6,opt,name=pageIndex,proto3" json:"pageIndex,omitempty"`       //页码；默认第一页
-	AppId        int64  `protobuf:"varint,7,opt,name=appId,proto3" json:"appId,omitempty"`               //剑鱼标识 默认10000
+	AppId        string `protobuf:"bytes,7,opt,name=appId,proto3" json:"appId,omitempty"`                //剑鱼标识 默认10000
 }
 
 func (x *MyPublishListReq) Reset() {
@@ -799,11 +794,11 @@ func (x *MyPublishListReq) GetPageIndex() int64 {
 	return 0
 }
 
-func (x *MyPublishListReq) GetAppId() int64 {
+func (x *MyPublishListReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 //我的发布列表Resp
@@ -1046,7 +1041,7 @@ type InfoDetailReq struct {
 	UserId  string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`    //用户id
 	MsgId   string `protobuf:"bytes,2,opt,name=msgId,proto3" json:"msgId,omitempty"`      //信息id
 	Type    int64  `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`       //处理信息类型:0:获取发布信息详情（默认）；1：删除发布的信息；2：更新发布信息
-	AppId   int64  `protobuf:"varint,4,opt,name=appId,proto3" json:"appId,omitempty"`     //剑鱼标识 默认10000
+	AppId   string `protobuf:"bytes,4,opt,name=appId,proto3" json:"appId,omitempty"`      //剑鱼标识 默认10000
 	MsgType int64  `protobuf:"varint,5,opt,name=msgType,proto3" json:"msgType,omitempty"` //信息类型 1:招标信息 2:采购信息 3:供应信息
 }
 
@@ -1103,11 +1098,11 @@ func (x *InfoDetailReq) GetType() int64 {
 	return 0
 }
 
-func (x *InfoDetailReq) GetAppId() int64 {
+func (x *InfoDetailReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InfoDetailReq) GetMsgType() int64 {
@@ -1201,7 +1196,7 @@ type InfoDetailData struct {
 	Title             string             `protobuf:"bytes,13,opt,name=title,proto3" json:"title,omitempty"`                         //信息类型
 	ValidityTime      string             `protobuf:"bytes,14,opt,name=validityTime,proto3" json:"validityTime,omitempty"`           //供应信息有效期
 	PublishTime       string             `protobuf:"bytes,15,opt,name=publishTime,proto3" json:"publishTime,omitempty"`             //发布时间
-	AppId             int64              `protobuf:"varint,16,opt,name=appId,proto3" json:"appId,omitempty"`                        //发布时间
+	AppId             string             `protobuf:"bytes,16,opt,name=appId,proto3" json:"appId,omitempty"`                         //发布时间
 	InfoDetailRelated *Related           `protobuf:"bytes,17,opt,name=InfoDetailRelated,proto3" json:"InfoDetailRelated,omitempty"` //关联信息
 	InfoDetailReview  *Review            `protobuf:"bytes,18,opt,name=InfoDetailReview,proto3" json:"InfoDetailReview,omitempty"`   //审核
 	InfoDetailContact *InfoDetailContact `protobuf:"bytes,19,opt,name=infoDetailContact,proto3" json:"infoDetailContact,omitempty"` //联系人内容
@@ -1344,11 +1339,11 @@ func (x *InfoDetailData) GetPublishTime() string {
 	return ""
 }
 
-func (x *InfoDetailData) GetAppId() int64 {
+func (x *InfoDetailData) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InfoDetailData) GetInfoDetailRelated() *Related {
@@ -2846,7 +2841,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x18, 0x0d, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x06, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65,
 	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, 0x03,
+	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,
 	0x07, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
@@ -2875,7 +2870,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x6e, 0x49, 0x64, 0x22, 0x69, 0x0a, 0x09, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65, 0x71,
 	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, 0x61, 0x70, 0x70, 0x49,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14,
 	0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d,
 	0x61, 0x74, 0x63, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x71, 0x54, 0x79, 0x70, 0x65, 0x18,
 	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x71, 0x54, 0x79, 0x70, 0x65, 0x22, 0x7c,
@@ -2913,7 +2908,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1c,
 	0x0a, 0x09, 0x70, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05,
-	0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70,
+	0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70,
 	0x49, 0x64, 0x22, 0x7e, 0x0a, 0x11, 0x4d, 0x79, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x4c,
 	0x69, 0x73, 0x74, 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,
@@ -2949,7 +2944,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70,
 	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
-	0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70,
+	0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70,
 	0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x78, 0x0a,
 	0x0e, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12,
@@ -2985,7 +2980,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x76, 0x61, 0x6c, 0x69, 0x64, 0x69, 0x74, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
 	0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x0b, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61,
+	0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61,
 	0x70, 0x70, 0x49, 0x64, 0x12, 0x3f, 0x0a, 0x11, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x65, 0x74, 0x61,
 	0x69, 0x6c, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x11, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x74,

rpc/consumer/type/consumer/consumer_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.5
+// - protoc             v3.19.4
 // source: consumer.proto
 
 package consumer

rpc/manager/internal/logic/infodetaillogic.go

@@ -49,7 +49,7 @@ func (l *InfoDetailLogic) InfoDetail(in *manager.InfoDetailReq) (*manager.InfoDe
 	switch in.Type {
 	case 1, 2:
 		if _d := model.Mysql.SelectBySql(`SELECT a.*,b.title as relatedTitle FROM information a 
-				LEFT JOIN information b on (a.related_id =b.id) where a.id =? and a.app_id = ?`, msgId, in.AppId); _d != nil && len(*_d) > 0 {
+				LEFT JOIN information b on (a.related_id =b.id) where a.id =? and a.app_id = "`+in.AppId+`"`, msgId); _d != nil && len(*_d) > 0 {
 			data = (*_d)[0]
 			var (
 				related manager.Related
@@ -72,7 +72,7 @@ func (l *InfoDetailLogic) InfoDetail(in *manager.InfoDetailReq) (*manager.InfoDe
 			goto env
 		}
 	case 3:
-		if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = ?`, msgId, in.AppId); _d != nil && len(*_d) > 0 {
+		if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = "`+in.AppId+`"`, msgId); _d != nil && len(*_d) > 0 {
 			data = (*_d)[0]
 			infoData.ValidityTime = common.InterfaceToStr(data["validity_time"])
 		} else {
@@ -87,7 +87,7 @@ func (l *InfoDetailLogic) InfoDetail(in *manager.InfoDetailReq) (*manager.InfoDe
 	}
 	infoData.Province = common.InterfaceToStr(data["province"])
 	infoData.City = common.InterfaceToStr(data["city"])
-	infoData.AppId = common.Int64All(data["app_id"])
+	infoData.AppId = common.InterfaceToStr(data["app_id"])
 	infoData.Title = common.InterfaceToStr(data["title"])
 	infoData.MsgType = common.Int64All(data["type"])
 

rpc/manager/internal/logic/infolistlogic.go

@@ -62,8 +62,8 @@ func (l *InfoListLogic) InfoList(in *manager.InfoListReq) (*manager.InfoListResp
 		query = append(query, ` create_time <="`+in.ApplyEndTime+`"`)
 	}
 
-	if in.AppId != 0 {
-		query = append(query, ` app_id =`+common.InterfaceToStr(in.AppId))
+	if in.AppId != "" {
+		query = append(query, ` app_id ="`+in.AppId+`"`)
 	}
 	//supQuery := query
 	if in.ReviewStatus != 0 {

rpc/manager/internal/logic/institutionsfreezelogic.go

@@ -29,8 +29,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 = ? and ent_id = `+in.EntId, in.AppId)
-	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 = ? and ent_id = `+in.EntId, in.AppId)
+	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 = "` + 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 = "` + in.AppId + `"  and ent_id = ` + in.EntId)
 
 	return &resp, nil
 }

rpc/manager/manager.proto

@@ -12,7 +12,7 @@ message InfoListReq {
 		int64 reviewStatus = 5;//1：待审核；2：自动审核通过（不包含敏感词）；3：人工审核通过；4：审核通过后删除（此情况属于审核通过）；-1：自动审核不通过；-2：人工审核不通过；-3：用户已撤回（用户删除待审核完成的信息）
 		string applyStartTime = 6;//申请开始时间
 		string applyEndTime = 7;//申请结束时间
-  	int64 appId = 8;//剑鱼标识 默认10000
+  	string appId = 8;//剑鱼标识 默认10000
 		int64 PageSize = 9;//数
 		int64 PageIndex = 10;//页
 		int64 IsDel = 11;//是否删除
@@ -47,7 +47,7 @@ message InfoList{
 message InfoDetailReq{
 		string userId = 1;//用户id
 		string msgId = 2;//信息id
-  	int64 appId = 3;//剑鱼标识 默认10000
+  	string appId = 3;//剑鱼标识 默认10000
 		int64 type = 4;//信息状态
 }
 
@@ -75,7 +75,7 @@ message InfoData {
 	string validityTime = 13;//供应信息有效期
 	string publishTime = 14;//发布时间
 	int64 publishStatus = 15;//发布时间
-	int64 appId = 16;//发布时间
+	string appId = 16;//发布时间
 	string phone = 17;//注册手机号
 	int64 entId = 18;//企业id
 	int64 isDel = 19;//是否删除
@@ -123,7 +123,7 @@ message InfoExamineReq{
 		string msgId = 1;//信息id
 		int64 reviewStatus = 2;//审核状态：1:待审核｜2:审核通过｜3:审核不通过
 		string reviewDetail = 3;//审核不通过原因
-  	int64 appId = 4;//剑鱼标识 默认10000
+  	string appId = 4;//剑鱼标识 默认10000
 		int64 msgType = 5;//类型
 }
 //审核action Resp
@@ -157,7 +157,7 @@ message InfoResp{
 }
 
 message InstitutionsFreezeReq {
-	int64 appId = 1;//
+	string appId = 1;//
 	string entId = 2;//
 }
 //

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

@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.23.0
-// 	protoc        v3.15.5
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.19.4
 // source: manager.proto
 
 package manager
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 //信息列表Req
 type InfoListReq struct {
 	state         protoimpl.MessageState
@@ -38,7 +33,7 @@ type InfoListReq struct {
 	ReviewStatus   int64  `protobuf:"varint,5,opt,name=reviewStatus,proto3" json:"reviewStatus,omitempty"`    //1：待审核；2：自动审核通过（不包含敏感词）；3：人工审核通过；4：审核通过后删除（此情况属于审核通过）；-1：自动审核不通过；-2：人工审核不通过；-3：用户已撤回（用户删除待审核完成的信息）
 	ApplyStartTime string `protobuf:"bytes,6,opt,name=applyStartTime,proto3" json:"applyStartTime,omitempty"` //申请开始时间
 	ApplyEndTime   string `protobuf:"bytes,7,opt,name=applyEndTime,proto3" json:"applyEndTime,omitempty"`     //申请结束时间
-	AppId          int64  `protobuf:"varint,8,opt,name=appId,proto3" json:"appId,omitempty"`                  //剑鱼标识 默认10000
+	AppId          string `protobuf:"bytes,8,opt,name=appId,proto3" json:"appId,omitempty"`                   //剑鱼标识 默认10000
 	PageSize       int64  `protobuf:"varint,9,opt,name=PageSize,proto3" json:"PageSize,omitempty"`            //数
 	PageIndex      int64  `protobuf:"varint,10,opt,name=PageIndex,proto3" json:"PageIndex,omitempty"`         //页
 	IsDel          int64  `protobuf:"varint,11,opt,name=IsDel,proto3" json:"IsDel,omitempty"`                 //是否删除
@@ -126,11 +121,11 @@ func (x *InfoListReq) GetApplyEndTime() string {
 	return ""
 }
 
-func (x *InfoListReq) GetAppId() int64 {
+func (x *InfoListReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InfoListReq) GetPageSize() int64 {
@@ -408,7 +403,7 @@ type InfoDetailReq struct {
 
 	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //用户id
 	MsgId  string `protobuf:"bytes,2,opt,name=msgId,proto3" json:"msgId,omitempty"`   //信息id
-	AppId  int64  `protobuf:"varint,3,opt,name=appId,proto3" json:"appId,omitempty"`  //剑鱼标识 默认10000
+	AppId  string `protobuf:"bytes,3,opt,name=appId,proto3" json:"appId,omitempty"`   //剑鱼标识 默认10000
 	Type   int64  `protobuf:"varint,4,opt,name=type,proto3" json:"type,omitempty"`    //信息状态
 }
 
@@ -458,11 +453,11 @@ func (x *InfoDetailReq) GetMsgId() string {
 	return ""
 }
 
-func (x *InfoDetailReq) GetAppId() int64 {
+func (x *InfoDetailReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InfoDetailReq) GetType() int64 {
@@ -556,7 +551,7 @@ type InfoData struct {
 	ValidityTime  string     `protobuf:"bytes,13,opt,name=validityTime,proto3" json:"validityTime,omitempty"`    //供应信息有效期
 	PublishTime   string     `protobuf:"bytes,14,opt,name=publishTime,proto3" json:"publishTime,omitempty"`      //发布时间
 	PublishStatus int64      `protobuf:"varint,15,opt,name=publishStatus,proto3" json:"publishStatus,omitempty"` //发布时间
-	AppId         int64      `protobuf:"varint,16,opt,name=appId,proto3" json:"appId,omitempty"`                 //发布时间
+	AppId         string     `protobuf:"bytes,16,opt,name=appId,proto3" json:"appId,omitempty"`                  //发布时间
 	Phone         string     `protobuf:"bytes,17,opt,name=phone,proto3" json:"phone,omitempty"`                  //注册手机号
 	EntId         int64      `protobuf:"varint,18,opt,name=entId,proto3" json:"entId,omitempty"`                 //企业id
 	IsDel         int64      `protobuf:"varint,19,opt,name=isDel,proto3" json:"isDel,omitempty"`                 //是否删除
@@ -704,11 +699,11 @@ func (x *InfoData) GetPublishStatus() int64 {
 	return 0
 }
 
-func (x *InfoData) GetAppId() int64 {
+func (x *InfoData) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InfoData) GetPhone() string {
@@ -1091,7 +1086,7 @@ type InfoExamineReq struct {
 	MsgId        string `protobuf:"bytes,1,opt,name=msgId,proto3" json:"msgId,omitempty"`                //信息id
 	ReviewStatus int64  `protobuf:"varint,2,opt,name=reviewStatus,proto3" json:"reviewStatus,omitempty"` //审核状态：1:待审核｜2:审核通过｜3:审核不通过
 	ReviewDetail string `protobuf:"bytes,3,opt,name=reviewDetail,proto3" json:"reviewDetail,omitempty"`  //审核不通过原因
-	AppId        int64  `protobuf:"varint,4,opt,name=appId,proto3" json:"appId,omitempty"`               //剑鱼标识 默认10000
+	AppId        string `protobuf:"bytes,4,opt,name=appId,proto3" json:"appId,omitempty"`                //剑鱼标识 默认10000
 	MsgType      int64  `protobuf:"varint,5,opt,name=msgType,proto3" json:"msgType,omitempty"`           //类型
 }
 
@@ -1148,11 +1143,11 @@ func (x *InfoExamineReq) GetReviewDetail() string {
 	return ""
 }
 
-func (x *InfoExamineReq) GetAppId() int64 {
+func (x *InfoExamineReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InfoExamineReq) GetMsgType() int64 {
@@ -1415,8 +1410,8 @@ type InstitutionsFreezeReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AppId int64  `protobuf:"varint,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 string `protobuf:"bytes,2,opt,name=entId,proto3" json:"entId,omitempty"` //
 }
 
 func (x *InstitutionsFreezeReq) Reset() {
@@ -1451,11 +1446,11 @@ func (*InstitutionsFreezeReq) Descriptor() ([]byte, []int) {
 	return file_manager_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *InstitutionsFreezeReq) GetAppId() int64 {
+func (x *InstitutionsFreezeReq) GetAppId() string {
 	if x != nil {
 		return x.AppId
 	}
-	return 0
+	return ""
 }
 
 func (x *InstitutionsFreezeReq) GetEntId() string {
@@ -1531,7 +1526,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x70,
 	0x70, 0x6c, 0x79, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x0c, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61,
+	0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61,
 	0x70, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65,
 	0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65,
 	0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0a, 0x20,
@@ -1572,7 +1567,7 @@ var file_manager_proto_rawDesc = []byte{
 	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, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x73, 0x67, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05,
-	0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70,
+	0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70,
 	0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x6b, 0x0a, 0x0e, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x65,
 	0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f,
@@ -1607,7 +1602,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x54, 0x69, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x53,
 	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x70, 0x75, 0x62,
 	0x6c, 0x69, 0x73, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70,
-	0x70, 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64,
+	0x70, 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64,
 	0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52,
 	0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18,
 	0x12, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05,
@@ -1658,7 +1653,7 @@ var file_manager_proto_rawDesc = []byte{
 	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77,
 	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65,
 	0x76, 0x69, 0x65, 0x77, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70,
-	0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64,
+	0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64,
 	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x63, 0x0a, 0x0f, 0x49, 0x6e,
 	0x66, 0x6f, 0x45, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x19, 0x0a,
@@ -1685,7 +1680,7 @@ var file_manager_proto_rawDesc = []byte{
 	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, 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, 0x03,
+	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, 0x6e, 0x74, 0x49, 0x64, 0x32, 0x8c, 0x02,
 	0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x08, 0x49, 0x6e, 0x66,

rpc/manager/type/manager/manager_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.5
+// - protoc             v3.19.4
 // source: manager.proto
 
 package manager