From 8b32ce6c89c8ce03dc2067ea03a79a0e5b3e5e1f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 13 Apr 2024 15:41:26 +0800
Subject: [PATCH] 1

---
 server/mailserver/mail/mail.go    | 29 +++++++++++++----------------
 server/mailserver/mail/mailmgr.go |  5 +++++
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/server/mailserver/mail/mail.go b/server/mailserver/mail/mail.go
index bad77c54..fc71708a 100644
--- a/server/mailserver/mail/mail.go
+++ b/server/mailserver/mail/mail.go
@@ -7,28 +7,25 @@ import (
 	//"strings"
 )
 
+type attachment struct {
+	itemId int32
+	itemNum int32
+}
+
 type mail struct {
-	GameId      int           `json:"-"`
-	MailId      int64         `json:"mailid,string"`
-	From        string        `json:"from"`
-	To          string        `json:"to"`
-	Subject     string        `json:"subject"`
-	Content     string        `json:"content"`
-	Flag        int           `json:"flags"`
-	SendTime    int32         `json:"sendtime"`
-	ExpireTime  int32         `json:"expiretime"`
-	MailType    int           `json:"mailtype"`
-	MailSubType int           `json:"mailsubtype"`
-	UserType    int           `json:"-"`
-	CreateTime  int32         `json:"-"`
-	Ext         string        `json:"ext"`
+	malid int64
+	subject string
+	content string
+	sendTime int32
+	expireTime int32
+	attachments []*attachment
 }
 
-func (m *mail) Init() {
+func (this *mail) Init() {
 
 }
 
-func NewMail() *mail {
+func newMail() *mail {
 	m := new(mail)
 	m.Init()
 	return m
diff --git a/server/mailserver/mail/mailmgr.go b/server/mailserver/mail/mailmgr.go
index 2c88f4f7..6a81d1b1 100644
--- a/server/mailserver/mail/mailmgr.go
+++ b/server/mailserver/mail/mailmgr.go
@@ -11,9 +11,14 @@ type userMail struct {
 	userMailHash map[string]map[string]*mail
 }
 
+type group struct {
+	userHash map[string]int32
+}
+
 type mailMgr struct {
 	idHash       map[int64]*mail
 	userMailArr [1024]*userMail
+	groupHash map[string]*group
 }
 
 func (this *mailMgr) Init() {