mirrors/v2ray-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename VMessAccount to vmess.Account

Browse Source
This commit is contained in:
v2ray
2016-07-25 17:36:24 +02:00
parent 2049759640
commit 2034d54bab
17 changed files with 288 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/protocol/user_json.go
View File

@@ -14,16 +14,8 @@ func (u *User) UnmarshalJSON(data []byte) error {
return err
}
var rawAccount AccountJson
if err := json.Unmarshal(data, &rawAccount); err != nil {
return err
}
account, err := rawAccount.GetAccount()
if err != nil {
return err
}
*u = *NewUser(account, UserLevel(rawUserValue.LevelByte), rawUserValue.EmailString)
u.Email = rawUserValue.EmailString
u.Level = UserLevel(rawUserValue.LevelByte)
return nil
}