api pack move

internal/api/a2r/api2rpc.go

@@ -0,0 +1,43 @@
+package a2r
+
+import (
+	"OpenIM/internal/apiresp"
+	"OpenIM/pkg/common/constant"
+	"context"
+	"github.com/gin-gonic/gin"
+	"google.golang.org/grpc"
+	"net/http"
+)
+
+func Call[A, B, C any](
+	rpc func(client C, ctx context.Context, req *A, options ...grpc.CallOption) (*B, error),
+	client func() (C, error),
+	c *gin.Context,
+) {
+	var resp *apiresp.ApiResponse
+	defer func() {
+		c.JSON(http.StatusOK, resp)
+	}()
+	var req A
+	if err := c.BindJSON(&req); err != nil {
+		resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数错误
+		return
+	}
+	if check, ok := any(&req).(interface{ Check() error }); ok {
+		if err := check.Check(); err != nil {
+			resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数校验失败
+			return
+		}
+	}
+	cli, err := client()
+	if err != nil {
+		resp = apiresp.Error(constant.ErrInternalServer.Wrap(err.Error())) // 参数校验失败
+		return
+	}
+	data, err := rpc(cli, c, &req)
+	if err != nil {
+		resp = apiresp.Error(err) // 参数校验失败
+		return
+	}
+	resp = apiresp.Success(data) // 成功
+}

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"

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"

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"

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

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"