diff --git a/go.mod b/go.mod index ba5ec0fa5..97f17a5e2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( firebase.google.com/go v3.13.0+incompatible - github.com/OpenIMSDK/protocol v0.0.56 github.com/dtm-labs/rockscache v0.1.1 github.com/gin-gonic/gin v1.9.1 github.com/go-playground/validator/v10 v10.18.0 @@ -16,7 +15,8 @@ require ( github.com/minio/minio-go/v7 v7.0.67 github.com/mitchellh/mapstructure v1.5.0 github.com/openimsdk/localcache v0.0.1 - github.com/openimsdk/tools v0.0.46-alpha.7 + github.com/openimsdk/protocol v0.0.58-google + github.com/openimsdk/tools v0.0.46-alpha.9 github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.18.0 github.com/sirupsen/logrus v1.9.3 // indirect @@ -24,7 +24,7 @@ require ( go.mongodb.org/mongo-driver v1.14.0 golang.org/x/image v0.15.0 google.golang.org/api v0.165.0 - google.golang.org/grpc v1.61.0 + google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -136,15 +136,15 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gorm.io/gorm v1.25.8 // indirect diff --git a/go.sum b/go.sum index 044c3f615..80503e694 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,6 @@ firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIw github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/IBM/sarama v1.42.2 h1:VoY4hVIZ+WQJ8G9KNY/SQlWguBQXQ9uvFPOnrcu8hEw= github.com/IBM/sarama v1.42.2/go.mod h1:FLPGUGwYqEs62hq2bVG6Io2+5n+pS6s/WOXVKWSLFtE= -github.com/OpenIMSDK/protocol v0.0.56 h1:mbVFyDBachEsmJLfYW5AU1z2KL8AUEpoHG8RPCIxjgg= -github.com/OpenIMSDK/protocol v0.0.56/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= @@ -50,7 +48,7 @@ github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 h1:7To3pQ+pZo0i3dsWEbinPNFs5gPSBOsJtx3wTT94VBY= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -75,7 +73,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -270,8 +268,10 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/openimsdk/tools v0.0.46-alpha.7 h1:vzN/KAYQtMnVn2zWjasGb3jYPBFG0M1ldX31CcytTKQ= -github.com/openimsdk/tools v0.0.46-alpha.7/go.mod h1:qSmmASQjl0TEXWrPLVugM/Mh2zpKWtv1kzjNeM+crUw= +github.com/openimsdk/protocol v0.0.58-google h1:cGNUVaXO9LqcFgIb4NvrtEOrv0spGecoQKyN8YWhyZs= +github.com/openimsdk/protocol v0.0.58-google/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8= +github.com/openimsdk/tools v0.0.46-alpha.9 h1:bVGn5I0Gx7fKiVdiODQ2yjgIevzfaN5LffO/aiMNxcQ= +github.com/openimsdk/tools v0.0.46-alpha.9/go.mod h1:NAHPJyNUJm0n0WaZfIRC5s6Np+timv+xKIn5I8SKYaM= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= @@ -410,8 +410,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= @@ -489,17 +489,17 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe h1:USL2DhxfgRchafRvt/wYyyQNzwgL7ZiURcozOE/Pkvo= google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= -google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac h1:OZkkudMUu9LVQMCoRUbI/1p5VCo9BOrlvkqMvWtqa6s= -google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= -google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/internal/api/auth.go b/internal/api/auth.go index 7a3468f91..f0790ce98 100644 --- a/internal/api/auth.go +++ b/internal/api/auth.go @@ -15,9 +15,9 @@ package api import ( - "github.com/OpenIMSDK/protocol/auth" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/auth" "github.com/openimsdk/tools/a2r" ) diff --git a/internal/api/conversation.go b/internal/api/conversation.go index 18d4b3eef..f273eaa4a 100644 --- a/internal/api/conversation.go +++ b/internal/api/conversation.go @@ -15,9 +15,9 @@ package api import ( - "github.com/OpenIMSDK/protocol/conversation" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/tools/a2r" ) diff --git a/internal/api/custom_validator.go b/internal/api/custom_validator.go index d135b0dc4..e3873d16f 100644 --- a/internal/api/custom_validator.go +++ b/internal/api/custom_validator.go @@ -15,8 +15,8 @@ package api import ( - "github.com/OpenIMSDK/protocol/constant" "github.com/go-playground/validator/v10" + "github.com/openimsdk/protocol/constant" ) // RequiredIf validates if the specified field is required based on the session type. diff --git a/internal/api/friend.go b/internal/api/friend.go index b87c50fb5..1fea38b31 100644 --- a/internal/api/friend.go +++ b/internal/api/friend.go @@ -15,9 +15,9 @@ package api import ( - "github.com/OpenIMSDK/protocol/friend" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/friend" "github.com/openimsdk/tools/a2r" ) diff --git a/internal/api/group.go b/internal/api/group.go index 13788a098..de852f195 100644 --- a/internal/api/group.go +++ b/internal/api/group.go @@ -15,9 +15,9 @@ package api import ( - "github.com/OpenIMSDK/protocol/group" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/group" "github.com/openimsdk/tools/a2r" ) diff --git a/internal/api/msg.go b/internal/api/msg.go index c716c63ad..9d25d328b 100644 --- a/internal/api/msg.go +++ b/internal/api/msg.go @@ -15,9 +15,6 @@ package api import ( - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" "github.com/mitchellh/mapstructure" @@ -25,6 +22,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/a2r" "github.com/openimsdk/tools/apiresp" "github.com/openimsdk/tools/errs" diff --git a/internal/api/route.go b/internal/api/route.go index 1e577c61a..1165a2dd4 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -28,7 +28,6 @@ import ( "syscall" "time" - "github.com/OpenIMSDK/protocol/constant" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/openimsdk/open-im-server/v3/pkg/authverify" @@ -40,6 +39,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/apiresp" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" diff --git a/internal/api/statistics.go b/internal/api/statistics.go index 5418712c2..f5ee99f73 100644 --- a/internal/api/statistics.go +++ b/internal/api/statistics.go @@ -15,9 +15,9 @@ package api import ( - "github.com/OpenIMSDK/protocol/user" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/a2r" ) diff --git a/internal/api/third.go b/internal/api/third.go index b92565032..9489c4c07 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -19,9 +19,9 @@ import ( "net/http" "strconv" - "github.com/OpenIMSDK/protocol/third" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/a2r" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/mcontext" diff --git a/internal/api/user.go b/internal/api/user.go index 42bb367c0..d48111b9e 100644 --- a/internal/api/user.go +++ b/internal/api/user.go @@ -15,11 +15,11 @@ package api import ( - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/protocol/user" "github.com/gin-gonic/gin" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msggateway" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/a2r" "github.com/openimsdk/tools/apiresp" "github.com/openimsdk/tools/errs" diff --git a/internal/msggateway/callback.go b/internal/msggateway/callback.go index f2490418b..ceb8af1db 100644 --- a/internal/msggateway/callback.go +++ b/internal/msggateway/callback.go @@ -18,10 +18,10 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/constant" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/mcontext" ) diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index 579a45ae7..7a6d6832f 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -22,9 +22,9 @@ import ( "sync" "sync/atomic" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/apiresp" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" diff --git a/internal/msggateway/context.go b/internal/msggateway/context.go index 952b9be68..9c12ee1f7 100644 --- a/internal/msggateway/context.go +++ b/internal/msggateway/context.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/protocol/constant" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/utils" ) diff --git a/internal/msggateway/hub_server.go b/internal/msggateway/hub_server.go index 85e86663c..a19626c96 100644 --- a/internal/msggateway/hub_server.go +++ b/internal/msggateway/hub_server.go @@ -17,12 +17,12 @@ package msggateway import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msggateway" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msggateway" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go index de5f4c5ec..d527f2697 100644 --- a/internal/msggateway/message_handler.go +++ b/internal/msggateway/message_handler.go @@ -18,12 +18,12 @@ import ( "context" "sync" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/push" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/go-playground/validator/v10" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/push" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/utils" diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index 7fb0f7c0f..5127b886b 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -25,14 +25,14 @@ import ( "sync/atomic" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msggateway" "github.com/go-playground/validator/v10" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msggateway" "github.com/openimsdk/tools/apiresp" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" diff --git a/internal/msgtransfer/online_history_msg_handler.go b/internal/msgtransfer/online_history_msg_handler.go index 454d5b676..b956b0399 100644 --- a/internal/msgtransfer/online_history_msg_handler.go +++ b/internal/msgtransfer/online_history_msg_handler.go @@ -23,14 +23,14 @@ import ( "time" "github.com/IBM/sarama" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/go-redis/redis" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/internal/msgtransfer/online_msg_to_mongo_handler.go b/internal/msgtransfer/online_msg_to_mongo_handler.go index e0dd927a3..fb4486f99 100644 --- a/internal/msgtransfer/online_msg_to_mongo_handler.go +++ b/internal/msgtransfer/online_msg_to_mongo_handler.go @@ -18,11 +18,11 @@ import ( "context" "github.com/IBM/sarama" - pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" kfk "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + pbmsg "github.com/openimsdk/protocol/msg" "github.com/openimsdk/tools/log" "google.golang.org/protobuf/proto" ) diff --git a/internal/push/callback.go b/internal/push/callback.go index bccdee470..7ce342568 100644 --- a/internal/push/callback.go +++ b/internal/push/callback.go @@ -17,11 +17,11 @@ package push import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/utils" ) diff --git a/internal/push/offlinepush/fcm/push.go b/internal/push/offlinepush/fcm/push.go index a1e8454f7..d2f772724 100644 --- a/internal/push/offlinepush/fcm/push.go +++ b/internal/push/offlinepush/fcm/push.go @@ -20,10 +20,10 @@ import ( firebase "firebase.google.com/go" "firebase.google.com/go/messaging" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/redis/go-redis/v9" "google.golang.org/api/option" diff --git a/internal/push/offlinepush/jpush/body/platform.go b/internal/push/offlinepush/jpush/body/platform.go index 1ef136f2c..b66397cca 100644 --- a/internal/push/offlinepush/jpush/body/platform.go +++ b/internal/push/offlinepush/jpush/body/platform.go @@ -17,7 +17,7 @@ package body import ( "errors" - "github.com/OpenIMSDK/protocol/constant" + "github.com/openimsdk/protocol/constant" ) const ( diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go index 955fd475e..702c257db 100644 --- a/internal/push/push_handler.go +++ b/internal/push/push_handler.go @@ -18,11 +18,11 @@ import ( "context" "github.com/IBM/sarama" - "github.com/OpenIMSDK/protocol/constant" - pbchat "github.com/OpenIMSDK/protocol/msg" - pbpush "github.com/OpenIMSDK/protocol/push" "github.com/openimsdk/open-im-server/v3/pkg/common/config" kfk "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" + "github.com/openimsdk/protocol/constant" + pbchat "github.com/openimsdk/protocol/msg" + pbpush "github.com/openimsdk/protocol/push" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" "google.golang.org/protobuf/proto" diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go index 3e0d140aa..17cd75f80 100644 --- a/internal/push/push_rpc_server.go +++ b/internal/push/push_rpc_server.go @@ -17,13 +17,13 @@ package push import ( "context" - "github.com/OpenIMSDK/protocol/constant" - pbpush "github.com/OpenIMSDK/protocol/push" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + pbpush "github.com/openimsdk/protocol/push" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index f9094ee55..d96eb0d81 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -20,10 +20,6 @@ import ( "errors" "sync" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/protocol/msggateway" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/dummy" "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush/fcm" @@ -36,6 +32,10 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/conversation" + "github.com/openimsdk/protocol/msggateway" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/internal/push/tools.go b/internal/push/tools.go index 760c8c95b..076dc4e34 100644 --- a/internal/push/tools.go +++ b/internal/push/tools.go @@ -15,8 +15,8 @@ package push import ( - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "google.golang.org/protobuf/proto" ) diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 7daa6d782..704d35401 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -17,15 +17,15 @@ package auth import ( "context" - pbauth "github.com/OpenIMSDK/protocol/auth" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msggateway" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + pbauth "github.com/openimsdk/protocol/auth" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msggateway" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index 9a79c8b99..36b5712cf 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -19,9 +19,6 @@ import ( "errors" "sort" - "github.com/OpenIMSDK/protocol/constant" - pbconversation "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -31,6 +28,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/protocol/constant" + pbconversation "github.com/openimsdk/protocol/conversation" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go index 01fd55f95..1d3aa1e11 100644 --- a/internal/rpc/friend/black.go +++ b/internal/rpc/friend/black.go @@ -18,10 +18,10 @@ import ( "context" "time" - pbfriend "github.com/OpenIMSDK/protocol/friend" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + pbfriend "github.com/openimsdk/protocol/friend" "github.com/openimsdk/tools/mcontext" ) diff --git a/internal/rpc/friend/callback.go b/internal/rpc/friend/callback.go index 3e0964d59..bdd78eafe 100644 --- a/internal/rpc/friend/callback.go +++ b/internal/rpc/friend/callback.go @@ -17,10 +17,10 @@ package friend import ( "context" - pbfriend "github.com/OpenIMSDK/protocol/friend" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + pbfriend "github.com/openimsdk/protocol/friend" "github.com/openimsdk/tools/utils" ) diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 971297864..57c0d331d 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -17,9 +17,6 @@ package friend import ( "context" - "github.com/OpenIMSDK/protocol/constant" - pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" @@ -30,6 +27,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/protocol/constant" + pbfriend "github.com/openimsdk/protocol/friend" + "github.com/openimsdk/protocol/sdkws" registry "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/tx" diff --git a/internal/rpc/group/cache.go b/internal/rpc/group/cache.go index bd8230d6a..435f6bb68 100644 --- a/internal/rpc/group/cache.go +++ b/internal/rpc/group/cache.go @@ -17,8 +17,8 @@ package group import ( "context" - pbgroup "github.com/OpenIMSDK/protocol/group" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" + pbgroup "github.com/openimsdk/protocol/group" ) // GetGroupInfoCache get group info from cache. diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 73a4b3523..749db7f27 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -18,18 +18,18 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/group" - pbgroup "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/protocol/wrapperspb" "github.com/openimsdk/open-im-server/v3/pkg/apistruct" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/group" + pbgroup "github.com/openimsdk/protocol/group" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/utils" + "google.golang.org/protobuf/types/known/wrapperspb" ) type GroupEventCallbackConfig struct { diff --git a/internal/rpc/group/convert.go b/internal/rpc/group/convert.go index 195f294b9..86978ce3a 100644 --- a/internal/rpc/group/convert.go +++ b/internal/rpc/group/convert.go @@ -15,8 +15,8 @@ package group import ( - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/sdkws" ) func (s *groupServer) groupDB2PB(group *relation.GroupModel, ownerUserID string, memberCount uint32) *sdkws.GroupInfo { diff --git a/internal/rpc/group/db_map.go b/internal/rpc/group/db_map.go index f55a24a36..b4b503b95 100644 --- a/internal/rpc/group/db_map.go +++ b/internal/rpc/group/db_map.go @@ -18,8 +18,8 @@ import ( "context" "time" - pbgroup "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/protocol/sdkws" + pbgroup "github.com/openimsdk/protocol/group" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/mcontext" ) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 069c5c508..ab3b8c270 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -23,11 +23,6 @@ import ( "strings" "time" - "github.com/OpenIMSDK/protocol/constant" - pbconversation "github.com/OpenIMSDK/protocol/conversation" - pbgroup "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/protocol/wrapperspb" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" @@ -41,6 +36,10 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/grouphash" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/protocol/constant" + pbconversation "github.com/openimsdk/protocol/conversation" + pbgroup "github.com/openimsdk/protocol/group" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" @@ -49,6 +48,7 @@ import ( "github.com/openimsdk/tools/tx" "github.com/openimsdk/tools/utils" "google.golang.org/grpc" + "google.golang.org/protobuf/types/known/wrapperspb" ) type groupServer struct { diff --git a/internal/rpc/group/statistics.go b/internal/rpc/group/statistics.go index 4c01215b4..6adb1261a 100644 --- a/internal/rpc/group/statistics.go +++ b/internal/rpc/group/statistics.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/group" + "github.com/openimsdk/protocol/group" "github.com/openimsdk/tools/errs" ) diff --git a/internal/rpc/group/super_group.go b/internal/rpc/group/super_group.go index 073fc2f31..469a5066c 100644 --- a/internal/rpc/group/super_group.go +++ b/internal/rpc/group/super_group.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pbgroup "github.com/OpenIMSDK/protocol/group" + pbgroup "github.com/openimsdk/protocol/group" "github.com/openimsdk/tools/errs" ) diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 53f01b770..3eb182a6a 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -17,10 +17,10 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" utils2 "github.com/openimsdk/tools/utils" diff --git a/internal/rpc/msg/callback.go b/internal/rpc/msg/callback.go index a8a6d56d7..dc9e38311 100644 --- a/internal/rpc/msg/callback.go +++ b/internal/rpc/msg/callback.go @@ -17,12 +17,12 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - pbchat "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + "github.com/openimsdk/protocol/constant" + pbchat "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/utils" diff --git a/internal/rpc/msg/delete.go b/internal/rpc/msg/delete.go index d91bc9fad..e2be1af71 100644 --- a/internal/rpc/msg/delete.go +++ b/internal/rpc/msg/delete.go @@ -17,11 +17,11 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/conversation" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" ) diff --git a/internal/rpc/msg/message_interceptor.go b/internal/rpc/msg/message_interceptor.go index 4acaa18b6..4f1bed3c4 100644 --- a/internal/rpc/msg/message_interceptor.go +++ b/internal/rpc/msg/message_interceptor.go @@ -17,10 +17,10 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" ) diff --git a/internal/rpc/msg/msg_status.go b/internal/rpc/msg/msg_status.go index 67355d505..c61ac59cf 100644 --- a/internal/rpc/msg/msg_status.go +++ b/internal/rpc/msg/msg_status.go @@ -17,8 +17,8 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - pbmsg "github.com/OpenIMSDK/protocol/msg" + "github.com/openimsdk/protocol/constant" + pbmsg "github.com/openimsdk/protocol/msg" "github.com/openimsdk/tools/mcontext" ) diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index b0167abcb..212898ad6 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -19,11 +19,11 @@ import ( "encoding/json" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/authverify" unrelationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go index f910b3f8c..bc74096f2 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -17,17 +17,17 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - pbconversation "github.com/OpenIMSDK/protocol/conversation" - pbmsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/protocol/wrapperspb" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/protocol/constant" + pbconversation "github.com/openimsdk/protocol/conversation" + pbmsg "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/utils" + "google.golang.org/protobuf/types/known/wrapperspb" ) func (m *msgServer) SendMsg(ctx context.Context, req *pbmsg.SendMsgReq) (resp *pbmsg.SendMsgResp, error error) { diff --git a/internal/rpc/msg/seq.go b/internal/rpc/msg/seq.go index dd65a542d..c9595699e 100644 --- a/internal/rpc/msg/seq.go +++ b/internal/rpc/msg/seq.go @@ -17,7 +17,7 @@ package msg import ( "context" - pbmsg "github.com/OpenIMSDK/protocol/msg" + pbmsg "github.com/openimsdk/protocol/msg" ) func (m *msgServer) GetConversationMaxSeq(ctx context.Context, req *pbmsg.GetConversationMaxSeqReq) (resp *pbmsg.GetConversationMaxSeqResp, err error) { diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index ea1a83273..5eb6fea3d 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -16,15 +16,15 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/conversation" - "github.com/OpenIMSDK/protocol/msg" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpccache" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/conversation" + "github.com/openimsdk/protocol/msg" "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/internal/rpc/msg/statistics.go b/internal/rpc/msg/statistics.go index 5a89193f8..fcabdace5 100644 --- a/internal/rpc/msg/statistics.go +++ b/internal/rpc/msg/statistics.go @@ -18,9 +18,9 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/utils" ) diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go index 9766a947c..517ee23c5 100644 --- a/internal/rpc/msg/sync_msg.go +++ b/internal/rpc/msg/sync_msg.go @@ -17,11 +17,11 @@ package msg import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" ) diff --git a/internal/rpc/msg/utils.go b/internal/rpc/msg/utils.go index 6cf925551..72f3bbde0 100644 --- a/internal/rpc/msg/utils.go +++ b/internal/rpc/msg/utils.go @@ -15,9 +15,9 @@ package msg import ( - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/utils" "github.com/redis/go-redis/v9" "go.mongodb.org/mongo-driver/mongo" diff --git a/internal/rpc/msg/verify.go b/internal/rpc/msg/verify.go index 8d9b268d4..70ce077cc 100644 --- a/internal/rpc/msg/verify.go +++ b/internal/rpc/msg/verify.go @@ -20,10 +20,10 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" diff --git a/internal/rpc/third/log.go b/internal/rpc/third/log.go index 450633717..b6f4d359f 100644 --- a/internal/rpc/third/log.go +++ b/internal/rpc/third/log.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/third" "github.com/openimsdk/open-im-server/v3/pkg/authverify" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/utils" utils2 "github.com/openimsdk/tools/utils" diff --git a/internal/rpc/third/s3.go b/internal/rpc/third/s3.go index 5886ab13d..f7646e480 100644 --- a/internal/rpc/third/s3.go +++ b/internal/rpc/third/s3.go @@ -23,11 +23,11 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/protocol/third" "github.com/google/uuid" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3" "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/cont" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/internal/rpc/third/third.go b/internal/rpc/third/third.go index e38fd7f9b..2a5e8022b 100644 --- a/internal/rpc/third/third.go +++ b/internal/rpc/third/third.go @@ -20,7 +20,6 @@ import ( "net/url" "time" - "github.com/OpenIMSDK/protocol/third" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" @@ -31,6 +30,7 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/s3/oss" "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "google.golang.org/grpc" diff --git a/internal/rpc/third/tool.go b/internal/rpc/third/tool.go index ddeba8bc5..cab301e1e 100644 --- a/internal/rpc/third/tool.go +++ b/internal/rpc/third/tool.go @@ -21,8 +21,8 @@ import ( "strings" "unicode/utf8" - "github.com/OpenIMSDK/protocol/third" "github.com/openimsdk/open-im-server/v3/pkg/authverify" + "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/mcontext" ) diff --git a/internal/rpc/user/callback.go b/internal/rpc/user/callback.go index 45932901c..3fb4c426a 100644 --- a/internal/rpc/user/callback.go +++ b/internal/rpc/user/callback.go @@ -17,10 +17,10 @@ package user import ( "context" - pbuser "github.com/OpenIMSDK/protocol/user" cbapi "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/http" + pbuser "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/utils" ) diff --git a/internal/rpc/user/statistics.go b/internal/rpc/user/statistics.go index 9464c9839..ea4c17bfd 100644 --- a/internal/rpc/user/statistics.go +++ b/internal/rpc/user/statistics.go @@ -18,7 +18,7 @@ import ( "context" "time" - pbuser "github.com/OpenIMSDK/protocol/user" + pbuser "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/errs" ) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 43b6cc68f..26fe855c7 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -21,9 +21,6 @@ import ( "strings" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" - pbuser "github.com/OpenIMSDK/protocol/user" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" @@ -35,6 +32,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" + pbuser "github.com/openimsdk/protocol/user" registry "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" diff --git a/internal/tools/conversation.go b/internal/tools/conversation.go index 906351490..baee9cbc9 100644 --- a/internal/tools/conversation.go +++ b/internal/tools/conversation.go @@ -19,8 +19,8 @@ import ( "math/rand" "time" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" "github.com/openimsdk/tools/utils" diff --git a/internal/tools/msg.go b/internal/tools/msg.go index 381047f09..c619c4d73 100644 --- a/internal/tools/msg.go +++ b/internal/tools/msg.go @@ -17,7 +17,6 @@ package tools import ( "context" "fmt" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" @@ -26,6 +25,7 @@ import ( kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient/notification" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/internal/tools/msg_doc_convert.go b/internal/tools/msg_doc_convert.go index 1968c4b67..e7625ce21 100644 --- a/internal/tools/msg_doc_convert.go +++ b/internal/tools/msg_doc_convert.go @@ -15,8 +15,8 @@ package tools import ( - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" ) diff --git a/pkg/apistruct/manage.go b/pkg/apistruct/manage.go index f9f542835..e79b47722 100644 --- a/pkg/apistruct/manage.go +++ b/pkg/apistruct/manage.go @@ -15,7 +15,7 @@ package apistruct import ( - sdkws "github.com/OpenIMSDK/protocol/sdkws" + sdkws "github.com/openimsdk/protocol/sdkws" ) // SendMsg defines the structure for sending messages with various metadata. diff --git a/pkg/callbackstruct/group.go b/pkg/callbackstruct/group.go index 467061a4a..e78d45ab4 100644 --- a/pkg/callbackstruct/group.go +++ b/pkg/callbackstruct/group.go @@ -15,8 +15,8 @@ package callbackstruct import ( - common "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/apistruct" + common "github.com/openimsdk/protocol/sdkws" ) type CallbackCommand string diff --git a/pkg/callbackstruct/message.go b/pkg/callbackstruct/message.go index 2864e28b1..902fa6110 100644 --- a/pkg/callbackstruct/message.go +++ b/pkg/callbackstruct/message.go @@ -15,7 +15,7 @@ package callbackstruct import ( - sdkws "github.com/OpenIMSDK/protocol/sdkws" + sdkws "github.com/openimsdk/protocol/sdkws" ) type CallbackBeforeSendSingleMsgReq struct { diff --git a/pkg/callbackstruct/push.go b/pkg/callbackstruct/push.go index 0566c35e2..0b0f29b51 100644 --- a/pkg/callbackstruct/push.go +++ b/pkg/callbackstruct/push.go @@ -14,7 +14,7 @@ package callbackstruct -import common "github.com/OpenIMSDK/protocol/sdkws" +import common "github.com/openimsdk/protocol/sdkws" type CallbackBeforePushReq struct { UserStatusBatchCallbackReq diff --git a/pkg/callbackstruct/user.go b/pkg/callbackstruct/user.go index 96663a2ee..3931f42b9 100644 --- a/pkg/callbackstruct/user.go +++ b/pkg/callbackstruct/user.go @@ -15,8 +15,8 @@ package callbackstruct import ( - "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/protocol/wrapperspb" + "github.com/openimsdk/protocol/sdkws" + "google.golang.org/protobuf/types/known/wrapperspb" ) type CallbackBeforeUpdateUserInfoReq struct { diff --git a/pkg/common/cmd/api.go b/pkg/common/cmd/api.go index 70a92878b..dc64b639b 100644 --- a/pkg/common/cmd/api.go +++ b/pkg/common/cmd/api.go @@ -16,10 +16,10 @@ package cmd import ( "context" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/internal/api" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" "github.com/spf13/cobra" ) diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go index a766292b8..06a5862b2 100644 --- a/pkg/common/cmd/msg_gateway.go +++ b/pkg/common/cmd/msg_gateway.go @@ -19,9 +19,9 @@ import ( config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "log" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/internal/msggateway" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" "github.com/spf13/cobra" ) diff --git a/pkg/common/cmd/msg_gateway_test.go b/pkg/common/cmd/msg_gateway_test.go index c0ea2b057..e2e75115b 100644 --- a/pkg/common/cmd/msg_gateway_test.go +++ b/pkg/common/cmd/msg_gateway_test.go @@ -17,7 +17,7 @@ package cmd import ( "testing" - "github.com/OpenIMSDK/protocol/constant" + "github.com/openimsdk/protocol/constant" "github.com/stretchr/testify/mock" "gotest.tools/assert" ) diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index b327fcad6..fbd085c69 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -19,9 +19,9 @@ import ( "fmt" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/internal/msgtransfer" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" "github.com/spf13/cobra" ) diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go index 7a162b613..e730b2e7f 100644 --- a/pkg/common/cmd/root.go +++ b/pkg/common/cmd/root.go @@ -17,9 +17,9 @@ package cmd import ( "fmt" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/common/config" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/spf13/cobra" diff --git a/pkg/common/cmd/rpc.go b/pkg/common/cmd/rpc.go index ff5a4318a..2f85fc636 100644 --- a/pkg/common/cmd/rpc.go +++ b/pkg/common/cmd/rpc.go @@ -18,10 +18,10 @@ import ( "context" "errors" - "github.com/OpenIMSDK/protocol/constant" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/startrpc" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/spf13/cobra" diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index 521b8415c..eda322858 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -20,9 +20,9 @@ import ( "os" "path/filepath" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" ) diff --git a/pkg/common/convert/black.go b/pkg/common/convert/black.go index 683517fbc..635b1a586 100644 --- a/pkg/common/convert/black.go +++ b/pkg/common/convert/black.go @@ -17,9 +17,9 @@ package convert import ( "context" - "github.com/OpenIMSDK/protocol/sdkws" - sdk "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/sdkws" + sdk "github.com/openimsdk/protocol/sdkws" ) func BlackDB2Pb(ctx context.Context, blackDBs []*relation.BlackModel, f func(ctx context.Context, userIDs []string) (map[string]*sdkws.UserInfo, error)) (blackPbs []*sdk.BlackInfo, err error) { diff --git a/pkg/common/convert/conversation.go b/pkg/common/convert/conversation.go index e73499b39..5a6307733 100644 --- a/pkg/common/convert/conversation.go +++ b/pkg/common/convert/conversation.go @@ -15,8 +15,8 @@ package convert import ( - "github.com/OpenIMSDK/protocol/conversation" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/tools/utils" ) diff --git a/pkg/common/convert/friend.go b/pkg/common/convert/friend.go index 90fc7cc34..e194b1488 100644 --- a/pkg/common/convert/friend.go +++ b/pkg/common/convert/friend.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/utils" ) diff --git a/pkg/common/convert/group.go b/pkg/common/convert/group.go index dadd3493d..9b7353cfd 100644 --- a/pkg/common/convert/group.go +++ b/pkg/common/convert/group.go @@ -17,9 +17,9 @@ package convert import ( "time" - pbgroup "github.com/OpenIMSDK/protocol/group" - sdkws "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + pbgroup "github.com/openimsdk/protocol/group" + sdkws "github.com/openimsdk/protocol/sdkws" ) func Db2PbGroupInfo(m *relation.GroupModel, ownerUserID string, memberCount uint32) *sdkws.GroupInfo { diff --git a/pkg/common/convert/msg.go b/pkg/common/convert/msg.go index 34638049b..ab5193ab6 100644 --- a/pkg/common/convert/msg.go +++ b/pkg/common/convert/msg.go @@ -15,9 +15,9 @@ package convert import ( - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" ) func MsgPb2DB(msg *sdkws.MsgData) *unrelation.MsgDataModel { diff --git a/pkg/common/convert/user.go b/pkg/common/convert/user.go index 38afd8c19..a9378e1a0 100644 --- a/pkg/common/convert/user.go +++ b/pkg/common/convert/user.go @@ -17,8 +17,8 @@ package convert import ( "time" - "github.com/OpenIMSDK/protocol/sdkws" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/sdkws" ) func UsersDB2Pb(users []*relationtb.UserModel) []*sdkws.UserInfo { diff --git a/pkg/common/convert/user_test.go b/pkg/common/convert/user_test.go index a24efb53c..88eb812d2 100644 --- a/pkg/common/convert/user_test.go +++ b/pkg/common/convert/user_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/sdkws" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" ) diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index fdc2f08af..0dbb23e1c 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -19,11 +19,11 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/protocol/constant" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" diff --git a/pkg/common/db/cache/msg.go b/pkg/common/db/cache/msg.go index e32ef463f..dd0871e8d 100644 --- a/pkg/common/db/cache/msg.go +++ b/pkg/common/db/cache/msg.go @@ -20,11 +20,11 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/gogo/protobuf/jsonpb" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" diff --git a/pkg/common/db/cache/msg_test.go b/pkg/common/db/cache/msg_test.go index 65413199a..481b4012c 100644 --- a/pkg/common/db/cache/msg_test.go +++ b/pkg/common/db/cache/msg_test.go @@ -20,7 +20,7 @@ import ( "math/rand" "testing" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/sdkws" "github.com/redis/go-redis/v9" "github.com/stretchr/testify/assert" ) diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go index 73c4e9069..18b3c347d 100644 --- a/pkg/common/db/cache/user.go +++ b/pkg/common/db/cache/user.go @@ -22,12 +22,12 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/user" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/redis/go-redis/v9" diff --git a/pkg/common/db/controller/auth.go b/pkg/common/db/controller/auth.go index d13c47f7c..b912589b4 100644 --- a/pkg/common/db/controller/auth.go +++ b/pkg/common/db/controller/auth.go @@ -17,10 +17,10 @@ package controller import ( "context" - "github.com/OpenIMSDK/protocol/constant" "github.com/golang-jwt/jwt/v4" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/tokenverify" ) diff --git a/pkg/common/db/controller/conversation.go b/pkg/common/db/controller/conversation.go index ab2a8a465..ae06ddcb8 100644 --- a/pkg/common/db/controller/conversation.go +++ b/pkg/common/db/controller/conversation.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/constant" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/pagination" "github.com/openimsdk/tools/tx" diff --git a/pkg/common/db/controller/friend.go b/pkg/common/db/controller/friend.go index 8f2c38c4c..ba0441b2a 100644 --- a/pkg/common/db/controller/friend.go +++ b/pkg/common/db/controller/friend.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/protocol/constant" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index d1516ebb7..18b98f17b 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -18,10 +18,10 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/constant" "github.com/dtm-labs/rockscache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/pagination" "github.com/openimsdk/tools/tx" "github.com/openimsdk/tools/utils" diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index 51106fc05..6c61c2940 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -20,9 +20,6 @@ import ( "errors" "time" - "github.com/OpenIMSDK/protocol/constant" - pbmsg "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -30,6 +27,9 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" + "github.com/openimsdk/protocol/constant" + pbmsg "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils" diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go index 8ff990e2d..bd490342f 100644 --- a/pkg/common/db/controller/user.go +++ b/pkg/common/db/controller/user.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/user" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/pagination" "github.com/openimsdk/tools/tx" diff --git a/pkg/common/db/mgo/conversation.go b/pkg/common/db/mgo/conversation.go index 23191bc32..bd8cb24e1 100644 --- a/pkg/common/db/mgo/conversation.go +++ b/pkg/common/db/mgo/conversation.go @@ -18,8 +18,8 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/mgoutil" "github.com/openimsdk/tools/pagination" diff --git a/pkg/common/db/mgo/group.go b/pkg/common/db/mgo/group.go index 7582e131a..7499cb368 100644 --- a/pkg/common/db/mgo/group.go +++ b/pkg/common/db/mgo/group.go @@ -18,8 +18,8 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/mgoutil" "github.com/openimsdk/tools/pagination" diff --git a/pkg/common/db/mgo/group_member.go b/pkg/common/db/mgo/group_member.go index 5a410e510..f018478ff 100644 --- a/pkg/common/db/mgo/group_member.go +++ b/pkg/common/db/mgo/group_member.go @@ -17,8 +17,8 @@ package mgo import ( "context" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/mgoutil" "github.com/openimsdk/tools/pagination" diff --git a/pkg/common/db/mgo/user.go b/pkg/common/db/mgo/user.go index 350c34662..230f6c83f 100644 --- a/pkg/common/db/mgo/user.go +++ b/pkg/common/db/mgo/user.go @@ -18,8 +18,8 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/user" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/mgoutil" "github.com/openimsdk/tools/pagination" diff --git a/pkg/common/db/table/relation/user.go b/pkg/common/db/table/relation/user.go index cc0699c9b..2e1344ac5 100644 --- a/pkg/common/db/table/relation/user.go +++ b/pkg/common/db/table/relation/user.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/OpenIMSDK/protocol/user" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/pagination" ) diff --git a/pkg/common/db/table/unrelation/msg.go b/pkg/common/db/table/unrelation/msg.go index 60dd7c260..ff23d8488 100644 --- a/pkg/common/db/table/unrelation/msg.go +++ b/pkg/common/db/table/unrelation/msg.go @@ -19,8 +19,8 @@ import ( "strconv" "time" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "go.mongodb.org/mongo-driver/mongo" ) diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go index 22dc1aa0c..9a82a72dc 100644 --- a/pkg/common/db/unrelation/msg.go +++ b/pkg/common/db/unrelation/msg.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" table "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "go.mongodb.org/mongo-driver/bson" diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index f0c99e8e5..cd4dcce0c 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -22,9 +22,9 @@ import ( "net/http" "time" - "github.com/OpenIMSDK/protocol/constant" "github.com/openimsdk/open-im-server/v3/pkg/callbackstruct" "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" ) diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index cab18263b..2841f7917 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -23,7 +23,7 @@ import ( "time" "github.com/IBM/sarama" - "github.com/OpenIMSDK/protocol/constant" + "github.com/openimsdk/protocol/constant" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/pkg/msgprocessor/conversation.go b/pkg/msgprocessor/conversation.go index 0db2cd9e3..710f4ccf9 100644 --- a/pkg/msgprocessor/conversation.go +++ b/pkg/msgprocessor/conversation.go @@ -18,8 +18,8 @@ import ( "sort" "strings" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "google.golang.org/protobuf/proto" ) diff --git a/pkg/msgprocessor/conversation_test.go b/pkg/msgprocessor/conversation_test.go index c3fdb459d..32601baec 100644 --- a/pkg/msgprocessor/conversation_test.go +++ b/pkg/msgprocessor/conversation_test.go @@ -17,7 +17,7 @@ package msgprocessor import ( "testing" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/sdkws" "google.golang.org/protobuf/proto" ) diff --git a/pkg/msgprocessor/options.go b/pkg/msgprocessor/options.go index c6e209b98..406145ef4 100644 --- a/pkg/msgprocessor/options.go +++ b/pkg/msgprocessor/options.go @@ -14,7 +14,7 @@ package msgprocessor -import "github.com/OpenIMSDK/protocol/constant" +import "github.com/openimsdk/protocol/constant" type ( Options map[string]bool diff --git a/pkg/rpccache/conversation.go b/pkg/rpccache/conversation.go index 90babcb7e..17088b9b1 100644 --- a/pkg/rpccache/conversation.go +++ b/pkg/rpccache/conversation.go @@ -17,11 +17,11 @@ package rpccache import ( "context" - pbconversation "github.com/OpenIMSDK/protocol/conversation" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + pbconversation "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/redis/go-redis/v9" diff --git a/pkg/rpccache/group.go b/pkg/rpccache/group.go index 714f52da0..1c428e03e 100644 --- a/pkg/rpccache/group.go +++ b/pkg/rpccache/group.go @@ -17,11 +17,11 @@ package rpccache import ( "context" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/redis/go-redis/v9" diff --git a/pkg/rpccache/user.go b/pkg/rpccache/user.go index 007bbcf4d..27a07b4cf 100644 --- a/pkg/rpccache/user.go +++ b/pkg/rpccache/user.go @@ -17,11 +17,11 @@ package rpccache import ( "context" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/localcache" "github.com/openimsdk/open-im-server/v3/pkg/common/cachekey" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/redis/go-redis/v9" diff --git a/pkg/rpcclient/auth.go b/pkg/rpcclient/auth.go index 0e74eb69d..6fdd78ef6 100644 --- a/pkg/rpcclient/auth.go +++ b/pkg/rpcclient/auth.go @@ -17,8 +17,8 @@ package rpcclient import ( "context" - "github.com/OpenIMSDK/protocol/auth" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/auth" "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/conversation.go b/pkg/rpcclient/conversation.go index 81c92c0e3..ecbfa2f73 100644 --- a/pkg/rpcclient/conversation.go +++ b/pkg/rpcclient/conversation.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - pbconversation "github.com/OpenIMSDK/protocol/conversation" "github.com/openimsdk/open-im-server/v3/pkg/common/config" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + pbconversation "github.com/openimsdk/protocol/conversation" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "google.golang.org/grpc" diff --git a/pkg/rpcclient/friend.go b/pkg/rpcclient/friend.go index 41c15f00a..a348401ed 100644 --- a/pkg/rpcclient/friend.go +++ b/pkg/rpcclient/friend.go @@ -17,9 +17,9 @@ package rpcclient import ( "context" - "github.com/OpenIMSDK/protocol/friend" - sdkws "github.com/OpenIMSDK/protocol/sdkws" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/friend" + sdkws "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/group.go b/pkg/rpcclient/group.go index 098f58ac7..adc5d2d45 100644 --- a/pkg/rpcclient/group.go +++ b/pkg/rpcclient/group.go @@ -18,10 +18,10 @@ import ( "context" "strings" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/protocol/sdkws" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/group" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/utils" diff --git a/pkg/rpcclient/grouphash/grouphash.go b/pkg/rpcclient/grouphash/grouphash.go index c9f066810..c518550dc 100644 --- a/pkg/rpcclient/grouphash/grouphash.go +++ b/pkg/rpcclient/grouphash/grouphash.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "encoding/json" - "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/protocol/sdkws" + "github.com/openimsdk/protocol/group" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/utils" ) diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index e965fd9da..4f6d1f0c3 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -19,11 +19,11 @@ import ( "encoding/json" "fmt" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/msg" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/msg" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" diff --git a/pkg/rpcclient/notification/conversation.go b/pkg/rpcclient/notification/conversation.go index fd58a66a9..dee74c3d8 100644 --- a/pkg/rpcclient/notification/conversation.go +++ b/pkg/rpcclient/notification/conversation.go @@ -17,10 +17,10 @@ package notification import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" ) type ConversationNotificationSender struct { diff --git a/pkg/rpcclient/notification/friend.go b/pkg/rpcclient/notification/friend.go index bef9a7043..590b0427c 100644 --- a/pkg/rpcclient/notification/friend.go +++ b/pkg/rpcclient/notification/friend.go @@ -17,14 +17,14 @@ package notification import ( "context" - "github.com/OpenIMSDK/protocol/constant" - pbfriend "github.com/OpenIMSDK/protocol/friend" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + pbfriend "github.com/openimsdk/protocol/friend" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/mcontext" ) diff --git a/pkg/rpcclient/notification/group.go b/pkg/rpcclient/notification/group.go index 052479b48..97fd4a77b 100644 --- a/pkg/rpcclient/notification/group.go +++ b/pkg/rpcclient/notification/group.go @@ -18,14 +18,14 @@ import ( "context" "fmt" - "github.com/OpenIMSDK/protocol/constant" - pbgroup "github.com/OpenIMSDK/protocol/group" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + pbgroup "github.com/openimsdk/protocol/group" + "github.com/openimsdk/protocol/sdkws" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/mcontext" diff --git a/pkg/rpcclient/notification/msg.go b/pkg/rpcclient/notification/msg.go index eebbcb0a8..bf519ebb0 100644 --- a/pkg/rpcclient/notification/msg.go +++ b/pkg/rpcclient/notification/msg.go @@ -17,10 +17,10 @@ package notification import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" ) type MsgNotificationSender struct { diff --git a/pkg/rpcclient/notification/user.go b/pkg/rpcclient/notification/user.go index 418efdd5a..706aac3cb 100644 --- a/pkg/rpcclient/notification/user.go +++ b/pkg/rpcclient/notification/user.go @@ -17,12 +17,12 @@ package notification import ( "context" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/sdkws" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/sdkws" ) type UserNotificationSender struct { diff --git a/pkg/rpcclient/push.go b/pkg/rpcclient/push.go index 9253093da..1e77264ad 100644 --- a/pkg/rpcclient/push.go +++ b/pkg/rpcclient/push.go @@ -17,8 +17,8 @@ package rpcclient import ( "context" - "github.com/OpenIMSDK/protocol/push" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/push" "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/third.go b/pkg/rpcclient/third.go index 8ce98b6df..7995e452f 100644 --- a/pkg/rpcclient/third.go +++ b/pkg/rpcclient/third.go @@ -17,8 +17,8 @@ package rpcclient import ( "context" - "github.com/OpenIMSDK/protocol/third" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/third" "github.com/openimsdk/tools/discoveryregistry" "google.golang.org/grpc" ) diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index cdfc8c69e..a5c9a930d 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -18,11 +18,11 @@ import ( "context" "strings" - "github.com/OpenIMSDK/protocol/sdkws" - "github.com/OpenIMSDK/protocol/user" "github.com/openimsdk/open-im-server/v3/pkg/authverify" "github.com/openimsdk/open-im-server/v3/pkg/common/config" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" + "github.com/openimsdk/protocol/sdkws" + "github.com/openimsdk/protocol/user" "github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/utils" diff --git a/tools/url2im/go.mod b/tools/url2im/go.mod index b6011909d..e7995aff2 100644 --- a/tools/url2im/go.mod +++ b/tools/url2im/go.mod @@ -3,7 +3,7 @@ module github.com/openimsdk/open-im-server/v3/tools/url2im go 1.20 require ( - github.com/OpenIMSDK/protocol v0.0.21 + github.com/openimsdk/protocol v0.0.58-google github.com/kelindar/bitmap v1.5.1 ) diff --git a/tools/url2im/go.sum b/tools/url2im/go.sum index 1970dce2c..03e4bfe09 100644 --- a/tools/url2im/go.sum +++ b/tools/url2im/go.sum @@ -1,5 +1,5 @@ -github.com/OpenIMSDK/protocol v0.0.21 h1:5H6H+hJ9d/VgRqttvxD/zfK9Asd+4M8Eknk5swSbUVY= -github.com/OpenIMSDK/protocol v0.0.21/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= +github.com/openimsdk/protocol v0.0.21 h1:5H6H+hJ9d/VgRqttvxD/zfK9Asd+4M8Eknk5swSbUVY= +github.com/openimsdk/protocol v0.0.21/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= diff --git a/tools/url2im/pkg/api.go b/tools/url2im/pkg/api.go index 7575b078a..64a89b9ab 100644 --- a/tools/url2im/pkg/api.go +++ b/tools/url2im/pkg/api.go @@ -23,9 +23,9 @@ import ( "io" "net/http" - "github.com/OpenIMSDK/protocol/auth" - "github.com/OpenIMSDK/protocol/constant" - "github.com/OpenIMSDK/protocol/third" + "github.com/openimsdk/protocol/auth" + "github.com/openimsdk/protocol/constant" + "github.com/openimsdk/protocol/third" ) type Api struct { diff --git a/tools/url2im/pkg/manage.go b/tools/url2im/pkg/manage.go index 70c6713fc..a3c32c368 100644 --- a/tools/url2im/pkg/manage.go +++ b/tools/url2im/pkg/manage.go @@ -34,7 +34,7 @@ import ( "sync/atomic" "time" - "github.com/OpenIMSDK/protocol/third" + "github.com/openimsdk/protocol/third" ) type Upload struct {