blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

mv src/common src/utils src/grpc-etcdv3 to pkg

Browse Source
This commit is contained in:
xmcy0011 2021-10-11 22:12:01 +08:00
parent bc94d4e0b3
commit 737edb985b
119 changed files with 310 additions and 702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/open_im_api/main.go
View File

@ -8,7 +8,7 @@ import (
"Open_IM/internal/api/manage"
apiThird "Open_IM/internal/api/third"
"Open_IM/internal/api/user"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"flag"
"github.com/gin-gonic/gin"
"strconv"

2
cmd/rpc/open_im_msg/main.go
View File

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

6
internal/api/auth/user_register.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/auth/user_token.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

8
internal/api/chat/newest_seq.go
View File

@ -2,10 +2,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"
"Open_IM/src/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common"
"context"
"github.com/gin-gonic/gin"
"net/http"

8
internal/api/chat/pull_msg.go
View File

@ -2,10 +2,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/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common"
"context"
"github.com/gin-gonic/gin"
"net/http"

8
internal/api/chat/send_msg.go
View File

@ -2,12 +2,12 @@ package apiChat
import (
pbChat "Open_IM/pkg/proto/chat"
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/src/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/common"
"context"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"github.com/gin-gonic/gin"
"net/http"
"strings"

6
internal/api/friend/add_blacklist.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/friend/add_friend.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/friend/add_friend_response.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"fmt"
"github.com/gin-gonic/gin"

6
internal/api/friend/delete_friend.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"fmt"
"github.com/gin-gonic/gin"

6
internal/api/friend/get_blcaklist.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"fmt"
"github.com/gin-gonic/gin"

6
internal/api/friend/get_friend_apply_list.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/friend/get_friend_list.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"fmt"
"github.com/gin-gonic/gin"

6
internal/api/friend/get_friends_info.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"fmt"
"github.com/gin-gonic/gin"

6
internal/api/friend/is_friend.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/friend/remove_blacklist.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/friend/set_friend_comment.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/group/create_group.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

8
internal/api/group/get_group_applicationList.go
View File

@ -1,11 +1,11 @@
package group
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/proto/group"
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/group/get_groups_info.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/group/group.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"fmt"
"github.com/gin-gonic/gin"

8
internal/api/group/group_application_response.go
View File

@ -1,11 +1,11 @@
package group
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/proto/group"
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/group/join_group.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/group/quit_group.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/group/set_group_info.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

8
internal/api/group/transfer_group_owner.go
View File

@ -1,11 +1,11 @@
package group
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/proto/group"
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"
"net/http"

10
internal/api/manage/management_chat.go
View File

@ -8,11 +8,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"
"Open_IM/src/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common"
"context"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"

6
internal/api/manage/management_user.go
View File

@ -8,9 +8,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

4
internal/api/third/tencent_cloud_storage_credential.go
View File

@ -1,8 +1,8 @@
package apiThird
import (
"Open_IM/src/common/config"
log2 "Open_IM/src/common/log"
"Open_IM/pkg/common/config"
log2 "Open_IM/pkg/common/log"
"github.com/gin-gonic/gin"
sts "github.com/tencentyun/qcloud-cos-sts-sdk/go"
"net/http"

6
internal/api/user/get_user_info.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

6
internal/api/user/update_user_info.go
View File

@ -2,9 +2,9 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"github.com/gin-gonic/gin"
"net/http"

4
internal/msg_gateway/gate/init.go
View File

@ -1,8 +1,8 @@
package gate
import (
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"github.com/go-playground/validator/v10"
"sync"
)

10
internal/msg_gateway/gate/logic.go
View File

@ -1,12 +1,12 @@
package gate
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
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"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"encoding/json"
"github.com/gorilla/websocket"

10
internal/msg_gateway/gate/rpc_server.go
View File

@ -1,12 +1,12 @@
package gate
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
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"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"encoding/json"
"fmt"

4
internal/msg_gateway/gate/validate.go
View File

@ -7,8 +7,8 @@
package gate
import (
"Open_IM/src/common/constant"
"Open_IM/src/common/log"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
"github.com/mitchellh/mapstructure"
)

6
internal/msg_gateway/gate/ws_server.go
View File

@ -1,9 +1,9 @@
package gate
import (
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/src/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils"
"github.com/gorilla/websocket"
"net/http"
"time"

4
internal/msg_transfer/logic/db.go
View File

@ -2,8 +2,8 @@ package logic
import (
pbMsg "Open_IM/pkg/proto/chat"
"Open_IM/src/common/db"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
)
func saveUserChat(uid string, pbMsg *pbMsg.MsgSvrToPushSvrChatMsg) error {

12
internal/msg_transfer/logic/history_msg_handler.go
View File

@ -1,14 +1,14 @@
package logic
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
kfk "Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
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"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"github.com/Shopify/sarama"
"github.com/golang/protobuf/proto"

6
internal/msg_transfer/logic/init.go
View File

@ -1,9 +1,9 @@
package logic
import (
"Open_IM/src/common/config"
"Open_IM/src/common/kafka"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
)
var (

12
internal/msg_transfer/logic/persistent_msg_handler.go
View File

@ -7,13 +7,13 @@
package logic
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_msg_model"
kfk "Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
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"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"github.com/Shopify/sarama"
"github.com/golang/protobuf/proto"
"strings"

8
internal/push/logic/init.go
View File

@ -7,10 +7,10 @@
package logic
import (
"Open_IM/src/common/config"
"Open_IM/src/common/kafka"
"Open_IM/src/common/log"
"Open_IM/src/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils"
)
var (

6
internal/push/logic/push_handler.go
View File

@ -7,9 +7,9 @@
package logic
import (
"Open_IM/src/common/config"
kfk "Open_IM/src/common/kafka"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
kfk "Open_IM/pkg/common/kafka"
"Open_IM/pkg/common/log"
pbChat "Open_IM/pkg/proto/chat"
pbRelay "Open_IM/pkg/proto/relay"
"github.com/Shopify/sarama"

8
internal/push/logic/push_rpc_server.go
View File

@ -1,12 +1,12 @@
package logic
import (
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"Open_IM/pkg/proto/push"
pbRelay "Open_IM/pkg/proto/relay"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"google.golang.org/grpc"
"net"

10
internal/push/logic/push_to_client.go
View File

@ -9,15 +9,15 @@ package logic
import (
rpcChat "Open_IM/internal/rpc/chat"
"Open_IM/internal/rpc/user/internal_service"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
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"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"encoding/json"
"fmt"

2
internal/push/logic/tpns.go
View File

@ -5,7 +5,7 @@ import (
"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/auth"
"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/common"
"Open_IM/internal/push/sdk/tpns-server-sdk-go/go/req"
"Open_IM/src/common/config"
"Open_IM/pkg/common/config"
)
var badgeType = -2

8
internal/rpc/auth/rpcAuth.go
View File

@ -1,11 +1,11 @@
package auth
import (
"Open_IM/src/common/config"
log2 "Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
log2 "Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbAuth "Open_IM/pkg/proto/auth"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"google.golang.org/grpc"
"net"
"strconv"

4
internal/rpc/auth/user_register.go
View File

@ -1,8 +1,8 @@
package auth
import (
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbAuth "Open_IM/pkg/proto/auth"
"context"
)

6
internal/rpc/auth/user_token.go
View File

@ -1,10 +1,10 @@
package auth
import (
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbAuth "Open_IM/pkg/proto/auth"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

4
internal/rpc/chat/pull_message.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/garyburd/redigo/redis"
commonDB "Open_IM/src/common/db"
"Open_IM/src/common/log"
commonDB "Open_IM/pkg/common/db"
"Open_IM/pkg/common/log"
"sort"
"strings"

10
internal/rpc/chat/rpcChat.go
View File

@ -1,12 +1,12 @@
package chat
import (
"Open_IM/src/common/config"
"Open_IM/src/common/kafka"
log2 "Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/kafka"
log2 "Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbChat "Open_IM/pkg/proto/chat"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"google.golang.org/grpc"
"net"
"strconv"

12
internal/rpc/chat/send_msg.go
View File

@ -3,14 +3,14 @@ package chat
import (
"Open_IM/internal/api/group"
"Open_IM/internal/push/content_struct"
"Open_IM/src/common/config"
"Open_IM/src/common/constant"
http2 "Open_IM/src/common/http"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
http2 "Open_IM/pkg/common/http"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbChat "Open_IM/pkg/proto/chat"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"encoding/json"
"math/rand"

8
internal/rpc/friend/add_blacklist.go
View File

@ -1,11 +1,11 @@
package friend
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

10
internal/rpc/friend/add_friend.go
View File

@ -3,13 +3,13 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbChat "Open_IM/pkg/proto/chat"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

10
internal/rpc/friend/add_friend_response.go
View File

@ -3,13 +3,13 @@ package friend
import (
"Open_IM/internal/push/content_struct"
"Open_IM/internal/push/logic"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
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"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

8
internal/rpc/friend/delete_friend.go
View File

@ -1,11 +1,11 @@
package friend
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

8
internal/rpc/friend/get_blacklist.go
View File

@ -1,11 +1,11 @@
package friend
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

12
internal/rpc/friend/get_firends_info.go
View File

@ -1,13 +1,13 @@
package friend
import (
"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"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"fmt"
"google.golang.org/grpc"

8
internal/rpc/friend/get_friend_apply_list.go
View File

@ -1,11 +1,11 @@
package friend
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"fmt"
"strconv"

10
internal/rpc/friend/get_friend_list.go
View File

@ -1,12 +1,12 @@
package friend
import (
"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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

10
internal/rpc/friend/is_friend.go
View File

@ -1,12 +1,12 @@
package friend
import (
"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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"fmt"
)

4
internal/rpc/friend/is_in_blacklist.go
View File

@ -1,8 +1,8 @@
package friend
import (
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"context"
"fmt"

8
internal/rpc/friend/remove_blacklist.go
View File

@ -1,11 +1,11 @@
package friend
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

8
internal/rpc/friend/set_friend_comment.go
View File

@ -1,11 +1,11 @@
package friend
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbFriend "Open_IM/pkg/proto/friend"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

14
internal/rpc/group/create_group.go
View File

@ -3,15 +3,15 @@ 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"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbChat "Open_IM/pkg/proto/chat"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"google.golang.org/grpc"
"net"

4
internal/rpc/group/get_group_applicationList.go
View File

@ -1,8 +1,8 @@
package group
import (
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/proto/group"
"context"
)

8
internal/rpc/group/get_groups_info.go
View File

@ -1,11 +1,11 @@
package group
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

12
internal/rpc/group/group.go
View File

@ -3,16 +3,16 @@ 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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db"
pbChat "Open_IM/pkg/proto/chat"
"encoding/json"
imdb "Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"fmt"

6
internal/rpc/group/group_application_response.go
View File

@ -1,9 +1,9 @@
package group
import (
"Open_IM/src/common/db"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/proto/group"
"context"
)

8
internal/rpc/group/join_group.go
View File

@ -1,11 +1,11 @@
package group
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

10
internal/rpc/group/quit_group.go
View File

@ -1,12 +1,12 @@
package group
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

10
internal/rpc/group/set_group_info.go
View File

@ -1,12 +1,12 @@
package group
import (
"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"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbGroup "Open_IM/pkg/proto/group"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

4
internal/rpc/group/transfer_group_owner.go
View File

@ -1,8 +1,8 @@
package group
import (
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/proto/group"
"context"
)

10
internal/rpc/user/get_user_info.go
View File

@ -1,12 +1,12 @@
package user
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbUser "Open_IM/pkg/proto/user"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"google.golang.org/grpc"
"net"

4
internal/rpc/user/internal_service/get_user_info_to_client.go
View File

@ -2,8 +2,8 @@ package internal_service
import (
pbUser "Open_IM/pkg/proto/user"
"Open_IM/src/common/config"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
"context"
"strings"
)

8
internal/rpc/user/management_user.go
View File

@ -7,11 +7,11 @@
package user
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db/mysql_model/im_mysql_model"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
pbUser "Open_IM/pkg/proto/user"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
)

12
internal/rpc/user/update_user_info.go
View File

@ -2,15 +2,15 @@ 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"
"Open_IM/src/common/log"
"Open_IM/src/grpc-etcdv3/getcdv3"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
"Open_IM/pkg/common/log"
"Open_IM/pkg/grpc-etcdv3/getcdv3"
pbChat "Open_IM/pkg/proto/chat"
pbFriend "Open_IM/pkg/proto/friend"
pbUser "Open_IM/pkg/proto/user"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"context"
"strings"
)

0
src/common/config/config.go → pkg/common/config/config.go
View File

0
src/common/config/error.go → pkg/common/config/error.go
View File

0
src/common/constant/constant.go → pkg/common/constant/constant.go
View File

2
src/common/db/model.go → pkg/common/db/model.go
View File

@ -1,7 +1,7 @@
package db
import (
"Open_IM/src/common/config"
"Open_IM/pkg/common/config"
"github.com/garyburd/redigo/redis"
"gopkg.in/mgo.v2"
"time"

4
src/common/db/mongoModel.go → pkg/common/db/mongoModel.go
View File

@ -2,8 +2,8 @@ package db
import (
pbMsg "Open_IM/pkg/proto/chat"
"Open_IM/src/common/config"
"Open_IM/src/common/constant"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"errors"
"github.com/golang/protobuf/proto"
"gopkg.in/mgo.v2/bson"

4
src/common/db/mysql.go → pkg/common/db/mysql.go
View File

@ -1,8 +1,8 @@
package db
import (
"Open_IM/src/common/config"
"Open_IM/src/common/log"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"fmt"
"github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/mysql"

2
src/common/db/mysql_model/im_mysql_model/friend_model.go → pkg/common/db/mysql_model/im_mysql_model/friend_model.go
View File

@ -1,7 +1,7 @@
package im_mysql_model
import (
"Open_IM/src/common/db"
"Open_IM/pkg/common/db"
_ "github.com/jinzhu/gorm/dialects/mysql"
"time"
)

2
src/common/db/mysql_model/im_mysql_model/friend_request_model.go → pkg/common/db/mysql_model/im_mysql_model/friend_request_model.go
View File

@ -1,7 +1,7 @@
package im_mysql_model
import (
"Open_IM/src/common/db"
"Open_IM/pkg/common/db"
"time"
)

2
src/common/db/mysql_model/im_mysql_model/group_member_model.go → pkg/common/db/mysql_model/im_mysql_model/group_member_model.go
View File

@ -1,7 +1,7 @@
package im_mysql_model
import (
"Open_IM/src/common/db"
"Open_IM/pkg/common/db"
"time"
)

4
src/common/db/mysql_model/im_mysql_model/group_model.go → pkg/common/db/mysql_model/im_mysql_model/group_model.go
View File

@ -2,8 +2,8 @@ package im_mysql_model
import (
"Open_IM/pkg/proto/group"
"Open_IM/src/common/db"
"Open_IM/src/common/log"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/log"
"errors"
"time"
)

2
src/common/db/mysql_model/im_mysql_model/group_request_model.go → pkg/common/db/mysql_model/im_mysql_model/group_request_model.go
View File

@ -1,7 +1,7 @@
package im_mysql_model
import (
"Open_IM/src/common/db"
"Open_IM/pkg/common/db"
"time"
)

0
src/common/db/mysql_model/im_mysql_model/model_struct.go → pkg/common/db/mysql_model/im_mysql_model/model_struct.go
View File

2
src/common/db/mysql_model/im_mysql_model/user_black_list_model.go → pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go
View File

@ -1,7 +1,7 @@
package im_mysql_model
import (
"Open_IM/src/common/db"
"Open_IM/pkg/common/db"
"time"
)

6
src/common/db/mysql_model/im_mysql_model/user_model.go → pkg/common/db/mysql_model/im_mysql_model/user_model.go
View File

@ -1,10 +1,10 @@
package im_mysql_model
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db"
pbAuth "Open_IM/pkg/proto/auth"
"Open_IM/src/common/config"
"Open_IM/src/common/db"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
_ "github.com/jinzhu/gorm/dialects/mysql"
"time"
)

4
src/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go → pkg/common/db/mysql_model/im_mysql_msg_model/chat_log_model.go
View File

@ -7,9 +7,9 @@
package im_mysql_msg_model
import (
"Open_IM/pkg/common/db"
pbMsg "Open_IM/pkg/proto/chat"
"Open_IM/src/common/db"
"Open_IM/src/utils"
"Open_IM/pkg/utils"
"database/sql"
"time"
)

4
src/common/db/mysql_model/im_mysql_msg_model/hash_code.go → pkg/common/db/mysql_model/im_mysql_msg_model/hash_code.go
View File

@ -1,8 +1,8 @@
package im_mysql_msg_model
import (
"Open_IM/src/common/config"
"Open_IM/src/common/db"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db"
"hash/crc32"
"strconv"
)

0
src/common/db/mysql_model/im_mysql_msg_model/receive_model.go → pkg/common/db/mysql_model/im_mysql_msg_model/receive_model.go
View File

2
src/common/db/redisModel.go → pkg/common/db/redisModel.go
View File

@ -1,7 +1,7 @@
package db
import (
log2 "Open_IM/src/common/log"
log2 "Open_IM/pkg/common/log"
"github.com/garyburd/redigo/redis"
)

0
src/common/http/http_client.go → pkg/common/http/http_client.go
View File

0
src/common/kafka/consumer.go → pkg/common/kafka/consumer.go
View File

0
src/common/kafka/consumer_group.go → pkg/common/kafka/consumer_group.go
View File

2
src/common/kafka/producer.go → pkg/common/kafka/producer.go
View File

@ -1,7 +1,7 @@
package kafka
import (
log2 "Open_IM/src/common/log"
log2 "Open_IM/pkg/common/log"
"github.com/Shopify/sarama"
"github.com/golang/protobuf/proto"
)

8
src/common/multi_terminal_login/multi_terminal_login.go → pkg/common/multi_terminal_login/multi_terminal_login.go
View File

@ -4,10 +4,10 @@ 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"
"Open_IM/src/utils"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common"
)
func MultiTerminalLoginChecker(uid, token string, platformID int32) error {

Some files were not shown because too many files have changed in this diff Show More