diff --git a/database/maildb.sql b/database/maildb.sql index 86d40ef3..83886056 100644 --- a/database/maildb.sql +++ b/database/maildb.sql @@ -70,6 +70,7 @@ CREATE TABLE `t_group` ( `group_id` bigint NOT NULL COMMENT 'group id', `group_name` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '分组名', `group_desc` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '描述', + `enabled` int(11) NOT NULL DEFAULT '0' COMMENT '是否已启用', `deleted` int(11) NOT NULL DEFAULT '0' COMMENT '是否已删除', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', diff --git a/doc/admin/common.js b/doc/admin/common.js index 2bb90ff6..582a027f 100644 --- a/doc/admin/common.js +++ b/doc/admin/common.js @@ -23,8 +23,8 @@ exports.RspHead = class RspHead { constructor() { this.fields = [ - ['errcode', 0, '错误码/0 成功;1 失败'], - ['errmsg', '', '错误描述'], + ['code', 0, '错误码/0 成功;1 失败'], + ['message', '', '错误描述'], ]; } @@ -51,3 +51,19 @@ exports.Mail = class RspHead { } }; + +exports.UserGroup = class RspHead { + + constructor() { + this.fields = [ + ['group_id', '', '组id'], + ['group_name', '', '组名'], + ['group_desc', '', '描述'], + ['enabled', 0, '是否已启用'], + ['deleted', 0, '是否已删除'], + ['createtime', 0, '创建时间'], + ['modifytime', 0, '修改时间'], + ]; + } + +}; diff --git a/doc/admin/mail.js b/doc/admin/mail.js index 144bbea9..76eded08 100644 --- a/doc/admin/mail.js +++ b/doc/admin/mail.js @@ -17,7 +17,7 @@ module.exports = class { ], 'response': [ new common.RspHead(), - ['!mail_list', common.Mail()] + ['!data', common.Mail()] ] }, diff --git a/server/adminserver/api/v1/system/enter.go b/server/adminserver/api/v1/system/enter.go index 63f38c05..732b2605 100644 --- a/server/adminserver/api/v1/system/enter.go +++ b/server/adminserver/api/v1/system/enter.go @@ -6,5 +6,6 @@ type ApiGroup struct { AuditApi EmailApi MailApi + UserGroupApi BattleServerApi } diff --git a/server/adminserver/api/v1/system/user_group.go b/server/adminserver/api/v1/system/user_group.go new file mode 100644 index 00000000..1f728c36 --- /dev/null +++ b/server/adminserver/api/v1/system/user_group.go @@ -0,0 +1,14 @@ +package system + +import ( + "github.com/gin-gonic/gin" +) + +type UserGroupApi struct { +} + +func (this *UserGroupApi) List(c *gin.Context) { +} + +func (this *UserGroupApi) Add(c *gin.Context) { +} diff --git a/server/adminserver/model/system/group.go b/server/adminserver/model/system/group.go new file mode 100644 index 00000000..6c9e7c73 --- /dev/null +++ b/server/adminserver/model/system/group.go @@ -0,0 +1,15 @@ +package system + +type Group struct { + GroupId int64 `gorm:"unique;column:group_id" json:"group_id"` + GroupName string `gorm:"unique;column:group_name" json:"group_name"` + GroupDesc string `gorm:"column:group_desc" json:"group_desc"` + Enabled int32 `gorm:"unique;column:enabled" json:"enabled"` + Deleted int32 `gorm:"unique;column:deleted" json:"deleted"` + CreateTime int32 `gorm:"unique;column:createtime" json:"createtime"` + ModifyTime int32 `gorm:"unique;column:modifytime" json:"modifytime"` +} + +func (Group) TableName() string { + return "t_group" +} diff --git a/server/adminserver/router/system/user_group.go b/server/adminserver/router/system/user_group.go new file mode 100644 index 00000000..a434c1db --- /dev/null +++ b/server/adminserver/router/system/user_group.go @@ -0,0 +1,19 @@ +package system + +import ( + "github.com/gin-gonic/gin" + "main/api/v1" +) + +type UserGroupRoute struct{ + +} + +func (this *UserGroupRoute) InitMailRouter(priRouter *gin.RouterGroup) { + group := priRouter.Group("user_group") + api := v1.ApiGroupApp.SystemApiGroup.UserGroupApi + { + group.POST("add", api.Add) + group.GET("list", api.List) + } +}