diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml
index 1358bcb37..f2fdc8a19 100644
--- a/.github/workflows/scripts-test.yml
+++ b/.github/workflows/scripts-test.yml
@@ -1,4 +1,4 @@
-name: Execute Scripts
+name: OpenIM Start Execute Scripts
on:
push:
@@ -27,20 +27,23 @@ jobs:
uses: actions/checkout@v2
- name: Start Docker Compose
- run: |
+ run: |
docker-compose stop
docker-compose up -d
+ sleep 60
- name: Stop all services
run: |
chmod +x ./scripts/stop_all.sh
./scripts/stop_all.sh
+ shell: bash
- name: Build all services
run: |
chmod +x ./scripts/build_all_service.sh
./scripts/build_all_service.sh
cat logs/openIM.log
+ shell: bash
- name: Start all services
run: |
@@ -48,16 +51,19 @@ jobs:
./scripts/start_all.sh
cat logs/openIM.log
continue-on-error: true
+ shell: bash
- name: Check all services
run: |
chmod +x ./scripts/check_all.sh
./scripts/check_all.sh
cat logs/openIM.log
+ shell: bash
continue-on-error: true
- name: Print openIM.log
run: |
- cat -n logs/openIM.log
+ cat logs/openIM.log
cat logs/openIM.log >> "$GITHUB_OUTPUT"
-
+ shell: bash
+ continue-on-error: true
diff --git a/.idea/Open-IM-Server.iml b/.idea/Open-IM-Server.iml
deleted file mode 100644
index 5e764c4f0..000000000
--- a/.idea/Open-IM-Server.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
deleted file mode 100644
index 589964a46..000000000
--- a/.idea/dataSources.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- sqlite.xerial
- true
- org.sqlite.JDBC
- jdbc:sqlite:C:\Users\Administrator\Desktop\Open-IM-Server\docker-compose_cfg\grafana.db
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d89..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index d9805dbb6..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddfb..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/assets/logo-gif/openim-logo.gif b/assets/logo-gif/openim-logo.gif
index 779789641..42d7d6536 100644
Binary files a/assets/logo-gif/openim-logo.gif and b/assets/logo-gif/openim-logo.gif differ
diff --git a/assets/openim-logo-gradient.pdf b/assets/openim-logo-gradient.pdf
new file mode 100644
index 000000000..362117672
Binary files /dev/null and b/assets/openim-logo-gradient.pdf differ
diff --git a/assets/openim-logo-gradient.svg b/assets/openim-logo-gradient.svg
new file mode 100644
index 000000000..2e9b86d0e
--- /dev/null
+++ b/assets/openim-logo-gradient.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/openim-logo-green.pdf b/assets/openim-logo-green.pdf
new file mode 100644
index 000000000..c8b7e1187
Binary files /dev/null and b/assets/openim-logo-green.pdf differ
diff --git a/assets/openim-logo-green.svg b/assets/openim-logo-green.svg
new file mode 100644
index 000000000..cb49a5202
--- /dev/null
+++ b/assets/openim-logo-green.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/cmd/openim-msgtransfer/main.go b/cmd/openim-msgtransfer/main.go
new file mode 100644
index 000000000..7f8d1ce80
--- /dev/null
+++ b/cmd/openim-msgtransfer/main.go
@@ -0,0 +1,13 @@
+package main
+
+import (
+ "github.com/OpenIMSDK/Open-IM-Server/pkg/common/cmd"
+)
+
+func main() {
+ msgTransferCmd := cmd.NewMsgTransferCmd()
+ msgTransferCmd.AddPrometheusPortFlag()
+ if err := msgTransferCmd.Exec(); err != nil {
+ panic(err.Error())
+ }
+}
diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go
index b7664e2c6..c95d347e7 100644
--- a/internal/rpc/msg/revoke.go
+++ b/internal/rpc/msg/revoke.go
@@ -19,8 +19,6 @@ import (
"encoding/json"
"time"
- "github.com/google/uuid"
-
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
diff --git a/pkg/common/db/controller/s3.go b/pkg/common/db/controller/s3.go
index f192dadc5..b3cc9dbb4 100644
--- a/pkg/common/db/controller/s3.go
+++ b/pkg/common/db/controller/s3.go
@@ -1,6 +1,5 @@
package controller
-import "C"
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"
diff --git a/pkg/common/db/relation/mysql_init_test.go b/pkg/common/db/relation/mysql_init_test.go
deleted file mode 100644
index a4f38f7bc..000000000
--- a/pkg/common/db/relation/mysql_init_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package relation
-
-import (
- "fmt"
- "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
- "testing"
-)
-
-//TestNewGormDB Test the retry of sporadic errors and the direct exit of wrong password.
-func TestNewGormDB(t *testing.T) {
- err := config.InitConfig("config_folder_path")
- if err != nil {
- fmt.Println("config load error")
- return
- }
- db, err := newMysqlGormDB()
- if err != nil {
- fmt.Println("password error")
- return
- }
- if db != nil {
- fmt.Println("success connect")
- }
-}
diff --git a/pkg/proto/conversation/conversation.go b/pkg/proto/conversation/conversation.go
index 64b467ddb..7e8f62bbc 100644
--- a/pkg/proto/conversation/conversation.go
+++ b/pkg/proto/conversation/conversation.go
@@ -39,15 +39,15 @@ func (x *Conversation) Check() error {
return nil
}
-func (x *ModifyConversationFieldReq) Check() error {
- if x.UserIDList == nil {
- return errs.ErrArgs.Wrap("userIDList is empty")
- }
- if x.Conversation == nil {
- return errs.ErrArgs.Wrap("conversation is empty")
- }
- return nil
-}
+//func (x *ModifyConversationFieldReq) Check() error {
+// if x.UserIDList == nil {
+// return errs.ErrArgs.Wrap("userIDList is empty")
+// }
+// if x.Conversation == nil {
+// return errs.ErrArgs.Wrap("conversation is empty")
+// }
+// return nil
+//}
func (x *SetConversationReq) Check() error {
if x.Conversation == nil {
@@ -59,18 +59,18 @@ func (x *SetConversationReq) Check() error {
return nil
}
-func (x *SetRecvMsgOptReq) Check() error {
- if x.OwnerUserID == "" {
- return errs.ErrArgs.Wrap("ownerUserID is empty")
- }
- if x.ConversationID == "" {
- return errs.ErrArgs.Wrap("conversationID is empty")
- }
- if x.RecvMsgOpt > 2 || x.RecvMsgOpt < 0 {
- return errs.ErrArgs.Wrap("MsgReceiveOpt is invalid")
- }
- return nil
-}
+//func (x *SetRecvMsgOptReq) Check() error {
+// if x.OwnerUserID == "" {
+// return errs.ErrArgs.Wrap("ownerUserID is empty")
+// }
+// if x.ConversationID == "" {
+// return errs.ErrArgs.Wrap("conversationID is empty")
+// }
+// if x.RecvMsgOpt > 2 || x.RecvMsgOpt < 0 {
+// return errs.ErrArgs.Wrap("MsgReceiveOpt is invalid")
+// }
+// return nil
+//}
func (x *GetConversationReq) Check() error {
if x.OwnerUserID == "" {
@@ -99,15 +99,16 @@ func (x *GetAllConversationsReq) Check() error {
return nil
}
-func (x *BatchSetConversationsReq) Check() error {
- if x.Conversations == nil {
- return errs.ErrArgs.Wrap("conversations is empty")
- }
- if x.OwnerUserID == "" {
- return errs.ErrArgs.Wrap("conversation is empty")
- }
- return nil
-}
+//
+//func (x *BatchSetConversationsReq) Check() error {
+// if x.Conversations == nil {
+// return errs.ErrArgs.Wrap("conversations is empty")
+// }
+// if x.OwnerUserID == "" {
+// return errs.ErrArgs.Wrap("conversation is empty")
+// }
+// return nil
+//}
func (x *GetRecvMsgNotNotifyUserIDsReq) Check() error {
if x.GroupID == "" {
diff --git a/pkg/proto/msg/msg.go b/pkg/proto/msg/msg.go
index a221639ee..aeb6deece 100644
--- a/pkg/proto/msg/msg.go
+++ b/pkg/proto/msg/msg.go
@@ -44,60 +44,60 @@ func (x *GetSendMsgStatusReq) Check() error {
return nil
}
-func (x *ModifyMessageReactionExtensionsReq) Check() error {
- if x.ConversationID == "" {
- return errs.ErrArgs.Wrap("conversationID is empty")
- }
- if x.SessionType < 1 || x.SessionType > 4 {
- return errs.ErrArgs.Wrap("sessionType is invalid")
- }
- if x.ReactionExtensions == nil {
- return errs.ErrArgs.Wrap("reactionExtensions is empty")
- }
- return nil
-}
-
-func (x *SetMessageReactionExtensionsReq) Check() error {
- if x.ConversationID == "" {
- return errs.ErrArgs.Wrap("conversationID is empty")
- }
- if x.SessionType < 1 || x.SessionType > 4 {
- return errs.ErrArgs.Wrap("sessionType is invalid")
- }
- if x.ReactionExtensions == nil {
- return errs.ErrArgs.Wrap("reactionExtensions is empty")
- }
- return nil
-}
-
-func (x *GetMessagesReactionExtensionsReq) Check() error {
- if x.ConversationID == "" {
- return errs.ErrArgs.Wrap("conversationID is empty")
- }
- if x.SessionType < 1 || x.SessionType > 4 {
- return errs.ErrArgs.Wrap("sessionType is invalid")
- }
- if x.MessageReactionKeys == nil {
- return errs.ErrArgs.Wrap("MessageReactionKeys is empty")
- }
- if x.TypeKeys == nil {
- return errs.ErrArgs.Wrap("TypeKeys is empty")
- }
- return nil
-}
-
-func (x *DeleteMessagesReactionExtensionsReq) Check() error {
- if x.ConversationID == "" {
- return errs.ErrArgs.Wrap("conversationID is empty")
- }
- if x.SessionType < 1 || x.SessionType > 4 {
- return errs.ErrArgs.Wrap("sessionType is invalid")
- }
- if x.ReactionExtensions == nil {
- return errs.ErrArgs.Wrap("ReactionExtensions is empty")
- }
- return nil
-}
+//func (x *ModifyMessageReactionExtensionsReq) Check() error {
+// if x.ConversationID == "" {
+// return errs.ErrArgs.Wrap("conversationID is empty")
+// }
+// if x.SessionType < 1 || x.SessionType > 4 {
+// return errs.ErrArgs.Wrap("sessionType is invalid")
+// }
+// if x.ReactionExtensions == nil {
+// return errs.ErrArgs.Wrap("reactionExtensions is empty")
+// }
+// return nil
+//}
+//
+//func (x *SetMessageReactionExtensionsReq) Check() error {
+// if x.ConversationID == "" {
+// return errs.ErrArgs.Wrap("conversationID is empty")
+// }
+// if x.SessionType < 1 || x.SessionType > 4 {
+// return errs.ErrArgs.Wrap("sessionType is invalid")
+// }
+// if x.ReactionExtensions == nil {
+// return errs.ErrArgs.Wrap("reactionExtensions is empty")
+// }
+// return nil
+//}
+//
+//func (x *GetMessagesReactionExtensionsReq) Check() error {
+// if x.ConversationID == "" {
+// return errs.ErrArgs.Wrap("conversationID is empty")
+// }
+// if x.SessionType < 1 || x.SessionType > 4 {
+// return errs.ErrArgs.Wrap("sessionType is invalid")
+// }
+// if x.MessageReactionKeys == nil {
+// return errs.ErrArgs.Wrap("MessageReactionKeys is empty")
+// }
+// if x.TypeKeys == nil {
+// return errs.ErrArgs.Wrap("TypeKeys is empty")
+// }
+// return nil
+//}
+//
+//func (x *DeleteMessagesReactionExtensionsReq) Check() error {
+// if x.ConversationID == "" {
+// return errs.ErrArgs.Wrap("conversationID is empty")
+// }
+// if x.SessionType < 1 || x.SessionType > 4 {
+// return errs.ErrArgs.Wrap("sessionType is invalid")
+// }
+// if x.ReactionExtensions == nil {
+// return errs.ErrArgs.Wrap("ReactionExtensions is empty")
+// }
+// return nil
+//}
func (x *DelMsgsReq) Check() error {
return nil
diff --git a/pkg/proto/third/third.go b/pkg/proto/third/third.go
index 9562255fc..0e2072727 100644
--- a/pkg/proto/third/third.go
+++ b/pkg/proto/third/third.go
@@ -16,43 +16,43 @@ package third
import "github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
-func (x *ApplyPutReq) Check() error {
- if x.PutID == "" {
- return errs.ErrArgs.Wrap("PutID is empty")
- }
- if x.ContentType == "" {
- return errs.ErrArgs.Wrap("ContentType is empty")
- }
- return nil
-}
-
-func (x *ConfirmPutReq) Check() error {
- if x.PutID == "" {
- return errs.ErrArgs.Wrap("PutID is empty")
- }
- return nil
-}
-
-func (x *GetUrlReq) Check() error {
- if x.Name == "" {
- return errs.ErrArgs.Wrap("Name is empty")
- }
- return nil
-}
-
-func (x *GetPutReq) Check() error {
- if x.PutID == "" {
- return errs.ErrArgs.Wrap("PutID is empty")
- }
- return nil
-}
-
-func (x *GetHashInfoReq) Check() error {
- if x.Hash == "" {
- return errs.ErrArgs.Wrap("Hash is empty")
- }
- return nil
-}
+//func (x *ApplyPutReq) Check() error {
+// if x.PutID == "" {
+// return errs.ErrArgs.Wrap("PutID is empty")
+// }
+// if x.ContentType == "" {
+// return errs.ErrArgs.Wrap("ContentType is empty")
+// }
+// return nil
+//}
+//
+//func (x *ConfirmPutReq) Check() error {
+// if x.PutID == "" {
+// return errs.ErrArgs.Wrap("PutID is empty")
+// }
+// return nil
+//}
+//
+//func (x *GetUrlReq) Check() error {
+// if x.Name == "" {
+// return errs.ErrArgs.Wrap("Name is empty")
+// }
+// return nil
+//}
+//
+//func (x *GetPutReq) Check() error {
+// if x.PutID == "" {
+// return errs.ErrArgs.Wrap("PutID is empty")
+// }
+// return nil
+//}
+//
+//func (x *GetHashInfoReq) Check() error {
+// if x.Hash == "" {
+// return errs.ErrArgs.Wrap("Hash is empty")
+// }
+// return nil
+//}
func (x *FcmUpdateTokenReq) Check() error {
if x.PlatformID < 1 || x.PlatformID > 9 {