diff --git a/internal/a2r/api2rpc.go b/internal/api/a2r/api2rpc.go similarity index 100% rename from internal/a2r/api2rpc.go rename to internal/api/a2r/api2rpc.go diff --git a/internal/api/auth/auth.go b/internal/api/auth.go similarity index 96% rename from internal/api/auth/auth.go rename to internal/api/auth.go index 557299458..da67f62ce 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth.go @@ -1,7 +1,7 @@ -package apiAuth +package api import ( - "OpenIM/internal/a2r" + "OpenIM/internal/api/a2r" "OpenIM/pkg/common/config" auth "OpenIM/pkg/proto/auth" "context" diff --git a/internal/api/friend/friend.go b/internal/api/friend.go similarity index 98% rename from internal/api/friend/friend.go rename to internal/api/friend.go index 6d0e630b6..09b1db166 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend.go @@ -1,7 +1,7 @@ -package friend +package api import ( - "OpenIM/internal/a2r" + "OpenIM/internal/api/a2r" "OpenIM/pkg/common/config" "OpenIM/pkg/proto/friend" "context" diff --git a/internal/api/group/group.go b/internal/api/group.go similarity index 98% rename from internal/api/group/group.go rename to internal/api/group.go index 91d5115b6..d7e481262 100644 --- a/internal/api/group/group.go +++ b/internal/api/group.go @@ -1,7 +1,7 @@ -package group +package api import ( - "OpenIM/internal/a2r" + "OpenIM/internal/api/a2r" "OpenIM/pkg/common/config" "OpenIM/pkg/proto/group" "context" diff --git a/internal/api/route.go b/internal/api/route.go index 48c5fd5db..b2df5cdbb 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -1,14 +1,10 @@ package api import ( - "OpenIM/internal/api/auth" "OpenIM/internal/api/conversation" - "OpenIM/internal/api/friend" - "OpenIM/internal/api/group" "OpenIM/internal/api/manage" "OpenIM/internal/api/msg" "OpenIM/internal/api/third" - "OpenIM/internal/api/user" "OpenIM/pkg/common/config" "OpenIM/pkg/common/log" "OpenIM/pkg/common/middleware" @@ -37,7 +33,7 @@ func NewGinRouter() *gin.Engine { userRouterGroup := r.Group("/user") { - u := user.NewUser(nil) + u := NewUser(nil) userRouterGroup.POST("/update_user_info", u.UpdateUserInfo) //1 userRouterGroup.POST("/set_global_msg_recv_opt", u.SetGlobalRecvMessageOpt) userRouterGroup.POST("/get_users_info", u.GetUsersPublicInfo) //1 @@ -53,7 +49,7 @@ func NewGinRouter() *gin.Engine { ////friend routing group friendRouterGroup := r.Group("/friend") { - f := friend.NewFriend(nil) + f := NewFriend(nil) friendRouterGroup.POST("/add_friend", f.AddFriend) //1 friendRouterGroup.POST("/delete_friend", f.DeleteFriend) //1 friendRouterGroup.POST("/get_friend_apply_list", f.GetFriendApplyList) //1 @@ -69,7 +65,7 @@ func NewGinRouter() *gin.Engine { } groupRouterGroup := r.Group("/group") - g := group.NewGroup(nil) + g := NewGroup(nil) { groupRouterGroup.POST("/create_group", g.NewCreateGroup) //1 groupRouterGroup.POST("/set_group_info", g.NewSetGroupInfo) //1 @@ -102,7 +98,7 @@ func NewGinRouter() *gin.Engine { ////certificate authRouterGroup := r.Group("/auth") { - a := apiAuth.NewAuth(nil) + a := NewAuth(nil) authRouterGroup.POST("/user_register", a.UserRegister) //1 authRouterGroup.POST("/user_token", a.UserToken) //1 authRouterGroup.POST("/parse_token", a.ParseToken) //1 diff --git a/internal/api/user/user.go b/internal/api/user.go similarity index 97% rename from internal/api/user/user.go rename to internal/api/user.go index ce5b47b75..9b3f4a043 100644 --- a/internal/api/user/user.go +++ b/internal/api/user.go @@ -1,7 +1,7 @@ -package user +package api import ( - "OpenIM/internal/a2r" + "OpenIM/internal/api/a2r" "OpenIM/pkg/common/config" "OpenIM/pkg/proto/user" "context"