From dc33071478fc1abe61615da1b265808b90bfded2 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Thu, 16 Feb 2023 15:41:37 +0800 Subject: [PATCH] Error code standardization --- cmd/api/main.go | 4 +--- cmd/rpc/conversation/main.go | 2 +- go.mod | 1 - go.sum | 1 - internal/api/auth/auth.go | 2 +- internal/api/conversation/conversation.go | 3 +-- internal/api/friend/friend.go | 2 +- internal/api/friend/friend1.go | 4 ++-- internal/api/group/group.go | 2 +- internal/api/group/group_test.go | 2 +- internal/api/group/super_group.go | 2 +- internal/api/manage/management_chat.go | 3 +-- internal/api/manage/management_user.go | 3 +-- internal/api/msg/del_msg.go | 3 +-- internal/api/msg/extend_msg.go | 3 +-- internal/api/msg/get_max_min_seq.go | 1 - internal/api/msg/pull_msg.go | 1 - internal/api/msg/send_msg.go | 1 - internal/api/third/ali_oss_credential.go | 2 +- internal/api/third/aws_storage_credential.go | 2 +- internal/api/third/fcm_update_token.go | 3 +-- internal/api/third/minio_storage_credential.go | 3 +-- internal/api/third/rtc.go | 3 +-- internal/api/third/set_app_badge.go | 3 +-- internal/api/third/tencent_cloud_storage_credential.go | 2 +- internal/api/user/user.go | 5 ++--- internal/msggateway/batch_push.go | 1 - internal/msggateway/init.go | 2 +- internal/msggateway/logic.go | 1 - internal/msggateway/new/compressor.go | 1 - internal/msggateway/new/encoder.go | 1 - internal/msggateway/new/n_ws_server.go | 1 - internal/msggateway/relay_rpc_server.go | 10 ++++------ internal/msggateway/ws_server.go | 3 +-- internal/push/fcm/push.go | 1 - internal/push/getui/push.go | 1 - internal/push/logic/init.go | 2 +- internal/push/logic/push_rpc_server.go | 5 ++--- internal/push/logic/push_to_client.go | 5 ++--- internal/push/logic/tpns.go | 3 --- internal/rpc/conversation/conversaion.go | 6 ++---- internal/rpc/msg/callback.go | 2 +- internal/rpc/msg/extend_msg.go | 1 - internal/rpc/msg/lock.go | 1 - internal/rpc/msg/send_pull.go | 2 +- internal/rpc/msg/server.go | 2 +- internal/startrpc/start.go | 2 +- ...orm_number_id_to_name.go => platform_id_to_name.go} | 0 pkg/common/kafka/producer.go | 2 +- 49 files changed, 41 insertions(+), 77 deletions(-) rename pkg/common/constant/{platform_number_id_to_name.go => platform_id_to_name.go} (100%) diff --git a/cmd/api/main.go b/cmd/api/main.go index a9430f3c0..1e590de68 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -1,7 +1,6 @@ package main import ( - _ "Open_IM/cmd/open_im_api/docs" apiAuth "Open_IM/internal/api/auth" "Open_IM/internal/api/conversation" "Open_IM/internal/api/friend" @@ -14,7 +13,6 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/common/middleware" "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/utils" "flag" "fmt" @@ -28,7 +26,7 @@ import ( "github.com/gin-gonic/gin" //"syscall" "Open_IM/pkg/common/constant" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" ) // @title open-IM-Server API diff --git a/cmd/rpc/conversation/main.go b/cmd/rpc/conversation/main.go index e9ef7d201..0704ec8be 100644 --- a/cmd/rpc/conversation/main.go +++ b/cmd/rpc/conversation/main.go @@ -4,7 +4,7 @@ import ( rpcConversation "Open_IM/internal/rpc/conversation" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" "flag" "fmt" ) diff --git a/go.mod b/go.mod index 1f50db214..ad9918682 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,6 @@ require ( ) require ( - github.com/envoyproxy/protoc-gen-validate v0.1.0 github.com/go-openapi/spec v0.20.6 // indirect github.com/go-openapi/swag v0.21.1 // indirect github.com/go-playground/locales v0.14.1 // indirect diff --git a/go.sum b/go.sum index 4ca367233..805ab32e1 100644 --- a/go.sum +++ b/go.sum @@ -510,7 +510,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= -github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index bfb43cf23..94c805b48 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -1,7 +1,7 @@ package apiAuth import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/conversation/conversation.go b/internal/api/conversation/conversation.go index 687c95ffd..251de1994 100644 --- a/internal/api/conversation/conversation.go +++ b/internal/api/conversation/conversation.go @@ -1,10 +1,9 @@ package conversation import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" - "Open_IM/pkg/getcdv3" pbConversation "Open_IM/pkg/proto/conversation" pbUser "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go index 14306cdc2..953ab9574 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend/friend.go @@ -2,7 +2,7 @@ package friend //import ( // jsonData "Open_IM/internal/utils" -// api "Open_IM/pkg/api_struct" +// api "Open_IM/pkg/apistruct" // "Open_IM/pkg/common/config" // "Open_IM/pkg/common/log" // "Open_IM/pkg/common/tokenverify" diff --git a/internal/api/friend/friend1.go b/internal/api/friend/friend1.go index a3469245c..dc94aa210 100644 --- a/internal/api/friend/friend1.go +++ b/internal/api/friend/friend1.go @@ -1,8 +1,8 @@ package friend import ( - common "Open_IM/internal/api_to_rpc" - api "Open_IM/pkg/api_struct" + common "Open_IM/internal/api2rpc" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" rpc "Open_IM/pkg/proto/friend" "github.com/gin-gonic/gin" diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 2682374e8..5cc57e2c1 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -2,7 +2,7 @@ package group //import ( // common "Open_IM/internal/api_to_rpc" -// api "Open_IM/pkg/api_struct" +// api "Open_IM/pkg/apistruct" // "Open_IM/pkg/common/config" // "Open_IM/pkg/common/constant" // "Open_IM/pkg/common/log" diff --git a/internal/api/group/group_test.go b/internal/api/group/group_test.go index fc9595270..8334de243 100644 --- a/internal/api/group/group_test.go +++ b/internal/api/group/group_test.go @@ -1,7 +1,7 @@ package group import ( - "Open_IM/pkg/api_struct" + "Open_IM/pkg/apistruct" "Open_IM/pkg/proto/group" "context" "errors" diff --git a/internal/api/group/super_group.go b/internal/api/group/super_group.go index 10858d706..0dd19abd0 100644 --- a/internal/api/group/super_group.go +++ b/internal/api/group/super_group.go @@ -2,7 +2,7 @@ package group //import ( // jsonData "Open_IM/internal/utils" -// api "Open_IM/pkg/api_struct" +// api "Open_IM/pkg/apistruct" // "Open_IM/pkg/common/config" // "Open_IM/pkg/common/log" // "Open_IM/pkg/common/token_verify" diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index 3df2d0c5c..d1160fd0f 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -7,10 +7,9 @@ package manage import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "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/common/tokenverify" pbChat "Open_IM/pkg/proto/msg" diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index e2c5a1721..7e1829e48 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -7,12 +7,11 @@ package manage import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/getcdv3" pbRelay "Open_IM/pkg/proto/relay" rpc "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" diff --git a/internal/api/msg/del_msg.go b/internal/api/msg/del_msg.go index 877062404..e3031faf9 100644 --- a/internal/api/msg/del_msg.go +++ b/internal/api/msg/del_msg.go @@ -1,12 +1,11 @@ package msg import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/getcdv3" rpc "Open_IM/pkg/proto/msg" pbCommon "Open_IM/pkg/proto/sdkws" "Open_IM/pkg/utils" diff --git a/internal/api/msg/extend_msg.go b/internal/api/msg/extend_msg.go index 44db54920..a1e4130d3 100644 --- a/internal/api/msg/extend_msg.go +++ b/internal/api/msg/extend_msg.go @@ -1,12 +1,11 @@ package msg import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/getcdv3" rpc "Open_IM/pkg/proto/msg" "Open_IM/pkg/utils" "context" diff --git a/internal/api/msg/get_max_min_seq.go b/internal/api/msg/get_max_min_seq.go index b6cecdfe3..444f82d04 100644 --- a/internal/api/msg/get_max_min_seq.go +++ b/internal/api/msg/get_max_min_seq.go @@ -4,7 +4,6 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/getcdv3" pbChat "Open_IM/pkg/proto/msg" sdkws "Open_IM/pkg/proto/sdkws" "context" diff --git a/internal/api/msg/pull_msg.go b/internal/api/msg/pull_msg.go index 5bd2c175f..254e9b781 100644 --- a/internal/api/msg/pull_msg.go +++ b/internal/api/msg/pull_msg.go @@ -4,7 +4,6 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" - "Open_IM/pkg/getcdv3" "Open_IM/pkg/proto/msg" sdkws "Open_IM/pkg/proto/sdkws" "Open_IM/pkg/utils" diff --git a/internal/api/msg/send_msg.go b/internal/api/msg/send_msg.go index 36f7e2d1d..a9b826c5f 100644 --- a/internal/api/msg/send_msg.go +++ b/internal/api/msg/send_msg.go @@ -7,7 +7,6 @@ import ( sdkws "Open_IM/pkg/proto/sdkws" "context" - "Open_IM/pkg/getcdv3" "github.com/gin-gonic/gin" "net/http" "strings" diff --git a/internal/api/third/ali_oss_credential.go b/internal/api/third/ali_oss_credential.go index ce3d34be7..0dce20690 100644 --- a/internal/api/third/ali_oss_credential.go +++ b/internal/api/third/ali_oss_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/third/aws_storage_credential.go b/internal/api/third/aws_storage_credential.go index 9a7b9268d..5e4127155 100644 --- a/internal/api/third/aws_storage_credential.go +++ b/internal/api/third/aws_storage_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/third/fcm_update_token.go b/internal/api/third/fcm_update_token.go index 2b7a2da20..b6a31b96a 100644 --- a/internal/api/third/fcm_update_token.go +++ b/internal/api/third/fcm_update_token.go @@ -1,8 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" - "Open_IM/pkg/common/db" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" "Open_IM/pkg/utils" diff --git a/internal/api/third/minio_storage_credential.go b/internal/api/third/minio_storage_credential.go index c57e8b1e9..b8f610b5c 100644 --- a/internal/api/third/minio_storage_credential.go +++ b/internal/api/third/minio_storage_credential.go @@ -1,10 +1,9 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" _ "Open_IM/pkg/common/tokenverify" diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go index 60a37856c..1a4656197 100644 --- a/internal/api/third/rtc.go +++ b/internal/api/third/rtc.go @@ -1,8 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" - "Open_IM/pkg/common/db" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" "Open_IM/pkg/utils" diff --git a/internal/api/third/set_app_badge.go b/internal/api/third/set_app_badge.go index e93b38a80..a6349173c 100644 --- a/internal/api/third/set_app_badge.go +++ b/internal/api/third/set_app_badge.go @@ -1,8 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" - "Open_IM/pkg/common/db" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" "Open_IM/pkg/utils" diff --git a/internal/api/third/tencent_cloud_storage_credential.go b/internal/api/third/tencent_cloud_storage_credential.go index e36b49d5c..c008f8590 100644 --- a/internal/api/third/tencent_cloud_storage_credential.go +++ b/internal/api/third/tencent_cloud_storage_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/user/user.go b/internal/api/user/user.go index 3927acbaa..e8d3a157c 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -1,17 +1,16 @@ package user import ( - jsonData "Open_IM/internal/utils" - api "Open_IM/pkg/api_struct" + api "Open_IM/pkg/apistruct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tokenverify" - cacheRpc "Open_IM/pkg/proto/cache" pbRelay "Open_IM/pkg/proto/relay" sdkws "Open_IM/pkg/proto/sdkws" rpc "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" + jsonData "Open_IM/pkg/utils" "context" "net/http" "strings" diff --git a/internal/msggateway/batch_push.go b/internal/msggateway/batch_push.go index a215ddd0a..fb8fc89fe 100644 --- a/internal/msggateway/batch_push.go +++ b/internal/msggateway/batch_push.go @@ -2,7 +2,6 @@ package msggateway import ( "Open_IM/pkg/common/config" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" pbChat "Open_IM/pkg/proto/msg" sdkws "Open_IM/pkg/proto/sdkws" diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index 5f2765fe8..b88c9171d 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" "github.com/go-playground/validator/v10" ) diff --git a/internal/msggateway/logic.go b/internal/msggateway/logic.go index 5752ce74f..3b52e3bcd 100644 --- a/internal/msggateway/logic.go +++ b/internal/msggateway/logic.go @@ -3,7 +3,6 @@ package msggateway import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/common/prome" pbChat "Open_IM/pkg/proto/msg" diff --git a/internal/msggateway/new/compressor.go b/internal/msggateway/new/compressor.go index 42abcccd1..fbc9ea7bf 100644 --- a/internal/msggateway/new/compressor.go +++ b/internal/msggateway/new/compressor.go @@ -4,7 +4,6 @@ import ( "bytes" "compress/gzip" "io/ioutil" - "open_im_sdk/pkg/utils" ) type Compressor interface { diff --git a/internal/msggateway/new/encoder.go b/internal/msggateway/new/encoder.go index 10f369d2b..522d40c6a 100644 --- a/internal/msggateway/new/encoder.go +++ b/internal/msggateway/new/encoder.go @@ -3,7 +3,6 @@ package new import ( "bytes" "encoding/gob" - "open_im_sdk/pkg/utils" ) type Encoder interface { diff --git a/internal/msggateway/new/n_ws_server.go b/internal/msggateway/new/n_ws_server.go index 7f8f1b131..d74d715b7 100644 --- a/internal/msggateway/new/n_ws_server.go +++ b/internal/msggateway/new/n_ws_server.go @@ -5,7 +5,6 @@ import ( "errors" "github.com/gorilla/websocket" "net/http" - "open_im_sdk/pkg/utils" "sync" "sync/atomic" "time" diff --git a/internal/msggateway/relay_rpc_server.go b/internal/msggateway/relay_rpc_server.go index 8a95c1292..6dbaf90a6 100644 --- a/internal/msggateway/relay_rpc_server.go +++ b/internal/msggateway/relay_rpc_server.go @@ -12,15 +12,13 @@ import ( "bytes" "context" "encoding/gob" + "github.com/golang/protobuf/proto" + "github.com/gorilla/websocket" + grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus" + "google.golang.org/grpc" "net" "strconv" "strings" - - "github.com/golang/protobuf/proto" - grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - - "github.com/gorilla/websocket" - "google.golang.org/grpc" ) type RPCServer struct { diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go index 6e4630a5f..003a3b0e1 100644 --- a/internal/msggateway/ws_server.go +++ b/internal/msggateway/ws_server.go @@ -3,9 +3,8 @@ package msggateway import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" "Open_IM/pkg/common/tokenverify" pbRelay "Open_IM/pkg/proto/relay" "Open_IM/pkg/utils" diff --git a/internal/push/fcm/push.go b/internal/push/fcm/push.go index 8a739335a..9a5473eb6 100644 --- a/internal/push/fcm/push.go +++ b/internal/push/fcm/push.go @@ -3,7 +3,6 @@ package fcm import ( "Open_IM/internal/push" "Open_IM/pkg/common/config" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "context" go_redis "github.com/go-redis/redis/v8" diff --git a/internal/push/getui/push.go b/internal/push/getui/push.go index 783f62f54..3a68134ff 100644 --- a/internal/push/getui/push.go +++ b/internal/push/getui/push.go @@ -3,7 +3,6 @@ package getui import ( "Open_IM/internal/push" "Open_IM/pkg/common/config" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/utils" "bytes" diff --git a/internal/push/logic/init.go b/internal/push/logic/init.go index 04334a1fd..3ff25c84b 100644 --- a/internal/push/logic/init.go +++ b/internal/push/logic/init.go @@ -15,7 +15,7 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/kafka" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" "Open_IM/pkg/statistics" "fmt" ) diff --git a/internal/push/logic/push_rpc_server.go b/internal/push/logic/push_rpc_server.go index 888dfb255..2a284757a 100644 --- a/internal/push/logic/push_rpc_server.go +++ b/internal/push/logic/push_rpc_server.go @@ -3,10 +3,9 @@ package logic import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db" + "Open_IM/pkg/common/log" - prome "Open_IM/pkg/common/prometheus" - "Open_IM/pkg/getcdv3" + prome "Open_IM/pkg/common/prome" pbPush "Open_IM/pkg/proto/push" "Open_IM/pkg/utils" "context" diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index f1e42dc02..9030695b3 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -10,9 +10,8 @@ import ( "Open_IM/internal/push" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - "Open_IM/pkg/getcdv3" + pbPush "Open_IM/pkg/proto/push" pbRelay "Open_IM/pkg/proto/relay" pbRtc "Open_IM/pkg/proto/rtc" @@ -20,7 +19,7 @@ import ( "context" "strings" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" "github.com/golang/protobuf/proto" ) diff --git a/internal/push/logic/tpns.go b/internal/push/logic/tpns.go index 3d737f4a7..e1b671180 100644 --- a/internal/push/logic/tpns.go +++ b/internal/push/logic/tpns.go @@ -1,10 +1,7 @@ package logic import ( - tpns "Open_IM/internal/push/sdk/tpns-server-sdk-go/go" "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/pkg/common/config" ) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 4cfb99cbe..b536a07f3 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -8,12 +8,10 @@ import ( "Open_IM/pkg/common/db/controller" "Open_IM/pkg/common/db/relation" tableRelation "Open_IM/pkg/common/db/table/relation" - "Open_IM/pkg/common/db/unrelation" + "Open_IM/pkg/common/log" - promePkg "Open_IM/pkg/common/prometheus" - "Open_IM/pkg/getcdv3" + promePkg "Open_IM/pkg/common/prome" pbConversation "Open_IM/pkg/proto/conversation" - pbUser "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" "context" "github.com/dtm-labs/rockscache" diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index f8660e7e1..9815d0567 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -32,7 +32,7 @@ func toCommonCallback(ctx context.Context, msg *pbChat.SendMsgReq, command strin AtUserIDList: msg.MsgData.AtUserIDList, SenderFaceURL: msg.MsgData.SenderFaceURL, Content: utils.GetContent(msg.MsgData), - Seq: msg.MsgData.Seq, + Seq: uint32(msg.MsgData.Seq), Ex: msg.MsgData.Ex, } } diff --git a/internal/rpc/msg/extend_msg.go b/internal/rpc/msg/extend_msg.go index 5d32729f2..ba3ad3a7c 100644 --- a/internal/rpc/msg/extend_msg.go +++ b/internal/rpc/msg/extend_msg.go @@ -3,7 +3,6 @@ package msg import ( "Open_IM/internal/common/notification" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/proto/msg" "Open_IM/pkg/proto/sdkws" diff --git a/internal/rpc/msg/lock.go b/internal/rpc/msg/lock.go index cef59cb1a..bee152b15 100644 --- a/internal/rpc/msg/lock.go +++ b/internal/rpc/msg/lock.go @@ -1,7 +1,6 @@ package msg import ( - "Open_IM/pkg/common/db" "time" ) diff --git a/internal/rpc/msg/send_pull.go b/internal/rpc/msg/send_pull.go index 904e4f402..09502d4f3 100644 --- a/internal/rpc/msg/send_pull.go +++ b/internal/rpc/msg/send_pull.go @@ -2,7 +2,7 @@ package msg import ( "Open_IM/pkg/common/constant" - promePkg "Open_IM/pkg/common/prometheus" + promePkg "Open_IM/pkg/common/prome" pbConversation "Open_IM/pkg/proto/conversation" "Open_IM/pkg/proto/msg" "Open_IM/pkg/proto/sdkws" diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index 1700d4e72..f9304b5f0 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -9,7 +9,7 @@ import ( discoveryRegistry "Open_IM/pkg/discoveryregistry" "github.com/OpenIMSDK/openKeeper" - promePkg "Open_IM/pkg/common/prometheus" + promePkg "Open_IM/pkg/common/prome" "Open_IM/pkg/proto/msg" "google.golang.org/grpc" ) diff --git a/internal/startrpc/start.go b/internal/startrpc/start.go index 1a487d2b7..89ce089e3 100644 --- a/internal/startrpc/start.go +++ b/internal/startrpc/start.go @@ -6,7 +6,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/middleware" - promePkg "Open_IM/pkg/common/prometheus" + promePkg "Open_IM/pkg/common/prome" "flag" "fmt" "github.com/OpenIMSDK/openKeeper" diff --git a/pkg/common/constant/platform_number_id_to_name.go b/pkg/common/constant/platform_id_to_name.go similarity index 100% rename from pkg/common/constant/platform_number_id_to_name.go rename to pkg/common/constant/platform_id_to_name.go diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index c894fd2b4..b02fe3ef3 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -9,7 +9,7 @@ import ( "github.com/Shopify/sarama" "github.com/golang/protobuf/proto" - prome "Open_IM/pkg/common/prometheus" + prome "Open_IM/pkg/common/prome" ) type Producer struct {