mv src/proto to pkg/proto

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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 {

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"

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"

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"
+	pbChat "Open_IM/pkg/proto/chat"
-	pbRelay "Open_IM/src/proto/relay"
+	pbRelay "Open_IM/pkg/proto/relay"
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
 )

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"
+	"Open_IM/pkg/proto/push"
-	pbRelay "Open_IM/src/proto/relay"
+	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/src/utils"
 	"context"
 	"google.golang.org/grpc"

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"

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"

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"
 )
 

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"
 )

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) {

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"

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"
+	pbChat "Open_IM/pkg/proto/chat"
-	pbGroup "Open_IM/src/proto/group"
+	pbGroup "Open_IM/pkg/proto/group"
 	"Open_IM/src/utils"
 	"context"
 	"encoding/json"

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"
 )

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"
+	pbChat "Open_IM/pkg/proto/chat"
-	pbFriend "Open_IM/src/proto/friend"
+	pbFriend "Open_IM/pkg/proto/friend"
 	"Open_IM/src/utils"
 	"context"
 )

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"
 )

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"
 )

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"
 )

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"

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"

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"
 )

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"

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"
 )

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"
 )

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"
 )

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"
+	pbChat "Open_IM/pkg/proto/chat"
-	pbGroup "Open_IM/src/proto/group"
+	pbGroup "Open_IM/pkg/proto/group"
 	"Open_IM/src/utils"
 	"context"
 	"google.golang.org/grpc"

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"
 )
 

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"
 )

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"
 

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"
 )
 

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"
 )

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"
 )

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"
 )

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"
 )
 

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"

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"
 )

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"
 )

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"
+	pbChat "Open_IM/pkg/proto/chat"
-	pbFriend "Open_IM/src/proto/friend"
+	pbFriend "Open_IM/pkg/proto/friend"
-	pbUser "Open_IM/src/proto/user"
+	pbUser "Open_IM/pkg/proto/user"
 	"Open_IM/src/utils"
 	"context"
 	"strings"

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"

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"
 )

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"

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"

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"
 )