From 91d084693ea3dd9a8c9cd357d08a58ed6d5cd520 Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Mon, 7 Apr 2025 16:55:44 +0800 Subject: [PATCH 1/5] feat: support harmony --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/protocol/chat/chat.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 23ab44d5f..3fc0ddf8d 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/jinzhu/copier v0.4.0 // indirect github.com/pkg/errors v0.9.1 // indirect google.golang.org/grpc v1.68.0 - google.golang.org/protobuf v1.34.2 + google.golang.org/protobuf v1.35.1 gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/gorm v1.25.8 ) @@ -27,7 +27,7 @@ require ( github.com/livekit/protocol v1.10.1 github.com/mitchellh/mapstructure v1.5.0 github.com/openimsdk/gomake v0.0.14-alpha.5 - github.com/openimsdk/protocol v0.0.72 + github.com/openimsdk/protocol v0.0.73-alpha.4 github.com/openimsdk/tools v0.0.50-alpha.65 github.com/redis/go-redis/v9 v9.5.1 github.com/spf13/cobra v1.8.0 diff --git a/go.sum b/go.sum index b5b8a5c18..8ab645ad4 100644 --- a/go.sum +++ b/go.sum @@ -215,8 +215,8 @@ github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y= github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI= -github.com/openimsdk/protocol v0.0.72 h1:K+vslwaR7lDXyBzb07UuEQITaqsgighz7NyXVIWsu6A= -github.com/openimsdk/protocol v0.0.72/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8= +github.com/openimsdk/protocol v0.0.73-alpha.4 h1:y2q6ve4CHcSNKKU+djnSLUllSBxgzfCav+IMsAKuYu8= +github.com/openimsdk/protocol v0.0.73-alpha.4/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw= github.com/openimsdk/tools v0.0.50-alpha.65 h1:BRtxkyWxDWPHuHphSwEyHZj7kJSR98am/fHOH84naK8= github.com/openimsdk/tools v0.0.50-alpha.65/go.mod h1:B+oqV0zdewN7OiEHYJm+hW+8/Te7B8tHHgD8rK5ZLZk= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= @@ -476,8 +476,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/protocol/chat/chat.go b/pkg/protocol/chat/chat.go index ade8b7b1c..0f25e4d72 100644 --- a/pkg/protocol/chat/chat.go +++ b/pkg/protocol/chat/chat.go @@ -116,7 +116,7 @@ func (x *RegisterUserReq) Check() error { if x.User.Nickname == "" { return errs.ErrArgs.WrapMsg("Nickname is nil") } - if x.Platform < constantpb.IOSPlatformID || x.Platform > constantpb.AdminPlatformID { + if x.Platform < constantpb.IOSPlatformID || x.Platform > constantpb.HarmonyPlatformID { return errs.ErrArgs.WrapMsg("platform is invalid") } if x.User == nil { From a5afcf03737b3d3afb952b6ae6de365ccc1dd0e8 Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Mon, 7 Apr 2025 17:40:29 +0800 Subject: [PATCH 2/5] feat: support harmony --- go.mod | 2 +- go.sum | 4 ++-- pkg/protocol/chat/chat.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3fc0ddf8d..f3a151874 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/livekit/protocol v1.10.1 github.com/mitchellh/mapstructure v1.5.0 github.com/openimsdk/gomake v0.0.14-alpha.5 - github.com/openimsdk/protocol v0.0.73-alpha.4 + github.com/openimsdk/protocol v0.0.73-alpha.5 github.com/openimsdk/tools v0.0.50-alpha.65 github.com/redis/go-redis/v9 v9.5.1 github.com/spf13/cobra v1.8.0 diff --git a/go.sum b/go.sum index 8ab645ad4..0ac87813f 100644 --- a/go.sum +++ b/go.sum @@ -215,8 +215,8 @@ github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y= github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI= -github.com/openimsdk/protocol v0.0.73-alpha.4 h1:y2q6ve4CHcSNKKU+djnSLUllSBxgzfCav+IMsAKuYu8= -github.com/openimsdk/protocol v0.0.73-alpha.4/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw= +github.com/openimsdk/protocol v0.0.73-alpha.5 h1:SQ7aQRuMJTrUXAoLIu0EIsVU+oIRBvXc7JlA88lEZvw= +github.com/openimsdk/protocol v0.0.73-alpha.5/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw= github.com/openimsdk/tools v0.0.50-alpha.65 h1:BRtxkyWxDWPHuHphSwEyHZj7kJSR98am/fHOH84naK8= github.com/openimsdk/tools v0.0.50-alpha.65/go.mod h1:B+oqV0zdewN7OiEHYJm+hW+8/Te7B8tHHgD8rK5ZLZk= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= diff --git a/pkg/protocol/chat/chat.go b/pkg/protocol/chat/chat.go index 0f25e4d72..52e7ec5d5 100644 --- a/pkg/protocol/chat/chat.go +++ b/pkg/protocol/chat/chat.go @@ -116,7 +116,7 @@ func (x *RegisterUserReq) Check() error { if x.User.Nickname == "" { return errs.ErrArgs.WrapMsg("Nickname is nil") } - if x.Platform < constantpb.IOSPlatformID || x.Platform > constantpb.HarmonyPlatformID { + if x.Platform < constantpb.IOSPlatformID || x.Platform > constantpb.HarmonyOSPlatformID { return errs.ErrArgs.WrapMsg("platform is invalid") } if x.User == nil { From 052c4f2ed7cdf3a54756de2db65042b0625253c7 Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Mon, 7 Apr 2025 17:50:52 +0800 Subject: [PATCH 3/5] feat: support harmony --- .github/workflows/chat-build-test.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/chat-build-test.yml b/.github/workflows/chat-build-test.yml index c762332ad..55db32cf4 100644 --- a/.github/workflows/chat-build-test.yml +++ b/.github/workflows/chat-build-test.yml @@ -62,6 +62,10 @@ jobs: sudo sleep 30 # Increased sleep time for better stability timeout-minutes: 30 # Increased timeout for Docker setup + - name: Modify Server Configuration + run: | + yq e '.secret = 123456' -i ${{ github.workspace }}/server-repo/config/share.yml + - name: Build and Start IM Serevr Services run: | cd ${{ github.workspace }}/server-repo @@ -69,6 +73,10 @@ jobs: sudo mage start sudo mage check + - name: Modify Chat Configuration + run: | + yq e '.openIM.secret = 123456' -i config/share.yml + - name: Build, Start, Check Services and Print Logs for Linux run: | sudo mage From 374982de882f4c201cd7e3d33a6ecfc0e0e8314e Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Mon, 7 Apr 2025 18:01:36 +0800 Subject: [PATCH 4/5] fix: cicd --- .github/workflows/chat-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chat-build-test.yml b/.github/workflows/chat-build-test.yml index 55db32cf4..a4762a0e8 100644 --- a/.github/workflows/chat-build-test.yml +++ b/.github/workflows/chat-build-test.yml @@ -143,7 +143,7 @@ jobs: # Test get admin token get_admin_token_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{ - "secret": "openIM123", + "secret": "123456", "platformID": 2, "userID": "imAdmin" }' http://127.0.0.1:10002/auth/get_admin_token) From 6a7ba7a70dd937071cdb0c3dfe5f0625cd7f06b3 Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Wed, 9 Apr 2025 14:55:23 +0800 Subject: [PATCH 5/5] fix: check platform --- pkg/protocol/chat/chat.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/protocol/chat/chat.go b/pkg/protocol/chat/chat.go index 52e7ec5d5..0e89dfb77 100644 --- a/pkg/protocol/chat/chat.go +++ b/pkg/protocol/chat/chat.go @@ -142,7 +142,7 @@ func (x *RegisterUserReq) Check() error { } func (x *LoginReq) Check() error { - if x.Platform < constantpb.IOSPlatformID || x.Platform > constantpb.AdminPlatformID { + if x.Platform < constantpb.IOSPlatformID || x.Platform > constantpb.HarmonyOSPlatformID { return errs.ErrArgs.WrapMsg("platform is invalid") } if x.Email == "" {