diff --git a/database/maildb.sql b/database/maildb.sql index 8c363051..f10d7166 100644 --- a/database/maildb.sql +++ b/database/maildb.sql @@ -43,7 +43,7 @@ CREATE TABLE `t_mail` ( `mail_type` int(11) NOT NULL DEFAULT '0' COMMENT '邮件类型', `subject` text NOT NULL DEFAULT '' COMMENT 'subject', `content` text NOT NULL DEFAULT '' COMMENT '消息内容', - `reciver` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '收件人', + `recipients` text NOT NULL DEFAULT '' COMMENT '收件人列表', `attachments` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '附件', `deleted` int(11) NOT NULL DEFAULT '0' COMMENT '是否已删除', `sendtime` int(11) NOT NULL DEFAULT '0' COMMENT '发送时间', @@ -58,24 +58,6 @@ CREATE TABLE `t_mail` ( /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; --- --- Table structure for table `t_address` --- - -DROP TABLE IF EXISTS `t_address`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `t_address` ( - `idx` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增id', - `mail_id` bigint NOT NULL COMMENT 'mail id', - `group_id` bigint NOT NULL COMMENT 'group id', - `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', - `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', - PRIMARY KEY (`idx`) -) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -- -- Table structure for table `t_group` -- diff --git a/server/adminserver/constant/constant.go b/server/adminserver/constant/constant.go index 31a4a2c4..0cf2acb4 100644 --- a/server/adminserver/constant/constant.go +++ b/server/adminserver/constant/constant.go @@ -26,7 +26,6 @@ const ( ) const ( - MAIL_TYPE_PERSONAL = 1 - MAIL_TYPE_GROUP = 2 - MAIL_TYPE_ALL = 3 + MAIL_TYPE_GROUP = 1 + MAIL_TYPE_ALL = 2 ) diff --git a/server/adminserver/model/system/mail.go b/server/adminserver/model/system/mail.go index 4b64d90f..e9df69c5 100644 --- a/server/adminserver/model/system/mail.go +++ b/server/adminserver/model/system/mail.go @@ -5,7 +5,7 @@ type Mail struct { MailType int32 `gorm:"column:mail_type"` Subject string `gorm:"column:subject"` Content string `gorm:"column:content"` - Reciver string `gorm:"column:reciver"` + Recipients string `gorm:"column:recipients"` Attachments string `gorm:"column:attachments"` Deleted int32 `gorm:"column:deleted"` SendTime int32 `gorm:"column:sendtime"`