Jianghan 1 年之前
父节点
当前提交
482d0ae869

+ 48 - 32
jyBXSubscribe/api/bxsubscribe.api

@@ -1,10 +1,10 @@
 syntax = "v1"
 
 info (
-	title: "剑鱼标讯" // TODO: add title
-	desc: "订阅模块"// TODO: add description
+	title:  "剑鱼标讯" // TODO: add title
+	desc:   "订阅模块" // TODO: add description
 	author: "wangshan"
-	email: "wangshan@topnet.net.cn"
+	email:  "wangshan@topnet.net.cn"
 )
 
 type (
@@ -26,9 +26,9 @@ type (
 		Subtype        string                 `json:"subtype,optional"`
 		Price          string                 `json:"price,optional"`
 		FileExists     string                 `json:"fileExists,optional"`
-		Source         string                 `json:"source,optional"`                                        //信息来源
-		IsRead         string                 `json:"isRead,optional"`                                        //是否已读
-		Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
+		Source         string                 `json:"source,optional"` //信息来源
+		IsRead         string                 `json:"isRead,optional"` //是否已读
+		Staffs         string                 `json:"staffs,optional"` //分发的员工
 		UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType:普通用户;vType:超级订阅用户;mType:大会员用户;eType:商机管理用户;
 		NewUserId      int64                  `header:"newUserId"`
 		IsEnt          bool                   `json:"isEnt,optional"`
@@ -62,16 +62,16 @@ type (
 	}
 	//
 	subscribeUpdateReq {
-		Area            map[string]interface{}   `json:"area,optional"`            //地区
-		Buyerclass      []string                 `json:"buyerclass,optional"`      //采购单位类型
-		Items           []map[string]interface{} `json:"items,optional"`           //关键词
-		Infotype        []string                 `json:"infotype,optional"`        //信息类型
-		Matchway        string                   `json:"matchway,optional"`        //匹配方式 1标题 2正文
-		Projectmatch    string                   `json:"projectmatch,optional"`    //项目匹配 1开始 0关闭
-		Ratemode        string                   `json:"ratemode,optional"`        // 1:实时推送,2:每天9点推送,3:每周推送,4:每月推送 5:每日推送两次
-		Apppush         string                   `json:"apppush,optional"`         //app推送 1开启 0关闭
-		Mailpush        string                   `json:"mailpush,optional"`        //邮箱推送 1开启 0关闭
-		Mail            string                   `json:"mail,optional"`            //邮箱
+		Area            map[string]interface{}   `json:"area,optional"` //地区
+		Buyerclass      []string                 `json:"buyerclass,optional"` //采购单位类型
+		Items           []map[string]interface{} `json:"items,optional"` //关键词
+		Infotype        []string                 `json:"infotype,optional"` //信息类型
+		Matchway        string                   `json:"matchway,optional"` //匹配方式 1标题 2正文
+		Projectmatch    string                   `json:"projectmatch,optional"` //项目匹配 1开始 0关闭
+		Ratemode        string                   `json:"ratemode,optional"` // 1:实时推送,2:每天9点推送,3:每周推送,4:每月推送 5:每日推送两次
+		Apppush         string                   `json:"apppush,optional"` //app推送 1开启 0关闭
+		Mailpush        string                   `json:"mailpush,optional"` //邮箱推送 1开启 0关闭
+		Mail            string                   `json:"mail,optional"` //邮箱
 		Otherbuyerclass string                   `json:"otherbuyerclass,optional"` //匹配未分类类型 1匹配 0不匹配
 		AppId           string                   `header:"appId,optional"`
 		UserType        string                   `path:"userType,optional"`
@@ -188,7 +188,6 @@ type (
 		Err_msg  string      `json:"error_msg"`
 		Data     interface{} `json:"data"`
 	}
-
 	BidDistributor {
 		AppId     string   `header:"appId"`
 		EntId     string   `header:"entId,optional"`
@@ -197,37 +196,54 @@ type (
 		Staffs    string   `json:"staffs"`
 	}
 )
+
 service bxsubscribe-api {
 	@handler subscribeList
-	post /jybx/subscribe/:userType/list(subscribeReq) returns (commonResp)
+	post /jybx/subscribe/:userType/list (subscribeReq) returns (commonResp)
+
 	@handler someInfo
-	post /jybx/subscribe/:userType/someInfo(someInfoReq) returns (commonResp)
+	post /jybx/subscribe/:userType/someInfo (someInfoReq) returns (commonResp)
+
 	@handler subscribeUpdate
-	post /jybx/subscribe/:userType/update(subscribeUpdateReq) returns (commonResp)
+	post /jybx/subscribe/:userType/update (subscribeUpdateReq) returns (commonResp)
+
 	@handler ByPushHistory
-	post /jybx/subscribe/:userType/byPushHistory(subscribeReq) returns (commonResp)
+	post /jybx/subscribe/:userType/byPushHistory (subscribeReq) returns (commonResp)
+
 	@handler SetRead
-	post /jybx/subscribe/:userType/setRead(SetReadReq) returns (commonResp)
+	post /jybx/subscribe/:userType/setRead (SetReadReq) returns (commonResp)
+
 	@handler getKey
-	post /jybx/subscribe/:userType/getKey(GetKeyReq) returns (commonResp)
+	post /jybx/subscribe/:userType/getKey (GetKeyReq) returns (commonResp)
+
 	@handler distributor
-	post /jybx/subscribe/:userType/distributor(DistributorReq) returns (commonResp)
+	post /jybx/subscribe/:userType/distributor (DistributorReq) returns (commonResp)
+
 	@handler viewStatus
-	post /jybx/subscribe/:userType/viewStatus(viewStatusReq) returns (commonResp)
+	post /jybx/subscribe/:userType/viewStatus (viewStatusReq) returns (commonResp)
+
 	@handler msgDistributor
-	post /jybx/subscribe/msgDistributor(msgDistributor) returns (commonResp)
+	post /jybx/subscribe/msgDistributor (msgDistributor) returns (commonResp)
+
 	@handler getUser //查询用户信息
 	post /jybx/subscribe/getUser (GetUserReq) returns (commonResp)
-	@handler setUser  //设置用户信息
+
+	@handler setUser //设置用户信息
 	post /jybx/subscribe/setUser (SetUserReq) returns (commonResp)
-	@handler getPushSet  //推送设置查询
+
+	@handler getPushSet //推送设置查询
 	post /jybx/subscribe/getPushSet (GetUserReq) returns (commonResp)
-	@handler setPushSet  //推送设置修改
+
+	@handler setPushSet //推送设置修改
 	post /jybx/subscribe/setPushSet (SetPushSetReq) returns (commonResp)
+
 	@handler getStaffSubscribeList //查询企业员工订阅状态
 	post /jybx/subscribe/getStaffSubscribe (GetStaffSubscribeListReq) returns (StaffSubscribeCommonResp)
+
 	@handler getStaffSubscribeDetail //查询企业员工订阅详情
 	post /jybx/subscribe/getStaffSubscribeDetail (GetStaffSubscribeDetailReq) returns (StaffSubscribeCommonResp)
-	@handler bidDistributor  //标讯分发
-	post /jybx/subscribe/bidDistributor(BidDistributor) returns (commonResp)
-}
+
+	@handler bidDistributor //标讯分发
+	post /jybx/subscribe/bidDistributor (BidDistributor) returns (commonResp)
+}
+

+ 28 - 28
jyBXSubscribe/api/internal/handler/routes.go

@@ -14,23 +14,23 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/:userType/list",
-				Handler: subscribeListHandler(serverCtx),
+				Path:    "/jybx/subscribe/:userType/byPushHistory",
+				Handler: ByPushHistoryHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/:userType/someInfo",
-				Handler: someInfoHandler(serverCtx),
+				Path:    "/jybx/subscribe/:userType/distributor",
+				Handler: distributorHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/:userType/update",
-				Handler: subscribeUpdateHandler(serverCtx),
+				Path:    "/jybx/subscribe/:userType/getKey",
+				Handler: getKeyHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/:userType/byPushHistory",
-				Handler: ByPushHistoryHandler(serverCtx),
+				Path:    "/jybx/subscribe/:userType/list",
+				Handler: subscribeListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -39,13 +39,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/:userType/getKey",
-				Handler: getKeyHandler(serverCtx),
+				Path:    "/jybx/subscribe/:userType/someInfo",
+				Handler: someInfoHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/:userType/distributor",
-				Handler: distributorHandler(serverCtx),
+				Path:    "/jybx/subscribe/:userType/update",
+				Handler: subscribeUpdateHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -54,43 +54,43 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/msgDistributor",
-				Handler: msgDistributorHandler(serverCtx),
+				Path:    "/jybx/subscribe/bidDistributor",
+				Handler: bidDistributorHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/getUser",
-				Handler: getUserHandler(serverCtx),
+				Path:    "/jybx/subscribe/getPushSet",
+				Handler: getPushSetHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/setUser",
-				Handler: setUserHandler(serverCtx),
+				Path:    "/jybx/subscribe/getStaffSubscribe",
+				Handler: getStaffSubscribeListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/getPushSet",
-				Handler: getPushSetHandler(serverCtx),
+				Path:    "/jybx/subscribe/getStaffSubscribeDetail",
+				Handler: getStaffSubscribeDetailHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/setPushSet",
-				Handler: setPushSetHandler(serverCtx),
+				Path:    "/jybx/subscribe/getUser",
+				Handler: getUserHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/getStaffSubscribe",
-				Handler: getStaffSubscribeListHandler(serverCtx),
+				Path:    "/jybx/subscribe/msgDistributor",
+				Handler: msgDistributorHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/getStaffSubscribeDetail",
-				Handler: getStaffSubscribeDetailHandler(serverCtx),
+				Path:    "/jybx/subscribe/setPushSet",
+				Handler: setPushSetHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/jybx/subscribe/bidDistributor",
-				Handler: bidDistributorHandler(serverCtx),
+				Path:    "/jybx/subscribe/setUser",
+				Handler: setUserHandler(serverCtx),
 			},
 		},
 	)

+ 133 - 133
jyBXSubscribe/api/internal/types/types.go

@@ -1,92 +1,22 @@
 // Code generated by goctl. DO NOT EDIT.
 package types
 
-type SubscribeReq struct {
-	AppId          string                 `header:"appId"`
-	UserId         string                 `header:"userId"`
-	EntId          string                 `header:"entId,optional"`
-	EntUserId      string                 `header:"entUserId,optional"`
-	DeptId         string                 `header:"deptId,optional"` //部门id
-	PageNum        int64                  `json:"pageNum,optional"`
-	PageSize       int64                  `json:"pageSize,optional"`
-	SelectTime     string                 `json:"selectTime,optional"`
-	Area           string                 `json:"area,optional"`
-	City           string                 `json:"city,optional"`
-	Industry       string                 `json:"industry,optional"`
-	BuyerClass     string                 `json:"buyerClass,optional"`
-	KeyWords       string                 `json:"keyWords,optional"`
-	Subtype        string                 `json:"subtype,optional"`
-	Price          string                 `json:"price,optional"`
-	FileExists     string                 `json:"fileExists,optional"`
-	Source         string                 `json:"source,optional"`                                        //信息来源
-	IsRead         string                 `json:"isRead,optional"`                                        //是否已读
-	Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
-	UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType:普通用户;vType:超级订阅用户;mType:大会员用户;eType:商机管理用户;
-	NewUserId      int64                  `header:"newUserId"`
-	IsEnt          bool                   `json:"isEnt,optional"`
-	SelectIds      string                 `json:"selectIds,optional"`
-	SelectKeys     string                 `json:"selectKeys,optional"`
-	PositionType   int64                  `header:"positionType,optional"`
-	NotReturnCount int64                  `json:"notReturnCount,optional"`
-	Item           map[string]interface{} `json:"item,optional"`
-	AccountId      string                 `header:"accountId,optional"`
-	PositionId     string                 `header:"positionId,optional"`
-	MgoUserId      string                 `header:"mgoUserId,optional"` //原userId
-	District       string                 `json:"district,optional"`
-}
-
-type SomeInfoReq struct {
-	AppId        string `header:"appId"`
-	UserType     string `path:"userType"`
-	UserId       string `header:"userId,optional"`
-	NewUserId    string `header:"newUserId,optional"`
-	EntId        string `header:"entId,optional"`
-	AccountId    string `header:"accountId,optional"`
-	PositionType string `header:"positionType,optional"`
-	PositionId   string `header:"positionId,optional"`
-}
-
-type CommonResp struct {
-	Err_code int64       `json:"error_code"`
-	Err_msg  string      `json:"error_msg"`
-	Data     interface{} `json:"data"`
-	TimeData interface{} `json:"timeData"`
-}
-
-type SubscribeUpdateReq struct {
-	Area            map[string]interface{}   `json:"area,optional"`            //地区
-	Buyerclass      []string                 `json:"buyerclass,optional"`      //采购单位类型
-	Items           []map[string]interface{} `json:"items,optional"`           //关键词
-	Infotype        []string                 `json:"infotype,optional"`        //信息类型
-	Matchway        string                   `json:"matchway,optional"`        //匹配方式 1标题 2正文
-	Projectmatch    string                   `json:"projectmatch,optional"`    //项目匹配 1开始 0关闭
-	Ratemode        string                   `json:"ratemode,optional"`        // 1:实时推送,2:每天9点推送,3:每周推送,4:每月推送 5:每日推送两次
-	Apppush         string                   `json:"apppush,optional"`         //app推送 1开启 0关闭
-	Mailpush        string                   `json:"mailpush,optional"`        //邮箱推送 1开启 0关闭
-	Mail            string                   `json:"mail,optional"`            //邮箱
-	Otherbuyerclass string                   `json:"otherbuyerclass,optional"` //匹配未分类类型 1匹配 0不匹配
-	AppId           string                   `header:"appId,optional"`
-	UserType        string                   `path:"userType,optional"`
-	UserId          string                   `header:"userId,optional"`
-	PositionType    int64                    `header:"positionType,optional"`
-	NewUserId       int64                    `header:"newUserId,optional"`
-	EntId           int64                    `header:"entId,optional"`
-	AccountId       int64                    `header:"accountId,optional"`
-	PositionId      int64                    `header:"positionId,optional"`
-	District        map[string]interface{}   `json:"district,optional"`
+type BidDistributor struct {
+	AppId     string   `header:"appId"`
+	EntId     string   `header:"entId,optional"`
+	EntUserId string   `header:"entUserId,optional"`
+	Infoids   []string `json:"infoids"`
+	Staffs    string   `json:"staffs"`
 }
 
-type SetReadReq struct {
-	AppId        string `header:"appId"`
-	UserId       string `header:"userId"`
-	EntId        string `header:"entId,optional"`
-	EntUserId    string `header:"entUserId,optional"`
-	DeptId       string `header:"deptId,optional"` //部门id
-	Vsid         int64  `form:"vsid"`
-	NewUserId    int64  `header:"newUserId"`
-	IsEnt        bool   `form:"isEnt,optional"`
-	UserType     string `path:"userType,optional"`
-	PositionType int64  `header:"positionType,optional"`
+type DistributorReq struct {
+	AppId     string `header:"appId"`
+	EntId     string `header:"entId,optional"`
+	EntUserId string `header:"entUserId,optional"`
+	UserType  string `path:"userType,optional"`
+	Region    string `json:"region,optional"`
+	SelectIds string `json:"selectIds,optional"`
+	QueryType string `json:"queryType,optional"`
 }
 
 type GetKeyReq struct {
@@ -105,30 +35,22 @@ type GetKeyReq struct {
 	PositionType int64  `header:"positionType,optional"`
 }
 
-type DistributorReq struct {
-	AppId     string `header:"appId"`
-	EntId     string `header:"entId,optional"`
-	EntUserId string `header:"entUserId,optional"`
-	UserType  string `path:"userType,optional"`
-	Region    string `json:"region,optional"`
-	SelectIds string `json:"selectIds,optional"`
-	QueryType string `json:"queryType,optional"`
-}
-
-type ViewStatusReq struct {
+type GetStaffSubscribeDetailReq struct {
 	AppId     string `header:"appId"`
-	EntId     string `header:"entId,optional"`
-	EntUserId string `header:"entUserId,optional"`
-	UserType  string `path:"userType,optional"`
-	InfoId    string `json:"infoId,optional"`
+	EntId     int64  `header:"entId,optional"`
+	EntUserId int64  `header:"entUserId,optional"`
+	Token     string `json:"token,optional"`
 }
 
-type MsgDistributor struct {
+type GetStaffSubscribeListReq struct {
 	AppId     string `header:"appId"`
-	EntId     string `header:"entId,optional"`
-	EntUserId string `header:"entUserId,optional"`
-	MessageId string `json:"messageId"`
-	Staffs    string `json:"staffs"`
+	EntId     int64  `header:"entId,optional"`
+	EntUserId int64  `header:"entUserId,optional"`
+	EStatus   int64  `json:"e_status,optional"`
+	PStatus   int64  `json:"p_status,optional"`
+	Search    string `json:"search,optional"`
+	PageNum   int64  `json:"pageNum,optional"`
+	PageSize  int64  `json:"pageSize,optional"`
 }
 
 type GetUserReq struct {
@@ -144,15 +66,6 @@ type GetUserReq struct {
 	MgoUserId    string `header:"mgoUserId,optional"` //原userId
 }
 
-type SetUserReq struct {
-	AppId        string `header:"appId"`
-	EntId        int64  `header:"entId,optional"`
-	EntUserId    int64  `header:"entUserId,optional"`
-	PositionType int64  `header:"positionType,optional"`
-	UserId       string `header:"userId,optional"`
-	Mail         string `json:"mail,optional"`
-}
-
 type SetPushSetReq struct {
 	AppId        string   `header:"appId"`
 	EntId        int64    `header:"entId,optional"`
@@ -168,22 +81,26 @@ type SetPushSetReq struct {
 	Interested   int64    `json:"interested,optional"`
 }
 
-type GetStaffSubscribeListReq struct {
-	AppId     string `header:"appId"`
-	EntId     int64  `header:"entId,optional"`
-	EntUserId int64  `header:"entUserId,optional"`
-	EStatus   int64  `json:"e_status,optional"`
-	PStatus   int64  `json:"p_status,optional"`
-	Search    string `json:"search,optional"`
-	PageNum   int64  `json:"pageNum,optional"`
-	PageSize  int64  `json:"pageSize,optional"`
+type SetReadReq struct {
+	AppId        string `header:"appId"`
+	UserId       string `header:"userId"`
+	EntId        string `header:"entId,optional"`
+	EntUserId    string `header:"entUserId,optional"`
+	DeptId       string `header:"deptId,optional"` //部门id
+	Vsid         int64  `form:"vsid"`
+	NewUserId    int64  `header:"newUserId"`
+	IsEnt        bool   `form:"isEnt,optional"`
+	UserType     string `path:"userType,optional"`
+	PositionType int64  `header:"positionType,optional"`
 }
 
-type GetStaffSubscribeDetailReq struct {
-	AppId     string `header:"appId"`
-	EntId     int64  `header:"entId,optional"`
-	EntUserId int64  `header:"entUserId,optional"`
-	Token     string `json:"token,optional"`
+type SetUserReq struct {
+	AppId        string `header:"appId"`
+	EntId        int64  `header:"entId,optional"`
+	EntUserId    int64  `header:"entUserId,optional"`
+	PositionType int64  `header:"positionType,optional"`
+	UserId       string `header:"userId,optional"`
+	Mail         string `json:"mail,optional"`
 }
 
 type StaffSubscribeCommonResp struct {
@@ -192,10 +109,93 @@ type StaffSubscribeCommonResp struct {
 	Data     interface{} `json:"data"`
 }
 
-type BidDistributor struct {
-	AppId     string   `header:"appId"`
-	EntId     string   `header:"entId,optional"`
-	EntUserId string   `header:"entUserId,optional"`
-	Infoids   []string `json:"infoids"`
-	Staffs    string   `json:"staffs"`
+type CommonResp struct {
+	Err_code int64       `json:"error_code"`
+	Err_msg  string      `json:"error_msg"`
+	Data     interface{} `json:"data"`
+	TimeData interface{} `json:"timeData"`
+}
+
+type MsgDistributor struct {
+	AppId     string `header:"appId"`
+	EntId     string `header:"entId,optional"`
+	EntUserId string `header:"entUserId,optional"`
+	MessageId string `json:"messageId"`
+	Staffs    string `json:"staffs"`
+}
+
+type SomeInfoReq struct {
+	AppId        string `header:"appId"`
+	UserType     string `path:"userType"`
+	UserId       string `header:"userId,optional"`
+	NewUserId    string `header:"newUserId,optional"`
+	EntId        string `header:"entId,optional"`
+	AccountId    string `header:"accountId,optional"`
+	PositionType string `header:"positionType,optional"`
+	PositionId   string `header:"positionId,optional"`
+}
+
+type SubscribeReq struct {
+	AppId          string                 `header:"appId"`
+	UserId         string                 `header:"userId"`
+	EntId          string                 `header:"entId,optional"`
+	EntUserId      string                 `header:"entUserId,optional"`
+	DeptId         string                 `header:"deptId,optional"` //部门id
+	PageNum        int64                  `json:"pageNum,optional"`
+	PageSize       int64                  `json:"pageSize,optional"`
+	SelectTime     string                 `json:"selectTime,optional"`
+	Area           string                 `json:"area,optional"`
+	City           string                 `json:"city,optional"`
+	Industry       string                 `json:"industry,optional"`
+	BuyerClass     string                 `json:"buyerClass,optional"`
+	KeyWords       string                 `json:"keyWords,optional"`
+	Subtype        string                 `json:"subtype,optional"`
+	Price          string                 `json:"price,optional"`
+	FileExists     string                 `json:"fileExists,optional"`
+	Source         string                 `json:"source,optional"`                                        //信息来源
+	IsRead         string                 `json:"isRead,optional"`                                        //是否已读
+	Staffs         string                 `json:"staffs,optional"`                                        //分发的员工
+	UserType       string                 `path:"userType,default=fType,options=fType|vType|mType|eType"` //fType:普通用户;vType:超级订阅用户;mType:大会员用户;eType:商机管理用户;
+	NewUserId      int64                  `header:"newUserId"`
+	IsEnt          bool                   `json:"isEnt,optional"`
+	SelectIds      string                 `json:"selectIds,optional"`
+	SelectKeys     string                 `json:"selectKeys,optional"`
+	PositionType   int64                  `header:"positionType,optional"`
+	NotReturnCount int64                  `json:"notReturnCount,optional"`
+	Item           map[string]interface{} `json:"item,optional"`
+	AccountId      string                 `header:"accountId,optional"`
+	PositionId     string                 `header:"positionId,optional"`
+	MgoUserId      string                 `header:"mgoUserId,optional"` //原userId
+	District       string                 `json:"district,optional"`
+}
+
+type SubscribeUpdateReq struct {
+	Area            map[string]interface{}   `json:"area,optional"`            //地区
+	Buyerclass      []string                 `json:"buyerclass,optional"`      //采购单位类型
+	Items           []map[string]interface{} `json:"items,optional"`           //关键词
+	Infotype        []string                 `json:"infotype,optional"`        //信息类型
+	Matchway        string                   `json:"matchway,optional"`        //匹配方式 1标题 2正文
+	Projectmatch    string                   `json:"projectmatch,optional"`    //项目匹配 1开始 0关闭
+	Ratemode        string                   `json:"ratemode,optional"`        // 1:实时推送,2:每天9点推送,3:每周推送,4:每月推送 5:每日推送两次
+	Apppush         string                   `json:"apppush,optional"`         //app推送 1开启 0关闭
+	Mailpush        string                   `json:"mailpush,optional"`        //邮箱推送 1开启 0关闭
+	Mail            string                   `json:"mail,optional"`            //邮箱
+	Otherbuyerclass string                   `json:"otherbuyerclass,optional"` //匹配未分类类型 1匹配 0不匹配
+	AppId           string                   `header:"appId,optional"`
+	UserType        string                   `path:"userType,optional"`
+	UserId          string                   `header:"userId,optional"`
+	PositionType    int64                    `header:"positionType,optional"`
+	NewUserId       int64                    `header:"newUserId,optional"`
+	EntId           int64                    `header:"entId,optional"`
+	AccountId       int64                    `header:"accountId,optional"`
+	PositionId      int64                    `header:"positionId,optional"`
+	District        map[string]interface{}   `json:"district,optional"`
+}
+
+type ViewStatusReq struct {
+	AppId     string `header:"appId"`
+	EntId     string `header:"entId,optional"`
+	EntUserId string `header:"entUserId,optional"`
+	UserType  string `path:"userType,optional"`
+	InfoId    string `json:"infoId,optional"`
 }

+ 1 - 1
jyBXSubscribe/rpc/model/push.go

@@ -1020,7 +1020,7 @@ func (s *subscribePush) GetJyPushs(datas []map[string]interface{}) (pushCas []*P
 
 // 查看全部列表缓存
 func (s *subscribePush) PutAllCache(userId, userType string, datas *SubPush) {
-	log.Println("pushcache_2_a", s.allKey(userId, userType), datas, oneDay)
+	//log.Println("pushcache_2_a", s.allKey(userId, userType), datas, oneDay)
 	redis.Put("pushcache_2_a", s.allKey(userId, userType), datas, oneDay)
 }
 

+ 2 - 2
jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
-// 	protoc        v3.15.1
+// 	protoc-gen-go v1.32.0
+// 	protoc        v4.25.2
 // source: bxsubscribe.proto
 
 //import "google/protobuf/struct.proto";

+ 1 - 1
jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.15.1
+// - protoc             v4.25.2
 // source: bxsubscribe.proto
 
 //import "google/protobuf/struct.proto";