merge

rpc/internal/logic/deletemultiplemessagelogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/MessageCenter/rpc/message"
 	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
 	"app.yhyue.com/moapp/MessageCenter/service"
 	"context"
@@ -34,11 +35,7 @@ func (l *DeleteMultipleMessageLogic) DeleteMultipleMessage(in *messageclient.Del
 		idSlice = append(idSlice, v)
 	}
 	code, msg := m.DeleteMessage(idSlice, in.Appid)
-<<<<<<< HEAD
-	return &messageclient.Response{
-=======
 	return &message.Response{
->>>>>>> master
 		Code:    code,
 		Message: msg,
 	}, nil

rpc/message.go

@@ -26,11 +26,11 @@ 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() {
 	flag.Parse()
 
-	var c config.Config
 	conf.MustLoad(*configFile, &c)
 	ctx := svc.NewServiceContext(c)
 	srv := server.NewMessageServer(ctx)
@@ -39,7 +39,6 @@ func main() {
 		message.RegisterMessageServer(grpcServer, srv)
 	})
 	defer s.Stop()
-
 	fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
 	s.Start()
 }
@@ -47,7 +46,6 @@ func main() {
 //创建orm引擎
 func init() {
 	conf.MustLoad(*configFile, &config.ConfigJson)
-
 	log.Println("开始初始化数据库。。。。。")
 	//初始化mysql
 	entity.Mysql = &mysql.Mysql{
@@ -59,7 +57,6 @@ func init() {
 		MaxIdleConns: config.ConfigJson.DataSource.MaxIdleConns,
 	}
 	entity.Mysql.Init()
-
 	//初始化 redis
 	if config.ConfigJson.Redis.Addr != "" {
 		if config.ConfigJson.Redis.Modules == "" {
@@ -68,7 +65,6 @@ func init() {
 		log.Println("--初始化 redis--")
 		redis.InitRedisBySize(fmt.Sprintf("%s=%s", config.ConfigJson.Redis.Modules, config.ConfigJson.Redis.Addr), 20, 30, 300)
 	}
-
 	//初始化日志信息
 	conf.MustLoad(*logFile, &logc)
 	if len(logc.Level) > 0 {
@@ -82,4 +78,7 @@ func init() {
 			logx.Info(v, "--日志记录")
 		}
 	}
+	if config.ConfigJson.SurvivalTime != 0 {
+		entity.SurvivalTime = config.ConfigJson.SurvivalTime
+	}
 }

service/messageService.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"app.yhyue.com/moapp/MessageCenter/entity"
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
+	"app.yhyue.com/moapp/MessageCenter/rpc/message"
 	"app.yhyue.com/moapp/MessageCenter/util"
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"errors"
@@ -15,7 +15,7 @@ type MessageService struct {
 }
 
 // 修改消息阅读状态
-func (service *MessageService) ChangeReadStatus(data *messageclient.ChangeReadStatusRequest) (int64, string) {
+func (service *MessageService) ChangeReadStatus(data *message.ChangeReadStatusRequest) (int64, string) {
 	msg := entity.Mysql.FindOne("message", map[string]interface{}{"id": data.Id, "isdel": 1, "appid": data.Appid}, "", "")
 	//log.Println("查询到消息：", msg)
 	if msg == nil {
@@ -74,7 +74,7 @@ func (service *MessageService) CountUnread(userId string, appId string) (int64,
 }
 
 // 获取指定用户指定分类最新一条消息
-func (service *MessageService) LastMessage(userId string, appId string, msgType int64, isRead int64) (*messageclient.Messages, error) {
+func (service *MessageService) LastMessage(userId string, appId string, msgType int64, isRead int64) (*message.Messages, error) {
 	sql := "SELECT * FROM message receive_userid=? and isdel=1 and appid=?  and msg_type=?"
 	valueList := []interface{}{userId, appId, msgType}
 	if isRead != -1 {
@@ -91,7 +91,7 @@ func (service *MessageService) LastMessage(userId string, appId string, msgType
 	if lastMsg != nil && len(*lastMsg) > 0 {
 		_id := util.Int64All((*lastMsg)["id"])
 		id := strconv.FormatInt(_id, 10)
-		msg := messageclient.Messages{
+		msg := message.Messages{
 			Id:            id,
 			Appid:         qutil.ObjToString((*lastMsg)["appid"]),
 			ReceiveUserId: qutil.ObjToString((*lastMsg)["receive_userid"]),
@@ -128,14 +128,14 @@ func FindMessageDetail(id string) (entity.Message, error) {
 }
 
 // 获取用户未读消息分类及数量 及分类下的最新一条消息
-func (service *MessageService) ClassCountAndMessage(userId string, appId string) ([]*messageclient.ResCount, error) {
+func (service *MessageService) ClassCountAndMessage(userId string, appId string) ([]*message.ResCount, error) {
 	query := entity.Mysql.SelectBySql("SELECT msg_type,COUNT(CASE WHEN isRead=0 THEN 1 END) as count  FROM message where receive_userid=? and isdel=1 and appid=? GROUP BY msg_type  ORDER BY FIELD(`msg_type`,\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\")", userId, appId)
 
-	typeCount := []*messageclient.ResCount{}
+	typeCount := []*message.ResCount{}
 	// 未读消息分类及数量
 	if query != nil && len(*query) > 0 {
 		for _, v := range *query {
-			typeCount = append(typeCount, &messageclient.ResCount{MsgType: v["msg_type"].(int64), Count: v["count"].(int64)})
+			typeCount = append(typeCount, &message.ResCount{MsgType: v["msg_type"].(int64), Count: v["count"].(int64)})
 		}
 	}
 	return typeCount, nil

service/sendMsg.go

@@ -1,13 +1,9 @@
 package service
 
 import (
-<<<<<<< HEAD
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-=======
 	"app.yhyue.com/moapp/MessageCenter/entity"
 	"app.yhyue.com/moapp/MessageCenter/rpc/message"
 	"app.yhyue.com/moapp/MessageCenter/util"
->>>>>>> master
 	"app.yhyue.com/moapp/jybase/redis"
 	"database/sql"
 	"fmt"
@@ -16,12 +12,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-<<<<<<< HEAD
-
-	"app.yhyue.com/moapp/MessageCenter/entity"
-	"app.yhyue.com/moapp/MessageCenter/util"
-=======
->>>>>>> master
 )
 
 // 类型的顺序
@@ -29,17 +19,12 @@ const order = "1,4"
 const MsgCountKey = "count_%s_%s" //redis 消息未读数量 Count.用户id.消息类型=数量
 const redisModule = "msgCount"
 
-<<<<<<< HEAD
 /*var (
 	UserLockMap = map[string]*sync.Mutex{}
 	//MainLock    = sync.Mutex{}
 )*/
 
-func SendMsg(this messageclient.SendMsgRequest) (int64, string) {
-
-=======
 func SendMsg(this message.SendMsgRequest) (int64, string) {
->>>>>>> master
 	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() {
@@ -83,14 +68,7 @@ func SendMsg(this message.SendMsgRequest) (int64, string) {
 	}
 	return 0, "消息发送失败"
 }
-
-<<<<<<< HEAD
-func FindUserMsg(this messageclient.FindUserMsgReq) messageclient.FindUserMsgRes {
-	//orm := entity.Engine
-	//var messages []*entity.Message
-=======
 func FindUserMsg(this message.FindUserMsgReq, isClean bool) message.FindUserMsgRes {
->>>>>>> master
 	var err error
 	var count int64
 	cquery := map[string]interface{}{
@@ -104,11 +82,7 @@ func FindUserMsg(this message.FindUserMsgReq, isClean bool) message.FindUserMsgR
 	if this.Read != -1 {
 		cquery["isRead"] = this.Read
 	}
-<<<<<<< HEAD
 	count = entity.Mysql.Count("message", cquery)
-	//count, err = orm.Table("message").Where("((receive_userid = ? and send_userid = ?) or (receive_userid = ? and send_userid = ?)) and isdel = ? and appid = ?"+q, this.UserId, this.ReceiveUserId, this.ReceiveUserId, this.UserId, 1, this.Appid).Count()
-	data := messageclient.FindUserMsgRes{}
-=======
 	data := message.FindUserMsgRes{}
 	if this.PageSize == 5 {
 		//从缓存里边取数据
@@ -125,7 +99,6 @@ func FindUserMsg(this message.FindUserMsgReq, isClean bool) message.FindUserMsgR
 		}
 	}
 	count = entity.Mysql.Count("message", cquery)
->>>>>>> master
 	if count > 0 {
 		res := entity.Mysql.Find("message", cquery, "", "createtime desc", (int(this.OffSet)-1)*int(this.PageSize), int(this.PageSize))
 		//log.Println("数据：", res)
@@ -133,7 +106,7 @@ func FindUserMsg(this message.FindUserMsgReq, isClean bool) message.FindUserMsgR
 			for _, v := range *res {
 				_id := util.Int64All(v["id"])
 				id := strconv.FormatInt(_id, 10)
-				data.Data = append(data.Data, &messageclient.Messages{
+				data.Data = append(data.Data, &message.Messages{
 					Id:            id,
 					Appid:         util.ObjToString(v["appId"]),
 					ReceiveUserId: util.ObjToString(v["receive_userid"]),
@@ -231,7 +204,7 @@ func MsgCountZero(userId, msgType, appId string) bool {
 	return fool
 }
 
-func MultSave(this messageclient.MultipleSaveMsgReq) (int64, string) {
+func MultSave(this message.MultipleSaveMsgReq) (int64, string) {
 	userIdArr := strings.Split(this.UserIds, ",")
 	userNameArr := strings.Split(this.UserNames, ",")
 	if len(userIdArr) > 0 {