From ba78bd2acbcdcdc2a53ef8ae3a1210acd43af930 Mon Sep 17 00:00:00 2001 From: tengge <930372551@qq.com> Date: Fri, 15 May 2020 20:54:35 +0800 Subject: [PATCH] update imports --- server/go.sum | 1 + server/server/system/{model => }/config.go | 2 +- server/server/system/config/handle_get.go | 4 ++-- server/server/system/{model => }/department.go | 2 +- server/server/system/department/handle_list.go | 8 ++++---- server/server/system/{model => }/role.go | 2 +- server/server/system/role/handle_list.go | 6 +++--- server/server/system/{model => }/role_authority.go | 2 +- server/server/system/{model => }/user.go | 2 +- server/server/system/user/handle_list.go | 10 +++++----- server/server/user.go | 12 ++++++------ 11 files changed, 26 insertions(+), 25 deletions(-) rename server/server/system/{model => }/config.go (96%) rename server/server/system/{model => }/department.go (97%) rename server/server/system/{model => }/role.go (97%) rename server/server/system/{model => }/role_authority.go (97%) rename server/server/system/{model => }/user.go (98%) diff --git a/server/go.sum b/server/go.sum index e458cfcb..24269b68 100644 --- a/server/go.sum +++ b/server/go.sum @@ -336,6 +336,7 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/tengge1/shadoweditor/server v0.0.0-20200504012303-9192fe9f226c h1:aGG7kofghI2qpKsHd7KOv0rwi1oJgnjHfZBcA71UekU= github.com/tengge1/shadoweditor/server v0.0.0-20200504015715-5596e62b74dd h1:ZpiaZOrKlNkjzq83r8k5cT8VKKbiwQe+BCCaZrFDmZs= +github.com/tengge1/shadoweditor/server v0.0.0-20200515121047-ca1a176ced6d h1:vwCkoiaDr1Vmm+MxutDk9QypE7axDgISzDzGUOBnkDM= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.0.1 h1:WE4RBSZ1x6McVVC8S/Md+Qse8YUv6HRObAx6ke00NY8= diff --git a/server/server/system/model/config.go b/server/server/system/config.go similarity index 96% rename from server/server/system/model/config.go rename to server/server/system/config.go index 97162125..07ae457f 100644 --- a/server/server/system/model/config.go +++ b/server/server/system/config.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package model +package system // Config is mongodb config collection model. type Config struct { diff --git a/server/server/system/config/handle_get.go b/server/server/system/config/handle_get.go index eb555203..57eb2d72 100644 --- a/server/server/system/config/handle_get.go +++ b/server/server/system/config/handle_get.go @@ -15,7 +15,7 @@ import ( "github.com/tengge1/shadoweditor/helper" "github.com/tengge1/shadoweditor/server" - "github.com/tengge1/shadoweditor/server/system/model" + "github.com/tengge1/shadoweditor/server/system" ) func init() { @@ -30,7 +30,7 @@ func Get(w http.ResponseWriter, r *http.Request) { return } - config := model.Config{} + config := system.Config{} find, err := db.FindOne(server.ConfigCollectionName, bson.M{}, &config) if err != nil { helper.WriteJSON(w, server.Result{ diff --git a/server/server/system/model/department.go b/server/server/system/department.go similarity index 97% rename from server/server/system/model/department.go rename to server/server/system/department.go index 3a064f2f..944fa84e 100644 --- a/server/server/system/model/department.go +++ b/server/server/system/department.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package model +package system // Department is user department model. type Department struct { diff --git a/server/server/system/department/handle_list.go b/server/server/system/department/handle_list.go index 360fdf9a..08809508 100644 --- a/server/server/system/department/handle_list.go +++ b/server/server/system/department/handle_list.go @@ -14,7 +14,7 @@ import ( "github.com/tengge1/shadoweditor/helper" "github.com/tengge1/shadoweditor/server" - "github.com/tengge1/shadoweditor/server/system/model" + "github.com/tengge1/shadoweditor/server/system" ) func init() { @@ -30,7 +30,7 @@ func List(w http.ResponseWriter, r *http.Request) { } // get all the users - users := []model.User{} + users := []system.User{} err = db.FindMany(server.UserCollectionName, bson.M{}, &users) if err != nil { @@ -43,7 +43,7 @@ func List(w http.ResponseWriter, r *http.Request) { "Status": 0, } - list := []model.Department{} + list := []system.Department{} err = db.FindMany(server.DepartmentCollectionName, filter, &list) if err != nil { @@ -53,7 +53,7 @@ func List(w http.ResponseWriter, r *http.Request) { for key := range list { adminID := list[key].AdminID - var admin model.User + var admin system.User for _, user := range users { if user.ID == adminID { diff --git a/server/server/system/model/role.go b/server/server/system/role.go similarity index 97% rename from server/server/system/model/role.go rename to server/server/system/role.go index 3e084a45..8b3e98da 100644 --- a/server/server/system/model/role.go +++ b/server/server/system/role.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package model +package system import "time" diff --git a/server/server/system/role/handle_list.go b/server/server/system/role/handle_list.go index 06649a93..cac416d7 100644 --- a/server/server/system/role/handle_list.go +++ b/server/server/system/role/handle_list.go @@ -18,7 +18,7 @@ import ( "github.com/tengge1/shadoweditor/helper" "github.com/tengge1/shadoweditor/server" - "github.com/tengge1/shadoweditor/server/system/model" + "github.com/tengge1/shadoweditor/server/system" ) func init() { @@ -90,11 +90,11 @@ func List(w http.ResponseWriter, r *http.Request) { return } - rows := []model.Role{} + rows := []system.Role{} for _, doc := range docs { data := doc.(primitive.D).Map() - rows = append(rows, model.Role{ + rows = append(rows, system.Role{ ID: data["ID"].(primitive.ObjectID).Hex(), Name: data["Name"].(string), CreateTime: data["CreateTime"].(primitive.DateTime).Time(), diff --git a/server/server/system/model/role_authority.go b/server/server/system/role_authority.go similarity index 97% rename from server/server/system/model/role_authority.go rename to server/server/system/role_authority.go index 1acf6fbd..ab853cee 100644 --- a/server/server/system/model/role_authority.go +++ b/server/server/system/role_authority.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package model +package system // RoleAuthority presents a role's one authority. type RoleAuthority struct { diff --git a/server/server/system/model/user.go b/server/server/system/user.go similarity index 98% rename from server/server/system/model/user.go rename to server/server/system/user.go index d87380a6..e907bb38 100644 --- a/server/server/system/model/user.go +++ b/server/server/system/user.go @@ -5,7 +5,7 @@ // For more information, please visit: https://github.com/tengge1/ShadowEditor // You can also visit: https://gitee.com/tengge1/ShadowEditor -package model +package system import "time" diff --git a/server/server/system/user/handle_list.go b/server/server/system/user/handle_list.go index e8b210cf..ba1456e3 100644 --- a/server/server/system/user/handle_list.go +++ b/server/server/system/user/handle_list.go @@ -18,7 +18,7 @@ import ( "github.com/tengge1/shadoweditor/helper" "github.com/tengge1/shadoweditor/server" - "github.com/tengge1/shadoweditor/server/system/model" + "github.com/tengge1/shadoweditor/server/system" ) func init() { @@ -48,11 +48,11 @@ func List(w http.ResponseWriter, r *http.Request) { } // get all roles - roles := []model.Role{} + roles := []system.Role{} db.FindAll(server.RoleCollectionName, &roles) // get all departments - depts := []model.Department{} + depts := []system.Department{} db.FindAll(server.DepartmentCollectionName, &depts) // get users @@ -104,7 +104,7 @@ func List(w http.ResponseWriter, r *http.Request) { docs := bson.A{} db.FindMany(server.UserCollectionName, filter, &docs, &opts) - rows := []model.User{} + rows := []system.User{} for _, doc := range docs { data := doc.(primitive.D).Map() @@ -133,7 +133,7 @@ func List(w http.ResponseWriter, r *http.Request) { } } - rows = append(rows, model.User{ + rows = append(rows, system.User{ ID: data["ID"].(primitive.ObjectID).Hex(), Username: data["Username"].(string), Password: "", diff --git a/server/server/user.go b/server/server/user.go index 3e48fd1d..740f0dd2 100644 --- a/server/server/user.go +++ b/server/server/user.go @@ -15,12 +15,12 @@ import ( "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" - "github.com/tengge1/shadoweditor/server/system/model" + "github.com/tengge1/shadoweditor/server/system" ) // GetCurrentUser get the current login user. // It gets userID from the cookie. -func GetCurrentUser(r *http.Request) (*model.User, error) { +func GetCurrentUser(r *http.Request) (*system.User, error) { cookies := r.Cookies() if len(cookies) == 0 { @@ -49,7 +49,7 @@ func GetCurrentUser(r *http.Request) (*model.User, error) { } // GetUser get a user from userID. -func GetUser(userID string) (*model.User, error) { +func GetUser(userID string) (*system.User, error) { objectID, err := primitive.ObjectIDFromHex(userID) if err != nil { return nil, err @@ -64,7 +64,7 @@ func GetUser(userID string) (*model.User, error) { "ID": objectID, } - user := model.User{} + user := system.User{} find, err := mongo.FindOne(UserCollectionName, filter, &user) if err != nil { @@ -85,7 +85,7 @@ func GetUser(userID string) (*model.User, error) { "ID": objectID, } - role := model.Role{} + role := system.Role{} find, err = mongo.FindOne(RoleCollectionName, filter, &role) if err != nil { return nil, err @@ -111,7 +111,7 @@ func GetUser(userID string) (*model.User, error) { } for cursor.Next(context.TODO()) { - authority := model.RoleAuthority{} + authority := system.RoleAuthority{} cursor.Decode(&authority) user.OperatingAuthorities = append(user.OperatingAuthorities, authority.AuthorityID)