msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

Merge branch 'OpenIMSDK:main' into main

Browse Source
pull/518/head
pluto 1 year ago committed by GitHub
parent 496d178313 de1b970046
commit 568e6a8e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 147 additions and 209 deletions
Show Stats Download Patch File Download Diff File

12
.github/workflows/scripts-test.yml vendored
Unescape View File

@ -1,4 +1,4 @@
name: Execute Scripts name: OpenIM Start Execute Scripts
on: on:
push: push:
@ -30,17 +30,20 @@ jobs:
run: | run: |
docker-compose stop docker-compose stop
docker-compose up -d docker-compose up -d
sleep 60
- name: Stop all services - name: Stop all services
run: | run: |
chmod +x ./scripts/stop_all.sh chmod +x ./scripts/stop_all.sh
./scripts/stop_all.sh ./scripts/stop_all.sh
shell: bash
- name: Build all services - name: Build all services
run: | run: |
chmod +x ./scripts/build_all_service.sh chmod +x ./scripts/build_all_service.sh
./scripts/build_all_service.sh ./scripts/build_all_service.sh
cat logs/openIM.log cat logs/openIM.log
shell: bash
- name: Start all services - name: Start all services
run: | run: |
@ -48,16 +51,19 @@ jobs:
./scripts/start_all.sh ./scripts/start_all.sh
cat logs/openIM.log cat logs/openIM.log
continue-on-error: true continue-on-error: true
shell: bash
- name: Check all services - name: Check all services
run: | run: |
chmod +x ./scripts/check_all.sh chmod +x ./scripts/check_all.sh
./scripts/check_all.sh ./scripts/check_all.sh
cat logs/openIM.log cat logs/openIM.log
shell: bash
continue-on-error: true continue-on-error: true
- name: Print openIM.log - name: Print openIM.log
run: | run: |
cat -n logs/openIM.log cat logs/openIM.log
cat logs/openIM.log >> "$GITHUB_OUTPUT" cat logs/openIM.log >> "$GITHUB_OUTPUT"
shell: bash
continue-on-error: true

9
.idea/Open-IM-Server.iml
Unescape View File

@ -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>

14
.idea/dataSources.xml
Unescape View File

@ -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>

6
.idea/misc.xml
Unescape View File

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

8
.idea/modules.xml
Unescape View File

@ -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>

6
.idea/vcs.xml
Unescape View File

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

BIN
assets/logo-gif/openim-logo.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 420 KiB

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
assets/openim-logo-gradient.pdf
View File

Binary file not shown.

1
assets/openim-logo-gradient.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

BIN
assets/openim-logo-green.pdf
View File

Binary file not shown.

1
assets/openim-logo-green.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

13
cmd/openim-msgtransfer/main.go
Unescape View File

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

2
internal/rpc/msg/revoke.go
Unescape View File

@ -19,8 +19,6 @@ import (
"encoding/json" "encoding/json"
"time" "time"
"github.com/google/uuid"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation" unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"

1
pkg/common/db/controller/s3.go
Unescape View File

@ -1,6 +1,5 @@
package controller package controller
import "C"
import ( import (
"context" "context"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3"

38
pkg/common/db/relation/mysql_init_test.go
Unescape View File

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

61
pkg/proto/conversation/conversation.go
Unescape View File

@ -39,15 +39,15 @@ func (x *Conversation) Check() error {
return nil return nil
} }
func (x *ModifyConversationFieldReq) Check() error { //func (x *ModifyConversationFieldReq) Check() error {
if x.UserIDList == nil { // if x.UserIDList == nil {
return errs.ErrArgs.Wrap("userIDList is empty") // return errs.ErrArgs.Wrap("userIDList is empty")
} // }
if x.Conversation == nil { // if x.Conversation == nil {
return errs.ErrArgs.Wrap("conversation is empty") // return errs.ErrArgs.Wrap("conversation is empty")
} // }
return nil // return nil
} //}
func (x *SetConversationReq) Check() error { func (x *SetConversationReq) Check() error {
if x.Conversation == nil { if x.Conversation == nil {
@ -59,18 +59,18 @@ func (x *SetConversationReq) Check() error {
return nil return nil
} }
func (x *SetRecvMsgOptReq) Check() error { //func (x *SetRecvMsgOptReq) Check() error {
if x.OwnerUserID == "" { // if x.OwnerUserID == "" {
return errs.ErrArgs.Wrap("ownerUserID is empty") // return errs.ErrArgs.Wrap("ownerUserID is empty")
} // }
if x.ConversationID == "" { // if x.ConversationID == "" {
return errs.ErrArgs.Wrap("conversationID is empty") // return errs.ErrArgs.Wrap("conversationID is empty")
} // }
if x.RecvMsgOpt > 2 || x.RecvMsgOpt < 0 { // if x.RecvMsgOpt > 2 || x.RecvMsgOpt < 0 {
return errs.ErrArgs.Wrap("MsgReceiveOpt is invalid") // return errs.ErrArgs.Wrap("MsgReceiveOpt is invalid")
} // }
return nil // return nil
} //}
func (x *GetConversationReq) Check() error { func (x *GetConversationReq) Check() error {
if x.OwnerUserID == "" { if x.OwnerUserID == "" {
@ -99,15 +99,16 @@ func (x *GetAllConversationsReq) Check() error {
return nil return nil
} }
func (x *BatchSetConversationsReq) Check() error { //
if x.Conversations == nil { //func (x *BatchSetConversationsReq) Check() error {
return errs.ErrArgs.Wrap("conversations is empty") // if x.Conversations == nil {
} // return errs.ErrArgs.Wrap("conversations is empty")
if x.OwnerUserID == "" { // }
return errs.ErrArgs.Wrap("conversation is empty") // if x.OwnerUserID == "" {
} // return errs.ErrArgs.Wrap("conversation is empty")
return nil // }
} // return nil
//}
func (x *GetRecvMsgNotNotifyUserIDsReq) Check() error { func (x *GetRecvMsgNotNotifyUserIDsReq) Check() error {
if x.GroupID == "" { if x.GroupID == "" {

108
pkg/proto/msg/msg.go
Unescape View File

@ -44,60 +44,60 @@ func (x *GetSendMsgStatusReq) Check() error {
return nil return nil
} }
func (x *ModifyMessageReactionExtensionsReq) Check() error { //func (x *ModifyMessageReactionExtensionsReq) Check() error {
if x.ConversationID == "" { // if x.ConversationID == "" {
return errs.ErrArgs.Wrap("conversationID is empty") // return errs.ErrArgs.Wrap("conversationID is empty")
} // }
if x.SessionType < 1 || x.SessionType > 4 { // if x.SessionType < 1 || x.SessionType > 4 {
return errs.ErrArgs.Wrap("sessionType is invalid") // return errs.ErrArgs.Wrap("sessionType is invalid")
} // }
if x.ReactionExtensions == nil { // if x.ReactionExtensions == nil {
return errs.ErrArgs.Wrap("reactionExtensions is empty") // return errs.ErrArgs.Wrap("reactionExtensions is empty")
} // }
return nil // return nil
} //}
//
func (x *SetMessageReactionExtensionsReq) Check() error { //func (x *SetMessageReactionExtensionsReq) Check() error {
if x.ConversationID == "" { // if x.ConversationID == "" {
return errs.ErrArgs.Wrap("conversationID is empty") // return errs.ErrArgs.Wrap("conversationID is empty")
} // }
if x.SessionType < 1 || x.SessionType > 4 { // if x.SessionType < 1 || x.SessionType > 4 {
return errs.ErrArgs.Wrap("sessionType is invalid") // return errs.ErrArgs.Wrap("sessionType is invalid")
} // }
if x.ReactionExtensions == nil { // if x.ReactionExtensions == nil {
return errs.ErrArgs.Wrap("reactionExtensions is empty") // return errs.ErrArgs.Wrap("reactionExtensions is empty")
} // }
return nil // return nil
} //}
//
func (x *GetMessagesReactionExtensionsReq) Check() error { //func (x *GetMessagesReactionExtensionsReq) Check() error {
if x.ConversationID == "" { // if x.ConversationID == "" {
return errs.ErrArgs.Wrap("conversationID is empty") // return errs.ErrArgs.Wrap("conversationID is empty")
} // }
if x.SessionType < 1 || x.SessionType > 4 { // if x.SessionType < 1 || x.SessionType > 4 {
return errs.ErrArgs.Wrap("sessionType is invalid") // return errs.ErrArgs.Wrap("sessionType is invalid")
} // }
if x.MessageReactionKeys == nil { // if x.MessageReactionKeys == nil {
return errs.ErrArgs.Wrap("MessageReactionKeys is empty") // return errs.ErrArgs.Wrap("MessageReactionKeys is empty")
} // }
if x.TypeKeys == nil { // if x.TypeKeys == nil {
return errs.ErrArgs.Wrap("TypeKeys is empty") // return errs.ErrArgs.Wrap("TypeKeys is empty")
} // }
return nil // return nil
} //}
//
func (x *DeleteMessagesReactionExtensionsReq) Check() error { //func (x *DeleteMessagesReactionExtensionsReq) Check() error {
if x.ConversationID == "" { // if x.ConversationID == "" {
return errs.ErrArgs.Wrap("conversationID is empty") // return errs.ErrArgs.Wrap("conversationID is empty")
} // }
if x.SessionType < 1 || x.SessionType > 4 { // if x.SessionType < 1 || x.SessionType > 4 {
return errs.ErrArgs.Wrap("sessionType is invalid") // return errs.ErrArgs.Wrap("sessionType is invalid")
} // }
if x.ReactionExtensions == nil { // if x.ReactionExtensions == nil {
return errs.ErrArgs.Wrap("ReactionExtensions is empty") // return errs.ErrArgs.Wrap("ReactionExtensions is empty")
} // }
return nil // return nil
} //}
func (x *DelMsgsReq) Check() error { func (x *DelMsgsReq) Check() error {
return nil return nil

74
pkg/proto/third/third.go
Unescape View File

@ -16,43 +16,43 @@ package third
import "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" import "github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
func (x *ApplyPutReq) Check() error { //func (x *ApplyPutReq) Check() error {
if x.PutID == "" { // if x.PutID == "" {
return errs.ErrArgs.Wrap("PutID is empty") // return errs.ErrArgs.Wrap("PutID is empty")
} // }
if x.ContentType == "" { // if x.ContentType == "" {
return errs.ErrArgs.Wrap("ContentType is empty") // return errs.ErrArgs.Wrap("ContentType is empty")
} // }
return nil // return nil
} //}
//
func (x *ConfirmPutReq) Check() error { //func (x *ConfirmPutReq) Check() error {
if x.PutID == "" { // if x.PutID == "" {
return errs.ErrArgs.Wrap("PutID is empty") // return errs.ErrArgs.Wrap("PutID is empty")
} // }
return nil // return nil
} //}
//
func (x *GetUrlReq) Check() error { //func (x *GetUrlReq) Check() error {
if x.Name == "" { // if x.Name == "" {
return errs.ErrArgs.Wrap("Name is empty") // return errs.ErrArgs.Wrap("Name is empty")
} // }
return nil // return nil
} //}
//
func (x *GetPutReq) Check() error { //func (x *GetPutReq) Check() error {
if x.PutID == "" { // if x.PutID == "" {
return errs.ErrArgs.Wrap("PutID is empty") // return errs.ErrArgs.Wrap("PutID is empty")
} // }
return nil // return nil
} //}
//
func (x *GetHashInfoReq) Check() error { //func (x *GetHashInfoReq) Check() error {
if x.Hash == "" { // if x.Hash == "" {
return errs.ErrArgs.Wrap("Hash is empty") // return errs.ErrArgs.Wrap("Hash is empty")
} // }
return nil // return nil
} //}
func (x *FcmUpdateTokenReq) Check() error { func (x *FcmUpdateTokenReq) Check() error {
if x.PlatformID < 1 || x.PlatformID > 9 { if x.PlatformID < 1 || x.PlatformID > 9 {

Write Preview
Loading…
Cancel
Save