Bladeren bron

fix:接口删除

duxin 2 jaren geleden
bovenliggende
commit
d52e256bfd

+ 0 - 28
api/messagecenter/internal/handler/groupannouncementreminderhandler.go

@@ -1,28 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/logic"
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func groupAnnouncementReminderHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.OneUserPositionReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewGroupAnnouncementReminderLogic(r.Context(), svcCtx)
-		resp, err := l.GroupAnnouncementReminder(&req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

+ 0 - 5
api/messagecenter/internal/handler/routes.go

@@ -72,11 +72,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/message/oneUserPosition",
 				Handler: oneUserPositionHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/message/groupAnnouncementReminder",
-				Handler: groupAnnouncementReminderHandler(serverCtx),
-			},
 		},
 	)
 }

+ 0 - 40
api/messagecenter/internal/logic/groupannouncementreminderlogic.go

@@ -1,40 +0,0 @@
-package logic
-
-import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
-	"context"
-
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GroupAnnouncementReminderLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGroupAnnouncementReminderLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GroupAnnouncementReminderLogic {
-	return &GroupAnnouncementReminderLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GroupAnnouncementReminderLogic) GroupAnnouncementReminder(req *types.GroupAnnouncementReminderReq) (resp *types.CommonRes, err error) {
-	// todo: add your logic here and delete this line
-	r, _ := l.svcCtx.Message.GroupAnnouncementReminder(l.ctx, &messagecenter.GroupAnnouncementReminderReq{
-		Appid:      req.Appid,
-		EntId:      req.EntId,
-		PositionId: req.PositionId,
-	})
-	return &types.CommonRes{
-		Error_msg:  r.ErrorMsg,
-		Error_code: int(r.ErrorCode),
-		Data:       r.Reminder,
-	}, nil
-	return
-}

+ 0 - 7
api/messagecenter/internal/types/types.go

@@ -121,10 +121,3 @@ type OneUserPositionReq struct {
 	EntId      int64  `header:"entId,optional"`
 	Appid      string `header:"appId"`
 }
-
-type GroupAnnouncementReminderReq struct {
-	PositionId int64  `header:"positionId"`
-	EntId      int64  `header:"entId,optional"`
-	Appid      string `header:"appId"`
-	GroupId    string `json:"groupId"`
-}

+ 0 - 9
api/messagecenter/messagecenter.api

@@ -111,13 +111,6 @@ type OneUserPositionReq {
 	EntId      int64  `header:"entId,optional"`
 	Appid      string `header:"appId"`
 }
-
-type GroupAnnouncementReminderReq {
-	PositionId int64  `header:"positionId"`
-	EntId      int64  `header:"entId,optional"`
-	Appid      string `header:"appId"`
-	GroupId    string `json:"groupId"`
-}
 service messagecenter-api {
 	@handler messageCount
 	post /message/messageCount (CountReq) returns (CommonRes);
@@ -143,6 +136,4 @@ service messagecenter-api {
 	post /message/conversationList (UserReq) returns (CommonRes);
 	@handler oneUserPosition // 1v1会话职位
 	post /message/oneUserPosition (OneUserPositionReq) returns (CommonRes);
-	@handler groupAnnouncementReminder //群公告提醒
-	post /message/groupAnnouncementReminder (GroupAnnouncementReminderReq) returns (CommonRes);
 }

+ 0 - 31
rpc/messagecenter/internal/logic/groupannouncementreminderlogic.go

@@ -1,31 +0,0 @@
-package logic
-
-import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service"
-	"context"
-
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GroupAnnouncementReminderLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewGroupAnnouncementReminderLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GroupAnnouncementReminderLogic {
-	return &GroupAnnouncementReminderLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 群公告提醒
-func (l *GroupAnnouncementReminderLogic) GroupAnnouncementReminder(in *messagecenter.GroupAnnouncementReminderReq) (*messagecenter.GroupAnnouncementReminderResp, error) {
-	// todo: add your logic here and delete this line
-	return &messagecenter.GroupAnnouncementReminderResp{Reminder: service.GroupAnnouncementReminder(in)}, nil
-}

+ 0 - 6
rpc/messagecenter/internal/server/messagecenterserver.go

@@ -99,9 +99,3 @@ func (s *MessageCenterServer) OneUserPosition(ctx context.Context, in *messagece
 	l := logic.NewOneUserPositionLogic(ctx, s.svcCtx)
 	return l.OneUserPosition(in)
 }
-
-// 群公告提醒
-func (s *MessageCenterServer) GroupAnnouncementReminder(ctx context.Context, in *messagecenter.GroupAnnouncementReminderReq) (*messagecenter.GroupAnnouncementReminderResp, error) {
-	l := logic.NewGroupAnnouncementReminderLogic(ctx, s.svcCtx)
-	return l.GroupAnnouncementReminder(in)
-}

+ 0 - 16
rpc/messagecenter/messagecenter.proto

@@ -196,20 +196,6 @@ message OneUserPositionResp {
   string       position = 3;
 }
 
-message GroupAnnouncementReminderReq {
-  int64 positionId = 1;
-  int64 entId = 2;
-  string        appid = 3;
-  int64   groupId =4;
-
-}
-
-message GroupAnnouncementReminderResp {
-  int64         error_code = 1; //响应代码
-  string        error_msg = 2; //响应消息
-  int64       reminder = 3;
-}
-
 service messageCenter {
   // 查询数量
   rpc Count(CountReq) returns(CountResp);
@@ -237,6 +223,4 @@ service messageCenter {
   rpc GroupChat(MessageSaveReq)returns(CommonReq);
   // 1v1会话职位
   rpc OneUserPosition(OneUserPositionReq)returns(OneUserPositionResp);
-  // 群公告提醒
-  rpc GroupAnnouncementReminder(GroupAnnouncementReminderReq)returns(GroupAnnouncementReminderResp);
 }

+ 0 - 8
rpc/messagecenter/messagecenter/messagecenter.go

@@ -38,8 +38,6 @@ type (
 		GroupChat(ctx context.Context, in *MessageSaveReq, opts ...grpc.CallOption) (*CommonReq, error)
 		//  1v1会话职位
 		OneUserPosition(ctx context.Context, in *OneUserPositionReq, opts ...grpc.CallOption) (*OneUserPositionResp, error)
-		//  群公告提醒
-		GroupAnnouncementReminder(ctx context.Context, in *GroupAnnouncementReminderReq, opts ...grpc.CallOption) (*GroupAnnouncementReminderResp, error)
 	}
 
 	defaultMessageCenter struct {
@@ -130,9 +128,3 @@ func (m *defaultMessageCenter) OneUserPosition(ctx context.Context, in *OneUserP
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.OneUserPosition(ctx, in, opts...)
 }
-
-// 群公告提醒
-func (m *defaultMessageCenter) GroupAnnouncementReminder(ctx context.Context, in *GroupAnnouncementReminderReq, opts ...grpc.CallOption) (*GroupAnnouncementReminderResp, error) {
-	client := NewMessageCenterClient(m.cli.Conn())
-	return client.GroupAnnouncementReminder(ctx, in, opts...)
-}

+ 43 - 229
rpc/messagecenter/messagecenter/messagecenter.pb.go

@@ -1976,140 +1976,6 @@ func (x *OneUserPositionResp) GetPosition() string {
 	return ""
 }
 
-type GroupAnnouncementReminderReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PositionId int64  `protobuf:"varint,1,opt,name=positionId,proto3" json:"positionId,omitempty"`
-	EntId      int64  `protobuf:"varint,2,opt,name=entId,proto3" json:"entId,omitempty"`
-	Appid      string `protobuf:"bytes,3,opt,name=appid,proto3" json:"appid,omitempty"`
-	GroupId    int64  `protobuf:"varint,4,opt,name=groupId,proto3" json:"groupId,omitempty"`
-}
-
-func (x *GroupAnnouncementReminderReq) Reset() {
-	*x = GroupAnnouncementReminderReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_messagecenter_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GroupAnnouncementReminderReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GroupAnnouncementReminderReq) ProtoMessage() {}
-
-func (x *GroupAnnouncementReminderReq) ProtoReflect() protoreflect.Message {
-	mi := &file_messagecenter_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GroupAnnouncementReminderReq.ProtoReflect.Descriptor instead.
-func (*GroupAnnouncementReminderReq) Descriptor() ([]byte, []int) {
-	return file_messagecenter_proto_rawDescGZIP(), []int{22}
-}
-
-func (x *GroupAnnouncementReminderReq) GetPositionId() int64 {
-	if x != nil {
-		return x.PositionId
-	}
-	return 0
-}
-
-func (x *GroupAnnouncementReminderReq) GetEntId() int64 {
-	if x != nil {
-		return x.EntId
-	}
-	return 0
-}
-
-func (x *GroupAnnouncementReminderReq) GetAppid() string {
-	if x != nil {
-		return x.Appid
-	}
-	return ""
-}
-
-func (x *GroupAnnouncementReminderReq) GetGroupId() int64 {
-	if x != nil {
-		return x.GroupId
-	}
-	return 0
-}
-
-type GroupAnnouncementReminderResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	ErrorCode int64  `protobuf:"varint,1,opt,name=error_code,json=errorCode,proto3" json:"error_code,omitempty"` //响应代码
-	ErrorMsg  string `protobuf:"bytes,2,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"`     //响应消息
-	Reminder  int64  `protobuf:"varint,3,opt,name=reminder,proto3" json:"reminder,omitempty"`
-}
-
-func (x *GroupAnnouncementReminderResp) Reset() {
-	*x = GroupAnnouncementReminderResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_messagecenter_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GroupAnnouncementReminderResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GroupAnnouncementReminderResp) ProtoMessage() {}
-
-func (x *GroupAnnouncementReminderResp) ProtoReflect() protoreflect.Message {
-	mi := &file_messagecenter_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GroupAnnouncementReminderResp.ProtoReflect.Descriptor instead.
-func (*GroupAnnouncementReminderResp) Descriptor() ([]byte, []int) {
-	return file_messagecenter_proto_rawDescGZIP(), []int{23}
-}
-
-func (x *GroupAnnouncementReminderResp) GetErrorCode() int64 {
-	if x != nil {
-		return x.ErrorCode
-	}
-	return 0
-}
-
-func (x *GroupAnnouncementReminderResp) GetErrorMsg() string {
-	if x != nil {
-		return x.ErrorMsg
-	}
-	return ""
-}
-
-func (x *GroupAnnouncementReminderResp) GetReminder() int64 {
-	if x != nil {
-		return x.Reminder
-	}
-	return 0
-}
-
 var File_messagecenter_proto protoreflect.FileDescriptor
 
 var file_messagecenter_proto_rawDesc = []byte{
@@ -2381,23 +2247,7 @@ var file_messagecenter_proto_rawDesc = []byte{
 	0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72,
 	0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
 	0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0x84, 0x01, 0x0a, 0x1c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x6e, 0x6e, 0x6f,
-	0x75, 0x6e, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x65, 0x72,
-	0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70,
-	0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x12,
-	0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x77, 0x0a, 0x1d, 0x47, 0x72, 0x6f,
-	0x75, 0x70, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65,
-	0x6d, 0x69, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72,
-	0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
-	0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72,
-	0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x6d, 0x69, 0x6e, 0x64,
-	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x72, 0x65, 0x6d, 0x69, 0x6e, 0x64,
-	0x65, 0x72, 0x32, 0xe1, 0x08, 0x0a, 0x0d, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x65,
+	0x6f, 0x6e, 0x32, 0xe9, 0x07, 0x0a, 0x0d, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x43, 0x65,
 	0x6e, 0x74, 0x65, 0x72, 0x12, 0x3a, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x17, 0x2e,
 	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x6f,
 	0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
@@ -2459,17 +2309,9 @@ var file_messagecenter_proto_rawDesc = []byte{
 	0x65, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50,
 	0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x6d, 0x65, 0x73,
 	0x73, 0x61, 0x67, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x65, 0x55, 0x73,
-	0x65, 0x72, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x76,
-	0x0a, 0x19, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x2b, 0x2e, 0x6d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x6d,
-	0x69, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x2c, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x6e,
-	0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x6d, 0x69, 0x6e, 0x64,
-	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x42, 0x11, 0x5a, 0x0f, 0x2e, 0x2f, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x65, 0x72, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x42, 0x11,
+	0x5a, 0x0f, 0x2e, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x63, 0x65, 0x6e, 0x74, 0x65,
+	0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2484,32 +2326,30 @@ func file_messagecenter_proto_rawDescGZIP() []byte {
 	return file_messagecenter_proto_rawDescData
 }
 
-var file_messagecenter_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
+var file_messagecenter_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
 var file_messagecenter_proto_goTypes = []interface{}{
-	(*CountReq)(nil),                      // 0: messagecenter.CountReq
-	(*CountResp)(nil),                     // 1: messagecenter.CountResp
-	(*UserReq)(nil),                       // 2: messagecenter.UserReq
-	(*UserResp)(nil),                      // 3: messagecenter.UserResp
-	(*UserEntity)(nil),                    // 4: messagecenter.UserEntity
-	(*MessageReq)(nil),                    // 5: messagecenter.MessageReq
-	(*MessageResp)(nil),                   // 6: messagecenter.MessageResp
-	(*SaveMessageResp)(nil),               // 7: messagecenter.SaveMessageResp
-	(*MessageEntity)(nil),                 // 8: messagecenter.MessageEntity
-	(*ChatSessionReq)(nil),                // 9: messagecenter.ChatSessionReq
-	(*CloseSessionReq)(nil),               // 10: messagecenter.CloseSessionReq
-	(*ChatSessionResp)(nil),               // 11: messagecenter.ChatSessionResp
-	(*SaveAutoReplyReq)(nil),              // 12: messagecenter.SaveAutoReplyReq
-	(*ReadStateReq)(nil),                  // 13: messagecenter.ReadStateReq
-	(*ReadWithdrawReq)(nil),               // 14: messagecenter.ReadWithdrawReq
-	(*AppraiseReq)(nil),                   // 15: messagecenter.AppraiseReq
-	(*CurrencyResp)(nil),                  // 16: messagecenter.CurrencyResp
-	(*ConversationReq)(nil),               // 17: messagecenter.ConversationReq
-	(*MessageSaveReq)(nil),                // 18: messagecenter.MessageSaveReq
-	(*CommonReq)(nil),                     // 19: messagecenter.CommonReq
-	(*OneUserPositionReq)(nil),            // 20: messagecenter.OneUserPositionReq
-	(*OneUserPositionResp)(nil),           // 21: messagecenter.OneUserPositionResp
-	(*GroupAnnouncementReminderReq)(nil),  // 22: messagecenter.GroupAnnouncementReminderReq
-	(*GroupAnnouncementReminderResp)(nil), // 23: messagecenter.GroupAnnouncementReminderResp
+	(*CountReq)(nil),            // 0: messagecenter.CountReq
+	(*CountResp)(nil),           // 1: messagecenter.CountResp
+	(*UserReq)(nil),             // 2: messagecenter.UserReq
+	(*UserResp)(nil),            // 3: messagecenter.UserResp
+	(*UserEntity)(nil),          // 4: messagecenter.UserEntity
+	(*MessageReq)(nil),          // 5: messagecenter.MessageReq
+	(*MessageResp)(nil),         // 6: messagecenter.MessageResp
+	(*SaveMessageResp)(nil),     // 7: messagecenter.SaveMessageResp
+	(*MessageEntity)(nil),       // 8: messagecenter.MessageEntity
+	(*ChatSessionReq)(nil),      // 9: messagecenter.ChatSessionReq
+	(*CloseSessionReq)(nil),     // 10: messagecenter.CloseSessionReq
+	(*ChatSessionResp)(nil),     // 11: messagecenter.ChatSessionResp
+	(*SaveAutoReplyReq)(nil),    // 12: messagecenter.SaveAutoReplyReq
+	(*ReadStateReq)(nil),        // 13: messagecenter.ReadStateReq
+	(*ReadWithdrawReq)(nil),     // 14: messagecenter.ReadWithdrawReq
+	(*AppraiseReq)(nil),         // 15: messagecenter.AppraiseReq
+	(*CurrencyResp)(nil),        // 16: messagecenter.CurrencyResp
+	(*ConversationReq)(nil),     // 17: messagecenter.ConversationReq
+	(*MessageSaveReq)(nil),      // 18: messagecenter.MessageSaveReq
+	(*CommonReq)(nil),           // 19: messagecenter.CommonReq
+	(*OneUserPositionReq)(nil),  // 20: messagecenter.OneUserPositionReq
+	(*OneUserPositionResp)(nil), // 21: messagecenter.OneUserPositionResp
 }
 var file_messagecenter_proto_depIdxs = []int32{
 	8,  // 0: messagecenter.CountResp.lastMessage:type_name -> messagecenter.MessageEntity
@@ -2529,23 +2369,21 @@ var file_messagecenter_proto_depIdxs = []int32{
 	17, // 14: messagecenter.messageCenter.ConversationList:input_type -> messagecenter.ConversationReq
 	18, // 15: messagecenter.messageCenter.GroupChat:input_type -> messagecenter.MessageSaveReq
 	20, // 16: messagecenter.messageCenter.OneUserPosition:input_type -> messagecenter.OneUserPositionReq
-	22, // 17: messagecenter.messageCenter.GroupAnnouncementReminder:input_type -> messagecenter.GroupAnnouncementReminderReq
-	1,  // 18: messagecenter.messageCenter.Count:output_type -> messagecenter.CountResp
-	3,  // 19: messagecenter.messageCenter.UserList:output_type -> messagecenter.UserResp
-	6,  // 20: messagecenter.messageCenter.FindMessage:output_type -> messagecenter.MessageResp
-	7,  // 21: messagecenter.messageCenter.SaveMessage:output_type -> messagecenter.SaveMessageResp
-	11, // 22: messagecenter.messageCenter.CreateChatSession:output_type -> messagecenter.ChatSessionResp
-	11, // 23: messagecenter.messageCenter.CloseChatSession:output_type -> messagecenter.ChatSessionResp
-	6,  // 24: messagecenter.messageCenter.SaveAutoReplyMsg:output_type -> messagecenter.MessageResp
-	16, // 25: messagecenter.messageCenter.UpdateReadById:output_type -> messagecenter.CurrencyResp
-	16, // 26: messagecenter.messageCenter.WithdrawMessage:output_type -> messagecenter.CurrencyResp
-	16, // 27: messagecenter.messageCenter.AppraiseMessage:output_type -> messagecenter.CurrencyResp
-	3,  // 28: messagecenter.messageCenter.ConversationList:output_type -> messagecenter.UserResp
-	19, // 29: messagecenter.messageCenter.GroupChat:output_type -> messagecenter.CommonReq
-	21, // 30: messagecenter.messageCenter.OneUserPosition:output_type -> messagecenter.OneUserPositionResp
-	23, // 31: messagecenter.messageCenter.GroupAnnouncementReminder:output_type -> messagecenter.GroupAnnouncementReminderResp
-	18, // [18:32] is the sub-list for method output_type
-	4,  // [4:18] is the sub-list for method input_type
+	1,  // 17: messagecenter.messageCenter.Count:output_type -> messagecenter.CountResp
+	3,  // 18: messagecenter.messageCenter.UserList:output_type -> messagecenter.UserResp
+	6,  // 19: messagecenter.messageCenter.FindMessage:output_type -> messagecenter.MessageResp
+	7,  // 20: messagecenter.messageCenter.SaveMessage:output_type -> messagecenter.SaveMessageResp
+	11, // 21: messagecenter.messageCenter.CreateChatSession:output_type -> messagecenter.ChatSessionResp
+	11, // 22: messagecenter.messageCenter.CloseChatSession:output_type -> messagecenter.ChatSessionResp
+	6,  // 23: messagecenter.messageCenter.SaveAutoReplyMsg:output_type -> messagecenter.MessageResp
+	16, // 24: messagecenter.messageCenter.UpdateReadById:output_type -> messagecenter.CurrencyResp
+	16, // 25: messagecenter.messageCenter.WithdrawMessage:output_type -> messagecenter.CurrencyResp
+	16, // 26: messagecenter.messageCenter.AppraiseMessage:output_type -> messagecenter.CurrencyResp
+	3,  // 27: messagecenter.messageCenter.ConversationList:output_type -> messagecenter.UserResp
+	19, // 28: messagecenter.messageCenter.GroupChat:output_type -> messagecenter.CommonReq
+	21, // 29: messagecenter.messageCenter.OneUserPosition:output_type -> messagecenter.OneUserPositionResp
+	17, // [17:30] is the sub-list for method output_type
+	4,  // [4:17] is the sub-list for method input_type
 	4,  // [4:4] is the sub-list for extension type_name
 	4,  // [4:4] is the sub-list for extension extendee
 	0,  // [0:4] is the sub-list for field type_name
@@ -2821,30 +2659,6 @@ func file_messagecenter_proto_init() {
 				return nil
 			}
 		}
-		file_messagecenter_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GroupAnnouncementReminderReq); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_messagecenter_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GroupAnnouncementReminderResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2852,7 +2666,7 @@ func file_messagecenter_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_messagecenter_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   24,
+			NumMessages:   22,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 0 - 38
rpc/messagecenter/messagecenter/messagecenter_grpc.pb.go

@@ -48,8 +48,6 @@ type MessageCenterClient interface {
 	GroupChat(ctx context.Context, in *MessageSaveReq, opts ...grpc.CallOption) (*CommonReq, error)
 	// 1v1会话职位
 	OneUserPosition(ctx context.Context, in *OneUserPositionReq, opts ...grpc.CallOption) (*OneUserPositionResp, error)
-	// 群公告提醒
-	GroupAnnouncementReminder(ctx context.Context, in *GroupAnnouncementReminderReq, opts ...grpc.CallOption) (*GroupAnnouncementReminderResp, error)
 }
 
 type messageCenterClient struct {
@@ -177,15 +175,6 @@ func (c *messageCenterClient) OneUserPosition(ctx context.Context, in *OneUserPo
 	return out, nil
 }
 
-func (c *messageCenterClient) GroupAnnouncementReminder(ctx context.Context, in *GroupAnnouncementReminderReq, opts ...grpc.CallOption) (*GroupAnnouncementReminderResp, error) {
-	out := new(GroupAnnouncementReminderResp)
-	err := c.cc.Invoke(ctx, "/messagecenter.messageCenter/GroupAnnouncementReminder", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // MessageCenterServer is the server API for MessageCenter service.
 // All implementations must embed UnimplementedMessageCenterServer
 // for forward compatibility
@@ -216,8 +205,6 @@ type MessageCenterServer interface {
 	GroupChat(context.Context, *MessageSaveReq) (*CommonReq, error)
 	// 1v1会话职位
 	OneUserPosition(context.Context, *OneUserPositionReq) (*OneUserPositionResp, error)
-	// 群公告提醒
-	GroupAnnouncementReminder(context.Context, *GroupAnnouncementReminderReq) (*GroupAnnouncementReminderResp, error)
 	mustEmbedUnimplementedMessageCenterServer()
 }
 
@@ -264,9 +251,6 @@ func (UnimplementedMessageCenterServer) GroupChat(context.Context, *MessageSaveR
 func (UnimplementedMessageCenterServer) OneUserPosition(context.Context, *OneUserPositionReq) (*OneUserPositionResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method OneUserPosition not implemented")
 }
-func (UnimplementedMessageCenterServer) GroupAnnouncementReminder(context.Context, *GroupAnnouncementReminderReq) (*GroupAnnouncementReminderResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GroupAnnouncementReminder not implemented")
-}
 func (UnimplementedMessageCenterServer) mustEmbedUnimplementedMessageCenterServer() {}
 
 // UnsafeMessageCenterServer may be embedded to opt out of forward compatibility for this service.
@@ -514,24 +498,6 @@ func _MessageCenter_OneUserPosition_Handler(srv interface{}, ctx context.Context
 	return interceptor(ctx, in, info, handler)
 }
 
-func _MessageCenter_GroupAnnouncementReminder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GroupAnnouncementReminderReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageCenterServer).GroupAnnouncementReminder(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/messagecenter.messageCenter/GroupAnnouncementReminder",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageCenterServer).GroupAnnouncementReminder(ctx, req.(*GroupAnnouncementReminderReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // MessageCenter_ServiceDesc is the grpc.ServiceDesc for MessageCenter service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -591,10 +557,6 @@ var MessageCenter_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "OneUserPosition",
 			Handler:    _MessageCenter_OneUserPosition_Handler,
 		},
-		{
-			MethodName: "GroupAnnouncementReminder",
-			Handler:    _MessageCenter_GroupAnnouncementReminder_Handler,
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "messagecenter.proto",

+ 0 - 12
service/message_mail_box.go

@@ -1247,15 +1247,3 @@ func GetUserAllPosition(baseUserId int64) (positionStr string) {
 	}
 	return positionStr
 }
-
-func GroupAnnouncementReminder(in *messagecenter.GroupAnnouncementReminderReq) int64 {
-	//查询用户所有的职位id
-	data := IC.BaseMysql.SelectBySql(fmt.Sprintf("SELECT count(1) FROM socialize_chat_group_person a INNER JOIN socialize_chat_group_notice b on a.position_id =%d AND a.chat_group_id = %d AND nottice_tip =1 AND a.chat_group_id = b.chat_group_id ", in.PositionId, in.GroupId))
-	if data != nil && len(*data) > 0 {
-		if quitl.IntAll((*data)[0]["count"]) > 0 {
-			IC.BaseMysql.Update(util.SOCIALIZE_CHAT_GROUP_PERSON, map[string]interface{}{"position_id": in.PositionId, "chat_group_id": in.GroupId}, map[string]interface{}{"nottice_tip": 0})
-			return 1
-		}
-	}
-	return 0
-}