diff --git a/http/response/admin/user.go b/http/response/admin/user.go index 568aba0..a8e0d21 100644 --- a/http/response/admin/user.go +++ b/http/response/admin/user.go @@ -18,11 +18,6 @@ func (lp *LoginPayload) FromUser(user *model.User) { lp.Nickname = user.Nickname } -var UserRouteNames = []string{ - "MyTagList", "MyAddressBookList", "MyInfo", "MyAddressBookCollection", "MyPeer", "MyShareRecordList", "MyLoginLog", -} -var AdminRouteNames = []string{"*"} - type UserOauthItem struct { Op string `json:"op"` Status int `json:"status"` diff --git a/model/user.go b/model/user.go index fe2f99d..62fa64f 100644 --- a/model/user.go +++ b/model/user.go @@ -27,3 +27,8 @@ type UserList struct { Users []*User `json:"list,omitempty"` Pagination } + +var UserRouteNames = []string{ + "MyTagList", "MyAddressBookList", "MyInfo", "MyAddressBookCollection", "MyPeer", "MyShareRecordList", "MyLoginLog", +} +var AdminRouteNames = []string{"*"} diff --git a/service/user.go b/service/user.go index bcb3fbe..73b1125 100644 --- a/service/user.go +++ b/service/user.go @@ -2,7 +2,6 @@ package service import ( "Gwen/global" - adResp "Gwen/http/response/admin" "Gwen/model" "Gwen/utils" "errors" @@ -272,9 +271,9 @@ func (us *UserService) IsAdmin(u *model.User) bool { // RouteNames func (us *UserService) RouteNames(u *model.User) []string { if us.IsAdmin(u) { - return adResp.AdminRouteNames + return model.AdminRouteNames } - return adResp.UserRouteNames + return model.UserRouteNames } // InfoByOauthId 根据oauth的name和openId取用户信息