diff --git a/QMPlusServer/controller/api/sys_user.go b/QMPlusServer/controller/api/sys_user.go
index 29f98a372c5bb8b342be8d483f7054ab4d3b312f..56651fb0a3b1f38112c527dae6d7091d71ebce46 100644
--- a/QMPlusServer/controller/api/sys_user.go
+++ b/QMPlusServer/controller/api/sys_user.go
@@ -23,6 +23,14 @@ type RegistAndLoginStuct struct {
 	Password string `json:"password"`
 }
 
+type RegestStuct struct {
+	Username    string       `json:"userName"`
+	Password    string       `json:"passWord"`
+	NickName    string       `json:"nickName" gorm:"default:'QMPlusUser'"`
+	HeaderImg   string       `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"`
+	AuthorityId string       `json:"authorityId" gorm:"default:888"`
+}
+
 // @Tags Base
 // @Summary 用户注册账号
 // @Produce  application/json
@@ -30,9 +38,10 @@ type RegistAndLoginStuct struct {
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
 // @Router /base/regist [post]
 func Regist(c *gin.Context) {
-	var R sysModel.SysUser
+	var R RegestStuct
 	_ = c.BindJSON(&R)
-	err, user := R.Regist()
+	user := &sysModel.SysUser{Username:R.Username,NickName:R.NickName,Password:R.Password,HeaderImg:R.HeaderImg,AuthorityId:R.AuthorityId}
+	err, user := user.Regist()
 	if err != nil {
 		servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{
 			"user": user,
diff --git a/QMPlusServer/model/sysModel/sys_user.go b/QMPlusServer/model/sysModel/sys_user.go
index 1278e075909f38a775c7638f3324a0ae47753358..d86b7d20dd911ab78c5bdf03d7377eff781ad969 100644
--- a/QMPlusServer/model/sysModel/sys_user.go
+++ b/QMPlusServer/model/sysModel/sys_user.go
@@ -62,6 +62,9 @@ func (u *SysUser) Login() (err error, userInter *SysUser) {
 	var user SysUser
 	u.Password = tools.MD5V(u.Password)
 	err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error
+	if(err!=nil){
+		return err,&user
+	}
 	err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error
 	return err, &user
 }