Merge branch 'openimsdk:main' into main

1 year ago · 0885703bb7
parent f7bcbadb3c 80b332cb82
commit 0885703bb7
24 changed files with 55 additions and 28 deletions
--- a/README.md
+++ b/README.md
@ -19,7 +19,7 @@

     
 <p align="center">
-  <a href="./README.md">Englist</a> · 
+  <a href="./README.md">English</a> · 
  <a href="./README_zh_CN.md">中文</a> · 
  <a href="./docs/readme/README_uk.md">Українська</a> · 
  <a href="./docs/readme/README_cs.md">Česky</a> · 
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="./README.md">Englist</a> · 
+  <a href="./README.md">English</a> · 
  <a href="./README_zh_CN.md">中文</a> · 
  <a href="./docs/readme/README_uk.md">Українська</a> · 
  <a href="./docs/readme/README_cs.md">Česky</a> · 
--- a/config/log.yml
+++ b/config/log.yml
@ -10,4 +10,5 @@ remainLogLevel: 6
 isStdout: false
 # Whether to log in JSON format, default is acceptable
 isJson: false
-
+# output simplify log when KeyAndValues's value len is bigger than 50 in rpc method log
+isSimplify: true
--- a/docs/contrib/util-scripts.md
+++ b/docs/contrib/util-scripts.md
@ -32,7 +32,7 @@ This script offers a variety of utilities and helpers to enhance and simplify op

 ##  brief descriptions of each function 

-**Englist:**
+**English:**
 1. `openim::util::ensure-gnu-sed` - Determines if GNU version of `sed` exists on the system and sets its name.
 2. `openim::util::ensure-gnu-date` - Determines if GNU version of `date` exists on the system and sets its name.
 3. `openim::util::check-file-in-alphabetical-order` - Checks if a file is sorted in alphabetical order.
--- a/docs/contributing/CONTRIBUTING-JP.md
+++ b/docs/contributing/CONTRIBUTING-JP.md
@ -1,7 +1,7 @@
 # How do I contribute code to OpenIM

 <p align="center">
-  <a href="./CONTRIBUTING.md">Englist</a> · 
+  <a href="./CONTRIBUTING.md">English</a> · 
  <a href="./CONTRIBUTING-zh_CN.md">中文</a> · 
  <a href="docs/contributing/CONTRIBUTING-UA.md">Українська</a> · 
  <a href="docs/contributing/CONTRIBUTING-CS.md">Česky</a> · 
--- a/docs/contributing/CONTRIBUTING-PL.md
+++ b/docs/contributing/CONTRIBUTING-PL.md
@ -1,7 +1,7 @@
 # How do I contribute code to OpenIM

 <p align="center">
-  <a href="./CONTRIBUTING.md">Englist</a> · 
+  <a href="./CONTRIBUTING.md">English</a> · 
  <a href="./CONTRIBUTING-zh_CN.md">中文</a> · 
  <a href="docs/contributing/CONTRIBUTING-UA.md">Українська</a> · 
  <a href="docs/contributing/CONTRIBUTING-CS.md">Česky</a> · 
--- a/docs/readme/README_cs.md
+++ b/docs/readme/README_cs.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_da.md
+++ b/docs/readme/README_da.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_el.md
+++ b/docs/readme/README_el.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_es.md
+++ b/docs/readme/README_es.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_fa.md
+++ b/docs/readme/README_fa.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_fr.md
+++ b/docs/readme/README_fr.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_hu.md
+++ b/docs/readme/README_hu.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_ja.md
+++ b/docs/readme/README_ja.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_ko.md
+++ b/docs/readme/README_ko.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_tr.md
+++ b/docs/readme/README_tr.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_uk.md
+++ b/docs/readme/README_uk.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/docs/readme/README_vi.md
+++ b/docs/readme/README_vi.md
@ -19,7 +19,7 @@


 <p align="center">
-  <a href="../../README.md">Englist</a> · 
+  <a href="../../README.md">English</a> · 
  <a href="../../README_zh_CN.md">中文</a> · 
  <a href="./README_uk.md ">Українська</a> · 
  <a href="./README_cs.md">Česky</a> · 
--- a/go.mod
+++ b/go.mod
@ -12,8 +12,8 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.69-alpha.38
-	github.com/openimsdk/tools v0.0.49-alpha.52
+	github.com/openimsdk/protocol v0.0.69-alpha.41
+	github.com/openimsdk/tools v0.0.49-alpha.55
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
 	github.com/stretchr/testify v1.9.0
--- a/go.sum
+++ b/go.sum
@ -319,10 +319,10 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 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.69-alpha.38 h1:kVZCHIXg/el8YJFoIBWhZu1sbbTUqmzgF4l0W3sUH24=
-github.com/openimsdk/protocol v0.0.69-alpha.38/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
-github.com/openimsdk/tools v0.0.49-alpha.52 h1:NwAAtBO4BV96qG6Z0P2btGEqn4AI2DFgaHvLMXNHal0=
-github.com/openimsdk/tools v0.0.49-alpha.52/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
+github.com/openimsdk/protocol v0.0.69-alpha.41 h1:9hoQ6UHMBq+g58KXir90EpnnvwJ1bvDPixPSaODo4nY=
+github.com/openimsdk/protocol v0.0.69-alpha.41/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/tools v0.0.49-alpha.55 h1:KPgC53oqiwZYssLKljhtXbWXifMlTj2SSQEusj4Uf4k=
+github.com/openimsdk/tools v0.0.49-alpha.55/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
--- a/pkg/common/cmd/root.go
+++ b/pkg/common/cmd/root.go
@ -139,6 +139,7 @@ func (r *RootCmd) initializeLogger(cmdOpts *CmdOpts) error {
 		r.log.RemainRotationCount,
 		r.log.RotationTime,
 		config.Version,
+		r.log.IsSimplify,
 	)
 	if err != nil {
 		return errs.Wrap(err)
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@ -15,6 +15,9 @@
 package config

 import (
+	"strings"
+	"time"
+
 	"github.com/openimsdk/tools/db/mongoutil"
 	"github.com/openimsdk/tools/db/redisutil"
 	"github.com/openimsdk/tools/mq/kafka"
@ -22,8 +25,6 @@ import (
 	"github.com/openimsdk/tools/s3/kodo"
 	"github.com/openimsdk/tools/s3/minio"
 	"github.com/openimsdk/tools/s3/oss"
-	"strings"
-	"time"
 )

 type CacheConfig struct {
@ -48,6 +49,7 @@ type Log struct {
 	RemainLogLevel      int    `mapstructure:"remainLogLevel"`
 	IsStdout            bool   `mapstructure:"isStdout"`
 	IsJson              bool   `mapstructure:"isJson"`
+	IsSimplify          bool   `mapstructure:"isSimplify"`
 	WithStack           bool   `mapstructure:"withStack"`
 }

--- a/pkg/common/storage/cache/redis/seq_conversation.go
+++ b/pkg/common/storage/cache/redis/seq_conversation.go
@ -77,8 +77,8 @@ func (s *seqConversationCacheRedis) batchGetMaxSeq(ctx context.Context, keys []s
 			return errs.Wrap(err)
 		}
 	}
-	if len(notFoundKey) > 0 {
-		conversationID := keyConversationID[notFoundKey[0]]
+	for _, key := range notFoundKey {
+		conversationID := keyConversationID[key]
 		seq, err := s.GetMaxSeq(ctx, conversationID)
 		if err != nil {
 			return err
--- a/pkg/common/storage/database/mgo/msg.go
+++ b/pkg/common/storage/database/mgo/msg.go
@ -94,6 +94,29 @@ func (m *MsgMgo) FindOneByDocID(ctx context.Context, docID string) (*model.MsgDo
 }

 func (m *MsgMgo) GetMsgBySeqIndexIn1Doc(ctx context.Context, userID, docID string, seqs []int64) ([]*model.MsgInfoModel, error) {
+	msgs, err := m.getMsgBySeqIndexIn1Doc(ctx, userID, docID, seqs)
+	if err != nil {
+		return nil, err
+	}
+	if len(msgs) == len(seqs) {
+		return msgs, nil
+	}
+	tmp := make(map[int64]*model.MsgInfoModel)
+	for i, val := range msgs {
+		tmp[val.Msg.Seq] = msgs[i]
+	}
+	res := make([]*model.MsgInfoModel, 0, len(seqs))
+	for _, seq := range seqs {
+		if val, ok := tmp[seq]; ok {
+			res = append(res, val)
+		} else {
+			res = append(res, &model.MsgInfoModel{Msg: &model.MsgDataModel{Seq: seq}})
+		}
+	}
+	return res, nil
+}
+
+func (m *MsgMgo) getMsgBySeqIndexIn1Doc(ctx context.Context, userID, docID string, seqs []int64) ([]*model.MsgInfoModel, error) {
 	indexs := make([]int64, 0, len(seqs))
 	for _, seq := range seqs {
 		indexs = append(indexs, m.model.GetMsgIndex(seq))