From 357ff13eee6bf0f09cad1dcc3097b9f102db839f Mon Sep 17 00:00:00 2001 From: shuangzhijinghua Date: Mon, 13 May 2019 01:08:37 +0800 Subject: [PATCH 1/5] add if is_admin --- user.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user.go b/user.go index f73f19d..2c083fe 100755 --- a/user.go +++ b/user.go @@ -42,6 +42,7 @@ type User struct { TransferEnable int64 `json:"transfer_enable"` U int64 `json:"u"` D int64 `json:"d"` + IsAdmin int `json:"is_admin"` V2rayUser VUser `json:"v2ray_user"` } @@ -72,6 +73,13 @@ func (u User) IsEnable() bool { return true } +func (u user) IsAdmin() bool { + if u.IsAdmin == 0 { + return false + } + return true +} + func (u User) GetCipher() (*ss.Cipher, error, bool) { method := u.Method auth := false From 06b1235d6f0441709942f8a2b3802a3a89748e6b Mon Sep 17 00:00:00 2001 From: shuangzhijinghua Date: Mon, 13 May 2019 01:21:11 +0800 Subject: [PATCH 2/5] fix a typo --- user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user.go b/user.go index 2c083fe..d613d57 100755 --- a/user.go +++ b/user.go @@ -73,7 +73,7 @@ func (u User) IsEnable() bool { return true } -func (u user) IsAdmin() bool { +func (u User) IsAdmin() bool { if u.IsAdmin == 0 { return false } From 82f3dfe4c3b3e48ab88f6b087f7e701e30ebbdd7 Mon Sep 17 00:00:00 2001 From: shuangzhijinghua Date: Mon, 13 May 2019 01:32:09 +0800 Subject: [PATCH 3/5] fix a typo --- user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user.go b/user.go index d613d57..d647a86 100755 --- a/user.go +++ b/user.go @@ -73,7 +73,7 @@ func (u User) IsEnable() bool { return true } -func (u User) IsAdmin() bool { +func (u User) Admin() bool { if u.IsAdmin == 0 { return false } From 0a5b15cd22cb4cea5a6c97708cdf95ce18346036 Mon Sep 17 00:00:00 2001 From: shuangzhijinghua Date: Mon, 13 May 2019 01:54:59 +0800 Subject: [PATCH 4/5] fix a typo --- user.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/user.go b/user.go index d647a86..5786e3f 100755 --- a/user.go +++ b/user.go @@ -42,7 +42,7 @@ type User struct { TransferEnable int64 `json:"transfer_enable"` U int64 `json:"u"` D int64 `json:"d"` - IsAdmin int `json:"is_admin"` + IsAdmin bool `json:"is_admin"` V2rayUser VUser `json:"v2ray_user"` } @@ -74,10 +74,7 @@ func (u User) IsEnable() bool { } func (u User) Admin() bool { - if u.IsAdmin == 0 { - return false - } - return true + return u.IsAdmin } func (u User) GetCipher() (*ss.Cipher, error, bool) { From d1ceee946cfbfc6963ff3d490efd38c04f48b991 Mon Sep 17 00:00:00 2001 From: shuangzhijinghua Date: Fri, 17 May 2019 23:35:14 +0800 Subject: [PATCH 5/5] add class determine --- user.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user.go b/user.go index 5786e3f..1f08353 100755 --- a/user.go +++ b/user.go @@ -43,10 +43,15 @@ type User struct { U int64 `json:"u"` D int64 `json:"d"` IsAdmin bool `json:"is_admin"` + Class int `json:"class"` V2rayUser VUser `json:"v2ray_user"` } +func (u User) GetClass() int { + return u.Class +} + func (u User) GetPort() int { return u.Port }