diff --git a/server/mailserver/constant/constant.go b/server/mailserver/constant/constant.go index cba78973..32638126 100644 --- a/server/mailserver/constant/constant.go +++ b/server/mailserver/constant/constant.go @@ -1,9 +1,5 @@ package constant -const ( - MAX_PACKET_LEN = 1024 * 64 -) - const ( MAIL_DB = "maildb" ) @@ -16,8 +12,8 @@ const ( MAX_MODULE_IDX ) -// mail const ( - MAIL_TYPE_PLAYER = 1 + MAIL_TYPE_PERSONAL = 1 MAIL_TYPE_GROUP = 2 + MAIL_TYPE_ALL = 3 ) diff --git a/server/mailserver/mail/mail.go b/server/mailserver/mail/mail.go index df88b929..63879fa8 100644 --- a/server/mailserver/mail/mail.go +++ b/server/mailserver/mail/mail.go @@ -19,6 +19,8 @@ type mail struct { content string sendTime int32 expireTime int32 + userRegStart int32 + userRegEnd int32 attachments []*attachment userGroups map[int64]*userGroup reciver string diff --git a/server/mailserver/mail/mailmgr.go b/server/mailserver/mail/mailmgr.go index d268895f..0b10e47b 100644 --- a/server/mailserver/mail/mailmgr.go +++ b/server/mailserver/mail/mailmgr.go @@ -18,21 +18,19 @@ type userGroup struct { type mailMgr struct { idHash map[int64]*mail + allMails map[int64]*mail userMailArr [1024]*userMail groupHash map[int64]*userGroup } func (this *mailMgr) Init() { this.idHash = make(map[int64]*mail) - this.fetchmailFromDB() + this.loadFromDB() } func (this *mailMgr) UnInit() { } -func (this *mailMgr) fetchmailFromDB() { -} - func (this *mailMgr) loadFromDB() { }