From 1e49bc88693a3d0c7f5366b0e7f8b47ecc33bd46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= <shyinyong@outlook.com>
Date: Fri, 27 Oct 2023 17:58:31 +0800
Subject: [PATCH] save

---
 server/mailserver/mail/mail.go        | 2 +-
 server/mailserver/player/player.go    | 3 ++-
 server/mailserver/router/routermgr.go | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/mailserver/mail/mail.go b/server/mailserver/mail/mail.go
index 3872dc94..f59e164f 100644
--- a/server/mailserver/mail/mail.go
+++ b/server/mailserver/mail/mail.go
@@ -85,7 +85,7 @@ func (m *Mail) IsReadableMail(accountObj common.Player) bool {
 		}
 	}
 	nowUnixSec := int32(time.Now().Unix())
-	if m.ExpireTime > nowUnixSec && m.SendTime <= nowUnixSec && accountObj.IsUnreadMail(m.MailId) && !accountObj.IsDeletedMail(m.MailId) {
+	if m.ExpireTime > nowUnixSec && m.SendTime <= nowUnixSec && !accountObj.IsDeletedMail(m.MailId) {
 		return true
 	}
 
diff --git a/server/mailserver/player/player.go b/server/mailserver/player/player.go
index 6cb31aba..6eb5751a 100644
--- a/server/mailserver/player/player.go
+++ b/server/mailserver/player/player.go
@@ -224,6 +224,7 @@ func (p *Player) SaveToDB() {
 }
 
 func (p *Player) MarkDirty() {
+	// f5.GetApp().RegisterMainThreadCb(func() {})
 	timer := f5.GetTimer()
 	timer.SetTimeout(
 		1000*10,
@@ -240,6 +241,6 @@ func NewPlayer(accountId string) *Player {
 		AccountId:       accountId,
 		ReadMailHash:    make(map[int64]*ReadMail),
 		DeletedMailHash: make(map[int64]*DeletedMail),
-		CacheExpiration: time.Now().Add(10 * time.Second),
+		CacheExpiration: time.Now().Add(20 * time.Second),
 	}
 }
diff --git a/server/mailserver/router/routermgr.go b/server/mailserver/router/routermgr.go
index e688e0b8..311b6021 100644
--- a/server/mailserver/router/routermgr.go
+++ b/server/mailserver/router/routermgr.go
@@ -4,6 +4,7 @@ import (
 	"f5"
 	"github.com/gin-gonic/gin"
 	"main/middleware"
+	"net/http"
 )
 
 type routerMgr struct {
@@ -12,6 +13,12 @@ type routerMgr struct {
 
 func (rm *routerMgr) Init() {
 	router := f5.GetApp().GetGinEngine()
+	router.NoRoute(func(c *gin.Context) {
+		c.JSON(http.StatusNotFound, gin.H{
+			"errcode": http.StatusNotFound,
+			"errmsg":  "Not Found",
+		})
+	})
 	router.Use(gin.Logger())
 
 	authRouterGroup := router.Group("api")