合并代码

rpc/internal/server/messageserver.go

@@ -46,31 +46,13 @@ func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsg
 	return l.FindUserMsg(in)
 }
 
-//   查询指定用户指定分类的未读消息合计
-func (s *MessageServer) GetClassUnreadCount(ctx context.Context, in *message.GetClassUnreadCountReq) (*message.GetUnreadCountResponse, error) {
-	l := logic.NewGetClassUnreadCountLogic(ctx, s.svcCtx)
-	return l.GetClassUnreadCount(in)
-}
-
-//   获取指定用户指定分类的最新一条消息
-func (s *MessageServer) GetLastMessage(ctx context.Context, in *message.GetLastMessageReq) (*message.GetLastMessageRes, error) {
-	l := logic.NewGetLastMessageLogic(ctx, s.svcCtx)
-	return l.GetLastMessage(in)
-}
-
 // 查看详细详情
 func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.MessageDetailReq) (*message.MessageDetailResp, error) {
 	l := logic.NewFindMessageDetailLogic(ctx, s.svcCtx)
 	return l.FindMessageDetail(in)
 }
 
-//   获取指定用户的分类及未读消息数量
-func (s *MessageServer) GetUnreadClassCount(ctx context.Context, in *message.GetUnreadClassCountReq) (*message.GetUnreadClassCountRes, error) {
-	l := logic.NewGetUnreadClassCountLogic(ctx, s.svcCtx)
-	return l.GetUnreadClassCount(in)
-}
-
-//   获取指定用户收到消息的分类
+//   消息的分类
 func (s *MessageServer) GetMsgType(ctx context.Context, in *message.GetMsgTypeReq) (*message.GetMsgTypeRes, error) {
 	l := logic.NewGetMsgTypeLogic(ctx, s.svcCtx)
 	return l.GetMsgType(in)
@@ -94,10 +76,16 @@ func (s *MessageServer) UserMsgList(ctx context.Context, in *message.UserMsgList
 	return l.UserMsgList(in)
 }
 
-//   发送微信模版消息
-func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message.WxTmplMsg) (*message.Response, error) {
-	l := logic.NewSendWxTmplMsgLogic(ctx, s.svcCtx)
-	return l.SendWxTmplMsg(in)
+//   发送剑鱼学堂微信模版消息
+func (s *MessageServer) SendWxTmplJySchoolMsg(ctx context.Context, in *message.JySchoolMsg) (*message.SendMsgResponse, error) {
+	l := logic.NewSendWxTmplJySchoolMsgLogic(ctx, s.svcCtx)
+	return l.SendWxTmplJySchoolMsg(in)
+}
+
+//   发送剑鱼系统通用模版消息
+func (s *MessageServer) SendWxTmplSystemDefaultMsg(ctx context.Context, in *message.SystemDefaultMsg) (*message.SendMsgResponse, error) {
+	l := logic.NewSendWxTmplSystemDefaultMsgLogic(ctx, s.svcCtx)
+	return l.SendWxTmplSystemDefaultMsg(in)
 }
 
 //    官网、移动端首页、工作桌面消息滚动

rpc/messageclient/message.go

@@ -21,22 +21,21 @@ type (
 	FindUserBuoyMsgRes     = message.FindUserBuoyMsgRes
 	FindUserMsgReq         = message.FindUserMsgReq
 	FindUserMsgRes         = message.FindUserMsgRes
-	GetClassUnreadCountReq = message.GetClassUnreadCountReq
-	GetLastMessageReq      = message.GetLastMessageReq
-	GetLastMessageRes      = message.GetLastMessageRes
 	GetMsgTypeReq          = message.GetMsgTypeReq
 	GetMsgTypeRes          = message.GetMsgTypeRes
-	GetUnreadClassCountReq = message.GetUnreadClassCountReq
-	GetUnreadClassCountRes = message.GetUnreadClassCountRes
 	GetUnreadCountRequest  = message.GetUnreadCountRequest
 	GetUnreadCountResponse = message.GetUnreadCountResponse
+	JySchoolMsg            = message.JySchoolMsg
 	MessageDetailReq       = message.MessageDetailReq
 	MessageDetailResp      = message.MessageDetailResp
 	Messages               = message.Messages
+	MsgTypes               = message.MsgTypes
 	MultipleSaveMsgReq     = message.MultipleSaveMsgReq
 	MultipleSaveMsgResp    = message.MultipleSaveMsgResp
 	ResCount               = message.ResCount
 	Response               = message.Response
+	SendMsgResponse        = message.SendMsgResponse
+	SystemDefaultMsg       = message.SystemDefaultMsg
 	User                   = message.User
 	UserMsgList            = message.UserMsgList
 	UserMsgListReq         = message.UserMsgListReq
@@ -55,15 +54,9 @@ type (
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 		//   查询指定用户的历史消息记录
 		FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-		//   查询指定用户指定分类的未读消息合计
-		GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-		//   获取指定用户指定分类的最新一条消息
-		GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
 		// 查看详细详情
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-		//   获取指定用户的分类及未读消息数量
-		GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
-		//   获取指定用户收到消息的分类
+		//   消息的分类
 		GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
 		//   查询指定用户的浮标消息
 		FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
@@ -71,8 +64,10 @@ type (
 		ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
 		//    new用户消息列表
 		UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error)
-		//   发送微信模版消息
-		SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error)
+		//   发送剑鱼学堂微信模版消息
+		SendWxTmplJySchoolMsg(ctx context.Context, in *JySchoolMsg, opts ...grpc.CallOption) (*SendMsgResponse, error)
+		//   发送剑鱼系统通用模版消息
+		SendWxTmplSystemDefaultMsg(ctx context.Context, in *SystemDefaultMsg, opts ...grpc.CallOption) (*SendMsgResponse, error)
 		//    官网、移动端首页、工作桌面消息滚动
 		UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
 	}
@@ -112,31 +107,13 @@ func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq, op
 	return client.FindUserMsg(ctx, in, opts...)
 }
 
-//   查询指定用户指定分类的未读消息合计
-func (m *defaultMessage) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetClassUnreadCount(ctx, in, opts...)
-}
-
-//   获取指定用户指定分类的最新一条消息
-func (m *defaultMessage) GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetLastMessage(ctx, in, opts...)
-}
-
 // 查看详细详情
 func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindMessageDetail(ctx, in, opts...)
 }
 
-//   获取指定用户的分类及未读消息数量
-func (m *defaultMessage) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
-	client := message.NewMessageClient(m.cli.Conn())
-	return client.GetUnreadClassCount(ctx, in, opts...)
-}
-
-//   获取指定用户收到消息的分类
+//   消息的分类
 func (m *defaultMessage) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetMsgType(ctx, in, opts...)
@@ -160,10 +137,16 @@ func (m *defaultMessage) UserMsgList(ctx context.Context, in *UserMsgListReq, op
 	return client.UserMsgList(ctx, in, opts...)
 }
 
-//   发送微信模版消息
-func (m *defaultMessage) SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error) {
+//   发送剑鱼学堂微信模版消息
+func (m *defaultMessage) SendWxTmplJySchoolMsg(ctx context.Context, in *JySchoolMsg, opts ...grpc.CallOption) (*SendMsgResponse, error) {
+	client := message.NewMessageClient(m.cli.Conn())
+	return client.SendWxTmplJySchoolMsg(ctx, in, opts...)
+}
+
+//   发送剑鱼系统通用模版消息
+func (m *defaultMessage) SendWxTmplSystemDefaultMsg(ctx context.Context, in *SystemDefaultMsg, opts ...grpc.CallOption) (*SendMsgResponse, error) {
 	client := message.NewMessageClient(m.cli.Conn())
-	return client.SendWxTmplMsg(ctx, in, opts...)
+	return client.SendWxTmplSystemDefaultMsg(ctx, in, opts...)
 }
 
 //    官网、移动端首页、工作桌面消息滚动

rpc/type/message/message_grpc.pb.go

@@ -30,15 +30,9 @@ type MessageClient interface {
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
 	FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-	//  查询指定用户指定分类的未读消息合计
-	GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-	//  获取指定用户指定分类的最新一条消息
-	GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error)
 	//查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-	//  获取指定用户的分类及未读消息数量
-	GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error)
-	//  获取指定用户收到消息的分类
+	//  消息的分类
 	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
@@ -46,8 +40,10 @@ type MessageClient interface {
 	ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
 	//   new用户消息列表
 	UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error)
-	//  发送微信模版消息
-	SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error)
+	//  发送剑鱼学堂微信模版消息
+	SendWxTmplJySchoolMsg(ctx context.Context, in *JySchoolMsg, opts ...grpc.CallOption) (*SendMsgResponse, error)
+	//  发送剑鱼系统通用模版消息
+	SendWxTmplSystemDefaultMsg(ctx context.Context, in *SystemDefaultMsg, opts ...grpc.CallOption) (*SendMsgResponse, error)
 	//   官网、移动端首页、工作桌面消息滚动
 	UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
 }
@@ -96,24 +92,6 @@ func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opt
 	return out, nil
 }
 
-func (c *messageClient) GetClassUnreadCount(ctx context.Context, in *GetClassUnreadCountReq, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
-	out := new(GetUnreadCountResponse)
-	err := c.cc.Invoke(ctx, "/message.Message/GetClassUnreadCount", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *messageClient) GetLastMessage(ctx context.Context, in *GetLastMessageReq, opts ...grpc.CallOption) (*GetLastMessageRes, error) {
-	out := new(GetLastMessageRes)
-	err := c.cc.Invoke(ctx, "/message.Message/GetLastMessage", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error) {
 	out := new(MessageDetailResp)
 	err := c.cc.Invoke(ctx, "/message.Message/FindMessageDetail", in, out, opts...)
@@ -123,15 +101,6 @@ func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetail
 	return out, nil
 }
 
-func (c *messageClient) GetUnreadClassCount(ctx context.Context, in *GetUnreadClassCountReq, opts ...grpc.CallOption) (*GetUnreadClassCountRes, error) {
-	out := new(GetUnreadClassCountRes)
-	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadClassCount", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error) {
 	out := new(GetMsgTypeRes)
 	err := c.cc.Invoke(ctx, "/message.Message/GetMsgType", in, out, opts...)
@@ -168,9 +137,18 @@ func (c *messageClient) UserMsgList(ctx context.Context, in *UserMsgListReq, opt
 	return out, nil
 }
 
-func (c *messageClient) SendWxTmplMsg(ctx context.Context, in *WxTmplMsg, opts ...grpc.CallOption) (*Response, error) {
-	out := new(Response)
-	err := c.cc.Invoke(ctx, "/message.Message/SendWxTmplMsg", in, out, opts...)
+func (c *messageClient) SendWxTmplJySchoolMsg(ctx context.Context, in *JySchoolMsg, opts ...grpc.CallOption) (*SendMsgResponse, error) {
+	out := new(SendMsgResponse)
+	err := c.cc.Invoke(ctx, "/message.Message/SendWxTmplJySchoolMsg", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *messageClient) SendWxTmplSystemDefaultMsg(ctx context.Context, in *SystemDefaultMsg, opts ...grpc.CallOption) (*SendMsgResponse, error) {
+	out := new(SendMsgResponse)
+	err := c.cc.Invoke(ctx, "/message.Message/SendWxTmplSystemDefaultMsg", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -198,15 +176,9 @@ type MessageServer interface {
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
 	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
-	//  查询指定用户指定分类的未读消息合计
-	GetClassUnreadCount(context.Context, *GetClassUnreadCountReq) (*GetUnreadCountResponse, error)
-	//  获取指定用户指定分类的最新一条消息
-	GetLastMessage(context.Context, *GetLastMessageReq) (*GetLastMessageRes, error)
 	//查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
-	//  获取指定用户的分类及未读消息数量
-	GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error)
-	//  获取指定用户收到消息的分类
+	//  消息的分类
 	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error)
@@ -214,8 +186,10 @@ type MessageServer interface {
 	ClearUnreadMsg(context.Context, *ClearUnreadMsgReq) (*Response, error)
 	//   new用户消息列表
 	UserMsgList(context.Context, *UserMsgListReq) (*UserMsgListRes, error)
-	//  发送微信模版消息
-	SendWxTmplMsg(context.Context, *WxTmplMsg) (*Response, error)
+	//  发送剑鱼学堂微信模版消息
+	SendWxTmplJySchoolMsg(context.Context, *JySchoolMsg) (*SendMsgResponse, error)
+	//  发送剑鱼系统通用模版消息
+	SendWxTmplSystemDefaultMsg(context.Context, *SystemDefaultMsg) (*SendMsgResponse, error)
 	//   官网、移动端首页、工作桌面消息滚动
 	UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error)
 	mustEmbedUnimplementedMessageServer()
@@ -237,18 +211,9 @@ func (UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCoun
 func (UnimplementedMessageServer) FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserMsg not implemented")
 }
-func (UnimplementedMessageServer) GetClassUnreadCount(context.Context, *GetClassUnreadCountReq) (*GetUnreadCountResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetClassUnreadCount not implemented")
-}
-func (UnimplementedMessageServer) GetLastMessage(context.Context, *GetLastMessageReq) (*GetLastMessageRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetLastMessage not implemented")
-}
 func (UnimplementedMessageServer) FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMessageDetail not implemented")
 }
-func (UnimplementedMessageServer) GetUnreadClassCount(context.Context, *GetUnreadClassCountReq) (*GetUnreadClassCountRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadClassCount not implemented")
-}
 func (UnimplementedMessageServer) GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetMsgType not implemented")
 }
@@ -261,8 +226,11 @@ func (UnimplementedMessageServer) ClearUnreadMsg(context.Context, *ClearUnreadMs
 func (UnimplementedMessageServer) UserMsgList(context.Context, *UserMsgListReq) (*UserMsgListRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserMsgList not implemented")
 }
-func (UnimplementedMessageServer) SendWxTmplMsg(context.Context, *WxTmplMsg) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SendWxTmplMsg not implemented")
+func (UnimplementedMessageServer) SendWxTmplJySchoolMsg(context.Context, *JySchoolMsg) (*SendMsgResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SendWxTmplJySchoolMsg not implemented")
+}
+func (UnimplementedMessageServer) SendWxTmplSystemDefaultMsg(context.Context, *SystemDefaultMsg) (*SendMsgResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SendWxTmplSystemDefaultMsg not implemented")
 }
 func (UnimplementedMessageServer) UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UserUnreadMsgList not implemented")
@@ -352,42 +320,6 @@ func _Message_FindUserMsg_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_GetClassUnreadCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetClassUnreadCountReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetClassUnreadCount(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetClassUnreadCount",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetClassUnreadCount(ctx, req.(*GetClassUnreadCountReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Message_GetLastMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetLastMessageReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetLastMessage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetLastMessage",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetLastMessage(ctx, req.(*GetLastMessageReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(MessageDetailReq)
 	if err := dec(in); err != nil {
@@ -406,24 +338,6 @@ func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_GetUnreadClassCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetUnreadClassCountReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetUnreadClassCount(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetUnreadClassCount",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetUnreadClassCount(ctx, req.(*GetUnreadClassCountReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_GetMsgType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetMsgTypeReq)
 	if err := dec(in); err != nil {
@@ -496,20 +410,38 @@ func _Message_UserMsgList_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_SendWxTmplMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(WxTmplMsg)
+func _Message_SendWxTmplJySchoolMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(JySchoolMsg)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MessageServer).SendWxTmplJySchoolMsg(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/message.Message/SendWxTmplJySchoolMsg",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MessageServer).SendWxTmplJySchoolMsg(ctx, req.(*JySchoolMsg))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Message_SendWxTmplSystemDefaultMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SystemDefaultMsg)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(MessageServer).SendWxTmplMsg(ctx, in)
+		return srv.(MessageServer).SendWxTmplSystemDefaultMsg(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/SendWxTmplMsg",
+		FullMethod: "/message.Message/SendWxTmplSystemDefaultMsg",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).SendWxTmplMsg(ctx, req.(*WxTmplMsg))
+		return srv.(MessageServer).SendWxTmplSystemDefaultMsg(ctx, req.(*SystemDefaultMsg))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -555,22 +487,10 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindUserMsg",
 			Handler:    _Message_FindUserMsg_Handler,
 		},
-		{
-			MethodName: "GetClassUnreadCount",
-			Handler:    _Message_GetClassUnreadCount_Handler,
-		},
-		{
-			MethodName: "GetLastMessage",
-			Handler:    _Message_GetLastMessage_Handler,
-		},
 		{
 			MethodName: "FindMessageDetail",
 			Handler:    _Message_FindMessageDetail_Handler,
 		},
-		{
-			MethodName: "GetUnreadClassCount",
-			Handler:    _Message_GetUnreadClassCount_Handler,
-		},
 		{
 			MethodName: "GetMsgType",
 			Handler:    _Message_GetMsgType_Handler,
@@ -588,8 +508,12 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _Message_UserMsgList_Handler,
 		},
 		{
-			MethodName: "SendWxTmplMsg",
-			Handler:    _Message_SendWxTmplMsg_Handler,
+			MethodName: "SendWxTmplJySchoolMsg",
+			Handler:    _Message_SendWxTmplJySchoolMsg_Handler,
+		},
+		{
+			MethodName: "SendWxTmplSystemDefaultMsg",
+			Handler:    _Message_SendWxTmplSystemDefaultMsg_Handler,
 		},
 		{
 			MethodName: "UserUnreadMsgList",