wip:微信模版消息发送api提交

api/internal/handler/routes.go

@@ -57,6 +57,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/unreadMessages",
 				Handler: UnreadMessagesHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/messageCenter/sendWxTmplMsg",
+				Handler: SendWxTmplMsgHandler(serverCtx),
+			},
 		},
 	)
 }

api/internal/types/types.go

@@ -132,3 +132,19 @@ type UnreadMessageResp struct {
 	Data    []map[string]interface{} `json:"data"`
 	Total   int64                    `json:"total"`
 }
+
+type WxTmplMessageReq struct {
+	UserIds     string `json:"userIds,optional"`     // 用户id如果是多个就逗号分割
+	PositionIds string `json:"positionIds,optional"` //用户职位id
+	Title       string `json:"title"`
+	Date        string `json:"date"`
+	Detail      string `json:"detail"`
+	Class       string `json:"class"`
+	Url         string `json:"url"`
+}
+
+type WxTmplMessageResponse struct {
+	Code    int64  `json:"code"`
+	Total   int64  `json:"total"`
+	Message string `json:"message"`
+}

api/message.api

@@ -133,6 +133,22 @@ type UnreadMessageResp {
 	Total   int64                    `json:"total"`
 }
 
+type WxTmplMessageReq {
+	UserIds     string `json:"userIds,optional"`     // 用户id如果是多个就逗号分割
+	PositionIds string `json:"positionIds,optional"` //用户职位id
+	Title       string `json:"title"`
+	Date        string `json:"date"`
+	Detail      string `json:"detail"`
+	Class       string `json:"class"`
+	Url         string `json:"url"`
+}
+
+type WxTmplMessageResponse {
+	Code    int64  `json:"code"`
+	Total   int64  `json:"total"`
+	Message string `json:"message"`
+}
+
 service message-api {
 	
 	//查询消息详情
@@ -165,4 +181,8 @@ service message-api {
 	
 	@handler UnreadMessages
 	post /messageCenter/unreadMessages (UnreadMessageReq) returns (UnreadMessageResp)
+	
+	// 发送微信模版消息
+	@handler SendWxTmplMsg
+	post /messageCenter/sendWxTmplMsg (WxTmplMessageReq) returns (WxTmplMessageResponse)
 }

rpc/internal/common/sendWxTmplMsg.go

@@ -39,6 +39,13 @@ func MessageType() (func() map[string]string, []map[string]interface{}) {
 	}, data
 }
 
+type WxConfig struct {
+	Name      string //信息名称
+	Switch    string //开关
+	tmplId    string //微信模版id
+	tmplValue string //微信模版
+}
+
 var AllMsgType func() map[string]string
 
 var getSendTotalRedisKey = func(uFlag ...string) string {

rpc/internal/logic/sendwxtmpljyschoolmsglogic.go

@@ -50,7 +50,7 @@ func (l *SendWxTmplJySchoolMsgLogic) SendWxTmplJySchoolMsg(in *message.JySchoolM
 					Value: in.Address,
 				},
 				"const11": &qrpc.TmplItem{
-					Value: in.Class,
+					Value: config.ConfigJson.WxTmplConfig.TmplSetting.CloseNotice,
 				},
 			}
 		})

rpc/internal/server/messageserver.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT!
+// Code generated by goctl. DO NOT EDIT.
 // Source: message.proto
 
 package server
@@ -28,19 +28,19 @@ func (s *MessageServer) MultipleSaveMsg(ctx context.Context, in *message.Multipl
 	return l.MultipleSaveMsg(in)
 }
 
-//  修改消息阅读状态
+// 修改消息阅读状态
 func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message.ChangeReadStatusReq) (*message.Response, error) {
 	l := logic.NewChangeReadStatusLogic(ctx, s.svcCtx)
 	return l.ChangeReadStatus(in)
 }
 
-//   查询指定用户未读消息合计
+// 查询指定用户未读消息合计
 func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message.GetUnreadCountRequest) (*message.GetUnreadCountResponse, error) {
 	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)
 	return l.GetUnreadCount(in)
 }
 
-//   查询指定用户的历史消息记录
+// 查询指定用户的历史消息记录
 func (s *MessageServer) FindUserMsg(ctx context.Context, in *message.FindUserMsgReq) (*message.FindUserMsgRes, error) {
 	l := logic.NewFindUserMsgLogic(ctx, s.svcCtx)
 	return l.FindUserMsg(in)
@@ -52,43 +52,37 @@ func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.Messa
 	return l.FindMessageDetail(in)
 }
 
-//   消息的分类
+// 消息的分类
 func (s *MessageServer) GetMsgType(ctx context.Context, in *message.GetMsgTypeReq) (*message.GetMsgTypeRes, error) {
 	l := logic.NewGetMsgTypeLogic(ctx, s.svcCtx)
 	return l.GetMsgType(in)
 }
 
-//   查询指定用户的浮标消息
+// 查询指定用户的浮标消息
 func (s *MessageServer) FindUserBuoyMsg(ctx context.Context, in *message.FindUserBuoyMsgReq) (*message.FindUserBuoyMsgRes, error) {
 	l := logic.NewFindUserBuoyMsgLogic(ctx, s.svcCtx)
 	return l.FindUserBuoyMsg(in)
 }
 
-//    一键清空未读消息
+// 一键清空未读消息
 func (s *MessageServer) ClearUnreadMsg(ctx context.Context, in *message.ClearUnreadMsgReq) (*message.Response, error) {
 	l := logic.NewClearUnreadMsgLogic(ctx, s.svcCtx)
 	return l.ClearUnreadMsg(in)
 }
 
-//    new用户消息列表
+// new用户消息列表
 func (s *MessageServer) UserMsgList(ctx context.Context, in *message.UserMsgListReq) (*message.UserMsgListRes, error) {
 	l := logic.NewUserMsgListLogic(ctx, s.svcCtx)
 	return l.UserMsgList(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)
 }
 
-//    官网、移动端首页、工作桌面消息滚动
+// 官网、移动端首页、工作桌面消息滚动
 func (s *MessageServer) UserUnreadMsgList(ctx context.Context, in *message.UserUnreadMsgListReq) (*message.UserUnreadMsgListRes, error) {
 	l := logic.NewUserUnreadMsgListLogic(ctx, s.svcCtx)
 	return l.UserUnreadMsgList(in)

rpc/message.proto

@@ -64,6 +64,12 @@ message FindUserMsgRes {
     int64 count = 4; //总数
 }
 
+message GetClassUnreadCountReq {
+    string userId = 1; // 用户id
+    int64 msgType = 2; //分类 1：客服   2：系统通知  3：营销   4：用户会话
+    string appid = 3; //应用标识
+}
+
 //查看消息内容
 message MessageDetailReq {
     string id = 1; //消息id
@@ -73,6 +79,29 @@ message MessageDetailResp {
     string message = 2; //响应消息
     Messages data = 3; //
 }
+message GetLastMessageReq {
+    string userId = 1; // 用户id
+    int64 msgType = 2; //分类 1：客服   2：系统通知  3：营销   4：用户会话
+    string appid = 3; //应用标识
+    int64 isRead = 4; // 0：未读  1：已读  -1 不区分
+}
+message GetLastMessageRes {
+    int64 code = 1; //状态码
+    string message = 2; //响应消息
+    Messages data = 3; //
+}
+// 获取用户分类的的未读消息分类及数量 及分类下最新的消息
+message GetUnreadClassCountReq {
+    string userId = 1; // 用户id
+    string appid = 2; //应用标识
+    bool needMsg = 3; //是否需要分类下的最新一条消息
+}
+message GetUnreadClassCountRes {
+    int64 code = 1; //状态码
+    string message = 2; //响应消息
+    repeated ResCount data = 3; //
+    repeated Messages info = 4; // 每个类型最新消息列表
+}
 message GetMsgTypeReq {
     string userId = 1; // 用户id
     string appid = 2; //应用标识
@@ -87,7 +116,7 @@ message MsgTypes{
 message GetMsgTypeRes {
     int64 code = 1; //状态码
     string message = 2; //响应消息
-    repeated MsgTypes data = 3; //
+    repeated int64 data = 3; //
 }
 
 message user {
@@ -178,18 +207,6 @@ message UserMsgList {
     int64 unread = 4; //未读总数
 }
 
-
-// 发送微信模版消息
-message WxTmplMsg {
-    string appid = 1;     //应用标识
-    string userIds = 2;   //接受人 mongo_userId(多个用,分割)
-    string openIds = 3;    //接受人 openid(多个用,分割)
-    string positionIds = 4; //接受人 职位id
-    string url = 5;       //消息跳转连接
-    int64 msgType = 6;    //信息类型 附件、图片、链接类型
-    string tmplId = 7;     //消息模版id 根据此字段判断发送模版
-}
-
 message AllSortData {
     int64 unreadMessages =1 ;
    string name =2;
@@ -224,8 +241,7 @@ message JySchoolMsg {
   string title = 2;    //课程名称
   string date = 3;     //课程时间
   string address = 4;  //课程地点
-  string class = 5 ;   //课程类型
-  string url = 6;      //消息跳转连接
+  string url = 5;      //消息跳转连接
 }
 
 // 剑鱼系统通用模版
@@ -265,10 +281,10 @@ service Message {
 
     //   new用户消息列表
     rpc UserMsgList (UserMsgListReq) returns (UserMsgListRes);
-  //  发送剑鱼学堂微信模版消息
-  rpc SendWxTmplJySchoolMsg (JySchoolMsg) returns(SendMsgResponse);
-  //  发送剑鱼系统通用模版消息
-  rpc SendWxTmplSystemDefaultMsg (SystemDefaultMsg) returns(SendMsgResponse);
+    //  发送剑鱼学堂微信模版消息
+    // rpc SendWxTmplJySchoolMsg (JySchoolMsg) returns(SendMsgResponse);
+    //  发送剑鱼系统通用模版消息
+    rpc SendWxTmplSystemDefaultMsg (SystemDefaultMsg) returns(SendMsgResponse);
     //   官网、移动端首页、工作桌面消息滚动
     rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
 }

rpc/messageclient/message.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT!
+// Code generated by goctl. DO NOT EDIT.
 // Source: message.proto
 
 package messageclient
@@ -21,8 +21,13 @@ 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
@@ -42,33 +47,30 @@ type (
 	UserMsgListRes         = message.UserMsgListRes
 	UserUnreadMsgListReq   = message.UserUnreadMsgListReq
 	UserUnreadMsgListRes   = message.UserUnreadMsgListRes
-	WxTmplMsg              = message.WxTmplMsg
 	WxTmplResponse         = message.WxTmplResponse
 
 	Message interface {
 		// 批量保存消息
 		MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
-		//  修改消息阅读状态
+		// 修改消息阅读状态
 		ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-		//   查询指定用户未读消息合计
+		// 查询指定用户未读消息合计
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-		//   查询指定用户的历史消息记录
+		// 查询指定用户的历史消息记录
 		FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
 		// 查看详细详情
 		FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-		//   消息的分类
+		// 消息的分类
 		GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
-		//   查询指定用户的浮标消息
+		// 查询指定用户的浮标消息
 		FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
-		//    一键清空未读消息
+		// 一键清空未读消息
 		ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
-		//    new用户消息列表
+		// new用户消息列表
 		UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, 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)
 	}
 
@@ -89,19 +91,19 @@ func (m *defaultMessage) MultipleSaveMsg(ctx context.Context, in *MultipleSaveMs
 	return client.MultipleSaveMsg(ctx, in, opts...)
 }
 
-//  修改消息阅读状态
+// 修改消息阅读状态
 func (m *defaultMessage) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.ChangeReadStatus(ctx, in, opts...)
 }
 
-//   查询指定用户未读消息合计
+// 查询指定用户未读消息合计
 func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.GetUnreadCount(ctx, in, opts...)
 }
 
-//   查询指定用户的历史消息记录
+// 查询指定用户的历史消息记录
 func (m *defaultMessage) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindUserMsg(ctx, in, opts...)
@@ -113,43 +115,37 @@ func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetai
 	return client.FindMessageDetail(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...)
 }
 
-//   查询指定用户的浮标消息
+// 查询指定用户的浮标消息
 func (m *defaultMessage) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.FindUserBuoyMsg(ctx, in, opts...)
 }
 
-//    一键清空未读消息
+// 一键清空未读消息
 func (m *defaultMessage) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.ClearUnreadMsg(ctx, in, opts...)
 }
 
-//    new用户消息列表
+// new用户消息列表
 func (m *defaultMessage) UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.UserMsgList(ctx, in, opts...)
 }
 
-//   发送剑鱼学堂微信模版消息
-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.SendWxTmplSystemDefaultMsg(ctx, in, opts...)
 }
 
-//    官网、移动端首页、工作桌面消息滚动
+// 官网、移动端首页、工作桌面消息滚动
 func (m *defaultMessage) UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.UserUnreadMsgList(ctx, in, opts...)

rpc/type/message/message_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.19.4
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             v3.21.12
 // source: message.proto
 
 package message
@@ -18,33 +18,49 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
+const (
+	Message_MultipleSaveMsg_FullMethodName            = "/message.Message/multipleSaveMsg"
+	Message_ChangeReadStatus_FullMethodName           = "/message.Message/ChangeReadStatus"
+	Message_GetUnreadCount_FullMethodName             = "/message.Message/GetUnreadCount"
+	Message_FindUserMsg_FullMethodName                = "/message.Message/FindUserMsg"
+	Message_FindMessageDetail_FullMethodName          = "/message.Message/FindMessageDetail"
+	Message_GetMsgType_FullMethodName                 = "/message.Message/GetMsgType"
+	Message_FindUserBuoyMsg_FullMethodName            = "/message.Message/FindUserBuoyMsg"
+	Message_ClearUnreadMsg_FullMethodName             = "/message.Message/ClearUnreadMsg"
+	Message_UserMsgList_FullMethodName                = "/message.Message/UserMsgList"
+	Message_SendWxTmplSystemDefaultMsg_FullMethodName = "/message.Message/SendWxTmplSystemDefaultMsg"
+	Message_UserUnreadMsgList_FullMethodName          = "/message.Message/UserUnreadMsgList"
+)
+
 // MessageClient is the client API for Message service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type MessageClient interface {
-	//批量保存消息
+	// 批量保存消息
 	MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-	//  查询指定用户未读消息合计
+	// 查询指定用户未读消息合计
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
-	//  查询指定用户的历史消息记录
+	// 查询指定用户的历史消息记录
 	FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error)
-	//查看详细详情
+	// 查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
-	//  消息的分类
+	// 消息的分类
 	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
-	//  查询指定用户的浮标消息
+	// 查询指定用户的浮标消息
 	FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
-	//   一键清空未读消息
+	// 一键清空未读消息
 	ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error)
-	//   new用户消息列表
+	// new用户消息列表
 	UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error)
-	//  发送剑鱼学堂微信模版消息
-	SendWxTmplJySchoolMsg(ctx context.Context, in *JySchoolMsg, opts ...grpc.CallOption) (*SendMsgResponse, error)
-	//  发送剑鱼系统通用模版消息
+	//	发送剑鱼学堂微信模版消息
+	//
+	// rpc SendWxTmplJySchoolMsg (JySchoolMsg) returns(SendMsgResponse);
+	//
+	//	发送剑鱼系统通用模版消息
 	SendWxTmplSystemDefaultMsg(ctx context.Context, in *SystemDefaultMsg, opts ...grpc.CallOption) (*SendMsgResponse, error)
-	//   官网、移动端首页、工作桌面消息滚动
+	// 官网、移动端首页、工作桌面消息滚动
 	UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
 }
 
@@ -58,7 +74,7 @@ func NewMessageClient(cc grpc.ClientConnInterface) MessageClient {
 
 func (c *messageClient) MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error) {
 	out := new(MultipleSaveMsgResp)
-	err := c.cc.Invoke(ctx, "/message.Message/multipleSaveMsg", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_MultipleSaveMsg_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +83,7 @@ func (c *messageClient) MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsg
 
 func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/message.Message/ChangeReadStatus", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_ChangeReadStatus_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -76,7 +92,7 @@ func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStat
 
 func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	out := new(GetUnreadCountResponse)
-	err := c.cc.Invoke(ctx, "/message.Message/GetUnreadCount", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_GetUnreadCount_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +101,7 @@ func (c *messageClient) GetUnreadCount(ctx context.Context, in *GetUnreadCountRe
 
 func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opts ...grpc.CallOption) (*FindUserMsgRes, error) {
 	out := new(FindUserMsgRes)
-	err := c.cc.Invoke(ctx, "/message.Message/FindUserMsg", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_FindUserMsg_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -94,7 +110,7 @@ func (c *messageClient) FindUserMsg(ctx context.Context, in *FindUserMsgReq, opt
 
 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...)
+	err := c.cc.Invoke(ctx, Message_FindMessageDetail_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -103,7 +119,7 @@ func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetail
 
 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...)
+	err := c.cc.Invoke(ctx, Message_GetMsgType_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -112,7 +128,7 @@ func (c *messageClient) GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts
 
 func (c *messageClient) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error) {
 	out := new(FindUserBuoyMsgRes)
-	err := c.cc.Invoke(ctx, "/message.Message/FindUserBuoyMsg", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_FindUserBuoyMsg_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -121,7 +137,7 @@ func (c *messageClient) FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsg
 
 func (c *messageClient) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgReq, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
-	err := c.cc.Invoke(ctx, "/message.Message/ClearUnreadMsg", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_ClearUnreadMsg_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -130,16 +146,7 @@ func (c *messageClient) ClearUnreadMsg(ctx context.Context, in *ClearUnreadMsgRe
 
 func (c *messageClient) UserMsgList(ctx context.Context, in *UserMsgListReq, opts ...grpc.CallOption) (*UserMsgListRes, error) {
 	out := new(UserMsgListRes)
-	err := c.cc.Invoke(ctx, "/message.Message/UserMsgList", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-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...)
+	err := c.cc.Invoke(ctx, Message_UserMsgList_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -148,7 +155,7 @@ func (c *messageClient) SendWxTmplJySchoolMsg(ctx context.Context, in *JySchoolM
 
 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...)
+	err := c.cc.Invoke(ctx, Message_SendWxTmplSystemDefaultMsg_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -157,7 +164,7 @@ func (c *messageClient) SendWxTmplSystemDefaultMsg(ctx context.Context, in *Syst
 
 func (c *messageClient) UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error) {
 	out := new(UserUnreadMsgListRes)
-	err := c.cc.Invoke(ctx, "/message.Message/UserUnreadMsgList", in, out, opts...)
+	err := c.cc.Invoke(ctx, Message_UserUnreadMsgList_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -168,29 +175,31 @@ func (c *messageClient) UserUnreadMsgList(ctx context.Context, in *UserUnreadMsg
 // All implementations must embed UnimplementedMessageServer
 // for forward compatibility
 type MessageServer interface {
-	//批量保存消息
+	// 批量保存消息
 	MultipleSaveMsg(context.Context, *MultipleSaveMsgReq) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error)
-	//  查询指定用户未读消息合计
+	// 查询指定用户未读消息合计
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
-	//  查询指定用户的历史消息记录
+	// 查询指定用户的历史消息记录
 	FindUserMsg(context.Context, *FindUserMsgReq) (*FindUserMsgRes, error)
-	//查看详细详情
+	// 查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
-	//  消息的分类
+	// 消息的分类
 	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
-	//  查询指定用户的浮标消息
+	// 查询指定用户的浮标消息
 	FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error)
-	//   一键清空未读消息
+	// 一键清空未读消息
 	ClearUnreadMsg(context.Context, *ClearUnreadMsgReq) (*Response, error)
-	//   new用户消息列表
+	// new用户消息列表
 	UserMsgList(context.Context, *UserMsgListReq) (*UserMsgListRes, error)
-	//  发送剑鱼学堂微信模版消息
-	SendWxTmplJySchoolMsg(context.Context, *JySchoolMsg) (*SendMsgResponse, error)
-	//  发送剑鱼系统通用模版消息
+	//	发送剑鱼学堂微信模版消息
+	//
+	// rpc SendWxTmplJySchoolMsg (JySchoolMsg) returns(SendMsgResponse);
+	//
+	//	发送剑鱼系统通用模版消息
 	SendWxTmplSystemDefaultMsg(context.Context, *SystemDefaultMsg) (*SendMsgResponse, error)
-	//   官网、移动端首页、工作桌面消息滚动
+	// 官网、移动端首页、工作桌面消息滚动
 	UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error)
 	mustEmbedUnimplementedMessageServer()
 }
@@ -226,9 +235,6 @@ 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) 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")
 }
@@ -258,7 +264,7 @@ func _Message_MultipleSaveMsg_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/multipleSaveMsg",
+		FullMethod: Message_MultipleSaveMsg_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).MultipleSaveMsg(ctx, req.(*MultipleSaveMsgReq))
@@ -276,7 +282,7 @@ func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/ChangeReadStatus",
+		FullMethod: Message_ChangeReadStatus_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).ChangeReadStatus(ctx, req.(*ChangeReadStatusReq))
@@ -294,7 +300,7 @@ func _Message_GetUnreadCount_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/GetUnreadCount",
+		FullMethod: Message_GetUnreadCount_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetUnreadCount(ctx, req.(*GetUnreadCountRequest))
@@ -312,7 +318,7 @@ func _Message_FindUserMsg_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/FindUserMsg",
+		FullMethod: Message_FindUserMsg_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).FindUserMsg(ctx, req.(*FindUserMsgReq))
@@ -330,7 +336,7 @@ func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/FindMessageDetail",
+		FullMethod: Message_FindMessageDetail_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).FindMessageDetail(ctx, req.(*MessageDetailReq))
@@ -348,7 +354,7 @@ func _Message_GetMsgType_Handler(srv interface{}, ctx context.Context, dec func(
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/GetMsgType",
+		FullMethod: Message_GetMsgType_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).GetMsgType(ctx, req.(*GetMsgTypeReq))
@@ -366,7 +372,7 @@ func _Message_FindUserBuoyMsg_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/FindUserBuoyMsg",
+		FullMethod: Message_FindUserBuoyMsg_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).FindUserBuoyMsg(ctx, req.(*FindUserBuoyMsgReq))
@@ -384,7 +390,7 @@ func _Message_ClearUnreadMsg_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/ClearUnreadMsg",
+		FullMethod: Message_ClearUnreadMsg_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).ClearUnreadMsg(ctx, req.(*ClearUnreadMsgReq))
@@ -402,7 +408,7 @@ func _Message_UserMsgList_Handler(srv interface{}, ctx context.Context, dec func
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/UserMsgList",
+		FullMethod: Message_UserMsgList_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).UserMsgList(ctx, req.(*UserMsgListReq))
@@ -410,24 +416,6 @@ func _Message_UserMsgList_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-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 {
@@ -438,7 +426,7 @@ func _Message_SendWxTmplSystemDefaultMsg_Handler(srv interface{}, ctx context.Co
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/SendWxTmplSystemDefaultMsg",
+		FullMethod: Message_SendWxTmplSystemDefaultMsg_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).SendWxTmplSystemDefaultMsg(ctx, req.(*SystemDefaultMsg))
@@ -456,7 +444,7 @@ func _Message_UserUnreadMsgList_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/message.Message/UserUnreadMsgList",
+		FullMethod: Message_UserUnreadMsgList_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(MessageServer).UserUnreadMsgList(ctx, req.(*UserUnreadMsgListReq))
@@ -507,10 +495,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UserMsgList",
 			Handler:    _Message_UserMsgList_Handler,
 		},
-		{
-			MethodName: "SendWxTmplJySchoolMsg",
-			Handler:    _Message_SendWxTmplJySchoolMsg_Handler,
-		},
 		{
 			MethodName: "SendWxTmplSystemDefaultMsg",
 			Handler:    _Message_SendWxTmplSystemDefaultMsg_Handler,