Merge branch 'feature/v1.2.7' into dev/v1.2.7_rjj

rpc/etc/message.yaml

@@ -38,7 +38,7 @@ FileSystemConf:
     Key: message.rpc
 SurvivalTime: 86400
 SaveConcurrency: 10
-
+WebRpcPort: 8099
 mail:
   - addr: smtp.exmail.qq.com
     port: 465

rpc/internal/common/getBuoyMsg.go

@@ -4,6 +4,7 @@ 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"
 	"fmt"
 	"log"
 	"strconv"
@@ -77,6 +78,9 @@ func ClearUnreadMsg(in *message.ClearUnreadMsgReq) error {
 		if !entity.Mysql.Update("message", query, map[string]interface{}{"isRead": 1}) {
 			log.Println("更新服务未读数失败")
 		}
+		for _, v := range entity.MessageColumn {
+			go MsgCountZero(in.Userid, in.AppId, qutil.Int64All(v["msg_type"]))
+		}
 	}
 
 	//更新私信未读数

rpc/internal/config/config.go

@@ -8,6 +8,7 @@ type Config struct {
 	zrpc.RpcServerConf
 	DataSource      *mysqlConfig // 手动代码
 	BaseSource      *mysqlConfig // 手动代码
+	WebRpcPort      int
 	Mysql           string
 	RedisAddr       string `json:"RedisAddr"`
 	Mongodb         *mgoConf

rpc/internal/logic/usermsglistlogic.go

@@ -32,38 +32,34 @@ func (l *UserMsgListLogic) UserMsgList(in *message.UserMsgListReq) (*message.Use
 	data := new(message.UserMsgListRes)
 	res1 := service.UserMsgList(in)    //具体信息
 	res2 := service.MessageGetLast(in) //最新信息
-	if res2 != nil || res1 != nil {
-		var finalData []*message.Messages
-		if res1.Data != nil {
-			for _, v := range res1.Data {
-				link3, androidUrl3, iosUrl3, weChatUrl3 := util.LinkSplit(v.Link)
-				v.Link = link3
-				v.Url = map[string]string{
-					"androidUrl": androidUrl3,
-					"iosUrl":     iosUrl3,
-					"weChatUrl":  weChatUrl3,
-				}
-				finalData = append(finalData, v)
+	var finalData []*message.Messages
+	if res1 != nil && res1.Data != nil {
+		for _, v := range res1.Data {
+			link3, androidUrl3, iosUrl3, weChatUrl3 := util.LinkSplit(v.Link)
+			v.Link = link3
+			v.Url = map[string]string{
+				"androidUrl": androidUrl3,
+				"iosUrl":     iosUrl3,
+				"weChatUrl":  weChatUrl3,
 			}
+			finalData = append(finalData, v)
 		}
-
-		lastMsg := new(message.Messages)
-		if res2 != nil {
-			lastMsg = res2
-			links4 := lastMsg.Link
-			link4, androidUrl4, iosUrl4, weChatUrl4 := util.LinkSplit(links4)
-			lastMsg.Link = link4
-			lastMsg.Url = map[string]string{
-				"androidUrl": androidUrl4,
-				"iosUrl":     iosUrl4,
-				"weChatUrl":  weChatUrl4,
-			}
+	}
+	if res2 != nil {
+		links4 := res2.Link
+		link4, androidUrl4, iosUrl4, weChatUrl4 := util.LinkSplit(links4)
+		res2.Link = link4
+		res2.Url = map[string]string{
+			"androidUrl": androidUrl4,
+			"iosUrl":     iosUrl4,
+			"weChatUrl":  weChatUrl4,
 		}
-		data.Column = res1.SortData
-		data.List = finalData
-		data.Last = lastMsg
-		data.Count = res1.Count
-		data.Unread = res1.Unread
 	}
+
+	data.Column = res1.SortData
+	data.List = finalData
+	data.Last = res2
+	data.Count = res1.Count
+	data.Unread = res1.Unread
 	return data, nil
 }

rpc/message.go

@@ -10,6 +10,8 @@ import (
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/server"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
+	mc "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/endless"
 	"app.yhyue.com/moapp/jybase/mail"
 	m "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
@@ -30,8 +32,13 @@ var c config.Config
 
 func main() {
 	flag.Parse()
-
 	conf.MustLoad(*configFile, &c)
+	go func() {
+		err := endless.ListenAndServe(":"+mc.InterfaceToStr(c.WebRpcPort), nil, func() {})
+		if err != nil {
+			log.Println("ListenAndServe: ", err)
+		}
+	}()
 	ctx := svc.NewServiceContext(c)
 	srv := server.NewMessageServer(ctx)