diff --git a/internal/api/auth/user_register.go b/internal/api/auth/user_register.go index 72c567df9..b270e345f 100644 --- a/internal/api/auth/user_register.go +++ b/internal/api/auth/user_register.go @@ -1,10 +1,10 @@ package apiAuth import ( + pbAuth "Open_IM/pkg/proto/auth" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbAuth "Open_IM/src/proto/auth" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/auth/user_token.go b/internal/api/auth/user_token.go index 7f48e7f0b..f018237f2 100644 --- a/internal/api/auth/user_token.go +++ b/internal/api/auth/user_token.go @@ -1,10 +1,10 @@ package apiAuth import ( + pbAuth "Open_IM/pkg/proto/auth" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbAuth "Open_IM/src/proto/auth" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/chat/newest_seq.go b/internal/api/chat/newest_seq.go index 9fa7e1836..d2131b332 100644 --- a/internal/api/chat/newest_seq.go +++ b/internal/api/chat/newest_seq.go @@ -1,10 +1,10 @@ package apiChat import ( + pbMsg "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbMsg "Open_IM/src/proto/chat" "Open_IM/src/utils" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/chat/pull_msg.go b/internal/api/chat/pull_msg.go index 7e62d4f7d..19634a5fa 100644 --- a/internal/api/chat/pull_msg.go +++ b/internal/api/chat/pull_msg.go @@ -1,10 +1,10 @@ package apiChat import ( + "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - "Open_IM/src/proto/chat" "Open_IM/src/utils" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/chat/send_msg.go b/internal/api/chat/send_msg.go index ede81abdd..71042bdca 100644 --- a/internal/api/chat/send_msg.go +++ b/internal/api/chat/send_msg.go @@ -1,9 +1,9 @@ package apiChat import ( + pbChat "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/log" - pbChat "Open_IM/src/proto/chat" "Open_IM/src/utils" "context" diff --git a/internal/api/friend/add_blacklist.go b/internal/api/friend/add_blacklist.go index 1e03b53ec..51c6cab96 100644 --- a/internal/api/friend/add_blacklist.go +++ b/internal/api/friend/add_blacklist.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/friend/add_friend.go b/internal/api/friend/add_friend.go index 40fee7dac..8f80da958 100644 --- a/internal/api/friend/add_friend.go +++ b/internal/api/friend/add_friend.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/friend/add_friend_response.go b/internal/api/friend/add_friend_response.go index 762daa798..d50e520d6 100644 --- a/internal/api/friend/add_friend_response.go +++ b/internal/api/friend/add_friend_response.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/api/friend/delete_friend.go b/internal/api/friend/delete_friend.go index 47700f423..489efad6c 100644 --- a/internal/api/friend/delete_friend.go +++ b/internal/api/friend/delete_friend.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/api/friend/get_blcaklist.go b/internal/api/friend/get_blcaklist.go index b1eb995dd..7d0f5cc76 100644 --- a/internal/api/friend/get_blcaklist.go +++ b/internal/api/friend/get_blcaklist.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/api/friend/get_friend_apply_list.go b/internal/api/friend/get_friend_apply_list.go index 4fb55cf50..35353d229 100644 --- a/internal/api/friend/get_friend_apply_list.go +++ b/internal/api/friend/get_friend_apply_list.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/friend/get_friend_list.go b/internal/api/friend/get_friend_list.go index f7813cd6c..7fc656ad1 100644 --- a/internal/api/friend/get_friend_list.go +++ b/internal/api/friend/get_friend_list.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/api/friend/get_friends_info.go b/internal/api/friend/get_friends_info.go index 21266d032..a2e2c21c1 100644 --- a/internal/api/friend/get_friends_info.go +++ b/internal/api/friend/get_friends_info.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/api/friend/is_friend.go b/internal/api/friend/is_friend.go index f3a7544e2..d2c83ac2a 100644 --- a/internal/api/friend/is_friend.go +++ b/internal/api/friend/is_friend.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/friend/remove_blacklist.go b/internal/api/friend/remove_blacklist.go index c5fe87132..2573064e5 100644 --- a/internal/api/friend/remove_blacklist.go +++ b/internal/api/friend/remove_blacklist.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/friend/set_friend_comment.go b/internal/api/friend/set_friend_comment.go index 70816ddd4..9ec0683e8 100644 --- a/internal/api/friend/set_friend_comment.go +++ b/internal/api/friend/set_friend_comment.go @@ -1,10 +1,10 @@ package friend import ( + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/group/create_group.go b/internal/api/group/create_group.go index af606b424..6b35b123f 100644 --- a/internal/api/group/create_group.go +++ b/internal/api/group/create_group.go @@ -1,10 +1,10 @@ package group import ( + pb "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pb "Open_IM/src/proto/group" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/group/get_group_applicationList.go b/internal/api/group/get_group_applicationList.go index 5995004cf..342af7a97 100644 --- a/internal/api/group/get_group_applicationList.go +++ b/internal/api/group/get_group_applicationList.go @@ -1,10 +1,10 @@ package group import ( + "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - "Open_IM/src/proto/group" "Open_IM/src/utils" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/group/get_groups_info.go b/internal/api/group/get_groups_info.go index 8cf9d0fee..7ace5c47a 100644 --- a/internal/api/group/get_groups_info.go +++ b/internal/api/group/get_groups_info.go @@ -1,10 +1,10 @@ package group import ( + pb "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pb "Open_IM/src/proto/group" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 1ccecfe06..c4a26c1d0 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -1,10 +1,10 @@ package group import ( + pb "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pb "Open_IM/src/proto/group" "context" "fmt" "github.com/gin-gonic/gin" diff --git a/internal/api/group/group_application_response.go b/internal/api/group/group_application_response.go index 76c6b6802..3c4408cb2 100644 --- a/internal/api/group/group_application_response.go +++ b/internal/api/group/group_application_response.go @@ -1,10 +1,10 @@ package group import ( + "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - "Open_IM/src/proto/group" "Open_IM/src/utils" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/group/join_group.go b/internal/api/group/join_group.go index 08c58f0df..3f739c281 100644 --- a/internal/api/group/join_group.go +++ b/internal/api/group/join_group.go @@ -1,10 +1,10 @@ package group import ( + pb "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pb "Open_IM/src/proto/group" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/group/quit_group.go b/internal/api/group/quit_group.go index 06ec78686..7daaa4a7e 100644 --- a/internal/api/group/quit_group.go +++ b/internal/api/group/quit_group.go @@ -1,10 +1,10 @@ package group import ( + pb "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pb "Open_IM/src/proto/group" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/group/set_group_info.go b/internal/api/group/set_group_info.go index dde4fc6e1..9a7bea913 100644 --- a/internal/api/group/set_group_info.go +++ b/internal/api/group/set_group_info.go @@ -1,10 +1,10 @@ package group import ( + pb "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pb "Open_IM/src/proto/group" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/group/transfer_group_owner.go b/internal/api/group/transfer_group_owner.go index d01429ada..9a5c2ab4d 100644 --- a/internal/api/group/transfer_group_owner.go +++ b/internal/api/group/transfer_group_owner.go @@ -1,10 +1,10 @@ package group import ( + "Open_IM/pkg/proto/group" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - "Open_IM/src/proto/group" "Open_IM/src/utils" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index fd9c89b27..af4e75bce 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -7,11 +7,11 @@ package manage import ( + pbChat "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" "Open_IM/src/utils" "context" "github.com/gin-gonic/gin" diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index 578788c8d..4b70d606d 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -7,10 +7,10 @@ package manage import ( + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbUser "Open_IM/src/proto/user" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/user/get_user_info.go b/internal/api/user/get_user_info.go index 79e79e26c..ed9271a63 100644 --- a/internal/api/user/get_user_info.go +++ b/internal/api/user/get_user_info.go @@ -1,10 +1,10 @@ package user import ( + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbUser "Open_IM/src/proto/user" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/api/user/update_user_info.go b/internal/api/user/update_user_info.go index 0e296452e..c57da9d98 100644 --- a/internal/api/user/update_user_info.go +++ b/internal/api/user/update_user_info.go @@ -1,10 +1,10 @@ package user import ( + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbUser "Open_IM/src/proto/user" "context" "github.com/gin-gonic/gin" "net/http" diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index a79fd25c6..381e9c4fe 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -1,11 +1,11 @@ package gate import ( + pbChat "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" "Open_IM/src/utils" "context" "encoding/json" diff --git a/internal/msg_gateway/gate/rpc_server.go b/internal/msg_gateway/gate/rpc_server.go index e9aa28033..90f807e87 100644 --- a/internal/msg_gateway/gate/rpc_server.go +++ b/internal/msg_gateway/gate/rpc_server.go @@ -1,11 +1,11 @@ package gate import ( + pbRelay "Open_IM/pkg/proto/relay" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbRelay "Open_IM/src/proto/relay" "Open_IM/src/utils" "context" "encoding/json" diff --git a/internal/msg_transfer/logic/db.go b/internal/msg_transfer/logic/db.go index 93dccfc2b..9b641b7a4 100644 --- a/internal/msg_transfer/logic/db.go +++ b/internal/msg_transfer/logic/db.go @@ -1,9 +1,9 @@ package logic import ( + pbMsg "Open_IM/pkg/proto/chat" "Open_IM/src/common/db" "Open_IM/src/common/db/mysql_model/im_mysql_model" - pbMsg "Open_IM/src/proto/chat" ) func saveUserChat(uid string, pbMsg *pbMsg.MsgSvrToPushSvrChatMsg) error { diff --git a/internal/msg_transfer/logic/history_msg_handler.go b/internal/msg_transfer/logic/history_msg_handler.go index bea5c20b4..a661f10cf 100644 --- a/internal/msg_transfer/logic/history_msg_handler.go +++ b/internal/msg_transfer/logic/history_msg_handler.go @@ -1,13 +1,13 @@ package logic import ( + pbMsg "Open_IM/pkg/proto/chat" + pbPush "Open_IM/pkg/proto/push" "Open_IM/src/common/config" "Open_IM/src/common/constant" kfk "Open_IM/src/common/kafka" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbMsg "Open_IM/src/proto/chat" - pbPush "Open_IM/src/proto/push" "Open_IM/src/utils" "context" "github.com/Shopify/sarama" diff --git a/internal/msg_transfer/logic/persistent_msg_handler.go b/internal/msg_transfer/logic/persistent_msg_handler.go index 2c7df4b7c..2626d6fd4 100644 --- a/internal/msg_transfer/logic/persistent_msg_handler.go +++ b/internal/msg_transfer/logic/persistent_msg_handler.go @@ -7,12 +7,12 @@ package logic import ( + pbMsg "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/db/mysql_model/im_mysql_msg_model" kfk "Open_IM/src/common/kafka" "Open_IM/src/common/log" - pbMsg "Open_IM/src/proto/chat" "Open_IM/src/utils" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" diff --git a/internal/push/logic/push_handler.go b/internal/push/logic/push_handler.go index 01a6115f4..f558d6316 100644 --- a/internal/push/logic/push_handler.go +++ b/internal/push/logic/push_handler.go @@ -10,8 +10,8 @@ import ( "Open_IM/src/common/config" kfk "Open_IM/src/common/kafka" "Open_IM/src/common/log" - pbChat "Open_IM/src/proto/chat" - pbRelay "Open_IM/src/proto/relay" + pbChat "Open_IM/pkg/proto/chat" + pbRelay "Open_IM/pkg/proto/relay" "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" ) diff --git a/internal/push/logic/push_rpc_server.go b/internal/push/logic/push_rpc_server.go index ed128790c..3a880ee5e 100644 --- a/internal/push/logic/push_rpc_server.go +++ b/internal/push/logic/push_rpc_server.go @@ -4,8 +4,8 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - "Open_IM/src/proto/push" - pbRelay "Open_IM/src/proto/relay" + "Open_IM/pkg/proto/push" + pbRelay "Open_IM/pkg/proto/relay" "Open_IM/src/utils" "context" "google.golang.org/grpc" diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 3eaad541d..8ee6d1a77 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -9,14 +9,14 @@ package logic import ( rpcChat "Open_IM/internal/rpc/chat" "Open_IM/internal/rpc/user/internal_service" + pbChat "Open_IM/pkg/proto/chat" + pbGroup "Open_IM/pkg/proto/group" + pbRelay "Open_IM/pkg/proto/relay" + pbGetInfo "Open_IM/pkg/proto/user" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" - pbGroup "Open_IM/src/proto/group" - pbRelay "Open_IM/src/proto/relay" - pbGetInfo "Open_IM/src/proto/user" "Open_IM/src/utils" "context" "encoding/json" diff --git a/internal/rpc/auth/rpcAuth.go b/internal/rpc/auth/rpcAuth.go index 6c88aee83..1ff599ef2 100644 --- a/internal/rpc/auth/rpcAuth.go +++ b/internal/rpc/auth/rpcAuth.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" log2 "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbAuth "Open_IM/src/proto/auth" + pbAuth "Open_IM/pkg/proto/auth" "Open_IM/src/utils" "google.golang.org/grpc" "net" diff --git a/internal/rpc/auth/user_register.go b/internal/rpc/auth/user_register.go index feef389d5..62068d91a 100644 --- a/internal/rpc/auth/user_register.go +++ b/internal/rpc/auth/user_register.go @@ -3,7 +3,7 @@ package auth import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbAuth "Open_IM/src/proto/auth" + pbAuth "Open_IM/pkg/proto/auth" "context" ) diff --git a/internal/rpc/auth/user_token.go b/internal/rpc/auth/user_token.go index d180caaad..2e1e295bc 100644 --- a/internal/rpc/auth/user_token.go +++ b/internal/rpc/auth/user_token.go @@ -3,7 +3,7 @@ package auth import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbAuth "Open_IM/src/proto/auth" + pbAuth "Open_IM/pkg/proto/auth" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/chat/pull_message.go b/internal/rpc/chat/pull_message.go index bc172d32b..c5ef5e2d9 100644 --- a/internal/rpc/chat/pull_message.go +++ b/internal/rpc/chat/pull_message.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - pbMsg "Open_IM/src/proto/chat" + pbMsg "Open_IM/pkg/proto/chat" ) func (rpc *rpcChat) GetNewSeq(_ context.Context, in *pbMsg.GetNewSeqReq) (*pbMsg.GetNewSeqResp, error) { diff --git a/internal/rpc/chat/rpcChat.go b/internal/rpc/chat/rpcChat.go index 12ddac3e5..eea41a51d 100644 --- a/internal/rpc/chat/rpcChat.go +++ b/internal/rpc/chat/rpcChat.go @@ -5,7 +5,7 @@ import ( "Open_IM/src/common/kafka" log2 "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" + pbChat "Open_IM/pkg/proto/chat" "Open_IM/src/utils" "google.golang.org/grpc" "net" diff --git a/internal/rpc/chat/send_msg.go b/internal/rpc/chat/send_msg.go index cac39f014..c8a420421 100644 --- a/internal/rpc/chat/send_msg.go +++ b/internal/rpc/chat/send_msg.go @@ -8,8 +8,8 @@ import ( http2 "Open_IM/src/common/http" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" - pbGroup "Open_IM/src/proto/group" + pbChat "Open_IM/pkg/proto/chat" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" "encoding/json" diff --git a/internal/rpc/friend/add_blacklist.go b/internal/rpc/friend/add_blacklist.go index 7efe4e226..e47f62c39 100644 --- a/internal/rpc/friend/add_blacklist.go +++ b/internal/rpc/friend/add_blacklist.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/add_friend.go b/internal/rpc/friend/add_friend.go index 1f20f8d14..cb1c9b3ae 100644 --- a/internal/rpc/friend/add_friend.go +++ b/internal/rpc/friend/add_friend.go @@ -7,8 +7,8 @@ import ( "Open_IM/src/common/constant" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbChat "Open_IM/src/proto/chat" - pbFriend "Open_IM/src/proto/friend" + pbChat "Open_IM/pkg/proto/chat" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/add_friend_response.go b/internal/rpc/friend/add_friend_response.go index f372f03a6..dee4e03bb 100644 --- a/internal/rpc/friend/add_friend_response.go +++ b/internal/rpc/friend/add_friend_response.go @@ -1,14 +1,14 @@ package friend import ( + "Open_IM/internal/push/content_struct" + "Open_IM/internal/push/logic" + pbChat "Open_IM/pkg/proto/chat" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbChat "Open_IM/src/proto/chat" - pbFriend "Open_IM/src/proto/friend" - "Open_IM/src/push/content_struct" - "Open_IM/src/push/logic" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/delete_friend.go b/internal/rpc/friend/delete_friend.go index fba59d212..482036195 100644 --- a/internal/rpc/friend/delete_friend.go +++ b/internal/rpc/friend/delete_friend.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/get_blacklist.go b/internal/rpc/friend/get_blacklist.go index 421081b1a..da2fae257 100644 --- a/internal/rpc/friend/get_blacklist.go +++ b/internal/rpc/friend/get_blacklist.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/get_firends_info.go b/internal/rpc/friend/get_firends_info.go index 1da6ebaaf..1ac7f1acf 100644 --- a/internal/rpc/friend/get_firends_info.go +++ b/internal/rpc/friend/get_firends_info.go @@ -6,7 +6,7 @@ import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" "fmt" diff --git a/internal/rpc/friend/get_friend_apply_list.go b/internal/rpc/friend/get_friend_apply_list.go index 5e8e15a0f..c1067b77f 100644 --- a/internal/rpc/friend/get_friend_apply_list.go +++ b/internal/rpc/friend/get_friend_apply_list.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" "fmt" diff --git a/internal/rpc/friend/get_friend_list.go b/internal/rpc/friend/get_friend_list.go index 92809ad7f..cab4d3849 100644 --- a/internal/rpc/friend/get_friend_list.go +++ b/internal/rpc/friend/get_friend_list.go @@ -5,7 +5,7 @@ import ( "Open_IM/src/common/constant" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/is_friend.go b/internal/rpc/friend/is_friend.go index f64f3f00f..94233b972 100644 --- a/internal/rpc/friend/is_friend.go +++ b/internal/rpc/friend/is_friend.go @@ -5,7 +5,7 @@ import ( "Open_IM/src/common/constant" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" "fmt" diff --git a/internal/rpc/friend/is_in_blacklist.go b/internal/rpc/friend/is_in_blacklist.go index 3e3e8caa2..a62e9a999 100644 --- a/internal/rpc/friend/is_in_blacklist.go +++ b/internal/rpc/friend/is_in_blacklist.go @@ -3,7 +3,7 @@ package friend import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "context" "fmt" ) diff --git a/internal/rpc/friend/remove_blacklist.go b/internal/rpc/friend/remove_blacklist.go index 7d13d8a2f..1091e3a96 100644 --- a/internal/rpc/friend/remove_blacklist.go +++ b/internal/rpc/friend/remove_blacklist.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/friend/set_friend_comment.go b/internal/rpc/friend/set_friend_comment.go index 66c974f47..489bfe50c 100644 --- a/internal/rpc/friend/set_friend_comment.go +++ b/internal/rpc/friend/set_friend_comment.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbFriend "Open_IM/src/proto/friend" + pbFriend "Open_IM/pkg/proto/friend" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/group/create_group.go b/internal/rpc/group/create_group.go index 499522ea4..377207608 100644 --- a/internal/rpc/group/create_group.go +++ b/internal/rpc/group/create_group.go @@ -9,8 +9,8 @@ import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" - pbGroup "Open_IM/src/proto/group" + pbChat "Open_IM/pkg/proto/chat" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" "google.golang.org/grpc" diff --git a/internal/rpc/group/get_group_applicationList.go b/internal/rpc/group/get_group_applicationList.go index 72cb6e750..0a92ac593 100644 --- a/internal/rpc/group/get_group_applicationList.go +++ b/internal/rpc/group/get_group_applicationList.go @@ -3,7 +3,7 @@ package group import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - "Open_IM/src/proto/group" + "Open_IM/pkg/proto/group" "context" ) diff --git a/internal/rpc/group/get_groups_info.go b/internal/rpc/group/get_groups_info.go index a7fecc773..7df8d9a28 100644 --- a/internal/rpc/group/get_groups_info.go +++ b/internal/rpc/group/get_groups_info.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbGroup "Open_IM/src/proto/group" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index b90d20726..0ad390e8f 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -6,12 +6,12 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/db" - pbChat "Open_IM/src/proto/chat" + pbChat "Open_IM/pkg/proto/chat" "encoding/json" imdb "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbGroup "Open_IM/src/proto/group" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" diff --git a/internal/rpc/group/group_application_response.go b/internal/rpc/group/group_application_response.go index fc0da6306..9271525c8 100644 --- a/internal/rpc/group/group_application_response.go +++ b/internal/rpc/group/group_application_response.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/db" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - "Open_IM/src/proto/group" + "Open_IM/pkg/proto/group" "context" ) diff --git a/internal/rpc/group/join_group.go b/internal/rpc/group/join_group.go index a3993f67d..7df09bfe4 100644 --- a/internal/rpc/group/join_group.go +++ b/internal/rpc/group/join_group.go @@ -4,7 +4,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbGroup "Open_IM/src/proto/group" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/group/quit_group.go b/internal/rpc/group/quit_group.go index 9d3a35448..b16f77241 100644 --- a/internal/rpc/group/quit_group.go +++ b/internal/rpc/group/quit_group.go @@ -5,7 +5,7 @@ import ( "Open_IM/src/common/db" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbGroup "Open_IM/src/proto/group" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/group/set_group_info.go b/internal/rpc/group/set_group_info.go index cecec8445..fa4219022 100644 --- a/internal/rpc/group/set_group_info.go +++ b/internal/rpc/group/set_group_info.go @@ -5,7 +5,7 @@ import ( "Open_IM/src/common/constant" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbGroup "Open_IM/src/proto/group" + pbGroup "Open_IM/pkg/proto/group" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/group/transfer_group_owner.go b/internal/rpc/group/transfer_group_owner.go index 088241a46..2a989e557 100644 --- a/internal/rpc/group/transfer_group_owner.go +++ b/internal/rpc/group/transfer_group_owner.go @@ -3,7 +3,7 @@ package group import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - "Open_IM/src/proto/group" + "Open_IM/pkg/proto/group" "context" ) diff --git a/internal/rpc/user/get_user_info.go b/internal/rpc/user/get_user_info.go index 74ee468c4..45c08e899 100644 --- a/internal/rpc/user/get_user_info.go +++ b/internal/rpc/user/get_user_info.go @@ -5,7 +5,7 @@ import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbUser "Open_IM/src/proto/user" + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/utils" "context" "google.golang.org/grpc" diff --git a/internal/rpc/user/internal_service/get_user_info_to_client.go b/internal/rpc/user/internal_service/get_user_info_to_client.go index 8c0b93511..20a89e64f 100644 --- a/internal/rpc/user/internal_service/get_user_info_to_client.go +++ b/internal/rpc/user/internal_service/get_user_info_to_client.go @@ -1,9 +1,9 @@ package internal_service import ( + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/common/config" "Open_IM/src/grpc-etcdv3/getcdv3" - pbUser "Open_IM/src/proto/user" "context" "strings" ) diff --git a/internal/rpc/user/management_user.go b/internal/rpc/user/management_user.go index 7f5e10e03..53462d69f 100644 --- a/internal/rpc/user/management_user.go +++ b/internal/rpc/user/management_user.go @@ -10,7 +10,7 @@ import ( "Open_IM/src/common/config" "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" - pbUser "Open_IM/src/proto/user" + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/utils" "context" ) diff --git a/internal/rpc/user/update_user_info.go b/internal/rpc/user/update_user_info.go index 9a1908757..a0715accb 100644 --- a/internal/rpc/user/update_user_info.go +++ b/internal/rpc/user/update_user_info.go @@ -7,9 +7,9 @@ import ( "Open_IM/src/common/db/mysql_model/im_mysql_model" "Open_IM/src/common/log" "Open_IM/src/grpc-etcdv3/getcdv3" - pbChat "Open_IM/src/proto/chat" - pbFriend "Open_IM/src/proto/friend" - pbUser "Open_IM/src/proto/user" + pbChat "Open_IM/pkg/proto/chat" + pbFriend "Open_IM/pkg/proto/friend" + pbUser "Open_IM/pkg/proto/user" "Open_IM/src/utils" "context" "strings" diff --git a/src/proto/auth/auth.pb.go b/pkg/proto/auth/auth.pb.go similarity index 100% rename from src/proto/auth/auth.pb.go rename to pkg/proto/auth/auth.pb.go diff --git a/src/proto/auth/auth.proto b/pkg/proto/auth/auth.proto similarity index 100% rename from src/proto/auth/auth.proto rename to pkg/proto/auth/auth.proto diff --git a/src/proto/auto_proto.sh b/pkg/proto/auto_proto.sh similarity index 100% rename from src/proto/auto_proto.sh rename to pkg/proto/auto_proto.sh diff --git a/src/proto/chat/chat.pb.go b/pkg/proto/chat/chat.pb.go similarity index 100% rename from src/proto/chat/chat.pb.go rename to pkg/proto/chat/chat.pb.go diff --git a/src/proto/chat/chat.proto b/pkg/proto/chat/chat.proto similarity index 100% rename from src/proto/chat/chat.proto rename to pkg/proto/chat/chat.proto diff --git a/src/proto/friend/friend.pb.go b/pkg/proto/friend/friend.pb.go similarity index 100% rename from src/proto/friend/friend.pb.go rename to pkg/proto/friend/friend.pb.go diff --git a/src/proto/friend/friend.proto b/pkg/proto/friend/friend.proto similarity index 100% rename from src/proto/friend/friend.proto rename to pkg/proto/friend/friend.proto diff --git a/src/proto/group/group.pb.go b/pkg/proto/group/group.pb.go similarity index 100% rename from src/proto/group/group.pb.go rename to pkg/proto/group/group.pb.go diff --git a/src/proto/group/group.proto b/pkg/proto/group/group.proto similarity index 100% rename from src/proto/group/group.proto rename to pkg/proto/group/group.proto diff --git a/src/proto/proto_dir.cfg b/pkg/proto/proto_dir.cfg similarity index 100% rename from src/proto/proto_dir.cfg rename to pkg/proto/proto_dir.cfg diff --git a/src/proto/push/push.pb.go b/pkg/proto/push/push.pb.go similarity index 100% rename from src/proto/push/push.pb.go rename to pkg/proto/push/push.pb.go diff --git a/src/proto/push/push.proto b/pkg/proto/push/push.proto similarity index 100% rename from src/proto/push/push.proto rename to pkg/proto/push/push.proto diff --git a/src/proto/relay/relay.pb.go b/pkg/proto/relay/relay.pb.go similarity index 100% rename from src/proto/relay/relay.pb.go rename to pkg/proto/relay/relay.pb.go diff --git a/src/proto/relay/relay.proto b/pkg/proto/relay/relay.proto similarity index 100% rename from src/proto/relay/relay.proto rename to pkg/proto/relay/relay.proto diff --git a/src/proto/user/user.pb.go b/pkg/proto/user/user.pb.go similarity index 100% rename from src/proto/user/user.pb.go rename to pkg/proto/user/user.pb.go diff --git a/src/proto/user/user.proto b/pkg/proto/user/user.proto similarity index 100% rename from src/proto/user/user.proto rename to pkg/proto/user/user.proto diff --git a/src/common/db/mongoModel.go b/src/common/db/mongoModel.go index 3d0a7b4aa..ea532afba 100644 --- a/src/common/db/mongoModel.go +++ b/src/common/db/mongoModel.go @@ -1,9 +1,9 @@ package db import ( + pbMsg "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/constant" - pbMsg "Open_IM/src/proto/chat" "errors" "github.com/golang/protobuf/proto" "gopkg.in/mgo.v2/bson" diff --git a/src/common/db/mysql_model/im_mysql_model/group_model.go b/src/common/db/mysql_model/im_mysql_model/group_model.go index 85eab55f2..971779cf2 100644 --- a/src/common/db/mysql_model/im_mysql_model/group_model.go +++ b/src/common/db/mysql_model/im_mysql_model/group_model.go @@ -1,9 +1,9 @@ package im_mysql_model import ( + "Open_IM/pkg/proto/group" "Open_IM/src/common/db" "Open_IM/src/common/log" - "Open_IM/src/proto/group" "errors" "time" ) diff --git a/src/common/db/mysql_model/im_mysql_model/user_model.go b/src/common/db/mysql_model/im_mysql_model/user_model.go index 641eb99bc..54f9df3d2 100644 --- a/src/common/db/mysql_model/im_mysql_model/user_model.go +++ b/src/common/db/mysql_model/im_mysql_model/user_model.go @@ -1,9 +1,9 @@ package im_mysql_model import ( + pbAuth "Open_IM/pkg/proto/auth" "Open_IM/src/common/config" "Open_IM/src/common/db" - pbAuth "Open_IM/src/proto/auth" "Open_IM/src/utils" _ "github.com/jinzhu/gorm/dialects/mysql" "time" diff --git a/src/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go b/src/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go index 58a02e751..5809dacba 100644 --- a/src/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go +++ b/src/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go @@ -7,8 +7,8 @@ package im_mysql_msg_model import ( + pbMsg "Open_IM/pkg/proto/chat" "Open_IM/src/common/db" - pbMsg "Open_IM/src/proto/chat" "Open_IM/src/utils" "database/sql" "time" diff --git a/src/common/multi_terminal_login/multi_terminal_login.go b/src/common/multi_terminal_login/multi_terminal_login.go index 8da527274..278dbd398 100644 --- a/src/common/multi_terminal_login/multi_terminal_login.go +++ b/src/common/multi_terminal_login/multi_terminal_login.go @@ -1,12 +1,12 @@ package multi_terminal_login import ( + "Open_IM/internal/push/content_struct" + "Open_IM/internal/push/logic" + pbChat "Open_IM/pkg/proto/chat" "Open_IM/src/common/config" "Open_IM/src/common/constant" "Open_IM/src/common/db" - pbChat "Open_IM/src/proto/chat" - "Open_IM/src/push/content_struct" - "Open_IM/src/push/logic" "Open_IM/src/utils" )