merge: update release-v3.8 with main changes. (#2708)

IM/open-im-server

Fork 0

mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-06 18:15:59 +08:00

Browse Source

* chore: revert tool pkg version. (#2476)

* feat: update go mod pkg to latest.

* revert tool pkg version.

* feat: update grafana template (#2484)

* feat: update web front images (#2487)

* fix: import del cache (#2492)

* fix:update recive name to same (#2493)

* fix: fix-validate message. (#2499)

* h (#2501)

* refactor: refactor workflows structure. (#2511)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* fix: solve uncorrect outdated msg get. (#2513)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update issue translator in workflows (#2521)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update issue translator.

* fix: pass getMinioImageThumbnailKey error. (#2532)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update issue translator.

* fix: pass getMinioImageThumbnailKey error.

* docs: update CLA comments contents. (#2534)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* docs: update CLA comments contents.

* update workflow file.

* fix: the log key value is not aligned (#2527)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix 细节 (#2525)

1、统一结构体方法 receiver，都用 pointer
2、使用 errors.Is 来做错误判断
3、修复单词拼写的错误

* Fix config (#2541)

* feat: remove double quotation marks

* feat: test

* feat: default close prometheus

* Fix: solve conversation blocking in private chat when non friendship. (#2542)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: update contribute cla.

* fix: solve conversations bug.

* fix:get msg error (#2494)

* fix:mgo delete err (#2496)

* fix:doPut error (#2495)

* feat: update set conversation logic. (#2544)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update set conversation logic.

* content format.

* update setConversation logic.

* update conversation logic.

* update logic.

* Groupmsg (#2548)

* feat: add EnableHistoryForNewMembers

* feat: change name

* refactor: move first create conversation

* fix: set min seq

* feat: implement `SetGroupInfoEX` interface. (#2552)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: implement `SetGroupInfoEX` interface.

* remove null interface.

* update router.

* fix: set min seq (#2556)

* fix:log

* fix: set min seq

* Fix push (#2559)

* fix:log

* fix: add log

* fix: del return

* fix: push config

* feat: add push err log and extend push wait time

* feat: group config

* feat: add log in write binary msg

* feat: Modify Prometheus data scraping ports and reserve port space.

* feat: change group rpc num

* feat: change log

* fix: remove quotation mark

* fix: read seq is written to mongo, online status redis cluster is supported (#2558)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: invitation to join group notification opuser is null (#2562)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* Fix set convsation (#2564)

* fix: set conversation unequal check

* fix: check update list

* fix: delay deleteObject func. (#2566)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* fix: memory queue optimization (#2568)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: fill opUser in invite tips (#2578)

* fix: fill opUser in invite tips

* fix: del code

* feat: update group notification when set to null. (#2590)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* feat: update group notification when set to null.

* update log standard.

* feat: add long time push msg in prometheus (#2584)

* feat: add long time push msg in prometheus

* fix: log print

* fix: go mod

* fix: log msg

* fix: log init

* feat: push msg

* feat: go mod ,remove cgo package

* feat: remove error log

* feat: test dummy push

* feat:redis pool config

* feat: push to kafka log

* feat: supports getting messages based on session ID and seq (#2582)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: implement request batch count limit. (#2591)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: getting messages based on session ID and seq (#2595)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: avoid pulling messages from sessions with a large number of max seq values of 0 (#2602)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* refactor: improve db structure in `storage/controller` (#2604)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* refactor: improve db structure in `storage/controller`

* feat: implement offline push using kafka (#2600)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* feat: implement offline push.

* feat: implement batch Push spilt

* update go mod

* feat: implement kafka producer and consumer.

* update format,

* add PushMQ log.

* feat: update Handler logic.

* update MQ logic.

* update

* fix: update OfflinePushConsumerHandler.

* feat: API supports gzip (#2609)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* Fix err (#2608)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* feat: add rocksTimeout

* feat: wrap logs

* feat: add logs

* feat: listen config

* feat: enable listen TIME_WAIT port

* feat: add logs

* feat: cache batch

* chore: enable fullUserCache

* feat: push rpc num

* feat: push err

* feat: with operationID

* feat: sleep

* feat: change 1s

* feat: change log

* feat: implement Getbatch in rpcCache.

* feat: print getOnline cost

* feat: change log

* feat: change kafka and push config

* feat: del interface

* feat: fix err

* feat: change config

* feat: go mod

* feat: change config

* feat: add sleep in push

* feat: warn logs

* feat: logs

* feat: change port

* feat: start config

* feat: remove port reuse

* feat: prometheus config

* feat: add long time send msg to grafana

* feat: init

* feat: implement offline push.

* feat: batch get user online

* feat: implement batch Push spilt

* update go mod

* Revert "feat: change port"

This reverts commit 06d5e944

* feat: change port

* feat: change config

* feat: implement kafka producer and consumer.

* update format,

* add PushMQ log.

* feat: get all online users and init push

* feat: lock in online cache

* feat: config

* fix: init online status

* fix: add logs

* fix: userIDs

* fix: add logs

* feat: update Handler logic.

* update MQ logic.

* update

* fix: method name

* fix: update OfflinePushConsumerHandler.

* fix: prommetrics

* fix: add logs

* fix: ctx

* fix: log

* fix: config

* feat: change port

* fix: atomic online cache status

---------

Co-authored-by: Monet Lee <monet_lee@163.com>

* feature: add GetConversationsHasReadAndMaxSeq interface to the WebSocket API. (#2611)

* fix: lru lock (#2613)

* fix: lru lock

* fix: nil pointer error on close (#2618)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: create group can push notification (#2617)

* fix: blockage caused by listen error (#2620)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: go.mod (#2621)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: improve searchMsg implement. (#2614)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* remove unused script.

* feat: improve searchMsg implement.

* update mongo config.

* Fix lock (#2622)

* fix:log

* fix: lock

* fix: update setGroupInfoEX field name. (#2625)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEX field name.

* fix: update setGroupInfoEX field name (#2626)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEX field name.

* fix: update setGroupInfoEX field name

* feat: msg gateway add log (#2631)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: update setGroupInfoEx func name and field. (#2634)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEx func name and field.

* refactor: update groupinfoEx field.

* refactor: update database name in mongodb.yml

* add groupName Condition

* fix: fix setConversations req fill. (#2645)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: fix setConversations req fill.

* fix: GetMsgBySeqs boundary issues (#2647)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: the attribute version is obsolete, remove it (#2644)

* refactor: update Userregister request field. (#2650)

* Test Workflow (#2640)

* feat: cicd

* fix: cicd

* fix: kick group member callback (#2643)

* fix: kill group member callback

* fix: change port

* fix: route (#2654)

* feat: add GetSpecifiedBlacks interface. (#2656)

* Upgrade the Google Firebase version. (#2638)

* Fix token (#2653)

* fix: kick token

* fix: change config

* feat: get not notify conversationIDs (#2658)

* feat: get not notify conversationIDs

* feat: api

* fix: database

* fix: change name

* feat: GetPinnedConversationIDs (#2660)

* feat: GetPinnedConversationIDs

* feat: api

* Upgrade the FCM SDK to version 4, and use the SendEach method instead of the SendAll method. (#2633)

Co-authored-by: Monet Lee <monet_lee@163.com>

* feat: implement GetSpecifiedUserGroupRequestInfo interface. (#2661)

* feat: implement GetSpecifiedUserGroupRequestInfo interface.

* update mongo config.

* feat: provide the interface required by js sdk (#2664)

* fix: redis support acquisition time

* fix: GetActiveConversation

* feat: jssdk GetConversations, GetActiveConversation

* feat: improve get admin role memberIDs implement. (#2666)

* feat: implement GetSpecifiedUserGroupRequestInfo interface.

* update mongo config.

* feat: improve get admin role memberIDs implement.

* remove unused contents.

* remove todo implement.

* fix: fix update groupName invalid. (#2673)

* refactor: change platform to platformID (#2670)

* feat: don`t return nil data (#2675)

Co-authored-by: Monet Lee <monet_lee@163.com>

* refactor: update fields type in userStatus and check registered. (#2676)

* fix: usertoken auth. (#2677)

* refactor: update fields type in userStatus and check registered.

* fix: usertoken auth.

* update contents.

* update content.

* update

* fix

* update pb file.

* feat: add friend agree after callback (#2680)

* fix: sn not sort (#2682)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* refactor: add GetAdminToken interface. (#2684)

* refactor: add GetAdminToken interface.

* update config.

* fix: admin token (#2686)

* fix: update workflows logic. (#2688)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* fix: admin token (#2687)

* update the front image (#2692)

* update the front image

* update version

* feat: improve publish docker image workflows (#2697)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* feat: improve publish docker image workflows

* update condition logic.

* fix: update load file logic. (#2700)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* feat: improve publish docker image workflows

* update condition logic.

* fix: update load file logic.

* feat: Msg filter (#2703)

* feat: msg filter

---------

Co-authored-by: Monet Lee <monet_lee@163.com>
Co-authored-by: icey-yu <119291641+icey-yu@users.noreply.github.com>
Co-authored-by: Kevin Lee <59052025+lgz5689@users.noreply.github.com>
Co-authored-by: qinguoyi <1532979219@qq.com>
Co-authored-by: chao <48119764+withchao@users.noreply.github.com>
Co-authored-by: withchao <withchao@users.noreply.github.com>
Co-authored-by: Mew151 <dgqypl@gmail.com>
Co-authored-by: 蔡相跃 <caixiangyue007@gmail.com>
Co-authored-by: 暴走的大猩猩 <Hz_testing@163.com>
Co-authored-by: Libo <zhaolibo1989@foxmail.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>

This commit is contained in:

OpenIM-Gordon

2024-10-12 16:11:43 +08:00

committed by

GitHub

parent 3ecde781bb

commit 6f49519053

202 changed files with 6617 additions and 6091 deletions

									
										scripts/create-topic.sh
									
		+1
		-1
	
												View File
												
				@@ -35,7 +35,7 @@ done

				echo "Kafka is ready. Creating topics..."

				topics=("toRedis" "toMongo" "toPush")

				topics=("toRedis" "toMongo" "toPush" "toOfflinePush")

				partitions=8

				replicationFactor=1

									
										scripts/githooks/commit-msg.sh
									
		-92
	
												View File
											
				@@ -1,92 +0,0 @@

				#!/usr/bin/env bash

				# Copyright © 2023 OpenIMSDK.

				#

				# 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.

				#

				# ==============================================================================

				#

				# Store this file as .git/hooks/commit-msg in your repository in order to

				# enforce checking for proper commit message format before actual commits.

				# You may need to make the scripts executable by 'chmod +x .git/hooks/commit-msg'.

				# commit-msg use go-gitlint tool, install go-gitlint via `go get github.com/llorllale/go-gitlint/cmd/go-gitlint`

				# go-gitlint --msg-file="$1"

				# An example hook scripts to check the commit log message.

				# Called by "git commit" with one argument, the name of the file

				# that has the commit message.  The hook should exit with non-zero

				# status after issuing an appropriate message if it wants to stop the

				# commit.  The hook is allowed to edit the commit message file.

				YELLOW="\e[93m"

				GREEN="\e[32m"

				RED="\e[31m"

				ENDCOLOR="\e[0m"

				printMessage() {

				  printf "${YELLOW}OpenIM : $1${ENDCOLOR}\n"

				}

				printSuccess() {

				  printf "${GREEN}OpenIM : $1${ENDCOLOR}\n"

				}

				printError() {

				  printf "${RED}OpenIM : $1${ENDCOLOR}\n"

				}

				printMessage "Running the OpenIM commit-msg hook."

				# This example catches duplicate Signed-off-by lines.

				test "" = "$(grep '^Signed-off-by: ' "$1" |

				sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {

				echo >&2 Duplicate Signed-off-by lines.

				exit 1

				}

				# TODO: go-gitlint dir set

				OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..

				GITLINT_DIR="$OPENIM_ROOT/_output/tools/go-gitlint"

				$GITLINT_DIR \

				--msg-file=$1 \

				--subject-regex="^(build|chore|ci|docs|feat|feature|fix|perf|refactor|revert|style|bot|test)(.*)?:\s?.*" \

				--subject-maxlen=150 \

				--subject-minlen=10 \

				--body-regex=".*" \

				--max-parents=1

				if [ $? -ne 0 ]

				then

				if ! command -v $GITLINT_DIR &>/dev/null; then

				  printError "$GITLINT_DIR not found. Please run 'make tools' OR 'make tools.verify.go-gitlint' make verto install it."

				fi

				printError "Please fix your commit message to match kubecub coding standards"

				printError "https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694#file-githook-md"

				exit 1

				fi

				### Add Sign-off-by line to the end of the commit message

				# Get local git config

				NAME=$(git config user.name)

				EMAIL=$(git config user.email)

				# Check if the commit message contains a sign-off line

				grep -qs "^Signed-off-by: " "$1"

				SIGNED_OFF_BY_EXISTS=$?

				# Add "Signed-off-by" line if it doesn't exist

				if [ $SIGNED_OFF_BY_EXISTS -ne 0 ]; then

				echo -e "\nSigned-off-by: $NAME <$EMAIL>" >> "$1"

				fi

									
										scripts/githooks/pre-commit.sh
									
		-111
	
												View File
											
				@@ -1,111 +0,0 @@

				#!/usr/bin/env bash

				# Copyright © 2023 OpenIMSDK.

				#

				# 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.

				#

				# ==============================================================================

				# This is a pre-commit hook that ensures attempts to commit files that are

				# are larger than $limit to your _local_ repo fail, with a helpful error message.

				# You can override the default limit of 2MB by supplying the environment variable:

				# GIT_FILE_SIZE_LIMIT=50000000 git commit -m "test: this commit is allowed file sizes up to 50MB"

				#

				# ==============================================================================

				#

				LC_ALL=C

				local_branch="$(git rev-parse --abbrev-ref HEAD)"

				valid_branch_regex="^(main|master|develop|release(-[a-zA-Z0-9._-]+)?)$|(feature|feat|openim|hotfix|test|bug|bot|refactor|revert|ci|cicd|style|)\/[a-z0-9._-]+$|^HEAD$"

				YELLOW="\e[93m"

				GREEN="\e[32m"

				RED="\e[31m"

				ENDCOLOR="\e[0m"

				printMessage() {

				  printf "${YELLOW}openim : $1${ENDCOLOR}\n"

				}

				printSuccess() {

				  printf "${GREEN}openim : $1${ENDCOLOR}\n"

				}

				printError() {

				  printf "${RED}openim : $1${ENDCOLOR}\n"

				}

				printMessage "Running local openim pre-commit hook."

				# flutter format .

				# https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694#file-githook-md

				# TODO! GIT_FILE_SIZE_LIMIT=50000000 git commit -m "test: this commit is allowed file sizes up to 50MB"

				# Maximum file size limit in bytes

				limit=${GIT_FILE_SIZE_LIMIT:-2000000} # Default 2MB

				limitInMB=$(( $limit / 1000000 ))

				function file_too_large(){

				  filename=$0

				  filesize=$(( $1 / 2**20 ))

					cat <<HEREDOC

					File $filename is $filesize MB, which is larger than github's maximum

				        file size (2 MB). We will not be able to push this file to GitHub.

					Commit aborted

				HEREDOC

				  git status

				}

				# Move to the repo root so git files paths make sense

				repo_root=$( git rev-parse --show-toplevel )

				cd $repo_root

				empty_tree=$( git hash-object -t tree /dev/null )

				if git rev-parse --verify HEAD > /dev/null 2>&1

				then

				  against=HEAD

				else

				  against="$empty_tree"

				fi

				# Set split so that for loop below can handle spaces in file names by splitting on line breaks

				IFS='

				'

				shouldFail=false

				for file in $( git diff-index --cached --name-only $against ); do

					file_size=$(([ ! -f $file ] && echo 0) || (ls -la $file | awk '{ print $5 }'))

					if [ "$file_size" -gt  "$limit" ]; then

					    printError "File $file is $(( $file_size / 10**6 )) MB, which is larger than our configured limit of $limitInMB MB"

				        shouldFail=true

					fi

				done

				if $shouldFail

				then

				    printMessage "If you really need to commit this file, you can override the size limit by setting the GIT_FILE_SIZE_LIMIT environment variable, e.g. GIT_FILE_SIZE_LIMIT=42000000 for 42MB. Or, commit with the --no-verify switch to skip the check entirely."

					  printError "Commit aborted"

				    exit 1;

				fi

				if [[ ! $local_branch =~ $valid_branch_regex ]]

				then

				    printError "There is something wrong with your branch name. Branch names in this project must adhere to this contract: $valid_branch_regex.

				Your commit will be rejected. You should rename your branch to a valid name(feat/name OR fix/name) and try again."

				    printError "For more on this, read on: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694"

				    exit 1

				fi

									
										scripts/githooks/pre-push.sh
									
		-119
	
												View File
											
				@@ -1,119 +0,0 @@

				#!/usr/bin/env bash

				# Copyright © 2023 OpenIMSDK.

				#

				# 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.

				#

				# ==============================================================================

				#

				YELLOW="\e[93m"

				GREEN="\e[32m"

				RED="\e[31m"

				ENDCOLOR="\e[0m"

				local_branch="$(git rev-parse --abbrev-ref HEAD)"

				valid_branch_regex="^(main|master|develop|release(-[a-zA-Z0-9._-]+)?)$|(feature|feat|openim|hotfix|test|bug|ci|cicd|style|)\/[a-z0-9._-]+$|^HEAD$"

				printMessage() {

				  printf "${YELLOW}OpenIM : $1${ENDCOLOR}\n"

				}

				printSuccess() {

				  printf "${GREEN}OpenIM : $1${ENDCOLOR}\n"

				}

				printError() {

				  printf "${RED}OpenIM : $1${ENDCOLOR}\n"

				}

				printMessage "Running local OpenIM pre-push hook."

				if [[ $(git status --porcelain) ]]; then

				  printError "This scripts needs to run against committed code only. Please commit or stash you changes."

				  exit 1

				fi

				COLOR_SUFFIX="\033[0m"

				BLACK_PREFIX="\033[30m"

				RED_PREFIX="\033[31m"

				GREEN_PREFIX="\033[32m"

				BACKGROUND_GREEN="\033[33m"

				BLUE_PREFIX="\033[34m"

				PURPLE_PREFIX="\033[35m"

				SKY_BLUE_PREFIX="\033[36m"

				WHITE_PREFIX="\033[37m"

				BOLD_PREFIX="\033[1m"

				UNDERLINE_PREFIX="\033[4m"

				ITALIC_PREFIX="\033[3m"

				# Function to print colored text

				print_color() {

				  local text=$1

				  local color=$2

				  echo -e "${color}${text}${COLOR_SUFFIX}"

				}

				# Function to print section separator

				print_separator() {

				  print_color "==========================================================" ${PURPLE_PREFIX}

				}

				# Get current time

				time=$(date +"%Y-%m-%d %H:%M:%S")

				# Print section separator

				print_separator

				# Print time of submission

				print_color "PTIME: ${time}" "${BOLD_PREFIX}${CYAN_PREFIX}"

				echo ""

				author=$(git config user.name)

				repository=$(basename -s .git $(git config --get remote.origin.url))

				# Print additional information if needed

				print_color "Repository: ${repository}" "${BLUE_PREFIX}"

				echo ""

				print_color "Author: ${author}" "${PURPLE_PREFIX}"

				# Print section separator

				print_separator

				file_list=$(git diff --name-status HEAD @{u})

				added_files=$(grep -c '^A' <<< "$file_list")

				modified_files=$(grep -c '^M' <<< "$file_list")

				deleted_files=$(grep -c '^D' <<< "$file_list")

				print_color "Added Files: ${added_files}" "${BACKGROUND_GREEN}"

				print_color "Modified Files: ${modified_files}" "${BACKGROUND_GREEN}"

				print_color "Deleted Files: ${deleted_files}" "${BACKGROUND_GREEN}"

				if [[ ! $local_branch =~ $valid_branch_regex ]]

				then

				    printError "There is something wrong with your branch name. Branch names in this project must adhere to this contract: $valid_branch_regex.

				Your commit will be rejected. You should rename your branch to a valid name(feat/name OR fix/name) and try again."

				    printError "For more on this, read on: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694"

				    exit 1

				fi

				#

				#printMessage "Running the Flutter analyzer"

				#flutter analyze

				#

				#if [ $? -ne 0 ]; then

				#  printError "Flutter analyzer error"

				#  exit 1

				#fi

				#

				#printMessage "Finished running the Flutter analyzer"