Merge branch 'OpenIMSDK:main' into main

.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

.idea/Open-IM-Server.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/dataSources.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="grafana" uuid="95aae14a-3593-4ff7-ab49-5e4316cbecd1">
-      <driver-ref>sqlite.xerial</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:C:\Users\Administrator\Desktop\Open-IM-Server\docker-compose_cfg\grafana.db</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
-    </data-source>
-  </component>
-</project>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Open-IM-Server.iml" filepath="$PROJECT_DIR$/.idea/Open-IM-Server.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

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())
+	}
+}

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"

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"

pkg/common/db/relation/mysql_init_test.go

@@ -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")
-	}
-}

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 == "" {

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

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 {