整理代码

api/internal/handler/routes.go

@@ -47,11 +47,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/messageCenter/markRead",
 				Handler: MarkReadHandler(serverCtx),
 			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/messageCenter/SendMsg",
-				Handler: SendMsgHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/messageCenter/MultipleSaveMsg",

api/internal/handler/sendmsghandler.go

@@ -1,29 +0,0 @@
-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 SendMsgHandler(ctx *svc.ServiceContext) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.SendMsgReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.Error(w, err)
-			return
-		}
-
-		l := logic.NewSendMsgLogic(r.Context(), ctx)
-		resp, err := l.SendMsg(req)
-		if err != nil {
-			httpx.Error(w, err)
-		} else {
-			httpx.OkJson(w, resp)
-		}
-	}
-}

api/internal/logic/sendmsglogic.go

@@ -1,47 +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 SendMsgLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewSendMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) SendMsgLogic {
-	return SendMsgLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *SendMsgLogic) SendMsg(req types.SendMsgReq) (*types.SendMsgResp, error) {
-	lsi := l.svcCtx.MessageCenter
-	resp, err := lsi.SendUserMsg(l.ctx, &messageclient.SendMsgRequest{
-		Appid:         req.Appid,
-		ReceiveUserId: req.ReceiveUserId,
-		ReceiveName:   req.ReceiveName,
-		SendUserId:    req.SendUserId,
-		SendName:      req.SendName,
-		Title:         req.Title,
-		Content:       req.Content,
-		MsgType:       req.MsgType,
-		Link:          req.Link,
-		CiteId:        req.CiteId,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &types.SendMsgResp{
-		Code:    resp.Code,
-		Message: resp.Message,
-	}, nil
-}

api/internal/types/types.go

@@ -107,25 +107,6 @@ type MarkReadRes struct {
 	Data    int64  `json:"data"`
 }
 
-type SendMsgReq struct {
-	ReceiveUserId string `form:"receiveUserId"`        //接收方的用户id
-	ReceiveName   string `form:"receiveName,optional"` //接收方的用户名
-	SendUserId    string `form:"sendUserId"`           //发送方的用户id
-	SendName      string `form:"sendName"`             //发送方的用户名
-	Title         string `form:"title"`                //标题
-	Content       string `form:"content"`              //内容
-	MsgType       int64  `form:"msgType"`              // 消息类型
-	Link          string `form:"link,optional"`        //连接
-	CiteId        int64  `form:"citeId,optional"`      //应用id
-	Appid         string `form:"appid"`
-}
-
-type SendMsgResp struct {
-	Code    int64  `json:"code"`
-	Message string `json:"message"`
-	Status  int64  `json:"status"`
-}
-
 type MultipleSaveMsgReq struct {
 	MsgInfo     map[string]interface{} `json:"msgInfo"`
 	UserIds     string                 `json:"userIds"`

api/message.api

@@ -104,25 +104,6 @@ type MarkReadRes {
 	Data    int64  `json:"data"`
 }
 
-//给指定用户发送消息
-type SendMsgReq {
-	ReceiveUserId string `form:"receiveUserId"`        //接收方的用户id
-	ReceiveName   string `form:"receiveName,optional"` //接收方的用户名
-	SendUserId    string `form:"sendUserId"`           //发送方的用户id
-	SendName      string `form:"sendName"`             //发送方的用户名
-	Title         string `form:"title"`                //标题
-	Content       string `form:"content"`              //内容
-	MsgType       int64  `form:"msgType"`              // 消息类型
-	Link          string `form:"link,optional"`        //连接
-	CiteId        int64  `form:"citeId,optional"`      //应用id
-	Appid         string `form:"appid"`
-}
-type SendMsgResp {
-	Code    int64  `json:"code"`
-	Message string `json:"message"`
-	Status  int64  `json:"status"`
-}
-
 //批量保存消息
 type MultipleSaveMsgReq {
 	MsgInfo     map[string]interface{} `json:"msgInfo"`
@@ -213,9 +194,6 @@ service message-api {
 	// 标记为已读
 	@handler MarkReadHandler
 	post /messageCenter/markRead (MarkReadReq) returns (MarkReadRes)
-	// 发送消息
-	@handler SendMsgHandler
-	post /messageCenter/SendMsg (SendMsgReq) returns (SendMsgResp)
 	
 	// 发送消息
 	@handler MultipleSaveMsgHandler

entity/message.go

@@ -3,7 +3,6 @@ package entity
 import (
 	m "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
-	"database/sql"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"time"
 
@@ -15,7 +14,6 @@ var Engine *xorm.Engine
 var EtcdCli *clientv3.Client
 var Mysql *mysql.Mysql
 var MessageColumn []map[string]interface{}
-var Mysql11 *sql.DB
 var MQFW m.MongodbSim
 
 var SurvivalTime int

rpc/internal/common/sendMsg.go

@@ -21,59 +21,6 @@ const order = "1,4"
 const MsgCountKey = "count_%s_%s" //redis 消息未读数量 Count.用户id.消息类型=数量
 const redisModule = "msgCount"
 
-/*
-var (
-
-	UserLockMap = map[string]*sync.Mutex{}
-	//MainLock    = sync.Mutex{}
-
-)
-*/
-
-func SendMsg(this message.SendMsgRequest) (int64, string) {
-	r, err := entity.Mysql11.Query("select count(*) as c from conversation where receive_id = ? and send_id = ? ", this.ReceiveUserId, this.SendUserId)
-	c := 0
-	for r.Next() {
-		err := r.Scan(&c)
-		if err != nil {
-			panic(err.Error())
-		}
-	}
-	logx.Info("查询数量：", c)
-
-	sql3 := `INSERT INTO message(appid,receive_userid,receive_name,send_userid,send_name,title,content,msg_type,link,cite_id,createtime,isRead,isdel)
-		values ("%s",'%s','%s','%s','%s','%s','%s','%d','%s',0,'%s',0,1);`
-	sql3 = fmt.Sprintf(sql3, this.Appid, this.ReceiveUserId, this.ReceiveName, this.SendUserId, this.SendName, this.Title, this.Content, this.MsgType, this.Link, time.Now().Format("2006-01-02 15:04:05"))
-	if c < 1 {
-		sql1 := `INSERT INTO conversation(appid,` + "`key`" + `,user_id,receive_id,receive_name,send_id,send_name,sort,createtime) 
-		values ('%s','','%s','%s','%s','%s','%s',0,'%s');`
-		sql1 = fmt.Sprintf(sql1, this.Appid, this.SendUserId, this.ReceiveUserId, this.ReceiveName, this.SendUserId, this.SendName, time.Now().Format("2006-01-02 15:04:05"))
-		ok := entity.Mysql.ExecTx("发送消息事务", func(tx *sql.Tx) bool {
-			//插入会话表
-			_, err := entity.Mysql11.Exec(sql1)
-
-			sql2 := `INSERT INTO conversation(appid,` + "`key`" + `,user_id,receive_id,receive_name,send_id,send_name,sort,createtime) 
-		values ('%s','','%s','%s','%s','%s','%s',0,'%s');`
-			sql2 = fmt.Sprintf(sql2, this.Appid, this.ReceiveUserId, this.SendUserId, this.SendName, this.ReceiveUserId, this.ReceiveName, time.Now().Format("2006-01-02 15:04:05"))
-			_, err = entity.Mysql11.Exec(sql2)
-			//插入消息表
-			_, err = entity.Mysql11.Exec(sql3)
-			if err != nil {
-				return false
-			}
-			return true
-		})
-		if ok {
-			return 1, "消息发送成功"
-		}
-	}
-	_, err = entity.Mysql11.Exec(sql3)
-	if err == nil {
-		MsgCountAdd(this.ReceiveUserId, strconv.Itoa(int(this.MsgType)), this.Appid)
-		return 1, "消息发送成功"
-	}
-	return 0, "消息发送失败"
-}
 func FindUserMsg(this message.FindUserMsgReq, isClean bool) message.FindUserMsgRes {
 	var err error
 	var count int64

rpc/internal/logic/sendusermsglogic.go

@@ -1,34 +0,0 @@
-package logic
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"context"
-
-	service "app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
-	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type SendUserMsgLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewSendUserMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendUserMsgLogic {
-	return &SendUserMsgLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 指定用户发消息
-func (l *SendUserMsgLogic) SendUserMsg(in *messageclient.SendMsgRequest) (*messageclient.Response, error) {
-	// todo: add your logic here and delete this line
-	code, msg := service.SendMsg(*in)
-	return &messageclient.Response{
-		Code:    code,
-		Message: msg,
-	}, nil
-}

rpc/internal/server/messageserver.go

@@ -34,12 +34,6 @@ func (s *MessageServer) ChangeReadStatus(ctx context.Context, in *message2.Chang
 	return l.ChangeReadStatus(in)
 }
 
-// 指定用户发消息
-func (s *MessageServer) SendUserMsg(ctx context.Context, in *message2.SendMsgRequest) (*message2.Response, error) {
-	l := logic.NewSendUserMsgLogic(ctx, s.svcCtx)
-	return l.SendUserMsg(in)
-}
-
 //   查询指定用户未读消息合计
 func (s *MessageServer) GetUnreadCount(ctx context.Context, in *message2.GetUnreadCountRequest) (*message2.GetUnreadCountResponse, error) {
 	l := logic.NewGetUnreadCountLogic(ctx, s.svcCtx)

rpc/message.go

@@ -17,7 +17,6 @@ import (
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/zrpc"
-	clientv3 "go.etcd.io/etcd/client/v3"
 	"google.golang.org/grpc"
 	"log"
 )
@@ -25,8 +24,6 @@ import (
 var configFile = flag.String("f", "etc/message.yaml", "the config file")
 var logFile = flag.String("lf", "etc/logs.yaml", "the logs file")
 var logc entity.Logc
-var EtcdCli *clientv3.Client
-var Mysql *mysql.Mysql
 var c config.Config
 
 func main() {

rpc/message.proto

@@ -3,19 +3,6 @@ syntax = "proto3";
 package message;
 option go_package = "message/";
 
-message SendMsgRequest {
-    string receiveUserId = 1; //接收方用户ID
-    string receiveName = 2; //接收方用户名
-    string sendUserId = 3; //发送方用户ID
-    string sendName = 4; //发送方用户名
-    string title = 5; //主题
-    string content = 6; //内容
-    int64 msgType = 7; //消息类型 1：客服   2：系统通知  3：营销   4：用户会话
-    string link = 8; //跳转链接
-    int64 citeId = 9; //引用id
-    string appid = 10; //应用标识
-}
-
 message ChangeReadStatusReq {
     string id = 1; // 消息id
     int64 readStatus = 2; // 阅读状态 0-未读 1-已读
@@ -255,8 +242,6 @@ service Message {
     rpc multipleSaveMsg (multipleSaveMsgReq) returns (multipleSaveMsgResp);
     // 修改消息阅读状态
     rpc ChangeReadStatus (ChangeReadStatusReq) returns (Response);
-    //指定用户发消息
-    rpc SendUserMsg (SendMsgRequest) returns (Response);
     //  查询指定用户未读消息合计
     rpc GetUnreadCount (GetUnreadCountRequest) returns (GetUnreadCountResponse);
     //  查询指定用户的历史消息记录

rpc/messageclient/message.go

@@ -36,7 +36,6 @@ type (
 	MultipleSaveMsgResp    = message2.MultipleSaveMsgResp
 	ResCount               = message2.ResCount
 	Response               = message2.Response
-	SendMsgRequest         = message2.SendMsgRequest
 	User                   = message2.User
 	UserMsgList            = message2.UserMsgList
 	UserMsgListReq         = message2.UserMsgListReq
@@ -51,8 +50,6 @@ type (
 		MultipleSaveMsg(ctx context.Context, in *MultipleSaveMsgReq, opts ...grpc.CallOption) (*MultipleSaveMsgResp, error)
 		//  修改消息阅读状态
 		ChangeReadStatus(ctx context.Context, in *ChangeReadStatusReq, opts ...grpc.CallOption) (*Response, error)
-		// 指定用户发消息
-		SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error)
 		//   查询指定用户未读消息合计
 		GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 		//   查询指定用户的历史消息记录
@@ -102,12 +99,6 @@ func (m *defaultMessage) ChangeReadStatus(ctx context.Context, in *ChangeReadSta
 	return client.ChangeReadStatus(ctx, in, opts...)
 }
 
-// 指定用户发消息
-func (m *defaultMessage) SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error) {
-	client := message2.NewMessageClient(m.cli.Conn())
-	return client.SendUserMsg(ctx, in, opts...)
-}
-
 //   查询指定用户未读消息合计
 func (m *defaultMessage) GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error) {
 	client := message2.NewMessageClient(m.cli.Conn())

rpc/type/message/message_grpc.pb.go

@@ -26,8 +26,6 @@ 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)
-	//指定用户发消息
-	SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error)
 	//  查询指定用户未读消息合计
 	GetUnreadCount(ctx context.Context, in *GetUnreadCountRequest, opts ...grpc.CallOption) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
@@ -80,15 +78,6 @@ func (c *messageClient) ChangeReadStatus(ctx context.Context, in *ChangeReadStat
 	return out, nil
 }
 
-func (c *messageClient) SendUserMsg(ctx context.Context, in *SendMsgRequest, opts ...grpc.CallOption) (*Response, error) {
-	out := new(Response)
-	err := c.cc.Invoke(ctx, "/message.Message/SendUserMsg", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 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...)
@@ -205,8 +194,6 @@ type MessageServer interface {
 	MultipleSaveMsg(context.Context, *MultipleSaveMsgReq) (*MultipleSaveMsgResp, error)
 	// 修改消息阅读状态
 	ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error)
-	//指定用户发消息
-	SendUserMsg(context.Context, *SendMsgRequest) (*Response, error)
 	//  查询指定用户未读消息合计
 	GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error)
 	//  查询指定用户的历史消息记录
@@ -244,9 +231,6 @@ func (UnimplementedMessageServer) MultipleSaveMsg(context.Context, *MultipleSave
 func (UnimplementedMessageServer) ChangeReadStatus(context.Context, *ChangeReadStatusReq) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ChangeReadStatus not implemented")
 }
-func (UnimplementedMessageServer) SendUserMsg(context.Context, *SendMsgRequest) (*Response, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SendUserMsg not implemented")
-}
 func (UnimplementedMessageServer) GetUnreadCount(context.Context, *GetUnreadCountRequest) (*GetUnreadCountResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUnreadCount not implemented")
 }
@@ -332,24 +316,6 @@ func _Message_ChangeReadStatus_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Message_SendUserMsg_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SendMsgRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MessageServer).SendUserMsg(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/message.Message/SendUserMsg",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MessageServer).SendUserMsg(ctx, req.(*SendMsgRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Message_GetUnreadCount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetUnreadCountRequest)
 	if err := dec(in); err != nil {
@@ -581,10 +547,6 @@ var Message_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ChangeReadStatus",
 			Handler:    _Message_ChangeReadStatus_Handler,
 		},
-		{
-			MethodName: "SendUserMsg",
-			Handler:    _Message_SendUserMsg_Handler,
-		},
 		{
 			MethodName: "GetUnreadCount",
 			Handler:    _Message_GetUnreadCount_Handler,