Просмотр исходного кода

refactor(admin): Move Admin Web Route to user model

lejianwen 1 год назад
Родитель
Сommit
5082ab1893
3 измененных файлов с 7 добавлено и 8 удалено
  1. 0 5
      http/response/admin/user.go
  2. 5 0
      model/user.go
  3. 2 3
      service/user.go

+ 0 - 5
http/response/admin/user.go

@@ -18,11 +18,6 @@ func (lp *LoginPayload) FromUser(user *model.User) {
18
 	lp.Nickname = user.Nickname
18
 	lp.Nickname = user.Nickname
19
 }
19
 }
20
 
20
 
21
-var UserRouteNames = []string{
22
-	"MyTagList", "MyAddressBookList", "MyInfo", "MyAddressBookCollection", "MyPeer", "MyShareRecordList", "MyLoginLog",
23
-}
24
-var AdminRouteNames = []string{"*"}
25
-
26
 type UserOauthItem struct {
21
 type UserOauthItem struct {
27
 	Op     string `json:"op"`
22
 	Op     string `json:"op"`
28
 	Status int    `json:"status"`
23
 	Status int    `json:"status"`

+ 5 - 0
model/user.go

@@ -27,3 +27,8 @@ type UserList struct {
27
 	Users []*User `json:"list,omitempty"`
27
 	Users []*User `json:"list,omitempty"`
28
 	Pagination
28
 	Pagination
29
 }
29
 }
30
+
31
+var UserRouteNames = []string{
32
+	"MyTagList", "MyAddressBookList", "MyInfo", "MyAddressBookCollection", "MyPeer", "MyShareRecordList", "MyLoginLog",
33
+}
34
+var AdminRouteNames = []string{"*"}

+ 2 - 3
service/user.go

@@ -2,7 +2,6 @@ package service
2
 
2
 
3
 import (
3
 import (
4
 	"Gwen/global"
4
 	"Gwen/global"
5
-	adResp "Gwen/http/response/admin"
6
 	"Gwen/model"
5
 	"Gwen/model"
7
 	"Gwen/utils"
6
 	"Gwen/utils"
8
 	"errors"
7
 	"errors"
@@ -272,9 +271,9 @@ func (us *UserService) IsAdmin(u *model.User) bool {
272
 // RouteNames
271
 // RouteNames
273
 func (us *UserService) RouteNames(u *model.User) []string {
272
 func (us *UserService) RouteNames(u *model.User) []string {
274
 	if us.IsAdmin(u) {
273
 	if us.IsAdmin(u) {
275
-		return adResp.AdminRouteNames
274
+		return model.AdminRouteNames
276
 	}
275
 	}
277
-	return adResp.UserRouteNames
276
+	return model.UserRouteNames
278
 }
277
 }
279
 
278
 
280
 // InfoByOauthId 根据oauth的name和openId取用户信息
279
 // InfoByOauthId 根据oauth的name和openId取用户信息