db.go文件冲突已解决

server/dbdata/tables.go

@@ -118,3 +118,9 @@ type StatsMem struct {
 	Percent   float64   `json:"percent" xorm:"Float"`
 	CreatedAt time.Time `json:"created_at" xorm:"DateTime created index"`
 }
+
+type PasswordReset struct {
+	Token     string `json:"token" xorm:"varchar(60) not null unique"`
+	UserId    int    `json:"id" xorm:"not null"`
+	ExpiresAt int    `json:"expires_at" xorm:"not null"`
+}

server/dbdata/userauth_radius.go

@@ -75,8 +75,11 @@ func (auth AuthRadius) checkUser(name, pwd string, g *Group, ext map[string]inte
 			return fmt.Errorf("%s %s", name, "Radius set nasip 出现错误")
 		}
 	}
-	macAddr := ext["mac_addr"].(string)
-	base.Trace("AuthRadius", ext, macAddr)
+	macAddr := ""
+	if ext["mac_addr"] != nil {
+		macAddr = ext["mac_addr"].(string)
+		base.Trace("AuthRadius", ext, macAddr)
+	}
 	if macAddr != "" {
 		err = rfc2865.CallingStationID_AddString(packet, macAddr)
 		if err != nil {
@@ -94,5 +97,4 @@ func (auth AuthRadius) checkUser(name, pwd string, g *Group, ext map[string]inte
 		return fmt.Errorf("%s %s", name, "Radius：用户名或密码错误")
 	}
 	return nil
-
 }