Merge branch 'dev/v1.2.12_rjj' of moapp/MessageCenter into feature/v1.2.12

api/internal/handler/getmsgtypehandler.go → api/internal/handler/bitmapsavemsghandler.go

@@ -9,16 +9,16 @@ import (
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func GetMsgTypeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func BitmapSaveMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.GetMsgTypeReq
+		var req types.BitmapSaveMsgReq
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.Error(w, err)
 			return
 		}
 
-		l := logic.NewGetMsgTypeLogic(r.Context(), svcCtx)
-		resp, err := l.GetMsgType(&req)
+		l := logic.NewBitmapSaveMsgLogic(r.Context(), svcCtx)
+		resp, err := l.BitmapSaveMsg(&req)
 		if err != nil {
 			httpx.Error(w, err)
 		} else {

api/internal/handler/unreadmessageshandler.go → api/internal/handler/newusersavemsghandler.go

@@ -9,16 +9,16 @@ import (
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func UnreadMessagesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func NewUserSaveMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.UnreadMessageReq
+		var req types.NewUserSaveMsgReq
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.Error(w, err)
 			return
 		}
 
-		l := logic.NewUnreadMessagesLogic(r.Context(), svcCtx)
-		resp, err := l.UnreadMessages(&req)
+		l := logic.NewNewUserSaveMsgLogic(r.Context(), svcCtx)
+		resp, err := l.NewUserSaveMsg(&req)
 		if err != nil {
 			httpx.Error(w, err)
 		} else {

api/internal/handler/routes.go

@@ -32,11 +32,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/messageDetail",
 				Handler: MessageDetailHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/getMsgType",
-				Handler: GetMsgTypeHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/messageCenter/markRead",
@@ -62,11 +57,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/MessageList",
 				Handler: MessageListHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/unreadMessages",
-				Handler: UnreadMessagesHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/messageCenter/sendWxTmplMsg",

api/internal/handler/updatemsgsummaryhandler.go

@@ -0,0 +1,28 @@
+package handler
+
+import (
+	"net/http"
+
+	"app.yhyue.com/moapp/MessageCenter/api/internal/logic"
+	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
+	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func UpdateMsgSummaryHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.UpdateMsgSummaryReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := logic.NewUpdateMsgSummaryLogic(r.Context(), svcCtx)
+		resp, err := l.UpdateMsgSummary(&req)
+		if err != nil {
+			httpx.Error(w, err)
+		} else {
+			httpx.OkJson(w, resp)
+		}
+	}
+}

api/internal/logic/getmsgtypelogic.go

@@ -1,48 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GetMsgTypeLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetMsgTypeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMsgTypeLogic {
-	return &GetMsgTypeLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetMsgTypeLogic) GetMsgType(req *types.GetMsgTypeReq) (resp *types.GetMsgTypeRes, err error) {
-	result := &types.GetMsgTypeRes{}
-	lsi := l.svcCtx.MessageCenter
-	res, err := lsi.GetMsgType(l.ctx, &messageclient.GetMsgTypeReq{
-		Appid:  req.AppId,
-		UserId: req.UserId,
-	})
-	if err != nil {
-		return nil, err
-	}
-	for _, val := range res.Data {
-		result.Data = append(result.Data, map[string]interface{}{
-			"msgType":         val.MsgType,
-			"name":            val.Name,
-			"code":            val.Code,
-			"displayPlatform": val.DisplayPlatform,
-			"img":             val.Img,
-		})
-	}
-	result.Code = res.Code
-	result.Message = res.Message
-	return result, nil
-}

api/internal/logic/unreadmessageslogic.go

@@ -1,58 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/api/internal/svc"
-	"app.yhyue.com/moapp/MessageCenter/api/internal/types"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type UnreadMessagesLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewUnreadMessagesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UnreadMessagesLogic {
-	return &UnreadMessagesLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *UnreadMessagesLogic) UnreadMessages(req *types.UnreadMessageReq) (resp *types.UnreadMessageResp, err error) {
-	result := &types.UnreadMessageResp{}
-	lsi := l.svcCtx.MessageCenter
-	res, err := lsi.UserUnreadMsgList(l.ctx, &messageclient.UserUnreadMsgListReq{
-		UserId:     req.UserId,
-		Appid:      req.AppId,
-		PageSize:   req.PageSize,
-		OffSet:     req.Offset,
-		IsNeedData: req.IsNeedData,
-	})
-	if err != nil {
-		return nil, err
-	}
-	if res.List != nil && len(res.List) > 0 {
-		for _, v := range res.List {
-			result.Data = append(result.Data, map[string]interface{}{
-				"id":         v.Id,
-				"appid":      v.Appid,
-				"createtime": v.Createtime,
-				"title":      v.Title,
-				"msg_type":   v.MsgType,
-				"link":       v.Link,
-				"content":    v.Content,
-				"isRead":     v.IsRead,
-				"msgLogId":   v.MsgLogId,
-				"url":        v.Url,
-			})
-		}
-	}
-	result.Code = res.Code
-	result.Message = res.Message
-	result.Total = res.Count
-	return result, nil
-}

api/internal/types/types.go

@@ -115,21 +115,6 @@ type MessageListResp struct {
 	RollingTiming int64                    `json:"rollingTiming"`
 }
 
-type UnreadMessageReq struct {
-	UserId     string `header:"mgoUserId"`
-	AppId      string `header:"appId"`
-	Offset     int64  `json:"offset"` //
-	PageSize   int64  `json:"pageSize"`
-	IsNeedData int64  `json:"isNeedData"` //是否需要未读消息数据 0 不需要  1 需要
-}
-
-type UnreadMessageResp struct {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	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

api/message.api

@@ -118,19 +118,19 @@ type MessageListResp {
 	Unread        int64                    `json:"unread"`
 	RollingTiming int64                    `json:"rollingTiming"`
 }
-type UnreadMessageReq {
-	UserId     string `header:"mgoUserId"`
-	AppId      string `header:"appId"`
-	Offset     int64  `json:"offset"` //
-	PageSize   int64  `json:"pageSize"`
-	IsNeedData int64  `json:"isNeedData"` //是否需要未读消息数据 0 不需要  1 需要
-}
-type UnreadMessageResp {
-	Code    int64                    `json:"code"`
-	Message string                   `json:"message"`
-	Data    []map[string]interface{} `json:"data"`
-	Total   int64                    `json:"total"`
-}
+//type UnreadMessageReq {
+//	UserId     string `header:"mgoUserId"`
+//	AppId      string `header:"appId"`
+//	Offset     int64  `json:"offset"` //
+//	PageSize   int64  `json:"pageSize"`
+//	IsNeedData int64  `json:"isNeedData"` //是否需要未读消息数据 0 不需要  1 需要
+//}
+//type UnreadMessageResp {
+//	Code    int64                    `json:"code"`
+//	Message string                   `json:"message"`
+//	Data    []map[string]interface{} `json:"data"`
+//	Total   int64                    `json:"total"`
+//}
 
 type WxTmplMessageReq {
 	UserIds     string `json:"userIds,optional"`     // 用户id如果是多个就逗号分割
@@ -189,8 +189,8 @@ service message-api {
 	@handler MessageDetailHandler
 	post /messageCenter/messageDetail (MessageDetailReq) returns (MessageDetailResp)
 	// 获取消息分类
-	@handler GetMsgTypeHandler
-	post /messageCenter/getMsgType (GetMsgTypeReq) returns (GetMsgTypeRes)
+	//	@handler GetMsgTypeHandler
+	//	post /messageCenter/getMsgType (GetMsgTypeReq) returns (GetMsgTypeRes)
 	// 标记为已读
 	@handler MarkReadHandler
 	post /messageCenter/markRead (MarkReadReq) returns (MarkReadRes)
@@ -211,8 +211,8 @@ service message-api {
 	post /messageCenter/MessageList (MessageListReq) returns (MessageListResp)
 	
 	//未读消息列表
-	@handler UnreadMessages
-	post /messageCenter/unreadMessages (UnreadMessageReq) returns (UnreadMessageResp)
+	//	@handler UnreadMessages
+	//	post /messageCenter/unreadMessages (UnreadMessageReq) returns (UnreadMessageResp)
 	
 	// 发送微信模版消息
 	@handler SendWxTmplMsg

rpc/etc/message.yaml

@@ -18,7 +18,7 @@ Mongodb:
   Collection:
   Collection_back:
 DataSource:
-    DbName: messageCenter
+    DbName: jianyu
     Address: 192.168.3.217:4000
     UserName: root
     PassWord: =PDT49#80Z!RVv52_z
@@ -31,7 +31,7 @@ BaseSource:
   PassWord: =PDT49#80Z!RVv52_z
   MaxOpenConns: 50
   MaxIdleConns: 50
-RedisAddr: "msgCount=192.168.3.149:1712"
+RedisAddr: "msgCount=192.168.3.149:1713"
 FileSystemConf:
   Etcd:
     Hosts:
@@ -66,7 +66,6 @@ WxTmplConfig:
 Tidb: "root:=PDT49#80Z!RVv52_z@tcp(192.168.3.217:4000)/messageCenter?charset=utf8mb4&parseTime=true&loc=Local"
 ClassSearchList: # 需要按照messageClass 查询的groupId
   - 11  # 待办 group id
-<<<<<<< HEAD
 Clickhouse:
   Addr: 192.168.3.207:19000
   UserName: jytop
@@ -75,6 +74,4 @@ Clickhouse:
   MaxIdleConns: 5
   MaxOpenConns: 30
 GlobMsgLoadTime: "0 0/5 * * * *"
-=======
 EquityInfoMsgType: 13 #营销权益消息需要特殊处理
->>>>>>> master

rpc/internal/common/bmService.go

@@ -1,79 +0,0 @@
-package common
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/entity"
-	"fmt"
-	"github.com/RoaringBitmap/roaring"
-	"sync"
-)
-
-var rwMutex sync.RWMutex
-
-// 将Roaring Bitmap写入MySQL
-func writeBitmapToSendLog(rb *roaring.Bitmap, msgLogId int64) error {
-	// 将Roaring Bitmap转换为字节数组
-	bytes, err := rb.ToBytes()
-	if err != nil {
-		return err
-	}
-	ok := entity.Mysql.Update("message_send_log", map[string]interface{}{"id": msgLogId}, map[string]interface{}{"baseUserIds": bytes})
-	if !ok {
-		return fmt.Errorf("更新message_user_summary msg_log_id: %s 出错", msgLogId)
-	}
-
-	return nil
-}
-
-// 从MySQL中读取Roaring Bitmap
-func readBitmapFromSendLog(msgLogId int64) (*roaring.Bitmap, error) {
-	// 从MySQL读取字节数组
-	var bytes []byte
-	err := entity.Mysql.DB.QueryRow("SELECT baseUserIds FROM message_send_log WHERE `id` = ?", msgLogId).Scan(&bytes)
-	if err != nil {
-		return nil, err
-	}
-
-	// 将字节数组转换为Roaring Bitmap
-	rb := roaring.NewBitmap()
-	_, err = rb.FromBuffer(bytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return rb, nil
-}
-
-// 更新用户消息汇总表
-func writeBitmapToUserSummary(rb *roaring.Bitmap, userId string) error {
-	allMsg, err := rb.ToBytes()
-	if err != nil {
-		return err
-	}
-	ok := entity.Mysql.Update("message_user_summary", map[string]interface{}{"userId": userId}, map[string]interface{}{
-		"allMsg": allMsg,
-	})
-	if !ok {
-		return fmt.Errorf("更新message_user_summary USERID: %s 出错", userId)
-	}
-	return nil
-}
-
-// 更新用户消息汇总表 -已读未读
-func UpdateBitmapToUserUnread(rb2 *roaring.Bitmap, userId string) error {
-	readMsg, err := rb2.ToBytes()
-	if err != nil {
-		return err
-	}
-	ok := entity.Mysql.Update("message_user_summary", map[string]interface{}{"userId": userId}, map[string]interface{}{
-		"readMsg": readMsg,
-	})
-	if !ok {
-		return fmt.Errorf("更新message_user_summary USERID: %s 出错", userId)
-	}
-	return nil
-}
-
-type MsgSummaryEntity struct {
-	GroupId int
-	Byte1   []byte
-}

rpc/internal/common/messageService.go

@@ -3,14 +3,11 @@ package common
 import (
 	"app.yhyue.com/moapp/MessageCenter/entity"
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
-	"app.yhyue.com/moapp/MessageCenter/util"
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/redis"
 	"context"
 	"errors"
 	"fmt"
-	"log"
-	"strings"
 	"time"
 )
 
@@ -38,39 +35,8 @@ func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRe
 	return nil
 }
 
-// 删除消息
-func (service *MessageService) DeleteMessage(id []string, appId string) (int64, string) {
-	orm := entity.Engine.NewSession()
-	defer orm.Close()
-	msg := entity.Mysql.FindOne("message", map[string]interface{}{"id": id, "appid": appId}, "", "")
-	if msg == nil {
-		return 0, "该消息不存在"
-	}
-	m := entity.Message{}
-	m.Isdel = -1
-	count, err := orm.Where("appid=?", appId).In("id", id).Cols("isdel").Update(&m)
-	if err != nil || count == 0 {
-		log.Println(err)
-		orm.Rollback()
-		return 0, "删除消息失败"
-	}
-	err2 := orm.Commit()
-	if err2 != nil {
-		return 0, "删除消息失败"
-	}
-	FindUserMsg(message.FindUserMsgReq{
-		UserId:   qutil.ObjToString((*msg)["receive_userid"]),
-		Appid:    appId,
-		OffSet:   1,
-		PageSize: 5,
-		MsgType:  -1,
-		Read:     0,
-	}, true)
-	return 1, "删除消息成功"
-}
-
 // 未读消息合计 isRedis 是否需要初始化redis
-func (service *MessageService) CountUnread(userId string, isRedis bool) (map[string]int64, int64) {
+/*func (service *MessageService) CountUnread(userId string, isRedis bool) (map[string]int64, int64) {
 	var (
 		count              int64
 		msgTypes, groupIds []string
@@ -138,7 +104,7 @@ func (service *MessageService) CountClassUnread(userId string, groupId int64) (c
 	}
 
 	return data, count
-}
+}*/
 
 // 查询消息详情
 func FindMessageDetail(id, msgLogId int64, userId string) (msg *map[string]interface{}, err error) {
@@ -151,7 +117,7 @@ func FindMessageDetail(id, msgLogId int64, userId string) (msg *map[string]inter
 }
 
 // GetMsgType 消息的分类
-func (service *MessageService) GetMsgType() (data []*message.MsgTypes, err error) {
+/*func (service *MessageService) GetMsgType() (data []*message.MsgTypes, err error) {
 	types := entity.Mysql.SelectBySql("SELECT * FROM `message_group` WHERE group_id > 0 ORDER BY sequence ASC")
 	if types != nil && len(*types) > 0 {
 		for _, val := range *types {
@@ -166,7 +132,7 @@ func (service *MessageService) GetMsgType() (data []*message.MsgTypes, err error
 		return data, nil
 	}
 	return nil, nil
-}
+}*/
 
 func (service *MessageService) MsgOpenLog(platFrom, msgLogId int64, userId string) int64 {
 	//判断用户是否已经在pc端打开过

rpc/internal/common/newSendMsgService.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"app.yhyue.com/moapp/MessageCenter/entity"
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/config"
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
@@ -94,7 +95,7 @@ func NewUserSendMsg(in *message.NewUserInsertMsgReq) string {
 				OrderMoney:  in.OrderMoney,
 				Row4:        in.Row4,
 			}
-			SentWxTmplAndAppPush(pushData, v, group_id)
+			SentWxTmplAndAppPush(pushData, v, group_id, "", "")
 		}(userIdArr[i], positionId)
 	}
 	wg.Wait()
@@ -121,6 +122,18 @@ func UpdateUserMsgSummary(in *message.BitmapSaveMsgReq) error {
 	if err1 != nil {
 		return err1
 	}
+	//p459 特殊处理 传过来的消息内容格式为 消息内容#jy#微信模板项目名称#jy#服务地址
+	equityName, equityAddr := "", ""
+	if in.MsgType == config.ConfigJson.EquityInfoMsgType {
+		equityRs := strings.Split(in.Content, "#jy#")
+		if len(equityRs) != 3 {
+			log.Println("消息内容格式有误:", in.Content)
+			return errors.New("无效的消息内容格式")
+		}
+		in.Content = equityRs[0]
+		equityName = equityRs[1]
+		equityAddr = equityRs[2]
+	}
 	for i := 0; i < len(userIdArr); i++ {
 		if userIdArr[i] == "" {
 			continue
@@ -149,7 +162,7 @@ func UpdateUserMsgSummary(in *message.BitmapSaveMsgReq) error {
 				OrderMoney:  in.OrderMoney,
 				Row4:        in.Row4,
 			}
-			SentWxTmplAndAppPush(pushData, v, group_id)
+			SentWxTmplAndAppPush(pushData, v, group_id, equityName, equityAddr)
 		}(userIdArr[i])
 	}
 	wg.Wait()
@@ -180,7 +193,7 @@ type WxTmplAndPush struct {
 	SendUserId  string
 }
 
-func SentWxTmplAndAppPush(this WxTmplAndPush, v string, group_id int) {
+func SentWxTmplAndAppPush(this WxTmplAndPush, v string, group_id int, equityName, equityAddr string) {
 	nTime := time.Now().Format("2006-01-02 15:04:05")
 	//发送消息成功，推送微信、app
 	//fmt.Println("this.MsgType", this.MsgType)
@@ -199,7 +212,12 @@ func SentWxTmplAndAppPush(this WxTmplAndPush, v string, group_id int) {
 	}
 	// 消息模版 工单类型 {{thing19.DATA}} 工单标题 {{thing6.DATA}} 项目名称 {{thing13.DATA}} 服务时间 {{time25.DATA}} 服务地址 {{thing26.DATA}}
 	if this.MsgType != 1 && this.MsgType != 10 {
-		err = p.SendMsg(this.WxPushUrl, this.Title, this.Content, nTime, this.Row4)
+		if this.MsgType == config.ConfigJson.EquityInfoMsgType {
+			// p459 服务地址特殊处理
+			err = p.SendMsg(this.WxPushUrl, this.Title, equityName, nTime, this.Row4, equityAddr)
+		} else {
+			err = p.SendMsg(this.WxPushUrl, this.Title, this.Content, nTime, this.Row4, "")
+		}
 		if err != nil {
 			logx.Error(fmt.Sprintf("SendWxTmplMsg uId %s  Error %s", v, err.Error()))
 		} else {

rpc/internal/common/sendMsg.go

@@ -98,7 +98,7 @@ func FindUserMsg(this message.FindUserMsgReq, isClean bool) message.FindUserMsgR
 	return data
 }
 
-func UserMsgList(this *message.UserMsgListReq) *message.UserMsgList {
+/*func UserMsgList(this *message.UserMsgListReq) *message.UserMsgList {
 	var (
 		unread, count int64
 	)
@@ -263,7 +263,7 @@ func UserMsgList(this *message.UserMsgListReq) *message.UserMsgList {
 
 	data.Unread = unread
 	return data
-}
+}*/
 
 func unreadMsg(this *message.UserMsgListReq) int64 {
 	if this.PositionId <= 0 {
@@ -286,59 +286,6 @@ func unreadMsg(this *message.UserMsgListReq) int64 {
 	}
 	return 0
 }
-func UserUnreadMsgList(this *message.UserUnreadMsgListReq) (int64, []*message.Messages) {
-	count := 0
-	data := []*message.Messages{}
-	types := entity.Mysql.Find("message_group", map[string]interface{}{}, `"group_id"`, "", -1, -1)
-	if types != nil && len(*types) > 0 {
-		for _, v := range *types {
-			key := fmt.Sprintf(MsgCountKey, this.UserId, util.IntAll(v["group_id"]))
-			if exists, _ := redis.Exists(redisModule, key); exists {
-				count += redis.GetInt(redisModule, key)
-			}
-		}
-	}
-	if this.IsNeedData == 1 && count > 0 {
-		query := map[string]interface{}{
-			"receive_userid": this.UserId,
-			"isdel":          1,
-			"appid":          this.Appid,
-			"isRead":         0,
-		}
-		res := entity.Mysql.Find("message", query, "", "createtime desc", (int(this.OffSet)-1)*int(this.PageSize), int(this.PageSize))
-		if res != nil && len(*res) > 0 {
-			for _, val := range *res {
-				_id := util.Int64All(val["id"])
-				id := strconv.FormatInt(_id, 10)
-				links4 := common.InterfaceToStr(val["link"])
-				link4, androidUrl4, iosUrl4, weChatUrl4 := util.LinkSplit(links4)
-				url := map[string]string{
-					"androidUrl": androidUrl4,
-					"iosUrl":     iosUrl4,
-					"weChatUrl":  weChatUrl4,
-				}
-				data = append(data, &message.Messages{
-					Id:            id,
-					Appid:         common.InterfaceToStr(val["appid"]),
-					ReceiveUserId: common.InterfaceToStr(val["receive_userid"]),
-					ReceiveName:   common.InterfaceToStr(val["receive_name"]),
-					SendUserId:    common.InterfaceToStr(val["send_userid"]),
-					SendName:      common.InterfaceToStr(val["send_name"]),
-					Createtime:    common.InterfaceToStr(val["createtime"]),
-					Title:         common.InterfaceToStr(val["title"]),
-					MsgType:       common.Int64All(val["group_id"]),
-					Link:          link4,
-					CiteId:        common.Int64All(val["cite_id"]),
-					Content:       common.InterfaceToStr(val["content"]),
-					IsRead:        common.Int64All(val["isRead"]),
-					MsgLogId:      common.Int64All(val["msg_log_id"]),
-					Url:           url,
-				})
-			}
-		}
-	}
-	return util.Int64All(count), data
-}
 
 func MessageGetLast(this *message.UserMsgListReq) *message.Messages {
 	if !this.IsMsgList && !this.IsColumnNewMsg && !this.IsColumn {

rpc/internal/config/config.go

@@ -23,11 +23,11 @@ type Config struct {
 		Pwd  string `json:"pwd"`
 		User string `json:"user"`
 	} `json:"mail"`
-<<<<<<< HEAD
-	TidbEng         string  `json:"Tidb"`
-	ClassSearchList []int64 `json:"ClassSearchList"` // 需要按照messageclass 查询的groupId
-	Clickhouse      *CHouseConfig
-	GlobMsgLoadTime string `json:"GlobMsgLoadTime"`
+	TidbEng           string  `json:"Tidb"`
+	ClassSearchList   []int64 `json:"ClassSearchList"` // 需要按照messageclass 查询的groupId
+	Clickhouse        *CHouseConfig
+	GlobMsgLoadTime   string `json:"GlobMsgLoadTime"`
+	EquityInfoMsgType int64  `json:"EquityInfoMsgType"` // 营销权益消息需要特殊处理的消息类型
 }
 
 type CHouseConfig struct {
@@ -37,11 +37,6 @@ type CHouseConfig struct {
 	DbName       string
 	MaxIdleConns int
 	MaxOpenConns int
-=======
-	TidbEng           string  `json:"Tidb"`
-	ClassSearchList   []int64 `json:"ClassSearchList"`   // 需要按照messageclass 查询的groupId
-	EquityInfoMsgType int64   `json:"EquityInfoMsgType"` // 营销权益消息需要特殊处理的消息类型
->>>>>>> master
 }
 
 type mysqlConfig struct {

rpc/internal/logic/findmessagedetaillogic.go

@@ -7,7 +7,6 @@ import (
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"log"
 )
 
 type FindMessageDetailLogic struct {
@@ -38,14 +37,12 @@ func (l *FindMessageDetailLogic) FindMessageDetail(in *messageclient.MessageDeta
 			Content:    qutil.ObjToString((*msg)["content"]),
 			MsgType:    qutil.Int64All((*msg)["group_id"]),
 			Link:       qutil.ObjToString((*msg)["link"]),
-			IsRead:     qutil.Int64All((*msg)["isRead"]),
-			Createtime: qutil.ObjToString((*msg)["createtime"]),
-			MsgLogId:   qutil.Int64All((*msg)["msg_log_id"]),
+			Createtime: qutil.ObjToString((*msg)["send_time"]),
+			MsgLogId:   qutil.Int64All((*msg)["id"]),
 		}
 		result.Code = 0
 		result.Message = "请求成功"
 		result.Data = detail
 	}
-	log.Println(result.Data)
 	return result, nil
 }

rpc/internal/logic/getmsgtypelogic.go

@@ -1,39 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type GetMsgTypeLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewGetMsgTypeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMsgTypeLogic {
-	return &GetMsgTypeLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 获取指定用户收到消息的分类
-func (l *GetMsgTypeLogic) GetMsgType(in *messageclient.GetMsgTypeReq) (*messageclient.GetMsgTypeRes, error) {
-	m := service.MessageService{}
-	data, err := m.GetMsgType()
-	if err != nil {
-		return nil, err
-	}
-	return &messageclient.GetMsgTypeRes{
-		Code:    int64(0),
-		Message: "请求成功",
-		Data:    data,
-	}, nil
-
-}

rpc/internal/logic/userunreadmsglistlogic.go

@@ -1,39 +0,0 @@
-package logic
-
-import (
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
-	"context"
-	"log"
-
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type UserUnreadMsgListLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewUserUnreadMsgListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserUnreadMsgListLogic {
-	return &UserUnreadMsgListLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-//    官网、移动端首页、工作桌面消息滚动
-func (l *UserUnreadMsgListLogic) UserUnreadMsgList(in *message.UserUnreadMsgListReq) (*message.UserUnreadMsgListRes, error) {
-	data := new(message.UserUnreadMsgListRes)
-	count, res := service.UserUnreadMsgList(in) //具体信息
-	log.Println(count, res)
-	if count > 0 && len(res) > 0 {
-		data.List = res
-		data.Count = count
-		data.Code = 0
-		data.Message = "请求成功"
-	}
-	return data, nil
-}

rpc/internal/server/messageserver.go

@@ -65,12 +65,6 @@ func (s *MessageServer) FindMessageDetail(ctx context.Context, in *message.Messa
 }
 
 //   消息的分类
-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)
@@ -95,12 +89,6 @@ func (s *MessageServer) SendWxTmplMsg(ctx context.Context, in *message.WxTmplMsg
 }
 
 //    官网、移动端首页、工作桌面消息滚动
-func (s *MessageServer) UserUnreadMsgList(ctx context.Context, in *message.UserUnreadMsgListReq) (*message.UserUnreadMsgListRes, error) {
-	l := logic.NewUserUnreadMsgListLogic(ctx, s.svcCtx)
-	return l.UserUnreadMsgList(in)
-}
-
-//  点击消息-存查看记录
 func (s *MessageServer) MsgOpenLog(ctx context.Context, in *message.MsgOpenLogReq) (*message.Response, error) {
 	l := logic.NewMsgOpenLogLogic(ctx, s.svcCtx)
 	return l.MsgOpenLog(in)

rpc/message.go

@@ -20,7 +20,6 @@ import (
 	"flag"
 	"fmt"
 	"github.com/ClickHouse/clickhouse-go/v2"
-	"github.com/go-xorm/xorm"
 	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -133,8 +132,8 @@ func init() {
 	if config.ConfigJson.SurvivalTime != 0 {
 		entity.SurvivalTime = config.ConfigJson.SurvivalTime
 	}
-	entity.Engine, _ = xorm.NewEngine("mysql", config.ConfigJson.TidbEng)
-	entity.Engine.ShowSQL(true)
+	//entity.Engine, _ = xorm.NewEngine("mysql", config.ConfigJson.TidbEng)
+	//entity.Engine.ShowSQL(true)
 	common.LoadTask()
 }
 

rpc/message.proto

@@ -94,10 +94,10 @@ message GetUnreadClassCountRes {
     repeated ResCount data = 3; //
     repeated Messages info = 4; // 每个类型最新消息列表
 }
-message GetMsgTypeReq {
+/*message GetMsgTypeReq {
     string userId = 1; // 用户id
     string appid = 2; //应用标识
-}
+}*/
 message MsgTypes{
     int64 msgType =1;
     string img = 2;
@@ -105,11 +105,11 @@ message MsgTypes{
     string code = 4;
     string displayPlatform = 5;
 }
-message GetMsgTypeRes {
+/*message GetMsgTypeRes {
     int64 code = 1; //状态码
     string message = 2; //响应消息
     repeated MsgTypes data = 3; //
-}
+}*/
 
 message user {
     string userId = 1;
@@ -236,20 +236,20 @@ message WxTmplResponse {
     string message = 2; //信息
 }
 
-message UserUnreadMsgListReq {
+/*message UserUnreadMsgListReq {
     string userId = 1; //用户id
     string appid = 3; //应用标识
     int64 offSet = 4; //当前
     int64 pageSize = 5; //大小
     int64 isNeedData = 6; //是否需要未读的消息数据，0 不需要  1需要
-}
+}*/
 
-message UserUnreadMsgListRes {
+/*message UserUnreadMsgListRes {
     int64 code = 1; //状态码
     string message = 2; //响应消息
     repeated Messages list = 3;
     int64 count = 4; //总数
-}
+}*/
 
 // 剑鱼系统通用模版
 message WxTmplMsgRequest {
@@ -335,7 +335,7 @@ service Message {
     //查看详细详情
     rpc FindMessageDetail (MessageDetailReq) returns (MessageDetailResp);
     //  消息的分类
-    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
+//    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
     //  查询指定用户的浮标消息
     rpc FindUserBuoyMsg (FindUserBuoyMsgReq) returns (FindUserBuoyMsgRes);
 
@@ -347,7 +347,7 @@ service Message {
     //  发送剑鱼微信模版消息
     rpc SendWxTmplMsg (WxTmplMsgRequest) returns(SendMsgResponse);
     //   官网、移动端首页、工作桌面消息滚动
-    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
+//    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
     // 点击消息-存查看记录
     rpc MsgOpenLog (MsgOpenLogReq) returns (Response);
 

rpc/messageclient/message.go

@@ -26,8 +26,6 @@ type (
 	GetClassUnreadCountReq = message.GetClassUnreadCountReq
 	GetLastMessageReq      = message.GetLastMessageReq
 	GetLastMessageRes      = message.GetLastMessageRes
-	GetMsgTypeReq          = message.GetMsgTypeReq
-	GetMsgTypeRes          = message.GetMsgTypeRes
 	GetUnreadClassCountReq = message.GetUnreadClassCountReq
 	GetUnreadClassCountRes = message.GetUnreadClassCountRes
 	MessageDetailReq       = message.MessageDetailReq
@@ -47,8 +45,6 @@ type (
 	UserMsgList            = message.UserMsgList
 	UserMsgListReq         = message.UserMsgListReq
 	UserMsgListRes         = message.UserMsgListRes
-	UserUnreadMsgListReq   = message.UserUnreadMsgListReq
-	UserUnreadMsgListRes   = message.UserUnreadMsgListRes
 	WxTmplMsgRequest       = message.WxTmplMsgRequest
 	WxTmplResponse         = message.WxTmplResponse
 
@@ -68,8 +64,6 @@ type (
 		// 查看详细详情
 		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)
@@ -78,8 +72,6 @@ type (
 		//   发送剑鱼微信模版消息
 		SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest, opts ...grpc.CallOption) (*SendMsgResponse, error)
 		//    官网、移动端首页、工作桌面消息滚动
-		UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
-		//  点击消息-存查看记录
 		MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error)
 		//   发送剑鱼微信模版消息
 		AppLetterPush(ctx context.Context, in *WxTmplMsgRequest, opts ...grpc.CallOption) (*SendMsgResponse, error)
@@ -139,12 +131,6 @@ func (m *defaultMessage) FindMessageDetail(ctx context.Context, in *MessageDetai
 }
 
 //   消息的分类
-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...)
@@ -169,12 +155,6 @@ func (m *defaultMessage) SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest
 }
 
 //    官网、移动端首页、工作桌面消息滚动
-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...)
-}
-
-//  点击消息-存查看记录
 func (m *defaultMessage) MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error) {
 	client := message.NewMessageClient(m.cli.Conn())
 	return client.MsgOpenLog(ctx, in, opts...)

rpc/type/message/message_grpc.pb.go

@@ -37,7 +37,7 @@ type MessageClient interface {
 	//查看详细详情
 	FindMessageDetail(ctx context.Context, in *MessageDetailReq, opts ...grpc.CallOption) (*MessageDetailResp, error)
 	//  消息的分类
-	GetMsgType(ctx context.Context, in *GetMsgTypeReq, opts ...grpc.CallOption) (*GetMsgTypeRes, error)
+	//    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(ctx context.Context, in *FindUserBuoyMsgReq, opts ...grpc.CallOption) (*FindUserBuoyMsgRes, error)
 	//   一键清空未读消息
@@ -47,7 +47,7 @@ type MessageClient interface {
 	//  发送剑鱼微信模版消息
 	SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest, opts ...grpc.CallOption) (*SendMsgResponse, error)
 	//   官网、移动端首页、工作桌面消息滚动
-	UserUnreadMsgList(ctx context.Context, in *UserUnreadMsgListReq, opts ...grpc.CallOption) (*UserUnreadMsgListRes, error)
+	//    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
 	// 点击消息-存查看记录
 	MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error)
 	//  发送剑鱼微信模版消息
@@ -125,15 +125,6 @@ func (c *messageClient) FindMessageDetail(ctx context.Context, in *MessageDetail
 	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...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 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...)
@@ -170,15 +161,6 @@ func (c *messageClient) SendWxTmplMsg(ctx context.Context, in *WxTmplMsgRequest,
 	return out, nil
 }
 
-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...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *messageClient) MsgOpenLog(ctx context.Context, in *MsgOpenLogReq, opts ...grpc.CallOption) (*Response, error) {
 	out := new(Response)
 	err := c.cc.Invoke(ctx, "/message.Message/MsgOpenLog", in, out, opts...)
@@ -216,7 +198,7 @@ type MessageServer interface {
 	//查看详细详情
 	FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error)
 	//  消息的分类
-	GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error)
+	//    rpc GetMsgType (GetMsgTypeReq) returns (GetMsgTypeRes);
 	//  查询指定用户的浮标消息
 	FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error)
 	//   一键清空未读消息
@@ -226,7 +208,7 @@ type MessageServer interface {
 	//  发送剑鱼微信模版消息
 	SendWxTmplMsg(context.Context, *WxTmplMsgRequest) (*SendMsgResponse, error)
 	//   官网、移动端首页、工作桌面消息滚动
-	UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error)
+	//    rpc UserUnreadMsgList (UserUnreadMsgListReq) returns (UserUnreadMsgListRes);
 	// 点击消息-存查看记录
 	MsgOpenLog(context.Context, *MsgOpenLogReq) (*Response, error)
 	//  发送剑鱼微信模版消息
@@ -259,9 +241,6 @@ func (UnimplementedMessageServer) FindUserMsg(context.Context, *FindUserMsgReq)
 func (UnimplementedMessageServer) FindMessageDetail(context.Context, *MessageDetailReq) (*MessageDetailResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindMessageDetail not implemented")
 }
-func (UnimplementedMessageServer) GetMsgType(context.Context, *GetMsgTypeReq) (*GetMsgTypeRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetMsgType not implemented")
-}
 func (UnimplementedMessageServer) FindUserBuoyMsg(context.Context, *FindUserBuoyMsgReq) (*FindUserBuoyMsgRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindUserBuoyMsg not implemented")
 }
@@ -274,9 +253,6 @@ func (UnimplementedMessageServer) UserMsgList(context.Context, *UserMsgListReq)
 func (UnimplementedMessageServer) SendWxTmplMsg(context.Context, *WxTmplMsgRequest) (*SendMsgResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendWxTmplMsg not implemented")
 }
-func (UnimplementedMessageServer) UserUnreadMsgList(context.Context, *UserUnreadMsgListReq) (*UserUnreadMsgListRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UserUnreadMsgList not implemented")
-}
 func (UnimplementedMessageServer) MsgOpenLog(context.Context, *MsgOpenLogReq) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method MsgOpenLog not implemented")
 }
@@ -422,24 +398,6 @@ func _Message_FindMessageDetail_Handler(srv interface{}, ctx context.Context, de
 	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 {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).GetMsgType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/GetMsgType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).GetMsgType(ctx, req.(*GetMsgTypeReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_FindUserBuoyMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindUserBuoyMsgReq)
 	if err := dec(in); err != nil {
@@ -512,24 +470,6 @@ func _Message_SendWxTmplMsg_Handler(srv interface{}, ctx context.Context, dec fu
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_UserUnreadMsgList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UserUnreadMsgListReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).UserUnreadMsgList(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/UserUnreadMsgList",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).UserUnreadMsgList(ctx, req.(*UserUnreadMsgListReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_MsgOpenLog_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(MsgOpenLogReq)
 	if err := dec(in); err != nil {
@@ -601,10 +541,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindMessageDetail",
 			Handler:    _Message_FindMessageDetail_Handler,
 		},
-		{
-			MethodName: "GetMsgType",
-			Handler:    _Message_GetMsgType_Handler,
-		},
 		{
 			MethodName: "FindUserBuoyMsg",
 			Handler:    _Message_FindUserBuoyMsg_Handler,
@@ -621,10 +557,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SendWxTmplMsg",
 			Handler:    _Message_SendWxTmplMsg_Handler,
 		},
-		{
-			MethodName: "UserUnreadMsgList",
-			Handler:    _Message_UserUnreadMsgList_Handler,
-		},
 		{
 			MethodName: "MsgOpenLog",
 			Handler:    _Message_MsgOpenLog_Handler,