add cmd/rpc

cmd/rpc/open_im_auth/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	rpcAuth "Open_IM/src/rpc/auth/auth"
+	rpcAuth "Open_IM/internal/rpc/auth"
 	"flag"
 )
 

cmd/rpc/open_im_friend/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"Open_IM/src/rpc/friend/friend"
+	"Open_IM/internal/rpc/friend"
 	"flag"
 )
 

cmd/rpc/open_im_group/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"Open_IM/src/rpc/group/group"
+	"Open_IM/internal/rpc/group"
 	"flag"
 )
 

cmd/rpc/open_im_msg/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	rpcChat "Open_IM/src/rpc/chat/chat"
+	rpcChat "Open_IM/internal/rpc/chat"
 	"Open_IM/src/utils"
 	"flag"
 )

cmd/rpc/open_im_user/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"Open_IM/src/rpc/user/user"
+	"Open_IM/internal/rpc/user"
 	"flag"
 )
 

internal/push/logic/push_to_client.go

@@ -7,6 +7,8 @@
 package logic
 
 import (
+	rpcChat "Open_IM/internal/rpc/chat"
+	"Open_IM/internal/rpc/user/internal_service"
 	"Open_IM/src/common/config"
 	"Open_IM/src/common/constant"
 	"Open_IM/src/common/log"
@@ -15,8 +17,6 @@ import (
 	pbGroup "Open_IM/src/proto/group"
 	pbRelay "Open_IM/src/proto/relay"
 	pbGetInfo "Open_IM/src/proto/user"
-	rpcChat "Open_IM/src/rpc/chat/chat"
-	"Open_IM/src/rpc/user/internal_service"
 	"Open_IM/src/utils"
 	"context"
 	"encoding/json"

internal/rpc/auth/rpcAuth.go

@@ -1,4 +1,4 @@
-package rpcAuth
+package auth
 
 import (
 	"Open_IM/src/common/config"

internal/rpc/auth/user_register.go

@@ -1,4 +1,4 @@
-package rpcAuth
+package auth
 
 import (
 	"Open_IM/src/common/db/mysql_model/im_mysql_model"

internal/rpc/auth/user_token.go

@@ -1,4 +1,4 @@
-package rpcAuth
+package auth
 
 import (
 	"Open_IM/src/common/db/mysql_model/im_mysql_model"

internal/rpc/chat/pull_message.go

@@ -1,4 +1,4 @@
-package rpcChat
+package chat
 
 import (
 	"context"

internal/rpc/chat/rpcChat.go

@@ -1,4 +1,4 @@
-package rpcChat
+package chat
 
 import (
 	"Open_IM/src/common/config"

internal/rpc/chat/send_msg.go

@@ -1,4 +1,4 @@
-package rpcChat
+package chat
 
 import (
 	"Open_IM/internal/api/group"

internal/rpc/friend/add_friend.go

@@ -1,14 +1,14 @@
 package friend
 
 import (
+	"Open_IM/internal/push/content_struct"
+	"Open_IM/internal/push/logic"
 	"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/group/create_group.go

@@ -1,6 +1,8 @@
 package group
 
 import (
+	"Open_IM/internal/push/content_struct"
+	"Open_IM/internal/push/logic"
 	"Open_IM/src/common/config"
 	"Open_IM/src/common/constant"
 	"Open_IM/src/common/db"
@@ -9,8 +11,6 @@ import (
 	"Open_IM/src/grpc-etcdv3/getcdv3"
 	pbChat "Open_IM/src/proto/chat"
 	pbGroup "Open_IM/src/proto/group"
-	"Open_IM/src/push/content_struct"
-	"Open_IM/src/push/logic"
 	"Open_IM/src/utils"
 	"context"
 	"google.golang.org/grpc"

internal/rpc/group/group.go

@@ -1,12 +1,12 @@
 package group
 
 import (
+	"Open_IM/internal/push/content_struct"
+	"Open_IM/internal/push/logic"
 	"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"
 	"encoding/json"
 
 	imdb "Open_IM/src/common/db/mysql_model/im_mysql_model"

internal/rpc/user/update_user_info.go

@@ -1,6 +1,7 @@
 package user
 
 import (
+	"Open_IM/internal/push/logic"
 	"Open_IM/src/common/config"
 	"Open_IM/src/common/constant"
 	"Open_IM/src/common/db/mysql_model/im_mysql_model"
@@ -9,7 +10,6 @@ import (
 	pbChat "Open_IM/src/proto/chat"
 	pbFriend "Open_IM/src/proto/friend"
 	pbUser "Open_IM/src/proto/user"
-	"Open_IM/src/push/logic"
 	"Open_IM/src/utils"
 	"context"
 	"strings"