From 835cd6d14a778b8b51eadb2f44a84a7b36dee836 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Fri, 17 Mar 2023 11:14:14 +0800 Subject: [PATCH] pkg --- internal/rpc/auth/auth.go | 2 +- {internal/api => pkg}/a2r/api2rpc.go | 2 +- {internal => pkg}/apiresp/gin.go | 0 {internal => pkg}/apiresp/resp.go | 0 {internal => pkg}/common/network/ip.go | 0 {internal/common => pkg/rpcclient}/check/access.go | 0 {internal/common => pkg/rpcclient}/check/black.go | 0 {internal/common => pkg/rpcclient}/check/conversation.go | 0 {internal/common => pkg/rpcclient}/check/friend.go | 0 {internal/common => pkg/rpcclient}/check/group.go | 0 {internal/common => pkg/rpcclient}/check/msg.go | 0 {internal/common => pkg/rpcclient}/check/user.go | 0 {internal/common => pkg/rpcclient}/convert/convert.go | 2 +- {internal/common => pkg/rpcclient}/notification/c.go | 2 +- {internal/common => pkg/rpcclient}/notification/conversation.go | 0 {internal/common => pkg/rpcclient}/notification/extend_msg.go | 0 {internal/common => pkg/rpcclient}/notification/friend.go | 0 {internal/common => pkg/rpcclient}/notification/group.go | 0 {internal/common => pkg/rpcclient}/notification/msg.go | 0 {internal/common => pkg/rpcclient}/notification/super_group.go | 0 {internal/common => pkg/rpcclient}/notification/user.go | 0 {internal => pkg}/startrpc/start.go | 2 +- 22 files changed, 5 insertions(+), 5 deletions(-) rename {internal/api => pkg}/a2r/api2rpc.go (95%) rename {internal => pkg}/apiresp/gin.go (100%) rename {internal => pkg}/apiresp/resp.go (100%) rename {internal => pkg}/common/network/ip.go (100%) rename {internal/common => pkg/rpcclient}/check/access.go (100%) rename {internal/common => pkg/rpcclient}/check/black.go (100%) rename {internal/common => pkg/rpcclient}/check/conversation.go (100%) rename {internal/common => pkg/rpcclient}/check/friend.go (100%) rename {internal/common => pkg/rpcclient}/check/group.go (100%) rename {internal/common => pkg/rpcclient}/check/msg.go (100%) rename {internal/common => pkg/rpcclient}/check/user.go (100%) rename {internal/common => pkg/rpcclient}/convert/convert.go (99%) rename {internal/common => pkg/rpcclient}/notification/c.go (99%) rename {internal/common => pkg/rpcclient}/notification/conversation.go (100%) rename {internal/common => pkg/rpcclient}/notification/extend_msg.go (100%) rename {internal/common => pkg/rpcclient}/notification/friend.go (100%) rename {internal/common => pkg/rpcclient}/notification/group.go (100%) rename {internal/common => pkg/rpcclient}/notification/msg.go (100%) rename {internal/common => pkg/rpcclient}/notification/super_group.go (100%) rename {internal/common => pkg/rpcclient}/notification/user.go (100%) rename {internal => pkg}/startrpc/start.go (97%) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index da47bfe9f..3852d5ff7 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -2,7 +2,6 @@ package auth import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/internal/common/check" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache" @@ -13,6 +12,7 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" pbAuth "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/auth" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msggateway" + "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/check" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "google.golang.org/grpc" ) diff --git a/internal/api/a2r/api2rpc.go b/pkg/a2r/api2rpc.go similarity index 95% rename from internal/api/a2r/api2rpc.go rename to pkg/a2r/api2rpc.go index 708088898..ebdbf11ce 100644 --- a/internal/api/a2r/api2rpc.go +++ b/pkg/a2r/api2rpc.go @@ -2,7 +2,7 @@ package a2r import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/internal/apiresp" + "github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/gin-gonic/gin" diff --git a/internal/apiresp/gin.go b/pkg/apiresp/gin.go similarity index 100% rename from internal/apiresp/gin.go rename to pkg/apiresp/gin.go diff --git a/internal/apiresp/resp.go b/pkg/apiresp/resp.go similarity index 100% rename from internal/apiresp/resp.go rename to pkg/apiresp/resp.go diff --git a/internal/common/network/ip.go b/pkg/common/network/ip.go similarity index 100% rename from internal/common/network/ip.go rename to pkg/common/network/ip.go diff --git a/internal/common/check/access.go b/pkg/rpcclient/check/access.go similarity index 100% rename from internal/common/check/access.go rename to pkg/rpcclient/check/access.go diff --git a/internal/common/check/black.go b/pkg/rpcclient/check/black.go similarity index 100% rename from internal/common/check/black.go rename to pkg/rpcclient/check/black.go diff --git a/internal/common/check/conversation.go b/pkg/rpcclient/check/conversation.go similarity index 100% rename from internal/common/check/conversation.go rename to pkg/rpcclient/check/conversation.go diff --git a/internal/common/check/friend.go b/pkg/rpcclient/check/friend.go similarity index 100% rename from internal/common/check/friend.go rename to pkg/rpcclient/check/friend.go diff --git a/internal/common/check/group.go b/pkg/rpcclient/check/group.go similarity index 100% rename from internal/common/check/group.go rename to pkg/rpcclient/check/group.go diff --git a/internal/common/check/msg.go b/pkg/rpcclient/check/msg.go similarity index 100% rename from internal/common/check/msg.go rename to pkg/rpcclient/check/msg.go diff --git a/internal/common/check/user.go b/pkg/rpcclient/check/user.go similarity index 100% rename from internal/common/check/user.go rename to pkg/rpcclient/check/user.go diff --git a/internal/common/convert/convert.go b/pkg/rpcclient/convert/convert.go similarity index 99% rename from internal/common/convert/convert.go rename to pkg/rpcclient/convert/convert.go index da044e436..a37fa322b 100644 --- a/internal/common/convert/convert.go +++ b/pkg/rpcclient/convert/convert.go @@ -2,10 +2,10 @@ package convert import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/internal/common/check" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" discoveryRegistry "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" sdk "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" + "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/check" utils2 "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" utils "github.com/OpenIMSDK/open_utils" "time" diff --git a/internal/common/notification/c.go b/pkg/rpcclient/notification/c.go similarity index 99% rename from internal/common/notification/c.go rename to pkg/rpcclient/notification/c.go index 36ecf77ce..ba08c7442 100644 --- a/internal/common/notification/c.go +++ b/pkg/rpcclient/notification/c.go @@ -2,12 +2,12 @@ package notification import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/internal/common/check" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" discoveryRegistry "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" + "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/check" utils "github.com/OpenIMSDK/open_utils" ) diff --git a/internal/common/notification/conversation.go b/pkg/rpcclient/notification/conversation.go similarity index 100% rename from internal/common/notification/conversation.go rename to pkg/rpcclient/notification/conversation.go diff --git a/internal/common/notification/extend_msg.go b/pkg/rpcclient/notification/extend_msg.go similarity index 100% rename from internal/common/notification/extend_msg.go rename to pkg/rpcclient/notification/extend_msg.go diff --git a/internal/common/notification/friend.go b/pkg/rpcclient/notification/friend.go similarity index 100% rename from internal/common/notification/friend.go rename to pkg/rpcclient/notification/friend.go diff --git a/internal/common/notification/group.go b/pkg/rpcclient/notification/group.go similarity index 100% rename from internal/common/notification/group.go rename to pkg/rpcclient/notification/group.go diff --git a/internal/common/notification/msg.go b/pkg/rpcclient/notification/msg.go similarity index 100% rename from internal/common/notification/msg.go rename to pkg/rpcclient/notification/msg.go diff --git a/internal/common/notification/super_group.go b/pkg/rpcclient/notification/super_group.go similarity index 100% rename from internal/common/notification/super_group.go rename to pkg/rpcclient/notification/super_group.go diff --git a/internal/common/notification/user.go b/pkg/rpcclient/notification/user.go similarity index 100% rename from internal/common/notification/user.go rename to pkg/rpcclient/notification/user.go diff --git a/internal/startrpc/start.go b/pkg/startrpc/start.go similarity index 97% rename from internal/startrpc/start.go rename to pkg/startrpc/start.go index c9f5860c3..c8cdfdf09 100644 --- a/internal/startrpc/start.go +++ b/pkg/startrpc/start.go @@ -2,11 +2,11 @@ package startrpc import ( "fmt" - "github.com/OpenIMSDK/Open-IM-Server/internal/common/network" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/network" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/prome" "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils"