Commit Graph

1683 Commits (83ba487c6125abf18a8cb6dd769e615030422280)

Author SHA1 Message Date
wangchuxiao 07170135e6 prome
2 years ago
wangchuxiao 024ee6e602 prome
2 years ago
wangchuxiao a1f79f4508 prome
2 years ago
skiffer-git 6a6009827c prometheus for statistics
2 years ago
skiffer-git 375fc0c89e prometheus for statistics
2 years ago
skiffer-git a110b4c26b prometheus for statistics
2 years ago
skiffer-git ebdb875c56 prometheus for statistics
2 years ago
wangchuxiao 266a2b4c76 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 7e5b62377f add
2 years ago
skiffer-git 8dce5396b0 prometheus for statistics
2 years ago
skiffer-git e78f7a2a37 prometheus for statistics
2 years ago
wangchuxiao 5ce0cf1aad prome
2 years ago
wangchuxiao 88bcb35a14 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao d534f026b0 promethues
2 years ago
skiffer-git 939eb95cdc log
2 years ago
skiffer-git 46d3dd409a log
2 years ago
skiffer-git e7ab59a932 log
2 years ago
skiffer-git 285cb346b9 log
2 years ago
skiffer-git 1f36d970f9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 60f0c80c36 log
2 years ago
wangchuxiao c018d63117 add log
2 years ago
wangchuxiao 88af048e90 add log
2 years ago
wangchuxiao 4ac9d0410c Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
2 years ago
wangchuxiao 1c53c90ab5 hash
2 years ago
wangchuxiao d491c482a5 hash
2 years ago
wangchuxiao 82f2ec24fb group
2 years ago
wangchuxiao d59f699937 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao ef66b10501 prome
2 years ago
Gordon 765e8d4f79 log test
2 years ago
Gordon 8e7e496b44 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon cf14b19bf6 log test
2 years ago
skiffer-git 34eedd7955 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 98d7c7bb86 Limit the number of group members for kick/create/invite
2 years ago
Gordon b5deceaa3b put client msg id to offline callback
2 years ago
Gordon 22099d82be Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 07e1de2f62 put client msg id to offline callback
2 years ago
wangchuxiao 2203638fc5 promethues
2 years ago
wangchuxiao f41cebe776 prometheus
2 years ago
wangchuxiao dd47dbffe8 docker-compose
2 years ago
wangchuxiao aebcd1db2e docker-compose
2 years ago
wangchuxiao 3d184c95ba Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang
2 years ago
wangchuxiao 6754fdb580 getui
2 years ago
Gordon 4a2a9eb997 fcm push modify
2 years ago
wangchuxiao 4682abf4c1 cms
2 years ago
wangchuxiao 6871c7e665 fix bug
2 years ago
wangchuxiao a508dd2c0f fix bug
2 years ago
wangchuxiao 5469bb6508 fix bug
2 years ago
wangchuxiao 099461dbbf cms
2 years ago
wangchuxiao 5233e4c097 fix bug
2 years ago
wangchuxiao 7208dd6b2a cms
2 years ago
wangchuxiao a5cacaceda Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 821e704b5b cms
2 years ago
Gordon 82c79bd91c conversation unread modify
2 years ago
Gordon bde0adfbd0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 6c8b115479 conversation unread modify
2 years ago
wangchuxiao 82a8f18e88 merge cms into v2.3.0release
2 years ago
wangchuxiao bdae1f10d4 merge cms into v2.3.0release
2 years ago
wangchuxiao 05b5a0ada3 add
2 years ago
skiffer-git 3fcc2c2678 cache for GetDefaultGatewayConn4Unique
2 years ago
wangchuxiao 6dfbb90b80 fix signal
2 years ago
Gordon 72aff32024 fcm ios push badge
2 years ago
wangchuxiao 9f4c367249 cms
2 years ago
wangchuxiao 49f05d334d cms
2 years ago
wangchuxiao a372ef3faa cms
2 years ago
wangchuxiao a317ebd8e7 cms
2 years ago
wangchuxiao 6774a8594f cms
2 years ago
wangchuxiao 56fb579da2 Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
2 years ago
wangchuxiao b401917c19 cache
2 years ago
skiffer-git e990118475 fix bug :pushMsg.MsgData.OfflinePushInfo==nil
2 years ago
wangchuxiao ac2cc154b4 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 99ec0ed8df del key
2 years ago
skiffer-git 32daea25de Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 946dbc5efc change log file mode
2 years ago
Gordon 714dd597f1 fcm ios push badge
2 years ago
Gordon c36dfd9eea Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 67e5e3b56b fcm ios push badge
2 years ago
skiffer-git 988824f3f1 change log file mode
2 years ago
wangchuxiao af110f75d6 add
2 years ago
wangchuxiao 1da5ad8830 add
2 years ago
wangchuxiao 8e063f6e59 cms
2 years ago
wangchuxiao d16ceac149 cms
2 years ago
wangchuxiao c2831e6676 cms
2 years ago
wangchuxiao a4b95cb7cf cms
2 years ago
wangchuxiao 5134faeefd cms
2 years ago
wangchuxiao 77327f59b9 cms
2 years ago
wangchuxiao 87dfdb2ddc cms
2 years ago
wangchuxiao 2c2d3e4641 cms
2 years ago
wangchuxiao 42f7af3d52 cms
2 years ago
wangchuxiao 8d4e5ad3f1 cms
2 years ago
skiffer-git 49a127d97d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 8cfb604a0d set mysql connection
2 years ago
wangchuxiao 5657f617e7 merge
2 years ago
wangchuxiao 12e6cbb9e5 add
2 years ago
wangchuxiao 9b5e1465c3 add
2 years ago
wangchuxiao 7f5b12d4d2 cms
2 years ago
wangchuxiao c3d3f0986e join groups
2 years ago
skiffer-git 39720d401f fix bug: msg_gateway/gate/ws_server.go:138
2 years ago
wangchuxiao 3886d49b0a admin cms
2 years ago
Gordon 27dd574c4d err log
2 years ago
Gordon 1f4eeaa269 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon aa2d07ca8d callback add ex field and sdk server shell update
2 years ago
wangchuxiao 3739127044 conversation
2 years ago
wangchuxiao 2dab179166 conversation
2 years ago
wangchuxiao d542cdd898 conversation
2 years ago
wangchuxiao 9f15f50f9d fix conversation
2 years ago
Gordon ec0cd9a348 conversation update
2 years ago
wangchuxiao 92fc43cb3d conversation
2 years ago
wangchuxiao 73a73b7bc7 conversation
2 years ago
wangchuxiao 3391bd8322 conversation
2 years ago
wangchuxiao 3d5876a8c0 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 7d04f06f7d conversation fix
2 years ago
Gordon 2c21bf3e0e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon c1a2dee0e9 pb update
2 years ago
wangchuxiao 782ad07940 fix bug
2 years ago
wangchuxiao d57729d3d7 fix bug
2 years ago
wangchuxiao d4d9e08ae2 fix bug
2 years ago
wangchuxiao 6553ada66f add set client init
2 years ago
Gordon c0b49ff219 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wangchuxiao d20c89ba21 merge shichuang 2 v2.3.0release
2 years ago
wangchuxiao ee577cae4c add conversationCache
2 years ago
Gordon ed5b215bbb pc terminal can login at same time
2 years ago
skiffer-git 9f002172db Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 5d661f2fc6 add user register IP
2 years ago
Gordon 9a82dd356c callback add offline info
2 years ago
wangchuxiao 840e08fc8a Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
2 years ago
wangchuxiao 761b8c40d6 conversation cache function
2 years ago
Gordon 40b7314f6d model add update time
2 years ago
wangchuxiao 5c3a43f602 fix bug
2 years ago
wangchuxiao 5a995a8624 rtc pb
2 years ago
wangchuxiao 4614107b2b Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao d6dd99bb4a add
2 years ago
wangchuxiao d0a200f652 etcd
2 years ago
wangchuxiao 9138f90843 etcd
2 years ago
wangchuxiao 766a8fa4dd Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang
2 years ago
wangchuxiao 6f2451edd3 etcd
2 years ago
skiffer-git 864fccbdb2 get grpc conn from config
2 years ago
wangchuxiao 8956df9599 etcd
2 years ago
skiffer-git a3daaa55b5 get grpc conn from config
2 years ago
skiffer-git 85a52f5d6b get grpc conn from config
2 years ago
skiffer-git cdf09aa1bd get grpc conn from config
2 years ago
wangchuxiao b5166acada update orgnization after update user
2 years ago
skiffer-git 5b06791a6c set max PlatformID = 9
2 years ago
Gordon 97b1a774fb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 12a4c12753 notification
2 years ago
wangchuxiao 2016a1656b Merge branch 'v2.3.0release' into del
2 years ago
wangchuxiao 3f74022142 Merge branch 'main' into del
2 years ago
wangchuxiao ad1015c8b0 fix code
2 years ago
wangchuxiao d666f0245d
Merge pull request #267 from ouyangshi/del
2 years ago
wangchuxiao 7f252909fc fix code
2 years ago
欧阳氏 7b9d0b4f1f 封禁用户列表
2 years ago
wangchuxiao 1747ae8984 fix code
2 years ago
wangchuxiao dfee8891d3 fix code
2 years ago
wangchuxiao cb10df7c9f fix code
2 years ago
wangchuxiao 919e2543ca fix code
2 years ago
wangchuxiao b705ac24fa fix code
2 years ago
wangchuxiao 4ec255917d Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
2 years ago
wangchuxiao 9b86a18752 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
2 years ago
skiffer-git 630fef29a2 Restrict user login with IP
2 years ago
wangchuxiao 05d45c94d5 ip limit
2 years ago
Gordon 1f8a965b7a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 8b491f4c94 retry function
2 years ago
skiffer-git 8b857f9980 Restrict user login with IP
2 years ago
wangchuxiao 7d1707ca7c fix log
2 years ago
skiffer-git 5e3a3c61f3 Set the token activity time to five minutes ago
2 years ago
skiffer-git 073b6d200a Set the token activity time to five minutes ago
2 years ago
Gordon 652d560a21 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon be69ee8b1d fcm update
2 years ago
wangchuxiao d5239365be hide jwt not active yet
2 years ago
欧阳氏 ac7f905248 完善 用户注册 用户更新
2 years ago
欧阳氏 39606248a1 邀请码功能
2 years ago
skiffer-git 4e5c1606f3 log
2 years ago
wangchuxiao 9b130ae56c fix log
2 years ago
wangchuxiao a48b2e9edb cms
2 years ago
wangchuxiao e4bbd57c41 fix log
2 years ago
wangchuxiao 69008e08be cms api rpc
2 years ago
wangchuxiao 60029fc618 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao f3e71fec91 callback kickoff
2 years ago
wangchuxiao c2bd1d0d83 callback kickoff
2 years ago
wangchuxiao cc3f53d572 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao a2ddf3567c callback kickoff
2 years ago
wangchuxiao aa7ba6d659 callback kickoff
2 years ago
skiffer-git c53bcd990d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 78c807a514 add Invitation Code
2 years ago
wangchuxiao c4084cbcec callback kickoff
2 years ago
wangchuxiao 062c4b53b6
Merge pull request #258 from ouyangshi/main
2 years ago
wangchuxiao 06729c4e84 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 5c5f80691a fix delete
2 years ago
skiffer-git 5a0340e927 Multiple gateways
2 years ago
skiffer-git eb7e6a566b Multiple gateways
2 years ago
wangchuxiao 429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
2 years ago
Smile 547ad7a2c7
kafka topic优化及解释,删除废弃topic的冗余代码 (#255)
2 years ago
wangchuxiao 6bfa8643d6 fix delete
2 years ago
skiffer-git 281f4b38d2 add log
2 years ago
skiffer-git 7b590e4bd6 add log
2 years ago
skiffer-git 923a035e6e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git a2a56980d9 add log
2 years ago
wangchuxiao a74168d1e1 fix delete
2 years ago
wangchuxiao 6c0922a6d8 fix delete
2 years ago
wangchuxiao 706f6c6747 getui debug
2 years ago
wangchuxiao 2c0a2d7877 getui debug
2 years ago
欧阳氏 9358aa1bd8 用户表增加注册IP 登陆IP
2 years ago
Gordon e33af2a316 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon ffc4da1589 callback add seq
2 years ago
wangchuxiao 4cfa8d880f getui debug
2 years ago
skiffer-git bba5e7db0c fix bug
2 years ago
skiffer-git eb960f2606 fix bug
2 years ago
skiffer-git 92a68108a6 fix bug
2 years ago
skiffer-git ae8acc6eba GetGroupAbstractInfoResp
2 years ago
wangchuxiao 12cbb1f6f9 group hash
2 years ago
wangchuxiao 11f29280b1 group hash
2 years ago
wangchuxiao faae01cb8a fix bug
2 years ago
wangchuxiao 00bddd5e57 fix bug
2 years ago
wangchuxiao d1ffa9b330 callback fix
2 years ago
Gordon ba5edabb2c del conversation bug fix
2 years ago
skiffer-git 68eed69221 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git 5db5bf17cb add GetGroupAbstractInfo api
2 years ago
Gordon 319631b5c4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 0489c35417 unread bug fix
2 years ago
Gordon 10c0f3075a unread bug fix
2 years ago
wangchuxiao 576348b1f2 callback fix
2 years ago
wangchuxiao db547d60df callback fix
2 years ago
wangchuxiao 0f655e9292 callback fix
2 years ago
wangchuxiao 3d0827a6da callback fix
2 years ago
Gordon 0117e96d5b callback msg content
2 years ago
Gordon ca7bba33e6 docker-compose file update
2 years ago
wangchuxiao b294a8138c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao a99dbf634b callback fix
2 years ago
skiffer-git cda0fb6a10 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
skiffer-git a1392a7677 GetGroupAllMemberListBySplit
2 years ago
Gordon 7057d7fffb pb add fields
2 years ago
wangchuxiao b32463df53 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao f202d5f54a fix bug
2 years ago
Gordon 22a39ed4d3 config file update
2 years ago
Gordon 4003befc2a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon c17ca47e7d config file update
2 years ago
wangchuxiao e2e5ab656f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao b4d82579b7 fix bug
2 years ago
Gordon 6734c714d7 config file update
2 years ago
Gordon 526aa15ff6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon bc0e9eb74e config file update
2 years ago
Gordon a425c62156 config file update
2 years ago
wangchuxiao 9136838b63 fix bug
2 years ago
欧阳氏 cfa9f2d13f 增加 AWS S3 存储
2 years ago
wangchuxiao 0a8a248349 fix bug
2 years ago
wangchuxiao b29f93dcd2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 1c85424488 mongodb superGroup
2 years ago
Gordon b753536437 add test file
2 years ago
Gordon 2b54f0a7ae Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 6def5bd3cf add test file
2 years ago
wenxu12345 efe727ec71 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 d278dfb996 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 6a19c8130c Adjust error code
2 years ago
Gordon c43290338d add test file
2 years ago
Gordon 783a982ca8 remove _:
2 years ago
wangchuxiao 6e826cf369 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago
wangchuxiao 8f12fa52b4 mongodb superGroup to cache
2 years ago
Gordon 6d15e5b5a1 msg
2 years ago
Gordon 51679b47a6 delete super group message
2 years ago
Gordon 787cef54f5 manger send msg modify
2 years ago
Gordon 4b6332dbfa Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon bbc62ef907 remove cache message from redis
2 years ago
wenxu12345 90401d4d12 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
Gordon 5a626e9dab add update conversation unread count
2 years ago
wenxu12345 0ddf5eadb6 Push message to client through message queue
2 years ago
wenxu12345 b1377218b1 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
2 years ago
wenxu12345 80d74f6f38 Push message to client through message queue
2 years ago
wangchuxiao 192c764c8c superGroupMaxSeq
2 years ago
wangchuxiao 041a35e3c8 superGroupMaxSeq
2 years ago
wangchuxiao cf205c2480 superGroupMaxSeq
2 years ago
Gordon a3530be7b4 firebase update
2 years ago
Gordon e61434347e Merge branch 'superGroup' into v2.3.0release
2 years ago
欧阳氏 84c068783d
新增 firebase cloud message 消息推送 (#236)
2 years ago
wangchuxiao a3f62e2246 superGroupMaxSeq
2 years ago
wangchuxiao a5ef78fd1e superGroupMaxSeq
2 years ago
wangchuxiao a937a94e43 fix bug
2 years ago
wangchuxiao a6cf407a8f fix bug
2 years ago
wangchuxiao eec8eb4766 dtm
2 years ago
wangchuxiao 52c71e3843 dtm
2 years ago
wangchuxiao 960e3d34eb dtm
2 years ago
wangchuxiao cbb127ff38 Merge branch 'dtm' into v2.3.0release
2 years ago
wangchuxiao db1a043261 dtm
2 years ago
wangchuxiao f9eee19cbe dtm
2 years ago
wangchuxiao eb1aeefc8c Merge branch 'dtm' into v2.3.0release
2 years ago
skiffer-git f383d6c636 rename
2 years ago
skiffer-git 53eebb0638 rename
2 years ago
skiffer-git 4546e77d5b rename
2 years ago
skiffer-git 7d2eb31f05 rename
2 years ago
skiffer-git 7c15a53a62 rename
2 years ago
wangchuxiao 1531db0a35 departmentcache
2 years ago
wangchuxiao 6d91f766e7 docker-compose fix
2 years ago
wangchuxiao bf5bce9e64 rocks cache
2 years ago
wangchuxiao 5afa3380a6 docker-compose fix
2 years ago
wangchuxiao 85f5c59781 docker-compose fix
2 years ago
wangchuxiao 8ee4ca0357 docker-compose fix
2 years ago
wangchuxiao 656241c23f docker-compose fix
2 years ago
skiffer-git 5936492f76 Filter out disbanded groups
2 years ago
wangchuxiao abe06b8753 docker-compose fix
2 years ago
wangchuxiao 1b4b2b9bb1 docker-compose fix
2 years ago
skiffer-git ad1d759840 Application for joining the group: JoinSource && InviterUserID
2 years ago
wangchuxiao 1e6a93b4b6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
2 years ago