发布v2.7.3版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

server/internal/model/config.go

@@ -157,6 +157,18 @@ type WechatConfig struct {
 	*WechatOpenPlatformConfig
 }
 
+// LoginConfig 登录配置
+type LoginConfig struct {
+	RegisterSwitch int     `json:"loginRegisterSwitch"`
+	CaptchaSwitch  int     `json:"loginCaptchaSwitch"`
+	Avatar         string  `json:"loginAvatar"`
+	Protocol       string  `json:"loginProtocol"`
+	Policy         string  `json:"loginPolicy"`
+	RoleId         int64   `json:"loginRoleId"`
+	DeptId         int64   `json:"loginDeptId"`
+	PostIds        []int64 `json:"loginPostIds"`
+}
+
 ///////////// 以下是本地配置
 
 // SSLConfig https配置

server/internal/model/do/admin_member.go

@@ -34,6 +34,7 @@ type AdminMember struct {
 	Pid                interface{} // 上级管理员ID
 	Level              interface{} // 关系树等级
 	Tree               interface{} // 关系树
+	InviteCode         interface{} // 邀请码
 	Cash               *gjson.Json // 提现配置
 	LastActiveAt       *gtime.Time // 最后活跃时间
 	Remark             interface{} // 备注

server/internal/model/entity/admin_member.go

@@ -32,6 +32,7 @@ type AdminMember struct {
 	Pid                int64       `json:"pid"                description:"上级管理员ID"`
 	Level              int         `json:"level"              description:"关系树等级"`
 	Tree               string      `json:"tree"               description:"关系树"`
+	InviteCode         string      `json:"inviteCode"         description:"邀请码"`
 	Cash               *gjson.Json `json:"cash"               description:"提现配置"`
 	LastActiveAt       *gtime.Time `json:"lastActiveAt"       description:"最后活跃时间"`
 	Remark             string      `json:"remark"             description:"备注"`

server/internal/model/input/adminin/member.go

@@ -82,48 +82,44 @@ type MemberResetPwdInp struct {
 	Id       int64  `json:"id" dc:"用户ID"`
 }
 
-// MemberEmailUniqueInp 邮箱是否唯一
-type MemberEmailUniqueInp struct {
-	Email string `json:"email" v:"required#邮箱不能为空"  dc:"邮箱"`
-	Id    int64  `json:"id" dc:"用户ID"`
-}
-
-type MemberEmailUniqueModel struct {
-	IsUnique bool
-}
-
-// MemberMobileUniqueInp 手机号是否唯一
-type MemberMobileUniqueInp struct {
-	Mobile string `json:"mobile" v:"required#手机号不能为空"  dc:"手机号"`
-	Id     int64  `json:"id" dc:"用户ID"`
-}
-
-type MemberMobileUniqueModel struct {
-	IsUnique bool
-}
-
-// MemberNameUniqueInp 名称是否唯一
-type MemberNameUniqueInp struct {
-	Username string `json:"username" v:"required#用户名称不能为空"  dc:"用户名称"`
-	Id       int64  `json:"id" dc:"用户ID"`
-}
-
-type MemberNameUniqueModel struct {
-	IsUnique bool
+type LoginMemberInfoModel struct {
+	Id          int64       `json:"id"                 dc:"用户ID"`
+	DeptName    string      `json:"deptName"           dc:"所属部门"`
+	RoleName    string      `json:"roleName"           dc:"所属角色"`
+	Permissions []string    `json:"permissions"        dc:"角色信息"`
+	DeptId      int64       `json:"-"                  dc:"部门ID"`
+	RoleId      int64       `json:"-"                  dc:"角色ID"`
+	Username    string      `json:"username"           dc:"用户名"`
+	RealName    string      `json:"realName"           dc:"姓名"`
+	Avatar      string      `json:"avatar"             dc:"头像"`
+	Balance     float64     `json:"balance"            dc:"余额"`
+	Integral    float64     `json:"integral"           dc:"积分"`
+	Sex         int         `json:"sex"                dc:"性别"`
+	Qq          string      `json:"qq"                 dc:"qq"`
+	Email       string      `json:"email"              dc:"邮箱"`
+	Mobile      string      `json:"mobile"             dc:"手机号码"`
+	Birthday    *gtime.Time `json:"birthday"           dc:"生日"`
+	CityId      int64       `json:"cityId"             dc:"城市编码"`
+	Address     string      `json:"address"            dc:"联系地址"`
+	Cash        *MemberCash `json:"cash"               dc:"收款信息"`
+	CreatedAt   *gtime.Time `json:"createdAt"          dc:"创建时间"`
+	OpenId      string      `json:"openId"             dc:"本次登录的openId"` // 区别与绑定的微信openid
+	InviteCode  string      `json:"inviteCode"         dc:"邀请码"`
+	*MemberLoginStatModel
 }
 
 // MemberEditInp 修改/新增管理员
 type MemberEditInp struct {
 	Id           int64       `json:"id"                                            dc:""`
-	RoleId       int         `json:"roleId"    v:"required#角色不能为空"            dc:"角色ID"`
-	PostIds      []int64     `json:"postIds"   v:"required#岗位不能为空"            dc:"岗位ID"`
-	DeptId       int64       `json:"deptId"    v:"required#部门不能为空"            dc:"部门ID"`
-	Username     string      `json:"username"   v:"required#账号不能为空"           dc:"帐号"`
+	RoleId       int64       `json:"roleId"    v:"required#角色不能为空"             dc:"角色ID"`
+	PostIds      []int64     `json:"postIds"   v:"required#岗位不能为空"             dc:"岗位ID"`
+	DeptId       int64       `json:"deptId"    v:"required#部门不能为空"             dc:"部门ID"`
+	Username     string      `json:"username"   v:"required#账号不能为空"            dc:"帐号"`
 	PasswordHash string      `json:"passwordHash"                                  dc:"密码hash"`
 	Password     string      `json:"password"                                      dc:"密码"`
 	RealName     string      `json:"realName"                                      dc:"真实姓名"`
 	Avatar       string      `json:"avatar"                                        dc:"头像"`
-	Sex          string      `json:"sex"                                           dc:"性别"`
+	Sex          int         `json:"sex"                                           dc:"性别"`
 	Qq           string      `json:"qq"                                            dc:"qq"`
 	Email        string      `json:"email"                                         dc:"邮箱"`
 	Birthday     *gtime.Time `json:"birthday"                                      dc:"生日"`
@@ -133,17 +129,18 @@ type MemberEditInp struct {
 	Address      string      `json:"address"                                       dc:"默认地址"`
 	Mobile       string      `json:"mobile"                                        dc:"手机号码"`
 	Remark       string      `json:"remark"                                        dc:"备注"`
-	Status       string      `json:"status"                                        dc:"状态"`
+	Status       int         `json:"status"                                        dc:"状态"`
 	CreatedAt    *gtime.Time `json:"createdAt"                                     dc:"创建时间"`
 	UpdatedAt    *gtime.Time `json:"updatedAt"                                     dc:"修改时间"`
 }
 
 type MemberAddInp struct {
 	MemberEditInp
-	Salt  string `json:"salt"               dc:"密码盐"`
-	Pid   int64  `json:"pid"                dc:"上级ID"`
-	Level int    `json:"level"              dc:"等级"`
-	Tree  string `json:"tree"               dc:"关系树"`
+	Salt       string `json:"salt"               dc:"密码盐"`
+	Pid        int64  `json:"pid"                dc:"上级ID"`
+	Level      int    `json:"level"              dc:"等级"`
+	Tree       string `json:"tree"               dc:"关系树"`
+	InviteCode string `json:"inviteCode"         dc:"邀请码"`
 }
 
 func (in *MemberEditInp) Filter(ctx context.Context) (err error) {
@@ -160,6 +157,12 @@ func (in *MemberEditInp) Filter(ctx context.Context) (err error) {
 
 type MemberEditModel struct{}
 
+// VerifyUniqueInp 验证管理员唯一属性
+type VerifyUniqueInp struct {
+	Id    int64
+	Where g.Map
+}
+
 // MemberDeleteInp 删除字典类型
 type MemberDeleteInp struct {
 	Id interface{} `json:"id" v:"required#用户ID不能为空" dc:"用户ID"`
@@ -200,45 +203,6 @@ type MemberListModel struct {
 	DeptId   int64   `json:"deptId"      dc:"部门ID"`
 }
 
-// MemberLoginInp 登录
-type MemberLoginInp struct {
-	Username string
-	Password string
-}
-type MemberLoginModel struct {
-	Id      int64  `json:"id"              dc:"用户ID"`
-	Token   string `json:"token"           dc:"登录token"`
-	Expires int64  `json:"expires"         dc:"登录有效期"`
-}
-
-type LoginMemberInfoModel struct {
-	Id          int64       `json:"id"                 dc:"用户ID"`
-	DeptName    string      `json:"deptName"           dc:"所属部门"`
-	RoleName    string      `json:"roleName"           dc:"所属角色"`
-	Permissions []string    `json:"permissions"        dc:"角色信息"`
-	DeptId      int64       `json:"-"                  dc:"部门ID"`
-	RoleId      int64       `json:"-"                  dc:"角色ID"`
-	Username    string      `json:"username"           dc:"用户名"`
-	RealName    string      `json:"realName"           dc:"姓名"`
-	Avatar      string      `json:"avatar"             dc:"头像"`
-	Balance     float64     `json:"balance"            dc:"余额"`
-	Integral    float64     `json:"integral"           dc:"积分"`
-	Sex         int         `json:"sex"                dc:"性别"`
-	Qq          string      `json:"qq"                 dc:"qq"`
-	Email       string      `json:"email"              dc:"邮箱"`
-	Mobile      string      `json:"mobile"             dc:"手机号码"`
-	Birthday    *gtime.Time `json:"birthday"           dc:"生日"`
-	CityId      int64       `json:"cityId"             dc:"城市编码"`
-	Address     string      `json:"address"            dc:"联系地址"`
-	Cash        *MemberCash `json:"cash"               dc:"收款信息"`
-	CreatedAt   *gtime.Time `json:"createdAt"          dc:"创建时间"`
-	OpenId      string      `json:"openId"             dc:"本次登录的openId"` // 区别与绑定的微信openid
-	*MemberLoginStatModel
-}
-
-// MemberLoginPermissions 登录用户角色信息
-type MemberLoginPermissions []string
-
 // MemberCash 用户提现配置
 type MemberCash struct {
 	Name      string `json:"name"       dc:"收款人姓名"`
@@ -263,17 +227,6 @@ type MemberSelectModel struct {
 	Avatar   string `json:"avatar"   dc:"头像"`
 }
 
-// MemberLoginStatInp 用户登录统计
-type MemberLoginStatInp struct {
-	MemberId int64
-}
-
-type MemberLoginStatModel struct {
-	LoginCount  int         `json:"loginCount"  dc:"登录次数"`
-	LastLoginAt *gtime.Time `json:"lastLoginAt" dc:"最后登录时间"`
-	LastLoginIp string      `json:"lastLoginIp" dc:"最后登录IP"`
-}
-
 // MemberAddBalanceInp  增加余额
 type MemberAddBalanceInp struct {
 	Id               int64   `json:"id"          v:"required#用户ID不能为空"         dc:"管理员ID"`

server/internal/model/input/adminin/site.go

@@ -0,0 +1,78 @@
+package adminin
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/encoding/gbase64"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+	"hotgo/internal/consts"
+	"hotgo/utility/encrypt"
+)
+
+// RegisterInp 账号注册
+type RegisterInp struct {
+	Username   string `json:"username" v:"required#用户名不能为空" dc:"用户名"`
+	Password   string `json:"password" v:"required#密码不能为空" dc:"密码"`
+	Mobile     string `json:"mobile" v:"required|phone-loose#手机号不能为空|手机号格式不正确" dc:"手机号"`
+	Code       string `json:"code" v:"required#验证码不能为空"  dc:"验证码"`
+	InviteCode string `json:"inviteCode" dc:"邀请码"`
+}
+
+func (in *RegisterInp) Filter(ctx context.Context) (err error) {
+	// 解密密码
+	str, err := gbase64.Decode([]byte(in.Password))
+	if err != nil {
+		return err
+	}
+
+	str, err = encrypt.AesECBDecrypt(str, consts.RequestEncryptKey)
+	if err != nil {
+		return err
+	}
+
+	password := string(str)
+
+	if err = g.Validator().Data(password).Rules("password").Messages("密码长度在6~18之间").Run(ctx); err != nil {
+		return
+	}
+
+	in.Password = password
+	return
+}
+
+// LoginModel 统一登录响应
+type LoginModel struct {
+	Id       int64  `json:"id"              dc:"用户ID"`
+	Username string `json:"username"        dc:"用户名"`
+	Token    string `json:"token"           dc:"登录token"`
+	Expires  int64  `json:"expires"         dc:"登录有效期"`
+}
+
+// AccountLoginInp 账号登录
+type AccountLoginInp struct {
+	Username string `json:"username" v:"required#用户名不能为空" dc:"用户名"`
+	Password string `json:"password" v:"required#密码不能为空" dc:"密码"`
+	Cid      string `json:"cid"  dc:"验证码ID"`
+	Code     string `json:"code" dc:"验证码"`
+	IsLock   bool   `json:"isLock"  dc:"是否为锁屏状态"`
+}
+
+// MobileLoginInp 手机号登录
+type MobileLoginInp struct {
+	Mobile string `json:"mobile" v:"required|phone-loose#手机号不能为空|手机号格式不正确" dc:"手机号"`
+	Code   string `json:"code" v:"required#验证码不能为空"  dc:"验证码"`
+}
+
+// MemberLoginPermissions 登录用户角色信息
+type MemberLoginPermissions []string
+
+// MemberLoginStatInp 用户登录统计
+type MemberLoginStatInp struct {
+	MemberId int64
+}
+
+type MemberLoginStatModel struct {
+	LoginCount  int         `json:"loginCount"  dc:"登录次数"`
+	LastLoginAt *gtime.Time `json:"lastLoginAt" dc:"最后登录时间"`
+	LastLoginIp string      `json:"lastLoginIp" dc:"最后登录IP"`
+}

server/internal/model/input/payin/pay.go

@@ -88,10 +88,9 @@ type PayViewModel struct {
 // PayListInp 获取支付日志列表
 type PayListInp struct {
 	form.PageReq
-	Id               int64         `json:"id"               dc:"ID"`
-	Status           int           `json:"status"           dc:"状态"`
-	CreatedAt        []*gtime.Time `json:"createdAt"        dc:"创建时间"`
-	TestCategoryName string        `json:"testCategoryName" dc:"分类名称"`
+	Id        int64         `json:"id"               dc:"ID"`
+	Status    int           `json:"status"           dc:"状态"`
+	CreatedAt []*gtime.Time `json:"createdAt"        dc:"创建时间"`
 }
 
 func (in *PayListInp) Filter(ctx context.Context) (err error) {

server/internal/model/input/sysin/login_log.go

@@ -3,7 +3,6 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-//
 package sysin
 
 import (
@@ -84,7 +83,6 @@ type LoginLogExportModel struct {
 
 // LoginLogPushInp 解推送登录日志
 type LoginLogPushInp struct {
-	Input    adminin.MemberLoginInp
-	Response *adminin.MemberLoginModel
+	Response *adminin.LoginModel
 	Err      error
 }

server/internal/model/input/sysin/sms_log.go

@@ -55,8 +55,7 @@ type SmsLogListInp struct {
 
 func (in *SmsLogListInp) Filter(ctx context.Context) (err error) {
 	if in.Event != "" {
-		_, ok := consts.SmsTemplateEventMap[in.Event]
-		if !ok {
+		if _, ok := consts.SmsTemplateEventMap[in.Event]; !ok {
 			err = gerror.Newf("无效的事件类型:%v", in.Event)
 			return
 		}