Compare commits

..

6361 Commits

Author SHA1 Message Date
wangchuxiao 37aab966df close conn 2023-06-21 10:49:26 +08:00
wangchuxiao d1347c3db0 group 2023-06-21 10:43:10 +08:00
wangchuxiao fa9ff6709d group 2023-06-21 10:37:18 +08:00
wangchuxiao 2005a91891 grpc 2023-06-21 10:25:17 +08:00
wangchuxiao ee8ee48418 AUTH 2023-06-20 22:12:01 +08:00
wangchuxiao 5e634ac91f conn 2023-06-20 21:15:23 +08:00
wangchuxiao 84afa86db2 test conn 2023-06-20 20:50:15 +08:00
wangchuxiao ce16ce0aba Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-20 19:08:09 +08:00
wangchuxiao d8396c2b46 add ppoff 2023-06-20 19:08:04 +08:00
withchao a1fc6e4e65 statistics 2023-06-20 17:03:20 +08:00
withchao fe08e8b6c9 zk logger 2023-06-20 15:12:35 +08:00
withchao fbbd651f05 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-20 14:49:10 +08:00
withchao e66b474ab9 logger 2023-06-20 14:48:53 +08:00
wangchuxiao bba7f47767 fix conversation created 2023-06-20 12:13:25 +08:00
wangchuxiao df888d22e7 zklogger update 2023-06-20 10:32:35 +08:00
wangchuxiao e2cdc6a645 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-19 13:02:55 +08:00
wangchuxiao ba56e67129 remove rtc 2023-06-19 13:02:49 +08:00
withchao bf887e6bdb gin CVE-2023-26125 2023-06-19 10:57:04 +08:00
withchao c5dd8ad548 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-19 10:22:50 +08:00
withchao 698515549b second reset seq 2023-06-19 10:22:25 +08:00
wangchuxiao 710e67ff83 hasReadSeq 2023-06-19 10:19:01 +08:00
wangchuxiao eb91b83c83 sh 2023-06-16 14:04:26 +08:00
wangchuxiao 24c1f43b2b sh 2023-06-16 13:58:12 +08:00
wangchuxiao 55cc61d676 dockerfiles 2023-06-16 13:49:11 +08:00
wangchuxiao 66c384d9c8 dockerfile 2023-06-16 13:30:35 +08:00
wangchuxiao 4e84153a5a dockerfile 2023-06-16 13:22:26 +08:00
wangchuxiao 94724ca443 dockerfile 2023-06-16 13:20:45 +08:00
wangchuxiao b372451a76 docker file 2023-06-16 13:16:20 +08:00
wangchuxiao 0714ff780a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-16 12:30:31 +08:00
wangchuxiao fb35d550b1 sh 2023-06-16 12:30:25 +08:00
Xinwei Xiong(cubxxw) 8891274ccd feat: gitignore file
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-06-16 12:24:27 +08:00
wangchuxiao 39fd6e5407 sh 2023-06-16 12:23:54 +08:00
wangchuxiao 685511981a update sh 2023-06-16 12:14:30 +08:00
wangchuxiao 2acff68f4c docker 2023-06-16 11:53:58 +08:00
wangchuxiao f921793af7 docker 2023-06-16 11:51:01 +08:00
wangchuxiao 9818cc08f4 dockerfile 2023-06-16 11:45:33 +08:00
wangchuxiao 66194cf624 docker file 2023-06-16 11:44:13 +08:00
wangchuxiao ab0d8477b9 docker file 2023-06-16 11:36:29 +08:00
wangchuxiao 72f8c6841b script 2023-06-16 11:33:41 +08:00
wangchuxiao e41c50d461 docker file 2023-06-16 11:28:49 +08:00
wangchuxiao 1c1e05a8eb docker file 1 2023-06-16 11:22:47 +08:00
wangchuxiao 1614ca1def update rc 2023-06-15 18:37:47 +08:00
wangchuxiao fe0c549bf7 redis 2023-06-15 18:26:06 +08:00
wangchuxiao 2d09096317 replace v8 2 v9 2023-06-15 18:25:13 +08:00
wangchuxiao 22e0df5c11 replace redis v8 2 v9 2023-06-15 18:25:06 +08:00
wangchuxiao 092df7ecbd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-15 18:12:53 +08:00
wangchuxiao 67cb0327fa fix group bug 2023-06-15 18:12:47 +08:00
Gordon e3615c6c99 test: log 2023-06-15 17:42:33 +08:00
Gordon 65a76072df Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-15 15:14:15 +08:00
Gordon 120101fdcc fix: zap log panic 2023-06-15 15:13:45 +08:00
wangchuxiao e8427ee33e group 2023-06-15 14:20:05 +08:00
wangchuxiao 1b35ab4cf7 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-15 11:46:48 +08:00
wangchuxiao 180c888ba7 cache 2023-06-15 11:46:43 +08:00
withchao e0fd13bf4f Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-15 10:53:15 +08:00
withchao a8fa943142 PageGetGroupMember 2023-06-15 10:52:41 +08:00
wangchuxiao 61953f4f7d get con from cache 2023-06-15 10:22:37 +08:00
wangchuxiao fef5543392 get con from cache 2023-06-15 10:22:28 +08:00
wangchuxiao 3bc98aae2d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 18:17:37 +08:00
wangchuxiao 923e943591 err 2023-06-14 18:17:32 +08:00
Gordon 230513d61b fix: msg rpc panic 2023-06-14 16:30:56 +08:00
Gordon 636b00fe36 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 15:32:47 +08:00
Gordon e7f76f44de fix: friend add create time 2023-06-14 15:32:22 +08:00
withchao 48a8dda4f7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 15:31:50 +08:00
withchao caf5b0d7c7 WsVerifyToken 2023-06-14 15:31:36 +08:00
wangchuxiao 0a4a7daf71 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 15:25:31 +08:00
wangchuxiao 5cd0f8f1ec hasRead 2023-06-14 15:25:25 +08:00
Gordon 1fb13fa5de refactor: ws add 2023-06-14 15:07:53 +08:00
wangchuxiao d714e16333 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 14:28:10 +08:00
wangchuxiao f2e55fbf12 seq 2023-06-14 14:28:01 +08:00
Gordon 61a7c0f09a refactor: add rpc func 2023-06-14 14:23:55 +08:00
Gordon 996eefc1a0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 14:20:24 +08:00
Gordon 5ae56fc449 refactor: kick user 2023-06-14 14:20:02 +08:00
wangchuxiao e3b9b5a8cd fix name 2023-06-14 12:23:51 +08:00
wangchuxiao bef052ed8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 12:20:52 +08:00
wangchuxiao c1b843ea2e set conversation has read max seq 2023-06-14 12:20:47 +08:00
Gordon d3a92132a1 refactor: kick user 2023-06-14 11:53:12 +08:00
withchao 638d2d4282 WsVerifyToken 2023-06-14 11:26:20 +08:00
withchao aa8c250c61 WsVerifyToken 2023-06-14 11:00:44 +08:00
Gordon b3c60aaf10 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/msggateway/n_ws_server.go
2023-06-14 10:49:28 +08:00
Gordon 0124a5c05d refactor: token platformID update 2023-06-14 10:47:18 +08:00
withchao 82e85c7083 WsVerifyToken 2023-06-14 10:15:58 +08:00
Gordon 87d64c6afe Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 09:58:38 +08:00
Gordon ad42eaed11 feat: kick user when same terminal login 2023-06-14 09:58:10 +08:00
wangchuxiao dd3f29be68 remove memberList 2023-06-13 20:52:20 +08:00
wangchuxiao 1055a11b03 eng 2 chn 2023-06-13 14:55:58 +08:00
wangchuxiao cefeec9823 msg 2023-06-13 11:05:02 +08:00
wangchuxiao f6dcc2ba44 notification 2023-06-12 20:59:53 +08:00
wangchuxiao 662584a115 is read 2023-06-12 20:45:42 +08:00
wangchuxiao 43f782b6ce isread 2023-06-12 20:43:09 +08:00
wangchuxiao 24120b61c0 mark fix 2023-06-12 20:26:28 +08:00
wangchuxiao 78635e3f2b mark 2023-06-12 20:04:14 +08:00
wangchuxiao be0b5422ee mark log 2023-06-12 20:04:08 +08:00
wangchuxiao 53c28a954a add route 2023-06-12 19:40:01 +08:00
wangchuxiao 6cc801ed06 mark as read and modify pb 2023-06-12 18:52:35 +08:00
wangchuxiao 2e457d5a74 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-12 11:54:49 +08:00
wangchuxiao dacee9e86f cache 2023-06-12 11:54:44 +08:00
Gordon 9d596e76dd Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-12 10:56:02 +08:00
Gordon 358f57fb17 refactor: remove code 2023-06-12 10:55:37 +08:00
wangchuxiao df68e1cb4f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-11 19:04:11 +08:00
wangchuxiao 75bff3a3dd fix 2023-06-11 19:04:05 +08:00
withchao 493e9b0570 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-11 16:52:16 +08:00
withchao 24e7941b48 WsVerifyToken 2023-06-11 16:52:01 +08:00
wangchuxiao 89f6bbc6a4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-11 16:20:05 +08:00
wangchuxiao 086835a31b mark as read 2023-06-11 16:19:59 +08:00
Gordon e04f633fab feat: add background to conn args when client ws recon 2023-06-11 15:32:53 +08:00
withchao 3d119d4632 ws token 2023-06-11 14:51:17 +08:00
withchao c16e7fc022 ws token 2023-06-11 14:48:30 +08:00
withchao a990e6f19d Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-11 14:36:40 +08:00
withchao 7d69e35dcf WsVerifyToken 2023-06-11 14:36:25 +08:00
wangchuxiao 52fa046346 msg 2023-06-11 13:00:24 +08:00
wangchuxiao 7d7842c54e conn 2023-06-11 12:37:36 +08:00
wangchuxiao 8cd9f730d7 zk 2023-06-11 11:53:29 +08:00
wangchuxiao e98d17b1b7 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-11 11:50:00 +08:00
wangchuxiao cb060ac585 zk 2023-06-11 11:49:54 +08:00
withchao 8749e52809 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-11 11:49:53 +08:00
withchao e616136f33 WsVerifyToken 2023-06-11 11:46:42 +08:00
wangchuxiao 931991f926 callback 2023-06-09 19:44:45 +08:00
wangchuxiao 3c02880098 ctx 2023-06-09 19:30:40 +08:00
wangchuxiao 2637e81fa1 callback 2023-06-09 19:21:40 +08:00
wangchuxiao ab99be68e8 callback log 2023-06-09 19:19:27 +08:00
wangchuxiao 2c0ec630fd msg 2023-06-09 19:05:06 +08:00
wangchuxiao 08f9bc705b callback 2023-06-09 18:40:44 +08:00
wangchuxiao 16f215a82b callback log 2023-06-09 17:55:41 +08:00
wangchuxiao 518d63b9bc Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-09 17:35:32 +08:00
wangchuxiao 98837edfdd callback 2023-06-09 17:35:27 +08:00
withchao 3b56c41406 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-09 16:33:43 +08:00
withchao 44737777b6 QuitGroup 2023-06-09 16:33:29 +08:00
wangchuxiao 3c8ae2370b fix array range panic 2023-06-09 16:09:20 +08:00
wangchuxiao b762650588 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-09 14:32:43 +08:00
wangchuxiao f3ec6346e0 update zap 2023-06-09 14:32:37 +08:00
withchao 8d6bd95c62 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-09 14:21:10 +08:00
withchao 1ded8b64b1 group member nickname face_url 2023-06-09 14:19:49 +08:00
wangchuxiao 202a90ab65 fix del seq 2023-06-09 13:04:18 +08:00
wangchuxiao 2a78974cc1 both stdout and file 2023-06-09 10:58:12 +08:00
wangchuxiao 03d910028b del 2023-06-08 20:29:10 +08:00
wangchuxiao 89a1bf4742 del 2023-06-08 19:55:08 +08:00
wangchuxiao 331d90f198 fix del 2023-06-08 19:52:11 +08:00
wangchuxiao 34370e4cad Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-08 19:30:21 +08:00
wangchuxiao fa72d06d80 del list cache 2023-06-08 19:30:16 +08:00
withchao c1975d4bb3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-08 19:18:55 +08:00
withchao 2e876dd58b group api 2023-06-08 19:18:05 +08:00
wangchuxiao dfb6c8e3d1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-08 19:08:04 +08:00
wangchuxiao 1f543e70b1 fix redis key 2023-06-08 19:07:59 +08:00
withchao b536f489a4 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-08 17:37:08 +08:00
withchao 442426d2b9 group level 2023-06-08 17:36:43 +08:00
wangchuxiao f230c06244 ctx 2023-06-08 17:00:46 +08:00
wangchuxiao cd0acbba87 fix notification bug 2023-06-08 16:13:11 +08:00
wangchuxiao 85e82b95ba add log 2023-06-08 16:03:01 +08:00
wangchuxiao e8dd795f4c groupMemberNotification log 2023-06-08 15:55:25 +08:00
wangchuxiao 47541c1d87 zk 2023-06-08 15:19:08 +08:00
wangchuxiao 8d574b242b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-08 15:16:46 +08:00
wangchuxiao 51ee11f7d8 del msg 2023-06-08 15:16:40 +08:00
Gordon c672e5b702 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-08 11:55:19 +08:00
Gordon c7e684211d feat: log add prefixName 2023-06-08 11:54:52 +08:00
withchao 9069170b3d group mute 2023-06-08 11:42:06 +08:00
withchao 296def6596 adjustment group role level 2023-06-07 20:30:25 +08:00
wangchuxiao 6a43ca8302 pull msg bug 2023-06-07 20:08:45 +08:00
wangchuxiao ec35cf5e49 conversationID 2023-06-07 19:43:57 +08:00
wangchuxiao b902c9f266 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-07 19:26:15 +08:00
wangchuxiao 38e1eee0e5 conversation 2023-06-07 19:26:10 +08:00
Gordon 67612967f5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-07 19:05:07 +08:00
Gordon bd2d333a8d fix: conn args validation 2023-06-07 19:04:41 +08:00
wangchuxiao 0d966603c4 quit group set user maxSeq 2023-06-07 18:59:45 +08:00
wangchuxiao cb13707d64 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-07 17:39:47 +08:00
wangchuxiao ffcc6743fd mark as read 2023-06-07 17:39:41 +08:00
withchao 83321ad925 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-07 17:22:55 +08:00
withchao 21cef30ca0 adjustment group role level 2023-06-07 17:22:41 +08:00
wangchuxiao e382e6ad93 msg 2023-06-07 17:14:14 +08:00
wangchuxiao 9f8cce569e msg 2023-06-07 17:11:43 +08:00
wangchuxiao d03d9d5383 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-07 16:52:34 +08:00
wangchuxiao 6b24877924 del api 2023-06-07 16:52:25 +08:00
withchao 383334efbe Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-07 16:41:22 +08:00
withchao 661871dd8d group notification 2023-06-07 16:41:09 +08:00
wangchuxiao 5b3c270468 del logs 2023-06-07 16:35:39 +08:00
wangchuxiao 36fee3f14a clear msg tools 2023-06-07 15:54:23 +08:00
wangchuxiao c7d2f7f3b2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-07 15:38:28 +08:00
wangchuxiao b9ffab4a33 fix del bug 2023-06-07 15:38:19 +08:00
Gordon 8b76ecd84e Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-07 15:12:00 +08:00
Gordon 73fc29f93a fix: rename fields 2023-06-07 15:11:35 +08:00
wangchuxiao 6360980b66 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-07 15:06:55 +08:00
wangchuxiao 74ea708893 conn 2023-06-07 15:06:50 +08:00
withchao b8e469fb2e groupInfoSet 2023-06-07 15:01:42 +08:00
withchao a62860266b GroupInfoSetAnnouncementTips GroupInfoSetNameTips 2023-06-07 14:34:24 +08:00
withchao e103e9ad3b Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-07 14:28:34 +08:00
withchao 95cbf28b99 GroupInfoSetAnnouncementTips GroupInfoSetNameTips 2023-06-07 14:28:10 +08:00
Gordon 1e075a2468 fix: rename fields 2023-06-07 11:00:07 +08:00
Gordon b96707ea51 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-06 21:07:17 +08:00
wangchuxiao da3f9670e9 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-06 21:06:01 +08:00
wangchuxiao 84ca9e560c api log 2023-06-06 21:05:55 +08:00
Gordon 05460a1b7e fix: platform client conn delete 2023-06-06 21:05:32 +08:00
withchao 1f0aca8441 GroupApplicationResponse 2023-06-06 20:51:19 +08:00
withchao 8413db3f03 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-06 20:41:20 +08:00
withchao 8beb5c2e7b GroupApplicationResponse 2023-06-06 20:41:07 +08:00
Gordon 8ab6d91708 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-06 20:33:16 +08:00
Gordon 8d892da5a7 fix: platform client conn delete 2023-06-06 20:32:54 +08:00
withchao aac13ebae2 GroupApplicationResponse 2023-06-06 20:32:09 +08:00
wangchuxiao b188083452 group 2023-06-06 20:12:39 +08:00
wangchuxiao ba7b9194c3 group hash cache 2023-06-06 20:01:50 +08:00
wangchuxiao 6a23a0dde9 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-06 18:46:12 +08:00
wangchuxiao 85da9e0ac8 as read 2023-06-06 18:46:06 +08:00
Gordon f75fabd664 fix: platform client conn delete 2023-06-06 18:42:13 +08:00
Gordon b5e16aeb2c Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-06 17:51:22 +08:00
Gordon 6c8f368908 test: push log add 2023-06-06 17:51:01 +08:00
withchao 43172ac8de GroupApplicationResponse 2023-06-06 17:47:40 +08:00
Gordon 35ceb7542a test: push log add 2023-06-06 17:37:23 +08:00
Gordon f661245d9f Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-06 17:26:32 +08:00
Gordon 78cab78197 test: push log add 2023-06-06 17:26:00 +08:00
wangchuxiao adb572a88f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-06 16:57:53 +08:00
wangchuxiao 2411f4b8d5 fix quit group invite user 2023-06-06 16:57:48 +08:00
withchao 6859352556 GetJoinedGroupList 2023-06-06 16:33:58 +08:00
withchao 485abaa8f3 GroupApplicationResponse 2023-06-06 15:41:23 +08:00
withchao d968c1f976 DismissGroup 2023-06-06 11:43:00 +08:00
withchao edcd883b10 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-06 10:50:18 +08:00
withchao 1a842c3e48 TakeGroupOwner 2023-06-06 10:49:52 +08:00
wangchuxiao 22cea07266 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-05 19:49:27 +08:00
wangchuxiao 8278528aeb grpc 2023-06-05 19:49:21 +08:00
withchao 9ce683cd45 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 18:13:06 +08:00
withchao 99c92a18fe CommonCallbackResp 2023-06-05 18:12:42 +08:00
wangchuxiao 44b622af37 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-05 18:02:04 +08:00
wangchuxiao b50dd674ab mark msg as read server 2023-06-05 18:01:59 +08:00
withchao dc83136d81 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 17:47:46 +08:00
withchao e06b9ac674 callback config 2023-06-05 17:47:32 +08:00
Gordon 4b77839202 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 17:40:13 +08:00
Gordon 89ae83850a fix: message add dismissed err 2023-06-05 17:39:45 +08:00
withchao 6d0728bdc2 callback log 2023-06-05 17:39:09 +08:00
withchao 03a5f19816 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 17:35:55 +08:00
withchao 69cf9dbcbe callback 2023-06-05 17:35:41 +08:00
wangchuxiao d3a2859b41 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-05 16:45:35 +08:00
wangchuxiao 4dc9b86942 notification changed 2023-06-05 16:45:29 +08:00
withchao f3387c3787 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 16:38:09 +08:00
withchao a241ac1dd4 GetMsgBySeqIndexIn1Doc 2023-06-05 16:37:49 +08:00
wangchuxiao 3d252540af Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-05 15:52:00 +08:00
wangchuxiao 4bf8a030ab fix black 2023-06-05 15:51:55 +08:00
withchao deb049c01c Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 15:50:17 +08:00
withchao 13e64c129c SetGroupMemberInfo 2023-06-05 15:50:06 +08:00
wangchuxiao b8f29e9c66 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-05 15:28:42 +08:00
wangchuxiao 6dd16d2b67 fix cache key 2023-06-05 15:28:36 +08:00
withchao ea39ae5ce2 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-05 15:28:19 +08:00
withchao bd9b5757f8 GroupMemberSetToAdminNotification 2023-06-05 15:21:57 +08:00
wangchuxiao 727a28d993 notification 2023-06-05 14:31:02 +08:00
wangchuxiao e045f562e7 conn 2023-06-05 14:30:51 +08:00
wangchuxiao a3662d16d1 push 2023-06-04 17:57:21 +08:00
wangchuxiao 728a78d48c gorm key 2023-06-04 17:51:59 +08:00
wangchuxiao 5ec28faceb fix friend db bug 2023-06-04 17:49:03 +08:00
wangchuxiao 6224c937ad fix black bug 2023-06-04 17:27:40 +08:00
withchao 05ffb44ed5 DismissGroup 2023-06-04 17:17:55 +08:00
withchao 6acc0a18b5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 17:01:32 +08:00
withchao 75df8db438 DismissGroup 2023-06-04 17:01:00 +08:00
Gordon e926878e24 log: add detail of conn 2023-06-04 16:09:33 +08:00
Gordon e0a12924b8 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 14:59:24 +08:00
Gordon 16e5710d68 log: add detail of conn 2023-06-04 14:58:53 +08:00
withchao fb37bea439 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 14:45:24 +08:00
withchao aac22db8fc DismissGroup 2023-06-04 14:45:11 +08:00
Gordon 85b45583f4 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 14:43:03 +08:00
Gordon 705e08a277 log: add detail of conn 2023-06-04 14:42:36 +08:00
wangchuxiao 4a8f1d8392 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-04 14:37:56 +08:00
wangchuxiao 5693bd3f07 conversation changed 2023-06-04 14:37:50 +08:00
withchao 5ca104c6fe DismissGroup 2023-06-04 14:37:45 +08:00
withchao b039e56b8a Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 14:27:13 +08:00
withchao 557980c63f DismissGroup 2023-06-04 14:27:00 +08:00
Gordon fa274c2c40 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 14:22:48 +08:00
Gordon 2faf9698db fix: log panic 2023-06-04 14:22:20 +08:00
wangchuxiao 12f6091122 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-04 12:39:15 +08:00
wangchuxiao dbb4e92e5d pb 2023-06-04 12:39:09 +08:00
withchao f6921161a0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 12:26:43 +08:00
withchao b191d204ed GroupDismissedNotification 2023-06-04 12:25:30 +08:00
wangchuxiao 27f0dc282b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-04 11:00:44 +08:00
wangchuxiao a3055f53af conn 2023-06-04 11:00:39 +08:00
withchao 212c692228 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-04 10:58:57 +08:00
withchao f8bacd1dc2 GroupDismissedNotification 2023-06-04 10:58:32 +08:00
wangchuxiao 7051c06c09 conn 2023-06-04 10:56:23 +08:00
wangchuxiao 37e8dbfb94 round robin 2023-06-04 10:56:17 +08:00
wangchuxiao 97aa17af6c grpcconn 2023-06-02 20:52:16 +08:00
wangchuxiao 0ab9294fab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-02 20:41:58 +08:00
wangchuxiao 0ad86f0cb4 c 2023-06-02 20:41:52 +08:00
withchao 246fce1136 MuteGroupMember 2023-06-02 20:12:10 +08:00
withchao 2fcdd62149 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-02 20:00:59 +08:00
withchao a9c0a9a364 MuteGroupMember 2023-06-02 20:00:45 +08:00
wangchuxiao c097ce5ef7 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-02 19:54:23 +08:00
wangchuxiao 1fd1db9e64 revoke group 2023-06-02 19:54:17 +08:00
Gordon 0e8589b068 refactor: remove limit 2023-06-02 17:12:52 +08:00
Gordon b46e668f2e Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-02 17:06:05 +08:00
Gordon 7625892baa refactor: remove limit 2023-06-02 17:05:42 +08:00
wangchuxiao b262103e48 mark as read 2023-06-02 16:38:15 +08:00
wangchuxiao 0058cda6ee Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-02 16:00:43 +08:00
wangchuxiao a918281625 delete sync 2023-06-02 16:00:38 +08:00
withchao 3bd0553c6c find group member 2023-06-02 15:43:14 +08:00
withchao 68e48a39a6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-02 14:57:29 +08:00
withchao 9f07887329 CreateGroup 2023-06-02 14:57:17 +08:00
Gordon e676a48c2c Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-02 14:40:56 +08:00
Gordon 826b6113f8 refactor: remove limit 2023-06-02 14:40:22 +08:00
wangchuxiao ff7b6e200c rpc 2023-06-01 21:28:16 +08:00
wangchuxiao a641f44486 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-01 21:01:35 +08:00
wangchuxiao 7bf5a629af discov 2023-06-01 21:01:30 +08:00
wangchuxiao 1a9df45ef6 conn 2023-06-01 20:35:08 +08:00
wangchuxiao 1598c72794 conn 2023-06-01 20:30:59 +08:00
wangchuxiao 8158a03b2d fix friend 2023-06-01 19:55:47 +08:00
wangchuxiao b5ff464efc opt 2023-06-01 18:49:15 +08:00
wangchuxiao 2000b26049 test discov 2023-06-01 18:44:43 +08:00
wangchuxiao 7087bbe76d c 2023-06-01 18:36:20 +08:00
wangchuxiao 228514b1bf test discov 2023-06-01 18:29:25 +08:00
wangchuxiao 80c46919dd test discov 2023-06-01 18:08:12 +08:00
wangchuxiao 2aa7ed27e1 resolver 2023-06-01 17:44:36 +08:00
wangchuxiao f3dacda90e test discov 2023-06-01 17:21:05 +08:00
wangchuxiao cd273a9094 test discov 2023-06-01 16:49:08 +08:00
wangchuxiao d9d64d810b test fix dead lock 2023-06-01 16:38:33 +08:00
wangchuxiao dcd46e2363 resolver 2023-06-01 16:07:25 +08:00
wangchuxiao a81ed61683 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-01 15:22:58 +08:00
wangchuxiao 3554a89c41 sync delete msg 2023-06-01 15:22:53 +08:00
withchao 09e63b293e Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-01 15:22:28 +08:00
withchao 21d7646431 del unexistSeqs 2023-06-01 15:21:46 +08:00
wangchuxiao b8d6440d6a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-01 15:05:25 +08:00
wangchuxiao bc6e694149 seq 2023-06-01 15:05:19 +08:00
withchao 55099274fc GetMsgBySeqIndexIn1Doc 2023-06-01 14:52:48 +08:00
withchao 9651549005 test GetMsgBySeqIndexIn1Doc 2023-06-01 14:15:10 +08:00
withchao d41fddbba5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-01 11:58:51 +08:00
withchao af4a6bddb2 test GetMsgBySeqIndexIn1Doc 2023-06-01 11:58:01 +08:00
wangchuxiao b291d43d8f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-01 11:11:44 +08:00
wangchuxiao bca8cdee5c del office pb 2023-06-01 11:11:39 +08:00
withchao b1459cd7c7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-31 19:19:42 +08:00
withchao 90d77652ab RevokeMsgTips 2023-05-31 19:19:04 +08:00
wangchuxiao e0d1a8b4e2 notification change 2023-05-31 18:24:19 +08:00
withchao 1d4b5960d2 remove office 2023-05-31 17:54:05 +08:00
Gordon 54b651765b Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-31 17:07:06 +08:00
withchao abb976fd53 office 2023-05-31 17:06:40 +08:00
Gordon 16b41f83fe test: log add 2023-05-31 17:06:33 +08:00
withchao 26c3c30b82 office 2023-05-31 16:54:11 +08:00
withchao e8763f32d0 gen group pb 2023-05-31 15:54:42 +08:00
wangchuxiao f61a5429a0 pbMsg 2023-05-31 11:54:11 +08:00
wangchuxiao afacafbc97 revoke 2023-05-31 11:52:55 +08:00
withchao dd283c1007 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-31 11:50:12 +08:00
withchao 765a33db1f PullMessageBySeqs 2023-05-31 11:49:47 +08:00
wangchuxiao 7a5c2f0038 msg 2023-05-31 11:48:33 +08:00
wangchuxiao f534a45c67 resolver log 2023-05-31 10:46:32 +08:00
wangchuxiao 32c7029e63 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-31 10:38:58 +08:00
withchao 634247a5c7 PullMessageBySeqs 2023-05-31 10:36:58 +08:00
wangchuxiao 89bb7c14e1 resolver 2023-05-31 10:15:12 +08:00
wangchuxiao 21e4fcf7df seq 2023-05-30 20:28:25 +08:00
Gordon 38285c8885 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-30 20:27:14 +08:00
Gordon b884b059e8 refactor: pb update 2023-05-30 20:26:47 +08:00
wangchuxiao 3b7705943c grpc 2023-05-30 20:22:32 +08:00
wangchuxiao 96bcc1bd4c grpc 2023-05-30 20:21:41 +08:00
wangchuxiao 72244b82f5 opts 2023-05-30 20:21:20 +08:00
wangchuxiao 01ab3d28cc grpc 2023-05-30 20:19:26 +08:00
wangchuxiao 313a8c3a4a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-30 20:18:15 +08:00
wangchuxiao bcf5362316 grpc 2023-05-30 20:18:09 +08:00
Gordon 08b9af8254 refactor: pb update 2023-05-30 20:07:13 +08:00
Gordon d26c9da4e0 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/proto/msg/msg.pb.go
#	pkg/proto/sdkws/sdkws.pb.go
#	pkg/proto/sdkws/sdkws.proto
2023-05-30 20:03:43 +08:00
Gordon da88ca85d4 refactor: pb update 2023-05-30 20:01:55 +08:00
wangchuxiao 4c17c64403 builder 2023-05-30 19:18:12 +08:00
wangchuxiao 4c45148eca conn 2023-05-30 18:31:19 +08:00
wangchuxiao e00b686c80 grpc 2023-05-30 18:25:32 +08:00
wangchuxiao 40045710d4 conn 2023-05-30 18:24:19 +08:00
wangchuxiao fcd747ec88 k 2023-05-30 17:57:33 +08:00
wangchuxiao 5bb8d7fd0d debug log 2023-05-30 17:46:28 +08:00
wangchuxiao 0a71526698 discov 2023-05-30 17:09:09 +08:00
wangchuxiao b64f621b40 user 2023-05-30 16:24:07 +08:00
wangchuxiao 85bf1f44e0 grpc conn reuse 2023-05-30 16:15:11 +08:00
wangchuxiao 1b109964ff del notifi 2023-05-30 14:29:54 +08:00
wangchuxiao 2663c60850 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-30 11:18:12 +08:00
wangchuxiao 703b5ebda0 del notification 2023-05-30 11:18:07 +08:00
withchao d446516be8 findMsgInfoBySeq 2023-05-29 20:33:36 +08:00
withchao 576b699495 NotificationWithSesstionType 2023-05-29 20:23:50 +08:00
withchao 6e08f66ba7 RevokeMsg 2023-05-29 20:20:44 +08:00
wangchuxiao 11d3f4af0c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-29 20:18:52 +08:00
wangchuxiao 02a1d10a8b delete notification 2023-05-29 20:18:47 +08:00
withchao f17de168d6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-29 20:03:08 +08:00
withchao 57028450df findMsgInfoBySeq 2023-05-29 20:02:15 +08:00
wangchuxiao 32d9eb83d1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-29 19:20:02 +08:00
wangchuxiao acff4e01c2 v 2023-05-29 19:19:57 +08:00
withchao 25faf3579a sdkws 2023-05-29 19:17:54 +08:00
withchao efac87fbcf Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/proto/sdkws/sdkws.pb.go
2023-05-29 19:12:54 +08:00
wangchuxiao f4c51d1377 delete 2023-05-29 19:11:32 +08:00
wangchuxiao 290d7cffde grpc conn 2023-05-29 18:04:22 +08:00
wangchuxiao 232abf46a4 split notificationSender 2023-05-29 17:42:55 +08:00
wangchuxiao 02b4c012ad sync opt 2023-05-29 16:26:24 +08:00
wangchuxiao b4844a8a88 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-29 15:47:57 +08:00
wangchuxiao b7b988dff5 fix redis conversation key 2023-05-29 15:47:27 +08:00
withchao b6a0c32fdd PullMessageBySeqs 2023-05-29 15:22:10 +08:00
withchao b8974f09fb GetMsgBySeqIndexIn1Doc 2023-05-29 14:43:17 +08:00
withchao aa9042bd62 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/msg.go
#	pkg/common/db/controller/msg.go
#	pkg/common/db/controller/msg_test.go
#	pkg/common/db/table/unrelation/msg.go
#	pkg/common/db/unrelation/msg.go
2023-05-29 14:39:54 +08:00
withchao edad1eee41 GetMsgBySeqIndexIn1Doc 2023-05-29 14:36:41 +08:00
wangchuxiao be79131498 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-26 20:55:01 +08:00
wangchuxiao de185a74ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-26 20:54:54 +08:00
withchao 4d7b49aa1f RevokeMsg 2023-05-26 20:34:46 +08:00
withchao 8b31f676c2 RevokeMsg 2023-05-26 19:47:57 +08:00
withchao 6c7c5dea7b RevokeMsg 2023-05-26 18:52:47 +08:00
wangchuxiao dd1c6154d8 msg 2023-05-26 18:45:00 +08:00
withchao 3bdeb29483 RevokeMsg 2023-05-26 18:44:39 +08:00
withchao 2b14eae33d RevokeMsg 2023-05-26 18:33:32 +08:00
withchao e2e1cb19c7 RevokeMsg 2023-05-26 17:56:34 +08:00
withchao f1d2d4321c RevokeMsg 2023-05-26 17:32:48 +08:00
withchao 668f213974 RevokeMsg 2023-05-26 17:20:04 +08:00
withchao c3fca48b9f RevokeMsg 2023-05-26 17:14:16 +08:00
wangchuxiao 5fbfafb1ab msg 2023-05-26 17:03:36 +08:00
wangchuxiao d10f14e934 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-26 16:56:32 +08:00
wangchuxiao df3f8b5a58 msg 2023-05-26 16:56:27 +08:00
withchao 53a560afac RevokeMsg 2023-05-26 16:43:51 +08:00
wangchuxiao e804358c8f msg del 2023-05-26 16:23:34 +08:00
wangchuxiao 753c0d9803 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-26 16:22:08 +08:00
wangchuxiao 60670c5012 del msg 2023-05-26 16:22:03 +08:00
withchao 41c5b084ea RevokeMsg 2023-05-26 15:56:34 +08:00
withchao e8042c9e3e BatchInsertBlock 2023-05-26 15:15:42 +08:00
withchao 1ba6bef27a BatchInsertBlock 2023-05-26 14:30:10 +08:00
wangchuxiao 501e03e57e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-26 11:27:23 +08:00
wangchuxiao 1d441a9623 del msg 2023-05-26 11:11:48 +08:00
wangchuxiao 5f783fa078 delete msg 2023-05-26 11:11:34 +08:00
withchao 2401cd3525 BatchInsertBlock 2023-05-26 11:08:45 +08:00
Gordon b17037f8d5 fix: user logout recycle resources 2023-05-26 10:20:10 +08:00
Gordon f34996f6e3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-25 20:57:46 +08:00
Gordon 8a21e07d6d fix: user logout recycle resources 2023-05-25 20:57:19 +08:00
withchao f389359dd0 BatchInsertBlock 2023-05-25 17:31:46 +08:00
withchao 85de9aaefb Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-25 15:40:31 +08:00
withchao df148ae5af RevokeMsg 2023-05-25 15:40:19 +08:00
wangchuxiao d1728463b0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-25 14:58:58 +08:00
wangchuxiao 6c271ef546 del msg 2023-05-25 14:58:51 +08:00
withchao 30d8276986 BatchInsertBlock 2023-05-25 14:57:15 +08:00
withchao b8c3400145 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-25 12:24:35 +08:00
withchao 4c8c30f496 BatchInsertBlock 2023-05-25 12:24:21 +08:00
wangchuxiao c16c78aca5 delete 2023-05-25 12:18:02 +08:00
wangchuxiao b2e67b38c7 del pb 2023-05-25 11:09:10 +08:00
wangchuxiao 0c73b03e45 msg 2023-05-25 11:04:41 +08:00
wangchuxiao af406c3be4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-25 11:04:37 +08:00
wangchuxiao f9d6ffdc1b delete msg pb 2023-05-25 10:57:46 +08:00
withchao 597a3cf9b5 SetGroupMemberInfo 2023-05-24 18:10:36 +08:00
withchao 103cb3cb99 test 2023-05-24 16:39:12 +08:00
Gordon 7bfd9aef2f test: mongo concurrent test 2023-05-24 16:36:17 +08:00
withchao 8f21e7dcd2 Test_BatchInsertChat2DB 2023-05-24 15:29:17 +08:00
withchao 1d22b44dd4 Test_BatchInsertChat2DB 2023-05-24 12:26:59 +08:00
withchao 95cf1e292b Test_BatchInsertChat2DB 2023-05-24 12:13:45 +08:00
withchao 9b271da739 RevokeMsg 2023-05-23 17:20:34 +08:00
withchao 5061047164 RevokeMsg 2023-05-23 17:11:56 +08:00
withchao 9e7bc1b769 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-23 15:30:02 +08:00
withchao 724d8bcd97 RevokeMsgReq pb 2023-05-23 15:29:44 +08:00
wangchuxiao ba3aa74469 cron 2023-05-23 14:52:44 +08:00
wangchuxiao 2039b760b1 cron 2023-05-23 11:54:10 +08:00
wangchuxiao 5983f429eb del test 2023-05-23 10:49:30 +08:00
wangchuxiao 219d57528b cron 2023-05-23 10:38:43 +08:00
withchao 02f8003b4d Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-22 19:54:04 +08:00
withchao d35dd21374 BatchInsertChat2DB 2023-05-22 19:53:53 +08:00
wangchuxiao 708f55004c conversation 2023-05-22 19:00:46 +08:00
wangchuxiao 60bc755b36 tidy 2023-05-22 18:42:20 +08:00
wangchuxiao df7e64513f revoke 2023-05-22 18:38:46 +08:00
wangchuxiao d0f0fd6e66 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-22 18:38:33 +08:00
wangchuxiao 0eaceafcf9 RevokeMsgTip 2023-05-22 18:38:28 +08:00
withchao 6230b53501 BatchInsertChat2DB 2023-05-22 18:36:49 +08:00
wangchuxiao c5f1d874c8 RevokeMsgTip 2023-05-22 18:14:22 +08:00
wangchuxiao 14801b0e4e revoke tips 2023-05-22 16:29:22 +08:00
wangchuxiao 5974012fba revokeMsg route 2023-05-22 16:04:12 +08:00
wangchuxiao 416bf4921c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-22 15:15:06 +08:00
wangchuxiao 6a6283f2e4 revoke msg Pb 2023-05-22 15:15:01 +08:00
withchao 1b21dd6ee7 DismissGroup 2023-05-22 11:01:10 +08:00
withchao 74289e912f DismissGroup 2023-05-22 10:48:18 +08:00
withchao 7f585330ae DismissGroup 2023-05-22 10:36:23 +08:00
withchao 241a4ad0b5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-22 10:21:57 +08:00
withchao 0467a24813 DismissGroup 2023-05-22 10:21:34 +08:00
wangchuxiao fc49325bb8 remove mcontext 2023-05-22 10:08:30 +08:00
wangchuxiao 0394ee34e2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-22 10:08:09 +08:00
wangchuxiao 568f6abe80 remove logrus 2023-05-22 10:08:04 +08:00
withchao ec5e3b269d DismissGroup 2023-05-19 21:06:17 +08:00
withchao d78db822a1 DismissGroup 2023-05-19 21:00:15 +08:00
withchao 3b382aca99 DismissGroup 2023-05-19 20:53:58 +08:00
withchao d402115d66 DismissGroup 2023-05-19 20:48:36 +08:00
withchao 3039cd5fc4 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 20:45:40 +08:00
withchao faa0522f41 DismissGroup 2023-05-19 20:45:29 +08:00
withchao ae0947efa3 DismissGroup 2023-05-19 20:44:55 +08:00
Gordon 62d4a4dd9c Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 20:18:14 +08:00
Gordon 5f571f962f refactor: ctx message update 2023-05-19 20:17:50 +08:00
withchao e0c70742a8 DismissGroup 2023-05-19 20:13:04 +08:00
withchao b87fd91dd7 DismissGroup 2023-05-19 20:06:34 +08:00
withchao 22a93d814c DismissGroup 2023-05-19 20:02:19 +08:00
withchao 16f0d0875d Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 20:00:01 +08:00
withchao 16475f3a70 DismissGroup 2023-05-19 19:59:39 +08:00
wangchuxiao 73c74a929b merge 2023-05-19 19:50:52 +08:00
wangchuxiao 76fd103a82 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-19 19:50:46 +08:00
wangchuxiao 5fab4d3138 kafka key 2023-05-19 19:43:43 +08:00
Gordon 8ec4ebbc32 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 17:10:30 +08:00
Gordon 6ce26f93cc refactor: ctx message update 2023-05-19 17:10:00 +08:00
wangchuxiao ca2eee17bc Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-19 17:09:55 +08:00
wangchuxiao eb6cf53a0a mysql consumer 2023-05-19 17:09:49 +08:00
withchao f6e9104fa3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 16:34:30 +08:00
withchao 720c351da8 group notification 2023-05-19 16:34:16 +08:00
wangchuxiao 37dd079129 mysql storage 2023-05-19 16:20:20 +08:00
wangchuxiao d0aa0a8772 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-19 16:12:06 +08:00
wangchuxiao e8e306eb98 conversationID 2023-05-19 16:12:00 +08:00
withchao b6b77376d5 group notification 2023-05-19 15:49:48 +08:00
withchao 37f8718bbb group notification 2023-05-19 15:26:32 +08:00
withchao 628a18c3ed group notification 2023-05-19 15:22:56 +08:00
withchao b776b3f15e group notification 2023-05-19 15:19:11 +08:00
withchao 3a1dd0cb1d group notification 2023-05-19 15:18:19 +08:00
withchao e7797167cb group notification 2023-05-19 14:41:16 +08:00
withchao 4ae5acefc0 group notification 2023-05-19 14:21:18 +08:00
withchao 044741ff20 group notification 2023-05-19 11:51:11 +08:00
withchao 49d391d9bd group notification 2023-05-19 11:46:39 +08:00
withchao 6f273832ea group notification 2023-05-19 11:38:02 +08:00
withchao 394b609a44 sec 2023-05-19 11:32:40 +08:00
withchao 04b9e328b1 groupServer 2023-05-19 10:54:23 +08:00
withchao 8e41e7cbbd Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 10:49:15 +08:00
withchao af38f09faf groupServer 2023-05-19 10:49:03 +08:00
wangchuxiao 01f773c0f8 init 2023-05-19 10:44:37 +08:00
wangchuxiao 71fd442c44 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-19 10:44:24 +08:00
wangchuxiao a2f3d11110 init 2023-05-19 10:44:19 +08:00
withchao d01bd205ca groupServer 2023-05-19 10:40:08 +08:00
Gordon 97c08e982b refactor: notification sessionType update 2023-05-19 10:24:24 +08:00
withchao f57f838e39 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-19 10:08:45 +08:00
withchao a9d7c5c33e groupServer 2023-05-19 10:08:30 +08:00
Gordon a6e6476fef refactor: notification data struct change 2023-05-19 10:05:32 +08:00
wangchuxiao 9614d1f31b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-18 18:57:03 +08:00
wangchuxiao 1f5259d36a fix: notification pull 2023-05-18 18:56:58 +08:00
withchao 711c4878a8 groupServer 2023-05-18 18:13:58 +08:00
wangchuxiao 405a9b75b0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-18 17:35:05 +08:00
wangchuxiao 833c052cea notification 2023-05-18 17:35:00 +08:00
withchao fb429c70c4 groupServer 2023-05-18 17:08:48 +08:00
withchao c53daa76f2 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-18 16:42:19 +08:00
withchao 6646c393cb groupServer 2023-05-18 16:42:08 +08:00
wangchuxiao 1dad0b06d1 mongo 2023-05-18 16:22:59 +08:00
wangchuxiao 70758c306a sg notification 2023-05-18 15:41:08 +08:00
wangchuxiao 2358ec3d90 get seqs 2023-05-18 15:04:11 +08:00
withchao 8a8cd8655a groupServer 2023-05-18 14:33:28 +08:00
withchao c3345af45a groupServer 2023-05-18 14:16:09 +08:00
withchao 1c8df25603 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-18 11:56:52 +08:00
withchao a19d4eb44e groupServer 2023-05-18 11:56:35 +08:00
Gordon 5c610fd24d Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-18 11:35:59 +08:00
Gordon a2bdd3d30a test: log add 2023-05-18 11:35:37 +08:00
withchao bdb110a88c Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-18 11:30:57 +08:00
withchao 8f1988e23c groupServer 2023-05-18 11:30:46 +08:00
wangchuxiao 731ee8b49f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-18 11:08:56 +08:00
wangchuxiao fd1527e112 friend 2023-05-18 11:08:51 +08:00
withchao 87fb6d95ee Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-18 10:32:18 +08:00
withchao 7f66185798 groupServer 2023-05-18 10:31:52 +08:00
wangchuxiao 99429a75fa msg 2023-05-17 19:33:56 +08:00
wangchuxiao c7684fe026 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-17 18:45:00 +08:00
wangchuxiao eb0bd2f4dd msg split 2023-05-17 18:44:55 +08:00
withchao 3131a4f83a Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-17 18:42:11 +08:00
withchao d81b294384 groupServer 2023-05-17 18:41:57 +08:00
wangchuxiao dacf6cca31 conversationLocalCache 2023-05-17 17:09:26 +08:00
wangchuxiao 9b633b6729 conversationLocalCache 2023-05-17 17:09:13 +08:00
wangchuxiao 9fd8dfcf53 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-17 11:42:30 +08:00
wangchuxiao b004811809 group 2023-05-17 11:42:25 +08:00
withchao 3533dbd354 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-17 11:42:13 +08:00
withchao eccb8b7b30 GroupClient 2023-05-17 11:42:00 +08:00
wangchuxiao b89d5ec0ab seqs 2023-05-16 20:28:26 +08:00
wangchuxiao cf8d52d305 pull 2023-05-16 20:06:49 +08:00
wangchuxiao 510cf9ff29 pull notification 2023-05-16 20:04:01 +08:00
wangchuxiao fc3c38ab65 msg 2023-05-16 19:08:43 +08:00
wangchuxiao 6530bb65e4 notification 2023-05-16 18:49:16 +08:00
wangchuxiao 4f6fb10006 notification 2023-05-16 18:37:14 +08:00
wangchuxiao 5377f1501d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-16 17:28:26 +08:00
wangchuxiao 316d766511 push 2023-05-16 17:28:20 +08:00
Gordon 9e84009f74 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-16 17:22:34 +08:00
Gordon 478357fec3 fix: message encode 2023-05-16 17:22:11 +08:00
wangchuxiao 6b6c6cabaa rpc 2023-05-16 16:50:16 +08:00
wangchuxiao cad7b76d97 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-16 16:31:40 +08:00
wangchuxiao 2446a5d48c msgCache 2023-05-16 16:31:35 +08:00
withchao 7a3ff78d5a Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-16 12:17:54 +08:00
withchao 4451da23e8 ctx 2023-05-16 12:17:43 +08:00
wangchuxiao 67ad00ab04 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-16 10:25:10 +08:00
wangchuxiao 9d3237e0ab delete k8s 2023-05-16 10:25:05 +08:00
withchao 9e66fd6263 group 2023-05-15 19:26:10 +08:00
withchao ea8e5b241e group 2023-05-15 19:20:35 +08:00
withchao 20fc982f1f group 2023-05-15 19:17:29 +08:00
withchao 5e64903ca0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-15 19:12:00 +08:00
withchao fbb9014fa6 group 2023-05-15 19:11:17 +08:00
wangchuxiao ba8d14a5bf Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-15 17:28:42 +08:00
wangchuxiao 10c1e1df5a push 2023-05-15 17:28:37 +08:00
withchao 311192a122 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-15 17:13:06 +08:00
withchao 4abf6d51ea friend 2023-05-15 17:06:28 +08:00
wangchuxiao 32c2e7f5b1 push 2023-05-15 17:04:23 +08:00
wangchuxiao 437800d269 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-15 16:56:27 +08:00
wangchuxiao edaa6aefe6 reply 2023-05-15 16:56:21 +08:00
withchao 41b8c242a7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-15 16:52:52 +08:00
withchao 95c1259d65 friend 2023-05-15 16:52:39 +08:00
wangchuxiao 2e1d852095 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-15 16:45:06 +08:00
wangchuxiao 03679caed9 pull 2023-05-15 16:44:59 +08:00
withchao fc1425b797 friend 2023-05-15 16:42:26 +08:00
withchao ed29bc1b5c group 2023-05-15 16:17:36 +08:00
withchao b52e111de9 group 2023-05-15 15:37:48 +08:00
withchao e679ddcde2 group 2023-05-15 12:11:46 +08:00
withchao 6ba457d7f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-15 11:55:54 +08:00
withchao f7d347ff4a group 2023-05-15 11:55:41 +08:00
wangchuxiao 0b5838c79b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-15 11:44:57 +08:00
wangchuxiao dbec5f2191 msg 2023-05-15 11:44:51 +08:00
withchao ccccf35344 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-15 10:59:19 +08:00
withchao a313dddaa6 group 2023-05-15 10:59:06 +08:00
wangchuxiao 54a5e06f37 getui 2023-05-15 10:04:11 +08:00
wangchuxiao 2d6c837f0d err 2023-05-15 10:01:05 +08:00
wangchuxiao f7cf573ba8 push 2023-05-15 09:53:14 +08:00
wangchuxiao 63f4757071 notification 2023-05-12 20:50:14 +08:00
wangchuxiao f35da7b8ba noti 2023-05-12 20:41:10 +08:00
wangchuxiao 6bef075122 notification 2023-05-12 20:23:37 +08:00
wangchuxiao 0d881c2139 notification conversationIDs 2023-05-12 20:19:28 +08:00
wangchuxiao b64e9af92f msg 2023-05-12 20:05:25 +08:00
wangchuxiao cc20c7af4b conversations 2023-05-12 16:51:04 +08:00
wangchuxiao e6b7fe43d3 conversation 2023-05-12 16:46:45 +08:00
wangchuxiao 7456d3e8c0 conversation 2023-05-12 16:45:50 +08:00
wangchuxiao 01ccb6f404 modify dic 2023-05-12 11:37:53 +08:00
wangchuxiao 9abff13008 max seq 2023-05-12 10:50:59 +08:00
wangchuxiao 8aff2e86a8 msg 2023-05-11 21:32:12 +08:00
wangchuxiao dd99f52355 msg 2023-05-11 20:35:59 +08:00
wangchuxiao 303e2c4ecc decode 2023-05-11 20:27:05 +08:00
wangchuxiao 6b204c6066 msg 2023-05-11 20:24:05 +08:00
wangchuxiao d4cb40c390 msg 2023-05-11 20:15:06 +08:00
wangchuxiao 1dab783299 GetMsgBySeqIndexIn1Doc 2023-05-11 20:12:34 +08:00
wangchuxiao 945b638d4d log 2023-05-11 20:02:21 +08:00
wangchuxiao 52b079a582 msg 2023-05-11 16:01:02 +08:00
wangchuxiao 2c58335b9b seqs 2023-05-11 15:51:25 +08:00
wangchuxiao 482ea572c4 seq 2023-05-11 15:41:46 +08:00
wangchuxiao 351c5bacfa pipeline 2023-05-11 15:30:06 +08:00
wangchuxiao 89d5f7bd45 cache 2023-05-11 15:15:16 +08:00
wangchuxiao 798f946651 seq 2023-05-11 15:09:45 +08:00
wangchuxiao 6fc7fd1318 seq 2023-05-11 15:03:06 +08:00
wangchuxiao c4e23c09df msg 2023-05-11 14:54:47 +08:00
wangchuxiao 1ebe0294ac m 2023-05-11 14:49:40 +08:00
wangchuxiao 5d4b290d06 zk 2023-05-11 13:14:36 +08:00
wangchuxiao ce7686800c keeper 2023-05-11 12:08:27 +08:00
Gordon 46d2d04b20 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-11 11:52:32 +08:00
Gordon f95e970de8 test: log add 2023-05-11 11:51:58 +08:00
wangchuxiao e8b46663ab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-10 20:50:54 +08:00
wangchuxiao b2bf50a4f2 msgs 2023-05-10 20:50:46 +08:00
Gordon 24dbbb3857 test: log add 2023-05-10 20:35:18 +08:00
wangchuxiao 150089c2b9 log 2023-05-10 20:27:39 +08:00
wangchuxiao 042d4ca670 mongo 2023-05-10 18:36:02 +08:00
wangchuxiao eb841d0e0d consumer log 2023-05-10 18:30:21 +08:00
wangchuxiao 2043abb24b mongo consumer 2023-05-10 18:18:30 +08:00
wangchuxiao 651c904aff mongo 2023-05-10 18:03:21 +08:00
wangchuxiao 32ea0d4fcc options 2023-05-10 18:00:05 +08:00
wangchuxiao e05d617893 notification 2023-05-10 17:48:26 +08:00
wangchuxiao c3b16aa678 ctx 2023-05-10 17:21:58 +08:00
wangchuxiao e283e66f00 conversationID 2023-05-10 17:18:04 +08:00
wangchuxiao ead25c24ec zk 2023-05-10 16:32:44 +08:00
wangchuxiao b357f8508f zap 2023-05-10 16:20:36 +08:00
wangchuxiao 6035bd5683 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-10 15:57:17 +08:00
withchao ec5f617437 fix bug 2023-05-10 15:47:15 +08:00
withchao 20afd0a51f fix bug 2023-05-10 15:21:08 +08:00
wangchuxiao 1e6e8ebf23 zk 2023-05-10 15:17:07 +08:00
wangchuxiao ac357f93eb grpc 2023-05-10 12:21:43 +08:00
wangchuxiao a1d194266e zk 2023-05-10 12:08:37 +08:00
wangchuxiao 73f31df60b zk 2023-05-10 11:59:47 +08:00
wangchuxiao 16ca6313e8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-10 11:52:20 +08:00
wangchuxiao 143def1b0d zk 2023-05-10 11:52:12 +08:00
withchao 84b26f1ac9 fix bug 2023-05-10 11:49:55 +08:00
withchao 28c9f7fb77 fix bug 2023-05-10 11:33:32 +08:00
withchao 30479902a0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-10 11:09:30 +08:00
withchao 563ed58544 fix bug 2023-05-10 11:09:15 +08:00
Gordon 2afe26336d Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-10 10:40:42 +08:00
Gordon 88a2df00bd fix: reset read deadline when message come 2023-05-10 10:40:12 +08:00
withchao d0c2def5f6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-10 10:27:13 +08:00
withchao d0e650b1d8 msg 2023-05-10 10:23:55 +08:00
withchao 8df2b2357a Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-05-09 20:32:55 +08:00
withchao 68bc2c53b3 test 2023-05-09 20:32:39 +08:00
wangchuxiao 5c50be3c50 group 2023-05-09 20:29:49 +08:00
wangchuxiao 9884dcd7b1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-09 20:29:24 +08:00
withchao dbb8c889ef test 2023-05-09 20:20:00 +08:00
wangchuxiao de2f3a8582 conn 2023-05-09 20:05:56 +08:00
wangchuxiao 22f4c3bf89 WithRoundRobin 2023-05-09 19:36:41 +08:00
wangchuxiao 1ab8e42dd8 rpc 2023-05-09 18:44:42 +08:00
wangchuxiao b6f20d1772 group 2023-05-09 18:40:35 +08:00
wangchuxiao 9ea3e4c758 test group 2023-05-09 18:34:20 +08:00
wangchuxiao 17e747049c group 2023-05-09 18:23:28 +08:00
wangchuxiao 1ef3f527f3 group 2023-05-09 18:04:02 +08:00
wangchuxiao f82b15e12b group 2023-05-09 18:01:41 +08:00
wangchuxiao f8a2721406 rpc 2023-05-09 17:23:43 +08:00
wangchuxiao aaf746d6dc max seq 2023-05-09 17:02:44 +08:00
wangchuxiao 6ac95de7b7 seq 2023-05-09 16:55:04 +08:00
wangchuxiao 7397928acf Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-09 15:23:46 +08:00
wangchuxiao d5b8c32433 user 2023-05-09 15:23:36 +08:00
withchao 2073c4bf46 rpc mv 2023-05-09 15:15:17 +08:00
wangchuxiao 6f3b4a9f02 route 2023-05-09 11:58:21 +08:00
wangchuxiao c31b7af944 prome 2023-05-09 11:49:15 +08:00
wangchuxiao 20828746ea promethues 2023-05-09 11:46:18 +08:00
wangchuxiao 22e0fc216b grpc mw 2023-05-09 11:35:59 +08:00
wangchuxiao f5c80ffd50 grpc interceptor 2023-05-09 11:24:58 +08:00
wangchuxiao d18c7e2c52 exception msgs 2023-05-08 20:50:41 +08:00
wangchuxiao f6c6ea8706 transfer 2023-05-08 15:16:47 +08:00
wangchuxiao c8b4b9b669 transfer 2023-05-08 14:45:00 +08:00
wangchuxiao c402621359 auth 2023-05-08 12:52:12 +08:00
wangchuxiao ed978c40b2 conf 2023-05-08 12:50:53 +08:00
wangchuxiao b95496df73 refactor 2023-05-08 12:39:45 +08:00
wangchuxiao b34d1e7ee7 pb 2023-05-06 19:21:41 +08:00
wangchuxiao 12b2cc79ca pb 2023-05-06 19:20:45 +08:00
wangchuxiao 2d57c94d0e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-06 18:51:16 +08:00
wangchuxiao 121523626d msg 2023-05-06 18:51:10 +08:00
Gordon 4eb311dd21 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-06 12:01:34 +08:00
Gordon 573a669ac2 pb update 2023-05-06 12:01:03 +08:00
wangchuxiao 287b028ba8 msg 2023-05-06 11:48:03 +08:00
wangchuxiao d369d05ee4 options 2023-05-06 11:31:04 +08:00
wangchuxiao a62335a910 msg pull 2023-05-06 11:13:38 +08:00
wangchuxiao 4509530859 pb 2023-05-06 11:11:54 +08:00
wangchuxiao 4cca3b54e4 msg 2023-05-06 11:04:28 +08:00
wangchuxiao 3b4c8ad2f0 conversation 2023-05-06 10:57:49 +08:00
wangchuxiao 7df211ca18 notification 2023-05-06 10:52:29 +08:00
wangchuxiao a94ef2c290 notification 2023-05-06 10:52:03 +08:00
wangchuxiao 0fd38ece0a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-06 10:42:19 +08:00
wangchuxiao c9334ca827 conversationID 2023-05-06 10:42:11 +08:00
Gordon 8d998ad63c pb update 2023-05-06 10:27:07 +08:00
wangchuxiao 72aa6d5eab msg 2023-05-05 21:30:32 +08:00
wangchuxiao b00bd8bc35 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-05 12:20:48 +08:00
wangchuxiao 6b612ec345 pull msg 2023-05-05 12:19:04 +08:00
withchao 66757099f6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-05-05 12:03:44 +08:00
withchao d03e8634fb notification 2023-05-05 12:03:32 +08:00
Gordon 137751e5a9 pb update 2023-05-05 10:53:36 +08:00
Gordon e24d89ce52 pb update 2023-05-05 10:43:32 +08:00
Gordon 455aa79dad pb update 2023-05-04 21:03:11 +08:00
wangchuxiao 5f7fa2a7a2 conversations 2023-05-04 20:34:20 +08:00
wangchuxiao c0f8b9910a conversation 2023-05-04 20:07:20 +08:00
wangchuxiao 640313386b conversation create 2023-05-04 17:27:29 +08:00
wangchuxiao cfa543802e commonMsgDatabase 2023-05-04 16:51:50 +08:00
wangchuxiao 5d617cc240 conversation 2023-05-04 16:06:17 +08:00
wangchuxiao 9c76988225 merge 2023-05-04 16:00:06 +08:00
wangchuxiao 334e1b77b6 merge 2023-05-04 15:57:43 +08:00
wangchuxiao 076551594b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-04 15:54:10 +08:00
wangchuxiao 4f01e10f65 merge 2023-05-04 15:54:04 +08:00
wangchuxiao 8793271541 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-05-04 15:53:58 +08:00
withchao 180b8c2d3f notification 2023-05-04 15:46:22 +08:00
wangchuxiao 5c8208e0f8 sourceID2conversationID 2023-05-04 15:06:23 +08:00
withchao 3e1f97e300 notification 2023-05-04 12:11:29 +08:00
withchao 0935f1d57b msg 2023-05-04 10:02:01 +08:00
withchao 3b5ab4cb41 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/msgtransfer/init.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/msgtransfer/online_msg_to_mongo_handler.go
#	pkg/common/db/controller/msg.go
#	pkg/proto/msg/msg.pb.go
#	pkg/proto/msg/msg.proto
2023-04-28 18:45:28 +08:00
withchao 7a7a912352 msg 2023-04-28 18:39:21 +08:00
wangchuxiao d855beb354 aggres 2023-04-28 18:38:12 +08:00
wangchuxiao 573b39f248 ConversationType 2023-04-28 18:33:33 +08:00
wangchuxiao e6b2a9f8f9 msg 2023-04-28 11:01:48 +08:00
wangchuxiao 45ad252a44 msg 2023-04-28 10:26:27 +08:00
wangchuxiao 6da0c38927 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-26 18:57:47 +08:00
wangchuxiao d7401e085d redis consumer split notification 2 msg 2023-04-26 18:57:41 +08:00
withchao 508cdf06ba group 2023-04-26 16:14:50 +08:00
withchao f0a8b828be group 2023-04-26 15:42:43 +08:00
withchao cf39ea7364 group 2023-04-26 15:16:56 +08:00
withchao 122f649da7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-26 15:14:43 +08:00
withchao 84ee1cdf9f group 2023-04-26 15:10:20 +08:00
wangchuxiao 4214521dea groupID 2023-04-26 14:44:45 +08:00
wangchuxiao 5c9ecf38df friend&user 2023-04-26 14:30:52 +08:00
wangchuxiao 16231ee077 conversation 2023-04-26 14:10:12 +08:00
wangchuxiao 0dc16d54a5 modify dictory 2023-04-26 11:19:49 +08:00
wangchuxiao c2a5f664af conversation 2023-04-26 10:48:43 +08:00
wangchuxiao 88427518b0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-26 10:48:16 +08:00
wangchuxiao 0a227f8731 msg 2023-04-26 10:47:55 +08:00
withchao aaf62f3e27 group 2023-04-26 10:10:26 +08:00
withchao 554445eeba group 2023-04-26 09:44:14 +08:00
wangchuxiao 83541fbbc8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-25 20:42:08 +08:00
withchao 64bb44d181 group 2023-04-25 17:40:01 +08:00
withchao 1fc2264028 group 2023-04-25 14:18:26 +08:00
withchao 66d996cbc1 group 2023-04-25 10:36:13 +08:00
wangchuxiao cae843a6e3 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-25 10:20:05 +08:00
withchao 469458dd2a group 2023-04-24 19:45:29 +08:00
wangchuxiao 180309c878 notification 2023-04-24 17:28:39 +08:00
wangchuxiao 56a04aaf82 notification 2023-04-24 17:02:36 +08:00
wangchuxiao dc637059ab validate 2023-04-24 14:57:35 +08:00
wangchuxiao f4ba537328 notification 2023-04-24 14:50:21 +08:00
wangchuxiao 9c594dacde notification 2023-04-24 11:06:58 +08:00
wangchuxiao 0071252777 notification 2023-04-23 21:14:40 +08:00
wangchuxiao f6cebdbdef notification 2023-04-23 20:07:41 +08:00
wangchuxiao 94b5703399 notification 2023-04-23 19:50:42 +08:00
wangchuxiao c80babaef6 friend 2023-04-23 16:47:41 +08:00
wangchuxiao b94dfae6b8 noti 2023-04-23 15:34:20 +08:00
wangchuxiao f57bdf42dd n 2023-04-23 15:20:39 +08:00
wangchuxiao 95e4506279 notification 2023-04-23 15:20:35 +08:00
wangchuxiao 2ab6136b2f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-23 14:21:45 +08:00
wangchuxiao 4dccfd0a81 notification 2023-04-23 14:21:36 +08:00
withchao cfbf1593c6 s3 2023-04-23 11:44:33 +08:00
withchao f815e9bd9a s3 2023-04-23 10:46:52 +08:00
withchao 2196f69804 third 2023-04-23 10:30:38 +08:00
wangchuxiao e3d907f113 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-21 20:29:13 +08:00
wangchuxiao 2a7e305992 notification 2023-04-21 20:29:08 +08:00
withchao 705ec6f65e Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-21 19:54:02 +08:00
withchao b5fc6dbf04 third 2023-04-21 19:52:57 +08:00
wangchuxiao 9ec692585d page 1 2023-04-21 19:26:07 +08:00
wangchuxiao c0ef0a8660 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-21 17:51:33 +08:00
wangchuxiao fde574be1b conn 2023-04-21 17:51:28 +08:00
withchao d891a1ca8e Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-21 16:45:48 +08:00
withchao 681c0747dd third 2023-04-21 16:44:21 +08:00
withchao 9d8f86f778 friend 2023-04-21 16:39:04 +08:00
wangchuxiao 7f805e89bb conversations 2023-04-21 15:06:29 +08:00
wangchuxiao 4bcad908da conversation 2023-04-21 14:58:42 +08:00
wangchuxiao 886f59e19d conversation 2023-04-21 14:55:24 +08:00
wangchuxiao 8ad343e97c conversationID 2023-04-21 14:51:57 +08:00
wangchuxiao 22c1b8eb59 con 2023-04-21 11:48:47 +08:00
wangchuxiao 2bd22b42b7 conversation 2023-04-21 11:26:48 +08:00
wangchuxiao e1d2c52519 conversation 2023-04-20 16:31:36 +08:00
wangchuxiao 5bf165d2c3 Updates 2023-04-20 16:28:02 +08:00
wangchuxiao 934e531840 conversation 2023-04-20 16:23:41 +08:00
wangchuxiao b05bedf243 conversation 2023-04-20 16:05:22 +08:00
withchao 9f523d980a friend 2023-04-19 20:06:20 +08:00
withchao d2068857e1 friend 2023-04-19 19:13:31 +08:00
withchao e6e5268df9 friend 2023-04-19 18:31:52 +08:00
withchao f86fd1fd95 friend 2023-04-19 18:28:30 +08:00
withchao 8d57409392 friend 2023-04-19 17:57:22 +08:00
wangchuxiao 6b9353d7b5 cache 2023-04-19 17:21:05 +08:00
withchao 3fa1a5c485 friend 2023-04-19 17:13:54 +08:00
withchao ee7016753a friend 2023-04-19 17:11:09 +08:00
withchao 0b0f38da20 group 2023-04-19 16:37:50 +08:00
withchao 1f02053ed3 group 2023-04-19 16:16:06 +08:00
withchao d30fc3ef54 group 2023-04-19 15:51:47 +08:00
withchao da180aacdd group 2023-04-19 15:51:23 +08:00
withchao 88ef5251f4 group 2023-04-19 15:22:00 +08:00
withchao 2b58579c0a Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-19 15:12:18 +08:00
withchao df7c98e27d config 2023-04-19 15:11:24 +08:00
wangchuxiao b7de5c46cf cache 2023-04-18 19:15:06 +08:00
wangchuxiao a927215197 group 2023-04-18 18:40:20 +08:00
wangchuxiao ba45e9d50c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-18 18:37:55 +08:00
wangchuxiao 57d623af9a getcache 2023-04-18 18:35:16 +08:00
withchao 4faced7d51 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-18 18:20:03 +08:00
withchao 36da39e5ab config 2023-04-18 18:19:25 +08:00
wangchuxiao a6f30db53b group 2023-04-18 18:10:58 +08:00
wangchuxiao 255c5ed1c3 debug 2023-04-18 17:58:53 +08:00
withchao 5da12839fb config 2023-04-18 17:52:08 +08:00
withchao a49f69ba8f config 2023-04-18 17:26:34 +08:00
withchao 5ddc04e992 config 2023-04-18 16:49:23 +08:00
withchao 984686e073 config 2023-04-18 16:38:11 +08:00
withchao 72e6f8bc99 group 2023-04-18 16:23:07 +08:00
withchao ea299b73aa group 2023-04-18 16:11:23 +08:00
withchao 68563d4edd group 2023-04-18 15:54:41 +08:00
withchao 5432ea0869 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-18 14:48:17 +08:00
withchao e860991f06 group 2023-04-18 14:48:06 +08:00
wangchuxiao fedee55842 logger 2023-04-18 14:47:34 +08:00
wangchuxiao c739b32e24 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-18 14:43:59 +08:00
wangchuxiao cfb600a632 zap 2023-04-18 14:43:54 +08:00
withchao c2f4550166 group 2023-04-18 14:37:52 +08:00
withchao 2152f5d45d Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-18 14:22:21 +08:00
withchao 1394f5add7 group 2023-04-18 14:22:05 +08:00
wangchuxiao a2e845ec9f zap 2023-04-18 14:18:48 +08:00
wangchuxiao f118705a8f zap 2023-04-18 14:12:51 +08:00
wangchuxiao 7dd93aa395 zap 2023-04-18 13:11:40 +08:00
wangchuxiao 554c0961c1 zap 2023-04-18 12:21:01 +08:00
wangchuxiao d61bede62a logger 2023-04-18 12:20:20 +08:00
wangchuxiao 5a1ba91872 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-18 12:11:43 +08:00
wangchuxiao 7b48444a85 zap 2023-04-18 12:11:37 +08:00
withchao bf86c53915 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-18 10:50:29 +08:00
withchao 0488ce6428 group 2023-04-18 10:50:15 +08:00
wangchuxiao f4020a2508 zap 2023-04-18 10:45:23 +08:00
wangchuxiao fb668b3f0c color 2023-04-18 10:37:12 +08:00
wangchuxiao c04b85aa29 zap 2023-04-17 21:39:31 +08:00
wangchuxiao f18b03987e zap 2023-04-17 21:37:04 +08:00
wangchuxiao a2b0edf8de zap 2023-04-17 21:33:08 +08:00
wangchuxiao 3202b6869d zap 2023-04-17 21:26:04 +08:00
wangchuxiao 22633cbe77 color 2023-04-17 21:22:54 +08:00
wangchuxiao 5f0346be77 zap 2023-04-17 21:18:11 +08:00
wangchuxiao 9445f74e1a color 2023-04-17 21:18:05 +08:00
wangchuxiao bbcc6c212a zap 2023-04-17 20:58:21 +08:00
wangchuxiao aed8536080 zap 2023-04-17 20:49:38 +08:00
wangchuxiao cce90a109d zap 2023-04-17 20:35:27 +08:00
wangchuxiao 1039d44284 zap 2023-04-17 20:28:38 +08:00
wangchuxiao ede2097678 caller 2023-04-17 20:26:24 +08:00
wangchuxiao bde01538a0 zap 2023-04-17 20:18:00 +08:00
wangchuxiao 3fa96b0700 caller 2023-04-17 20:12:52 +08:00
wangchuxiao 111fbdcccf caller 2023-04-17 20:12:26 +08:00
wangchuxiao c81d958b78 log 2023-04-17 20:09:58 +08:00
wangchuxiao 0d3a1ba6f6 zap 2023-04-17 19:58:15 +08:00
wangchuxiao 1a56deeb21 zap 2023-04-17 19:49:35 +08:00
wangchuxiao 987e6b1004 zap 2023-04-17 19:18:40 +08:00
wangchuxiao 85461165e8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-17 19:13:39 +08:00
wangchuxiao 15f6626282 zap 2023-04-17 19:13:34 +08:00
withchao c33eb316b3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-17 19:05:58 +08:00
withchao f6d63cca46 group 2023-04-17 19:05:47 +08:00
wangchuxiao 085fc7adbf Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-17 19:03:49 +08:00
wangchuxiao 97bcab6c64 zap 2023-04-17 19:03:44 +08:00
withchao efa8d9297a Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-17 19:02:55 +08:00
withchao 96100501e7 group 2023-04-17 19:02:31 +08:00
wangchuxiao 2558e2a1db zap 2023-04-17 18:59:22 +08:00
wangchuxiao 682eda06b2 zap 2023-04-17 18:47:03 +08:00
wangchuxiao 7818bb100d log 2023-04-17 15:20:11 +08:00
wangchuxiao e3b4ea7977 log 2023-04-17 15:19:01 +08:00
wangchuxiao 1578176f39 log level 2023-04-17 11:57:38 +08:00
wangchuxiao f6761d2544 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-13 10:05:33 +08:00
wangchuxiao 993d048989 cmd utils 2023-04-13 10:05:28 +08:00
withchao 9910f98d1a Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-12 18:16:14 +08:00
withchao 80505ca74c group 2023-04-12 18:16:02 +08:00
wangchuxiao dec9761a17 exclude node exporter 2023-04-11 17:13:15 +08:00
wangchuxiao a882e12092 script 2023-04-11 17:03:28 +08:00
wangchuxiao 9b7451fa92 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-11 16:48:37 +08:00
wangchuxiao 430d9e0a84 install guide 2023-04-11 16:48:31 +08:00
withchao cb40e47c21 Merge remote-tracking branch 'origin/errcode' into errcode 2023-04-11 14:45:15 +08:00
withchao bd07c964a4 friend 2023-04-11 14:44:51 +08:00
wangchuxiao 20c20ce01a sh 2023-04-11 14:29:44 +08:00
wangchuxiao 33be38339e install sh 2023-04-11 14:28:51 +08:00
wangchuxiao 32343e17f8 script 2023-04-10 20:59:51 +08:00
wangchuxiao 97c1b235b5 script 2023-04-10 20:34:03 +08:00
wangchuxiao 5ece607224 script 2023-04-10 20:25:39 +08:00
wangchuxiao c90eb51177 script 2023-04-10 20:16:28 +08:00
wangchuxiao b0c06e9ee7 script 2023-04-10 20:02:21 +08:00
wangchuxiao f5b618f76d script 2023-04-10 19:53:59 +08:00
wangchuxiao 00282652ea script 2023-04-10 19:50:09 +08:00
wangchuxiao c021922213 script 2023-04-10 19:46:47 +08:00
wangchuxiao 2409d17892 compose 2023-04-10 19:42:24 +08:00
wangchuxiao b5234ad226 errcode 2023-04-10 19:40:51 +08:00
wangchuxiao fe517070f9 script 2023-04-10 19:29:11 +08:00
wangchuxiao 0dec7e3a3c script 2023-04-10 18:39:32 +08:00
wangchuxiao 2fbe46eb6c script 2023-04-10 18:31:01 +08:00
wangchuxiao cbe6005212 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-04-10 18:26:01 +08:00
wangchuxiao d55bb2c529 script 2023-04-10 18:25:56 +08:00
withchao 387a3cbe96 wrapperspb 2023-04-07 15:35:23 +08:00
withchao c81fb9ceca group 2023-04-07 12:07:54 +08:00
withchao a83b4fc5d8 fix bug 2023-04-03 11:49:59 +08:00
withchao ffecab72d8 user db model 2023-03-31 09:45:15 +08:00
withchao 063062a0ad third 2023-03-30 14:28:45 +08:00
withchao c2cd2e5d7c third 2023-03-30 14:26:09 +08:00
withchao ee712593d1 third 2023-03-30 14:19:58 +08:00
withchao 8843933d45 third 2023-03-30 10:52:45 +08:00
withchao b27efd54cc third 2023-03-30 10:20:25 +08:00
withchao 39aeabcd24 third 2023-03-29 18:52:49 +08:00
withchao 267cfe24ce third 2023-03-29 18:48:07 +08:00
withchao 12b19bdf64 third 2023-03-29 18:41:30 +08:00
withchao c7f7e7c782 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-29 18:34:26 +08:00
withchao bd07594ae0 third 2023-03-29 18:33:02 +08:00
wangchuxiao 909b57558e group 2023-03-29 18:26:03 +08:00
wangchuxiao 0345099e99 group 2023-03-29 17:59:52 +08:00
wangchuxiao 38f0f37ece group 2023-03-29 15:57:00 +08:00
wangchuxiao bb73b7e675 group 2023-03-29 15:00:30 +08:00
wangchuxiao 666e1f9273 group 2023-03-29 14:44:44 +08:00
wangchuxiao bd6fb0b831 group 2023-03-29 14:42:00 +08:00
wangchuxiao 66ad26b71b group 2023-03-29 14:32:02 +08:00
wangchuxiao b4e228c33e groupMember 2023-03-29 14:30:38 +08:00
wangchuxiao e2710958e2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-29 11:39:36 +08:00
wangchuxiao 3dac37b89b group 2023-03-29 11:39:29 +08:00
withchao 73747e0b38 third 2023-03-29 11:17:16 +08:00
withchao 5edcb9908d Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-29 11:04:50 +08:00
withchao 9b89b5c782 third 2023-03-29 11:04:34 +08:00
wangchuxiao 53a5ab4ebc Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-29 11:01:11 +08:00
wangchuxiao 2c3b6669d6 group 2023-03-29 11:01:03 +08:00
withchao 23daab441c Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-29 10:47:32 +08:00
withchao 1f59d9cda4 third 2023-03-29 10:47:10 +08:00
wangchuxiao 42f8709150 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-29 10:19:27 +08:00
wangchuxiao 728aa97c86 group 2023-03-29 10:19:20 +08:00
withchao 2a33eaf4ea Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-29 10:16:03 +08:00
withchao 8ec04f46b0 third 2023-03-29 10:15:21 +08:00
wangchuxiao 93fe0d3cd7 gormpage 2023-03-28 19:33:35 +08:00
wangchuxiao 2fd768df75 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-28 19:25:05 +08:00
wangchuxiao 55c79c805f group 2023-03-28 19:24:59 +08:00
Gordon d1875af9be msg add permission judge 2023-03-28 19:08:33 +08:00
withchao ff65eeddba third 2023-03-28 17:11:04 +08:00
withchao 18156980d9 third 2023-03-28 17:04:34 +08:00
withchao 8c5970e527 third 2023-03-28 17:03:52 +08:00
withchao 102072ef24 third 2023-03-28 17:01:27 +08:00
withchao e7e287b6c1 third 2023-03-28 16:33:22 +08:00
withchao 3613787a6b third 2023-03-28 16:26:02 +08:00
withchao e27be8f698 third 2023-03-28 15:14:14 +08:00
withchao ca04748862 third 2023-03-28 15:04:40 +08:00
withchao d0c042844e third 2023-03-28 14:53:57 +08:00
withchao 3c1b0e3994 third 2023-03-28 14:40:51 +08:00
Gordon 330e8d0f05 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-27 19:34:25 +08:00
Gordon 3390dfff8d msg add permission judge 2023-03-27 19:33:51 +08:00
wangchuxiao 01f4a206c7 group 2023-03-27 19:24:16 +08:00
wangchuxiao 7becc2cfdd group 2023-03-27 19:09:58 +08:00
wangchuxiao 82a33d1c8c group 2023-03-27 18:59:06 +08:00
wangchuxiao de661a54cd group 2023-03-27 18:31:25 +08:00
wangchuxiao cb26321847 group 2023-03-27 17:20:36 +08:00
wangchuxiao cfb157d2e4 group 2023-03-27 15:05:40 +08:00
wangchuxiao a999b9d0c4 GROUP 2023-03-27 11:03:50 +08:00
wangchuxiao 96321a2469 group 2023-03-27 10:42:24 +08:00
wangchuxiao 4777bdeb7e group 2023-03-27 10:18:37 +08:00
wangchuxiao 4706d830a2 group 2023-03-27 10:07:41 +08:00
wangchuxiao de7d4fac85 group 2023-03-24 20:24:38 +08:00
wangchuxiao 4c7986e1b8 group 2023-03-24 20:02:16 +08:00
wangchuxiao 5873ed3b51 group 2023-03-24 19:55:01 +08:00
wangchuxiao 94847770bf Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 19:49:58 +08:00
wangchuxiao 4a013de0f1 group 2023-03-24 19:49:50 +08:00
Gordon 3d46297aa4 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-24 19:21:38 +08:00
Gordon 9843d5c7ba ws update 2023-03-24 19:21:08 +08:00
wangchuxiao 53abc2703d group 2023-03-24 19:03:20 +08:00
wangchuxiao aea5525de3 group 2023-03-24 18:59:37 +08:00
wangchuxiao becbba877a cache 2023-03-24 18:53:49 +08:00
wangchuxiao fa477c2d17 cache 2023-03-24 18:42:19 +08:00
wangchuxiao 862fca1019 cache 2023-03-24 18:38:14 +08:00
wangchuxiao 83d91c7dc9 cache 2023-03-24 18:32:25 +08:00
wangchuxiao 9158b62789 cache fix bug 2023-03-24 18:27:17 +08:00
wangchuxiao 81d6ca8b31 conversation 2023-03-24 18:09:54 +08:00
wangchuxiao 8399613018 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 17:59:28 +08:00
wangchuxiao 2fa02983fb cache 2023-03-24 17:59:20 +08:00
withchao 9f19fd46e7 ctx 2023-03-24 17:43:52 +08:00
withchao 7975a377a0 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-03-24 17:37:38 +08:00
withchao eba6993726 ctx 2023-03-24 17:36:36 +08:00
withchao 05ae254d3d Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/apiresp/gin.go
#	pkg/apiresp/resp.go
2023-03-24 17:35:22 +08:00
wangchuxiao 3d647ee41b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 17:34:40 +08:00
wangchuxiao 8a073a9dfb conversation 2023-03-24 17:34:33 +08:00
Gordon 3239dfe0a0 ws update 2023-03-24 17:34:16 +08:00
withchao 429d5da1d2 ctx 2023-03-24 17:34:00 +08:00
Gordon 4c18e47e96 ws update 2023-03-24 16:57:50 +08:00
Gordon 1199a45784 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-24 16:56:39 +08:00
Gordon c8ba439a2c ws update 2023-03-24 16:56:02 +08:00
wangchuxiao d9afe8a562 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 16:41:17 +08:00
wangchuxiao 6fb9992957 conversation 2023-03-24 16:41:11 +08:00
Gordon 7e7d5fc41b Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-24 16:40:13 +08:00
Gordon 1291420db0 ws update 2023-03-24 16:39:33 +08:00
wangchuxiao ad7fa572b5 fix cache 2023-03-24 16:06:37 +08:00
wangchuxiao 07309b872b del user field 2023-03-24 15:44:45 +08:00
withchao 5017c61e28 ctx 2023-03-24 14:50:35 +08:00
withchao d2a4ea5c4e Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-03-24 14:48:17 +08:00
withchao 3ccdc96229 ctx 2023-03-24 14:47:57 +08:00
wangchuxiao dce1769bcc Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-24 11:29:47 +08:00
wangchuxiao 59fe9f0ca9 add redis pipeline 2023-03-24 11:29:39 +08:00
Gordon 98e22cc699 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 20:06:23 +08:00
Gordon 735c35bd0f ws update 2023-03-23 20:05:49 +08:00
wangchuxiao 39c35e840d cache 2023-03-23 19:06:35 +08:00
wangchuxiao 2baf208c02 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-23 19:05:20 +08:00
wangchuxiao 132e1b987c cache 2023-03-23 19:02:20 +08:00
Gordon a0d61769b2 ws update 2023-03-23 17:51:38 +08:00
Gordon 52f49140b2 ws update 2023-03-23 17:06:21 +08:00
Gordon f109ead705 ws update 2023-03-23 16:53:25 +08:00
Gordon 393dfa5902 ws update 2023-03-23 15:56:47 +08:00
Gordon a5380a971b ws update 2023-03-23 15:42:31 +08:00
Gordon 2ba38d30f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 15:15:35 +08:00
Gordon e08a127213 ws update 2023-03-23 15:14:50 +08:00
withchao 53ed7728f5 ctx 2023-03-23 14:54:40 +08:00
Gordon 6382528360 ws update 2023-03-23 14:22:02 +08:00
Gordon 889e6b0d84 ws update 2023-03-23 14:18:33 +08:00
Gordon be3c866dc0 ws update 2023-03-23 14:05:49 +08:00
Gordon ac8a53b1b3 ws update 2023-03-23 13:17:06 +08:00
Gordon c96d6b48d1 ws update 2023-03-23 13:04:35 +08:00
Gordon e794769eea ws update 2023-03-23 12:49:18 +08:00
Gordon 87ae907df1 ws update 2023-03-23 12:33:25 +08:00
Gordon d88c45c415 ws update 2023-03-23 12:05:25 +08:00
Gordon 985fa74b34 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 10:46:16 +08:00
withchao 2564c2f06e ctx 2023-03-23 10:39:03 +08:00
Gordon 0a90986d14 ws update 2023-03-23 10:34:53 +08:00
withchao 3ea2128b93 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-23 09:48:48 +08:00
withchao 1e683fcf95 api error 2023-03-23 09:48:11 +08:00
Gordon 646cf767f9 log 2023-03-22 20:33:37 +08:00
Gordon 56cd2b0a46 log 2023-03-22 20:24:13 +08:00
Gordon 77a9fad102 log 2023-03-22 19:39:20 +08:00
Gordon 1f80758ebb log 2023-03-22 19:38:35 +08:00
Gordon d2d3ee4979 log 2023-03-22 19:31:43 +08:00
Gordon 19b8bd0ff6 msg update 2023-03-22 19:24:38 +08:00
Gordon 2b0e0eb9e5 msg update 2023-03-22 19:11:44 +08:00
Gordon 254313d11f msg update 2023-03-22 18:47:29 +08:00
Gordon 1bb33a2dfc Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-22 18:35:55 +08:00
Gordon 11ebe4e234 msg update 2023-03-22 18:35:21 +08:00
withchao 486e69fd33 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-22 17:25:52 +08:00
withchao ea7d61d281 rpc custom header 2023-03-22 17:25:30 +08:00
Gordon b07bb1765e msg update 2023-03-22 15:28:25 +08:00
Gordon 74e4c1cf2c Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-22 10:55:14 +08:00
Gordon c21523f863 msg update 2023-03-22 10:54:39 +08:00
withchao 900858e4ea rpc custom header 2023-03-22 10:11:18 +08:00
Gordon c0d72d91fb msg update 2023-03-21 20:09:50 +08:00
withchao 008efc56d8 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-21 19:21:07 +08:00
withchao 97608e47cd verify req key 2023-03-21 19:20:54 +08:00
Gordon be98943d2a Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-21 19:06:15 +08:00
Gordon b05e89cd67 msg update 2023-03-21 19:05:02 +08:00
withchao 119f8bf820 OpenIMCommonConfigKey 2023-03-21 15:33:33 +08:00
Gordon c036d27b36 msg update 2023-03-21 12:28:21 +08:00
Gordon 7eb28e7d0a msg update 2023-03-21 11:45:48 +08:00
Gordon 1e8eb76013 test 2023-03-21 11:27:20 +08:00
Gordon c92e48dfa3 msg update 2023-03-21 10:32:09 +08:00
Gordon adfd117926 msg update 2023-03-21 10:30:40 +08:00
Gordon 71156eca21 msg update 2023-03-21 10:18:53 +08:00
Gordon 33a09acdee user update 2023-03-20 20:57:51 +08:00
Gordon 4230136064 user update 2023-03-20 20:52:52 +08:00
Gordon aa09e77ab6 user update 2023-03-20 20:43:36 +08:00
Gordon b24960449d user update 2023-03-20 20:42:02 +08:00
Gordon 357245691d user update 2023-03-20 20:00:16 +08:00
Gordon c5974781fb Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-20 19:35:21 +08:00
Gordon 78d5fa30ba user update 2023-03-20 19:34:50 +08:00
withchao 762d6516a5 db 2023-03-20 15:11:00 +08:00
withchao e0a422fd16 code error 2023-03-20 14:36:42 +08:00
Gordon 99c486295b msg update 2023-03-20 12:58:18 +08:00
Gordon 7e2db9cd43 msg update 2023-03-20 12:36:41 +08:00
Gordon 0aaa8cb36b msg update 2023-03-20 11:30:14 +08:00
Gordon c2862424f2 msg update 2023-03-20 10:44:22 +08:00
Gordon 26de3bd859 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-20 10:43:31 +08:00
Gordon eec9446abe msg update 2023-03-20 10:43:02 +08:00
wangchuxiao 3e15014e0a user 2023-03-17 19:55:05 +08:00
wangchuxiao 69106a4cca user 2023-03-17 19:54:23 +08:00
wangchuxiao 0bd80a81eb Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-17 19:41:52 +08:00
wangchuxiao 13adde5223 group 2023-03-17 19:41:44 +08:00
wangchuxiao 607fa18f27 group 2023-03-17 19:41:37 +08:00
Gordon f03c72541a Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-17 19:21:58 +08:00
Gordon 05fc63a350 user update 2023-03-17 19:21:24 +08:00
withchao 54e6299dc4 pb 2023-03-17 17:27:12 +08:00
withchao 3519cfb3ab pb 2023-03-17 17:26:58 +08:00
wangchuxiao 8e8270b090 pb 2023-03-17 17:18:50 +08:00
wangchuxiao 2f6aa39824 friend 2023-03-17 17:04:27 +08:00
wangchuxiao d1c07f2e5c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-17 16:24:53 +08:00
wangchuxiao fd19cd89a3 friend 2023-03-17 16:24:47 +08:00
withchao 58206f983e Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-17 16:08:21 +08:00
withchao 2e24846e15 wrap 2023-03-17 16:08:13 +08:00
wangchuxiao 7c8c809fb8 errcode 2023-03-17 16:01:56 +08:00
wangchuxiao c9fd336812 friend 2023-03-17 15:54:54 +08:00
wangchuxiao 04347bcc0d friend 2023-03-17 15:48:48 +08:00
wangchuxiao 19f5354721 page 2023-03-17 15:24:07 +08:00
wangchuxiao 2f8c65f930 friend 2023-03-17 15:17:40 +08:00
wangchuxiao c8fd03a693 friend 2023-03-17 15:04:01 +08:00
wangchuxiao 40333d62e3 friend 2023-03-17 14:59:32 +08:00
wangchuxiao a765160ee3 friend 2023-03-17 14:19:53 +08:00
wangchuxiao 40da937c4c friend 2023-03-17 13:44:30 +08:00
wangchuxiao 91e2f3caeb err 2023-03-17 12:41:04 +08:00
wangchuxiao befd5c8636 err 2023-03-17 12:36:26 +08:00
wangchuxiao 1921e5b030 err 2023-03-17 12:32:26 +08:00
wangchuxiao 506a417b0b err 2023-03-17 12:29:19 +08:00
wangchuxiao 9716d478bd freind 2023-03-17 12:23:49 +08:00
wangchuxiao 553606d2a8 err 2023-03-17 12:18:33 +08:00
wangchuxiao 7fd9a84271 error 2023-03-17 12:12:32 +08:00
wangchuxiao 7445f96e66 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-17 11:42:57 +08:00
wangchuxiao cf968c0b4c friend 2023-03-17 11:41:20 +08:00
withchao 26341a5187 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/rpc/friend/friend.go
2023-03-17 11:33:40 +08:00
withchao 2ce1bc84f2 pkg 2023-03-17 11:27:34 +08:00
wangchuxiao 67e1faefd8 friend db 2023-03-17 11:26:34 +08:00
withchao 835cd6d14a pkg 2023-03-17 11:14:14 +08:00
wangchuxiao 22fa9dc0ba Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-17 11:03:02 +08:00
wangchuxiao ea9c9a496b friend 2023-03-17 11:02:54 +08:00
withchao 15610438d8 is all fields private 2023-03-17 09:40:45 +08:00
wangchuxiao 2966afca6b friend 2023-03-16 20:35:55 +08:00
wangchuxiao 47637175d7 friend 2023-03-16 20:32:58 +08:00
wangchuxiao 3f65376a35 fix friend 2023-03-16 20:30:28 +08:00
wangchuxiao 3d9945393a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 20:21:17 +08:00
wangchuxiao ba6dddf986 fix add friend 2023-03-16 20:21:10 +08:00
withchao f38bac44b4 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 19:16:03 +08:00
withchao 202f033c02 is empty struct 2023-03-16 19:15:45 +08:00
wangchuxiao 0ffce32f62 black 2023-03-16 19:06:57 +08:00
wangchuxiao d2cd3618e0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 19:02:21 +08:00
wangchuxiao e7b1377444 black bug 2023-03-16 19:01:15 +08:00
wangchuxiao 73e6fbbe91 black bug 2023-03-16 19:00:17 +08:00
withchao c331d6f200 code error 2023-03-16 18:54:01 +08:00
Gordon 5c38ffa15e user update 2023-03-16 18:18:59 +08:00
Gordon a60dc3189c user update 2023-03-16 18:11:03 +08:00
Gordon 92d941b747 user update 2023-03-16 17:49:36 +08:00
Gordon 007e0cff26 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 17:44:03 +08:00
Gordon 1117488eec user update 2023-03-16 17:43:30 +08:00
wangchuxiao 57c082c545 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 17:01:31 +08:00
wangchuxiao 5a886f6837 db 2023-03-16 17:01:17 +08:00
Gordon f3937499fa user update 2023-03-16 17:00:10 +08:00
withchao 0fd1e785fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 16:33:33 +08:00
withchao 1f935531f6 code error 2023-03-16 16:32:42 +08:00
wangchuxiao d725b9538f db 2023-03-16 16:23:56 +08:00
wangchuxiao 962c39f3c2 db 2023-03-16 16:11:34 +08:00
wangchuxiao 62920d3dd0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 16:10:29 +08:00
wangchuxiao 12d25e91bf db 2023-03-16 16:10:08 +08:00
Gordon 9539f93640 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 15:11:35 +08:00
wangchuxiao 23c704e93b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 15:10:37 +08:00
Gordon ce87ef0a04 conversation update 2023-03-16 15:10:23 +08:00
wangchuxiao 31833d06ba db 2023-03-16 15:10:21 +08:00
Gordon 38d3c5d94d user update 2023-03-16 13:01:42 +08:00
Gordon 1f03ebdbe7 user update 2023-03-16 12:53:29 +08:00
Gordon 6ce1c6c048 user update 2023-03-16 12:42:34 +08:00
Gordon 9a0f9c2270 user update 2023-03-16 12:32:25 +08:00
Gordon baae7875aa Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-16 12:07:57 +08:00
Gordon e99753f188 user update 2023-03-16 12:07:21 +08:00
wangchuxiao a8dd306196 db 2023-03-16 12:00:14 +08:00
wangchuxiao 642743957e db 2023-03-16 11:43:08 +08:00
wangchuxiao be847d5d5e db 2023-03-16 11:41:38 +08:00
wangchuxiao 690a2195da Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/friend.go
2023-03-16 11:03:57 +08:00
wangchuxiao 63f5169dbe db 2023-03-16 11:03:14 +08:00
withchao a529ba4f5b packet name pb 2023-03-16 10:52:50 +08:00
withchao 1680b96b65 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	cmd/api/main.go
#	internal/api/a2r/api2rpc.go
#	internal/apiresp/resp.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/push/consumer_init.go
#	pkg/common/db/controller/conversation.go
#	pkg/common/mw/gin.go
#	pkg/statistics/statistics.go
2023-03-16 10:51:00 +08:00
withchao 17de3e7927 packet name pb 2023-03-16 10:46:06 +08:00
wangchuxiao 69f147a70c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-16 10:46:04 +08:00
wangchuxiao a0f3307fe3 db 2023-03-16 10:45:56 +08:00
Gordon 574399669c log remove 2023-03-16 10:20:40 +08:00
wangchuxiao e888910f3c db 2023-03-15 18:41:22 +08:00
wangchuxiao cc93335d7f db 2023-03-15 18:36:00 +08:00
wangchuxiao 74d1d760aa db 2023-03-15 18:35:06 +08:00
wangchuxiao 2a60974ebd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 17:59:56 +08:00
wangchuxiao 51d8c0ba51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 17:59:38 +08:00
Gordon f2d33991e1 parse token 2023-03-15 17:11:23 +08:00
Gordon 970e6c40b4 parse token 2023-03-15 17:01:54 +08:00
Gordon 7b17ed6303 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 16:52:58 +08:00
Gordon 808cd69429 parse token 2023-03-15 16:52:29 +08:00
wangchuxiao cbfe679f06 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 16:51:44 +08:00
wangchuxiao 42c9cc61ab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:51:29 +08:00
wangchuxiao d75d1f57e4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:45:17 +08:00
Gordon 460cf8d8ba parse token 2023-03-15 16:39:11 +08:00
Gordon b8ef0b3513 parse token 2023-03-15 16:37:09 +08:00
wangchuxiao becd3eb8f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:30:10 +08:00
wangchuxiao 8dea2cacf4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:29:04 +08:00
wangchuxiao d5b721be30 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 16:10:34 +08:00
wangchuxiao 14e3e561ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:56:37 +08:00
wangchuxiao 4866e88eab Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:56:13 +08:00
wangchuxiao fab8277086 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:40:19 +08:00
wangchuxiao e2421d7aa2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:33:23 +08:00
wangchuxiao ea8de45a6c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:29:58 +08:00
wangchuxiao 6c1525bd62 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-15 15:27:01 +08:00
wangchuxiao 15d48fb0ad Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-15 15:26:37 +08:00
Gordon 5b4cc786ed log update 2023-03-15 14:50:23 +08:00
Gordon a40ad5df68 log update 2023-03-15 14:38:11 +08:00
Gordon cb4b41476b log update 2023-03-15 13:41:58 +08:00
Gordon 4680b1e6be log update 2023-03-15 13:37:17 +08:00
Gordon 8d8c5071b5 remove statistic 2023-03-15 12:03:14 +08:00
Gordon a03bdb35ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:40:54 +08:00
Gordon 41fb79d995 remove statistic 2023-03-15 11:40:22 +08:00
withchao 8437c9a38b s3 config 2023-03-15 11:39:56 +08:00
withchao eba9b8ad44 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:25:18 +08:00
withchao e9865539de s3 2023-03-15 11:24:59 +08:00
Gordon a74c60927f Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-15 11:09:31 +08:00
Gordon 49f855e1d1 log update 2023-03-15 11:09:01 +08:00
wangchuxiao 3bc6e66b1a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 20:30:04 +08:00
wangchuxiao 6de048d84f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 20:16:52 +08:00
wangchuxiao fcbcfbb17c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 20:09:26 +08:00
wangchuxiao fd2fb3dcaa Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 20:06:41 +08:00
wangchuxiao 2a49abc74a zap 2023-03-14 20:05:48 +08:00
Gordon d827c9c598 log update 2023-03-14 20:02:54 +08:00
Gordon 37999fe322 log update 2023-03-14 19:50:54 +08:00
withchao 316fa10257 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 19:47:07 +08:00
withchao 384cca3689 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 19:46:56 +08:00
wangchuxiao 19f3a9e077 zap 2023-03-14 19:45:48 +08:00
wangchuxiao 64db33a6fd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 19:43:30 +08:00
Gordon 16561e1589 log update 2023-03-14 19:43:08 +08:00
wangchuxiao 9995b1c8ab zap 2023-03-14 19:41:26 +08:00
withchao acb7a8be2d s3 2023-03-14 19:40:35 +08:00
withchao 188dc6d322 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/controller/storage.go
2023-03-14 19:39:34 +08:00
withchao 6a95025e41 s3 2023-03-14 19:33:44 +08:00
wangchuxiao df78784ede Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 19:28:10 +08:00
wangchuxiao 6b98f27656 zap 2023-03-14 19:27:43 +08:00
Gordon e96ae5907e Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 19:27:30 +08:00
Gordon 0c5e5207e6 log update 2023-03-14 19:26:26 +08:00
wangchuxiao f6f4409357 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 19:23:44 +08:00
wangchuxiao 714a68fc44 zap 2023-03-14 19:23:31 +08:00
wangchuxiao a3410beaec zap 2023-03-14 19:23:26 +08:00
Gordon 85b6f00b66 log update 2023-03-14 19:23:14 +08:00
Gordon a2b7c4da7e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
2023-03-14 19:07:29 +08:00
Gordon b7413dffb2 log update 2023-03-14 19:06:43 +08:00
wangchuxiao fdf20f31c3 zap 2023-03-14 18:55:32 +08:00
wangchuxiao 726f83a683 zap 2023-03-14 18:54:43 +08:00
wangchuxiao 5a3cea56fa zap 2023-03-14 18:50:49 +08:00
wangchuxiao 104b5748b8 zap 2023-03-14 18:47:40 +08:00
wangchuxiao 1d04b6c924 zap 2023-03-14 18:13:35 +08:00
wangchuxiao b3031ea529 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 18:08:16 +08:00
wangchuxiao b2e4dce77a zap 2023-03-14 18:07:32 +08:00
Gordon e6c02fcb8f conversation update 2023-03-14 17:58:51 +08:00
wangchuxiao 5310f60422 zap 2023-03-14 17:51:11 +08:00
wangchuxiao 5c6141d0e6 zap 2023-03-14 16:19:28 +08:00
wangchuxiao c33dab0e30 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 16:14:19 +08:00
withchao 9bb30406ee api error 2023-03-14 16:13:00 +08:00
wangchuxiao 845f858e7a zap 2023-03-14 16:09:20 +08:00
withchao b8a1b6644b Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 15:43:24 +08:00
withchao b5a080623c special error 2023-03-14 15:42:52 +08:00
wangchuxiao dffc8da28f zap 2023-03-14 15:40:51 +08:00
wangchuxiao 8c87b0c595 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/mw/rpc.go
2023-03-14 15:40:18 +08:00
wangchuxiao 6afb47ba06 zap 2023-03-14 15:35:58 +08:00
withchao e9eea7cd9a Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 15:08:47 +08:00
withchao ce72365842 special error 2023-03-14 15:06:45 +08:00
wangchuxiao d0211ebd89 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 14:35:53 +08:00
wangchuxiao 2f6c5c6fe2 zap 2023-03-14 14:35:31 +08:00
withchao 0536a5fee2 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 14:31:24 +08:00
withchao c3b109ad4a special error 2023-03-14 14:31:05 +08:00
wangchuxiao 3f74d076f2 zap 2023-03-14 14:29:34 +08:00
wangchuxiao ef94239727 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-14 14:28:31 +08:00
wangchuxiao 247c45db9d zap 2023-03-14 14:26:44 +08:00
withchao 8dd2d3054f Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-14 14:25:16 +08:00
withchao 6d03169f12 special error 2023-03-14 14:25:02 +08:00
wangchuxiao 9d80220d68 zap 2023-03-14 13:35:41 +08:00
wangchuxiao 2c08e1c361 zap 2023-03-14 13:32:35 +08:00
wangchuxiao 656206c95a zap 2023-03-14 13:26:49 +08:00
wangchuxiao 2d476021a6 zap 2023-03-14 12:36:53 +08:00
wangchuxiao b67ce3c462 zap 2023-03-14 12:33:26 +08:00
wangchuxiao 311cdbfdae zap 2023-03-14 12:21:12 +08:00
wangchuxiao 102c300f24 zap 2023-03-14 12:11:22 +08:00
wangchuxiao daffe8a7b7 zap 2023-03-14 12:07:25 +08:00
wangchuxiao 23c2d81c2c zap 2023-03-14 11:57:37 +08:00
wangchuxiao 7631629468 zap 2023-03-14 11:52:21 +08:00
wangchuxiao 351b59020d zap 2023-03-14 11:47:40 +08:00
wangchuxiao eeffefc9fc zap 2023-03-14 11:09:55 +08:00
wangchuxiao 8c931818fd connID to md5 2023-03-13 19:54:19 +08:00
wangchuxiao a018245d43 connID to md5 2023-03-13 19:47:49 +08:00
wangchuxiao 8b3ca92457 connID to md5 2023-03-13 19:41:35 +08:00
wangchuxiao 2986227f1c connID to md5 2023-03-13 19:36:19 +08:00
wangchuxiao 0b1c198dfe connID to md5 2023-03-13 18:58:45 +08:00
wangchuxiao 54a74c0b82 connID to md5 2023-03-13 18:55:00 +08:00
wangchuxiao e28e6891d4 connID to md5 2023-03-13 18:41:14 +08:00
wangchuxiao 83b7794836 connID to md5 2023-03-13 18:36:11 +08:00
wangchuxiao 4547e809bf connID to md5 2023-03-13 18:23:43 +08:00
wangchuxiao 27a1197a97 connID to md5 2023-03-13 18:08:24 +08:00
wangchuxiao bd4c6b1a97 connID to md5 2023-03-13 17:57:52 +08:00
wangchuxiao 217765be6e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 15:39:54 +08:00
wangchuxiao eb946ad181 log 2023-03-13 15:39:47 +08:00
Gordon 9a68a9645a rpc add data 2023-03-13 14:21:41 +08:00
Gordon 59b99edf79 rpc add data 2023-03-13 14:18:33 +08:00
Gordon 8867c5e14a rpc add data 2023-03-13 14:10:51 +08:00
Gordon cf29bd6227 zk add client options 2023-03-13 13:59:39 +08:00
Gordon 8a44305440 zk add client options 2023-03-13 13:52:25 +08:00
Gordon fed4dbd54f zk add client options 2023-03-13 13:31:40 +08:00
wangchuxiao 6187b15a88 log 2023-03-13 13:21:55 +08:00
wangchuxiao 4792ab7489 log 2023-03-13 13:16:53 +08:00
wangchuxiao 380ba11af0 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 13:12:00 +08:00
wangchuxiao 0fa6ff2136 log 2023-03-13 13:11:47 +08:00
Gordon 63cf4a60ae ctx error 2023-03-13 13:05:50 +08:00
Gordon e243012438 ctx error 2023-03-13 12:59:44 +08:00
Gordon 863e32898a ctx error 2023-03-13 12:51:35 +08:00
wangchuxiao 639e0c403a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 12:37:18 +08:00
wangchuxiao 9fcfdc9fab log 2023-03-13 12:34:56 +08:00
Gordon 78a30a7663 user bug fix 2023-03-13 12:15:25 +08:00
Gordon 9645d16b2d test 2023-03-13 11:42:27 +08:00
Gordon bc2ae99ba7 test 2023-03-13 11:40:16 +08:00
Gordon cddf35fb2b test 2023-03-13 11:32:32 +08:00
Gordon 6780be6d56 test 2023-03-13 11:25:52 +08:00
Gordon 53d13ee17c Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-13 10:35:14 +08:00
Gordon 3e8edce014 test 2023-03-13 10:34:42 +08:00
wangchuxiao 0b086e19a9 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 10:22:56 +08:00
Gordon d9b1bc6c41 test 2023-03-13 10:22:12 +08:00
wangchuxiao 9709271ae3 log 2023-03-13 10:21:50 +08:00
wangchuxiao 04068d25cb fix cron 2023-03-13 10:14:02 +08:00
wangchuxiao c7a8536278 fix cron 2023-03-13 10:10:50 +08:00
wangchuxiao 5feffcef42 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-13 10:04:04 +08:00
wangchuxiao d73ab781fe fix cron 2023-03-13 10:03:23 +08:00
Gordon 0b39dd9097 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-10 21:05:27 +08:00
Gordon 01a27008a1 Revert "test"
This reverts commit b61ab1201a.
2023-03-10 21:04:38 +08:00
wangchuxiao a348af74fa fix cron 2023-03-10 20:58:44 +08:00
wangchuxiao ee738e11cd fix cron 2023-03-10 20:58:24 +08:00
wangchuxiao 8ea9484255 fix cron 2023-03-10 20:55:34 +08:00
wangchuxiao 012a173629 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-10 20:46:35 +08:00
wangchuxiao e326acb578 fix cron 2023-03-10 20:46:06 +08:00
Gordon b61ab1201a test 2023-03-10 20:33:37 +08:00
Gordon ef0b9a9ebe test 2023-03-10 20:16:27 +08:00
Gordon 1e1fc188b4 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-10 20:05:26 +08:00
Gordon 768f1ce032 test 2023-03-10 20:04:53 +08:00
wangchuxiao c624880863 fix cron 2023-03-10 20:02:07 +08:00
wangchuxiao bebe89162f fix cron 2023-03-10 19:57:53 +08:00
wangchuxiao a86bb8dddf Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-10 19:53:22 +08:00
wangchuxiao fd186e9e82 fix cron 2023-03-10 19:53:08 +08:00
Gordon abc303d1b3 add log 2023-03-10 19:34:24 +08:00
wangchuxiao 7a248377f0 fix cron 2023-03-10 18:46:30 +08:00
wangchuxiao 6f09dfecd6 fix cron 2023-03-10 18:45:23 +08:00
wangchuxiao 662254f30f fix cron 2023-03-10 18:37:36 +08:00
wangchuxiao d545a7f753 fix cron 2023-03-10 16:47:22 +08:00
wangchuxiao e7de7b4b64 log 2023-03-10 15:15:07 +08:00
wangchuxiao c558bfa3ee log 2023-03-10 15:06:57 +08:00
wangchuxiao a9c093ac59 log 2023-03-10 12:20:01 +08:00
wangchuxiao 4f0813889c log 2023-03-10 11:59:50 +08:00
wangchuxiao c0afe5d24a log 2023-03-10 11:47:53 +08:00
wangchuxiao 49e7f15130 log 2023-03-10 11:44:26 +08:00
wangchuxiao f6600edea0 log 2023-03-10 11:42:06 +08:00
wangchuxiao cfefc757af log 2023-03-09 20:12:58 +08:00
wangchuxiao 549a0aceb0 log 2023-03-09 20:05:18 +08:00
wangchuxiao 745c96349d log 2023-03-09 16:49:46 +08:00
wangchuxiao 78034dc83a log 2023-03-09 16:43:42 +08:00
wangchuxiao c15edd11ad log 2023-03-09 16:40:27 +08:00
wangchuxiao 7f861fa5c3 log 2023-03-09 16:36:47 +08:00
withchao 6f3320ab55 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-09 16:18:49 +08:00
withchao aca2843224 pb path 2023-03-09 16:18:01 +08:00
Gordon 4ac827020d gateway update 2023-03-09 16:15:35 +08:00
withchao 232a1be53e protobuf 2023-03-09 16:09:38 +08:00
withchao 2cd0b34f5b Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-09 15:53:30 +08:00
wangchuxiao 7e622ae784 script 2023-03-09 15:47:51 +08:00
wangchuxiao 5447f27c80 script 2023-03-09 15:47:00 +08:00
withchao 1e24f651c8 protobuf 2023-03-09 15:41:28 +08:00
wangchuxiao 2be3c9b0ad script 2023-03-09 15:34:42 +08:00
wangchuxiao 05f4333152 script 2023-03-09 15:30:02 +08:00
wangchuxiao 4081ed2ac6 script 2023-03-09 15:26:29 +08:00
wangchuxiao acadfd2c35 script 2023-03-09 15:17:46 +08:00
wangchuxiao 955e776d3f script 2023-03-09 15:09:36 +08:00
wangchuxiao 946fba17ef script 2023-03-09 15:07:35 +08:00
wangchuxiao a957f2227b script 2023-03-09 15:00:32 +08:00
wangchuxiao ae2e09e48b script 2023-03-09 14:59:45 +08:00
wangchuxiao 82f499f942 script 2023-03-09 14:54:05 +08:00
wangchuxiao 3bcc696826 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-09 14:43:28 +08:00
wangchuxiao 10cf431ccf script 2023-03-09 14:43:09 +08:00
withchao 7776db83ea Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-09 14:42:21 +08:00
withchao 8368b670e1 protobuf 2023-03-09 14:41:57 +08:00
wangchuxiao a3aa965b37 script 2023-03-09 14:41:46 +08:00
wangchuxiao 48722ebe36 script 2023-03-09 14:34:58 +08:00
wangchuxiao f693b6f335 script 2023-03-09 14:31:41 +08:00
wangchuxiao 1f089cbbe3 script 2023-03-09 14:27:57 +08:00
wangchuxiao b828f1d3d1 script 2023-03-09 13:28:39 +08:00
wangchuxiao 0c98231fcd script 2023-03-09 13:26:58 +08:00
wangchuxiao 046d645ef6 script 2023-03-09 12:50:39 +08:00
wangchuxiao 944b1a6680 script 2023-03-09 12:48:21 +08:00
wangchuxiao 8904ebccbc script 2023-03-09 12:46:56 +08:00
wangchuxiao fae6fdc3ed script 2023-03-09 12:34:08 +08:00
wangchuxiao 889f3031bf script 2023-03-09 11:35:52 +08:00
wangchuxiao ee11636d7e script 2023-03-09 11:30:13 +08:00
wangchuxiao 471b9cbea6 script 2023-03-09 11:28:11 +08:00
wangchuxiao 90c6130bc6 script 2023-03-09 11:26:01 +08:00
wangchuxiao 3421610acb script 2023-03-09 11:20:36 +08:00
wangchuxiao 4c25686060 script 2023-03-09 11:16:01 +08:00
wangchuxiao 2bc2b4cf24 script 2023-03-09 11:10:12 +08:00
wangchuxiao 9aea3b4981 script 2023-03-09 11:08:28 +08:00
wangchuxiao 12a0ab8ae8 script 2023-03-09 10:57:55 +08:00
wangchuxiao 2ccf040fbb script 2023-03-09 10:43:49 +08:00
wangchuxiao 0aa0b257ee script 2023-03-09 10:33:54 +08:00
wangchuxiao 90974298cd script 2023-03-09 10:30:15 +08:00
wangchuxiao e10b0743dc script 2023-03-09 10:28:48 +08:00
wangchuxiao 040fd345e0 script 2023-03-08 20:02:34 +08:00
wangchuxiao 4c5210af59 script 2023-03-08 19:59:22 +08:00
wangchuxiao b9edc90349 script 2023-03-08 19:42:22 +08:00
wangchuxiao 415f1f41c7 script 2023-03-08 19:37:53 +08:00
wangchuxiao 6d4cee96c8 script 2023-03-08 19:34:36 +08:00
wangchuxiao 7789b2251a script 2023-03-08 19:28:18 +08:00
wangchuxiao c8717c88ea script 2023-03-08 19:26:17 +08:00
wangchuxiao d3b711e91b script 2023-03-08 19:25:27 +08:00
Gordon 7f3ee77116 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	cmd/msggateway/main.go
#	go.sum
#	internal/msggateway/init.go
2023-03-08 18:42:25 +08:00
Gordon 52e03b0149 gateway update 2023-03-08 18:39:18 +08:00
wangchuxiao 540c33ba74 script 2023-03-08 18:38:35 +08:00
wangchuxiao 74ba5ba614 script 2023-03-08 18:30:20 +08:00
wangchuxiao 1043142970 cobra 2023-03-08 18:19:56 +08:00
wangchuxiao 4c4a8341c4 cobra 2023-03-08 17:50:43 +08:00
wangchuxiao 4beb348333 cobra 2023-03-08 17:48:14 +08:00
wangchuxiao a87a8c1fb3 cobra 2023-03-08 17:29:27 +08:00
wangchuxiao 9ce50095b5 cobra 2023-03-08 17:29:03 +08:00
wangchuxiao 345bf3a882 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-08 16:35:40 +08:00
wangchuxiao ca1cdbdeb7 cobra 2023-03-08 16:35:18 +08:00
withchao 5813d13fe4 pb package name add OpenIMServer 2023-03-08 16:10:43 +08:00
wangchuxiao ff6a503f53 cobra 2023-03-08 14:21:06 +08:00
wangchuxiao f8ad35a6f7 cobra 2023-03-08 13:34:12 +08:00
wangchuxiao 107f4c950b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-08 11:46:03 +08:00
wangchuxiao e55167d0bf test cobra 2023-03-08 11:45:54 +08:00
withchao 5df6847f7d version 2023-03-08 11:42:15 +08:00
withchao c63f7c9e48 utils todo 2023-03-08 11:24:51 +08:00
wangchuxiao 60876e865b test cobra 2023-03-08 10:51:45 +08:00
wangchuxiao 30e9b44054 test cobra 2023-03-07 20:41:09 +08:00
wangchuxiao f0943276cb test cobra 2023-03-07 20:39:07 +08:00
wangchuxiao 5dfda23ded test cobra 2023-03-07 20:36:30 +08:00
wangchuxiao e7f6f0f93e test cobra 2023-03-07 20:32:57 +08:00
wangchuxiao 2c91185102 test cobra 2023-03-07 20:31:40 +08:00
wangchuxiao c1746fb32e test cobra 2023-03-07 20:12:36 +08:00
wangchuxiao 380bf1cc8c test cobra 2023-03-07 20:07:44 +08:00
wangchuxiao 320c978e94 test cobra 2023-03-07 20:07:13 +08:00
wangchuxiao f5309ee3b8 test cobra 2023-03-07 19:56:22 +08:00
wangchuxiao 6bb8160a99 test cobra 2023-03-07 18:32:20 +08:00
wangchuxiao 6eb13df2e2 test cobra 2023-03-07 18:06:57 +08:00
wangchuxiao 13132efc6c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	cmd/cmdutils/main.go
2023-03-07 18:02:57 +08:00
wangchuxiao 32af58e861 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	cmd/cmdutils/main.go
2023-03-07 18:01:36 +08:00
wangchuxiao ea614167a6 test cobra 2023-03-07 17:59:34 +08:00
withchao d80cf34f26 rpc mw 2023-03-07 17:21:48 +08:00
withchao 37d04c9fa0 rpc mw 2023-03-07 16:57:59 +08:00
withchao 102ab98276 rpc mw 2023-03-07 16:57:49 +08:00
withchao 555fc52acc Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-07 12:19:38 +08:00
withchao 4c5613084c error 2023-03-07 12:19:30 +08:00
wangchuxiao d6704aed80 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-07 12:12:34 +08:00
wangchuxiao 52d8ec6aee test cobra 2023-03-07 12:12:16 +08:00
withchao 3fe9ee22fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-07 11:12:53 +08:00
withchao 1513933922 error 2023-03-07 11:12:39 +08:00
wangchuxiao 6ad93962aa test cobra 2023-03-06 18:52:49 +08:00
wangchuxiao 373b317b1a test cobra 2023-03-06 18:47:48 +08:00
wangchuxiao 757fd4bf0b test cobra 2023-03-06 18:41:59 +08:00
wangchuxiao 5a77f91fa0 test cobra 2023-03-06 18:35:17 +08:00
wangchuxiao 757a668047 test cobra 2023-03-06 18:29:44 +08:00
wangchuxiao 427376977c test cobra 2023-03-06 18:28:34 +08:00
wangchuxiao 5604ec9902 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-06 18:26:36 +08:00
wangchuxiao 6ca1d403b2 test cobra 2023-03-06 18:26:23 +08:00
withchao 5ca36ebc10 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-06 17:43:48 +08:00
withchao 3ea0d1f765 s3 complete 2023-03-06 16:40:57 +08:00
wangchuxiao 94b0d55516 makefile 2023-03-06 16:31:46 +08:00
wangchuxiao b26f115e67 makefile 2023-03-06 16:28:42 +08:00
wangchuxiao 5b175377ee makefile 2023-03-06 16:26:40 +08:00
wangchuxiao 9575ba74e8 makefile 2023-03-06 16:25:00 +08:00
wangchuxiao 23c24308f7 makefile 2023-03-06 16:23:16 +08:00
wangchuxiao 8143d589aa makefile 2023-03-06 16:00:23 +08:00
wangchuxiao bfb67ed6b7 makefile 2023-03-06 15:03:29 +08:00
wangchuxiao 8ae9c2a278 test name 2023-03-06 14:25:49 +08:00
wangchuxiao a2674bfe9f modify dictory 2023-03-06 12:09:42 +08:00
wangchuxiao 612fe2173e modify dictory 2023-03-06 12:07:25 +08:00
wangchuxiao a6562e5a0e modify dictory 2023-03-06 12:06:50 +08:00
wangchuxiao 77b2d4aad0 modify dictory 2023-03-06 12:04:44 +08:00
wangchuxiao97@outlook.com 120477c092 pb generate 2023-03-06 11:56:17 +08:00
wangchuxiao 8f0e6149be modify dictory 2023-03-06 11:55:21 +08:00
wangchuxiao 7342d2ebd0 modify dictory 2023-03-06 11:55:13 +08:00
wangchuxiao 65cd769645 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-06 11:24:27 +08:00
wangchuxiao 15ff930661 modify dictory 2023-03-06 11:24:13 +08:00
wangchuxiao df6eb2e6f1 modify dictory 2023-03-06 11:09:56 +08:00
wangchuxiao 9b830eb559 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-06 11:01:09 +08:00
wangchuxiao 9945a2f8dc modify dictory 2023-03-06 10:58:15 +08:00
withchao 56306f33d7 validator 2023-03-06 10:39:02 +08:00
wangchuxiao 79f7e17759 proto modify 2023-03-06 10:24:18 +08:00
wangchuxiao e07c9077ca proto modify 2023-03-06 10:17:55 +08:00
wangchuxiao a862fa3960 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-03 19:59:33 +08:00
wangchuxiao 0ed07dfa2a proto modify 2023-03-03 19:59:10 +08:00
withchao db89a13f65 solve error 2023-03-03 19:51:03 +08:00
wangchuxiao 080dfa5563 proto modify 2023-03-03 19:45:15 +08:00
wangchuxiao 2ca3f4673b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-03 19:44:49 +08:00
wangchuxiao de6fbf82e2 proto modify 2023-03-03 19:44:34 +08:00
withchao b2ea5036db solve error 2023-03-03 19:05:57 +08:00
withchao a743a2cfd2 solve error 2023-03-03 19:02:09 +08:00
withchao cdb8197156 Merge remote-tracking branch 'origin/errcode' into errcode 2023-03-03 18:59:43 +08:00
withchao b74e6b52f3 solve error 2023-03-03 18:59:28 +08:00
wangchuxiao 3a93f60555 proto modify 2023-03-03 18:55:51 +08:00
wangchuxiao ebe689324b Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-03-03 18:44:27 +08:00
wangchuxiao 3a23153e48 proto modify 2023-03-03 18:44:14 +08:00
withchao ebd1de919d Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/api/auth.go
2023-03-03 18:43:54 +08:00
withchao 4deedb6856 api to rpc 2023-03-03 18:42:33 +08:00
withchao 5e845c8fb6 api to rpc 2023-03-03 18:14:48 +08:00
wangchuxiao d06235d28e proto modify 2023-03-03 18:08:26 +08:00
wangchuxiao f177715ada Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api/auth.go
	internal/api/route.go
	internal/api/user.go
	internal/rpc/third/third.go
2023-03-03 17:45:15 +08:00
wangchuxiao 96d9b25b57 proto modify 2023-03-03 17:42:26 +08:00
withchao e93425c574 api rpc third 2023-03-03 17:20:36 +08:00
withchao 6150419842 api 2023-03-02 14:41:59 +08:00
wangchuxiao97@outlook.com 7050b64b19 pb 2023-03-02 12:12:54 +08:00
wangchuxiao 9c59b4d21d proto modify 2023-03-02 12:10:52 +08:00
wangchuxiao 90fc925360 proto modify 2023-03-02 12:10:30 +08:00
wangchuxiao bff7d0923a proto modify 2023-03-02 12:07:32 +08:00
wangchuxiao d991947d4c proto modify 2023-03-02 12:00:31 +08:00
wangchuxiao fc009c7c6c proto modify 2023-03-01 15:36:04 +08:00
wangchuxiao 8d0148c4ba proto modify 2023-03-01 15:32:26 +08:00
root 9ecd43af73 proto modify 2023-02-28 17:17:21 +08:00
wangchuxiao 82c3f871f4 proto 2023-02-28 17:14:44 +08:00
wangchuxiao 84904b7eca proto 2023-02-28 17:13:56 +08:00
wangchuxiao acfdb90b6e pb 2023-02-28 16:05:33 +08:00
wangchuxiao 0c417d3471 pb 2023-02-28 15:53:38 +08:00
wangchuxiao c2cfb32c45 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
2023-02-28 15:48:42 +08:00
wangchuxiao ab6fa41438 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
2023-02-28 15:47:42 +08:00
wangchuxiao 2edb3cfd8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
2023-02-28 15:28:04 +08:00
wangchuxiao 4ac9943565 conf 2023-02-28 15:20:57 +08:00
withchao 886818e54c api pack move 2023-02-28 14:20:26 +08:00
withchao 1538917089 api 2023-02-28 11:38:05 +08:00
withchao e30e391756 gen group pb json no omitempty 2023-02-27 18:47:11 +08:00
withchao cae6c53b01 api resp 2023-02-27 18:21:41 +08:00
withchao 4cf29ad565 group api 2023-02-27 18:11:00 +08:00
withchao 586a113994 apitorpc group 2023-02-27 15:13:39 +08:00
withchao 0411a5045b api to rpc 2023-02-27 14:44:14 +08:00
withchao 03ccd0131a api2rpc 2023-02-27 10:27:35 +08:00
withchao e513a09e45 api2rpc 2023-02-27 10:14:19 +08:00
withchao 08fdac83fc api2rpc 2023-02-27 09:53:17 +08:00
withchao 0547f25ecb Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/config/config.go
2023-02-24 19:17:06 +08:00
withchao c019dd5f1e api2rpc 2023-02-24 19:16:26 +08:00
wangchuxiao 4c426c7c7c config modify 2023-02-24 17:42:01 +08:00
withchao d7640ca864 api2rpc 2023-02-24 15:41:50 +08:00
withchao ae8478dc5e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/msg/delete.go
#	internal/rpc/msg/send_pull.go
#	pkg/common/db/cache/msg.go
#	pkg/common/db/cache/redis.go
#	pkg/common/db/cache/redis_test.go
2023-02-24 13:55:53 +08:00
wangchuxiao cfe6aff3ac config path 2023-02-24 11:51:07 +08:00
wangchuxiao ffaf0bd021 config path 2023-02-24 11:37:40 +08:00
wangchuxiao 2a0ad5c7af config path 2023-02-24 11:15:40 +08:00
wangchuxiao 92764b3727 config path 2023-02-24 11:13:16 +08:00
wangchuxiao 66aaa9b152 config path 2023-02-24 11:06:49 +08:00
wangchuxiao bb94a7947c config path 2023-02-24 11:01:33 +08:00
wangchuxiao dd7a7d9cda config path 2023-02-24 10:47:36 +08:00
wangchuxiao 3106f671af config path 2023-02-24 10:41:34 +08:00
wangchuxiao e103644929 config path 2023-02-23 19:57:37 +08:00
wangchuxiao 1e43ad2fc0 config path 2023-02-23 19:55:38 +08:00
wangchuxiao 7930c230e4 config path 2023-02-23 19:51:58 +08:00
wangchuxiao 50664c2486 config path 2023-02-23 19:45:44 +08:00
wangchuxiao c74841fd96 config path 2023-02-23 19:44:43 +08:00
wangchuxiao 9f8833baa1 config path 2023-02-23 19:44:22 +08:00
wangchuxiao b41a0a66ef config path 2023-02-23 19:42:13 +08:00
wangchuxiao a26ca657fe config path 2023-02-23 19:41:44 +08:00
wangchuxiao 8bdf86172f push 2023-02-23 19:20:58 +08:00
wangchuxiao 76565cded1 push 2023-02-23 19:19:01 +08:00
wangchuxiao be11da75ae Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/msg/delete.go
#	pkg/common/db/controller/msg.go
#	pkg/common/db/table/unrelation/extend_msg_set.go
2023-02-23 19:17:23 +08:00
wangchuxiao f586ab1ac2 push 2023-02-23 19:15:30 +08:00
withchao fa8ca69a9e msg database 2023-02-23 18:48:41 +08:00
withchao c8004279a4 msg database 2023-02-23 18:48:14 +08:00
withchao 2f1c064413 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/msgtransfer/online_msg_to_mongo_handler.go
#	internal/push/init.go
#	pkg/common/db/cache/redis.go
#	pkg/common/db/controller/msg.go
2023-02-23 18:42:56 +08:00
wangchuxiao 9c76722c90 push 2023-02-23 18:20:45 +08:00
withchao 2af2716c2c msg database 2023-02-23 18:17:17 +08:00
wangchuxiao 4fc00109ef push 2023-02-23 17:28:57 +08:00
withchao 2359d7ab37 msg database 2023-02-23 11:57:54 +08:00
withchao eac2619c33 msg 2023-02-23 11:26:46 +08:00
withchao b4443c843a GetSuperGroupOpenNotDisturbUserID -> GetRecvMsgNotNotifyUserIDs 2023-02-23 11:04:51 +08:00
wangchuxiao dae0c25a57 push 2023-02-23 10:51:07 +08:00
wangchuxiao 432627353c push 2023-02-23 10:47:50 +08:00
withchao 22c372a9d0 GetSuperGroupOpenNotDisturbUserID 2023-02-23 10:45:13 +08:00
Gordon d54cab5d03 gateway update 2023-02-22 21:06:55 +08:00
skiffer-git d56fef0a88 Error code standardization 2023-02-22 20:33:19 +08:00
wangchuxiao e1a27e6aea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	cmd/api/main.go
	go.mod
	internal/push/fcm/push.go
	internal/push/getui/push.go
	internal/push/logic/init.go
	internal/push/logic/push_to_client.go
	internal/push/push_rpc_server.go
	internal/rpc/conversation/conversaion.go
	pkg/common/db/controller/group.go
	pkg/proto/push/push.pb.go
2023-02-22 19:52:53 +08:00
wangchuxiao 94d50a6c71 push 2023-02-22 19:51:14 +08:00
withchao 1d6e2ac000 callback 2023-02-22 18:43:40 +08:00
withchao f3e37650c6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-22 14:38:27 +08:00
withchao 3bae8edb39 conversation 2023-02-22 14:31:30 +08:00
skiffer-git 28fb738410 Error code standardization 2023-02-22 12:17:59 +08:00
withchao cd00d91eee group db 2023-02-22 11:35:24 +08:00
withchao e94bf6216c utils 2023-02-22 11:20:09 +08:00
skiffer-git 62a2cf2976 Error code standardization 2023-02-22 10:52:51 +08:00
withchao f9e09d67bb utils 2023-02-21 19:20:09 +08:00
withchao a1e66e9da0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-21 19:16:57 +08:00
skiffer-git 5751062605 Error code standardization 2023-02-21 16:48:10 +08:00
withchao edc09af93f utils 2023-02-21 16:22:22 +08:00
skiffer-git ae40c8c8c0 Error code standardization 2023-02-21 14:38:01 +08:00
skiffer-git 9e4b59034d Error code standardization 2023-02-21 14:30:08 +08:00
skiffer-git 7e9b8f6808 Error code standardization 2023-02-21 13:18:01 +08:00
skiffer-git 6201e5c206 Error code standardization 2023-02-21 13:14:19 +08:00
skiffer-git be1bf240ad Error code standardization 2023-02-21 12:59:44 +08:00
skiffer-git e27d66cd2e Error code standardization 2023-02-21 10:29:09 +08:00
withchao f5fbe1d852 gorm conn 2023-02-21 10:16:58 +08:00
withchao 5bb42593ba Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 17:44:28 +08:00
withchao 762c49625c group db tx 2023-02-20 17:43:09 +08:00
skiffer-git 9b0682705e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 17:13:37 +08:00
skiffer-git 7338b633c8 Error code standardization 2023-02-20 17:13:15 +08:00
Gordon 141cfef1b6 conversation update 2023-02-20 16:42:52 +08:00
wangchuxiao 2b38381296 fix mongoDB bug 2023-02-20 15:03:40 +08:00
skiffer-git c318c62542 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-20 11:45:29 +08:00
skiffer-git d9359817c1 Error code standardization 2023-02-20 11:45:11 +08:00
withchao 6ef8228064 group build pass 2023-02-20 10:49:39 +08:00
wangchuxiao 5be441f4fd errcode 2023-02-20 10:13:29 +08:00
withchao da9f4bb78e rpc 2023-02-20 10:10:02 +08:00
root f0a0e0ade6 pb proto 2023-02-16 17:30:15 +08:00
withchao 98769fefae grammar 2023-02-16 17:25:28 +08:00
withchao 5e6f9448bc gorm db 2023-02-16 17:20:08 +08:00
withchao ff542e83fe Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-16 17:11:00 +08:00
withchao 20ba4e33e8 db 2023-02-16 17:08:24 +08:00
Gordon 1f7d2d73c7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-16 16:33:04 +08:00
Gordon ffdc7b8f9d msggateway refactor 2023-02-16 16:32:31 +08:00
withchao fe2cf94d36 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-16 16:20:02 +08:00
withchao 4683712e05 object storage 2023-02-16 16:19:53 +08:00
wenxu12345 dc33071478 Error code standardization 2023-02-16 15:41:37 +08:00
wangchuxiao b6d19dba00 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-16 15:21:08 +08:00
wangchuxiao 29a1f5b4f7 errcode 2023-02-16 15:20:59 +08:00
Gordon 1ff8ba7fc2 message update 2023-02-15 19:57:16 +08:00
withchao f517e63fca Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-15 17:01:10 +08:00
withchao bedb9e117b code error 2023-02-15 17:00:55 +08:00
wangchuxiao 0d0a90a14b errcode 2023-02-15 17:00:43 +08:00
wangchuxiao 52a0a8aca4 errcode 2023-02-15 16:09:00 +08:00
wangchuxiao 3cc8e6a0a0 errcode 2023-02-15 16:06:12 +08:00
wangchuxiao b2cdf4279d errcode 2023-02-15 16:05:54 +08:00
wangchuxiao 1b3eaed0e5 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	cmd/rpc/auth/main.go
	cmd/rpc/friend/main.go
	cmd/rpc/group/main.go
	cmd/rpc/msg/main.go
	cmd/rpc/user/main.go
	internal/rpc/auth/auth.go
	internal/rpc/conversation/conversaion.go
	internal/rpc/friend/friend.go
	internal/rpc/group/callback.go
	internal/rpc/group/group.go
	internal/rpc/msg/pull_message.go
	internal/rpc/msg/query_msg.go
	internal/rpc/msg/rpc_chat.go
	internal/rpc/msg/send_msg.go
	internal/rpc/user/user.go
	pkg/common/db/cache/redis.go
	pkg/common/db/controller/msg.go
	pkg/common/http/http_client.go
2023-02-15 16:03:31 +08:00
wangchuxiao 6619183a48 errcode 2023-02-15 15:52:32 +08:00
withchao ed466387e4 callback 2023-02-15 15:50:52 +08:00
skiffer-git c93aa15473 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 22:04:29 +08:00
skiffer-git 5baf05ba5e Error code standardization 2023-02-14 22:04:03 +08:00
Gordon 83950263ad Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 21:08:55 +08:00
Gordon 71f1fcee57 msggateway refactor 2023-02-14 21:08:36 +08:00
skiffer-git 64caafd6b6 Error code standardization 2023-02-14 20:01:44 +08:00
skiffer-git e070a602f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 19:34:39 +08:00
skiffer-git dea9a4c8fa Error code standardization 2023-02-14 19:34:19 +08:00
withchao 0f776fb2f3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 19:29:15 +08:00
withchao e147dc5b1b callback start 2023-02-14 19:28:57 +08:00
skiffer-git c63b543a4a Error code standardization 2023-02-14 17:20:39 +08:00
withchao e83a070e81 group 2023-02-14 16:37:10 +08:00
withchao d4b125d010 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-02-14 16:36:08 +08:00
withchao bba819854c group 2023-02-14 16:33:18 +08:00
skiffer-git f40ae89c8c Error code standardization 2023-02-14 16:21:25 +08:00
skiffer-git 12eba46dab Error code standardization 2023-02-14 16:07:35 +08:00
withchao 446ac63898 callback 2023-02-14 15:20:02 +08:00
withchao 7c00d0f621 Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode 2023-02-14 15:18:22 +08:00
skiffer-git 8f30818328 Error code standardization 2023-02-14 15:17:56 +08:00
withchao 5d66ff951c Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 15:07:24 +08:00
withchao 1ae1f77a14 msg cb 2023-02-14 15:02:45 +08:00
skiffer-git c237510080 Error code standardization 2023-02-14 12:10:15 +08:00
skiffer-git 9eb0ee55f3 Error code standardization 2023-02-14 12:06:58 +08:00
skiffer-git 731112e61b Error code standardization 2023-02-14 11:55:50 +08:00
skiffer-git 461fd5f1ff Error code standardization 2023-02-14 11:49:42 +08:00
withchao 8435508f35 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 11:47:39 +08:00
skiffer-git 20829cdd28 Error code standardization 2023-02-14 11:41:04 +08:00
withchao 4d8e19c6bb Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 11:40:41 +08:00
withchao f5c4e755eb rpc start 2023-02-14 11:37:19 +08:00
skiffer-git 05d00a8174 Error code standardization 2023-02-14 11:33:10 +08:00
skiffer-git b7d724a5e4 Error code standardization 2023-02-14 10:57:52 +08:00
skiffer-git 42c0e014e7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-14 10:34:55 +08:00
skiffer-git e1b6e054f0 Error code standardization 2023-02-14 10:34:34 +08:00
withchao a61a3253a5 group rpc GetGroupMemberRoleLevel 2023-02-14 10:33:15 +08:00
skiffer-git c5f1c940d8 Error code standardization 2023-02-14 09:05:38 +08:00
skiffer-git b7645ffda6 Error code standardization 2023-02-13 21:45:45 +08:00
skiffer-git b27aa040f7 Error code standardization 2023-02-13 21:36:08 +08:00
skiffer-git 4cb7a286b9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-13 20:58:22 +08:00
skiffer-git 1ed62aad97 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/common/notification/conversation.go
#	internal/rpc/msg/send_msg.go
2023-02-13 20:57:44 +08:00
withchao b4f967ea97 check.go 2023-02-13 19:31:17 +08:00
skiffer-git d87cc24f9e Error code standardization 2023-02-13 18:44:53 +08:00
withchao d7ea41fa1a msg rpc 2023-02-13 18:14:26 +08:00
skiffer-git a9dec0c832 Error code standardization 2023-02-13 17:48:01 +08:00
withchao 048d4b83e1 rpc start 2023-02-13 17:44:22 +08:00
withchao f3d43f8578 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-13 16:36:16 +08:00
withchao 884d28b9a8 msg send pull 2023-02-13 16:36:05 +08:00
skiffer-git 8fd81edc44 Error code standardization 2023-02-13 16:18:38 +08:00
skiffer-git 7414c20dd2 Error code standardization 2023-02-13 16:17:52 +08:00
skiffer-git b607cc806a Error code standardization 2023-02-13 16:16:47 +08:00
skiffer-git d2309aab32 Error code standardization 2023-02-13 16:15:16 +08:00
skiffer-git 6b47c471f7 Error code standardization 2023-02-13 15:52:41 +08:00
withchao 03a7048d31 msg del 2023-02-13 11:24:45 +08:00
withchao 991a4d1d95 msg del 2023-02-13 11:24:13 +08:00
withchao bf5a5bffa0 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/msg/query_msg.go
2023-02-13 10:41:06 +08:00
withchao 52e393dc45 msg status 2023-02-13 10:33:54 +08:00
skiffer-git ac1032800f Error code standardization 2023-02-13 10:03:16 +08:00
skiffer-git 217d6380f7 Error code standardization 2023-02-13 09:19:56 +08:00
skiffer-git ec7f44358c Error code standardization 2023-02-13 09:14:50 +08:00
skiffer-git 452d9840bf Error code standardization 2023-02-10 22:10:37 +08:00
skiffer-git adc84b68e7 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/common/notification/conversation_notification.go
#	internal/common/notification/work_moments_notification.go
#	internal/rpc/conversation/conversaion.go
#	internal/rpc/group/callback.go
#	internal/rpc/group/group.go
#	internal/rpc/office/office.go
2023-02-10 21:05:49 +08:00
skiffer-git cba70e3196 Error code standardization 2023-02-10 21:04:22 +08:00
Gordon 0f5cfbb2dc Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 20:58:54 +08:00
Gordon a3593379f6 conversation update 2023-02-10 20:57:45 +08:00
wangchuxiao 85ebf24325 errcode 2023-02-10 19:45:24 +08:00
withchao dbf41bf21f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/callback.go
2023-02-10 19:18:29 +08:00
withchao 09c6fbdfe4 group 2023-02-10 19:17:33 +08:00
wangchuxiao 00e43cc955 errcode 2023-02-10 18:19:40 +08:00
wangchuxiao b7107edc71 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 18:14:19 +08:00
wangchuxiao a92dd54354 errcode 2023-02-10 18:13:58 +08:00
wangchuxiao 2e3bb941b0 errcode 2023-02-10 17:02:20 +08:00
skiffer-git f985689a39 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 16:19:35 +08:00
skiffer-git 7e1b69cc3c Error code standardization 2023-02-10 16:18:26 +08:00
wangchuxiao 4aaac8595a Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
2023-02-10 15:47:02 +08:00
wangchuxiao 0e97285e0a errcode 2023-02-10 15:46:29 +08:00
withchao 4b3d965783 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-10 15:43:05 +08:00
withchao 1e1c6de56e group nickname 2023-02-10 15:36:25 +08:00
skiffer-git aff1c1f35e Error code standardization 2023-02-10 12:53:46 +08:00
wangchuxiao 79c30fdc69 errcode 2023-02-10 11:03:03 +08:00
withchao 5d7809624c group cache 2023-02-10 10:48:49 +08:00
wangchuxiao 6eb231aae4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go
	pkg/proto/group/group.proto
2023-02-09 20:39:12 +08:00
wangchuxiao 759432794f errcode 2023-02-09 20:36:34 +08:00
withchao a15051bfde Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 19:42:16 +08:00
withchao d6d6afb788 group update batch 2023-02-09 19:40:45 +08:00
skiffer-git 0198a628da Error code standardization 2023-02-09 18:05:19 +08:00
skiffer-git bfc202f31f Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 17:57:02 +08:00
skiffer-git d26daa23f1 Error code standardization 2023-02-09 17:55:59 +08:00
withchao 5da1195274 group cache 2023-02-09 17:54:31 +08:00
withchao 29b05499df group rpc 2023-02-09 16:35:15 +08:00
withchao ab30c77836 group db 2023-02-09 16:33:40 +08:00
withchao fc2d07212d Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 16:28:58 +08:00
wangchuxiao 8a1702fcf7 errcode 2023-02-09 16:15:18 +08:00
wangchuxiao ccc7e6b3c8 errcode 2023-02-09 16:11:18 +08:00
withchao eecf8bb8ae api to rpc use generic paradigm 2023-02-09 15:38:50 +08:00
wangchuxiao 1075754458 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api/group/group.go
	internal/api/group/super_group.go
	pkg/common/db/controller/user.go
2023-02-09 14:49:17 +08:00
wangchuxiao 414915eb3b errcode 2023-02-09 14:40:49 +08:00
withchao 2f7b65730a api to rpc use generic paradigm 2023-02-09 14:39:58 +08:00
withchao b422b49c06 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 14:33:45 +08:00
withchao 00d64119fa api to rpc use generic paradigm 2023-02-09 14:33:35 +08:00
skiffer-git d46970f519 Error code standardization 2023-02-09 13:43:50 +08:00
skiffer-git 099bbbb5d3 Error code standardization 2023-02-09 13:36:37 +08:00
skiffer-git 772a46e041 Error code standardization 2023-02-09 13:06:22 +08:00
skiffer-git 22f4d8f66d Error code standardization 2023-02-09 13:05:12 +08:00
skiffer-git 96ef753c77 Error code standardization 2023-02-09 13:02:10 +08:00
skiffer-git ca6b704377 Error code standardization 2023-02-09 12:52:47 +08:00
skiffer-git ddb4e1e6ea Error code standardization 2023-02-09 12:21:58 +08:00
skiffer-git 8975f62433 Error code standardization 2023-02-09 11:35:46 +08:00
skiffer-git e2d61b3eb6 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 11:30:42 +08:00
skiffer-git 15cfe949bc Error code standardization 2023-02-09 11:30:31 +08:00
wangchuxiao 8c6c7ee21f errcode 2023-02-09 11:25:19 +08:00
wangchuxiao 90e82ec2ef Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-09 11:19:21 +08:00
wangchuxiao 285ca8aff3 errcode 2023-02-09 11:19:06 +08:00
skiffer-git a016a48f9e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 11:18:46 +08:00
skiffer-git b4ddf198bd Error code standardization 2023-02-09 11:18:31 +08:00
wangchuxiao 42adc7bccc Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-09 11:17:46 +08:00
wangchuxiao 956df9b376 errcode 2023-02-09 11:17:24 +08:00
wangchuxiao 7b5560db69 errcode 2023-02-09 11:14:14 +08:00
skiffer-git 26905e4cdb Error code standardization 2023-02-09 11:01:16 +08:00
skiffer-git ac284b696a Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	go.mod
#	pkg/common/db/controller/user.go
2023-02-09 10:59:32 +08:00
skiffer-git 9a7ed2d24d Error code standardization 2023-02-09 10:58:30 +08:00
wangchuxiao 62f0d1043d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/cache/conversation.go
	pkg/common/db/cache/group.go
	pkg/common/db/controller/group.go
2023-02-09 10:57:57 +08:00
wangchuxiao 4826810c2a errcode 2023-02-09 10:55:21 +08:00
withchao 41d62937ff group rpc 2023-02-09 10:27:55 +08:00
withchao ba264e557b group pb 2023-02-09 10:03:41 +08:00
withchao f20e9e71b7 group complete 2023-02-08 20:08:22 +08:00
withchao b3ae69ce94 conversation.go 2023-02-08 19:18:11 +08:00
withchao ec43f2847e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-08 18:30:49 +08:00
withchao 324a0ae0ae super group rpc 2023-02-08 18:30:45 +08:00
wangchuxiao db51bc87e2 errcode 2023-02-08 18:29:11 +08:00
wangchuxiao 6d700765d2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-08 17:56:21 +08:00
wangchuxiao 2193d380ca errcode 2023-02-08 17:56:04 +08:00
withchao f5adb7a17e group database 2023-02-08 17:23:14 +08:00
withchao 3423b224fd group db 2023-02-08 15:25:25 +08:00
withchao 77edbe1edd group controller 2023-02-08 14:41:09 +08:00
skiffer-git dad31652ad Error code standardization 2023-02-07 20:39:12 +08:00
skiffer-git bf5fbe8d6f Error code standardization 2023-02-07 20:33:56 +08:00
skiffer-git 0565474732 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	go.mod
#	go.sum
2023-02-07 20:30:55 +08:00
skiffer-git 0a2e55311c Error code standardization 2023-02-07 20:28:34 +08:00
wangchuxiao 4a32e98e62 errcode 2023-02-07 20:24:20 +08:00
wangchuxiao 84c59cecfb errcode 2023-02-07 18:46:19 +08:00
wangchuxiao 8fc54a7379 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/cache/conversation.go
2023-02-07 18:45:54 +08:00
wangchuxiao f4baf847ca errcode 2023-02-07 18:43:43 +08:00
withchao 66b6d5fc2f group db 2023-02-07 18:36:47 +08:00
withchao cfa5420d9d group func name 2023-02-07 17:16:04 +08:00
withchao 1716de808f realization group rpc 2023-02-07 16:31:12 +08:00
withchao 26794503c3 realization group rpc 2023-02-07 15:48:18 +08:00
withchao 4645eec8b6 realization group rpc 2023-02-07 15:11:31 +08:00
withchao 0443b517fb group group.pb.go 2023-02-07 10:27:59 +08:00
withchao 90aa699d5f group proto 2023-02-07 10:17:28 +08:00
withchao 4f96cc9b1b group rpc 2023-02-06 18:33:33 +08:00
withchao 7d3b203d03 rpc QuitGroup 2023-02-06 15:53:08 +08:00
withchao ca1dde558b rpc JoinGroup 2023-02-06 15:45:25 +08:00
withchao 210d04d488 rpc GroupApplicationResponse 2023-02-06 15:32:20 +08:00
withchao 49983b8c83 1 2023-02-06 12:26:14 +08:00
withchao 1b09353991 1 2023-02-06 12:14:12 +08:00
withchao 8c30bde86e 1 2023-02-06 11:55:10 +08:00
withchao 32d99595fb 1 2023-02-06 11:53:19 +08:00
withchao b801cde5c4 1 2023-02-03 18:26:51 +08:00
withchao 3d8902c670 1 2023-02-03 18:11:51 +08:00
withchao d91039c99d Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 18:10:57 +08:00
withchao 516285952d 1 2023-02-03 18:10:49 +08:00
withchao bec4a89f7b 1 2023-02-03 17:27:56 +08:00
skiffer-git d59c4367fb Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:51:57 +08:00
skiffer-git 22c63ecdbd Error code standardization 2023-02-03 16:51:35 +08:00
Gordon 99504eec2e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
2023-02-03 16:23:47 +08:00
Gordon 830ebdd472 conversation update 2023-02-03 16:22:59 +08:00
skiffer-git 795a90a194 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 16:12:07 +08:00
skiffer-git 1aa3ac9399 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/controller/friend.go
#	pkg/common/db/relation/friend_model_k.go
#	pkg/common/db/relation/friend_request_model.go
2023-02-03 16:11:29 +08:00
withchao a2c4bccdb6 1 2023-02-03 16:10:51 +08:00
skiffer-git 3320f81c8f Error code standardization 2023-02-03 16:10:33 +08:00
withchao 64dee9f989 1 2023-02-03 16:10:07 +08:00
Gordon 3b4c227519 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
2023-02-03 15:54:23 +08:00
withchao f98d894a4b 1 2023-02-03 14:36:38 +08:00
withchao 4d4a451926 1 2023-02-03 14:26:54 +08:00
withchao adfcfac711 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/relation.go
2023-02-03 14:24:57 +08:00
withchao 8e49d7e567 1 2023-02-03 14:23:29 +08:00
wangchuxiao 2243e8194d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-03 12:17:04 +08:00
wangchuxiao b637a29348 errcode 2023-02-03 12:16:48 +08:00
withchao d5a9647902 1 2023-02-03 11:50:23 +08:00
Gordon 77156014a1 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-03 11:00:28 +08:00
Gordon e167d80469 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/cache/conversation.go
#	pkg/common/db/relation/conversation_model.go
2023-02-03 10:26:26 +08:00
skiffer-git ff88f5d54a Update README.md 2023-02-03 09:55:51 +08:00
Gordon 730be9db47 conversation update 2023-02-02 19:47:21 +08:00
wangchuxiao 01f7262d3a errcode 2023-02-02 19:43:51 +08:00
wangchuxiao 83eba5a9ea Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 19:41:11 +08:00
wangchuxiao 47b725ac69 errcode 2023-02-02 19:40:54 +08:00
withchao dec0c8cc47 1 2023-02-02 18:45:43 +08:00
withchao b7f0e2e6f3 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 17:54:21 +08:00
withchao e8a24ab59e 1 2023-02-02 17:54:02 +08:00
skiffer-git 0e5f3dacd6 Update config.yaml 2023-02-02 17:51:59 +08:00
withchao 778e3e5cd2 1 2023-02-02 17:49:19 +08:00
skiffer-git 082a3b7e65 Update config.yaml 2023-02-02 17:34:11 +08:00
skiffer-git 348cb921eb Update config.yaml 2023-02-02 17:25:09 +08:00
skiffer-git e175ef2b4e Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 16:39:45 +08:00
skiffer-git 5402d33519 Error code standardization 2023-02-02 16:39:29 +08:00
wangchuxiao 174c3e5fae Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-02-02 16:11:33 +08:00
wangchuxiao f6cc91d7db errcode 2023-02-02 16:11:24 +08:00
withchao 94b0e60e83 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 16:08:19 +08:00
withchao 0eb77e9b35 1 2023-02-02 16:08:08 +08:00
withchao c3f6a0fa15 1 2023-02-02 15:42:14 +08:00
Gordon eb810f8dca Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 12:06:55 +08:00
Gordon 645b8dc0a9 pb file 2023-02-02 12:06:36 +08:00
Gordon a9151868b0 pb file 2023-02-02 12:06:25 +08:00
withchao c1af64854c 1 2023-02-02 12:00:18 +08:00
withchao dab552aed4 1 2023-02-02 11:55:48 +08:00
withchao 26b5ed72df 1 2023-02-02 11:52:00 +08:00
withchao eb3bb7948f 1 2023-02-02 11:47:27 +08:00
withchao c55785783d 1 2023-02-02 11:24:03 +08:00
withchao 7ed60bd8f9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-02 10:47:46 +08:00
withchao 4649ce5354 1 2023-02-02 10:47:19 +08:00
wangchuxiao 848e861304 errcode 2023-02-02 10:28:52 +08:00
wangchuxiao 803ecd3f92 errcode 2023-02-01 19:31:39 +08:00
wangchuxiao 5bb731f884 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/relation/black.go
2023-02-01 18:42:38 +08:00
wangchuxiao cd6c056e73 errcode 2023-02-01 18:42:04 +08:00
skiffer-git 6658566144 Error code standardization 2023-02-01 17:54:16 +08:00
skiffer-git a5a1cbb077 Error code standardization 2023-02-01 17:45:47 +08:00
skiffer-git 2e19e3109e Error code standardization 2023-02-01 17:39:08 +08:00
withchao 2b1868f558 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 17:22:50 +08:00
withchao 3651274d68 1 2023-02-01 17:22:42 +08:00
skiffer-git 1d42c220af Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/table.go
2023-02-01 17:21:30 +08:00
skiffer-git cbe68507f3 Error code standardization 2023-02-01 17:20:55 +08:00
wangchuxiao c2fbcd1f22 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/relation/friend_model_k.go
2023-02-01 17:13:06 +08:00
withchao d67515f53f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/db/table/table.go
2023-02-01 17:12:00 +08:00
wangchuxiao d4952ebc16 errcode 2023-02-01 17:11:44 +08:00
withchao 0f3691893e 1 2023-02-01 17:07:56 +08:00
skiffer-git fb436e7713 Error code standardization 2023-02-01 16:44:50 +08:00
Gordon aafe17a0f3 friend update 2023-02-01 16:22:13 +08:00
Gordon 80bde864c1 friend update 2023-02-01 16:19:44 +08:00
Gordon 7c92de7899 Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:58:14 +08:00
Gordon e550c9a874 friend update 2023-02-01 15:56:17 +08:00
withchao 4bea4252ff Merge remote-tracking branch 'origin/errcode' into errcode 2023-02-01 15:44:47 +08:00
withchao ef475cb9d9 1 2023-02-01 15:42:27 +08:00
skiffer-git abd957a459 Error code standardization 2023-02-01 12:16:14 +08:00
skiffer-git 39463e68e3 Error code standardization 2023-02-01 12:12:51 +08:00
withchao 01d3977766 1 2023-02-01 12:01:05 +08:00
withchao 26e130122c 1 2023-02-01 12:00:29 +08:00
wangchuxiao 4ad6b74d75 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/relation/friend_model_k.go
2023-02-01 11:23:35 +08:00
wangchuxiao 40470bc320 errcode 2023-02-01 11:23:01 +08:00
skiffer-git 839af18f49 Error code standardization 2023-02-01 11:15:39 +08:00
skiffer-git e7eee16cf1 Error code standardization 2023-02-01 10:49:30 +08:00
skiffer-git 4067d7e4b9 Error code standardization 2023-01-31 21:06:04 +08:00
skiffer-git d44c286ff3 Error code standardization 2023-01-31 20:41:45 +08:00
skiffer-git bac9ba000e Error code standardization 2023-01-31 20:36:25 +08:00
skiffer-git 00bd22041b Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-31 20:33:48 +08:00
skiffer-git b3e141a3ce Error code standardization 2023-01-31 20:33:33 +08:00
wangchuxiao e0d05e1fa8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-31 18:56:23 +08:00
wangchuxiao 4c931fba5c errcode 2023-01-31 18:55:22 +08:00
skiffer-git d6b5a5278e Error code standardization 2023-01-31 17:04:08 +08:00
skiffer-git 954e01c951 Error code standardization 2023-01-31 16:49:35 +08:00
skiffer-git 8ecdcbfc0a Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-31 15:45:34 +08:00
skiffer-git 4e580cb848 Error code standardization 2023-01-31 15:45:24 +08:00
withchao 83c782df9f 1 2023-01-31 15:35:11 +08:00
skiffer-git 618ff03cbe Error code standardization 2023-01-31 13:38:39 +08:00
skiffer-git b18fb5cd31 Error code standardization 2023-01-31 13:37:35 +08:00
skiffer-git 6aa4974e29 Error code standardization 2023-01-31 11:34:30 +08:00
skiffer-git 026649f875 Error code standardization 2023-01-31 10:48:02 +08:00
skiffer-git 467d44adc6 Error code standardization 2023-01-31 10:03:10 +08:00
skiffer-git 6bce40535e Error code standardization 2023-01-31 09:59:15 +08:00
skiffer-git 82c1b2352c Error code standardization 2023-01-31 09:35:00 +08:00
skiffer-git fa45eb1fa8 Error code standardization 2023-01-30 21:57:39 +08:00
skiffer-git 29321b4e09 Error code standardization 2023-01-30 21:51:20 +08:00
skiffer-git d50248ffd2 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-30 21:47:38 +08:00
skiffer-git b881924144 Error code standardization 2023-01-30 21:47:29 +08:00
wangchuxiao 1693359010 errcode 2023-01-30 19:49:18 +08:00
wangchuxiao 1e3e243a7f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-30 16:56:33 +08:00
wangchuxiao c1d6f5809b errcode 2023-01-30 16:55:44 +08:00
wangchuxiao 1b4f6054ae errcode 2023-01-30 16:47:58 +08:00
wangchuxiao 1ba5cde076 errcode 2023-01-30 16:45:40 +08:00
withchao 5c99bdf14f 1 2023-01-30 15:41:30 +08:00
wangchuxiao 79b5d4b8bd Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/friend/friend.go
2023-01-30 15:30:37 +08:00
wangchuxiao 67c082ab7b errcode 2023-01-30 15:28:46 +08:00
skiffer-git ec23d22d6d Error code standardization 2023-01-30 15:26:39 +08:00
skiffer-git d9eb55d9df Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-30 11:35:06 +08:00
skiffer-git f38dc3b1f1 Error code standardization 2023-01-30 11:34:07 +08:00
wangchuxiao 26ed14d1d3 errcode 2023-01-30 11:14:18 +08:00
wangchuxiao 5b8f66404c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/relation/user_model_k.go
2023-01-30 11:12:35 +08:00
wangchuxiao 21a1e7dff2 errcode 2023-01-30 11:10:26 +08:00
skiffer-git 2a76dc3ac8 Error code standardization 2023-01-30 10:40:27 +08:00
skiffer-git 007daaa014 Error code standardization 2023-01-29 19:47:13 +08:00
skiffer-git 8e1f524f68 Error code standardization 2023-01-29 19:45:17 +08:00
skiffer-git 0bec6eeb57 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 19:19:20 +08:00
skiffer-git d49022c16a Error code standardization 2023-01-29 19:19:03 +08:00
withchao 4c6e02f805 1 2023-01-29 18:37:38 +08:00
withchao f76afd3185 1 2023-01-29 18:31:01 +08:00
withchao b83260ca30 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 18:26:47 +08:00
withchao 25f0173c10 1 2023-01-29 18:24:46 +08:00
withchao 0a81dd040f 1 2023-01-29 18:13:02 +08:00
skiffer-git d2d8b9c41c Error code standardization 2023-01-29 17:54:01 +08:00
skiffer-git c7237a64bb Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 17:46:37 +08:00
skiffer-git 1d25a5e53f Error code standardization 2023-01-29 17:46:11 +08:00
wangchuxiao d6edb4aa8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
2023-01-29 17:21:22 +08:00
wangchuxiao 704b18d900 errcode 2023-01-29 17:20:31 +08:00
withchao 16fa05f76e 1 2023-01-29 16:47:38 +08:00
withchao 6a87d26420 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 16:44:19 +08:00
withchao 8eee04e7be 1 2023-01-29 16:33:11 +08:00
skiffer-git 00b4538b0a Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 16:30:48 +08:00
skiffer-git b162909147 Error code standardization 2023-01-29 16:30:33 +08:00
withchao 1e92e0ab28 1 2023-01-29 16:29:14 +08:00
withchao 0e1982083e Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/proto/sdk_ws/ws.proto
2023-01-29 16:13:45 +08:00
withchao 29a78c469d 1 2023-01-29 16:10:30 +08:00
withchao cf4499e958 1 2023-01-29 15:23:14 +08:00
skiffer-git e241c65a9c Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 15:03:51 +08:00
skiffer-git a218bc1daa Error code standardization 2023-01-29 15:03:39 +08:00
wangchuxiao 4688767c51 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-29 15:01:27 +08:00
wangchuxiao dc5ee4436e errcode 2023-01-29 15:01:11 +08:00
skiffer-git 17d3ef2469 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 14:56:41 +08:00
skiffer-git 3e340f345d Error code standardization 2023-01-29 14:56:25 +08:00
withchao 399e1520d6 1 2023-01-29 14:53:31 +08:00
withchao 56a89ad33b Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-29 14:52:05 +08:00
withchao f65cd2aefc 1 2023-01-29 14:51:59 +08:00
skiffer-git 7b0eeb3049 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/utils/convert.go
2023-01-29 14:48:05 +08:00
skiffer-git 39fc655b1a Error code standardization 2023-01-29 14:47:21 +08:00
wangchuxiao 069b978b23 errcode 2023-01-29 14:35:52 +08:00
wangchuxiao 15166f53b0 errcode 2023-01-29 11:37:11 +08:00
wangchuxiao b021089360 errcode 2023-01-29 11:30:12 +08:00
wangchuxiao 52ceb7682d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
	pkg/common/db/controller/group.go
	pkg/common/db/relation/group_member_model_k.go
2023-01-29 11:26:03 +08:00
withchao 4e10b361ed 1 2023-01-29 11:22:37 +08:00
wangchuxiao eebf7ca893 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-29 11:15:31 +08:00
wangchuxiao 945449108d errcode 2023-01-29 11:15:16 +08:00
withchao ebd329558c 1 2023-01-29 10:42:58 +08:00
wangchuxiao 5e4e960524 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/controller/group.go
	pkg/common/db/relation/group_model_k.go
2023-01-29 10:37:59 +08:00
wangchuxiao 68d595b558 errcode 2023-01-29 10:31:01 +08:00
withchao 5bf8f6728e 1 2023-01-28 18:49:36 +08:00
withchao c760b520ff 1 2023-01-28 18:47:02 +08:00
withchao 601fac7a04 1 2023-01-28 18:46:42 +08:00
withchao 891e631b91 1 2023-01-28 18:01:33 +08:00
wangchuxiao 87e61046cb errcode 2023-01-28 17:09:20 +08:00
wangchuxiao 7fc279a329 errcode 2023-01-28 16:36:38 +08:00
wangchuxiao c90d4330df errcode 2023-01-28 15:55:04 +08:00
wangchuxiao 19ae659e44 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-28 15:14:55 +08:00
wangchuxiao 870cc25beb errcode 2023-01-28 15:10:19 +08:00
Gordon 0b2854ddda group update 2023-01-28 14:42:46 +08:00
wangchuxiao 36e82d0a6d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/rpc/group/group.go
#	pkg/common/db/model/group.go
2023-01-28 13:23:34 +08:00
wangchuxiao 7e4bc249be errCode 2023-01-28 13:20:00 +08:00
wangchuxiao d9becad8e9 errCode 2023-01-28 13:19:36 +08:00
Gordon 5af01e4da1 group update 2023-01-28 11:28:11 +08:00
wangchuxiao 8d029a7ab3 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	pkg/common/db/model/group.go
2023-01-18 11:46:56 +08:00
Gordon 0d3984233b db update 2023-01-18 11:18:05 +08:00
Gordon 640960a87b db update 2023-01-18 10:59:25 +08:00
wangchuxiao 46a7a76b43 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-18 10:23:45 +08:00
Gordon 6e26c0d986 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 20:18:34 +08:00
Gordon f83e8659be db update 2023-01-17 20:18:02 +08:00
skiffer-git 8b821ce32e Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 18:03:11 +08:00
skiffer-git 9067172424 Error code standardization 2023-01-17 18:02:57 +08:00
wangchuxiao da48b27ada groupModel 2023-01-17 17:50:25 +08:00
wangchuxiao f528535cfd groupModel 2023-01-17 17:49:29 +08:00
wangchuxiao adccfff581 model 2023-01-17 17:47:13 +08:00
Gordon 65cfb5c898 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 17:46:57 +08:00
Gordon 0a57d5a426 db update 2023-01-17 17:46:33 +08:00
withchao 8e47b55ab4 1 2023-01-17 17:43:30 +08:00
withchao 142b9386fc Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 17:31:35 +08:00
withchao 6ab9cff3c3 1 2023-01-17 17:31:22 +08:00
Gordon f538a86e10 remove notification limit 2023-01-17 17:26:58 +08:00
wangchuxiao 0f17f52c2c model 2023-01-17 17:15:18 +08:00
wangchuxiao 3e0c6f94ed model 2023-01-17 17:08:52 +08:00
wangchuxiao 727bf623b3 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/model/group.go
2023-01-17 17:05:34 +08:00
wangchuxiao eea7adb1b8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/model/group.go
2023-01-17 16:39:12 +08:00
wangchuxiao 3751e633e4 groupdb 2023-01-17 16:36:34 +08:00
skiffer-git 3f52c03b1d Error code standardization 2023-01-17 16:25:18 +08:00
skiffer-git e31d162870 Error code standardization 2023-01-17 15:30:24 +08:00
skiffer-git 87d0e296c1 Error code standardization 2023-01-17 15:28:25 +08:00
skiffer-git ffd306f25c Error code standardization 2023-01-17 15:03:47 +08:00
withchao 58866c1b41 1 2023-01-17 14:54:08 +08:00
withchao 1d428785d1 1 2023-01-17 14:46:20 +08:00
wangchuxiao df6bd5719d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-17 14:40:24 +08:00
wangchuxiao a55e27c581 groupdb 2023-01-17 14:40:20 +08:00
wangchuxiao d21b1e6e78 groupdb 2023-01-17 14:39:29 +08:00
wangchuxiao 86157b4f7a groupdb 2023-01-17 14:38:33 +08:00
withchao 12514a632d Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-17 12:31:14 +08:00
withchao 775951a09f copy map 2023-01-17 12:29:50 +08:00
skiffer-git 46c6f532dc Error code standardization 2023-01-17 11:51:19 +08:00
skiffer-git 65a4c39ab8 Error code standardization 2023-01-17 11:15:39 +08:00
skiffer-git beeb0f3e00 Error code standardization 2023-01-17 11:10:26 +08:00
skiffer-git 7a34a4e5aa Error code standardization 2023-01-17 10:08:30 +08:00
skiffer-git a6f6915336 Error code standardization 2023-01-16 21:32:06 +08:00
wangchuxiao 3c4051c5fc groupdb 2023-01-16 20:15:45 +08:00
wangchuxiao 4854db030f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-16 20:14:49 +08:00
wangchuxiao 822db2a63e groupdb 2023-01-16 20:14:26 +08:00
withchao 38013d272b 1 2023-01-16 19:14:05 +08:00
withchao 21ea555183 1 2023-01-16 18:50:05 +08:00
withchao 07d3467b7a 1 2023-01-16 18:48:40 +08:00
withchao 689611bcd5 1 2023-01-16 16:38:21 +08:00
withchao 7061bf7667 1 2023-01-16 16:37:55 +08:00
withchao b14863aea6 1 2023-01-16 16:21:39 +08:00
withchao 3f739459db 1 2023-01-16 16:07:42 +08:00
withchao 3e344c16a2 1 2023-01-16 16:05:37 +08:00
withchao 99bcc50eb8 1 2023-01-16 16:02:56 +08:00
withchao 8a6435ddf6 1 2023-01-16 15:59:30 +08:00
withchao 62a67905af 1 2023-01-16 15:53:40 +08:00
skiffer-git 033d1e0919 Error code standardization 2023-01-13 20:58:59 +08:00
skiffer-git a30162df52 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-13 20:58:22 +08:00
skiffer-git 87ce1895e3 Error code standardization 2023-01-13 20:58:06 +08:00
wangchuxiao 80b22e0e0e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-13 19:08:01 +08:00
wangchuxiao 40438f529a del files 2023-01-13 19:05:43 +08:00
withchao 50d6b4053a 1 2023-01-13 18:29:25 +08:00
withchao 176c65ebaf 1 2023-01-13 18:20:48 +08:00
wangchuxiao 51529eece3 del files 2023-01-13 18:00:18 +08:00
withchao 9b070bd8df Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-13 17:17:27 +08:00
withchao 24896299d3 1 2023-01-13 17:16:56 +08:00
skiffer-git 16c9f670cf Error code standardization 2023-01-13 17:00:43 +08:00
skiffer-git 12cf665d42 Error code standardization 2023-01-13 16:59:40 +08:00
skiffer-git 28e0125d55 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-13 16:57:01 +08:00
skiffer-git f78304602c Error code standardization 2023-01-13 16:56:46 +08:00
withchao 0c9ca254e6 1 2023-01-13 16:49:22 +08:00
withchao c16a994fd4 1 2023-01-13 16:19:21 +08:00
withchao b224b1ab40 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-13 16:02:49 +08:00
withchao e2ebe19aff 1 2023-01-13 16:02:38 +08:00
skiffer-git 8e8ee2b968 Error code standardization 2023-01-13 14:39:23 +08:00
skiffer-git 29c1bb86d8 Error code standardization 2023-01-13 14:35:58 +08:00
skiffer-git 1797267a6b Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-13 14:34:49 +08:00
skiffer-git a35bb0ddc0 Error code standardization 2023-01-13 14:34:34 +08:00
withchao 55cbc26742 1 2023-01-13 14:10:46 +08:00
skiffer-git 6c3e710223 Error code standardization 2023-01-12 19:55:51 +08:00
wangchuxiao cc1a9e1d4a log 2023-01-12 18:21:39 +08:00
wangchuxiao fcb7639833 log 2023-01-12 18:14:33 +08:00
wangchuxiao 6416127e39 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 18:09:18 +08:00
wangchuxiao 82c32d24a1 log 2023-01-12 18:09:13 +08:00
withchao 6641637f12 1 2023-01-12 18:03:07 +08:00
withchao fd8dd47d2a Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 17:52:25 +08:00
withchao 5e48231d51 1 2023-01-12 17:52:14 +08:00
wangchuxiao 31ff1cb673 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 17:49:50 +08:00
wangchuxiao 022da8bdbd log 2023-01-12 17:49:36 +08:00
withchao 6bd62610dd Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 17:37:33 +08:00
withchao a657fd8d51 1 2023-01-12 17:37:25 +08:00
skiffer-git ba81f0e4b9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 17:31:13 +08:00
skiffer-git fb1e10f32c Error code standardization 2023-01-12 17:31:02 +08:00
withchao 44e6a5570e Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 17:30:56 +08:00
withchao 231e0adea1 1 2023-01-12 17:30:48 +08:00
wangchuxiao 57928f900e log 2023-01-12 17:30:40 +08:00
wangchuxiao 8be1ee90f6 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 17:26:16 +08:00
wangchuxiao 35774878db log 2023-01-12 17:26:10 +08:00
withchao 0f4170907f 1 2023-01-12 17:20:28 +08:00
withchao 56d4064b90 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 17:17:58 +08:00
withchao 979f617209 1 2023-01-12 17:17:42 +08:00
wangchuxiao da637d1ec2 log 2023-01-12 17:15:59 +08:00
wangchuxiao 653fce11da log 2023-01-12 17:08:10 +08:00
withchao 3270cbab8c 1 2023-01-12 16:56:44 +08:00
withchao 8cc76e83f6 1 2023-01-12 16:55:56 +08:00
withchao c9dc7885e9 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:54:34 +08:00
withchao a5dbcad87c 1 2023-01-12 16:54:26 +08:00
skiffer-git 939e6c9e4d Error code standardization 2023-01-12 16:53:18 +08:00
skiffer-git f8372c2744 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:50:47 +08:00
skiffer-git 4e9f4ecaff Error code standardization 2023-01-12 16:50:37 +08:00
withchao 92ee864b45 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:50:35 +08:00
withchao b0834ae437 1 2023-01-12 16:50:26 +08:00
withchao 6c6e02967a 1 2023-01-12 16:49:00 +08:00
skiffer-git 425ba5946f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	pkg/common/constant/errors.go
2023-01-12 16:48:59 +08:00
skiffer-git 3720134fbd Error code standardization 2023-01-12 16:48:11 +08:00
withchao 4e96e77d26 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:47:37 +08:00
withchao 5ddc08e4fd 1 2023-01-12 16:47:28 +08:00
wangchuxiao 21e44518cb Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 16:46:37 +08:00
wangchuxiao fd7b0da269 log 2023-01-12 16:45:50 +08:00
withchao f51ff6fa19 1 2023-01-12 16:45:18 +08:00
skiffer-git ec9ad4a06d Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:32:12 +08:00
wangchuxiao e67dc28e82 log 2023-01-12 16:31:44 +08:00
skiffer-git 007f9912eb Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:31:42 +08:00
skiffer-git 8286fdc4d0 Error code standardization 2023-01-12 16:31:32 +08:00
wangchuxiao 6c7b80f853 log 2023-01-12 16:30:53 +08:00
withchao b6fc96aa31 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:17:59 +08:00
withchao d06dc3e4b5 1 2023-01-12 16:17:52 +08:00
withchao 16864dab7d 1 2023-01-12 16:16:50 +08:00
wangchuxiao 8becaf07c7 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 16:13:54 +08:00
wangchuxiao fbffd9ea26 log 2023-01-12 16:13:13 +08:00
withchao 03dd50e25c Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 16:10:13 +08:00
withchao 8431b40c16 1 2023-01-12 16:10:01 +08:00
withchao f5fc429b34 1 2023-01-12 16:08:44 +08:00
withchao be39542832 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/api_to_rpc/api.go
2023-01-12 16:06:46 +08:00
wangchuxiao 09244e757f log 2023-01-12 16:06:21 +08:00
withchao 69e94c25f4 1 2023-01-12 16:04:12 +08:00
wangchuxiao ff524b0ee7 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/api_to_rpc/api.go
2023-01-12 16:01:20 +08:00
withchao 7b10b17056 1 2023-01-12 16:00:52 +08:00
wangchuxiao 1a32b49662 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	internal/api_to_rpc/api.go
2023-01-12 15:58:26 +08:00
wangchuxiao 6205c67b70 log 2023-01-12 15:55:44 +08:00
withchao dac62d62ef 1 2023-01-12 14:37:34 +08:00
withchao 631c7202b4 1 2023-01-12 14:32:14 +08:00
withchao 20aea0c335 1 2023-01-12 14:31:44 +08:00
withchao 3b82fbe4ca 1 2023-01-12 14:23:00 +08:00
withchao b57616cb29 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 14:14:21 +08:00
withchao 2645e4da41 go mod getcdv3 2023-01-12 14:14:12 +08:00
wangchuxiao 47766a2c2c db 2023-01-12 11:23:07 +08:00
wangchuxiao 6ee06ded3f db 2023-01-12 11:19:25 +08:00
wangchuxiao 9bc659e8f0 db 2023-01-12 11:14:37 +08:00
wangchuxiao db51b597da db 2023-01-12 11:09:08 +08:00
wangchuxiao 6fd6c29ea4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 10:55:31 +08:00
wangchuxiao 6808d734b4 db 2023-01-12 10:55:07 +08:00
withchao 5e020bb514 1 2023-01-12 10:52:41 +08:00
withchao 7bc32e67bc Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-12 10:50:48 +08:00
withchao dfb91b3fc0 1 2023-01-12 10:50:35 +08:00
wangchuxiao 4649eb11e6 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-12 10:48:17 +08:00
wangchuxiao cb713db9d2 db 2023-01-12 10:48:02 +08:00
withchao 59c477424c 1 2023-01-12 10:42:27 +08:00
withchao 94eeb3abb2 1 2023-01-12 10:12:38 +08:00
withchao 2841109f31 1 2023-01-12 10:07:08 +08:00
withchao d142988390 1 2023-01-12 09:55:20 +08:00
withchao 35c0e8303c 1 2023-01-11 19:33:25 +08:00
withchao 6dafbf2165 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-11 19:28:12 +08:00
withchao 4f2d9c548e 1 2023-01-11 19:26:17 +08:00
wangchuxiao 59d83dd563 db 2023-01-11 19:10:21 +08:00
wangchuxiao 31a264f411 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-11 19:03:40 +08:00
wangchuxiao e466faa20d db 2023-01-11 19:03:26 +08:00
withchao 6c0175540b 1 2023-01-11 18:39:42 +08:00
wangchuxiao 9b962a0368 db 2023-01-11 18:08:26 +08:00
wangchuxiao 6755303f0a db 2023-01-11 18:05:32 +08:00
wangchuxiao e34ad36912 db 2023-01-11 17:59:43 +08:00
wangchuxiao 88d6fc663a db 2023-01-11 17:40:20 +08:00
wangchuxiao dff32dd7ef db 2023-01-11 17:32:49 +08:00
withchao 53c278234d friend 2023-01-11 16:55:25 +08:00
wangchuxiao 4ab18f191f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-11 16:50:19 +08:00
wangchuxiao b65f3151d1 fix Pb2String 2023-01-11 16:50:02 +08:00
withchao 2a7068942a Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-11 16:46:30 +08:00
withchao d79936ef7b friend 2023-01-11 16:46:20 +08:00
wangchuxiao d3c9ef6992 fix Pb2String 2023-01-11 16:46:09 +08:00
withchao a60a8441ba friend 2023-01-11 16:42:47 +08:00
wangchuxiao edced72be9 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/api_to_rpc/api.go
	internal/rpc/group/group.go
2023-01-11 16:27:20 +08:00
wangchuxiao c96ccfc7f5 fix Pb2String 2023-01-11 16:23:16 +08:00
withchao 920fcc14f1 api to rpc 2023-01-11 16:16:44 +08:00
withchao 5669399b2d group rpc 2023-01-11 15:56:49 +08:00
withchao e8de74f76d group rpc 2023-01-11 15:33:32 +08:00
withchao b2460d5267 group rpc 2023-01-11 14:57:44 +08:00
withchao 9058c96ea4 group rpc CommonResp 2023-01-11 14:53:11 +08:00
withchao b05e4f131a group rpc 2023-01-11 14:51:24 +08:00
withchao 1fc7c4434c group 2023-01-11 14:29:37 +08:00
skiffer-git 46c3b5a6ea Error code standardization 2023-01-11 11:24:38 +08:00
wangchuxiao 07a6439082 fix Pb2String 2023-01-11 11:15:46 +08:00
wangchuxiao 62ff4213e2 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-10 18:05:51 +08:00
withchao 198cae5ade group 2023-01-10 18:05:13 +08:00
withchao 8f51749786 group 2023-01-10 16:17:55 +08:00
withchao 9341a5f57f Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/group/group.go
2023-01-10 10:17:28 +08:00
wangchuxiao 2c7f7f27d3 group rpc 2023-01-09 18:01:41 +08:00
wangchuxiao 6e8a2232a9 group rpc 2023-01-09 17:04:43 +08:00
wangchuxiao 5f48eeb74b group rpc 2023-01-09 16:51:26 +08:00
wangchuxiao 5cbfe7c73f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
 Conflicts:
	internal/rpc/group/group.go
2023-01-09 16:49:14 +08:00
wangchuxiao 69787064e9 group rpc 2023-01-09 16:37:33 +08:00
withchao aa2b43293d group 2023-01-09 14:51:31 +08:00
withchao 36be1f4be8 group 2023-01-09 14:29:53 +08:00
withchao 4a098a4a0e group 2023-01-09 14:29:43 +08:00
withchao 10fa4318e9 group 2023-01-09 14:28:19 +08:00
wangchuxiao ac74d01d35 groupCallback 2023-01-09 14:27:08 +08:00
withchao 6830fe5f7a group 2023-01-09 14:09:07 +08:00
withchao 8478331ef9 group 2023-01-09 13:57:30 +08:00
withchao 0a803098ac group 2023-01-09 10:01:17 +08:00
withchao 5be07abbed group 2023-01-06 18:39:48 +08:00
withchao 42061ddaf0 group 2023-01-06 18:25:41 +08:00
withchao d60d8096df group 2023-01-06 17:58:35 +08:00
withchao 80022dfb8f group 2023-01-06 17:25:22 +08:00
withchao 2e8396e408 group 2023-01-06 17:00:14 +08:00
withchao fdaeb8a8bf GetJoinedGroupList 2023-01-06 16:31:40 +08:00
withchao 90fddd34d2 CreateGroup 2023-01-06 16:21:43 +08:00
wangchuxiao 90cc7937e6 groupCallback 2023-01-06 15:01:44 +08:00
wangchuxiao 463f08546e groupCallback 2023-01-06 14:36:39 +08:00
wangchuxiao dab58d775a groupCallback 2023-01-06 14:32:58 +08:00
wangchuxiao b0cc8fe947 groupCallback 2023-01-06 14:31:01 +08:00
skiffer-git 6518473436 Error code standardization 2023-01-06 14:23:43 +08:00
withchao d9bff25958 CreateGroup 2023-01-06 14:21:00 +08:00
withchao 250020e8c2 CreateGroup 2023-01-06 14:19:03 +08:00
withchao ebc8ab4cab CreateGroup 2023-01-06 14:13:39 +08:00
withchao 490dafad0c CreateGroup 2023-01-06 14:11:12 +08:00
withchao 692ec1f8c2 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-06 14:06:25 +08:00
withchao 46cc5ccdf3 CreateGroup 2023-01-06 14:06:18 +08:00
skiffer-git 31cb75b024 Error code standardization 2023-01-06 13:52:25 +08:00
withchao 18c4212aa0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-06 13:47:00 +08:00
withchao 028c2ac364 CheckAccess 2023-01-06 13:46:35 +08:00
skiffer-git 8d42184ff0 Error code standardization 2023-01-06 13:41:50 +08:00
withchao 08bffa60f4 CreateGroup rpc 2023-01-06 11:49:11 +08:00
withchao e0241d73de CreateGroup rpc 2023-01-06 11:19:31 +08:00
skiffer-git 74f5663963 Error code standardization 2023-01-05 20:23:33 +08:00
wangchuxiao fb1b3687f4 groupCallback 2023-01-05 20:15:51 +08:00
wangchuxiao 2d67f95413 groupCallback 2023-01-05 20:04:11 +08:00
wangchuxiao 4aa7abf94b groupCallback 2023-01-05 18:37:01 +08:00
wangchuxiao 2db5a8b618 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-05 18:32:55 +08:00
wangchuxiao 99fc84aaea groupCallback 2023-01-05 18:32:30 +08:00
skiffer-git 7827ce1aee Error code standardization 2023-01-05 17:20:12 +08:00
skiffer-git d28d470435 Error code standardization 2023-01-05 17:14:28 +08:00
skiffer-git b76751ec79 Error code standardization 2023-01-05 17:09:35 +08:00
wangchuxiao 635c703535 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-05 15:59:34 +08:00
wangchuxiao 1fc0f0cb01 getcd 2023-01-05 15:58:00 +08:00
skiffer-git 0f7b183e7c Error code standardization 2023-01-05 15:52:48 +08:00
skiffer-git 45aa8293e5 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 15:45:46 +08:00
skiffer-git f3a3477811 Error code standardization 2023-01-05 15:45:21 +08:00
wangchuxiao cf82d3495e Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/constant/error.go
2023-01-05 15:33:28 +08:00
wangchuxiao 297f3c16a8 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-05 15:30:33 +08:00
skiffer-git 9d791c186b Error code standardization 2023-01-05 15:04:48 +08:00
skiffer-git b81513e9bb Error code standardization 2023-01-05 13:36:49 +08:00
skiffer-git e03a34cae4 Error code standardization 2023-01-05 11:40:48 +08:00
skiffer-git 89f0741cea Error code standardization 2023-01-05 11:38:20 +08:00
skiffer-git 8028ee790f Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 11:33:32 +08:00
skiffer-git 4147c68f6d Error code standardization 2023-01-05 11:33:17 +08:00
withchao f5b598fde8 Merge remote-tracking branch 'origin/errcode' into errcode 2023-01-05 10:48:51 +08:00
withchao 0138b7fc12 get func name 2023-01-05 10:47:41 +08:00
skiffer-git 847860a0c7 Error code standardization 2023-01-05 10:07:38 +08:00
withchao c092c0e72d group member db 2023-01-04 21:56:42 +08:00
wangchuxiao 633aefad56 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:49:47 +08:00
wangchuxiao b9a11e4ca1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:46:43 +08:00
wangchuxiao bd8536b9eb Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:45:56 +08:00
wangchuxiao 6bd9b3d82f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model_k.go
2023-01-04 19:38:07 +08:00
wangchuxiao 7743801795 errCode 2023-01-04 19:35:07 +08:00
skiffer-git bedba8d8f5 Error code standardization 2023-01-04 19:32:44 +08:00
skiffer-git 4aad2c86ec Error code standardization 2023-01-04 19:26:57 +08:00
skiffer-git b041cb6cbf Error code standardization 2023-01-04 19:09:53 +08:00
withchao 99de72d723 1 2023-01-04 18:43:49 +08:00
wangchuxiao f2cade3251 errCode 2023-01-04 18:36:04 +08:00
wangchuxiao 9d433fb248 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 18:20:31 +08:00
wangchuxiao 94d087b1bc errCode 2023-01-04 18:19:18 +08:00
skiffer-git 64b4e5570c Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/rpc/friend/friend.go
#	pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go
2023-01-04 17:23:27 +08:00
skiffer-git 86bf207e02 Error code standardization 2023-01-04 17:22:55 +08:00
wangchuxiao b13ab0f0ba Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 17:21:46 +08:00
wangchuxiao 2d8a538798 errCode 2023-01-04 17:21:33 +08:00
withchao e9446d0360 1 2023-01-04 17:16:06 +08:00
skiffer-git 5a2a57c706 Error code standardization 2023-01-04 15:51:02 +08:00
skiffer-git c076f16793 Error code standardization 2023-01-04 11:54:49 +08:00
wangchuxiao 58bb3fe3f1 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-01-04 11:32:30 +08:00
wangchuxiao 491501c618 errCode 2023-01-04 11:31:52 +08:00
wangchuxiao cbe7dcebea errCode 2023-01-04 11:28:52 +08:00
skiffer-git 4acde81cc4 Error code standardization 2023-01-04 11:26:35 +08:00
skiffer-git 108685e8d0 Error code standardization 2023-01-04 11:24:11 +08:00
skiffer-git 1d5e4a0f8a Error code standardization 2023-01-04 11:06:28 +08:00
skiffer-git 89a4fe96b5 Error code standardization 2023-01-04 10:12:20 +08:00
withchao b2ce96eb67 operationID 2023-01-03 16:47:11 +08:00
skiffer-git 84df63e249 Error code standardization 2023-01-03 16:42:48 +08:00
skiffer-git efd5da9e87 Error code standardization 2023-01-03 16:37:04 +08:00
skiffer-git b2dd39887d Error code standardization 2023-01-03 16:35:40 +08:00
skiffer-git 2888236e02 Error code standardization 2023-01-03 15:49:34 +08:00
skiffer-git 304474a5e1 Error code standardization 2023-01-03 15:46:28 +08:00
skiffer-git 6e4a17764e Error code standardization 2023-01-03 15:42:59 +08:00
skiffer-git a76e93626d Error code standardization 2023-01-03 15:17:33 +08:00
skiffer-git 5e5d238e82 Error code standardization 2023-01-03 14:19:23 +08:00
skiffer-git c77868bfae Error code standardization 2023-01-03 14:09:51 +08:00
skiffer-git bf747e538b Error code standardization 2023-01-03 14:08:29 +08:00
skiffer-git 20d56aefa8 Error code standardization 2022-12-30 19:52:12 +08:00
skiffer-git a2cd47f79f Error code standardization 2022-12-30 19:46:26 +08:00
skiffer-git 32d7846139 Error code standardization 2022-12-30 18:46:02 +08:00
wangchuxiao e588091bf6 mongodb 2022-12-27 11:01:21 +08:00
wangchuxiao eb49b27e16 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-26 10:25:53 +08:00
wangchuxiao 4fd31e4367 getui 2022-12-26 10:25:42 +08:00
Gordon aaad0c03a6 callback update 2022-12-23 16:31:37 +08:00
Gordon 1026a6b2b6 Merge remote-tracking branch 'origin/modify' into v2.3.0release
# Conflicts:
#	config/config.yaml
#	pkg/common/constant/constant.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-12-23 16:16:28 +08:00
Gordon f5ed0be023 callback update 2022-12-23 16:09:59 +08:00
Gordon a7f44b6ce7 callback update 2022-12-23 16:05:51 +08:00
wangchuxiao 481f12af5e Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-23 10:51:00 +08:00
Gordon 16a7bc63f2 callback update 2022-12-22 17:37:34 +08:00
wangchuxiao e8dc5ce085 push 2022-12-22 17:35:09 +08:00
Gordon 98ce12d74e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-22 17:25:29 +08:00
Gordon edb09f2081 callback update 2022-12-22 17:25:14 +08:00
Gordon 86fc0e4101 reaction message update 2022-12-22 17:23:14 +08:00
wangchuxiao fb72f4b1ae push 2022-12-22 17:17:28 +08:00
wangchuxiao 6bf0a3a804 push 2022-12-22 16:28:36 +08:00
wangchuxiao 4bcaa5eaca push 2022-12-22 15:42:16 +08:00
wangchuxiao 8ca6584299 push 2022-12-22 15:23:46 +08:00
wangchuxiao e86e8820f3 push 2022-12-22 11:30:19 +08:00
wangchuxiao 07c300f35f push 2022-12-22 11:10:19 +08:00
wangchuxiao b08936c27e push 2022-12-21 19:56:25 +08:00
wangchuxiao 0b4b408552 push 2022-12-21 18:58:36 +08:00
wangchuxiao 36e37052e0 push 2022-12-21 18:37:58 +08:00
wangchuxiao 9a3373a43d push 2022-12-21 18:29:31 +08:00
wangchuxiao 428e5a7a4e push 2022-12-21 18:15:25 +08:00
wangchuxiao 7445b84756 push 2022-12-21 18:03:39 +08:00
wangchuxiao fa5be03fc3 push 2022-12-21 17:41:35 +08:00
wangchuxiao 49b21fb577 push 2022-12-21 17:39:48 +08:00
wangchuxiao 1f7e788585 push 2022-12-21 17:30:49 +08:00
wangchuxiao 43ac9de714 getui 2022-12-21 16:55:44 +08:00
wangchuxiao e80afa610d getui 2022-12-21 16:46:16 +08:00
Gordon 20a2cb3d3c reaction message update 2022-12-19 11:18:23 +08:00
Gordon 26b3f742ce pb 2022-12-18 13:16:26 +08:00
Gordon 2ccbade642 pb 2022-12-18 12:29:39 +08:00
Gordon fc8523da46 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-16 17:23:01 +08:00
Gordon b67ad01d97 platform update 2022-12-16 17:22:40 +08:00
wangchuxiao cdf49b2e37 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-16 16:54:31 +08:00
wangchuxiao 920a7cfdac set groupMemberInfo callback 2022-12-16 16:54:18 +08:00
Gordon 023ec9e53e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-16 16:18:36 +08:00
Gordon 7c9b4576f0 platform update 2022-12-16 16:17:53 +08:00
wangchuxiao 4f2d543651 Merge branch 'main' into v2.3.0release 2022-12-16 15:56:04 +08:00
Gordon 25aa6a4345 message reaction 2022-12-16 15:52:30 +08:00
wangchuxiao 0b9d9fa8d7 install script 2022-12-15 18:43:52 +08:00
skiffer-git a01781d5b7 Get Internet IP automatically 2022-12-15 17:21:04 +08:00
skiffer-git b15ae542aa check time synchronize 2022-12-14 17:40:51 +08:00
skiffer-git b68f69dfc7 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-14 17:36:03 +08:00
skiffer-git 7d1cafc3d3 check time synchronize 2022-12-14 17:35:48 +08:00
wangchuxiao 386c837f1a pb 2022-12-14 16:14:56 +08:00
wangchuxiao be8c544da3 proto 2022-12-14 16:14:12 +08:00
skiffer-git a78e43bfe3 Simplify logs 2022-12-14 15:22:06 +08:00
skiffer-git 7b57b924ee Simplify logs 2022-12-14 14:52:39 +08:00
skiffer-git 46ee4e41a1 simplify init logging 2022-12-14 14:15:53 +08:00
Gordon f87eed1336 reaction message add expiration 2022-12-13 15:21:27 +08:00
Gordon e4964b050b reaction message add expiration 2022-12-13 15:19:33 +08:00
wangchuxiao 83f128ddcc upgrade open_im_enterprise 2022-12-13 15:11:42 +08:00
skiffer-git 13b2aa675f Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-13 14:45:23 +08:00
skiffer-git a98f89a4e7 Update group application list for group administrator 2022-12-13 14:43:09 +08:00
wangchuxiao d42d4308e5 upgrade enterprise 2022-12-13 13:59:58 +08:00
wangchuxiao 0608649961 upgrade enterprise 2022-12-13 13:58:51 +08:00
wangchuxiao 3013af8e62 upgrade enterprise 2022-12-13 12:42:04 +08:00
Gordon 915118140f reaction message add expiration 2022-12-12 20:41:40 +08:00
wangchuxiao a662414b7f Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
#	pkg/proto/msg/msg.pb.go
2022-12-12 19:53:04 +08:00
wangchuxiao 112ce9b450 Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify
# Conflicts:
#	pkg/proto/msg/msg.pb.go
2022-12-12 19:24:53 +08:00
wangchuxiao 0f1208dba9 mongo operation 2022-12-12 19:22:50 +08:00
Gordon 21dcb55c82 reaction message add expiration 2022-12-12 19:15:42 +08:00
Gordon 25871aea49 reaction message add expiration 2022-12-12 19:15:31 +08:00
Gordon 63d75bb68b reaction message add expiration 2022-12-12 17:36:12 +08:00
Gordon 8e95e8c4f8 reaction message add expiration 2022-12-12 16:52:52 +08:00
Gordon 2b0a997573 reaction message add expiration 2022-12-12 16:52:36 +08:00
Gordon 84df956293 reaction message add expiration 2022-12-12 15:39:40 +08:00
Gordon 1acf21371b reaction message add expiration 2022-12-12 15:35:02 +08:00
Gordon acee47e861 reaction message add expiration 2022-12-12 15:34:49 +08:00
skiffer-git 2dab70697c set group member ex == "" if ex == nil 2022-12-12 14:46:49 +08:00
Gordon b3f5c2f185 reaction message add expiration 2022-12-12 12:12:53 +08:00
skiffer-git 25a848c4e4 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-12 11:43:56 +08:00
Gordon ad814b6cbb add web push 2022-12-12 11:16:55 +08:00
Gordon ac55951c74 message reaction 2022-12-11 13:16:24 +08:00
Gordon a0520ce5d8 log 2022-12-10 20:12:13 +08:00
Gordon 6f20cdd905 reaction message 2022-12-09 20:53:13 +08:00
wangchuxiao 6d45f0730c mongo operation 2022-12-09 19:54:49 +08:00
wangchuxiao 24288aa597 modify msg 2022-12-09 18:03:40 +08:00
wangchuxiao 66f49feebb modify msg 2022-12-09 17:29:18 +08:00
wangchuxiao b77bbe6a66 modify msg 2022-12-09 16:55:01 +08:00
wangchuxiao 084fe0e00f Merge branch 'modify' of github.com:OpenIMSDK/Open-IM-Server into modify 2022-12-09 16:42:56 +08:00
wangchuxiao 7f449aed5b modify msg 2022-12-09 16:42:43 +08:00
Gordon 9cb30e0ec6 reaction message 2022-12-09 14:28:24 +08:00
skiffer-git 1d78b68831 set group member ex == "" if ex == nil 2022-12-09 13:18:36 +08:00
wangchuxiao 0fbf882059 modify 2022-12-09 12:18:38 +08:00
wangchuxiao 4d56dfdfa2 modify 2022-12-09 12:13:14 +08:00
wangchuxiao 53cd4205e8 modify 2022-12-09 10:45:51 +08:00
wangchuxiao a4e2e23fbe modify 2022-12-08 19:50:28 +08:00
wangchuxiao 0e726a20ba modify 2022-12-08 12:54:39 +08:00
wangchuxiao be01c4da0c dek jinzhu 2022-12-07 21:12:48 +08:00
Gordon f190611bcc add friend notification 2022-12-07 10:56:57 +08:00
skiffer-git c0a2abeae9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-07 10:01:28 +08:00
skiffer-git 5d4600a080 Separate the notification 2022-12-07 10:00:53 +08:00
Gordon e6136cac08 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-06 22:42:48 +08:00
Gordon f2a35fb833 callback add seq 2022-12-06 21:26:47 +08:00
wangchuxiao 11342a54c9 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-06 15:43:10 +08:00
wangchuxiao ab176b5b1d app background 2022-12-06 15:42:57 +08:00
skiffer-git 189911c77f Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-06 14:45:07 +08:00
wangchuxiao 4c9859a1ac ws backgroundStatus 2022-12-06 14:24:29 +08:00
skiffer-git 01b1116017 log 2022-12-06 13:06:20 +08:00
skiffer-git d3af2e6547 log 2022-12-06 12:51:39 +08:00
skiffer-git b5a031be9f log 2022-12-06 12:06:37 +08:00
wangchuxiao c24b0e1425 ws connID 2022-12-06 10:37:16 +08:00
wangchuxiao 4272955097 ws connID 2022-12-05 18:44:19 +08:00
wangchuxiao 0a267f69e6 ws connID 2022-12-05 18:42:53 +08:00
wangchuxiao 5d5788e67e ws connID 2022-12-05 18:38:24 +08:00
wangchuxiao 10ec7e8708 ws connID 2022-12-05 18:36:11 +08:00
wangchuxiao 233ecf8b5f ws connID 2022-12-05 18:35:34 +08:00
wangchuxiao 156c6429d3 ws connID 2022-12-05 18:34:51 +08:00
wangchuxiao d5e7d3298a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-05 18:30:13 +08:00
wangchuxiao 837efc90b6 ws connID 2022-12-05 18:29:58 +08:00
skiffer-git 9394d340a2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-05 17:10:15 +08:00
skiffer-git be820e8401 set MaxNotificationNum = 500 2022-12-05 17:10:00 +08:00
wangchuxiao 75629ba5ea group 2022-12-05 16:44:46 +08:00
wangchuxiao 7e428e8f94 group 2022-12-05 16:34:54 +08:00
wangchuxiao 5a69eb2dd3 group 2022-12-05 16:27:01 +08:00
wangchuxiao 5b5abd2601 ws 2022-12-05 15:49:08 +08:00
wangchuxiao 7c302cb19c ws 2022-12-05 14:55:38 +08:00
wangchuxiao 71c836ae1a ws 2022-12-05 14:53:16 +08:00
wangchuxiao b2be663ba6 conversation 2022-12-05 11:30:54 +08:00
wangchuxiao f6533b2ca4 group admin send mute msg 2022-12-02 18:39:15 +08:00
wangchuxiao a499112ece group admin send mute msg 2022-12-02 17:27:12 +08:00
wangchuxiao df78d87ec5 ex msg 2022-12-02 16:40:11 +08:00
wangchuxiao a9edd036e0 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-12-01 19:35:10 +08:00
wangchuxiao b75507396b EX MSG 2022-12-01 19:34:54 +08:00
Gordon 6f69653a8b Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-12-01 14:55:42 +08:00
Gordon 14fd7444e8 callback add seq 2022-12-01 14:55:30 +08:00
wangchuxiao 8d66128009 mongo 2022-12-01 01:40:13 +08:00
wangchuxiao d9ecfddecd error log 2022-11-30 18:04:58 +08:00
wangchuxiao 19da03dfa4 msg rpc max 2022-11-30 16:13:03 +08:00
wangchuxiao 271934ef4b fix groupMuted send msg 2022-11-29 18:08:47 +08:00
wangchuxiao 6f22b37e1d fix groupMuted send msg 2022-11-29 14:41:20 +08:00
wangchuxiao ad2df2f36f conn 2022-11-29 12:07:48 +08:00
wangchuxiao 99739810a0 conn 2022-11-29 11:57:21 +08:00
wangchuxiao d2c1daf4e3 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-29 11:40:16 +08:00
wangchuxiao a30c8953c8 conn 2022-11-29 11:39:39 +08:00
Gordon a6d676700d compression 2022-11-29 10:56:41 +08:00
Gordon 66aa690104 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-11-29 10:31:23 +08:00
Gordon 05b6fb4a7d compression 2022-11-29 10:31:13 +08:00
wangchuxiao c1c72927c1 conn 2022-11-29 10:13:46 +08:00
wangchuxiao d78bf6d1e1 conn 2022-11-28 19:32:31 +08:00
wangchuxiao 86512f0dcb conn 2022-11-28 19:12:30 +08:00
wangchuxiao f738113020 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-28 19:09:56 +08:00
wangchuxiao 1be16380da conn 2022-11-28 19:09:38 +08:00
Gordon a9bb365760 user get token add account judge 2022-11-26 12:09:36 +08:00
skiffer-git 10a0666de9 Update README.md 2022-11-25 19:56:28 +08:00
wangchuxiao cf8dc4e529 cron 2022-11-25 18:50:51 +08:00
wangchuxiao ebed875c46 get chat log do not need time 2022-11-25 12:04:17 +08:00
wangchuxiao 8ac36526a8 get chat log do not need time 2022-11-25 12:02:14 +08:00
wangchuxiao dce0e370cf get chat log do not need time 2022-11-25 11:45:01 +08:00
wangchuxiao 067d23e2bc cron 2022-11-24 19:24:04 +08:00
wangchuxiao e494d21a57 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-24 19:17:49 +08:00
wangchuxiao 0654ecc9bb cron 2022-11-24 19:17:29 +08:00
Gordon b235c71c76 offline 2022-11-24 17:41:27 +08:00
Gordon 07842b0fa7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-11-24 14:21:01 +08:00
Gordon e0ad4e6e7b offline 2022-11-24 14:20:32 +08:00
wangchuxiao 9be70d640e api 2022-11-23 11:08:44 +08:00
skiffer-git 44a9724827 readme 2022-11-23 09:47:24 +08:00
wangchuxiao 9065e8ed25 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-22 18:28:43 +08:00
wangchuxiao e1c7c11bdf fix callback 2022-11-22 18:28:37 +08:00
skiffer-git 56436adf4d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-11-22 16:20:35 +08:00
skiffer-git 1a8197aef1 add admin platform id 2022-11-22 16:20:18 +08:00
wangchuxiao e9f6521c6a add callback and fix cache 2022-11-22 14:44:52 +08:00
wangchuxiao 07cdd8bbab add callback and fix cache 2022-11-22 14:18:57 +08:00
wangchuxiao 53d7f60ebc Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-22 11:08:00 +08:00
wangchuxiao 819ebf0ede add callback and fix cache 2022-11-22 11:07:20 +08:00
Gordon 157f858975 user 2022-11-21 15:57:56 +08:00
Gordon a1a79ea619 user 2022-11-21 15:47:30 +08:00
Gordon 672de78c81 user 2022-11-21 15:41:38 +08:00
wangchuxiao d446bbb451 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-21 10:21:09 +08:00
wangchuxiao 135973de09 fix bug 2022-11-21 10:20:56 +08:00
Gordon 9fddf6819b user notification 2022-11-20 17:45:49 +08:00
wangchuxiao 7f9812a488 cron 2022-11-18 18:16:44 +08:00
wangchuxiao f3a16e1ecd cron 2022-11-18 18:09:43 +08:00
wangchuxiao 11405adcf6 cron test 2022-11-18 17:35:45 +08:00
wangchuxiao c0d7f0f5fd cron test 2022-11-18 16:59:31 +08:00
wangchuxiao 68ad1e9645 log print size 2022-11-18 10:45:48 +08:00
wangchuxiao 4b0a95fc1b fix bug 2022-11-17 16:18:13 +08:00
wangchuxiao fdb0ba4349 msg size 2022-11-17 11:17:26 +08:00
wangchuxiao 4a3f168720 gzip msg 2022-11-16 19:26:49 +08:00
wangchuxiao 05d83ebe8b gzip msg 2022-11-16 18:55:42 +08:00
wangchuxiao 9aaee04a69 read after burn time 2022-11-16 12:40:44 +08:00
wangchuxiao 3f5dd5bad8 read after burn time 2022-11-16 11:54:24 +08:00
wangchuxiao e53a895471 check script 2022-11-15 19:31:43 +08:00
wangchuxiao bfc8314f52 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server 2022-11-15 19:19:41 +08:00
wangchuxiao 199d2e8298 Merge branch 'main' into v2.3.0release 2022-11-15 19:14:40 +08:00
wangchuxiao 4c7d7fad1b Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-15 19:14:07 +08:00
wangchuxiao df58abfcdb check script 2022-11-15 19:13:53 +08:00
skiffer-git 710d37c640 config 2022-11-15 19:08:58 +08:00
skiffer-git 56c63fb1a1 config 2022-11-15 19:07:31 +08:00
wangchuxiao 3e21c841be docker 2022-11-15 18:29:33 +08:00
wangchuxiao 298763a4a7 docker 2022-11-15 18:28:27 +08:00
wangchuxiao d6f8f9704c docker 2022-11-15 15:55:02 +08:00
wangchuxiao f3e5b03af2 docker 2022-11-15 14:55:03 +08:00
wangchuxiao 603f0d289a docker 2022-11-15 14:49:50 +08:00
wangchuxiao e7f0979c9e docker 2022-11-15 14:30:31 +08:00
wangchuxiao 9b69a5c8f2 docker 2022-11-15 14:27:29 +08:00
wangchuxiao 99b445e7bc docker 2022-11-15 14:09:39 +08:00
wangchuxiao a85bbc8ce8 docker 2022-11-15 11:21:51 +08:00
wangchuxiao ea85628389 etcd conf 2022-11-14 20:03:09 +08:00
wangchuxiao bafd2f3b86 etcd conf 2022-11-14 19:58:57 +08:00
wangchuxiao bd7009732f etcd conf 2022-11-14 19:45:05 +08:00
wangchuxiao 051f73013c etcd conf 2022-11-14 19:36:49 +08:00
wangchuxiao 6484b796cd etcd conf 2022-11-14 19:24:20 +08:00
wangchuxiao 7a5a308c9b etcd conf 2022-11-14 19:21:56 +08:00
wangchuxiao 4709e536ee etcd conf 2022-11-14 19:19:56 +08:00
wangchuxiao 4eb5df3f28 etcd conf 2022-11-14 19:14:51 +08:00
wangchuxiao d3751da0e4 etcd conf 2022-11-14 19:07:44 +08:00
wangchuxiao de90205b66 etcd conf 2022-11-14 19:07:34 +08:00
wangchuxiao 5d54225f9d etcd conf 2022-11-14 19:04:34 +08:00
wangchuxiao a556cfcd40 etcd conf 2022-11-14 18:37:42 +08:00
wangchuxiao 405a60c4f8 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:35:53 +08:00
wangchuxiao de528270a2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:18:48 +08:00
wangchuxiao ea0365b9da Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:17:41 +08:00
wangchuxiao f8ca38b7e3 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	config/usualConfig.yaml
2022-11-14 18:07:14 +08:00
wangchuxiao bfeb434920 conf script 2022-11-14 18:03:44 +08:00
skiffer-git 7101ba472d config 2022-11-14 16:02:00 +08:00
wangchuxiao a314f2d1cb conf script 2022-11-14 15:42:50 +08:00
wangchuxiao 99e1c53a41 conf script 2022-11-14 15:41:24 +08:00
wangchuxiao b21cc930af Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-14 15:37:51 +08:00
wangchuxiao ccad06b7b6 conf script 2022-11-14 15:37:32 +08:00
wangchuxiao 7364dc1989 fix config 2022-11-12 17:12:06 +08:00
wangchuxiao 5b816b095d fix conf 2022-11-11 19:01:23 +08:00
wangchuxiao 08a4b92f3a mute member cant send msg 2022-11-11 18:06:15 +08:00
wangchuxiao 3c8a0bb011 k8s version update 2022-11-11 15:24:37 +08:00
wangchuxiao d6e14eafef k8s version update 2022-11-11 15:18:04 +08:00
wangchuxiao 15df8e0a08 k8s version update 2022-11-11 12:17:04 +08:00
wangchuxiao 42d9e7175f k8s version update 2022-11-11 11:22:45 +08:00
wangchuxiao 2aa7d6095d Merge branch 'main' into v2.3.0release 2022-11-11 11:21:22 +08:00
wangchuxiao 31aa75d745 k8s version update 2022-11-11 11:16:17 +08:00
wangchuxiao dfd2847c12 Merge branch 'v2.3.0release' 2022-11-11 11:04:30 +08:00
wangchuxiao db5f9572b1 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server
# Conflicts:
#	.env
#	config/config.yaml
#	script/.env
2022-11-11 11:03:02 +08:00
wangchuxiao cb9db10052 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server
# Conflicts:
#	.env
#	config/config.yaml
#	script/.env
2022-11-11 10:56:47 +08:00
skiffer-git 66960b147a nginx config 2022-11-10 22:09:05 +08:00
wangchuxiao 8ec4f2e814 add usualConfig` 2022-11-10 19:09:15 +08:00
wangchuxiao 081e34f953 add usualConfig` 2022-11-10 18:45:46 +08:00
wangchuxiao 2800eef199 add usualConfig` 2022-11-10 18:41:16 +08:00
wangchuxiao 08f3a79e6e add usualConfig 2022-11-10 18:23:11 +08:00
wangchuxiao 1c528b0f04 fix friend bug 2022-11-10 18:05:14 +08:00
wangchuxiao c5d144bcc4 fix friend bug 2022-11-10 17:37:46 +08:00
wangchuxiao 9a9d6ac524 config 2022-11-10 15:32:01 +08:00
skiffer-git 6ced618c1c nginx config 2022-11-10 14:56:29 +08:00
wangchuxiao bb1babad11 config 2022-11-10 14:51:35 +08:00
wangchuxiao 1a93592253 Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-10 14:30:00 +08:00
skiffer-git e52be45659 slack 2022-11-10 14:26:39 +08:00
skiffer-git e7e08a94a9 slack 2022-11-10 14:24:30 +08:00
skiffer-git d22c3867c1 slack 2022-11-10 09:23:28 +08:00
skiffer-git e52f65f690 slack 2022-11-10 09:23:19 +08:00
skiffer-git dfcfa643f0 nginx config 2022-11-09 21:05:14 +08:00
wangchuxiao a986068cbb Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-09 19:40:16 +08:00
skiffer-git af6915b1b0 install_im_server 2022-11-09 18:24:45 +08:00
wangchuxiao af46999a16 Merge branch 'main' into v2.3.0release
# Conflicts:
#	.env
#	install_im_server.sh
2022-11-09 18:18:35 +08:00
skiffer-git 322ec26829 install_im_server 2022-11-09 15:52:59 +08:00
skiffer-git 935f80cd8a install_im_server 2022-11-09 15:52:01 +08:00
skiffer-git 8379652ad5 config 2022-11-09 15:49:11 +08:00
skiffer-git decef23751 config 2022-11-09 12:36:55 +08:00
skiffer-git c639cf7162 2.3.4 2022-11-09 12:07:17 +08:00
skiffer-git 2785ab6913 Merge remote-tracking branch 'origin/main' 2022-11-09 12:06:35 +08:00
skiffer-git d92aca5b16 Optimize the script 2022-11-09 12:06:07 +08:00
wangchuxiao 4cf00a4198 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server 2022-11-09 10:49:38 +08:00
wangchuxiao f6b549678d fix k8s 2022-11-09 10:40:50 +08:00
wangchuxiao 978a7e209e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-08 17:10:45 +08:00
skiffer-git b06b8e4d2b Optimize the configuration 2022-11-08 17:10:27 +08:00
wangchuxiao 3a3412486a fix callback bug 2022-11-08 17:10:27 +08:00
skiffer-git 624014572c Optimize the configuration 2022-11-08 17:06:18 +08:00
skiffer-git 24d917bb2d Optimize the configuration 2022-11-08 17:04:18 +08:00
skiffer-git 2a4fae4718 Optimize the configuration 2022-11-08 17:01:18 +08:00
skiffer-git 9f4a8952a4 remove log 2022-11-08 11:13:07 +08:00
skiffer-git 029c020fe0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-11-08 11:12:00 +08:00
skiffer-git 1f0040ceb6 Specify the relative path for the configuration file 2022-11-08 11:08:27 +08:00
wangchuxiao 76a3334f9d test cron 2022-11-04 18:40:38 +08:00
wangchuxiao 22d0d80bfe test cron 2022-11-04 17:56:21 +08:00
wangchuxiao de13f5edbd test cron 2022-11-04 16:29:38 +08:00
wangchuxiao 953e284566 test cron 2022-11-04 16:24:56 +08:00
wangchuxiao 1b3fbf56d0 test cron 2022-11-04 16:18:45 +08:00
skiffer-git 83779a684b limit memory 2022-11-04 15:00:54 +08:00
skiffer-git d33e15a2bb log 2022-11-04 15:00:42 +08:00
skiffer-git a9b60b8052 encryption 2022-11-04 15:00:42 +08:00
skiffer-git 329d475106 limit memory 2022-11-04 15:00:28 +08:00
wangchuxiao 2cbecf439e test cron 2022-11-03 20:08:56 +08:00
wangchuxiao 389271c00d test cron 2022-11-03 19:50:06 +08:00
wangchuxiao 8839c36917 test cron 2022-11-03 19:26:41 +08:00
wangchuxiao 3649846423 test cron 2022-11-03 19:23:10 +08:00
wangchuxiao f3858e8300 test cron 2022-11-03 19:19:43 +08:00
wangchuxiao 741cfec1ec test cron 2022-11-03 19:16:23 +08:00
wangchuxiao 9326b10d3a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-11-03 18:31:51 +08:00
wangchuxiao 6d90cd59f2 test cron 2022-11-03 18:31:29 +08:00
Gordon 5c503e71ed message update 2022-11-02 15:32:36 +08:00
wangchuxiao cdf851d196 test cron 2022-11-02 12:00:23 +08:00
wangchuxiao bf09e49164 test cron 2022-11-02 11:55:48 +08:00
wangchuxiao d391a4d023 test cron 2022-11-02 11:40:55 +08:00
wangchuxiao 9182f15ee0 test cron 2022-11-02 11:17:20 +08:00
wangchuxiao be6811ddbd test cron 2022-11-01 19:51:10 +08:00
wangchuxiao 10d299d1b3 test cron 2022-11-01 19:49:19 +08:00
wangchuxiao 4989bb07f6 test cron 2022-11-01 19:39:56 +08:00
wangchuxiao 0d46349386 test cron 2022-11-01 19:18:17 +08:00
wangchuxiao 267e7c3b08 test cron 2022-11-01 19:14:33 +08:00
wangchuxiao cad689b337 test cron 2022-11-01 19:03:54 +08:00
wangchuxiao e54d5a13e8 test cron 2022-11-01 18:57:53 +08:00
wangchuxiao ac7619de55 test cron 2022-11-01 18:51:14 +08:00
wangchuxiao c75e258f81 test cron 2022-11-01 17:41:08 +08:00
wangchuxiao e4ed6dde0c test cron 2022-11-01 17:05:48 +08:00
wangchuxiao 9025d8bd90 test cron 2022-11-01 16:54:23 +08:00
wangchuxiao 2433e27eb5 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-10-28 15:43:18 +08:00
wangchuxiao 2610a27894 add birthStr field 2022-10-28 15:42:37 +08:00
Gordon eba25f1bb8 ws add logout remove push token 2022-10-27 17:15:06 +08:00
Gordon 59b625b7c0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-10-27 11:46:13 +08:00
Gordon 0eeb2f6752 log 2022-10-27 11:45:42 +08:00
Gordon cd7b484fc2 message pull 2022-10-22 17:53:15 +08:00
wangchuxiao 16b3ea8b7e callback update 2022-10-21 15:44:55 +08:00
wangchuxiao 942afd7fec callback update 2022-10-20 12:01:06 +08:00
wangchuxiao de271d5b76 callback update 2022-10-20 12:00:32 +08:00
wangchuxiao 7e826c70df add friend callback 2022-10-19 21:09:05 +08:00
wangchuxiao 162478563c add friend callback 2022-10-19 21:06:48 +08:00
wangchuxiao 8d0ae922b8 k8s deploy 2022-10-17 18:03:18 +08:00
wangchuxiao 2200f757dc Merge branch 'shichuang2' into v2.3.0release 2022-10-17 11:09:10 +08:00
Gordon 4f65882b5d user update 2022-10-11 17:30:21 +08:00
Gordon 5ba67af0e3 message update 2022-10-10 17:51:57 +08:00
wangchuxiao efeb394f3e k8s deploy 2022-10-09 11:53:46 +08:00
wangchuxiao 9a0ee3516b singal 2022-10-09 11:42:28 +08:00
wangchuxiao 55a873d0ef singal 2022-10-08 15:23:34 +08:00
wangchuxiao 0561f3e398 singal 2022-10-08 15:17:58 +08:00
wangchuxiao 68d587e484 singal 2022-10-08 11:37:11 +08:00
wangchuxiao c026754a68 singal 2022-10-08 11:04:34 +08:00
wangchuxiao 32561b5616 fix bug 2022-10-06 11:30:45 +08:00
wangchuxiao 6b30097bde index fix 2022-09-30 18:58:19 +08:00
wangchuxiao 7dc1f9b81b index fix 2022-09-30 18:39:10 +08:00
wangchuxiao 9964650014 Merge branch 'main' into v2.3.0release 2022-09-30 17:59:46 +08:00
wangchuxiao a705f6a8b7 proto 2022-09-30 17:32:06 +08:00
wangchuxiao 151cf3daf2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-30 11:05:38 +08:00
wangchuxiao 5758f1701d proto 2022-09-30 11:05:32 +08:00
Gordon ac631f7c49 revoke message 2022-09-29 19:29:22 +08:00
Gordon e814d9ea63 revoke message 2022-09-29 18:35:47 +08:00
Gordon d7e88a3213 revoke message 2022-09-29 18:32:20 +08:00
Gordon 9b3dee6aa4 revoke message 2022-09-29 18:31:36 +08:00
Gordon 879ad86e0f revoke message 2022-09-29 18:14:36 +08:00
Gordon ed63b9f3cc Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-29 17:58:14 +08:00
Gordon ef3f41bb69 revoke message 2022-09-29 17:57:40 +08:00
Gordon 4d9ed1a6cb revoke message 2022-09-29 17:57:26 +08:00
wangchuxiao 4b8f6f1f66 fix bug 2022-09-29 17:53:02 +08:00
wangchuxiao cf57f999c5 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-29 17:47:30 +08:00
wangchuxiao fd9630ea84 fix bug 2022-09-29 17:47:12 +08:00
wangchuxiao 9fed812872 fix bug 2022-09-29 15:53:54 +08:00
wangchuxiao 41b7e5f32d fix bug 2022-09-29 15:24:56 +08:00
wangchuxiao 3345b6e242 fix bug 2022-09-29 15:23:28 +08:00
Gordon 52a4577b4c del msg test 2022-09-28 17:29:08 +08:00
Gordon 267d93168d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-28 16:45:24 +08:00
Gordon 78895288d0 del msg test 2022-09-28 16:44:50 +08:00
wangchuxiao 249d5e2788 signal 2022-09-28 16:35:20 +08:00
wangchuxiao 488346979d Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-28 15:39:19 +08:00
wangchuxiao cadecdb3b8 signal 2022-09-28 15:39:03 +08:00
Gordon 9d9d3db701 http status change 2022-09-28 15:33:49 +08:00
Gordon 5b216e6a3a revoke message struct update 2022-09-28 14:43:43 +08:00
wangchuxiao c03e26ee5e signal 2022-09-27 17:18:25 +08:00
wangchuxiao bcc2f05aa5 workmoment 2022-09-27 16:59:56 +08:00
wangchuxiao b18813689d workmoment 2022-09-27 15:45:47 +08:00
wangchuxiao 79999edcea Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-27 15:35:50 +08:00
wangchuxiao 764b34d947 workmoment 2022-09-27 15:35:36 +08:00
Gordon 51fa675e90 callback update 2022-09-26 12:22:28 +08:00
liu ming e000dc18aa 添加袤博推送 (#284)
Co-authored-by: liuming <liuming@example.com>
2022-09-23 17:40:48 +08:00
skiffer-git 1f81c7ba2d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-21 20:20:41 +08:00
skiffer-git c1811463cb add ParseToken rpc 2022-09-21 20:20:26 +08:00
Gordon 7a1dc6da01 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-21 18:58:25 +08:00
Gordon 0a28bcfbe9 mongo index modify 2022-09-21 18:58:15 +08:00
skiffer-git 93f3dd14a5 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-21 18:45:06 +08:00
skiffer-git 6d82c9c3db add ParseToken rpc 2022-09-21 18:44:21 +08:00
Gordon 3714873b7b online push info callback update 2022-09-21 16:14:57 +08:00
Gordon 5534c2a8f8 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-21 16:09:31 +08:00
Gordon cad23f1672 online push info callback update 2022-09-21 16:09:02 +08:00
skiffer-git 2bf50bb8c2 update proto 2022-09-21 09:23:10 +08:00
skiffer-git 6ad50e4e04 jwt import update 2022-09-21 09:13:58 +08:00
skiffer-git 1c5aae2301 update proto 2022-09-21 09:09:00 +08:00
skiffer-git aed95ed4fc update proto 2022-09-21 08:40:31 +08:00
skiffer-git 2a97801aae update proto 2022-09-21 08:39:15 +08:00
skiffer-git c6aefa984d update proto 2022-09-21 08:37:15 +08:00
skiffer-git 5e9f1ac00f update proto 2022-09-21 08:36:33 +08:00
skiffer-git 0a83470019 update proto 2022-09-20 23:33:46 +08:00
skiffer-git 0ed1f6c341 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-20 23:31:47 +08:00
skiffer-git e85463c4a1 update proto 2022-09-20 23:31:28 +08:00
wangchuxiao 31c18bf856 organization 2022-09-20 19:18:10 +08:00
wangchuxiao ca1d36556b organization 2022-09-20 11:23:14 +08:00
wangchuxiao 3085bc1443 orgization 2022-09-20 11:14:31 +08:00
wangchuxiao 7843d81c18 orgization 2022-09-20 11:11:33 +08:00
wangchuxiao 8155551464 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-20 11:09:08 +08:00
wangchuxiao 168dd1d01f orgization 2022-09-20 11:08:46 +08:00
Gordon 18e92ccbd3 push update 2022-09-20 10:39:43 +08:00
skiffer-git 2ad71fc4ac Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-20 09:23:42 +08:00
skiffer-git 29380b93ef update version 2022-09-20 09:23:16 +08:00
Gordon 00d2ff810b media message change to push directly 2022-09-19 22:16:45 +08:00
wangchuxiao a99295f594 cms add api 2022-09-19 12:15:01 +08:00
wangchuxiao cc8a2e5fce cms add api 2022-09-19 12:12:52 +08:00
wangchuxiao 7137320f1a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-19 12:00:41 +08:00
wangchuxiao 376c9bbdc7 cms add api 2022-09-19 11:52:03 +08:00
skiffer-git 49d57f46ae prometheus for statistics 2022-09-19 11:10:37 +08:00
skiffer-git a4fe45d58c Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-18 10:51:07 +08:00
skiffer-git db8763b610 fix bug :KickUserOffline panic: runtime error: invalid memory address or nil pointer dereference 2022-09-18 10:50:51 +08:00
wangchuxiao 1a61598322 v2.3.3 2022-09-16 19:06:25 +08:00
wangchuxiao d971397c8b v2.3.3 2022-09-16 18:41:11 +08:00
wangchuxiao 427a598385 check login 2022-09-16 18:11:14 +08:00
wangchuxiao 4c0b96d81a check login 2022-09-16 18:10:27 +08:00
wangchuxiao af2baba1e3 merge shichuang 2022-09-16 17:23:28 +08:00
skiffer-git 93cb01e7e6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-16 16:52:15 +08:00
skiffer-git 139285c46a Support mongodb cluster 2022-09-16 16:52:03 +08:00
wangchuxiao dc401c784a Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-16 16:51:25 +08:00
wangchuxiao bb0f5e97a2 kafka 2022-09-16 16:51:12 +08:00
skiffer-git 82cd3fd9f1 Support mongodb cluster 2022-09-16 16:29:37 +08:00
skiffer-git 06117c98b1 Support mongodb cluster 2022-09-16 16:17:21 +08:00
skiffer-git aa41dc3650 Support mongodb cluster 2022-09-16 15:54:26 +08:00
skiffer-git 98fe00a171 Support mongodb cluster 2022-09-16 15:14:02 +08:00
skiffer-git 3bdafc2a11 Support mongodb cluster 2022-09-16 15:11:13 +08:00
skiffer-git 3c4227696c Support mongodb cluster 2022-09-16 15:08:48 +08:00
skiffer-git 5d78fa9519 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-16 15:07:13 +08:00
skiffer-git eb2a9d540e Support mongodb cluster 2022-09-16 15:06:49 +08:00
wangchuxiao 665e2e3e83 add mysql 2022-09-16 11:57:01 +08:00
wangchuxiao c025d0d030 add mysql 2022-09-15 20:17:09 +08:00
wangchuxiao 1ce0a3b5d3 add mysql 2022-09-15 20:12:18 +08:00
wangchuxiao 7c79d10f5d add mysql 2022-09-15 20:07:29 +08:00
wangchuxiao eeb5ba4c7b prome 2022-09-15 19:55:24 +08:00
wangchuxiao 5d32627553 grafana 2022-09-15 19:46:13 +08:00
wangchuxiao 07a038503e grafana 2022-09-15 19:22:36 +08:00
wangchuxiao 3a878f8426 prometheus 2022-09-15 17:58:51 +08:00
wangchuxiao 1cfa55817a prometheus 2022-09-15 17:50:45 +08:00
wangchuxiao 78ce5c3f69 prometheus 2022-09-15 16:39:49 +08:00
skiffer-git 97187af0c7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-15 16:28:34 +08:00
skiffer-git d26076c0e4 prometheus for statistics 2022-09-15 16:28:19 +08:00
wangchuxiao 1f81bd121f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-15 16:27:46 +08:00
wangchuxiao 02fa9142fe prometheus 2022-09-15 16:27:36 +08:00
skiffer-git 6759e0c25b fix bug: invited/kick failed due to json tag validation 2022-09-15 15:52:48 +08:00
wangchuxiao 46e233ccbb fix bug 2022-09-15 15:40:26 +08:00
skiffer-git 1b31de18e4 Remove duplicate messageVerification call in sendMsg 2022-09-15 15:03:57 +08:00
skiffer-git ccc65c846f prometheus for statistics 2022-09-15 13:17:53 +08:00
skiffer-git 9d73fc9932 Remove duplicate messageVerification call in sendMsg 2022-09-15 12:55:40 +08:00
skiffer-git d6abbacbf7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	internal/rpc/msg/rpcChat.go
#	pkg/common/prometheus/gather.go
2022-09-15 12:27:55 +08:00
skiffer-git 979100850c prometheus for statistics 2022-09-15 12:07:28 +08:00
wangchuxiao a0a2b6c340 fix bug 2022-09-15 11:38:31 +08:00
wangchuxiao 7f1acb4532 prome 2022-09-15 09:30:23 +08:00
wangchuxiao 9afaba4382 prome 2022-09-15 09:16:08 +08:00
wangchuxiao 355c672ed1 prome 2022-09-15 08:50:29 +08:00
wangchuxiao 144cf279f9 prome 2022-09-15 08:45:10 +08:00
wangchuxiao c1a94a1b6c prome 2022-09-15 01:48:24 +08:00
wangchuxiao c091b5f385 prome 2022-09-15 01:46:22 +08:00
wangchuxiao aa6b439e8c prome 2022-09-15 01:35:08 +08:00
wangchuxiao 07170135e6 prome 2022-09-15 01:28:56 +08:00
wangchuxiao 024ee6e602 prome 2022-09-15 01:23:57 +08:00
wangchuxiao a1f79f4508 prome 2022-09-15 01:22:20 +08:00
skiffer-git 6a6009827c prometheus for statistics 2022-09-14 21:42:04 +08:00
skiffer-git 375fc0c89e prometheus for statistics 2022-09-14 21:11:40 +08:00
skiffer-git a110b4c26b prometheus for statistics 2022-09-14 20:27:54 +08:00
skiffer-git ebdb875c56 prometheus for statistics 2022-09-14 19:36:59 +08:00
wangchuxiao 266a2b4c76 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-14 19:28:56 +08:00
wangchuxiao 7e5b62377f add 2022-09-14 19:28:17 +08:00
skiffer-git 8dce5396b0 prometheus for statistics 2022-09-14 18:58:30 +08:00
skiffer-git e78f7a2a37 prometheus for statistics 2022-09-14 18:47:11 +08:00
Gordon aafbda47d4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-14 18:33:18 +08:00
Gordon e1b1af9a48 private message cache update 2022-09-14 18:31:56 +08:00
Gordon 19f725965d private message cache update 2022-09-14 18:30:52 +08:00
wangchuxiao 5ce0cf1aad prome 2022-09-14 18:16:02 +08:00
wangchuxiao 88bcb35a14 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-14 17:45:51 +08:00
wangchuxiao d534f026b0 promethues 2022-09-14 17:45:38 +08:00
skiffer-git 939eb95cdc log 2022-09-14 16:39:03 +08:00
skiffer-git 46d3dd409a log 2022-09-14 16:29:22 +08:00
skiffer-git 398be73f5b log 2022-09-14 15:34:09 +08:00
skiffer-git e7ab59a932 log 2022-09-14 15:24:56 +08:00
skiffer-git 285cb346b9 log 2022-09-14 14:52:14 +08:00
skiffer-git 72d0920458 log 2022-09-14 14:42:35 +08:00
skiffer-git 4aaa1a7afa log 2022-09-14 13:09:04 +08:00
skiffer-git f2f35e115c log 2022-09-14 13:08:15 +08:00
skiffer-git 7295f39d68 log 2022-09-14 12:45:42 +08:00
skiffer-git 685cacf490 log 2022-09-14 12:43:10 +08:00
skiffer-git 1f36d970f9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-14 12:31:46 +08:00
skiffer-git 60f0c80c36 log 2022-09-14 12:31:24 +08:00
wangchuxiao c018d63117 add log 2022-09-14 12:24:29 +08:00
wangchuxiao 88af048e90 add log 2022-09-14 12:19:17 +08:00
wangchuxiao c0190e21c6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-14 11:00:42 +08:00
wangchuxiao 2368a8fba3 fix transfer 2022-09-14 11:00:27 +08:00
skiffer-git e9ad462f9e log 2022-09-14 10:42:02 +08:00
wangchuxiao 4ac9d0410c Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-09-14 10:29:55 +08:00
wangchuxiao 1c53c90ab5 hash 2022-09-14 10:29:49 +08:00
wangchuxiao 4d6e05989e prome 2022-09-14 10:25:44 +08:00
wangchuxiao 54a3a755d6 prome 2022-09-14 10:25:31 +08:00
wangchuxiao e32a3fbfca hash 2022-09-13 19:58:48 +08:00
wangchuxiao f498f67f1e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-13 18:32:01 +08:00
wangchuxiao d491c482a5 hash 2022-09-13 18:31:47 +08:00
skiffer-git 7062676f9a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-13 18:15:50 +08:00
skiffer-git 0d52759455 fix bug : messages can be sent after the group is disbanded 2022-09-13 18:15:33 +08:00
wangchuxiao 9a5c0bae50 hash 2022-09-13 18:02:37 +08:00
wangchuxiao eb30e54dc8 Merge branch 'v2.3.0release' 2022-09-13 16:19:32 +08:00
wangchuxiao 4ea97ab23f group cms 2022-09-13 16:19:01 +08:00
wangchuxiao 82f2ec24fb group 2022-09-13 15:27:00 +08:00
wangchuxiao d487465b2a prome 2022-09-13 11:40:08 +08:00
wangchuxiao 899e88babe prome 2022-09-13 01:06:18 +08:00
wangchuxiao 83f923aa10 prome 2022-09-13 00:53:17 +08:00
wangchuxiao 04a0614319 prome 2022-09-13 00:22:34 +08:00
wangchuxiao 632ff783c6 fix bug 2022-09-12 23:50:14 +08:00
wangchuxiao e4f86ee823 add prome 2022-09-12 23:46:28 +08:00
wangchuxiao f7390c757b add prome 2022-09-12 23:38:34 +08:00
wangchuxiao 7a9b45d257 add prome 2022-09-12 22:55:30 +08:00
wangchuxiao b699ce3512 add prome 2022-09-12 22:47:51 +08:00
wangchuxiao da9003ec46 prome 2022-09-12 21:24:39 +08:00
wangchuxiao 30a0743c8c prome 2022-09-12 21:24:05 +08:00
wangchuxiao a4fc493ea5 prome 2022-09-12 20:51:54 +08:00
wangchuxiao f5f6e9a882 prome 2022-09-12 20:50:22 +08:00
wangchuxiao 21cda37380 prome 2022-09-12 20:25:37 +08:00
wangchuxiao 941670a420 prome 2022-09-12 20:23:45 +08:00
wangchuxiao 15b01a07b5 prome 2022-09-12 20:11:33 +08:00
wangchuxiao 85565dc137 prome 2022-09-12 19:56:15 +08:00
wangchuxiao d59f699937 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-12 19:34:21 +08:00
wangchuxiao ef66b10501 prome 2022-09-12 19:32:24 +08:00
Gordon 081c47aba9 docker compose file update 2022-09-10 21:48:29 +08:00
Gordon 6cdb64fb8b Merge remote-tracking branch 'origin/v2.3.0release' into main 2022-09-10 21:31:03 +08:00
Gordon 765e8d4f79 log test 2022-09-10 00:15:31 +08:00
Gordon 8e7e496b44 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-09 23:40:53 +08:00
Gordon cf14b19bf6 log test 2022-09-09 23:40:35 +08:00
wangchuxiao 2131061482 v2.3.2 2022-09-09 18:30:49 +08:00
wangchuxiao 692cebe659 rpome 2022-09-09 17:17:10 +08:00
wangchuxiao 189d5aed69 promethues 2022-09-09 17:02:23 +08:00
wangchuxiao ea38953b47 promethues 2022-09-09 17:00:07 +08:00
wangchuxiao 9130881875 promethues 2022-09-09 16:53:07 +08:00
wangchuxiao 46b1803086 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-09 16:27:23 +08:00
wangchuxiao 98dde67f65 v2.3.2 2022-09-09 16:26:57 +08:00
skiffer-git 34eedd7955 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-09 15:53:07 +08:00
skiffer-git 98d7c7bb86 Limit the number of group members for kick/create/invite 2022-09-09 15:52:47 +08:00
wangchuxiao 74c2bafc9b merge 2022-09-09 15:33:50 +08:00
wangchuxiao 912da395c9 merge 2022-09-09 15:29:22 +08:00
wangchuxiao 061ad6df2c merge 2022-09-09 12:40:32 +08:00
Gordon b5deceaa3b put client msg id to offline callback 2022-09-09 11:00:15 +08:00
Gordon 22099d82be Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-09 10:59:00 +08:00
Gordon 07e1de2f62 put client msg id to offline callback 2022-09-09 10:58:38 +08:00
wangchuxiao 2203638fc5 promethues 2022-09-09 10:37:09 +08:00
wangchuxiao 5ef7123f78 promethues 2022-09-09 10:29:30 +08:00
wangchuxiao 5ae9b84cce prome 2022-09-09 02:05:04 +08:00
wangchuxiao f41cebe776 prometheus 2022-09-09 01:39:00 +08:00
wangchuxiao dd47dbffe8 docker-compose 2022-09-09 01:14:24 +08:00
wangchuxiao aebcd1db2e docker-compose 2022-09-09 01:10:06 +08:00
wangchuxiao 4af9d88771 docker 2022-09-08 15:18:51 +08:00
wangchuxiao 6f706d9aaf docker 2022-09-08 13:08:06 +08:00
wangchuxiao 700f1e0001 docker 2022-09-08 12:29:44 +08:00
wangchuxiao 9cc0825185 prome 2022-09-08 02:32:59 +08:00
wangchuxiao 26c65d0da8 prome 2022-09-08 02:19:23 +08:00
wangchuxiao 602ac1ffb8 prome 2022-09-08 02:15:21 +08:00
wangchuxiao 947609a3b3 prome 2022-09-08 02:08:41 +08:00
wangchuxiao db38a64a30 prome 2022-09-08 02:08:14 +08:00
wangchuxiao 783a4d33b4 prome 2022-09-08 01:54:19 +08:00
wangchuxiao c80b4c1d32 prome 2022-09-08 01:46:30 +08:00
wangchuxiao b1f1ec5fbb prome 2022-09-08 01:31:00 +08:00
wangchuxiao 2cad8a879d Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-08 01:27:19 +08:00
wangchuxiao 95910f5c17 prome 2022-09-08 01:27:05 +08:00
Gordon f3a9c47c2a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-07 20:39:26 +08:00
wangchuxiao 3d184c95ba Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang 2022-09-07 18:23:06 +08:00
wangchuxiao 6754fdb580 getui 2022-09-07 18:20:41 +08:00
wangchuxiao 9842e5624e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-07 17:01:22 +08:00
wangchuxiao d00b265347 prome 2022-09-07 16:53:53 +08:00
Gordon c72f898238 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-07 16:43:40 +08:00
Gordon 4a2a9eb997 fcm push modify 2022-09-07 16:41:18 +08:00
skiffer-git 5b399d0d06 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-07 14:05:28 +08:00
skiffer-git 8edacbff2f log 2022-09-07 14:05:16 +08:00
wangchuxiao 156e9e2fc7 cms 2022-09-06 20:41:46 +08:00
wangchuxiao 4682abf4c1 cms 2022-09-06 20:35:32 +08:00
wangchuxiao 6871c7e665 fix bug 2022-09-06 17:57:12 +08:00
wangchuxiao a508dd2c0f fix bug 2022-09-06 17:51:29 +08:00
wangchuxiao 5469bb6508 fix bug 2022-09-06 17:46:55 +08:00
wangchuxiao 099461dbbf cms 2022-09-06 17:19:13 +08:00
wangchuxiao 5233e4c097 fix bug 2022-09-06 16:08:28 +08:00
wangchuxiao 70e8811d5c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-06 15:51:30 +08:00
wangchuxiao 7208dd6b2a cms 2022-09-06 15:51:18 +08:00
Gordon 44af6740c7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-06 12:00:43 +08:00
Gordon 8d1dd92df7 opid add 2022-09-06 11:57:22 +08:00
wangchuxiao a5cacaceda Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-06 01:14:51 +08:00
wangchuxiao 821e704b5b cms 2022-09-06 01:14:36 +08:00
Gordon 82c79bd91c conversation unread modify 2022-09-05 21:21:16 +08:00
Gordon bde0adfbd0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
2022-09-05 21:00:18 +08:00
Gordon 6c8b115479 conversation unread modify 2022-09-05 19:07:16 +08:00
wangchuxiao 82a8f18e88 merge cms into v2.3.0release 2022-09-05 18:28:11 +08:00
wangchuxiao bdae1f10d4 merge cms into v2.3.0release 2022-09-05 18:11:03 +08:00
wangchuxiao 05b5a0ada3 add 2022-09-05 17:52:43 +08:00
skiffer-git 3fcc2c2678 cache for GetDefaultGatewayConn4Unique 2022-09-03 15:48:45 +08:00
skiffer-git 6af9d3129e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-03 10:35:19 +08:00
skiffer-git d7cff79ac7 log 2022-09-03 10:34:45 +08:00
Gordon f6137dfc34 fcm ios push badge 2022-09-02 22:03:35 +08:00
wangchuxiao 6dfbb90b80 fix signal 2022-09-02 17:22:27 +08:00
Gordon 72aff32024 fcm ios push badge 2022-09-02 16:36:47 +08:00
wangchuxiao 9f4c367249 cms 2022-09-02 14:57:08 +08:00
Gordon 3f87958328 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-02 12:04:11 +08:00
Gordon a0e689c437 fcm ios push badge 2022-09-02 12:03:28 +08:00
wangchuxiao 49f05d334d cms 2022-09-02 12:01:10 +08:00
wangchuxiao a372ef3faa cms 2022-09-02 11:35:20 +08:00
wangchuxiao 06e48516bb cms 2022-09-02 11:28:01 +08:00
wangchuxiao a317ebd8e7 cms 2022-09-02 11:26:25 +08:00
wangchuxiao 6774a8594f cms 2022-09-02 02:01:42 +08:00
wangchuxiao 56fb579da2 Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-09-01 21:59:09 +08:00
wangchuxiao b401917c19 cache 2022-09-01 21:58:53 +08:00
skiffer-git e990118475 fix bug :pushMsg.MsgData.OfflinePushInfo==nil 2022-09-01 21:58:22 +08:00
wangchuxiao ac2cc154b4 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-09-01 21:18:46 +08:00
wangchuxiao 99ec0ed8df del key 2022-09-01 21:18:33 +08:00
skiffer-git 32daea25de Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-01 21:15:59 +08:00
skiffer-git 946dbc5efc change log file mode 2022-09-01 21:15:30 +08:00
Gordon 714dd597f1 fcm ios push badge 2022-09-01 21:06:07 +08:00
Gordon c36dfd9eea Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-01 21:05:36 +08:00
Gordon 67e5e3b56b fcm ios push badge 2022-09-01 21:05:16 +08:00
skiffer-git fdc1cd26e7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-09-01 20:52:11 +08:00
skiffer-git 988824f3f1 change log file mode 2022-09-01 20:51:53 +08:00
Gordon 15ef064fc3 user conn map copy 2022-08-31 17:32:40 +08:00
wangchuxiao c7d544685e cms 2022-08-31 15:26:32 +08:00
wangchuxiao d622f1df3d fcm 2022-08-31 15:11:09 +08:00
wangchuxiao c7e1302377 add 2022-08-31 15:06:59 +08:00
wangchuxiao caea072f7d fcm 2022-08-31 14:53:16 +08:00
wangchuxiao 04b22c1a76 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-31 11:56:50 +08:00
wangchuxiao 26d9d7630c fcm 2022-08-31 11:55:55 +08:00
skiffer-git 4529047349 log for msg_gateway cluster 2022-08-31 11:16:44 +08:00
wangchuxiao af110f75d6 add 2022-08-31 01:50:56 +08:00
wangchuxiao 1da5ad8830 add 2022-08-31 01:29:29 +08:00
wangchuxiao 8e063f6e59 cms 2022-08-31 01:01:38 +08:00
wangchuxiao d16ceac149 cms 2022-08-31 00:54:02 +08:00
wangchuxiao c2831e6676 cms 2022-08-31 00:43:06 +08:00
wangchuxiao a4b95cb7cf cms 2022-08-30 23:23:53 +08:00
skiffer-git e5a7810d6e add group member cache in msg rpc 2022-08-30 22:04:13 +08:00
skiffer-git 99e913637a add group member cache in push 2022-08-30 21:31:53 +08:00
skiffer-git 9ff80466fc Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-30 21:22:46 +08:00
skiffer-git 67319031ea log 2022-08-30 21:22:14 +08:00
wangchuxiao 5134faeefd cms 2022-08-30 17:33:20 +08:00
wangchuxiao 77327f59b9 cms 2022-08-30 16:53:15 +08:00
wangchuxiao 5b68d86052 k8s 2022-08-30 16:30:08 +08:00
wangchuxiao 54c56037e7 cms 2022-08-30 14:17:40 +08:00
wangchuxiao 8f31bd93fa k8s conf 2022-08-30 11:31:45 +08:00
wangchuxiao 87dfdb2ddc cms 2022-08-30 02:20:04 +08:00
wangchuxiao 2c2d3e4641 cms 2022-08-30 02:02:41 +08:00
wangchuxiao 2a8b19d319 cms 2022-08-30 01:57:06 +08:00
wangchuxiao f43c042223 cms 2022-08-30 01:45:41 +08:00
wangchuxiao b75b46f415 cms 2022-08-30 01:44:34 +08:00
wangchuxiao 42f7af3d52 cms 2022-08-30 01:42:27 +08:00
wangchuxiao a4767bc7e3 cms 2022-08-30 01:40:54 +08:00
wangchuxiao 8d4e5ad3f1 cms 2022-08-30 01:38:23 +08:00
skiffer-git 49a127d97d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-29 22:31:38 +08:00
skiffer-git 8cfb604a0d set mysql connection 2022-08-29 22:31:14 +08:00
wangchuxiao da9918b655 cms 2022-08-29 17:16:54 +08:00
wangchuxiao c41464b974 cms 2022-08-29 16:34:13 +08:00
wangchuxiao 5657f617e7 merge 2022-08-29 16:16:33 +08:00
wangchuxiao 12e6cbb9e5 add 2022-08-29 16:11:56 +08:00
wangchuxiao bc1cfed389 xms 2022-08-29 16:09:10 +08:00
wangchuxiao 9b5e1465c3 add 2022-08-29 16:05:12 +08:00
wangchuxiao 7f5b12d4d2 cms 2022-08-29 15:52:39 +08:00
wangchuxiao c3d3f0986e join groups 2022-08-29 14:34:07 +08:00
skiffer-git 8c21d0360f log 2022-08-29 12:04:58 +08:00
wangchuxiao 650141a498 fix org 2022-08-29 11:36:58 +08:00
skiffer-git 6ff8fc7f87 merge code : Filter push data by time 2022-08-29 09:48:55 +08:00
skiffer-git 0f0e99b42e merge code : Filter push data by time 2022-08-29 09:34:52 +08:00
skiffer-git 96814109dc fix bug: GetSelfUserInfo for no result 2022-08-27 15:20:49 +08:00
skiffer-git 39720d401f fix bug: msg_gateway/gate/ws_server.go:138 2022-08-27 12:24:06 +08:00
wangchuxiao 5e6e30a5b3 fix bug 2022-08-27 00:24:09 +08:00
wangchuxiao a92c0ffac3 fix bug 2022-08-27 00:14:53 +08:00
wangchuxiao 43f7ecc75a fix bug 2022-08-27 00:03:12 +08:00
wangchuxiao d598ec1852 fix bug 2022-08-26 23:23:42 +08:00
wangchuxiao fad61a0a2a fix bug 2022-08-26 22:20:13 +08:00
wangchuxiao 3886d49b0a admin cms 2022-08-26 17:51:01 +08:00
Gordon 93f8ed223e group file update 2022-08-26 17:41:58 +08:00
Gordon 96e0851563 group file update 2022-08-26 11:39:01 +08:00
Gordon 9d1eb469b5 compose file update 2022-08-25 14:05:59 +08:00
Gordon 4001897338 compose file update 2022-08-25 14:02:18 +08:00
Gordon 27dd574c4d err log 2022-08-24 20:33:41 +08:00
Gordon 06a75a0a0e add version 2022-08-24 18:12:18 +08:00
Gordon 8cf7282f46 add version 2022-08-24 18:12:00 +08:00
Gordon dd8e42ef71 Merge remote-tracking branch 'origin/v2.3.0release' into main
# Conflicts:
#	config/config.yaml
2022-08-24 17:51:28 +08:00
Gordon 221b4587d4 shell update 2022-08-24 16:20:31 +08:00
Gordon 4203c4d30c shell update 2022-08-24 16:15:24 +08:00
Gordon 059dd1993a shell update 2022-08-24 15:51:50 +08:00
Gordon e172364e86 shell update 2022-08-24 15:51:23 +08:00
Gordon 0941a8e016 shell update 2022-08-24 15:45:13 +08:00
Gordon de67b9465a callback add ex field and sdk server shell update 2022-08-24 15:42:27 +08:00
Gordon a2a71ff8f5 callback add ex field and sdk server shell update 2022-08-24 15:38:57 +08:00
Gordon 0befceef9a callback add ex field and sdk server shell update 2022-08-24 15:26:33 +08:00
Gordon 203bfbe411 callback add ex field and sdk server shell update 2022-08-24 15:20:01 +08:00
Gordon 1f4eeaa269 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-24 14:22:56 +08:00
Gordon aa2d07ca8d callback add ex field and sdk server shell update 2022-08-24 14:22:47 +08:00
wangchuxiao 3739127044 conversation 2022-08-23 19:17:52 +08:00
wangchuxiao 2dab179166 conversation 2022-08-23 19:13:56 +08:00
wangchuxiao 9590d2865a conversation 2022-08-23 19:08:20 +08:00
wangchuxiao d542cdd898 conversation 2022-08-23 17:32:21 +08:00
wangchuxiao 1d0d063a6c add 2022-08-23 15:46:10 +08:00
wangchuxiao 9f15f50f9d fix conversation 2022-08-23 15:42:05 +08:00
skiffer-git f0ebc151db Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-23 12:36:12 +08:00
skiffer-git f0a9c63cd3 log for remote ip 2022-08-23 12:35:50 +08:00
Gordon ec0cd9a348 conversation update 2022-08-23 12:06:44 +08:00
Gordon b5afd304d0 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-22 20:00:15 +08:00
Gordon 4bd4e0863c conversation update 2022-08-22 20:00:05 +08:00
skiffer-git 463a5451e1 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-22 19:19:44 +08:00
skiffer-git cb881e81a8 log for cost time 2022-08-22 19:19:30 +08:00
wangchuxiao 92fc43cb3d conversation 2022-08-22 16:14:31 +08:00
wangchuxiao 73a73b7bc7 conversation 2022-08-22 16:03:59 +08:00
wangchuxiao 3391bd8322 conversation 2022-08-22 15:59:45 +08:00
wangchuxiao 3d5876a8c0 Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-22 15:48:05 +08:00
wangchuxiao 7d04f06f7d conversation fix 2022-08-22 15:47:50 +08:00
Gordon 24137bffdd conversation update 2022-08-21 23:56:44 +08:00
Gordon 621051cfb9 pb update 2022-08-21 23:37:43 +08:00
Gordon 2c21bf3e0e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-21 23:32:00 +08:00
Gordon c1a2dee0e9 pb update 2022-08-21 23:25:39 +08:00
wangchuxiao 782ad07940 fix bug 2022-08-21 22:28:10 +08:00
wangchuxiao d57729d3d7 fix bug 2022-08-21 22:22:59 +08:00
wangchuxiao 1f8c2ba8c5 fix bug 2022-08-21 22:18:50 +08:00
wangchuxiao b176701e51 fix bug 2022-08-21 22:09:00 +08:00
wangchuxiao 7dd6869cd1 fix bug 2022-08-21 22:07:46 +08:00
wangchuxiao 33886f106c fix bug 2022-08-21 22:04:33 +08:00
wangchuxiao 94ed160eee fix bug 2022-08-21 21:59:28 +08:00
wangchuxiao 066eeb6ba6 fix bug 2022-08-21 21:57:46 +08:00
wangchuxiao 402b3f5535 fix bug 2022-08-21 21:56:55 +08:00
wangchuxiao d4d9e08ae2 fix bug 2022-08-21 21:55:46 +08:00
wangchuxiao 6553ada66f add set client init 2022-08-21 21:54:32 +08:00
Gordon c0b49ff219 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-21 19:07:03 +08:00
wangchuxiao d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
wangchuxiao ee577cae4c add conversationCache 2022-08-21 17:33:40 +08:00
Gordon ed5b215bbb pc terminal can login at same time 2022-08-21 16:05:58 +08:00
skiffer-git a5f8e833ba build_all_service 2022-08-19 21:51:35 +08:00
skiffer-git decd70ff21 batch_build_all_service 2022-08-19 21:44:30 +08:00
skiffer-git 9f002172db Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-19 21:37:56 +08:00
skiffer-git 5d661f2fc6 add user register IP 2022-08-19 21:37:39 +08:00
Gordon 9a82dd356c callback add offline info 2022-08-19 13:04:38 +08:00
wangchuxiao 840e08fc8a Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-08-19 12:09:21 +08:00
wangchuxiao 761b8c40d6 conversation cache function 2022-08-19 12:09:05 +08:00
Gordon 40b7314f6d model add update time 2022-08-19 11:58:46 +08:00
wangchuxiao 5c3a43f602 fix bug 2022-08-18 11:14:38 +08:00
skiffer-git dd001ab0e7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-18 10:50:39 +08:00
skiffer-git 30b55ce25e GetSelfUserInfo: Handle the case where the user does not exist 2022-08-18 10:50:09 +08:00
wangchuxiao 943a5b36e3 Merge branch 'del' into v2.3.0release 2022-08-17 21:38:00 +08:00
wangchuxiao 0ebaefb8be Merge branch 'v2.3.0release' of https://github.com/OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-17 21:37:31 +08:00
wangchuxiao 5a995a8624 rtc pb 2022-08-17 21:32:34 +08:00
Gordon eee98c5175 revoke super group message and push message modify 2022-08-17 20:18:56 +08:00
wangchuxiao 4614107b2b Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-17 18:21:49 +08:00
wangchuxiao d6dd99bb4a add 2022-08-17 15:34:07 +08:00
wangchuxiao d0a200f652 etcd 2022-08-17 14:57:57 +08:00
wangchuxiao 9138f90843 etcd 2022-08-17 12:58:51 +08:00
wangchuxiao 766a8fa4dd Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-08-17 12:24:49 +08:00
wangchuxiao 6f2451edd3 etcd 2022-08-17 12:12:54 +08:00
skiffer-git 864fccbdb2 get grpc conn from config 2022-08-17 11:58:23 +08:00
wangchuxiao 8956df9599 etcd 2022-08-17 11:51:37 +08:00
skiffer-git a3daaa55b5 get grpc conn from config 2022-08-17 11:46:11 +08:00
skiffer-git 85a52f5d6b get grpc conn from config 2022-08-17 11:42:12 +08:00
skiffer-git 92d7ecdf68 Merge remote-tracking branch 'origin/shichuang' into shichuang
# Conflicts:
#	pkg/grpc-etcdv3/getcdv3/resolver.go
2022-08-17 11:36:12 +08:00
skiffer-git cdf09aa1bd get grpc conn from config 2022-08-17 11:35:33 +08:00
wangchuxiao 63a830cc95 Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-08-17 11:29:31 +08:00
wangchuxiao 3b9cc61669 update orgnization after update user 2022-08-17 11:27:56 +08:00
wangchuxiao b5166acada update orgnization after update user 2022-08-17 10:42:17 +08:00
Gordon a38291fc17 notification 2022-08-17 10:18:01 +08:00
skiffer-git 723e304ed8 set mysql max conn 2022-08-16 23:52:53 +08:00
wangchuxiao 63ac7738bb Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang 2022-08-16 23:45:45 +08:00
wangchuxiao bda96a2175 fix 2022-08-16 23:45:32 +08:00
skiffer-git 5b06791a6c set max PlatformID = 9 2022-08-16 23:26:13 +08:00
wangchuxiao 64e1361ef5 fix signal bug 2022-08-16 23:08:16 +08:00
skiffer-git 2f6eb5969e getui 2022-08-16 21:21:29 +08:00
skiffer-git 125b6fa779 Merge remote-tracking branch 'origin/del' into del 2022-08-16 21:15:37 +08:00
skiffer-git 5e78871c00 getui 2022-08-16 21:15:20 +08:00
Gordon 487d9a6449 notification 2022-08-16 19:54:04 +08:00
Gordon 97b1a774fb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-16 19:16:20 +08:00
Gordon 12a4c12753 notification 2022-08-16 19:15:54 +08:00
wangchuxiao e8fdc454db update orgnization after update user 2022-08-16 15:08:12 +08:00
wangchuxiao 69da4410dc update orgnization after update user 2022-08-16 15:07:19 +08:00
wangchuxiao 5fc6f78555 Merge branch 'v2.3.0release' into del 2022-08-16 14:17:19 +08:00
wangchuxiao 15e0a7aa38 update orgnization after update user 2022-08-16 14:15:51 +08:00
wangchuxiao 0d62bfb0c6 Merge branch 'v2.3.0release' into del 2022-08-16 13:12:40 +08:00
wangchuxiao a37d82e2dd update orgnization after update user 2022-08-16 13:12:21 +08:00
wangchuxiao 0a14c8b3e6 update orgnization after update user 2022-08-16 13:11:59 +08:00
wangchuxiao e779280428 Merge branch 'v2.3.0release' into del 2022-08-16 13:06:08 +08:00
wangchuxiao 753cd95a18 update orgnization after update user 2022-08-16 13:05:47 +08:00
wangchuxiao 5bd34f19fe Merge branch 'v2.3.0release' into del 2022-08-16 13:01:42 +08:00
wangchuxiao 0e5b17adcc update orgnization after update user 2022-08-16 13:01:14 +08:00
wangchuxiao b23f10ecde Merge branch 'v2.3.0release' into del 2022-08-16 12:57:28 +08:00
wangchuxiao 08d6e142c3 update orgnization after update user 2022-08-16 12:57:20 +08:00
wangchuxiao 2016a1656b Merge branch 'v2.3.0release' into del 2022-08-16 12:17:07 +08:00
wangchuxiao 5a44618289 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-16 12:16:32 +08:00
wangchuxiao 338d7f0df6 update orgnization after update user 2022-08-16 12:16:16 +08:00
wangchuxiao fd19dd1a03 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del 2022-08-16 12:01:20 +08:00
wangchuxiao 6d19af02c9 Merge branch 'v2.3.0release' into del 2022-08-16 12:01:04 +08:00
skiffer-git 1deb7e9f95 config 2022-08-16 11:59:00 +08:00
wangchuxiao 5a6f96f84b update orgnization after update user 2022-08-16 11:49:20 +08:00
wangchuxiao 3f74022142 Merge branch 'main' into del 2022-08-15 21:51:12 +08:00
wangchuxiao ccd2ed8ac2 Merge branch 'v2.3.0release' into del 2022-08-15 21:51:06 +08:00
wangchuxiao a72e422684 fix code 2022-08-15 21:51:00 +08:00
wangchuxiao da8755fcb7 fix code 2022-08-15 21:37:38 +08:00
wangchuxiao 3be284c129 fix code 2022-08-15 21:30:47 +08:00
wangchuxiao 15e2d172a4 fix code 2022-08-15 21:27:05 +08:00
wangchuxiao 4e54cb56e5 fix code 2022-08-15 21:09:21 +08:00
wangchuxiao ad1015c8b0 fix code 2022-08-15 20:41:46 +08:00
wangchuxiao 1dbe80afc4 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del 2022-08-15 20:38:41 +08:00
wangchuxiao 0683352c4b fix code 2022-08-15 20:38:33 +08:00
wangchuxiao d666f0245d Merge pull request #267 from ouyangshi/del
封禁用户列表
2022-08-15 20:37:36 +08:00
wangchuxiao 7f252909fc fix code 2022-08-15 20:36:16 +08:00
欧阳氏 7b9d0b4f1f 封禁用户列表 2022-08-15 20:33:09 +08:00
wangchuxiao 37193c48d9 fix code 2022-08-15 20:31:03 +08:00
wangchuxiao 1747ae8984 fix code 2022-08-15 20:21:06 +08:00
wangchuxiao dfee8891d3 fix code 2022-08-15 20:16:15 +08:00
wangchuxiao cb10df7c9f fix code 2022-08-15 20:11:08 +08:00
wangchuxiao c6b669eb9d fix code 2022-08-15 20:09:02 +08:00
wangchuxiao 919e2543ca fix code 2022-08-15 19:50:13 +08:00
wangchuxiao b705ac24fa fix code 2022-08-15 19:27:23 +08:00
wangchuxiao 9aa7ba77f5 fix code 2022-08-15 19:19:22 +08:00
wangchuxiao d5b873b70b Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/ip_model.go
2022-08-15 19:01:57 +08:00
wangchuxiao 4ec255917d Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del 2022-08-15 18:59:52 +08:00
wangchuxiao 9b86a18752 Merge branch 'del' of github.com:OpenIMSDK/Open-IM-Server into del
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/ip_model.go
2022-08-15 18:58:48 +08:00
skiffer-git 630fef29a2 Restrict user login with IP 2022-08-15 18:43:12 +08:00
wangchuxiao 05d45c94d5 ip limit 2022-08-15 18:39:34 +08:00
skiffer-git 44e4c59493 Restrict user login with IP 2022-08-15 18:34:03 +08:00
skiffer-git 24e7076423 Restrict user login with IP 2022-08-15 18:28:04 +08:00
Gordon 1f8a965b7a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-15 18:00:08 +08:00
Gordon 8b491f4c94 retry function 2022-08-15 17:59:52 +08:00
skiffer-git 8b857f9980 Restrict user login with IP 2022-08-15 17:52:45 +08:00
wangchuxiao 7d1707ca7c fix log 2022-08-15 16:51:41 +08:00
skiffer-git 5e3a3c61f3 Set the token activity time to five minutes ago 2022-08-15 15:47:26 +08:00
skiffer-git 073b6d200a Set the token activity time to five minutes ago 2022-08-15 15:40:36 +08:00
Gordon 652d560a21 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-15 11:17:12 +08:00
Gordon be69ee8b1d fcm update 2022-08-15 11:16:37 +08:00
wangchuxiao fc5aefe435 Merge pull request #265 from ouyangshi/del
邀请码功能
2022-08-15 00:11:30 +08:00
wangchuxiao d5239365be hide jwt not active yet 2022-08-14 23:34:51 +08:00
欧阳氏 ac7f905248 完善 用户注册 用户更新 2022-08-14 22:53:41 +08:00
wangchuxiao 1a2ea05361 fix bug 2022-08-14 14:09:31 +08:00
欧阳氏 39606248a1 邀请码功能
1、新增邀请码功能
  needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
2022-08-13 10:41:10 +08:00
skiffer-git 73118ce447 config recover 2022-08-12 21:49:54 +08:00
skiffer-git 4e5c1606f3 log 2022-08-12 21:48:13 +08:00
Gordon b8aa54a159 mark message 2022-08-12 20:05:01 +08:00
wangchuxiao 7caccce907 fix log 2022-08-12 19:51:23 +08:00
wangchuxiao 82777d641c fix log 2022-08-12 19:47:06 +08:00
wangchuxiao 5b248c82f5 fix log 2022-08-12 19:37:45 +08:00
Gordon 9c7ae3b0ef mark message 2022-08-12 19:24:30 +08:00
wangchuxiao 9b130ae56c fix log 2022-08-12 19:13:08 +08:00
wangchuxiao a48b2e9edb cms 2022-08-12 18:37:51 +08:00
wangchuxiao e4bbd57c41 fix log 2022-08-12 15:03:36 +08:00
skiffer-git 0dba30977d Merge pull request #252 from x-shadow-man/config-perf
config perf
2022-08-12 11:43:56 +08:00
wangchuxiao 69008e08be cms api rpc 2022-08-12 11:24:21 +08:00
wangchuxiao 06236546a8 Merge branch 'v2.3.0release' into del 2022-08-11 20:41:58 +08:00
wangchuxiao 60029fc618 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 20:25:48 +08:00
wangchuxiao f3e71fec91 callback kickoff 2022-08-11 20:25:33 +08:00
Gordon 54cdb24cec user add delete cache 2022-08-11 20:04:15 +08:00
wangchuxiao 206140c3fa callback kickoff 2022-08-11 19:50:52 +08:00
wangchuxiao c2bd1d0d83 callback kickoff 2022-08-11 19:47:59 +08:00
Gordon 5cb3b8cfbf submodule update 2022-08-11 17:49:22 +08:00
wangchuxiao f363722779 Merge pull request #263 from ouyangshi/main
修复aws s3 配置
2022-08-11 17:38:10 +08:00
欧阳氏 5e09e3e072 修复aws s3 配置 2022-08-11 17:34:57 +08:00
wangchuxiao cc3f53d572 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 16:51:37 +08:00
wangchuxiao a2ddf3567c callback kickoff 2022-08-11 16:51:21 +08:00
wangchuxiao aa7ba6d659 callback kickoff 2022-08-11 16:48:03 +08:00
skiffer-git c53bcd990d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-11 16:06:54 +08:00
skiffer-git 78c807a514 add Invitation Code 2022-08-11 16:06:35 +08:00
wangchuxiao c4084cbcec callback kickoff 2022-08-11 15:55:33 +08:00
wangchuxiao 062c4b53b6 Merge pull request #258 from ouyangshi/main
增加 AWS S3 存储
2022-08-11 14:32:45 +08:00
skiffer-git c9d7b63ef7 Multiple gateways 2022-08-11 12:19:03 +08:00
wangchuxiao 06729c4e84 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 12:10:00 +08:00
wangchuxiao 5c5f80691a fix delete 2022-08-11 12:09:44 +08:00
skiffer-git 5a0340e927 Multiple gateways 2022-08-11 11:48:22 +08:00
skiffer-git eb7e6a566b Multiple gateways 2022-08-11 11:44:14 +08:00
skiffer-git 079fe089de Multiple gateways 2022-08-11 11:28:51 +08:00
skiffer-git 5f83acf3ad Multiple gateways 2022-08-11 11:25:01 +08:00
skiffer-git 0d16fbe4ab Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-11 11:17:32 +08:00
skiffer-git c1184fd7d2 Multiple gateways 2022-08-11 11:14:30 +08:00
wangchuxiao 429bee7e6c Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
2022-08-11 11:07:56 +08:00
wangchuxiao 56e2df75b9 fix delete 2022-08-11 11:06:10 +08:00
Smile 547ad7a2c7 kafka topic优化及解释,删除废弃topic的冗余代码 (#255) 2022-08-11 10:24:37 +08:00
wangchuxiao e2c75f6836 fix delete 2022-08-10 20:42:26 +08:00
wangchuxiao ce591227ae fix delete 2022-08-10 20:39:54 +08:00
wangchuxiao ace424e78a fix delete 2022-08-10 20:34:18 +08:00
wangchuxiao 10223c944c fix delete 2022-08-10 20:23:40 +08:00
wangchuxiao 9e190cb5aa fix delete 2022-08-10 20:16:18 +08:00
wangchuxiao 5d57e93ee1 fix delete 2022-08-10 20:11:04 +08:00
wangchuxiao 75805e3c69 fix delete 2022-08-10 20:04:32 +08:00
wangchuxiao 327ae4ac79 fix delete 2022-08-10 19:50:45 +08:00
wangchuxiao 911614673b fix delete 2022-08-10 19:42:38 +08:00
wangchuxiao e80d3e7dac fix delete 2022-08-10 19:40:10 +08:00
wangchuxiao 7b820ebb94 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-10 19:32:06 +08:00
wangchuxiao 6bfa8643d6 fix delete 2022-08-10 19:31:57 +08:00
Gordon 25de6b58c3 conversation update 2022-08-10 18:29:49 +08:00
wangchuxiao cdc60ef5f0 fix delete 2022-08-10 15:35:28 +08:00
wangchuxiao edeb228315 fix delete 2022-08-10 15:23:44 +08:00
wangchuxiao f6c6d58045 fix delete 2022-08-10 15:21:59 +08:00
wangchuxiao b1d0ca76c9 fix delete 2022-08-10 15:19:24 +08:00
wangchuxiao 5a058d9b97 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-10 15:15:08 +08:00
wangchuxiao 2892add766 fix delete 2022-08-10 15:14:51 +08:00
skiffer-git 281f4b38d2 add log 2022-08-10 14:15:45 +08:00
skiffer-git 7b590e4bd6 add log 2022-08-10 14:01:26 +08:00
skiffer-git 923a035e6e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-10 13:29:34 +08:00
skiffer-git a2a56980d9 add log 2022-08-10 13:29:12 +08:00
wangchuxiao 2ee0943115 fix delete 2022-08-10 12:09:28 +08:00
wangchuxiao cfe218b8a4 fix delete 2022-08-10 12:08:28 +08:00
wangchuxiao 4c10164970 fix delete 2022-08-10 12:07:32 +08:00
wangchuxiao a74168d1e1 fix delete 2022-08-10 12:02:50 +08:00
wangchuxiao 6c0922a6d8 fix delete 2022-08-09 19:44:27 +08:00
wangchuxiao f279b9173e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-09 18:55:02 +08:00
wangchuxiao 706f6c6747 getui debug 2022-08-09 18:48:11 +08:00
Gordon dd6c2df5d2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-09 17:30:20 +08:00
Gordon bcc0c7c2df delete conversation update 2022-08-09 17:29:41 +08:00
wangchuxiao 2c0a2d7877 getui debug 2022-08-09 16:38:33 +08:00
Gordon 7bd7edfec9 send options bug fix 2022-08-09 15:54:16 +08:00
Gordon db8c4f369c send options bug fix 2022-08-09 15:41:16 +08:00
Gordon 569d5d2d89 super group add after callback 2022-08-09 15:12:13 +08:00
skiffer-git 5cbea2cab5 Set token kicked status first in forceKickOff 2022-08-09 13:52:20 +08:00
skiffer-git 57a21ab8e6 forceKickOff work 2022-08-09 13:18:02 +08:00
skiffer-git c52bdce621 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	internal/api/user/user.go
2022-08-09 13:02:02 +08:00
欧阳氏 9358aa1bd8 用户表增加注册IP 登陆IP
1、用户表增加注册IP 登陆IP
2、新增ip_limit表、user_ip_limit表
3、用户创建需要增加createIp参数同步
   用户登录需要增加loginIp参数同步

login_limit 限制说明
0:读取ip_limits表 限制用户注册+用户登陆IP
1:读取user_ip_limits表 限制用户在指定IP登陆
2:读取black_lists表 限制用户在限制时间不能登陆
2022-08-09 10:42:19 +08:00
Gordon c304de9288 userinfo get 2022-08-08 20:03:08 +08:00
skiffer-git 52e57cf547 fix bug 2022-08-08 20:01:29 +08:00
Gordon e33af2a316 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-08 17:42:39 +08:00
Gordon ffc4da1589 callback add seq 2022-08-08 17:42:06 +08:00
wangchuxiao 4cfa8d880f getui debug 2022-08-08 17:14:59 +08:00
wangchuxiao cd65d42004 getui debug 2022-08-08 16:46:43 +08:00
skiffer-git bba5e7db0c fix bug 2022-08-08 13:44:43 +08:00
skiffer-git eb960f2606 fix bug 2022-08-08 13:43:57 +08:00
skiffer-git 92a68108a6 fix bug 2022-08-08 13:21:06 +08:00
skiffer-git ae8acc6eba GetGroupAbstractInfoResp 2022-08-08 13:16:58 +08:00
skiffer-git 1e1381df8e log 2022-08-08 13:10:34 +08:00
wangchuxiao 2ba7fcd628 group hash 2022-08-08 12:22:10 +08:00
wangchuxiao 12cbb1f6f9 group hash 2022-08-08 12:19:23 +08:00
wangchuxiao 1f8e161001 group hash 2022-08-08 12:14:46 +08:00
wangchuxiao b4b215a3f8 group hash 2022-08-08 12:10:28 +08:00
wangchuxiao e2ff7ef113 group hash 2022-08-08 12:07:41 +08:00
wangchuxiao 73c998f510 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-08 11:58:30 +08:00
wangchuxiao 11f29280b1 group hash 2022-08-08 11:30:10 +08:00
Gordon de752c69f4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 19:10:26 +08:00
Gordon 2cf10fce38 del conversation bug fix 2022-08-05 19:10:08 +08:00
wangchuxiao 4ba248a101 fix bug 2022-08-05 18:56:00 +08:00
wangchuxiao faae01cb8a fix bug 2022-08-05 18:38:25 +08:00
wangchuxiao 600c5243dd Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-05 17:01:38 +08:00
wangchuxiao 00bddd5e57 fix bug 2022-08-05 17:01:08 +08:00
Gordon 2436ea6ff9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 16:43:43 +08:00
Gordon 403489865c del conversation bug fix 2022-08-05 16:43:23 +08:00
wangchuxiao c8590b9e9c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-05 15:54:24 +08:00
wangchuxiao d1ffa9b330 callback fix 2022-08-05 15:54:00 +08:00
Gordon 37799ca0be del conversation bug fix 2022-08-05 15:51:34 +08:00
Gordon ba5edabb2c del conversation bug fix 2022-08-05 15:16:43 +08:00
Gordon 1dfe8f866a del conversation bug fix 2022-08-05 15:13:35 +08:00
Gordon e77b4f334d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 14:43:03 +08:00
Gordon 87c64bdb2b del conversation bug fix 2022-08-05 14:42:39 +08:00
skiffer-git 68eed69221 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	pkg/base_info/group_api_struct.go
2022-08-05 13:40:57 +08:00
skiffer-git 5db5bf17cb add GetGroupAbstractInfo api 2022-08-05 13:40:20 +08:00
Gordon 319631b5c4 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-05 12:08:49 +08:00
Gordon 0489c35417 unread bug fix 2022-08-05 12:08:34 +08:00
Gordon 10c0f3075a unread bug fix 2022-08-05 12:08:00 +08:00
wangchuxiao 91a767b4fb callback fix 2022-08-04 19:18:31 +08:00
wangchuxiao 4e69ff196a cache get group 2022-08-04 19:08:08 +08:00
wangchuxiao 576348b1f2 callback fix 2022-08-04 18:55:38 +08:00
wangchuxiao db547d60df callback fix 2022-08-04 18:24:17 +08:00
wangchuxiao 0f655e9292 callback fix 2022-08-04 17:23:21 +08:00
wangchuxiao 3d0827a6da callback fix 2022-08-04 17:20:33 +08:00
Gordon 231d4db71d callback msg content 2022-08-04 16:36:50 +08:00
Gordon 0117e96d5b callback msg content 2022-08-04 16:27:39 +08:00
Gordon ca7bba33e6 docker-compose file update 2022-08-04 14:46:30 +08:00
wangchuxiao b294a8138c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-04 14:22:27 +08:00
wangchuxiao a99dbf634b callback fix 2022-08-04 14:21:03 +08:00
skiffer-git cda0fb6a10 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-04 14:05:05 +08:00
skiffer-git a1392a7677 GetGroupAllMemberListBySplit 2022-08-04 14:04:29 +08:00
Gordon e9da7f28cc Merge branch 'main' into v2.3.0release
# Conflicts:
#	pkg/common/config/config.go
2022-08-04 10:01:45 +08:00
Gordon c4ee293388 docker-compose file update 2022-08-04 10:00:32 +08:00
Gordon 6417977617 docker-compose file update 2022-08-03 21:05:56 +08:00
wangchuxiao f687f2eafb fix bug 2022-08-03 19:34:46 +08:00
Gordon 7057d7fffb pb add fields 2022-08-02 18:11:40 +08:00
wangchuxiao d99b0893df fix bug 2022-08-01 19:13:26 +08:00
wangchuxiao b32463df53 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-01 17:45:09 +08:00
wangchuxiao f202d5f54a fix bug 2022-08-01 17:44:40 +08:00
Gordon 18891c554d log add 2022-08-01 17:02:56 +08:00
Gordon 22a39ed4d3 config file update 2022-08-01 16:56:06 +08:00
Gordon 4003befc2a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-01 16:42:25 +08:00
Gordon c17ca47e7d config file update 2022-08-01 16:42:07 +08:00
wangchuxiao e2e5ab656f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-01 16:39:52 +08:00
wangchuxiao 8e445caf26 fix bug 2022-08-01 16:37:40 +08:00
wangchuxiao b4d82579b7 fix bug 2022-08-01 16:36:23 +08:00
Gordon 6734c714d7 config file update 2022-08-01 16:23:52 +08:00
Gordon 526aa15ff6 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-01 16:09:42 +08:00
Gordon bc0e9eb74e config file update 2022-08-01 16:09:03 +08:00
Gordon a425c62156 config file update 2022-08-01 16:01:10 +08:00
wangchuxiao d99375a536 fix bug 2022-08-01 15:27:51 +08:00
wangchuxiao 4c610abd44 fix bug 2022-08-01 14:56:20 +08:00
wangchuxiao e1a941b998 fix bug 2022-08-01 14:44:29 +08:00
wangchuxiao a8a91fe945 fix bug 2022-08-01 14:33:50 +08:00
wangchuxiao 9136838b63 fix bug 2022-08-01 14:33:01 +08:00
wangchuxiao ef9c291d9a fix bug 2022-08-01 11:52:43 +08:00
wangchuxiao 6f968342dc fix bug 2022-08-01 11:49:50 +08:00
wangchuxiao 4930906b62 fix bug 2022-08-01 11:47:24 +08:00
wangchuxiao c39df537b4 minio obj locking 2022-08-01 10:58:29 +08:00
欧阳氏 cfa9f2d13f 增加 AWS S3 存储 2022-07-31 01:14:26 +08:00
wangchuxiao 0a8a248349 fix bug 2022-07-29 21:53:53 +08:00
wangchuxiao 146cf8750f Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 20:49:32 +08:00
wangchuxiao c25352b660 fix bug 2022-07-29 20:49:27 +08:00
Gordon e8f7ad6c09 Merge branch 'v2.3.0release' 2022-07-29 20:35:26 +08:00
Gordon 7cc9d6707c Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 20:23:33 +08:00
Gordon dca2f9323b update server version 2022-07-29 20:23:07 +08:00
wangchuxiao 7cf2fec3ea Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 19:09:01 +08:00
wangchuxiao ab6b1f0fca fix bug 2022-07-29 19:08:56 +08:00
wenxu12345 0b08bfdcba Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 17:59:08 +08:00
wenxu12345 4701300ed8 Adjust error code 2022-07-29 17:58:51 +08:00
Gordon 9d6d28dcae Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 17:55:13 +08:00
Gordon 147e8d5f9e remove fcm json file 2022-07-29 17:54:50 +08:00
wangchuxiao 79a974946e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 17:50:14 +08:00
wangchuxiao 151fec445e fix bug 2022-07-29 17:50:00 +08:00
wenxu12345 d653e139d3 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 17:49:27 +08:00
wenxu12345 04e826ff09 Adjust error code 2022-07-29 17:49:15 +08:00
Gordon 3681bea8b7 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 17:46:20 +08:00
Gordon e09d8fc5f5 remove fcm json file 2022-07-29 17:45:55 +08:00
wangchuxiao b29f93dcd2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 17:09:27 +08:00
wangchuxiao 1c85424488 mongodb superGroup 2022-07-29 17:09:21 +08:00
Gordon b753536437 add test file 2022-07-29 17:05:39 +08:00
Gordon 490c94fa95 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 17:04:26 +08:00
Gordon 1b92774778 add test file 2022-07-29 17:03:26 +08:00
wenxu12345 34588f9da3 Adjust error code 2022-07-29 16:55:54 +08:00
wenxu12345 0811999081 Adjust error code 2022-07-29 16:28:50 +08:00
wenxu12345 cf7e1c7767 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 16:14:31 +08:00
wenxu12345 ba4988bb9b Adjust error code 2022-07-29 16:14:17 +08:00
Gordon cd3778a620 add test file 2022-07-29 16:09:53 +08:00
Gordon 5b065ee68d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 16:07:31 +08:00
Gordon ee79728f9d add test file 2022-07-29 16:07:05 +08:00
wenxu12345 482c502356 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 16:01:22 +08:00
wenxu12345 92cdff3043 Adjust error code 2022-07-29 16:01:08 +08:00
Gordon b01474523e Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 16:00:11 +08:00
Gordon 9121063ebc add test file 2022-07-29 15:59:49 +08:00
wangchuxiao 2c34b11980 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 15:56:53 +08:00
wangchuxiao e1af587040 mongodb superGroup 2022-07-29 15:56:16 +08:00
Gordon 2b54f0a7ae Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 15:49:23 +08:00
Gordon 6def5bd3cf add test file 2022-07-29 15:49:13 +08:00
wenxu12345 efe727ec71 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 15:48:42 +08:00
wenxu12345 d278dfb996 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 15:48:00 +08:00
Gordon 9ed6afd836 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 15:47:46 +08:00
wenxu12345 6a19c8130c Adjust error code 2022-07-29 15:47:19 +08:00
Gordon c43290338d add test file 2022-07-29 15:47:09 +08:00
wangchuxiao da540522ac mongodb superGroup 2022-07-29 15:28:23 +08:00
Gordon 64bfff5690 remove _: 2022-07-29 15:23:09 +08:00
wangchuxiao 73c5dc159b mongodb superGroup 2022-07-29 15:09:00 +08:00
Gordon 783a982ca8 remove _: 2022-07-29 15:01:06 +08:00
Gordon 86d652f1eb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-29 14:46:14 +08:00
Gordon 766d9c2641 fcm json file update 2022-07-29 14:43:59 +08:00
wangchuxiao 6e826cf369 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-29 14:36:33 +08:00
wangchuxiao 8f12fa52b4 mongodb superGroup to cache 2022-07-29 14:36:07 +08:00
Gordon 6d15e5b5a1 msg 2022-07-29 13:05:51 +08:00
Gordon 51679b47a6 delete super group message 2022-07-29 12:24:54 +08:00
Gordon 1eda0ebea7 fcm push modify 2022-07-28 18:58:57 +08:00
Gordon 787cef54f5 manger send msg modify 2022-07-28 18:14:58 +08:00
Gordon 36885b4f9e test 2022-07-28 15:32:03 +08:00
Gordon 4b6332dbfa Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-27 12:15:52 +08:00
Gordon bbc62ef907 remove cache message from redis 2022-07-27 12:15:32 +08:00
wenxu12345 4c53023ebc debug 2022-07-27 12:04:15 +08:00
wenxu12345 17494b45bd debug 2022-07-27 12:01:42 +08:00
wenxu12345 90401d4d12 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-27 11:52:49 +08:00
wenxu12345 9730ada805 debug 2022-07-27 11:49:00 +08:00
Gordon 5a626e9dab add update conversation unread count 2022-07-26 21:02:11 +08:00
Gordon 14d5b3b316 remove validation for notificationFaceURL 2022-07-26 18:47:06 +08:00
wenxu12345 0ddf5eadb6 Push message to client through message queue 2022-07-26 16:50:54 +08:00
Gordon 803135ae46 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	cmd/Open-IM-SDK-Core
2022-07-26 16:33:06 +08:00
Gordon 641ac7c503 sdk update 2022-07-26 16:32:18 +08:00
wenxu12345 b1377218b1 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-26 15:52:56 +08:00
wenxu12345 80d74f6f38 Push message to client through message queue 2022-07-26 15:52:38 +08:00
wangchuxiao 5a262880b9 superGroupMaxSeq 2022-07-26 15:45:07 +08:00
wangchuxiao 192c764c8c superGroupMaxSeq 2022-07-26 15:41:16 +08:00
wangchuxiao f84cc0554f superGroupMaxSeq 2022-07-26 15:26:39 +08:00
wangchuxiao 2d20c4ee4c superGroupMaxSeq 2022-07-26 15:23:33 +08:00
wangchuxiao 041a35e3c8 superGroupMaxSeq 2022-07-26 15:20:48 +08:00
wangchuxiao cf205c2480 superGroupMaxSeq 2022-07-26 15:16:46 +08:00
Gordon 09b830bcf9 super group add verification 2022-07-25 21:36:21 +08:00
Gordon 8dca55aac8 super group add verification 2022-07-25 21:05:44 +08:00
Gordon adade8fcf1 super group add verification 2022-07-25 21:00:02 +08:00
Gordon 589ac2863c super group add verification 2022-07-25 20:59:41 +08:00
Gordon 5e7b2fbdcf super group add verification 2022-07-25 20:42:57 +08:00
Gordon bb9f7bb27b super group add verification 2022-07-25 20:38:28 +08:00
Gordon 7561831624 super group add verification 2022-07-25 20:03:04 +08:00
Gordon ccf6ef6140 super group add verification 2022-07-25 19:19:00 +08:00
Gordon a3530be7b4 firebase update 2022-07-25 17:57:58 +08:00
wangchuxiao 76505bd0e7 superGroupMaxSeq 2022-07-25 17:43:20 +08:00
Gordon e61434347e Merge branch 'superGroup' into v2.3.0release
# Conflicts:
#	go.sum
#	pkg/common/db/RedisModel.go
#	pkg/common/db/model.go
2022-07-25 17:22:47 +08:00
欧阳氏 84c068783d 新增 firebase cloud message 消息推送 (#236)
* 新增 firebase cloud message 消息推送

新增 api接口  /third/fcm_update_token 用于更新客户端获取到 FCM token 同步到服务器

* mongodb授权缺少授权数据库

windows下面的编译+启动
2022-07-25 17:07:47 +08:00
Gordon 3bd42defaf compose file update 2022-07-25 13:24:50 +08:00
Gordon a71b42c335 not storage message push fix bug 2022-07-25 12:53:49 +08:00
x-shadow-man 456e2f5693 修改字段解释 2022-07-25 10:24:21 +08:00
Gordon f3ed48e0ac seq add 2022-07-22 19:20:57 +08:00
wangchuxiao 55cc8cead1 superGroupMaxSeq 2022-07-22 19:13:23 +08:00
wangchuxiao 0d24078ee4 Merge branch 'v2.3.0-rc1' 2022-07-22 19:09:51 +08:00
wangchuxiao 18db5c500f superGroupMaxSeq 2022-07-22 18:50:07 +08:00
wangchuxiao f87806edb4 superGroupMaxSeq 2022-07-22 18:25:24 +08:00
wangchuxiao a3f62e2246 superGroupMaxSeq 2022-07-22 17:51:17 +08:00
wangchuxiao a5ef78fd1e superGroupMaxSeq 2022-07-22 16:55:29 +08:00
wangchuxiao 337d01008b script 2022-07-22 10:44:49 +08:00
x-shadow-man 92dc36f480 config perf 2022-07-22 09:40:54 +08:00
wangchuxiao a937a94e43 fix bug 2022-07-21 19:11:36 +08:00
skiffer-git 8bb82be2b9 fix bug : Two group owners 2022-07-21 18:12:38 +08:00
wangchuxiao a6cf407a8f fix bug 2022-07-21 17:46:51 +08:00
wangchuxiao eec8eb4766 dtm 2022-07-21 11:20:18 +08:00
wangchuxiao 52c71e3843 dtm 2022-07-21 11:13:47 +08:00
wangchuxiao b5ea79e3ea dtm 2022-07-21 11:05:16 +08:00
wangchuxiao 960e3d34eb dtm 2022-07-21 11:03:02 +08:00
wangchuxiao cbb127ff38 Merge branch 'dtm' into v2.3.0release 2022-07-21 10:57:03 +08:00
wangchuxiao db1a043261 dtm 2022-07-21 10:56:50 +08:00
wangchuxiao f9eee19cbe dtm 2022-07-21 10:48:15 +08:00
wangchuxiao eb1aeefc8c Merge branch 'dtm' into v2.3.0release
# Conflicts:
#	internal/rpc/group/group.go
2022-07-21 10:41:48 +08:00
skiffer-git e64cf47d31 rename 2022-07-20 21:41:32 +08:00
skiffer-git 3f79409a11 rename 2022-07-20 21:40:11 +08:00
skiffer-git dd0d518ecd rename 2022-07-20 21:36:10 +08:00
skiffer-git 6d236a2dd6 rename 2022-07-20 21:30:37 +08:00
skiffer-git 663db12594 rename 2022-07-20 21:29:33 +08:00
skiffer-git f383d6c636 rename 2022-07-20 21:26:52 +08:00
skiffer-git 2b3bb92357 rename 2022-07-20 21:20:46 +08:00
skiffer-git 87a2944837 rename 2022-07-20 21:19:19 +08:00
skiffer-git ea32c88d85 rename 2022-07-20 21:17:47 +08:00
skiffer-git 725f8ce761 rename 2022-07-20 21:17:11 +08:00
skiffer-git 3f42390f2f rename 2022-07-20 21:15:30 +08:00
skiffer-git 4d3343d0d0 rename 2022-07-20 21:11:30 +08:00
skiffer-git 4b22eb946c rename 2022-07-20 21:07:46 +08:00
skiffer-git 53eebb0638 rename 2022-07-20 21:05:12 +08:00
skiffer-git 4546e77d5b rename 2022-07-20 21:04:05 +08:00
skiffer-git 7d2eb31f05 rename 2022-07-20 21:02:25 +08:00
skiffer-git 7c15a53a62 rename 2022-07-20 20:59:52 +08:00
wangchuxiao 1531db0a35 departmentcache 2022-07-20 19:09:20 +08:00
wangchuxiao 6d91f766e7 docker-compose fix 2022-07-20 18:12:39 +08:00
wangchuxiao bf5bce9e64 rocks cache 2022-07-20 16:07:30 +08:00
wangchuxiao 5afa3380a6 docker-compose fix 2022-07-20 15:49:21 +08:00
wangchuxiao 85f5c59781 docker-compose fix 2022-07-20 12:08:58 +08:00
wangchuxiao 8ee4ca0357 docker-compose fix 2022-07-20 12:05:57 +08:00
wangchuxiao 656241c23f docker-compose fix 2022-07-20 11:35:19 +08:00
skiffer-git 5936492f76 Filter out disbanded groups 2022-07-20 10:18:43 +08:00
wangchuxiao abe06b8753 docker-compose fix 2022-07-19 17:05:25 +08:00
Gordon ac536c48cd sub moudule update 2022-07-19 16:42:14 +08:00
wangchuxiao 1b4b2b9bb1 docker-compose fix 2022-07-19 16:15:23 +08:00
skiffer-git ad1d759840 Application for joining the group: JoinSource && InviterUserID 2022-07-19 12:13:20 +08:00
skiffer-git a55134ae63 fix bug: two group owners 2022-07-19 11:15:27 +08:00
wangchuxiao 67b20d073e docker-compose fix 2022-07-15 18:47:04 +08:00
wangchuxiao 2187f44ed7 docker-compose fix 2022-07-15 16:53:19 +08:00
wangchuxiao 026f61126a Merge branch 'v2.3.0release' 2022-07-15 16:49:44 +08:00
wangchuxiao 8a8fce927e Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-15 16:39:09 +08:00
skiffer-git 99873e2136 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	docker-compose.yaml
2022-07-15 15:23:06 +08:00
skiffer-git e904651541 new image 2022-07-15 15:21:42 +08:00
skiffer-git d65a0dbbc7 new image 2022-07-15 15:17:54 +08:00
skiffer-git 2b2ecad437 fix bug 2022-07-15 10:33:03 +08:00
wangchuxiao 89406f1c57 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:08:51 +08:00
wangchuxiao ea93e97e79 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:07:50 +08:00
wangchuxiao 1e6a93b4b6 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts:
#	internal/rpc/group/group.go
#	internal/rpc/user/user.go
#	pkg/common/db/mysql_model/im_mysql_model/group_model.go
2022-07-14 14:06:30 +08:00
skiffer-git 8ad22f8148 fix bug 2022-07-14 13:44:36 +08:00
wangchuxiao e667ec944b Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-07-14 12:11:53 +08:00
wangchuxiao b064244907 rocks cache 2022-07-14 12:08:28 +08:00
skiffer-git a01156feb6 fix bug 2022-07-14 11:50:58 +08:00
skiffer-git af1d8fa834 fix bug 2022-07-14 11:43:01 +08:00
skiffer-git 0234795200 fix bug 2022-07-13 18:25:00 +08:00
skiffer-git 58f4ebe411 Limit the number of members invited to join the group 2022-07-13 14:28:49 +08:00
skiffer-git d4e575f777 Show group notification editor 2022-07-13 11:43:37 +08:00
skiffer-git 2d110deb09 Show group notification editor 2022-07-13 11:09:29 +08:00
欧阳氏 2e552e8711 + windows编译脚本 (#245)
新增windows编译脚本
win_build_all_service.cmd windows下编译脚本
win_start_all_service.cmd windows下执行脚本
2022-07-13 10:19:46 +08:00
skiffer-git fb4cef7ccb Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-12 19:24:31 +08:00
skiffer-git 3b6b88fd62 Source of joining the group 2022-07-12 19:24:06 +08:00
Gordon 95630c6d61 group add field 2022-07-12 18:09:51 +08:00
Gordon 33222d59c2 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-12 17:23:16 +08:00
Gordon adb7da7aaf group add field 2022-07-12 17:22:45 +08:00
skiffer-git 04eb85d279 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-12 16:22:40 +08:00
skiffer-git 58847c7fb6 Update group member nickname when personal nickname is updated 2022-07-12 16:22:13 +08:00
Gordon 504e4cc6a3 add super delete 2022-07-12 16:16:04 +08:00
skiffer-git ec5177342e Set friend remark to empty 2022-07-11 21:33:56 +08:00
Gordon 4d982ab816 config update 2022-07-11 11:02:56 +08:00
Gordon c390617151 config update 2022-07-11 11:01:41 +08:00
Gordon fff7f30005 config update 2022-07-11 11:00:32 +08:00
Gordon ca72d4840a config update 2022-07-11 10:50:08 +08:00
Gordon 7ccb1b6a6f shell udpate 2022-07-11 10:45:12 +08:00
Gordon 126e1f44ca remove submodule 2022-07-11 10:35:51 +08:00
Gordon 84a4382532 Merge remote-tracking branch 'origin/main' 2022-07-11 10:17:27 +08:00
Gordon 40f7048eee remove submodule 2022-07-11 10:17:03 +08:00
wangchuxiao c94fb80cb0 Merge branch 'superGroup' of https://github.com/OpenIMSDK/Open-IM-Server into superGroup 2022-07-10 13:07:05 +08:00
wangchuxiao 2db194b9d1 k8s 2022-07-10 13:03:46 +08:00
Gordon 34420c1265 check all shell update 2022-07-09 11:22:38 +08:00
wangchuxiao 9e0e2fe124 fix bug 2022-07-08 19:26:44 +08:00
Gordon 9cfbd8107e add redis username 2022-07-08 16:34:38 +08:00
Gordon b70a4070f2 add redis username 2022-07-08 16:34:23 +08:00
Gordon d3b302ce66 add redis username 2022-07-08 16:22:52 +08:00
Gordon 5a423f88dd add redis username 2022-07-08 16:18:31 +08:00
Gordon b47877235f add redis username 2022-07-08 16:17:32 +08:00
Gordon f89c1edadf add redis username 2022-07-08 15:17:46 +08:00
Gordon bc5774c934 password test 2022-07-07 16:30:12 +08:00
wangchuxiao 9e885c2379 Merge branch 'v2.3.0release' into superGroup 2022-07-07 10:28:02 +08:00
skiffer-git 1380d2c1e9 Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release
# Conflicts:
#	pkg/common/constant/constant.go
2022-07-07 07:54:21 +08:00
skiffer-git 4895323200 fix bug 2022-07-07 07:51:40 +08:00
Gordon f737d2e8ce Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-06 16:14:44 +08:00
Gordon 3157f97ae6 push fix bug 2022-07-06 16:14:31 +08:00
wangchuxiao 278329b73c Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-06 16:12:33 +08:00
wangchuxiao 033ec6bc76 fix bug 2022-07-06 16:12:17 +08:00
Gordon 1aa106ba4a Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-07-06 15:29:06 +08:00
Gordon c638072902 super group add 2022-07-06 15:28:34 +08:00
wangchuxiao 6eb9041df4 Merge branch 'v2.3.0release' into superGroup 2022-07-06 14:46:30 +08:00
wangchuxiao 4035f037d2 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-07-05 16:58:46 +08:00
Gordon 2b6f861f3b test group file 2022-07-05 16:35:12 +08:00
Gordon 9a813030a3 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-05 16:33:26 +08:00
Gordon 04b7dd719c test group 2022-07-05 16:33:05 +08:00
wangchuxiao 3ad3b30d97 demo 2022-07-05 14:30:53 +08:00
wangchuxiao d0e7147911 demo 2022-07-05 11:01:10 +08:00
Gordon b0669b7eea add docker-compose shard cluster 2022-07-04 16:30:37 +08:00
Gordon a504961e93 add docker-compose shard cluster 2022-07-04 13:02:35 +08:00
Gordon b14bcf966d add docker-compose shard cluster 2022-07-04 12:09:29 +08:00
Gordon 7ef37a9fa2 add docker-compose shard cluster 2022-07-04 11:53:11 +08:00
skiffer-git d7ce455f2f Super code can be disabled 2022-07-02 09:50:25 +08:00
wangchuxiao 7ffe857f52 fix bug 2022-07-01 20:13:36 +08:00
Gordon f2b0f54c0b test 2022-07-01 19:48:03 +08:00
Gordon a1025d8eee test 2022-07-01 19:41:15 +08:00
Gordon 047ee6454b test 2022-07-01 19:32:56 +08:00
Gordon 71dd28eabd Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 19:29:37 +08:00
Gordon b8cd9484dc test 2022-07-01 19:29:17 +08:00
wangchuxiao 2c823e094f v2.2.0 2022-07-01 18:11:30 +08:00
Gordon a1bb9630d0 test 2022-07-01 17:27:51 +08:00
skiffer-git e23d5926dd Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 17:24:24 +08:00
skiffer-git 5c4982a3f1 fix bug 2022-07-01 17:23:43 +08:00
Gordon 7d172d718f test 2022-07-01 17:23:21 +08:00
Gordon 804b5423e5 test 2022-07-01 17:11:41 +08:00
Gordon 5a825df6a1 test 2022-07-01 17:06:55 +08:00
Gordon 50d1646ce0 test 2022-07-01 17:05:16 +08:00
Gordon 1d01e61148 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 17:00:13 +08:00
Gordon 21e9958da9 test 2022-07-01 16:59:49 +08:00
wangchuxiao 7c18012ef2 mongo docker-compose 2022-07-01 16:59:16 +08:00
wangchuxiao cbeae74fc0 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-07-01 16:53:50 +08:00
wangchuxiao f3144f92c5 mongo docker-compose 2022-07-01 16:53:45 +08:00
Gordon 3dd9d51ca5 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 16:51:56 +08:00
Gordon 5f0873221a test 2022-07-01 16:51:44 +08:00
wangchuxiao 49cbb42d0d mongo docker-compose 2022-07-01 16:45:12 +08:00
wangchuxiao 519a8bee71 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-07-01 16:42:04 +08:00
wangchuxiao 834b88f68f mongo docker-compose 2022-07-01 16:41:47 +08:00
Gordon e02150cdb0 test 2022-07-01 16:38:11 +08:00
Gordon 5b4f94832d Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 16:23:47 +08:00
Gordon 566d5e832c test 2022-07-01 16:23:28 +08:00
wangchuxiao 36667b8649 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-07-01 15:38:18 +08:00
wangchuxiao 088f9dae9b demo 2022-07-01 15:36:44 +08:00
Gordon 813b6a6a68 test 2022-07-01 15:33:35 +08:00
Gordon c8d9fc7311 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 15:30:41 +08:00
Gordon e555a047e6 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 15:29:52 +08:00
skiffer-git ed52ecb259 fix bug 2022-07-01 15:29:45 +08:00
Gordon f993ddf876 test 2022-07-01 15:29:22 +08:00
skiffer-git 54566997b2 fix bug 2022-07-01 15:25:06 +08:00
skiffer-git 4783e3d061 log 2022-07-01 15:11:33 +08:00
skiffer-git 658d97ff4e log 2022-07-01 15:07:22 +08:00
skiffer-git 3373925acf Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-07-01 15:00:13 +08:00
skiffer-git 9d84bf8f4c log 2022-07-01 14:59:53 +08:00
Gordon 1650165f4b group add verify 2022-07-01 14:47:29 +08:00
wangchuxiao 8849cd46c9 callback 2022-07-01 12:14:15 +08:00
wangchuxiao 0835ecf0ed Merge branch 'tuoyun' into superGroup
# Conflicts:
#	deploy_k8s/k8s_openim_deploy.md
2022-07-01 10:16:48 +08:00
wangchuxiao 8bedfca646 deploy_k8s 2022-07-01 00:14:59 +08:00
Gordon 1fa38a24b6 compose file update 2022-06-30 19:27:23 +08:00
Gordon 1d105dd345 compose file update 2022-06-30 19:19:00 +08:00
wangchuxiao 7823306045 demo 2022-06-30 19:11:44 +08:00
wangchuxiao 53b0d13342 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-30 18:50:28 +08:00
wangchuxiao f51fbecfee callback 2022-06-30 18:50:10 +08:00
Gordon 1f968a606b compose file update 2022-06-30 18:46:34 +08:00
Gordon a13397bc17 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-30 18:42:50 +08:00
Gordon 323e8e72cc compose file update 2022-06-30 18:42:30 +08:00
wangchuxiao 80a67d0970 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-30 17:12:46 +08:00
wangchuxiao 4e22970784 minio 2022-06-30 17:12:25 +08:00
Gordon ddc07ee160 compose file update 2022-06-30 17:07:18 +08:00
Gordon e96b9b8bf8 compose file update 2022-06-30 16:51:58 +08:00
Gordon 013828eb03 sms test 2022-06-30 16:42:27 +08:00
Gordon 10132879f2 sms test 2022-06-30 16:29:52 +08:00
Gordon 832871d49d sms test 2022-06-30 16:27:39 +08:00
wangchuxiao e5ccc1dd36 minio 2022-06-30 10:28:11 +08:00
wangchuxiao 61951863ad minio 2022-06-30 10:24:47 +08:00
wangchuxiao 64c6a68d34 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-30 10:14:26 +08:00
wangchuxiao 0054c4cc58 minio 2022-06-30 10:14:12 +08:00
Gordon 5bf494ca7d code update 2022-06-29 19:06:08 +08:00
Gordon da81f70161 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-29 19:01:16 +08:00
Gordon f3e21ac814 code update 2022-06-29 19:00:48 +08:00
wangchuxiao 2314c99c36 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-29 18:49:41 +08:00
wangchuxiao 2907cac50f swagger 2022-06-29 18:48:17 +08:00
Gordon 536c62c137 config update 2022-06-29 18:46:27 +08:00
Gordon c1b855ebf7 config update 2022-06-29 18:45:16 +08:00
Gordon 84d76f0749 config update 2022-06-29 18:37:39 +08:00
Gordon 3ae0a05422 config update 2022-06-29 18:36:35 +08:00
Gordon f700c15bc7 config update 2022-06-29 18:35:26 +08:00
Gordon 46e24556ef config update 2022-06-29 18:34:07 +08:00
Gordon e20f953c7f config update 2022-06-29 18:30:33 +08:00
Gordon 3c24d50bde Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-29 18:01:56 +08:00
Gordon 204d80d86f Tencent cloud 2022-06-29 18:01:42 +08:00
wangchuxiao 4eeef63724 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
# Conflicts:
#	internal/api/group/group.go
2022-06-29 11:23:03 +08:00
wangchuxiao 0c7f57d55d swagger docs 2022-06-29 11:18:19 +08:00
Gordon 3a55f50723 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-29 11:05:35 +08:00
Gordon 6853c64479 mongo version update 2022-06-29 11:05:22 +08:00
skiffer-git 3da6597643 fix bug 2022-06-28 20:47:16 +08:00
skiffer-git 26bd3bf76d fix bug 2022-06-28 20:43:52 +08:00
skiffer-git d17d7a792a fix bug 2022-06-28 20:39:27 +08:00
skiffer-git dc9f7dc294 fix bug 2022-06-28 18:26:32 +08:00
skiffer-git 92b219769d fix bug 2022-06-28 17:26:18 +08:00
skiffer-git 3e630a3882 fix bug 2022-06-28 17:23:20 +08:00
skiffer-git de32c46ea4 debug 2022-06-28 15:54:27 +08:00
skiffer-git 722b5d0726 debug 2022-06-28 15:47:55 +08:00
skiffer-git d51af59f85 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-28 15:26:35 +08:00
skiffer-git 5102f83290 debug 2022-06-28 15:25:46 +08:00
skiffer-git 9da4da5fd6 debug 2022-06-28 15:25:26 +08:00
wangchuxiao 5213860919 docker-compose 2022-06-28 10:38:33 +08:00
wangchuxiao 20f78d214f swagger 2022-06-28 10:36:27 +08:00
wangchuxiao 5207e268de swagger doc 2022-06-28 10:29:14 +08:00
wangchuxiao 226108f558 docker-compose 2022-06-27 13:31:37 +08:00
wangchuxiao 7280ef42a9 docker-compose 2022-06-27 13:24:21 +08:00
wangchuxiao 919eacc0a9 docker-compose 2022-06-27 13:22:35 +08:00
wangchuxiao ccd7be7276 docker-compose 2022-06-27 13:20:31 +08:00
wangchuxiao 5bdf4e51de Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-27 12:20:11 +08:00
wangchuxiao 25704e5ddd docker-compose 2022-06-27 12:19:54 +08:00
skiffer-git cf15bd3697 Adjust api router 2022-06-27 11:32:43 +08:00
wangchuxiao 14b53276b9 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-24 20:30:29 +08:00
wangchuxiao a6c63e7968 swagger init 2022-06-24 20:29:53 +08:00
Gordon 57e11c781b test 2022-06-24 20:01:37 +08:00
Gordon 1d2da05f66 test 2022-06-24 19:52:52 +08:00
Gordon ceb0f778b8 test 2022-06-24 19:49:01 +08:00
Gordon d8717bd0b4 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-24 19:04:39 +08:00
Gordon cfcc5c1095 test 2022-06-24 19:04:06 +08:00
wangchuxiao 79b1a801b5 demo 2022-06-24 18:46:21 +08:00
wangchuxiao 79907b374a alter demo 2022-06-24 18:33:52 +08:00
wangchuxiao 278d09e4db add swagger demo 2022-06-24 17:46:50 +08:00
wangchuxiao 189a7d09a1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-24 17:45:50 +08:00
wangchuxiao 99062805ec add swagger demo 2022-06-24 17:45:33 +08:00
wenxu12345 87dbdc07d1 verification joining group chat 2022-06-24 15:52:37 +08:00
wenxu12345 db7ef3ac4b Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-23 18:57:05 +08:00
wenxu12345 5b8ef3a17c verification gor joining group chat 2022-06-23 18:56:52 +08:00
Gordon b7f257daf1 compose file update 2022-06-23 11:06:17 +08:00
Gordon c27560ed44 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-23 10:18:58 +08:00
Gordon ddddbf6987 remove old redis module 2022-06-23 10:18:44 +08:00
wenxu12345 2f5d8dfb80 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-23 09:24:20 +08:00
wenxu12345 218340e138 Rpc Register IP 2022-06-23 09:24:05 +08:00
wangchuxiao c4ea10d0af fix bug 2022-06-22 20:23:04 +08:00
wangchuxiao bb8dcd8b61 fix bug 2022-06-22 20:19:37 +08:00
wangchuxiao 2372340e0d fix bug 2022-06-22 20:13:26 +08:00
wangchuxiao f78f7e97ee Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-22 19:48:49 +08:00
wangchuxiao 6b78b75638 fix bug 2022-06-22 19:48:35 +08:00
Gordon 2f2f72fe4b test 2022-06-21 21:27:00 +08:00
Gordon 34fe9596a9 test 2022-06-21 21:22:35 +08:00
Gordon e4d35c2a86 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 21:13:36 +08:00
Gordon af7dde61d6 model update 2022-06-21 21:13:27 +08:00
wenxu12345 a62388759a Handling token exceptions 2022-06-21 20:29:20 +08:00
wenxu12345 9337d150b9 Handling token exceptions 2022-06-21 20:25:34 +08:00
wenxu12345 910876f323 Handling token exceptions 2022-06-21 20:25:13 +08:00
wenxu12345 af152aa9b9 Handling token exceptions 2022-06-21 20:16:01 +08:00
wenxu12345 f34fedd822 Handling token exceptions 2022-06-21 20:13:19 +08:00
wenxu12345 ac7c0015db Handling token exceptions 2022-06-21 20:00:03 +08:00
wenxu12345 1a3b5d018a Handling token exceptions 2022-06-21 19:57:48 +08:00
wenxu12345 86c26793b7 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 19:48:47 +08:00
wenxu12345 d99d7ac63c debug 2022-06-21 19:48:26 +08:00
Gordon 5646db52a9 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 19:47:11 +08:00
Gordon 0fe838d588 compose limit memory 2022-06-21 19:46:58 +08:00
wenxu12345 c2686beb9b debug 2022-06-21 19:44:02 +08:00
wenxu12345 1bfae7627e debug 2022-06-21 19:39:46 +08:00
wenxu12345 06c523ea81 debug 2022-06-21 19:38:13 +08:00
wenxu12345 7f4e21d4ba debug 2022-06-21 19:24:09 +08:00
wenxu12345 c993bb2f5e debug 2022-06-21 18:58:57 +08:00
wenxu12345 5527f7c78a debug 2022-06-21 18:49:01 +08:00
wenxu12345 8e9ad57173 debug 2022-06-21 18:36:34 +08:00
wenxu12345 30ae608863 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 18:15:38 +08:00
wenxu12345 68e611794b debug 2022-06-21 18:15:22 +08:00
wangchuxiao b5c20f5be9 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-21 17:37:30 +08:00
wangchuxiao 59a53c7c73 fix bug 2022-06-21 17:37:22 +08:00
wenxu12345 9b76eb6b55 debug 2022-06-21 17:15:24 +08:00
wenxu12345 08d9551230 debug 2022-06-21 16:50:18 +08:00
wenxu12345 c3bdd2f288 debug 2022-06-21 16:36:34 +08:00
wenxu12345 fae881c080 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 14:54:58 +08:00
wenxu12345 49797ce6ab super group notification 2022-06-21 14:54:42 +08:00
Gordon 7783e5b7cf jpush add config for ios env mode 2022-06-21 11:28:02 +08:00
Gordon b242aac7cd jpush add config for ios env mode 2022-06-21 11:27:39 +08:00
skiffer-git 127ad802ff Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-20 18:13:13 +08:00
skiffer-git f42a2c9434 kickoff 2022-06-20 18:12:02 +08:00
wangchuxiao b80f510de5 quit superGroup add notification 2022-06-20 11:57:53 +08:00
wangchuxiao 134087c672 v2.1.0 2022-06-17 17:11:59 +08:00
wangchuxiao 91a2406827 Merge branch 'tuoyun'
# Conflicts:
#	internal/api/manage/management_chat.go
2022-06-17 17:08:11 +08:00
wangchuxiao f82f9567c2 merge super 2 tuoyun 2022-06-17 15:56:19 +08:00
wangchuxiao 0a2951c2eb Merge branch 'superGroup' into tuoyun
# Conflicts:
#	internal/push/logic/push_to_client.go
2022-06-17 15:54:57 +08:00
Gordon 5601212f58 config file update 2022-06-17 15:48:40 +08:00
wangchuxiao 3451d22460 signal 2022-06-17 13:14:38 +08:00
wangchuxiao 0d5dc6bdd8 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 13:13:22 +08:00
Gordon 87e6aedb74 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 12:39:58 +08:00
Gordon 9b5bd47760 config file update 2022-06-17 12:39:26 +08:00
wangchuxiao 007065b40e 入职流程 2022-06-17 12:36:05 +08:00
wangchuxiao 2e52867df4 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 12:10:07 +08:00
wangchuxiao c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
skiffer-git cacde08e99 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 11:50:13 +08:00
skiffer-git 9443ed5d49 log for etcd 2022-06-17 11:49:29 +08:00
wangchuxiao e3c702aca1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 11:09:54 +08:00
wangchuxiao 7fbdff391c fix bug 2022-06-17 11:09:48 +08:00
Gordon 92cb2e7eab config file update 2022-06-17 10:59:50 +08:00
Gordon 04136d5b9d Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:50:24 +08:00
Gordon fd256a6c28 config file update 2022-06-17 10:50:15 +08:00
wangchuxiao e64b8841c5 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:45:00 +08:00
wangchuxiao 52ae2c3655 fix bug 2022-06-17 10:44:23 +08:00
skiffer-git f1b5f56294 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:43:44 +08:00
skiffer-git ed3b62480c log for etcd 2022-06-17 10:43:24 +08:00
Gordon 365d282119 compose file update 2022-06-17 10:39:02 +08:00
Gordon 56d0c574f9 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:37:54 +08:00
Gordon 573937e1e5 msg transfer handle change 2022-06-17 10:37:43 +08:00
wangchuxiao 3892883470 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:37:03 +08:00
wangchuxiao d1049b8022 fix bug 2022-06-17 10:36:46 +08:00
Gordon 8e3f090ffe msg transfer handle change 2022-06-16 21:15:24 +08:00
Gordon 903c39206f msg transfer handle change 2022-06-16 20:35:27 +08:00
Gordon 29dbb36961 user proto modify 2022-06-16 19:33:35 +08:00
wangchuxiao 20851f2a96 fix bug 2022-06-16 19:26:09 +08:00
wangchuxiao 7bbf2b200b fix bug 2022-06-16 19:18:17 +08:00
Gordon e9ac9faa49 user proto modify 2022-06-16 19:12:50 +08:00
wangchuxiao a15e644a51 fix bug 2022-06-16 19:09:13 +08:00
Gordon 479679a1c6 user proto modify 2022-06-16 19:02:08 +08:00
Gordon a50001364f user proto modify 2022-06-16 18:59:17 +08:00
wangchuxiao 7ea7dffd4a fix bug 2022-06-16 17:57:44 +08:00
wangchuxiao 5ea620a4cd fix bug 2022-06-16 16:49:21 +08:00
wangchuxiao 4e11c7a9e2 fix bug 2022-06-16 16:44:12 +08:00
wangchuxiao 9503766a68 fix bug 2022-06-16 16:20:50 +08:00
skiffer-git 6b29d54b50 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 16:13:09 +08:00
skiffer-git 19bbd9b528 fix bug 2022-06-16 16:12:41 +08:00
Gordon 28721c7d20 add global recv opt 2022-06-16 15:34:58 +08:00
Gordon 7dbf0a3594 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 15:29:57 +08:00
Gordon e2f7dd67a2 add global recv opt 2022-06-16 15:29:48 +08:00
skiffer-git 3f455199eb Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 15:22:14 +08:00
skiffer-git 24f2ffe82d Handling exception: getcdv3.GetConn == nil 2022-06-16 15:21:53 +08:00
wangchuxiao 86c5d694e5 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 15:21:52 +08:00
wangchuxiao 8c963c669b redis interface 2022-06-16 15:21:46 +08:00
skiffer-git d058cacb38 Handling exception: getcdv3.GetConn == nil 2022-06-16 15:19:39 +08:00
skiffer-git c3cb5f20d9 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 15:10:37 +08:00
skiffer-git abb9ebaf76 Handling exception: getcdv3.GetConn == nil 2022-06-16 15:10:15 +08:00
skiffer-git 167ebd6975 Handling exception: getcdv3.GetConn == nil 2022-06-16 15:09:37 +08:00
Gordon 66d248ec8e Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 15:02:38 +08:00
Gordon 966cb24911 add global recv opt 2022-06-16 15:02:29 +08:00
skiffer-git 98821c95b6 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:55:38 +08:00
skiffer-git ceaa0b61eb Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 14:51:58 +08:00
skiffer-git 89aef130a5 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:51:36 +08:00
Gordon 57d96b85f1 add global recv opt 2022-06-16 14:47:39 +08:00
wangchuxiao dd4817a65a Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 14:45:53 +08:00
wangchuxiao b3dcff2d76 redis interface 2022-06-16 14:45:39 +08:00
skiffer-git 8d3d41831d Handling exception: getcdv3.GetConn == nil 2022-06-16 14:39:31 +08:00
skiffer-git 066a7041d8 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:36:59 +08:00
skiffer-git 50df9bdf4e Handling exception: getcdv3.GetConn == nil 2022-06-16 14:35:24 +08:00
skiffer-git eab9e4ab92 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:33:52 +08:00
skiffer-git 56cf46a3a4 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:31:41 +08:00
skiffer-git 90442e3e39 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:27:57 +08:00
skiffer-git 02c594d4ec Handling exception: getcdv3.GetConn == nil 2022-06-16 14:26:03 +08:00
skiffer-git 8c82f811cb Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
#	internal/rpc/user/user.go
2022-06-16 14:10:56 +08:00
skiffer-git dbc2713495 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:09:28 +08:00
wangchuxiao 89ac29a019 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 13:41:33 +08:00
wangchuxiao 96d3ae86cc Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 13:41:18 +08:00
Gordon 071a7fa629 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 12:58:19 +08:00
Gordon 0a44a8e78a add global recv opt 2022-06-16 12:53:39 +08:00
wangchuxiao 59743ef071 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 12:48:07 +08:00
wangchuxiao 077482d759 Merge branch 'tuoyun' into superGroup
# Conflicts:
#	internal/push/logic/push_to_client.go
2022-06-16 12:47:06 +08:00
Gordon 7e6e214f08 add global recv opt 2022-06-16 12:41:31 +08:00
wangchuxiao b6634d26d1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 12:36:00 +08:00
Gordon 5e51eebe8a msg handle 2022-06-16 12:21:49 +08:00
skiffer-git 310997f978 update chat.pb 2022-06-16 12:04:57 +08:00
wangchuxiao b67643ed95 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup
# Conflicts:
#	go.sum
2022-06-16 11:58:18 +08:00
wangchuxiao 1b1f4464ee GlobalRecvMsgOpt 2022-06-16 11:53:43 +08:00
skiffer-git 1111cf48f3 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 11:46:25 +08:00
skiffer-git 41833712f0 has read default->true 2022-06-16 11:45:52 +08:00
wangchuxiao f9a26e9195 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 11:35:22 +08:00
wangchuxiao ea76f20825 GlobalRecvMsgOpt 2022-06-16 11:27:55 +08:00
skiffer-git 1a6a0d3592 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 10:27:02 +08:00
skiffer-git 0d2c0e91c8 use sarama v1.29.0 2022-06-16 10:26:37 +08:00
wangchuxiao bc2a7b902e k8s 2022-06-16 00:19:41 +08:00
Gordon 2e7e278ba4 redis restore 2022-06-15 23:30:33 +08:00
skiffer-git 06915f5dc3 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:55:06 +08:00
skiffer-git 7cbd840060 Optimization for log 2022-06-15 19:51:16 +08:00
Gordon cc8301cc6e redis replace to go_redis 2022-06-15 19:28:15 +08:00
skiffer-git a9603f44f4 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:26:05 +08:00
skiffer-git 04ee5269fe Optimization for log 2022-06-15 19:25:47 +08:00
Gordon afa93aaf9e Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:20:33 +08:00
Gordon d74bea25aa redis replace to go_redis 2022-06-15 19:17:49 +08:00
skiffer-git 1af78c9bcb Optimization for log 2022-06-15 18:15:00 +08:00
skiffer-git 9f7cc1ae69 Optimization for log 2022-06-15 18:11:15 +08:00
skiffer-git f4f6ea681e Optimization for log 2022-06-15 18:02:48 +08:00
wangchuxiao 21051900f9 hash userID 2022-06-15 17:33:48 +08:00
Gordon f96e12a8b3 redis replace to go_redis 2022-06-15 16:50:45 +08:00
Gordon eef47017a3 redis replace to go_redis 2022-06-15 16:39:03 +08:00
Gordon 4315d9dfbb redis replace to go_redis 2022-06-15 16:35:24 +08:00
Gordon d7961bf226 redis replace to go_redis 2022-06-15 16:33:30 +08:00
wangchuxiao 7dbc8a4253 go-redis 2022-06-15 16:18:41 +08:00
wangchuxiao 1aee41e7e7 go-redis 2022-06-15 16:16:35 +08:00
wangchuxiao f4cdbe985e alter rtc timeout 2022-06-15 14:57:21 +08:00
wangchuxiao 8a0c112072 alter rtc timeout 2022-06-15 13:55:37 +08:00
wangchuxiao 16641f0494 alter rtc timeout 2022-06-15 13:44:45 +08:00
wangchuxiao 5965dcd029 alter rtc timeout 2022-06-15 13:39:49 +08:00
wangchuxiao e45ef5c49a alter rtc timeout 2022-06-15 13:30:58 +08:00
wangchuxiao 9a1682ebaf Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-15 13:24:35 +08:00
wangchuxiao 9eed6ce197 alter rtc timeout 2022-06-15 13:24:21 +08:00
Gordon d3279694b7 add global msg recv opt 2022-06-15 13:12:16 +08:00
Gordon 8fe6231ebc add global msg recv opt 2022-06-15 13:11:08 +08:00
Gordon 6f0860d954 add global msg recv opt 2022-06-15 12:57:40 +08:00
Gordon 1e62ddce73 super update 2022-06-15 11:31:24 +08:00
wangchuxiao 956d745034 alter rtc timeout 2022-06-15 11:13:10 +08:00
Gordon ccc69ac2d0 Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
2022-06-15 11:08:52 +08:00
wangchuxiao 68365aa3b7 alter rtc timeout 2022-06-15 10:34:32 +08:00
wangchuxiao a0581618a4 Merge branch 'tuoyun' into superGroup
# Conflicts:
#	config/config.yaml
#	internal/msg_gateway/gate/logic.go
#	internal/msg_gateway/gate/ws_server.go
#	internal/push/logic/push_to_client.go
#	internal/rpc/group/group.go
#	internal/rpc/msg/send_msg.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
2022-06-15 10:31:58 +08:00
Gordon cfcccd0240 user add global set message recv opt 2022-06-14 18:20:08 +08:00
Gordon 926de3fa94 log 2022-06-14 17:27:04 +08:00
Gordon 38ded2c43d send message remove online status split 2022-06-14 17:24:40 +08:00
wangchuxiao f324bb603d rtc 2022-06-14 16:05:45 +08:00
wangchuxiao d190616d34 rtc 2022-06-14 16:03:20 +08:00
wangchuxiao d7884f89f5 rtc 2022-06-14 15:56:06 +08:00
Gordon d8ce122254 redis model update 2022-06-14 15:47:34 +08:00
wangchuxiao 9c1ca78fed rtc 2022-06-14 15:27:11 +08:00
wangchuxiao 31c123a09b rtc 2022-06-14 15:25:18 +08:00
wangchuxiao 0e93295cdf rtc 2022-06-14 15:24:40 +08:00
wangchuxiao 5e7eda6781 rtc 2022-06-14 15:03:05 +08:00
wangchuxiao f31179bb9a rtc 2022-06-14 13:21:30 +08:00
wangchuxiao 805b7705b2 rtc 2022-06-14 10:52:23 +08:00
wangchuxiao ae649a0e31 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-14 10:42:56 +08:00
wangchuxiao d797d7b47a rtc 2022-06-14 10:41:52 +08:00
skiffer-git 7308d0f9c6 config 2022-06-14 10:37:39 +08:00
skiffer-git 2ab1f3749c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-13 21:08:53 +08:00
skiffer-git 52199fb5d3 config 2022-06-13 21:08:25 +08:00
wangchuxiao ad497b7386 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-13 20:11:59 +08:00
wangchuxiao 257e98edb2 group 2022-06-13 20:11:43 +08:00
skiffer-git 5be23220e4 super group 2022-06-13 18:27:52 +08:00
skiffer-git 25310d5e88 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-13 17:20:13 +08:00
skiffer-git 4bc9da3910 set groupID 2022-06-13 17:19:48 +08:00
wangchuxiao 6dfba3c7b8 group 2022-06-13 16:25:03 +08:00
Gordon 034201a45b redis model update 2022-06-13 16:09:34 +08:00
Gordon d43b9fc6c1 redis model update 2022-06-13 15:58:14 +08:00
wangchuxiao 94ec584dc3 signal 2022-06-13 15:42:48 +08:00
Gordon 043188ab5e push update 2022-06-13 15:24:13 +08:00
Gordon 2cbffb96fd push update 2022-06-13 15:20:23 +08:00
Gordon 50f7057f68 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-13 15:19:15 +08:00
Gordon f3b083cafd push update 2022-06-13 15:19:04 +08:00
wangchuxiao d881ab5fea signal 2022-06-13 15:04:36 +08:00
skiffer-git 464200e693 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-13 14:59:06 +08:00
skiffer-git 9ae84a69be SuperGroupOnlineBatchPushOneMsg 2022-06-13 14:56:24 +08:00
wangchuxiao 47184ca01e org 2022-06-13 14:27:41 +08:00
wangchuxiao 39d4d01814 org 2022-06-13 13:01:49 +08:00
wangchuxiao 5419478c48 org 2022-06-13 12:23:13 +08:00
wangchuxiao 52d8ab5389 singal 2022-06-13 11:53:12 +08:00
wangchuxiao 7d6701780c Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-13 10:38:15 +08:00
wangchuxiao dbc055efb4 org 2022-06-13 10:38:00 +08:00
skiffer-git f9c2b4c28e SuperGroupOnlineBatchPushOneMsg 2022-06-13 09:00:09 +08:00
Gordon 7c90baf7bf remove online offline split 2022-06-12 18:27:01 +08:00
skiffer-git 67807a3aa7 remove kick 2022-06-11 20:47:25 +08:00
skiffer-git dca39d6eae set time out 2022-06-11 20:41:23 +08:00
skiffer-git 768d139789 set time out 2022-06-11 20:40:13 +08:00
skiffer-git af612e4b92 log 2022-06-11 13:25:32 +08:00
skiffer-git ef23fba147 log 2022-06-11 12:50:20 +08:00
skiffer-git 5f813c6f70 fix bug 2022-06-11 12:43:54 +08:00
skiffer-git c171728749 fix bug 2022-06-11 12:16:32 +08:00
skiffer-git 85c0e1f330 debug log 2022-06-11 12:09:50 +08:00
skiffer-git 8269e61163 debug log 2022-06-11 12:03:12 +08:00
skiffer-git ae6c09aae2 debug log 2022-06-11 11:53:04 +08:00
skiffer-git 9619584de5 debug 2022-06-11 11:27:58 +08:00
skiffer-git dad40d60b3 debug 2022-06-11 10:54:17 +08:00
skiffer-git 9216a085cf log 2022-06-11 10:42:26 +08:00
skiffer-git f232ffb5cc batch build 2022-06-11 09:50:24 +08:00
skiffer-git 952033f409 compile 2022-06-11 09:26:49 +08:00
skiffer-git dc10c7e3e7 batch push 2022-06-11 09:23:51 +08:00
skiffer-git a84c8bd273 SetWriteTimeoutWriteMsg 2022-06-11 09:19:06 +08:00
skiffer-git 2d3d351e26 log 2022-06-11 08:26:32 +08:00
skiffer-git e375188889 log 2022-06-11 08:24:02 +08:00
skiffer-git 5860f1fa7a add send msg timeout 2022-06-10 22:59:45 +08:00
skiffer-git 6a149c74d1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-10 22:54:43 +08:00
skiffer-git 6ae71dba4f add send msg timeout 2022-06-10 22:54:15 +08:00
skiffer-git 659cc7f1c6 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-10 21:43:20 +08:00
skiffer-git a6a80a8b93 batch build 2022-06-10 21:37:48 +08:00
skiffer-git 722ada3f0e batch build 2022-06-10 18:55:21 +08:00
wangchuxiao aeb479641f Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-10 18:39:12 +08:00
wangchuxiao 8a471a5455 base64 userID 2022-06-10 18:38:55 +08:00
skiffer-git c8207b479e Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-10 18:24:40 +08:00
wangchuxiao fdaf4380fa base64 userID 2022-06-10 18:23:31 +08:00
skiffer-git 89d228e605 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-10 18:22:01 +08:00
skiffer-git 556ed8413f batch build 2022-06-10 18:21:09 +08:00
wangchuxiao e95f09191a Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-10 18:13:25 +08:00
wangchuxiao fa02c20e1c fix signal 2022-06-10 18:13:11 +08:00
skiffer-git f51a074f86 batch build 2022-06-10 18:11:46 +08:00
skiffer-git 915539ca0f batch build 2022-06-10 18:10:11 +08:00
skiffer-git 26353fd28f batch build 2022-06-10 18:08:33 +08:00
skiffer-git 0aa19ed1b0 batch build 2022-06-10 18:07:49 +08:00
skiffer-git 843a9cedaf batch build 2022-06-10 18:05:36 +08:00
skiffer-git c9b25f73d3 batch build 2022-06-10 18:00:04 +08:00
skiffer-git df7d2b54bd batch build 2022-06-10 17:53:34 +08:00
skiffer-git 5cb907b0f1 batch build 2022-06-10 17:49:00 +08:00
skiffer-git 832f9c042d batch build 2022-06-10 17:42:45 +08:00
skiffer-git eaa416c394 batch build 2022-06-10 17:39:58 +08:00
skiffer-git 16645bc568 batch build 2022-06-10 17:37:31 +08:00
wangchuxiao 25f9e28230 fix signal 2022-06-10 17:33:36 +08:00
wangchuxiao 1687b70bde fix signal 2022-06-10 17:31:30 +08:00
skiffer-git d49ceef637 log 2022-06-10 15:55:07 +08:00
skiffer-git da573ac573 log 2022-06-10 15:37:24 +08:00
skiffer-git 743eaab9f6 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-10 13:33:14 +08:00
skiffer-git 202811f3c6 groupID digitization 2022-06-10 13:32:40 +08:00
wangchuxiao 6250603440 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-10 12:22:24 +08:00
wangchuxiao 650c7a3ae0 fix json word 2022-06-10 12:17:44 +08:00
Gordon 42d75decb0 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-10 11:10:30 +08:00
Gordon 55f6aa9ff8 add batch push 2022-06-10 11:08:18 +08:00
skiffer-git 0e77caa329 batch push 2022-06-10 10:48:03 +08:00
wangchuxiao da0e73fe11 fix json word 2022-06-10 10:24:47 +08:00
wangchuxiao fc5ab3572e fix word 2022-06-10 10:16:18 +08:00
wangchuxiao 891738747a fix word 2022-06-09 19:36:51 +08:00
wangchuxiao 1c52e731e1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 19:35:09 +08:00
wangchuxiao ee615fbadf fix word 2022-06-09 19:34:52 +08:00
Gordon 2ede9ef8ed add batch push 2022-06-09 18:24:32 +08:00
wangchuxiao dbcfcafdfc fix word 2022-06-09 18:16:23 +08:00
Gordon 7d63c82ddd Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 18:08:52 +08:00
Gordon 1d4dc81e55 add batch push 2022-06-09 18:08:42 +08:00
wangchuxiao ceca0f095b demo 2022-06-09 17:24:30 +08:00
wangchuxiao 793996e047 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 17:19:56 +08:00
wangchuxiao ab76d46007 demo 2022-06-09 17:19:39 +08:00
skiffer-git ed1e22bac5 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 17:04:52 +08:00
skiffer-git e57ce28d2b batch push 2022-06-09 17:04:16 +08:00
wangchuxiao 2b596e226a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-09 15:44:31 +08:00
wangchuxiao c46f574aa8 fix bug 2022-06-09 15:40:53 +08:00
wangchuxiao 9b4890a99f fix bug 2022-06-09 15:33:37 +08:00
wangchuxiao 3f129513bb fix bug 2022-06-09 15:33:28 +08:00
wangchuxiao 698490b936 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 15:25:27 +08:00
wangchuxiao c8bf95578c fix bug 2022-06-09 15:25:02 +08:00
skiffer-git 064132833c Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 15:21:05 +08:00
skiffer-git 60f8f93a02 batch push 2022-06-09 15:20:40 +08:00
wangchuxiao 7b08d98647 fix bug 2022-06-09 14:58:43 +08:00
skiffer-git 11e619d1b3 log 2022-06-09 14:26:18 +08:00
skiffer-git 4f184a6723 batch push 2022-06-09 14:24:24 +08:00
skiffer-git 5fd91e808a batch push 2022-06-09 14:07:09 +08:00
skiffer-git 0dfa224aeb config for msg read receipt 2022-06-09 14:00:18 +08:00
skiffer-git 32565dd188 config for msg read receipt 2022-06-09 13:57:10 +08:00
skiffer-git 96f09c45f5 batch push 2022-06-09 13:12:46 +08:00
skiffer-git d2474c8a72 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 12:49:54 +08:00
skiffer-git 9eb0dd5e70 batch push 2022-06-09 12:49:16 +08:00
wangchuxiao bbdcb34ab6 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 12:39:42 +08:00
wangchuxiao 6525d63459 fix bug 2022-06-09 12:39:28 +08:00
skiffer-git 0babf89aa5 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-08 20:26:41 +08:00
skiffer-git 317e6f81bb batch push 2022-06-08 20:26:08 +08:00
wangchuxiao ae684d6d39 fix bug 2022-06-08 19:39:36 +08:00
wangchuxiao d9710ac244 fix bug 2022-06-08 19:27:04 +08:00
wangchuxiao dff7a28094 fix bug 2022-06-08 19:14:25 +08:00
wangchuxiao da18950b3d fix bug 2022-06-08 19:06:22 +08:00
wangchuxiao 6055ce9b6b fix bug 2022-06-08 18:44:21 +08:00
wangchuxiao bd14739a9e fix bug 2022-06-08 18:40:07 +08:00
wangchuxiao 843cbe4f80 organization 2022-06-08 18:24:20 +08:00
wangchuxiao f650e73d5c fix bug 2022-06-08 17:36:24 +08:00
Gordon d1293dd047 log 2022-06-08 17:34:39 +08:00
Gordon 715e8a5000 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-08 17:24:31 +08:00
Gordon a7a69008d8 log 2022-06-08 17:24:22 +08:00
skiffer-git 553b56d094 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-08 17:21:11 +08:00
skiffer-git fec57c4ed7 log 2022-06-08 17:20:39 +08:00
Gordon b46f106a91 log 2022-06-08 17:19:37 +08:00
Gordon 0214419446 log 2022-06-08 17:17:55 +08:00
Gordon d587d14f86 log 2022-06-08 17:11:17 +08:00
wangchuxiao a115151616 fix bug 2022-06-08 17:08:47 +08:00
wangchuxiao 26771ee7d0 organization 2022-06-08 17:07:16 +08:00
Gordon 731263638b log 2022-06-08 16:53:58 +08:00
wangchuxiao a4f69351ce fix bug 2022-06-08 16:46:21 +08:00
wangchuxiao fa5f234a38 fix bug 2022-06-08 15:40:33 +08:00
wangchuxiao 5d2c981368 fix bug 2022-06-08 15:27:50 +08:00
wangchuxiao 4a55842724 fix bug 2022-06-08 15:26:31 +08:00
wangchuxiao e9655ed05e fix bug 2022-06-08 15:15:56 +08:00
wangchuxiao ed7d2bbdd7 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-08 15:07:19 +08:00
wangchuxiao 276328e0fd fix bug 2022-06-08 15:05:57 +08:00
Gordon 1bcd091330 Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
2022-06-08 11:43:11 +08:00
Gordon 536d7e2957 ws pb 2022-06-08 11:42:39 +08:00
Gordon 55e774344a ws pb 2022-06-08 10:32:21 +08:00
Gordon 7d0c8b0c5f super group add notification 2022-06-07 19:02:19 +08:00
Gordon 88c4cff50c Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:45:09 +08:00
Gordon cfe01bb820 super group push 2022-06-07 18:45:00 +08:00
wangchuxiao 4f1bd4e509 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-07 18:40:41 +08:00
Gordon 88544a89b7 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:39:52 +08:00
Gordon a87e41eecd super group push 2022-06-07 18:39:43 +08:00
wangchuxiao e52639d1d4 fix bug 2022-06-07 18:36:06 +08:00
skiffer-git 0463f5e83d fix bug 2022-06-07 18:25:08 +08:00
skiffer-git eb90314b38 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:10:02 +08:00
skiffer-git 6ce1d60ebb log 2022-06-07 18:09:11 +08:00
wangchuxiao 5fa62c9fbd Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-07 17:46:53 +08:00
Gordon ef93a1f42e add conversation sync 2022-06-07 17:45:07 +08:00
wangchuxiao 5f42748e1b Merge branch 'tuoyun' into superGroup
# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto
2022-06-07 17:42:24 +08:00
wangchuxiao 269df23851 set group memberInfo 2022-06-07 17:06:47 +08:00
wangchuxiao c40dc64bd0 set group memberInfo 2022-06-07 16:59:05 +08:00
skiffer-git 2b150e3c1c KickUserOffline 2022-06-07 16:38:42 +08:00
skiffer-git f7c17ac7e7 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 16:29:31 +08:00
skiffer-git 3f2638efaf KickUserOffline 2022-06-07 16:28:51 +08:00
Gordon f106664952 kick 2022-06-07 16:27:11 +08:00
skiffer-git afe8dcc1ff Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 16:19:15 +08:00
wangchuxiao 8f1e439381 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-07 16:18:32 +08:00
skiffer-git 4418d031e1 log 2022-06-07 16:18:23 +08:00
wangchuxiao f3fc452904 group set memberInfo 2022-06-07 16:18:18 +08:00
Gordon 89f40fe3de kick 2022-06-07 16:17:08 +08:00
Gordon f8962beca6 kick 2022-06-07 16:05:59 +08:00
skiffer-git dae1569f0e debug userid == "" 2022-06-07 14:02:11 +08:00
skiffer-git dd76c268c5 debug userid == "" 2022-06-07 13:50:35 +08:00
skiffer-git 52c52f23d3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	internal/msg_transfer/logic/online_history_msg_handler.go
2022-06-07 13:47:11 +08:00
skiffer-git 3adcb9f164 debug userid == "" 2022-06-07 13:44:52 +08:00
Gordon 0f1a061afe Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-07 12:28:48 +08:00
Gordon 95705cc95a log 2022-06-07 12:28:36 +08:00
wangchuxiao 07b652c1d4 singal offline push 2022-06-07 12:08:53 +08:00
skiffer-git eac137a9a9 ForceLogout 2022-06-07 11:50:37 +08:00
Gordon 6ec65965a4 log 2022-06-07 11:50:05 +08:00
skiffer-git 290ae774e0 ForceLogout 2022-06-07 11:42:15 +08:00
Gordon 31e12f682d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-07 11:24:37 +08:00
Gordon ae52f85502 log 2022-06-07 11:24:27 +08:00
skiffer-git fcda79eb3c fix bug: v.MsgData == nil 2022-06-07 11:10:49 +08:00
skiffer-git 385f371c06 fix bug: v.MsgData == nil 2022-06-07 10:52:52 +08:00
skiffer-git 6efb1a6705 fix bug: v.MsgData == nil 2022-06-07 10:40:19 +08:00
Gordon 4695ef3208 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 10:38:10 +08:00
Gordon 34e8b79e7e pb file 2022-06-07 10:38:01 +08:00
skiffer-git 3639f943bf group administrator access 2022-06-07 10:20:56 +08:00
skiffer-git d373369649 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 10:14:21 +08:00
skiffer-git 9106e70b37 group administrator access 2022-06-07 10:13:19 +08:00
Gordon 4678189ed4 pb file 2022-06-07 10:12:15 +08:00
Gordon 78298e1284 pb file 2022-06-07 10:11:49 +08:00
wangchuxiao 34c091f232 signal 2022-06-06 23:27:16 +08:00
skiffer-git 064b650fac group administrator access 2022-06-06 23:19:07 +08:00
wangchuxiao f8b4cbcc13 singal offline push 2022-06-06 21:04:11 +08:00
Gordon 2f9c8dbb33 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-06 20:55:02 +08:00
Gordon 8bd5db431b add function 2022-06-06 20:54:53 +08:00
skiffer-git 5754510d7a Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-06 20:42:41 +08:00
skiffer-git 797e2fea1e group info set 2022-06-06 20:39:45 +08:00
wangchuxiao 538656fcc7 singal offline push 2022-06-06 19:58:31 +08:00
wangchuxiao 0f66fa528d singal offline push 2022-06-06 19:48:59 +08:00
wangchuxiao 1a42f6dded singal offline push 2022-06-06 19:36:25 +08:00
wangchuxiao 4efdd342d6 singal offline push 2022-06-06 19:20:12 +08:00
wangchuxiao f15684a562 singal offline push 2022-06-06 19:02:35 +08:00
wangchuxiao 78dfba8771 singal offline push 2022-06-06 18:52:17 +08:00
wangchuxiao e428e186f0 singal offline push 2022-06-06 18:23:08 +08:00
wangchuxiao ebf07eddfb singal offline push 2022-06-06 18:18:30 +08:00
wangchuxiao d3abc44976 singal offline push 2022-06-06 18:15:32 +08:00
wangchuxiao dc7c10014d singal offline push 2022-06-06 10:45:04 +08:00
wangchuxiao 5e2e8f91c7 singal offline push 2022-06-06 10:42:23 +08:00
wangchuxiao e5a314bb3a singal offline push 2022-06-06 10:29:21 +08:00
wangchuxiao 9d3882d5b9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-06 10:23:01 +08:00
wangchuxiao a647007a0f singal offline push 2022-06-06 10:22:42 +08:00
wangchuxiao e04a4908cf k8s 2022-06-05 23:42:27 +08:00
wangchuxiao cfe0272022 singal offline push 2022-06-02 20:53:50 +08:00
wangchuxiao 2e3b55d9e8 singal offline push 2022-06-02 20:19:24 +08:00
wangchuxiao 6b8ebe11de singal offline push 2022-06-02 20:17:12 +08:00
wangchuxiao 1fffd36054 singal offline push 2022-06-02 20:06:14 +08:00
wangchuxiao 2b25fea86c singal offline push 2022-06-02 19:52:29 +08:00
wangchuxiao 409a8311b1 singal offline push 2022-06-02 19:14:11 +08:00
wangchuxiao 6996c008d0 singal offline push 2022-06-02 18:36:42 +08:00
wangchuxiao 64fa52452c singal offline push 2022-06-02 18:19:20 +08:00
wangchuxiao 16d33b1c1f singal offline push 2022-06-02 18:17:11 +08:00
Gordon 0a260a67d5 ws and push update 2022-06-02 17:37:00 +08:00
Gordon 1aacd3cb23 ws and push update 2022-06-02 16:51:31 +08:00
Gordon 5af3ba9db6 ws and push update 2022-06-02 16:48:56 +08:00
Gordon 14bfd78f63 ws and push update 2022-06-02 16:47:48 +08:00
Gordon febc672e6e ws and push update 2022-06-02 16:45:48 +08:00
Gordon a18dcfce9e ws and push update 2022-06-02 16:44:55 +08:00
Gordon 48410c428a redis update 2022-06-02 14:28:00 +08:00
wenxu12345 da1df91f49 Clear msg 2022-06-01 15:54:40 +08:00
wenxu12345 b2df6e6d41 Clear msg 2022-06-01 15:53:14 +08:00
wenxu12345 8315c61240 Clear msg 2022-06-01 15:25:22 +08:00
wenxu12345 1ff7ebb04a tools 2022-06-01 15:09:20 +08:00
wenxu12345 ab914f4621 tools 2022-06-01 11:18:28 +08:00
skiffer-git 51ef00e0f2 Update README.md 2022-06-01 08:20:21 +08:00
wenxu12345 2b4df5be16 Clear personal chat history 2022-05-31 19:16:29 +08:00
wangchuxiao f98da25fda organization 2022-05-31 19:14:00 +08:00
Gordon 4c305b7cc0 redis replace go redis 2022-05-31 15:18:54 +08:00
Gordon 5c979a532f redis replace go redis 2022-05-31 15:13:59 +08:00
Gordon fcf2427878 redis replace go redis 2022-05-31 14:51:37 +08:00
Gordon 31e923fc67 redis replace go redis 2022-05-31 14:51:25 +08:00
Gordon 1c2ebb8c5d redis replace go redis 2022-05-31 14:37:47 +08:00
wangchuxiao 29e75a4851 organization 2022-05-31 14:30:14 +08:00
Gordon 3765661a4e redis replace go redis 2022-05-31 14:29:16 +08:00
Gordon 628984c09d redis replace go redis 2022-05-31 14:25:52 +08:00
Gordon a630653d88 redis replace go redis 2022-05-31 14:22:42 +08:00
Gordon e693b908be redis replace go redis 2022-05-31 13:41:06 +08:00
Gordon f36b2433a0 redis replace go redis 2022-05-31 13:24:18 +08:00
Gordon 47af0d0356 redis replace go redis 2022-05-31 13:20:51 +08:00
Gordon d4c587c668 redis replace go redis 2022-05-31 13:09:33 +08:00
Gordon dda453975b redis replace go redis 2022-05-31 12:32:26 +08:00
Gordon c28801ff27 redis replace go redis 2022-05-31 12:20:40 +08:00
Gordon 4e609ebc33 redis replace go redis 2022-05-31 12:14:40 +08:00
Gordon 1257e96d5e redis replace go redis 2022-05-31 12:13:12 +08:00
Gordon 122a3ab4ce redis replace go redis 2022-05-31 12:10:24 +08:00
Gordon 136cb43cd1 redis replace go redis 2022-05-31 12:07:06 +08:00
Gordon ad8086d2b6 redis replace go redis 2022-05-31 11:57:22 +08:00
Gordon d00641a73c redis replace go redis 2022-05-31 11:47:35 +08:00
wangchuxiao 197be51047 k8s 2022-05-30 21:19:05 +08:00
wangchuxiao 53c40a87b2 k8s 2022-05-30 21:17:57 +08:00
wangchuxiao b304c13034 k8s 2022-05-30 21:15:59 +08:00
wangchuxiao cb895d17ff k8s 2022-05-30 21:12:53 +08:00
wangchuxiao f0dd3aada3 k8s 2022-05-30 21:10:24 +08:00
wangchuxiao 2d055c8d8d k8s 2022-05-30 21:03:29 +08:00
wangchuxiao aad4482a78 k8s 2022-05-30 21:02:42 +08:00
wangchuxiao d71536ab86 k8s 2022-05-30 21:01:35 +08:00
wangchuxiao fe25d52082 k8s 2022-05-30 20:56:32 +08:00
wangchuxiao 0441662e0c k8s 2022-05-30 20:53:54 +08:00
wangchuxiao 0f40bc4cce k8s 2022-05-30 20:52:39 +08:00
wangchuxiao 13e9c20be0 k8s 2022-05-30 20:50:32 +08:00
wangchuxiao 17bab31b18 k8s 2022-05-30 20:49:51 +08:00
wangchuxiao 26f11fabb7 k8s 2022-05-30 20:47:49 +08:00
wangchuxiao b892749c75 k8s 2022-05-30 20:46:53 +08:00
wangchuxiao 810b08c50d k8s 2022-05-30 20:43:19 +08:00
wangchuxiao fc71a757dd k8s 2022-05-30 20:29:22 +08:00
wangchuxiao 6c324414b1 k8s 2022-05-30 20:26:11 +08:00
wangchuxiao d7283b92ac k8s 2022-05-30 20:19:56 +08:00
wangchuxiao d67fdbc24e k8s 2022-05-30 20:17:10 +08:00
wangchuxiao 1edaf15220 k8s 2022-05-30 20:15:17 +08:00
wangchuxiao 38bd2bd011 k8s 2022-05-30 20:10:01 +08:00
wangchuxiao da4ac6d709 k8s 2022-05-30 20:07:01 +08:00
wangchuxiao 9e16629d69 k8s 2022-05-30 19:41:28 +08:00
Gordon 0aefab34f1 log 2022-05-30 19:37:54 +08:00
wangchuxiao 05b4ddfd46 k8s 2022-05-30 19:37:32 +08:00
Gordon 74f2d6bea6 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 19:31:19 +08:00
Gordon 5392c9fd38 log 2022-05-30 19:31:09 +08:00
wenxu12345 cd8e12c747 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 18:24:18 +08:00
wenxu12345 591b292fbf super group 2022-05-30 18:23:12 +08:00
Gordon 3610525c88 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 17:46:27 +08:00
Gordon 1db3ecca22 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 17:46:15 +08:00
wangchuxiao 0168ef4014 superGroup 2022-05-30 17:46:11 +08:00
Gordon 25450a4182 message update 2022-05-30 17:46:06 +08:00
wangchuxiao 8cc6b048fd superGroup 2022-05-30 17:39:52 +08:00
wangchuxiao cf094a2048 superGroup 2022-05-30 17:30:55 +08:00
wangchuxiao 10881c8f5b superGroup 2022-05-30 17:12:08 +08:00
wangchuxiao 23c6c8b331 superGroup 2022-05-30 16:29:37 +08:00
wangchuxiao cf8a437361 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 16:23:34 +08:00
wangchuxiao 653c0faa18 superGroup 2022-05-30 16:23:15 +08:00
wenxu12345 b108e5bf45 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 15:50:45 +08:00
wenxu12345 5e5597ef19 super group 2022-05-30 15:49:35 +08:00
wangchuxiao edb5cb4ee5 superGroup 2022-05-30 15:45:19 +08:00
wangchuxiao 3b81108738 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 15:27:43 +08:00
wangchuxiao 110f5e02f4 superGroup 2022-05-30 15:27:23 +08:00
Gordon a4a7ce51ad Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 15:16:13 +08:00
Gordon 08a7dbe319 message update 2022-05-30 15:15:46 +08:00
wangchuxiao 0b9e6d52b4 superGroup 2022-05-30 15:11:13 +08:00
wangchuxiao ecf0a4f299 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 15:10:32 +08:00
wangchuxiao d3fe5cdf34 superGroup 2022-05-30 15:10:26 +08:00
wenxu12345 d3d5c11675 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 12:12:24 +08:00
wenxu12345 ae30b4359f super group 2022-05-30 12:12:09 +08:00
Gordon bda1b0a304 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-30 11:56:45 +08:00
Gordon 839f3e52ef pull message update 2022-05-30 11:56:32 +08:00
wangchuxiao a85f6b8287 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-05-30 11:55:45 +08:00
wangchuxiao fe9f86b432 superGroup 2022-05-30 11:55:27 +08:00
wangchuxiao c0a3bdcf99 k8s 2022-05-29 19:44:22 +08:00
skiffer-git 94125fa5dd Update README.md 2022-05-29 13:12:17 +08:00
skiffer-git a77971ae13 Update README.md 2022-05-29 13:12:07 +08:00
skiffer-git e7f153a5e5 Add files via upload 2022-05-29 13:11:19 +08:00
skiffer-git 8cd39861f8 Delete Wechat.jpg 2022-05-29 13:11:07 +08:00
skiffer-git dcff407670 Update README.md 2022-05-29 13:10:35 +08:00
skiffer-git 3b453dea13 Update README.md 2022-05-29 13:10:16 +08:00
skiffer-git 9981b8f16c Update README.md 2022-05-29 13:09:47 +08:00
skiffer-git da4663aa83 Update README.md 2022-05-29 13:08:20 +08:00
skiffer-git 3895bbc801 Add files via upload 2022-05-29 13:07:37 +08:00
Gordon 7285e2b2c9 add super group 2022-05-28 18:10:08 +08:00
Gordon e9bf26e0ca pb file 2022-05-28 17:22:19 +08:00
wenxu12345 ec0319d256 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-05-27 20:30:31 +08:00
wenxu12345 1bfefbd083 super group 2022-05-27 20:29:39 +08:00
wangchuxiao 8967343079 superGroup 2022-05-27 19:33:47 +08:00
wangchuxiao b3ba06aecb superGroup 2022-05-27 19:16:47 +08:00
wangchuxiao 8cdcd7105a superGroup 2022-05-27 18:57:04 +08:00
wangchuxiao cc6d8d28b5 superGroup 2022-05-27 18:53:47 +08:00
wangchuxiao b55e13dbeb superGroup 2022-05-27 18:40:24 +08:00
wangchuxiao bbe8c46df9 callback 2022-05-27 16:13:44 +08:00
wangchuxiao 16a56457ed callback 2022-05-27 15:34:10 +08:00
wangchuxiao a4c0728e28 callback 2022-05-27 15:19:13 +08:00
wangchuxiao d6907f3f3a callback 2022-05-27 15:17:17 +08:00
wangchuxiao 3f126be081 callback 2022-05-27 15:14:12 +08:00
wangchuxiao cbf0b3c05e callback 2022-05-27 15:10:20 +08:00
wangchuxiao 0f0470b93c callback 2022-05-27 15:03:29 +08:00
wangchuxiao d104c6dbf4 callback 2022-05-27 14:20:05 +08:00
wangchuxiao a8705be6ee callback 2022-05-27 13:16:05 +08:00
wangchuxiao f54ba4b018 callback 2022-05-27 13:11:19 +08:00
wangchuxiao 884b410dce callback 2022-05-27 12:49:26 +08:00
wangchuxiao e5945fa720 callback 2022-05-27 11:49:38 +08:00
wangchuxiao b155a9908b callback 2022-05-27 11:34:10 +08:00
wangchuxiao d67e4a3491 callback 2022-05-27 11:08:27 +08:00
wangchuxiao 97d0ab1b75 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-27 10:33:31 +08:00
wangchuxiao f5befcc95f callback 2022-05-27 10:26:44 +08:00
wangchuxiao ab047944b6 ingress 2022-05-27 00:33:52 +08:00
wangchuxiao ce5f927a8d ingress 2022-05-27 00:27:17 +08:00
wangchuxiao dcb777d6ea ingress 2022-05-27 00:01:51 +08:00
wangchuxiao decf728d91 ingress 2022-05-26 22:11:03 +08:00
wangchuxiao 098f8a52f7 callback 2022-05-26 19:59:40 +08:00
wangchuxiao 1eeb7f8303 callback 2022-05-26 19:53:13 +08:00
wangchuxiao 4b7177101a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-26 18:09:13 +08:00
wangchuxiao 73cf3eb869 callback 2022-05-26 18:08:29 +08:00
wangchuxiao b4da35a0ab ingress 2022-05-26 18:02:00 +08:00
wenxu12345 e3d92c27e8 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-26 12:11:36 +08:00
wenxu12345 8addb49012 add error handling : mongo 2022-05-26 12:10:45 +08:00
wenxu12345 ac1e557c46 add error handling : mongo 2022-05-26 12:10:30 +08:00
wangchuxiao d1651b54ec ingress 2022-05-26 10:45:16 +08:00
wangchuxiao f61dbdccec ingress 2022-05-26 10:37:06 +08:00
wangchuxiao 9beff11125 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-26 10:08:22 +08:00
wangchuxiao d8c0a82411 ingress 2022-05-26 10:06:56 +08:00
Gordon 2add9a02f9 channelNum 2022-05-25 22:42:44 +08:00
Gordon 2910a6effd channelNum 2022-05-25 22:30:30 +08:00
Gordon 5621a651a1 channelNum 2022-05-25 22:17:11 +08:00
Gordon c83e816bda channelNum 2022-05-25 22:15:34 +08:00
Gordon 948e5a2dde channelNum 2022-05-25 21:43:35 +08:00
Gordon 94cd17909d channelNum 2022-05-25 21:23:10 +08:00
Gordon bcfa3efef7 channelNum 2022-05-25 21:15:17 +08:00
Gordon bf87eb68e2 channelNum 2022-05-25 21:03:48 +08:00
Gordon a84298de86 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-25 20:29:41 +08:00
Gordon ee47c6d727 channelNum 2022-05-25 20:29:32 +08:00
wangchuxiao ef5bd95620 ingress 2022-05-25 20:17:17 +08:00
wangchuxiao b36703fc47 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 19:46:13 +08:00
wangchuxiao b2112ca8b9 ingress 2022-05-25 19:45:57 +08:00
Gordon 7952545f0d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-25 19:37:31 +08:00
Gordon c997fbafb0 channelNum 2022-05-25 19:37:20 +08:00
wangchuxiao 60c8d3b832 script 2022-05-25 19:21:06 +08:00
wangchuxiao 778c1852b8 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 19:15:35 +08:00
wangchuxiao 08cc287dff script 2022-05-25 19:15:15 +08:00
Gordon 17b7ef80ba channelNum 2022-05-25 19:01:36 +08:00
Gordon a4532cb834 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-25 18:47:03 +08:00
Gordon dc2bc7fbf7 channelNum 2022-05-25 18:46:53 +08:00
wangchuxiao d37dd66ec5 script 2022-05-25 18:26:12 +08:00
wangchuxiao 79bbeea7f0 script 2022-05-25 18:25:09 +08:00
wangchuxiao 5b56de784d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 18:18:54 +08:00
wangchuxiao 620dd0be78 script 2022-05-25 18:18:35 +08:00
Gordon 7267fd080e channelNum 2022-05-25 18:17:55 +08:00
Gordon 2d8e03cc69 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-25 18:12:16 +08:00
Gordon b797492dbd channelNum 2022-05-25 18:11:49 +08:00
Gordon eb41d8b16d channelNum 2022-05-25 18:10:53 +08:00
wangchuxiao d791aa2e4f script 2022-05-25 18:09:41 +08:00
wangchuxiao f969841464 script 2022-05-25 18:05:47 +08:00
wangchuxiao 93d63508dc script 2022-05-25 18:05:24 +08:00
Gordon 84e7935971 channelNum 2022-05-25 18:03:43 +08:00
wangchuxiao 730bedf0a5 script 2022-05-25 18:01:39 +08:00
wangchuxiao 0ed223ef01 script 2022-05-25 17:58:05 +08:00
wangchuxiao fc677ca0e9 script 2022-05-25 17:48:28 +08:00
wangchuxiao c02f95c2fc script 2022-05-25 17:47:04 +08:00
wangchuxiao 76b5affaaa script 2022-05-25 17:46:02 +08:00
wangchuxiao 72c7cc2c67 script 2022-05-25 17:42:45 +08:00
wangchuxiao 13b9749e8f del msg 2022-05-25 17:41:32 +08:00
wangchuxiao 3f76521bfe Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 17:39:42 +08:00
wangchuxiao 837cf10e36 del msg 2022-05-25 17:38:49 +08:00
wenxu12345 e8fe7cc853 debug 2022-05-25 17:14:09 +08:00
Gordon 5db96847fc Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-25 16:37:29 +08:00
Gordon 746b01f8ca push update 2022-05-25 16:37:20 +08:00
wangchuxiao eb2218c220 del msg 2022-05-25 16:33:28 +08:00
wangchuxiao 657ec411c3 del msg 2022-05-25 16:28:28 +08:00
wangchuxiao 9895806d23 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 16:25:36 +08:00
wangchuxiao 5957e4b264 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 16:25:16 +08:00
Gordon c544c4d6b5 push update 2022-05-25 16:22:35 +08:00
Gordon 061af3f827 push update 2022-05-25 16:16:23 +08:00
wangchuxiao 4d8708a5ee Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 16:10:05 +08:00
wangchuxiao 9eb1870196 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 16:01:34 +08:00
wangchuxiao e961a44511 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/rpcChat.go
2022-05-25 15:58:06 +08:00
wangchuxiao c16a35ec8c del msg 2022-05-25 15:57:17 +08:00
wangchuxiao 841566a5d1 del msg 2022-05-25 15:56:39 +08:00
Gordon 4a822c5920 push update 2022-05-25 15:53:19 +08:00
Gordon ce554fc442 push update 2022-05-25 15:48:48 +08:00
Gordon e9a515ac34 message update 2022-05-25 15:29:38 +08:00
Gordon b14b53329c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-25 15:22:03 +08:00
Gordon b8641258d6 message update 2022-05-25 15:21:53 +08:00
wangchuxiao 6022aff965 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-25 15:09:25 +08:00
wangchuxiao 18eaae80ec del msg 2022-05-25 15:09:17 +08:00
Gordon a4e41462c7 message update 2022-05-25 14:55:14 +08:00
Gordon f8bed154ce pb file 2022-05-25 14:36:24 +08:00
Gordon 8ee3f7ab66 pb file 2022-05-25 14:22:39 +08:00
Gordon 77c7efbe89 redis add get message 2022-05-24 23:31:37 +08:00
Gordon 8d78ef5946 redis add get message 2022-05-24 23:07:07 +08:00
Gordon 4571a3b50b redis add get message 2022-05-24 22:27:53 +08:00
Gordon b48197c8aa redis add get message 2022-05-24 22:14:30 +08:00
Gordon bb45c0c34b redis add get message 2022-05-24 21:45:34 +08:00
Gordon 25c316165e redis add get message 2022-05-24 21:42:12 +08:00
wenxu12345 1246f3aa21 msg cache 2022-05-24 21:34:02 +08:00
wenxu12345 49cd31fd41 msg cache 2022-05-24 21:31:55 +08:00
Gordon 94e6380485 redis add get message 2022-05-24 21:14:39 +08:00
Gordon 36b5315075 redis add get message 2022-05-24 20:17:06 +08:00
Gordon c66ccfeda2 redis add get message 2022-05-24 20:04:40 +08:00
Gordon ae0cfe1575 redis add get message 2022-05-24 19:25:49 +08:00
Gordon 79ff36d49a redis add get message 2022-05-24 19:24:11 +08:00
Gordon d6742812c8 redis add get message 2022-05-24 18:58:22 +08:00
Gordon 13dc721cb0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-24 18:41:08 +08:00
Gordon 57967835bd redis add get message 2022-05-24 18:40:57 +08:00
wenxu12345 db9913c725 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-24 18:19:11 +08:00
wenxu12345 c3e3f4e947 msg cache 2022-05-24 18:18:59 +08:00
wangchuxiao f33937bc5d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-24 18:18:05 +08:00
wangchuxiao c176a5b80a msg cache 2022-05-24 18:17:50 +08:00
wenxu12345 e2db8c07af msg cache 2022-05-24 17:52:29 +08:00
Gordon c224892609 redis add get message 2022-05-24 17:49:43 +08:00
Gordon f5ed9d93c3 redis add get message 2022-05-24 17:47:25 +08:00
Gordon 88145694ce Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-24 17:36:21 +08:00
Gordon d58f7fd089 redis add get message 2022-05-24 17:36:11 +08:00
wangchuxiao c32b53b3c0 msg cache 2022-05-24 17:22:17 +08:00
wangchuxiao 9dfef527a3 msg cache 2022-05-24 17:09:02 +08:00
wangchuxiao df51c8b9a4 msg cache 2022-05-24 16:54:56 +08:00
wangchuxiao 499c4a27d3 k8s deploy 2022-05-24 15:48:45 +08:00
Gordon bfe08acfec docker compose file update 2022-05-24 12:39:37 +08:00
Gordon ffae976e11 compose file update 2022-05-24 12:36:05 +08:00
Gordon ced8eb419f compose file update 2022-05-24 12:25:41 +08:00
Gordon 0ab2eaa630 compose file update 2022-05-24 12:24:53 +08:00
Gordon d385f555dd compose file update 2022-05-24 12:23:39 +08:00
Gordon 268e5cbdb1 compose file update 2022-05-24 12:19:55 +08:00
Gordon 247649ec34 compose file update 2022-05-24 12:09:55 +08:00
Gordon 2ada6d969d compose file update 2022-05-24 11:46:29 +08:00
Gordon a4d2740f24 consumer update test 2022-05-24 11:37:39 +08:00
Gordon df7266cc75 consumer update test 2022-05-24 11:35:03 +08:00
Gordon 3255b73a44 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-24 11:14:12 +08:00
Gordon 305e81bef1 consumer update test 2022-05-24 11:14:02 +08:00
wangchuxiao 84cc6e9140 k8s deploy 2022-05-24 10:53:18 +08:00
wangchuxiao b8d95f4b31 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-24 10:42:24 +08:00
wangchuxiao c0f7d02f44 k8s deploy 2022-05-24 10:42:07 +08:00
Gordon 7fc6b61f21 consumer update 2022-05-23 20:39:44 +08:00
Gordon ed3a1296d8 consumer update 2022-05-23 20:20:06 +08:00
Gordon 66c62d8875 consumer update 2022-05-23 20:12:54 +08:00
Gordon 7d1b06471f Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-23 19:57:00 +08:00
Gordon b7309cdda8 log 2022-05-23 19:56:34 +08:00
wangchuxiao 6ffc12ef97 k8s deploy 2022-05-23 19:14:29 +08:00
wangchuxiao 79b2d39305 k8s deploy 2022-05-23 18:04:51 +08:00
wangchuxiao b3525ea6a5 k8s deploy 2022-05-23 17:56:29 +08:00
wangchuxiao b5ceec4883 k8s deploy 2022-05-23 17:40:04 +08:00
wangchuxiao 4287082f4b k8s deploy 2022-05-23 17:22:27 +08:00
wangchuxiao e3a8d12d4b k8s deploy 2022-05-23 17:19:53 +08:00
wangchuxiao ce15c26b59 k8s deploy 2022-05-23 16:07:52 +08:00
wangchuxiao 48940272ae k8s deploy 2022-05-23 15:49:55 +08:00
wangchuxiao 8c64538207 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-23 14:32:37 +08:00
wangchuxiao 0460033281 k8s deploy 2022-05-23 14:30:54 +08:00
wangchuxiao 8240cb9c0f k8s deploy 2022-05-23 14:24:46 +08:00
Gordon e385f054df message handle 2022-05-23 11:57:41 +08:00
wangchuxiao 03ae935756 k8s deploy 2022-05-23 11:39:59 +08:00
wangchuxiao d196f455cb k8s deploy 2022-05-23 11:32:33 +08:00
Gordon 50bb13b7cd message handle 2022-05-23 10:55:33 +08:00
wangchuxiao 652afd6b57 Merge branch 'k8s' of github.com:OpenIMSDK/Open-IM-Server into k8s 2022-05-23 10:14:21 +08:00
wangchuxiao d1cb176b31 del msg sync 2022-05-23 10:14:10 +08:00
Gordon 767131a117 message handle 2022-05-23 09:54:43 +08:00
Gordon f0dadcef70 message handle 2022-05-23 09:41:34 +08:00
skiffer-git 1f20024b91 log 2022-05-23 08:44:20 +08:00
skiffer-git f5c7197dda log 2022-05-23 08:42:50 +08:00
wangchuxiao cb497fe720 k8s_deployment 2022-05-23 00:55:56 +08:00
skiffer-git bef0e40db8 log 2022-05-22 21:48:01 +08:00
skiffer-git 24073b20ab log 2022-05-22 21:37:38 +08:00
skiffer-git 64d83d9048 log 2022-05-22 21:31:10 +08:00
skiffer-git 5c0b06f27d log 2022-05-22 21:27:29 +08:00
skiffer-git b09e2c11eb sess == nil 2022-05-22 21:10:18 +08:00
skiffer-git 8c119a76d1 sess == nil 2022-05-22 21:08:57 +08:00
skiffer-git 04a9788bc0 log 2022-05-22 18:47:16 +08:00
skiffer-git 883e7f96ee log 2022-05-22 18:42:08 +08:00
skiffer-git d276be9594 Reduce memory copies 2022-05-22 18:28:51 +08:00
skiffer-git 2fc6b0a8cb log 2022-05-22 15:57:02 +08:00
skiffer-git 9f295d8399 log 2022-05-22 15:15:55 +08:00
skiffer-git 024f454702 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-22 15:09:49 +08:00
skiffer-git 821ad4de2e log 2022-05-22 15:09:21 +08:00
Gordon b864f9c6a9 message 2022-05-21 19:17:31 +08:00
Gordon 31e0a8a88b log change 2022-05-21 15:04:42 +08:00
Gordon be3d2b6552 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	internal/msg_transfer/logic/online_history_msg_handler.go
2022-05-21 15:04:19 +08:00
Gordon e2eb546069 log change 2022-05-21 15:03:26 +08:00
skiffer-git b2ae3b4fee Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-21 15:01:35 +08:00
skiffer-git 5b9e5f904b log 2022-05-21 15:01:01 +08:00
Gordon 7d1843f485 log change 2022-05-21 14:19:45 +08:00
skiffer-git f1e2704407 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-21 11:01:13 +08:00
skiffer-git 17b4a0525d log 2022-05-21 10:59:44 +08:00
Gordon 5cdba3c00a log change 2022-05-21 10:19:02 +08:00
Gordon 79b5551ec1 log change 2022-05-21 09:58:27 +08:00
skiffer-git ac840323be Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-21 07:33:39 +08:00
skiffer-git c2e7863ca0 fix bug 2022-05-21 07:32:45 +08:00
Gordon 01b065b3c2 concurrent consumption of messages 2022-05-20 21:58:23 +08:00
Gordon 55907a9a05 concurrent consumption of messages 2022-05-20 21:02:18 +08:00
skiffer-git 6e9dcdbb50 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	pkg/common/db/batch_insert_chat.go
2022-05-20 20:13:25 +08:00
skiffer-git 0265ea45b2 fix bug 2022-05-20 20:11:47 +08:00
Gordon ccb7e41434 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 20:10:35 +08:00
Gordon 38317c5497 concurrent consumption of messages 2022-05-20 20:10:24 +08:00
skiffer-git 9f62de0420 fix bug 2022-05-20 19:46:49 +08:00
wangchuxiao e8e4af7286 k8s_deploy 2022-05-20 19:43:28 +08:00
skiffer-git 2c5d30a0ff Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 19:36:28 +08:00
skiffer-git eb27db2232 fix bug 2022-05-20 19:36:06 +08:00
Gordon adb6337a27 concurrent consumption of messages 2022-05-20 19:34:45 +08:00
Gordon 624bb0a7e5 concurrent consumption of messages 2022-05-20 18:46:19 +08:00
Gordon 757829d286 concurrent consumption of messages 2022-05-20 17:43:25 +08:00
Gordon c5f055718a concurrent consumption of messages 2022-05-20 17:32:40 +08:00
Gordon a12c8f4dbc concurrent consumption of messages 2022-05-20 17:06:51 +08:00
Gordon f072afa6ef Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 16:53:46 +08:00
Gordon 686d77dcc1 concurrent consumption of messages 2022-05-20 16:53:35 +08:00
skiffer-git 7da227cdfa Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 16:12:31 +08:00
skiffer-git abcfaa05e2 log 2022-05-20 16:12:05 +08:00
Gordon aa144b0439 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 16:07:41 +08:00
Gordon 15329a97fe concurrent consumption of messages 2022-05-20 16:07:32 +08:00
skiffer-git 223b2678b4 fix bug 2022-05-20 16:03:33 +08:00
Gordon 930923e330 concurrent consumption of messages 2022-05-20 15:51:37 +08:00
Gordon 8fe929d8ab concurrent consumption of messages 2022-05-20 15:47:04 +08:00
Gordon e12207fc73 concurrent consumption of messages 2022-05-20 15:40:40 +08:00
Gordon ef05949e5a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 15:29:01 +08:00
Gordon a2f7edcbcd concurrent consumption of messages 2022-05-20 15:28:36 +08:00
skiffer-git 7f80638928 fix bug 2022-05-20 15:27:25 +08:00
skiffer-git 222d6cdca1 fix bug 2022-05-20 15:21:16 +08:00
Gordon aa733542e3 concurrent consumption of messages 2022-05-20 15:09:52 +08:00
Gordon 2b142baf19 concurrent consumption of messages 2022-05-20 14:48:06 +08:00
Gordon 78bfd1ff64 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	internal/msg_transfer/logic/online_history_msg_handler.go
2022-05-20 14:45:40 +08:00
Gordon 7ea1309146 concurrent consumption of messages 2022-05-20 14:42:49 +08:00
skiffer-git a7be7a3e7a log 2022-05-20 14:38:10 +08:00
skiffer-git a14fd303fc log 2022-05-20 14:32:09 +08:00
skiffer-git b632a991b9 log 2022-05-20 14:18:54 +08:00
skiffer-git 06aae24dad log 2022-05-20 14:12:29 +08:00
skiffer-git 3bf04802e4 log 2022-05-20 14:06:51 +08:00
skiffer-git 6f79e63b3f log 2022-05-20 14:06:31 +08:00
skiffer-git 67cfdedcc4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 13:34:51 +08:00
skiffer-git f0c6295cff batch to mongo 2022-05-20 13:34:34 +08:00
Gordon 6c5629a0d7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 13:33:49 +08:00
Gordon 06726758d2 concurrent consumption of messages 2022-05-20 13:33:38 +08:00
skiffer-git 866c7d4f2f batch to mongo 2022-05-20 13:15:32 +08:00
skiffer-git 17695927d5 batch to mongo 2022-05-20 13:09:28 +08:00
skiffer-git ea8638c843 batch to mongo 2022-05-20 13:01:08 +08:00
skiffer-git 0fbc1095be batch to mongo 2022-05-20 12:21:29 +08:00
skiffer-git b914e8388d batch to mongo 2022-05-20 12:11:46 +08:00
skiffer-git 31911a40c0 batch to mongo 2022-05-20 11:24:10 +08:00
skiffer-git 00a2a23190 batch to mongo 2022-05-20 11:20:21 +08:00
skiffer-git 5f25e605d3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-20 11:02:27 +08:00
skiffer-git d4f81f086c batch to mongo 2022-05-20 11:00:11 +08:00
wangchuxiao e048813c43 k8s_deploy 2022-05-20 10:42:33 +08:00
wangchuxiao 1186f2fb14 k8s_deploy 2022-05-20 10:32:51 +08:00
wangchuxiao a2cdf6559d k8s_deploy 2022-05-20 10:28:07 +08:00
wangchuxiao 9d6d74ce98 k8s_deploy 2022-05-20 10:19:00 +08:00
wangchuxiao dbc7023c00 k8s_deploy 2022-05-19 20:05:37 +08:00
wangchuxiao 6fd84dba8f k8s_deploy 2022-05-19 19:58:46 +08:00
wangchuxiao e444a52b6a k8s_deploy 2022-05-19 19:56:49 +08:00
wangchuxiao d431a81cf0 k8s_deploy 2022-05-19 19:55:51 +08:00
wangchuxiao dcb03a2250 k8s_deploy 2022-05-19 19:48:29 +08:00
wangchuxiao 8d6e016e48 k8s_deploy 2022-05-19 19:29:45 +08:00
wangchuxiao f067af664e k8s_deploy 2022-05-19 19:22:57 +08:00
wangchuxiao 6355e4e3bc k8s_deploy 2022-05-19 19:13:22 +08:00
wangchuxiao e2f9c18a27 k8s_deploy 2022-05-19 19:12:35 +08:00
wangchuxiao cc93dba508 k8s_deploy 2022-05-19 19:03:27 +08:00
wangchuxiao b1f270c082 k8s_deploy 2022-05-19 18:22:18 +08:00
Gordon d086de8103 concurrent consumption of messages 2022-05-19 18:08:44 +08:00
wangchuxiao 523ca2f7fc k8s_deploy 2022-05-19 17:50:04 +08:00
Gordon a2888b009d concurrent consumption of messages 2022-05-19 14:21:38 +08:00
Gordon 143e2908ad concurrent consumption of messages 2022-05-19 14:18:05 +08:00
Gordon 98542bd5d5 concurrent consumption of messages 2022-05-19 12:28:14 +08:00
Gordon ee0a71de1b concurrent consumption of messages 2022-05-19 12:25:46 +08:00
wangchuxiao 9f8cb6ca34 k8s_deploy 2022-05-19 11:17:07 +08:00
wangchuxiao 759fb8a802 k8s_deploy 2022-05-19 10:58:33 +08:00
wangchuxiao ab06eaeca8 k8s_deploy 2022-05-19 10:55:14 +08:00
wangchuxiao 267b3a9547 k8s_deploy 2022-05-19 10:50:22 +08:00
wangchuxiao 0b49ecfc12 office tag async send 2022-05-19 10:49:40 +08:00
wangchuxiao 23b03919e6 office tag async send 2022-05-19 10:44:39 +08:00
Gordon 4f165f3b27 statistic update 2022-05-18 21:58:32 +08:00
Gordon 967a4c7748 statistic update 2022-05-18 21:09:49 +08:00
wangchuxiao 03c23f0fda office tag async send 2022-05-18 19:17:43 +08:00
wangchuxiao 44bad0146c office tag async send 2022-05-18 19:13:00 +08:00
Gordon d92d6e84d0 push message 2022-05-18 18:58:51 +08:00
Gordon 355b64fda4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-18 18:37:52 +08:00
Gordon c1632f8e65 tag message sender not notification 2022-05-18 18:37:42 +08:00
wangchuxiao 1fa16bd8dd office tag async send 2022-05-18 16:36:30 +08:00
wangchuxiao 0ac531674c Merge branch 'tuoyun' into k8s 2022-05-18 16:07:43 +08:00
wangchuxiao 18a61061e1 office tag async send 2022-05-18 15:48:42 +08:00
wangchuxiao b0e349212d office tag async send 2022-05-18 15:25:17 +08:00
wangchuxiao 9913e67928 office tag async send 2022-05-18 15:16:44 +08:00
wangchuxiao 888c837cdd office tag async send 2022-05-18 15:10:44 +08:00
wangchuxiao 0e03fb6393 organization 2022-05-18 12:51:33 +08:00
wangchuxiao 317fed304c Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-18 11:54:12 +08:00
wangchuxiao 681cf349e6 organization 2022-05-18 11:53:57 +08:00
skiffer-git 313cf858f0 Statistics 2022-05-18 11:52:15 +08:00
Gordon fa94fd075f Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-18 11:49:36 +08:00
Gordon 3433d211a5 options add value 2022-05-18 11:49:24 +08:00
wangchuxiao dcda3c7329 organization 2022-05-18 11:34:12 +08:00
wangchuxiao d2563063d1 organization 2022-05-18 11:18:24 +08:00
wangchuxiao 9557baf22a organization 2022-05-18 11:15:09 +08:00
wangchuxiao c7b1d4514f organization 2022-05-18 11:06:45 +08:00
wangchuxiao 09cd8bcb99 organization 2022-05-18 11:04:40 +08:00
skiffer-git 3046d63ad4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-18 08:07:05 +08:00
skiffer-git de9c2d3d85 mutex 2022-05-18 08:06:05 +08:00
wangchuxiao 2454c50380 organization 2022-05-17 20:42:43 +08:00
wangchuxiao e2f8156a4d organization 2022-05-17 20:18:12 +08:00
wangchuxiao 6ea6a61e90 organization 2022-05-17 17:44:08 +08:00
Gordon b978b6756e log add operationID 2022-05-13 23:17:04 +08:00
Gordon cbae83106b Merge branch 'tuoyun' 2022-05-13 21:58:42 +08:00
Gordon 424f854145 docker-compose version upgrade 2022-05-13 21:58:28 +08:00
Gordon faf72705cb Merge branch 'tuoyun' 2022-05-13 21:15:25 +08:00
Gordon 381e72f1ef send message 2022-05-13 21:05:39 +08:00
Gordon 91fe549c25 add log 2022-05-13 16:30:36 +08:00
Gordon a472da9ea6 msg bug fix 2022-05-13 16:19:11 +08:00
Gordon 20c7fe81dc Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-13 16:00:03 +08:00
Gordon 3ef445eb2e msg bug fix 2022-05-13 15:59:38 +08:00
wangchuxiao 4afc38523d organization 2022-05-13 15:41:11 +08:00
wangchuxiao 15616e8d07 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-13 15:38:19 +08:00
wangchuxiao 2534921af9 organization 2022-05-13 15:38:05 +08:00
Gordon 0206198f55 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-13 10:07:43 +08:00
Gordon 3c8c402f10 compose restore 2022-05-13 10:06:56 +08:00
wangchuxiao 098dae9640 organization 2022-05-12 19:11:55 +08:00
wangchuxiao 42c38de3e2 organization 2022-05-12 19:09:25 +08:00
wangchuxiao be10e6a9de organization 2022-05-12 19:07:26 +08:00
wangchuxiao 6b5fb81e01 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-12 19:06:25 +08:00
wangchuxiao bb5991b111 organization 2022-05-12 19:00:48 +08:00
wenxu12345 8f261970e9 Update group members' faceURL immediately 2022-05-12 18:00:23 +08:00
Gordon 093a8f18ef test 2022-05-11 21:01:36 +08:00
Gordon 9c19b5b785 test 2022-05-11 20:54:04 +08:00
Gordon 35958ca3a2 test 2022-05-11 20:49:47 +08:00
Gordon 3bc2e97e8b test 2022-05-11 20:02:33 +08:00
Gordon eb7ff77461 test 2022-05-11 19:45:44 +08:00
Gordon d36f4cf6f8 test 2022-05-11 19:44:08 +08:00
Gordon f373669f02 test 2022-05-11 19:31:32 +08:00
Gordon 37596589a7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-11 19:28:00 +08:00
Gordon 3e90426d8e test 2022-05-11 19:27:49 +08:00
wenxu12345 35a184827a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-11 19:25:33 +08:00
wenxu12345 2edd3c5614 When you create a group chat, the group member can be empty 2022-05-11 19:25:06 +08:00
Gordon cec5a6ceeb test 2022-05-11 19:21:28 +08:00
Gordon dc6b0b4dde test 2022-05-11 19:16:57 +08:00
Gordon 3ecc1816be test 2022-05-11 18:58:11 +08:00
Gordon 9a90c2e568 test 2022-05-11 18:54:22 +08:00
Gordon ab747d0338 test 2022-05-11 18:49:21 +08:00
Gordon 8753f91a4a send group message split topic 2022-05-11 18:38:58 +08:00
Gordon f8af109821 send group message split topic 2022-05-11 18:33:48 +08:00
wenxu12345 a1a7900254 config 2022-05-11 16:50:09 +08:00
Gordon 804eb6c076 video message send 2022-05-11 14:34:21 +08:00
Gordon f4f3ff0eda Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-11 13:26:50 +08:00
Gordon 03c0b1ea91 add kafka manager 2022-05-11 13:26:39 +08:00
wenxu12345 38535bde84 add RpcRegisterIP 2022-05-11 12:20:28 +08:00
wenxu12345 17e1fa54cf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-11 12:13:43 +08:00
wenxu12345 a4f5dd9d89 add log 2022-05-11 12:13:17 +08:00
wangchuxiao 6269902140 update app 2022-05-11 11:07:04 +08:00
wangchuxiao b964e424b2 update app 2022-05-11 10:47:32 +08:00
wangchuxiao 73665f62b3 update app 2022-05-11 10:46:54 +08:00
wangchuxiao 3fca780132 update app 2022-05-11 10:27:00 +08:00
wangchuxiao b5e01dcb5e update app 2022-05-11 10:24:11 +08:00
wangchuxiao f180b89a9c Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-11 10:20:13 +08:00
wangchuxiao 98a903e60c update app 2022-05-11 10:19:58 +08:00
Gordon c20cc8fb18 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-11 09:55:13 +08:00
Gordon 99f5c4e12f update sarama version 2022-05-11 09:54:47 +08:00
wangchuxiao 17759f9a98 update app 2022-05-10 19:28:36 +08:00
wangchuxiao 6c0e96213f update app 2022-05-10 19:04:08 +08:00
wangchuxiao 2c89d80a27 update app 2022-05-10 18:28:57 +08:00
wangchuxiao e314fd4a0a update app 2022-05-10 18:22:18 +08:00
wangchuxiao affbe9f5a9 update app 2022-05-10 17:50:57 +08:00
wangchuxiao 7a423eb6e1 update app 2022-05-10 17:50:22 +08:00
wangchuxiao 7137924baa update app 2022-05-10 17:39:27 +08:00
wangchuxiao c998bce34f update app 2022-05-10 17:23:28 +08:00
wangchuxiao f5d4397f0b update app 2022-05-10 17:17:20 +08:00
wangchuxiao 608b166b32 update app 2022-05-10 17:00:52 +08:00
wangchuxiao 472cda8315 update app 2022-05-10 16:59:45 +08:00
wangchuxiao 7a78e5d869 update app 2022-05-10 16:53:58 +08:00
wangchuxiao 8effca3a7c update app 2022-05-10 16:39:08 +08:00
wangchuxiao fab52b6a56 update app 2022-05-10 16:23:56 +08:00
wangchuxiao e98ef5f5f2 update app 2022-05-10 16:22:16 +08:00
wangchuxiao 7aa84607c8 update app 2022-05-10 16:21:26 +08:00
wangchuxiao 928fc374c7 update app 2022-05-10 16:07:58 +08:00
wangchuxiao 4ea8cb5903 update app 2022-05-10 16:04:26 +08:00
wangchuxiao db6acacf2e update app 2022-05-10 16:02:05 +08:00
wangchuxiao 59aa71b3b8 update app 2022-05-10 15:58:29 +08:00
wangchuxiao ccfa487493 update app 2022-05-10 15:41:59 +08:00
wangchuxiao 9fcc41aeff update app 2022-05-10 15:34:00 +08:00
wangchuxiao d9a4fa3f49 update app 2022-05-10 15:21:51 +08:00
wangchuxiao 6c821dc42a update app 2022-05-10 15:16:20 +08:00
wangchuxiao d58e34ed3d update app 2022-05-10 15:07:07 +08:00
wangchuxiao ff37d1cb02 update app 2022-05-10 14:57:54 +08:00
wangchuxiao dcf119ae59 update app 2022-05-10 14:38:43 +08:00
wangchuxiao 1338cf875a update app 2022-05-10 14:20:15 +08:00
wangchuxiao ed3e299e0b update app 2022-05-10 14:18:36 +08:00
wangchuxiao f85645a78a update app 2022-05-10 14:17:31 +08:00
wangchuxiao e412abd017 update app 2022-05-10 14:07:44 +08:00
wangchuxiao 1efa654e7d update app 2022-05-10 13:06:13 +08:00
wangchuxiao 00b58068dc Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-10 12:30:16 +08:00
wangchuxiao 7be5208daf update app 2022-05-10 12:30:00 +08:00
wenxu12345 7ad555a41b add ParseToken 2022-05-10 12:20:53 +08:00
wenxu12345 872f70a418 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 12:07:33 +08:00
wenxu12345 c37d2e78d2 add ParseToken 2022-05-10 12:07:09 +08:00
wangchuxiao b606d066fc Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-10 12:07:07 +08:00
wangchuxiao d4608eec26 update app 2022-05-10 12:05:02 +08:00
wenxu12345 0bc8e231ad Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 12:01:26 +08:00
wenxu12345 2dab5e4a78 add ParseToken 2022-05-10 11:57:25 +08:00
wangchuxiao c6aa37851d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-10 11:53:08 +08:00
wangchuxiao 31bd106ffd update app 2022-05-10 11:52:52 +08:00
wenxu12345 74cea2b41c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 11:49:11 +08:00
wangchuxiao 46f9a00b75 update app 2022-05-10 11:48:33 +08:00
wenxu12345 450d8c21cf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 11:48:28 +08:00
wenxu12345 2073bc77c8 add ParseToken 2022-05-10 11:48:10 +08:00
wangchuxiao b6a5501f71 update app 2022-05-10 11:41:13 +08:00
wangchuxiao e27b98cdc1 update app 2022-05-10 11:40:40 +08:00
wangchuxiao 8af500462f update app 2022-05-10 11:22:10 +08:00
wangchuxiao 30fc4c28b7 cache 2022-05-10 11:17:54 +08:00
Gordon 74b582369a log change 2022-05-10 11:00:15 +08:00
Gordon c9ab2b507b Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 10:52:43 +08:00
Gordon 2b479319c1 log change 2022-05-10 10:52:32 +08:00
wangchuxiao 3a3ac012bb Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-10 10:45:21 +08:00
wangchuxiao 00265a7e8e cache 2022-05-10 10:44:43 +08:00
wenxu12345 0dafb50223 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 10:13:23 +08:00
wenxu12345 ac9620c253 add ParseToken 2022-05-10 10:12:53 +08:00
Gordon 6e226b165c sdk version 2022-05-10 10:01:46 +08:00
wenxu12345 6226f65e20 add ParseToken 2022-05-10 09:47:00 +08:00
wenxu12345 7de29c29e9 add ParseToken 2022-05-10 09:45:55 +08:00
wenxu12345 deed6c7bbe Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 09:17:22 +08:00
wenxu12345 c234e2ca3d log 2022-05-10 09:16:56 +08:00
Gordon 19bffa288d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 09:13:34 +08:00
Gordon 9303096430 log change 2022-05-10 09:09:37 +08:00
wenxu12345 98d5f5ee3e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-10 09:09:20 +08:00
wenxu12345 ba16fceeb8 log 2022-05-10 09:06:49 +08:00
Gordon c49b5f78bf test 2022-05-09 18:45:44 +08:00
Gordon 446688d5b2 test 2022-05-09 18:34:14 +08:00
Gordon e2cacd9c4b test 2022-05-09 18:23:06 +08:00
Gordon d5c9e08888 manager send message to mysql duplicate primary key fix 2022-05-09 14:15:29 +08:00
skiffer-git ab0ead4e05 grpc 2022-05-09 11:39:55 +08:00
wenxu12345 9a267db583 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-09 11:38:22 +08:00
wenxu12345 fb15cbef90 grpc 1.45.0 2022-05-09 11:38:08 +08:00
wangchuxiao 97e5d9f610 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-09 10:00:12 +08:00
wangchuxiao 305ee394b1 cache 2022-05-09 10:00:03 +08:00
skiffer-git a251d521a1 set api ip in config 2022-05-07 19:52:18 +08:00
skiffer-git b5065cb52f Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-07 17:05:56 +08:00
skiffer-git dca16e83d3 rpc register ip 2022-05-07 17:05:05 +08:00
wangchuxiao c5256fe2cb Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-07 15:02:03 +08:00
wangchuxiao 1b93ba5355 cache 2022-05-07 15:01:48 +08:00
FG fd7171f5a4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-07 14:25:54 +08:00
wangchuxiao 685fc1a37b cache 2022-05-07 14:13:47 +08:00
wangchuxiao a738c93163 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-07 13:21:22 +08:00
wangchuxiao 4ac863fa6a cache 2022-05-07 13:21:05 +08:00
skiffer-git fed369ad5d add err log 2022-05-07 12:04:07 +08:00
skiffer-git f2c91d015e add err log 2022-05-07 12:01:01 +08:00
skiffer-git e122349f9e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-07 11:55:32 +08:00
skiffer-git bb07c3ab45 add err log 2022-05-07 11:55:19 +08:00
wangchuxiao 65a4b38ee5 cache 2022-05-07 11:42:47 +08:00
wangchuxiao bbc3f5c19a cache 2022-05-07 11:39:27 +08:00
wangchuxiao 0b4ba548a5 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-07 11:14:56 +08:00
wangchuxiao 747b963bd4 cache 2022-05-07 11:14:29 +08:00
FG 32b9820725 remove timer and database init 2022-05-07 10:37:52 +08:00
skiffer-git b217fede87 upgrade etcd & grpc 2022-05-07 09:41:56 +08:00
skiffer-git a9ce8a3b2e upgrade etcd & grpc 2022-05-07 09:34:49 +08:00
wangchuxiao 7914e7bc14 office 2022-05-06 17:35:33 +08:00
wangchuxiao ed8716510b office 2022-05-06 17:32:52 +08:00
wangchuxiao efd2ae59f5 office 2022-05-06 17:23:37 +08:00
wangchuxiao 1923d0b809 office 2022-05-06 17:05:59 +08:00
wangchuxiao 99f6752590 office 2022-05-06 16:51:59 +08:00
wangchuxiao 131746f94e office 2022-05-06 16:51:34 +08:00
wangchuxiao f0ed6973c8 office 2022-05-06 16:50:19 +08:00
wangchuxiao 2cf070a26c office 2022-05-06 16:38:29 +08:00
wangchuxiao 3c68ecb7f1 office 2022-05-06 15:58:50 +08:00
wangchuxiao 243f5fcda4 fix bug 2022-05-06 11:19:16 +08:00
wangchuxiao e22b7f36ce fix bug 2022-05-06 11:07:32 +08:00
wangchuxiao 308ea15763 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-05 19:23:01 +08:00
wangchuxiao e26f9c58fa office 2022-05-05 19:22:47 +08:00
Gordon 4ca758174e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-05-05 16:14:16 +08:00
Gordon bf8e35e168 log change 2022-05-05 16:13:45 +08:00
wangchuxiao 2a3265ed71 office 2022-05-05 14:14:30 +08:00
wangchuxiao 3a06617a7d office 2022-05-05 11:59:44 +08:00
wangchuxiao d75eb456dc office 2022-05-05 11:58:48 +08:00
wangchuxiao 8ed0f8ec73 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-05 10:11:00 +08:00
skiffer-git 185e0dce6e delete msg by index 2022-05-04 18:35:13 +08:00
skiffer-git d9e74a78f0 delete msg by index 2022-05-04 18:02:24 +08:00
skiffer-git 700483dd48 group chat log 2022-05-02 20:03:13 +08:00
skiffer-git 1c80b820cb group chat log 2022-05-02 20:00:09 +08:00
skiffer-git 59e5cfb04d group chat log 2022-05-02 19:45:32 +08:00
skiffer-git b06550e2cb group chat log 2022-05-02 19:43:22 +08:00
skiffer-git ca4bf13569 group chat log 2022-05-02 19:23:26 +08:00
skiffer-git eae3a50435 group chat log 2022-05-02 19:16:00 +08:00
skiffer-git de2956ec3c group chat log 2022-05-02 08:47:21 +08:00
skiffer-git a2e62c9fb5 fix bug: group chat share pb 2022-05-01 16:21:28 +08:00
wangchuxiao e7fdc318f1 cache bug fix 2022-05-01 13:27:52 +08:00
wangchuxiao 62dd559b7c cache bug fix 2022-05-01 13:08:46 +08:00
skiffer-git 4a631753a0 add msgToMQSingle && msgToMQGroup 2022-05-01 12:04:31 +08:00
wangchuxiao b696984655 cache 2022-04-29 19:36:36 +08:00
wangchuxiao f1dbec122a cache 2022-04-29 18:59:08 +08:00
wangchuxiao 47cb54461f cache 2022-04-29 18:56:53 +08:00
wangchuxiao 91e03f7cfd cache 2022-04-29 18:53:33 +08:00
Gordon c0314d95c9 send message parallel 2022-04-29 18:47:55 +08:00
wenxu12345 8e17b3ff51 Revert "update etcd to v3.5.2 (#206)"
This reverts commit 766b6e9f
2022-04-29 18:45:11 +08:00
wenxu12345 b932a659b6 etcd 2022-04-29 18:35:55 +08:00
wenxu12345 80b2ed19e0 etcd 2022-04-29 18:32:46 +08:00
wenxu12345 88000926f4 etcd 2022-04-29 18:30:02 +08:00
wenxu12345 12245fefed etcd 2022-04-29 18:24:18 +08:00
wenxu12345 8eebd5fb9a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-29 18:20:09 +08:00
wenxu12345 c5b0e31d36 config 2022-04-29 18:19:59 +08:00
wangchuxiao 5c5e828cc6 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-29 18:00:29 +08:00
Gordon ecb11cf927 test 2022-04-29 17:59:53 +08:00
wangchuxiao 485241d080 cache & workMoments 2022-04-29 17:59:42 +08:00
Gordon 8701f8868c test 2022-04-29 17:58:57 +08:00
wenxu12345 e68086e149 config 2022-04-29 17:04:15 +08:00
wenxu12345 16a2d80801 config 2022-04-29 17:02:03 +08:00
wenxu12345 d5e5659a2c config 2022-04-29 16:42:42 +08:00
wenxu12345 3c2e8dcf87 config 2022-04-29 16:33:01 +08:00
wangchuxiao 03320e8644 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-29 15:52:18 +08:00
wangchuxiao 40ae6ccf2f cache & workMoments 2022-04-29 14:26:04 +08:00
Gordon bcbade3729 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-28 21:21:27 +08:00
Gordon 58a6f9cae3 test 2022-04-28 21:17:50 +08:00
Gordon bf154eb8c3 Merge branch 'main' into tuoyun
# Conflicts:
#	script/sdk_svr_start.sh
2022-04-28 21:12:14 +08:00
yiippee 766b6e9fef update etcd to v3.5.2 (#206)
Co-authored-by: lizhanbin <lizhanbin@52tt.com>
2022-04-28 21:09:43 +08:00
wangchuxiao d89a41d4c7 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-28 19:08:15 +08:00
wangchuxiao d24a7d7b22 cache & workMoments 2022-04-28 19:05:04 +08:00
wenxu12345 57a746fc21 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-28 19:01:20 +08:00
wenxu12345 2c1bd41fba ulimit -n 2022-04-28 19:00:37 +08:00
wangchuxiao 6260cf24cc cache 2022-04-28 18:25:10 +08:00
wangchuxiao 88d4a670d4 cache 2022-04-28 18:23:55 +08:00
wangchuxiao ea0b6c5ee5 cache 2022-04-28 17:38:09 +08:00
wangchuxiao 20f61042fc cache 2022-04-28 17:35:19 +08:00
wangchuxiao 2751a967e8 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-28 16:48:52 +08:00
wangchuxiao 93057870a7 cache 2022-04-28 16:48:39 +08:00
Gordon 6b98c3fed5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-28 16:47:56 +08:00
Gordon eb63ed926d log modify 2022-04-28 16:47:46 +08:00
wangchuxiao b72787f5bb cache 2022-04-28 16:38:33 +08:00
wangchuxiao 0793b2ab38 cache 2022-04-28 16:29:40 +08:00
wangchuxiao 604ed3e3e1 cache 2022-04-28 16:19:51 +08:00
wangchuxiao 0aefbc2c7d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/friend/firend.go
2022-04-28 15:32:38 +08:00
wangchuxiao eb1fa90788 cache 2022-04-28 15:17:19 +08:00
wangchuxiao 65f02e5139 cache 2022-04-28 15:13:39 +08:00
Gordon bbfe65a905 send message add cache 2022-04-28 15:10:42 +08:00
wangchuxiao 59468eb162 fix work moments bug 2022-04-28 10:46:21 +08:00
wangchuxiao 1889a283ee fix work moments bug 2022-04-27 14:43:46 +08:00
wangchuxiao 0655b2021d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-27 14:36:15 +08:00
wangchuxiao a1b8c9b6fd fix work moments bug 2022-04-27 14:35:02 +08:00
wenxu12345 c4a60bc6f6 Merge remote-tracking branch 'origin/main' 2022-04-27 10:09:18 +08:00
wenxu12345 eb7037eea8 ulimit -n 2022-04-27 10:09:05 +08:00
wenxu12345 7546083cd5 ulimit -n 2022-04-27 10:08:09 +08:00
wangchuxiao 74ee36f43a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-26 20:20:39 +08:00
wangchuxiao f8c3e4d66f Merge branch 'tuoyun'
# Conflicts:
#	cmd/open_im_cms_api/main.go
#	config/config.yaml
2022-04-26 20:19:02 +08:00
wenxu12345 6db8d9a38a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-26 18:26:48 +08:00
wenxu12345 61145a2d03 fix bug user_register port 2022-04-26 18:23:10 +08:00
wangchuxiao 4a9410742a Merge branch 'tuoyun'
# Conflicts:
#	cmd/open_im_cms_api/main.go
#	config/config.yaml
2022-04-26 16:50:43 +08:00
wangchuxiao db78e4ef03 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server 2022-04-26 16:46:17 +08:00
wangchuxiao 7b0eb4e79d work moments 2022-04-26 16:24:43 +08:00
wangchuxiao 17f6b8eb2a work moments 2022-04-26 16:01:48 +08:00
wangchuxiao 37c40d7dda work moments 2022-04-26 15:52:03 +08:00
wangchuxiao 1a2aa876e3 work moments 2022-04-26 15:06:43 +08:00
wangchuxiao 39822f323f work moments 2022-04-26 15:05:23 +08:00
wangchuxiao 338acfba75 cache rpc 2022-04-26 14:57:15 +08:00
wangchuxiao 490f4f36f1 cache rpc 2022-04-26 14:43:55 +08:00
wangchuxiao 69c46f684f cache rpc 2022-04-26 14:38:11 +08:00
wangchuxiao 1626406557 cache rpc 2022-04-26 14:13:36 +08:00
wangchuxiao f662defcf9 cache rpc 2022-04-26 11:19:21 +08:00
wangchuxiao 8f07f8e9e1 cache rpc 2022-04-26 11:19:14 +08:00
wangchuxiao 7e44f7f110 cache rpc 2022-04-26 10:33:49 +08:00
skiffer-git b211a66e99 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-26 09:09:44 +08:00
skiffer-git 0bdb066820 add cache 2022-04-26 09:09:33 +08:00
wenxu12345 4ee84e10fd fix bug 2022-04-25 21:13:46 +08:00
wenxu12345 ab706f4076 fix bug 2022-04-25 21:13:32 +08:00
wangchuxiao bd7266653f cache rpc 2022-04-25 20:29:33 +08:00
wangchuxiao 08f968dced cache rpc 2022-04-25 20:20:34 +08:00
wangchuxiao 9f9ebd838a cache rpc 2022-04-25 20:16:43 +08:00
wangchuxiao a03f89fb68 cache rpc 2022-04-25 20:05:21 +08:00
wangchuxiao 51146a4ed5 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-25 19:57:54 +08:00
wangchuxiao 80301f2cb2 alter router 2022-04-25 19:57:35 +08:00
Gordon 9a9f26c435 conversation update 2022-04-25 19:56:46 +08:00
Gordon eebe9cbd5f conversation update 2022-04-25 19:41:17 +08:00
Gordon 503d43b552 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-25 19:15:01 +08:00
Gordon b3077fc15d conversation update 2022-04-25 19:14:51 +08:00
wenxu12345 fdc462d071 Adjust port 2022-04-25 17:30:13 +08:00
wenxu12345 f44a26da3c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-25 17:28:56 +08:00
wenxu12345 d12d03fd5e Adjust port 2022-04-25 17:28:43 +08:00
Gordon 51ee2df755 flag parse update 2022-04-25 17:13:54 +08:00
wenxu12345 a89bb33015 Adjust port 2022-04-25 16:58:35 +08:00
wenxu12345 7659cca8ba Adjust port 2022-04-25 16:58:05 +08:00
wenxu12345 f754e951f7 Adjust port 2022-04-25 16:55:56 +08:00
wenxu12345 e2905d01ac Adjust port 2022-04-25 16:47:51 +08:00
wenxu12345 9d691f2452 Adjust port 2022-04-25 16:21:48 +08:00
wenxu12345 a426c8bb26 Adjust port 2022-04-25 15:45:39 +08:00
wenxu12345 bc8b1722b0 config 2022-04-25 15:29:56 +08:00
wangchuxiao ac31c612b3 work_moments 2022-04-25 10:40:31 +08:00
wangchuxiao 03c3eea54e work_moments 2022-04-25 10:35:20 +08:00
wangchuxiao bccaf16343 work_moments 2022-04-25 10:07:14 +08:00
wangchuxiao 30df45ef2e work_moments 2022-04-24 18:49:03 +08:00
wangchuxiao 6500ba48a7 work_moments 2022-04-24 18:23:44 +08:00
wangchuxiao 03b35721a2 work_moments 2022-04-24 18:01:27 +08:00
wangchuxiao 14327d4462 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-24 18:00:18 +08:00
wangchuxiao 1b968903e2 work_moments 2022-04-24 18:00:04 +08:00
Gordon b719e95e6e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-24 17:54:25 +08:00
Gordon 318eb2f47d shell update 2022-04-24 17:54:02 +08:00
wangchuxiao 010f24e5c3 work_moments 2022-04-24 17:46:47 +08:00
wangchuxiao db9762c5b2 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-24 17:44:10 +08:00
wangchuxiao d1ebcde725 work_moments 2022-04-24 17:42:41 +08:00
Gordon 545f9cad2d add modify conversation api 2022-04-24 17:30:53 +08:00
Gordon 3247d84b6b add modify conversation api 2022-04-24 17:27:26 +08:00
Gordon e73f0a916a add modify conversation api 2022-04-24 16:55:47 +08:00
Gordon 150af5ff8b @ people update 2022-04-24 15:55:19 +08:00
wangchuxiao 1659ab146d fix docker-compose 2022-04-24 11:57:21 +08:00
wangchuxiao 86e17d38d4 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-24 11:54:08 +08:00
Gordon 1809c59f25 config 2022-04-24 11:53:50 +08:00
wangchuxiao 4eb9661730 fix docker-compose 2022-04-24 11:50:36 +08:00
Gordon 4acbe4b31a config 2022-04-24 11:49:01 +08:00
Gordon df17dd749f add rpc conversation 2022-04-24 11:23:54 +08:00
wangchuxiao 20e5a88e56 Merge branch 'tuoyun' 2022-04-24 10:51:20 +08:00
wangchuxiao 0a939a5b91 Merge branch 'tuoyun'
# Conflicts:
#	config/config.yaml
2022-04-24 10:38:22 +08:00
wangchuxiao 6ad7c30a18 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server 2022-04-24 10:34:54 +08:00
wangchuxiao e6bfc60139 Merge branch 'tuoyun'
# Conflicts:
#	config/config.yaml
2022-04-24 10:34:15 +08:00
Gordon c866baa4eb Merge branch 'tuoyun' 2022-04-22 19:46:31 +08:00
Gordon 91303acdbe conversation update 2022-04-22 19:45:29 +08:00
Gordon 1273af4b1b Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-22 19:45:10 +08:00
Gordon e682b408f3 conversation update 2022-04-22 19:44:58 +08:00
skiffer-git 0a0c206998 add cache 2022-04-22 18:56:39 +08:00
wangchuxiao 44ffd98d0c Merge branch 'tuoyun'
# Conflicts:
#	config/config.yaml
2022-04-22 18:37:59 +08:00
wangchuxiao 53ec93c8f8 minio config 2022-04-22 18:36:02 +08:00
wangchuxiao f779ed7628 workMoments 2022-04-22 17:19:35 +08:00
wangchuxiao f2fdb74f23 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-22 16:41:50 +08:00
wangchuxiao 4ba87e3349 workMoments 2022-04-22 16:41:41 +08:00
Gordon 7abee90992 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-22 15:12:21 +08:00
Gordon 159a9e00c8 conversation update 2022-04-22 15:12:10 +08:00
wangchuxiao 9c62f38345 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-21 18:39:01 +08:00
wangchuxiao 1443f5f997 workMoments 2022-04-21 18:38:48 +08:00
Gordon 17d8a124cd kick group invite group update 2022-04-21 18:09:20 +08:00
Gordon 5cd565306e kick group invite group update 2022-04-21 17:23:40 +08:00
Gordon 67010e20d7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-21 16:47:10 +08:00
Gordon 704604f6fe kick group invite group update 2022-04-21 16:46:48 +08:00
wangchuxiao e687f56c7f Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-21 16:14:41 +08:00
wangchuxiao ff85575e98 workMoments 2022-04-21 16:14:26 +08:00
Gordon 26be25c218 quit group and dismiss group update 2022-04-21 14:58:57 +08:00
Gordon d3d5e0cbfb Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-21 12:53:39 +08:00
Gordon 4796bf632c quit group and dismiss group update 2022-04-21 12:53:28 +08:00
wangchuxiao 5eef365baf workMoments 2022-04-21 11:52:31 +08:00
wangchuxiao 937ff63af9 workMoments 2022-04-21 11:34:15 +08:00
wangchuxiao 33211bfb27 workMoments 2022-04-21 11:18:11 +08:00
wangchuxiao a243da8b1e Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-21 10:43:46 +08:00
wangchuxiao 62e605a443 workMoments 2022-04-21 10:43:31 +08:00
skiffer-git 2bdaaa5a33 log 2022-04-20 20:58:51 +08:00
Gordon bcad3c1ced add save message to mysql switch 2022-04-20 18:53:23 +08:00
Gordon b865f5d6e7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-20 18:47:31 +08:00
Gordon 00664822ec conversation add fields 2022-04-20 18:47:21 +08:00
skiffer-git 4594c15de7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-20 18:39:23 +08:00
skiffer-git 2b6ec1672c Organization 2022-04-20 18:39:12 +08:00
Gordon d44d5711cb Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-20 18:06:53 +08:00
Gordon 54cb13ba62 pb file 2022-04-20 18:06:43 +08:00
Gordon c32f5dd951 pb file 2022-04-20 18:06:24 +08:00
wangchuxiao 2e6c42c8ac workMoments 2022-04-20 16:33:19 +08:00
wangchuxiao 5757b86d39 workMoments 2022-04-20 16:32:22 +08:00
wangchuxiao 9df4a79827 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-20 16:25:48 +08:00
wangchuxiao 071dd46a4c workMoments 2022-04-20 16:25:33 +08:00
skiffer-git 030d619910 Organization 2022-04-20 11:53:32 +08:00
skiffer-git c56fd399c1 Organization 2022-04-20 09:07:35 +08:00
skiffer-git 31c954db0e Organization 2022-04-19 21:28:12 +08:00
skiffer-git cb6a040c4d Organization 2022-04-19 21:27:06 +08:00
skiffer-git 51c3a753a9 Organization 2022-04-19 20:57:59 +08:00
skiffer-git c28c592c80 OrganizationChangedNotification 2022-04-19 18:52:28 +08:00
skiffer-git fc07f851f7 OrganizationChangedNotification 2022-04-19 18:46:33 +08:00
skiffer-git ab4a5e6719 OrganizationChangedNotification 2022-04-19 18:46:02 +08:00
skiffer-git 88e9dd54b2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-19 16:41:43 +08:00
skiffer-git f53f34559a organization 2022-04-19 16:40:57 +08:00
wangchuxiao 3e5d9a394f workMoments 2022-04-19 16:33:44 +08:00
wangchuxiao 3f287eb148 workMoments 2022-04-19 16:28:03 +08:00
wangchuxiao dfe854a236 workMoments 2022-04-19 16:15:41 +08:00
wangchuxiao 3854c7bba2 workMoments 2022-04-19 15:52:44 +08:00
wangchuxiao 01c066419d workMoments 2022-04-19 15:38:16 +08:00
wangchuxiao 040b1d9bc8 workMoments 2022-04-19 15:37:20 +08:00
wangchuxiao 6c4acbad68 workMoments 2022-04-19 14:54:43 +08:00
wangchuxiao b5c11ece57 workMoments 2022-04-19 14:33:48 +08:00
wangchuxiao 50696d2e88 workMoments 2022-04-19 14:12:30 +08:00
wangchuxiao e7661fd4be Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-19 13:06:10 +08:00
wangchuxiao 957e11eff0 workMoments 2022-04-19 13:05:54 +08:00
skiffer-git bd6e8d093a add operationID when ws connecting 2022-04-18 21:39:46 +08:00
skiffer-git f7b5a86a09 add operationID when ws connecting 2022-04-18 21:34:58 +08:00
skiffer-git 97fd107f47 add operationID when ws connecting 2022-04-18 21:29:48 +08:00
skiffer-git fc688dca99 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-18 21:16:56 +08:00
skiffer-git fe3bd2a1f1 add operationID when ws connecting 2022-04-18 21:16:23 +08:00
wangchuxiao 3625befc0b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	pkg/common/constant/constant.go
2022-04-18 19:26:26 +08:00
wangchuxiao 6e6508aafd workMoments 2022-04-18 19:24:36 +08:00
skiffer-git 3a8a0a541e organization 2022-04-18 18:11:07 +08:00
skiffer-git 650495306f organization 2022-04-18 18:06:47 +08:00
skiffer-git 5664c34790 organization 2022-04-18 18:02:11 +08:00
skiffer-git b1c66997ca organization 2022-04-18 17:25:54 +08:00
skiffer-git 114ffd4667 organization 2022-04-18 16:58:41 +08:00
skiffer-git ad1770ec95 organization 2022-04-18 16:46:03 +08:00
skiffer-git 5f22402761 organization 2022-04-18 16:42:50 +08:00
skiffer-git c11094a11e organization 2022-04-18 16:27:04 +08:00
skiffer-git 6873bf384e organization 2022-04-18 16:24:12 +08:00
skiffer-git 42242daf9b organization 2022-04-18 16:18:10 +08:00
skiffer-git 1f96b960ab organization 2022-04-18 15:51:17 +08:00
skiffer-git f6b30ed0c6 organization 2022-04-18 15:45:44 +08:00
skiffer-git c59dc129a8 /user/get_users_online_status 2022-04-18 14:27:12 +08:00
skiffer-git 472c1a9e3e set group member nickname 2022-04-18 13:01:16 +08:00
skiffer-git 24fe8ab4a4 set group member nickname 2022-04-18 11:53:03 +08:00
skiffer-git 453c6f05bd set group member nickname 2022-04-18 11:52:49 +08:00
skiffer-git 248de7f1f2 set groupmember nickname 2022-04-18 11:52:17 +08:00
skiffer-git 3bbf84861e organization 2022-04-18 10:53:23 +08:00
skiffer-git 0dac9044a5 organization 2022-04-17 15:18:21 +08:00
skiffer-git a981d1082a organization 2022-04-17 15:11:27 +08:00
skiffer-git 803d0c2ae2 organization 2022-04-17 15:09:18 +08:00
skiffer-git 06e44cc649 organization 2022-04-17 15:03:50 +08:00
skiffer-git fd01e5c263 organization 2022-04-17 15:01:26 +08:00
skiffer-git ecc47dcfbb organization 2022-04-17 14:54:51 +08:00
skiffer-git b6e06dfdc2 organization 2022-04-17 14:47:52 +08:00
skiffer-git eb630b23ae organization 2022-04-17 14:45:45 +08:00
skiffer-git eae7a48991 organization 2022-04-17 14:44:44 +08:00
skiffer-git 9436c836e6 organization 2022-04-17 14:42:07 +08:00
skiffer-git 7c64239b36 organization 2022-04-17 14:39:48 +08:00
skiffer-git 80ba371296 organization 2022-04-17 12:41:42 +08:00
skiffer-git 6787563efe organization 2022-04-17 12:37:00 +08:00
skiffer-git 9def85f9ba organization 2022-04-17 12:32:28 +08:00
skiffer-git 6d55f35404 organization 2022-04-17 11:59:31 +08:00
skiffer-git 1902c37924 organization 2022-04-17 11:51:36 +08:00
skiffer-git 02b5ff38a4 organization 2022-04-16 21:41:38 +08:00
skiffer-git f076a927c9 organization 2022-04-16 21:34:29 +08:00
skiffer-git 6184eaa30e organization 2022-04-16 21:32:53 +08:00
skiffer-git a42b72e9ce organization 2022-04-16 21:31:28 +08:00
skiffer-git f4dcae722c organization 2022-04-16 21:28:37 +08:00
skiffer-git bbcb3e9403 organization 2022-04-16 21:26:16 +08:00
skiffer-git 3d690b7c72 organization 2022-04-16 21:23:38 +08:00
skiffer-git b4ab2c69ae organization 2022-04-16 21:20:17 +08:00
skiffer-git 4a7f406edb organization 2022-04-16 21:17:32 +08:00
skiffer-git 9e18bcaeb8 organization 2022-04-16 21:14:28 +08:00
skiffer-git 9abfe233bc organization 2022-04-16 21:10:46 +08:00
skiffer-git 3267958541 organization 2022-04-16 20:59:38 +08:00
skiffer-git af5ee45206 organization 2022-04-16 20:56:28 +08:00
skiffer-git 300b72b9b8 organization 2022-04-16 20:47:00 +08:00
skiffer-git 42af55a740 organization 2022-04-16 20:45:41 +08:00
skiffer-git 3c1e6d0e5c organization 2022-04-16 20:42:50 +08:00
skiffer-git edf7df368e organization 2022-04-16 20:30:02 +08:00
skiffer-git cde38e012f organization 2022-04-16 20:27:18 +08:00
skiffer-git bef4f0c4e2 organization 2022-04-16 20:25:01 +08:00
skiffer-git bf081dce32 organization 2022-04-16 20:22:01 +08:00
skiffer-git 0bb3cb4aab organization 2022-04-16 20:19:24 +08:00
skiffer-git 0d5132f710 organization 2022-04-16 20:17:21 +08:00
skiffer-git cad147faf8 organization 2022-04-16 20:14:47 +08:00
skiffer-git cc405b83e2 organization 2022-04-16 20:10:10 +08:00
skiffer-git c65f5b7279 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-15 20:37:26 +08:00
skiffer-git c216340120 organization 2022-04-15 19:48:17 +08:00
wangchuxiao ff5cbc490e getui 2022-04-15 18:22:27 +08:00
wangchuxiao 27cba5ba31 getui 2022-04-15 18:16:28 +08:00
wangchuxiao 9976b8132f getui 2022-04-15 17:45:33 +08:00
wangchuxiao dbc5bd96f3 getui 2022-04-15 17:43:04 +08:00
wangchuxiao 9489ab862b getui 2022-04-15 12:10:33 +08:00
wangchuxiao 1bb634bc6f merge code 2022-04-15 12:03:23 +08:00
wangchuxiao 07b5c7fef4 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-15 11:58:32 +08:00
wangchuxiao 4a7cfab543 getui 2022-04-15 11:56:36 +08:00
Gordon 426ef5cb88 push update 2022-04-13 18:34:36 +08:00
Gordon 5b86412407 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-13 18:33:35 +08:00
Gordon 4f8fcd2d3d push update 2022-04-13 18:33:22 +08:00
wangchuxiao 16c40aa51c getui 2022-04-13 16:25:33 +08:00
Gordon 6449c4a53d push update 2022-04-13 16:20:30 +08:00
wangchuxiao d670356388 getui 2022-04-13 15:29:35 +08:00
wangchuxiao fb4c8549dc Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-13 15:22:03 +08:00
wangchuxiao 42dc5c1f0f getui 2022-04-13 15:21:53 +08:00
skiffer-git 659c3bc1cf add department db 2022-04-13 08:58:52 +08:00
skiffer-git f5684f2c45 add department db 2022-04-13 08:58:16 +08:00
skiffer-git 1d2d2b1c9c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-12 22:07:03 +08:00
skiffer-git bc06ba54b9 organization && department 2022-04-12 22:02:43 +08:00
wangchuxiao 1b6e223456 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-12 11:13:17 +08:00
wangchuxiao 9e4a2168c0 getui 2022-04-12 11:12:36 +08:00
Gordon 46aa26a444 version code 2022-04-12 09:51:25 +08:00
wangchuxiao 4d01aa3006 getui 2022-04-11 18:12:00 +08:00
wangchuxiao 2c308af615 getui 2022-04-11 17:58:23 +08:00
wangchuxiao caf4ab60cd minio add inner ip 2022-04-11 17:08:54 +08:00
wangchuxiao 4a8d37bde1 getui 2022-04-11 16:18:36 +08:00
wangchuxiao 3289dd8419 Merge branch 'tuoyun' 2022-04-11 15:09:24 +08:00
wangchuxiao 13473eeb4d getui 2022-04-11 14:44:58 +08:00
wangchuxiao 4264cd8830 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-11 14:43:15 +08:00
wangchuxiao edcc215774 getui 2022-04-11 14:41:09 +08:00
skiffer-git 3085fffb49 add department db 2022-04-11 14:08:23 +08:00
wangchuxiao 81a6e4b46c getui 2022-04-11 11:31:20 +08:00
wangchuxiao e0d612c92f getui 2022-04-11 10:35:33 +08:00
wangchuxiao fadbb91287 getui 2022-04-08 19:31:13 +08:00
wangchuxiao 72146c08ae getui 2022-04-08 19:18:00 +08:00
wangchuxiao 0c7cb274b4 Merge branch 'tuoyun' 2022-04-08 18:37:35 +08:00
wangchuxiao a08c499c95 getui 2022-04-08 18:35:53 +08:00
wangchuxiao a879bbce59 getui 2022-04-08 18:29:54 +08:00
wangchuxiao f11f8b3e0e getui 2022-04-08 18:27:20 +08:00
wangchuxiao 7842545627 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-08 18:01:11 +08:00
Gordon 2a0f8f5ce3 note 2022-04-08 17:55:44 +08:00
wangchuxiao 4ae3ad7abd getui 2022-04-08 17:48:16 +08:00
wangchuxiao a16025ca95 getui 2022-04-08 17:41:39 +08:00
wangchuxiao fdefe09187 getui 2022-04-08 17:32:58 +08:00
wangchuxiao 06370a763c getui 2022-04-08 17:20:55 +08:00
wangchuxiao 691e2580e5 getui 2022-04-08 17:17:26 +08:00
wangchuxiao f40369d061 getui 2022-04-08 17:12:11 +08:00
wangchuxiao 046c523880 getui 2022-04-08 17:00:28 +08:00
wangchuxiao b3b7ae26cf getui 2022-04-08 16:40:39 +08:00
wangchuxiao 49424b8b56 getui 2022-04-08 16:23:53 +08:00
wenxu12345 68ff4a52dc Merge remote-tracking branch 'origin/main' 2022-04-08 16:21:12 +08:00
wenxu12345 07c932e9e6 v2.0.7 2022-04-08 16:20:41 +08:00
wangchuxiao cbe3abeab0 getui 2022-04-08 16:15:22 +08:00
wangchuxiao 3d5e3ce6cf Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
# Conflicts:
#	internal/rpc/msg/tag_send_msg.go
2022-04-08 15:43:55 +08:00
wangchuxiao 4efdabc1ff getui 2022-04-08 15:40:07 +08:00
Gordon 8ca495ec50 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-06 16:47:32 +08:00
Gordon 69aba02c9a send tag modify 2022-04-06 16:47:22 +08:00
wenxu12345 42225dd35e log 2022-04-06 15:54:59 +08:00
wenxu12345 ad4c9fcc83 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-06 15:33:30 +08:00
wenxu12345 ef4d0c3c42 log 2022-04-06 15:33:16 +08:00
Gordon 59cc45eaab replace log 2022-04-06 14:41:36 +08:00
Gordon f64c40e91f tag msg 2022-04-06 14:31:25 +08:00
Gordon 46d7d30089 shell update 2022-04-06 12:01:29 +08:00
Gordon 48f15bb71c shell update 2022-04-06 11:59:30 +08:00
Gordon ac70b1d11b Merge branch 'tuoyun' 2022-04-06 11:56:22 +08:00
Gordon d720082644 shell update 2022-04-06 11:47:01 +08:00
Gordon 1f45b642e9 build modify 2022-04-05 20:11:57 +08:00
Gordon 83228d8aa6 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-05 20:10:35 +08:00
Gordon 34f1e50f90 build modify 2022-04-05 20:10:05 +08:00
wenxu12345 b0c518a0d6 log 2022-04-05 20:06:15 +08:00
wenxu12345 aa673a3a5c log 2022-04-05 20:06:08 +08:00
wenxu12345 40d58f6bc2 log 2022-04-05 19:49:49 +08:00
wenxu12345 7604b24ffc log 2022-04-05 19:48:31 +08:00
wenxu12345 a47c0c91a3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-05 19:31:52 +08:00
wenxu12345 0232f52281 log 2022-04-05 19:31:35 +08:00
Gordon 08eba71c8a remove timer 2022-04-05 17:50:26 +08:00
Gordon 577a9249d1 test 2022-04-05 17:31:32 +08:00
Gordon ea6461bd0a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-05 17:20:32 +08:00
Gordon f58c94146a test 2022-04-05 17:20:22 +08:00
wenxu12345 6efe13d142 log 2022-04-05 16:41:37 +08:00
wenxu12345 0a8fdc6cc8 set gin log 2022-04-05 16:24:34 +08:00
wenxu12345 b91b298174 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	cmd/Open-IM-SDK-Core
2022-04-05 15:08:25 +08:00
wenxu12345 f87038622b set gin log 2022-04-05 15:07:34 +08:00
Gordon 8b077848bb Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-05 14:56:39 +08:00
Gordon 2945e6f8bf test 2022-04-05 14:56:29 +08:00
wenxu12345 0f760dc388 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-04-05 14:48:03 +08:00
wenxu12345 5a9b5db99b Check environment before deployment 2022-04-05 14:47:47 +08:00
wangchuxiao 6ba51fb338 tag and set private tips 2022-04-05 14:27:13 +08:00
wangchuxiao 146aa497f9 tag and set private tips 2022-04-05 12:09:55 +08:00
wangchuxiao e7bc82d152 tag and set private tips 2022-04-05 12:03:54 +08:00
wangchuxiao 26f8172b1a tag and set private tips 2022-04-05 11:55:40 +08:00
wangchuxiao 634584400a tag and set private tips 2022-04-05 11:50:26 +08:00
wangchuxiao 7d6be79ba8 tag and set private tips 2022-04-05 10:33:50 +08:00
wangchuxiao cef208f6ef Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-04-05 10:27:43 +08:00
wangchuxiao f4921d1317 tag and set private tips 2022-04-05 10:27:34 +08:00
Gordon 7f1a74b576 panic fix 2022-04-01 20:40:58 +08:00
wangchuxiao 3dc11777c6 minio cfg 2022-04-01 19:23:22 +08:00
wangchuxiao b536165910 Merge branch 'tuoyun' 2022-04-01 19:19:10 +08:00
wenxu12345 7c7aa9e7a7 v2.0.6 2022-04-01 18:45:10 +08:00
wangchuxiao 2b03b57b5c tag and set private tips 2022-04-01 15:59:49 +08:00
wangchuxiao 77c6120014 null to empty slice 2022-04-01 15:32:24 +08:00
wangchuxiao b82ff7b88d tips info 2022-04-01 14:49:48 +08:00
wangchuxiao a16a75230c tag and set private tips 2022-04-01 14:43:31 +08:00
wangchuxiao 0e27b302bc tag and set private tips 2022-03-31 19:49:04 +08:00
wangchuxiao c369ab9b1c Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-31 19:45:57 +08:00
wangchuxiao bb267ccae7 tag and set private tips 2022-03-31 19:17:37 +08:00
Gordon efe24658a4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-31 18:38:05 +08:00
Gordon 5cdf9e7551 OA tag fields modify 2022-03-31 18:36:15 +08:00
wangchuxiao 4390302384 tag and set private tips 2022-03-31 16:50:46 +08:00
wangchuxiao dab00e7fb2 tag and set private tips 2022-03-31 15:01:49 +08:00
wangchuxiao 929c5e7a5b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-31 14:50:17 +08:00
wangchuxiao d600042110 tag and set private tips 2022-03-31 14:50:02 +08:00
Gordon 0a58e7433e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-31 11:43:25 +08:00
Gordon 5639c985df OA tag fields modify 2022-03-31 11:43:14 +08:00
wenxu12345 9fbfbfb23b Merge log files 2022-03-31 11:28:51 +08:00
wenxu12345 ecd2f0e2bf Merge log files 2022-03-31 11:15:06 +08:00
Gordon 60418276bd oa notification add 2022-03-30 20:04:12 +08:00
Gordon 170392f0bc oa notification add 2022-03-30 18:23:05 +08:00
Gordon 6744745152 token add operationID 2022-03-30 15:52:04 +08:00
skiffer-git 009ae6a235 mute group 2022-03-29 18:54:55 +08:00
skiffer-git bf5f72c00b mute group 2022-03-29 18:36:24 +08:00
skiffer-git 84aca5b9e1 mute group 2022-03-29 18:29:19 +08:00
skiffer-git 6164266870 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 18:24:22 +08:00
skiffer-git cc9df9c586 mute group 2022-03-29 18:24:10 +08:00
wangchuxiao 29a268d476 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 17:33:13 +08:00
wangchuxiao 18d7aab703 tag 2022-03-29 17:33:06 +08:00
skiffer-git 373e6b6c8e mute group 2022-03-29 17:29:05 +08:00
skiffer-git 71fab4f6be Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 17:24:55 +08:00
skiffer-git de55c14a16 mute group 2022-03-29 17:24:46 +08:00
Gordon e8517e954d group add 2022-03-29 17:20:37 +08:00
Gordon 78281fc82c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 17:16:02 +08:00
Gordon bc260fffde group add 2022-03-29 17:15:51 +08:00
skiffer-git db00a08bdc Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 17:03:17 +08:00
skiffer-git 85cf7f26ce mute group 2022-03-29 17:03:06 +08:00
Gordon acca147ff2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:56:43 +08:00
Gordon d53da0e422 group add 2022-03-29 16:56:33 +08:00
skiffer-git 11eaaab72d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:32:43 +08:00
skiffer-git 475e64fc5b mute group 2022-03-29 16:32:25 +08:00
wangchuxiao 1bd8154ac4 tag 2022-03-29 16:15:37 +08:00
wangchuxiao d2fa0e7852 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 16:10:43 +08:00
wangchuxiao f2b324abc2 tag 2022-03-29 16:10:36 +08:00
skiffer-git d2225dd841 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:05:16 +08:00
skiffer-git 8d26aa86b9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 16:05:08 +08:00
wangchuxiao 7e937d7d29 tag 2022-03-29 16:04:54 +08:00
skiffer-git fe4b534b78 mute group 2022-03-29 16:04:15 +08:00
wangchuxiao d0a65c7c68 tag 2022-03-29 15:58:42 +08:00
wangchuxiao 416f87f4bb tag 2022-03-29 15:50:20 +08:00
wangchuxiao 7eeb67be28 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 15:35:18 +08:00
wangchuxiao 7ed6ee5075 tag 2022-03-29 15:35:03 +08:00
wenxu12345 d3c8215e15 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 13:31:19 +08:00
wenxu12345 30bc6c274e mute group 2022-03-29 13:30:54 +08:00
skiffer-git ecb1068f0b mute group 2022-03-29 12:40:08 +08:00
wenxu12345 f6eef21b45 mute group 2022-03-29 11:55:48 +08:00
skiffer-git 1aeff25316 mute group 2022-03-29 11:48:17 +08:00
skiffer-git 6de569537f Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-29 11:36:11 +08:00
skiffer-git 764bc3fead mute group 2022-03-29 11:35:53 +08:00
Gordon a89d617532 group add 2022-03-29 11:27:19 +08:00
Gordon fef33795d0 group add 2022-03-29 11:16:03 +08:00
Gordon d2c04b761d ali cloud oss 2022-03-29 11:01:54 +08:00
Gordon c5828aba91 Merge branch 'tuoyun'
# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go
2022-03-29 10:58:01 +08:00
skiffer-git 1286f9dcb6 mute group 2022-03-29 09:34:45 +08:00
skiffer-git 391e525fc5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 19:27:23 +08:00
skiffer-git afc32b1cfa mute group 2022-03-28 19:27:05 +08:00
wangchuxiao 0797181967 tag 2022-03-28 19:18:30 +08:00
wangchuxiao 14c5e631ff tag 2022-03-28 19:15:59 +08:00
wangchuxiao 5cdb039c33 tag 2022-03-28 19:12:31 +08:00
wangchuxiao a11c4fcb58 tag 2022-03-28 19:05:58 +08:00
wangchuxiao c67a937d40 tag 2022-03-28 18:53:57 +08:00
wangchuxiao 03fa7137b9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 18:52:02 +08:00
wangchuxiao e95400988e tag 2022-03-28 18:51:48 +08:00
Gordon 942c9c6a63 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 18:30:21 +08:00
Gordon 6c45665fde add tag message conversation update 2022-03-28 18:30:12 +08:00
wangchuxiao d92ac8f588 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 18:13:08 +08:00
wangchuxiao 169665da32 tag 2022-03-28 18:13:01 +08:00
Gordon c4d80b4844 auto migrate test 2022-03-28 17:52:40 +08:00
Gordon 7827749453 tag notification 2022-03-28 17:37:30 +08:00
wangchuxiao 5e78697a69 tag 2022-03-28 17:22:18 +08:00
wangchuxiao a0e6a78496 tag 2022-03-28 17:18:03 +08:00
wangchuxiao af99a93536 tag 2022-03-28 17:12:36 +08:00
wangchuxiao e9ea117985 tag 2022-03-28 17:10:45 +08:00
wangchuxiao b9ddb0140f tag 2022-03-28 17:02:03 +08:00
wangchuxiao dae70371d1 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 16:59:39 +08:00
wangchuxiao 228cbb4082 tag 2022-03-28 16:59:15 +08:00
Gordon 679c913f3a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-28 16:57:24 +08:00
Gordon 03fb7947c3 add oa notification 2022-03-28 16:57:08 +08:00
wangchuxiao c39f5a27b2 tag 2022-03-28 16:49:19 +08:00
wangchuxiao dbdb516f3c tag 2022-03-28 16:42:18 +08:00
wangchuxiao c1a97b7356 tag 2022-03-28 16:20:20 +08:00
wangchuxiao a6d8f7ea24 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 16:03:16 +08:00
wangchuxiao 574c7600e0 tag 2022-03-28 16:02:31 +08:00
Gordon d1c0205d77 add oa notification 2022-03-28 15:55:55 +08:00
wangchuxiao 13c29d2c1e tag 2022-03-28 15:04:42 +08:00
wangchuxiao dc1a0f050e tag 2022-03-28 14:54:46 +08:00
wangchuxiao e252a00d55 tag 2022-03-28 14:11:47 +08:00
Gordon 5bedbb7c7d script modify 2022-03-28 12:56:59 +08:00
wangchuxiao e510418152 Merge branch 'office_tag' into tuoyun 2022-03-28 12:17:48 +08:00
wangchuxiao 8197ae6aa7 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 12:17:32 +08:00
wangchuxiao 9d619d520d tag 2022-03-28 12:17:07 +08:00
wangchuxiao 46605479e9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag 2022-03-25 18:48:30 +08:00
wangchuxiao 6d20eddd43 mongo 2022-03-25 18:46:27 +08:00
skiffer-git c1ee2a0adb Update docker-compose.yaml 2022-03-25 12:48:11 +08:00
skiffer-git 9d29d49ada group dismissed 2022-03-24 15:33:30 +08:00
wangchuxiao e7b95892ff minio upload api 2022-03-23 17:40:51 +08:00
wangchuxiao 4bf5c77374 mongo 2022-03-23 17:18:40 +08:00
wangchuxiao df4a75f4b0 mongo 2022-03-23 17:15:46 +08:00
wangchuxiao 4bdb4cbbb5 mongo 2022-03-23 16:13:18 +08:00
wangchuxiao 4cdcdee8e4 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-23 15:44:59 +08:00
wangchuxiao e6c36411cb mongo 2022-03-23 15:44:34 +08:00
skiffer-git a4788a95af Update issue templates 2022-03-23 11:33:35 +08:00
Gordon b5de638c0b ws remove log 2022-03-23 11:32:58 +08:00
skiffer-git c1a210313e Update issue templates 2022-03-23 11:28:08 +08:00
skiffer-git ab0ed67f81 Update issue templates 2022-03-23 11:26:25 +08:00
skiffer-git 5d54d5b7d6 Update issue templates 2022-03-23 11:25:59 +08:00
Gordon 1d09ffa529 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-22 18:13:48 +08:00
Gordon eef9d15aaa ws remove log 2022-03-22 18:13:34 +08:00
wangchuxiao 8034ddc413 mongo 2022-03-22 14:30:07 +08:00
wangchuxiao e75adb165a mongo 2022-03-21 19:36:10 +08:00
wangchuxiao 09ce0d5285 mongo 2022-03-21 19:19:33 +08:00
wangchuxiao cc1ad41e94 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-21 16:57:14 +08:00
wangchuxiao 8a38646bc5 mongo 2022-03-21 16:56:52 +08:00
Gordon a2b65f52f6 fix group create bug 2022-03-21 15:45:26 +08:00
jaonzyx c16d8da784 管理员创建群组bug fix (#168) 2022-03-21 15:43:43 +08:00
goubo a55582a018 方便测试导入数据 (#148) 2022-03-21 15:25:41 +08:00
Gordon ea6d472002 pr modify and update 2022-03-21 14:59:00 +08:00
Gordon 3dc4290f2a pr modify and update 2022-03-21 14:57:35 +08:00
hxnets 6c43f75f9f 新增阿里云OSS文件上传参数获取接口 (#115)
* configure update

* mongo:4.0

* open-im-server -> open_im_server

* sleep 15

* 0.0.0.0

* sleep 10 15

* Update config.yaml

* config

* Update docker-compose.yaml

* Update config.yaml

* Create ISSUE_TEMPLATE.md

* Update ISSUE_TEMPLATE.md

* Create ISSUE_TEMPLATE

* add issue template

* add issue template

* add issue template

* add issue template

* Update README.md

* script

* script

* script

* config

* script

* config update

* script update

* image: openim/open_im_server:v1.0.6

* script

* script

* script

* version update

* sender message sync

* version update

* 阿里云oss sts上传参数

* 阿里云oss sts上传参数

Co-authored-by: wenxu12345 <44203734@qq.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2022-03-21 14:43:41 +08:00
Sunny e0c6972bed Update config.yaml (#167)
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2022-03-21 11:19:10 +08:00
马守越 1ab3e04cba 新增mongo.dbUrl配置 (#174)
* 当dbUri值不为空则直接使用该值

* 新增支持ali oss

Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
2022-03-21 11:13:17 +08:00
Arthur 1b8f664c8a fix: json tag value of UserIDResult.UserID (#178)
Signed-off-by: arthur <yang_yapo@126.com>
2022-03-21 11:03:46 +08:00
Gordon 25adfe5b28 check shell update 2022-03-18 20:06:52 +08:00
Gordon 7637b2bec2 check shell update 2022-03-18 19:08:31 +08:00
Gordon 6b3d984ca6 log update 2022-03-18 19:02:46 +08:00
Gordon da5bfe32af log update 2022-03-18 18:18:10 +08:00
wenxu12345 cfab49a7dd friendVerify 2022-03-18 17:44:50 +08:00
Gordon f93d22ae22 log update 2022-03-18 17:35:09 +08:00
wenxu12345 91b9e50fd0 2.0.4 2022-03-18 17:21:04 +08:00
wenxu12345 1b457b0be6 fix bug : etcd Put failed etcdserver: requested lease not found 2022-03-18 11:10:06 +08:00
wangchuxiao d77894c8fe rtc add 2022-03-17 20:55:47 +08:00
wangchuxiao 366f7621fa rtc add 2022-03-17 19:00:05 +08:00
wangchuxiao 984bc37e29 middleware 2022-03-17 16:43:10 +08:00
wangchuxiao 604de144b9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-17 16:31:55 +08:00
Gordon 5dddaeb6e5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-17 15:47:20 +08:00
Gordon 7790686a84 ws add token platform verify 2022-03-17 15:46:32 +08:00
wenxu12345 60950f056b fix bug : etcd Put failed etcdserver: requested lease not found 2022-03-17 14:56:18 +08:00
wangchuxiao ef07634e09 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-17 14:13:24 +08:00
wangchuxiao f70a20f740 rtc add 2022-03-17 14:12:49 +08:00
wenxu12345 c1cda2d536 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-17 13:49:49 +08:00
wenxu12345 2b03e7aea8 add log 2022-03-17 13:49:21 +08:00
wangchuxiao 58cea3e947 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-17 12:49:00 +08:00
wangchuxiao f02fb7ba15 rtc add 2022-03-17 12:48:54 +08:00
wangchuxiao fbafcd0cbc rtc add 2022-03-17 12:48:24 +08:00
Gordon bf09c88e6e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-17 12:08:47 +08:00
Gordon cb8f7e0ddb mongo single node 2022-03-17 12:08:39 +08:00
wenxu12345 f63aa33082 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-17 11:57:33 +08:00
wenxu12345 7bdf6717e1 add log 2022-03-17 11:57:21 +08:00
Gordon 2fc2801ad4 mongo single node 2022-03-17 11:55:35 +08:00
Gordon 2bb6061a44 pb modify 2022-03-17 10:41:34 +08:00
wangchuxiao a0e3488af0 rtc proto modify 2022-03-17 10:33:20 +08:00
wangchuxiao 8fef1f975a rtc add 2022-03-16 20:37:37 +08:00
wangchuxiao 17fad47ca1 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-16 18:02:33 +08:00
wangchuxiao b0aa168c9a rtc add 2022-03-16 18:02:26 +08:00
Gordon 367888968b log add 2022-03-16 16:09:39 +08:00
wenxu12345 11c65e6b90 signaling add participant 2022-03-16 15:45:34 +08:00
wenxu12345 e9699ed8cc Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-16 15:31:27 +08:00
wenxu12345 812362338e signaling add participant 2022-03-16 15:31:15 +08:00
Gordon b7ff0cf2a2 meta data add 2022-03-16 15:21:18 +08:00
wangchuxiao fa21ae6161 rtc add 2022-03-16 14:59:15 +08:00
wenxu12345 fb815c0be0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-16 14:13:45 +08:00
wenxu12345 27c6a187a2 signaling 2022-03-16 14:13:30 +08:00
Gordon 852d3b9f48 add friend and blacklist judge 2022-03-16 11:25:44 +08:00
Gordon 10884b8175 add friend and blacklist judge 2022-03-16 11:18:59 +08:00
wenxu12345 5f37414fee delete msg from server 2022-03-16 10:44:58 +08:00
wenxu12345 e95644ada2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-15 19:08:57 +08:00
wenxu12345 ab4aee93c1 delete msg from server 2022-03-15 19:08:40 +08:00
Gordon 5df94a03fe Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-15 19:03:35 +08:00
Gordon ab9f3a1635 add friend and blacklist judge 2022-03-15 19:03:22 +08:00
wenxu12345 110c43b97a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-15 18:14:11 +08:00
wenxu12345 e0a86a8016 delete msg from server 2022-03-15 18:13:58 +08:00
Gordon 9e7f3b83c4 config explanation 2022-03-15 17:25:31 +08:00
Gordon 011960b159 send msg add protect 2022-03-15 14:16:14 +08:00
Gordon d23a3cedef pb modify 2022-03-15 11:16:00 +08:00
Gordon b782b539a5 pb modify 2022-03-15 11:15:20 +08:00
wenxu12345 2930e49d61 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-15 10:57:16 +08:00
Gordon 45777e6047 pb modify 2022-03-15 10:53:56 +08:00
wenxu12345 204b27ca5d pb platformID 2022-03-15 10:51:25 +08:00
Gordon dde8f427af pb modify 2022-03-15 10:41:19 +08:00
Gordon 1db0966675 pb modify 2022-03-15 10:17:24 +08:00
wenxu12345 b4c16002ff signaling 2022-03-15 10:16:13 +08:00
Gordon ca23c76426 pb modify 2022-03-15 10:11:14 +08:00
Gordon 0c50815944 server modify 2022-03-15 10:03:39 +08:00
wenxu12345 185f3c05fb signaling 2022-03-15 10:02:52 +08:00
Gordon bde88ecc79 server modify 2022-03-15 10:00:45 +08:00
Gordon 38e5b1f853 server modify 2022-03-15 09:50:37 +08:00
wenxu12345 83fffe717e signaling 2022-03-15 09:47:17 +08:00
Gordon 8757faf965 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-14 20:57:59 +08:00
Gordon 9b61fb1f85 ws modify 2022-03-14 20:57:40 +08:00
wangchuxiao 16a6465453 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-14 20:02:58 +08:00
wangchuxiao 1d3f05c22b rtc 2022-03-14 20:02:42 +08:00
Gordon 470bdb6efb ws modify 2022-03-14 19:46:01 +08:00
wenxu12345 fa53530055 signaling 2022-03-14 19:44:23 +08:00
Gordon 02d0b4c99b ws.proto 2022-03-14 19:41:00 +08:00
Gordon ca9ac35eb5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-14 18:40:14 +08:00
Gordon cb68f83451 signal update 2022-03-14 18:39:59 +08:00
wangchuxiao 972675d4da Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-14 18:33:16 +08:00
wangchuxiao 347b1dd31c livekit 2022-03-14 18:33:00 +08:00
Gordon d34e729e32 signal update 2022-03-14 18:22:48 +08:00
Gordon 4954dcead8 grpc version 2022-03-14 18:19:03 +08:00
Gordon a2f3677784 grpc version 2022-03-14 18:01:50 +08:00
Gordon fb22b8bba5 grpc version 2022-03-14 18:00:12 +08:00
Gordon c0ca3569fd grpc version 2022-03-14 17:58:32 +08:00
Gordon bae5042eea grpc version 2022-03-14 17:56:20 +08:00
Gordon a5f831e81e grpc version 2022-03-14 17:41:05 +08:00
Gordon 6cb6c60eba etcd version 2022-03-14 17:39:36 +08:00
Gordon d4098180b6 etcd version 2022-03-14 17:38:15 +08:00
Gordon 9bec4b2713 etcd version 2022-03-14 17:36:48 +08:00
Gordon 82b899f883 etcd version 2022-03-14 17:34:54 +08:00
Gordon 69daec4f86 remove timer 2022-03-14 17:19:50 +08:00
Gordon e5d348140c add Signal message 2022-03-14 17:17:40 +08:00
Gordon 8ba136e0a3 add Signal message 2022-03-14 17:15:55 +08:00
Gordon 63f48a3c4c add Signal message 2022-03-14 17:13:57 +08:00
Gordon e9d10bc012 add Signal message 2022-03-14 17:13:13 +08:00
Gordon 96be2e6262 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-14 17:12:36 +08:00
Gordon 91fa230016 add Signal message 2022-03-14 17:12:26 +08:00
wangchuxiao d4b33a1342 cfg 2022-03-14 17:00:03 +08:00
wangchuxiao 8d08bc7fd1 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-14 16:56:09 +08:00
Gordon 7c08249e08 add Signal message 2022-03-14 16:51:16 +08:00
Gordon 4f5fff96e0 add Signal message 2022-03-14 16:49:04 +08:00
Gordon cf6379283b add Signal message 2022-03-14 16:47:18 +08:00
Gordon 9659638f0c add Signal message 2022-03-14 16:33:59 +08:00
Gordon 433fef9992 add Signal message 2022-03-14 16:05:16 +08:00
Gordon d60039454a add Signal message 2022-03-14 16:04:49 +08:00
wangchuxiao d90b31c5df Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-14 15:18:47 +08:00
Gordon 965dac5ff9 constant 2022-03-14 15:14:14 +08:00
wenxu12345 564f77bcdc signaling 2022-03-14 15:04:34 +08:00
Gordon 6136ac4116 ws proto modify 2022-03-14 14:59:23 +08:00
Gordon bba84b4d11 ws proto modify 2022-03-14 14:28:35 +08:00
wenxu12345 b52317f56b signaling 2022-03-14 10:58:41 +08:00
wenxu12345 98f2806be6 signaling 2022-03-14 10:38:35 +08:00
wenxu12345 ebf7a1d40d v2.0.3 image 2022-03-14 10:23:44 +08:00
Gordon 0ce164079e ws modify 2022-03-14 10:00:28 +08:00
wangchuxiao 3693d2e93d conversation table 2022-03-13 10:07:31 +08:00
Judgelight d3a38963ae Merge pull request #173 from OpenIMSDK/tuoyun
Tuoyun
2022-03-11 18:44:48 +08:00
wenxu12345 9ab9ae0408 signal 2022-03-11 18:12:34 +08:00
wenxu12345 0abb4a82b1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-11 18:11:47 +08:00
wenxu12345 94a579e7d3 signal 2022-03-11 18:11:22 +08:00
Gordon 9d132d7f92 int32 modify 2022-03-11 18:10:58 +08:00
Gordon 0315abc0df utils modify 2022-03-11 18:09:28 +08:00
Gordon 24e04f1303 utils modify 2022-03-11 18:06:46 +08:00
wangchuxiao 51c2f845d8 opt 2022-03-11 17:37:01 +08:00
Gordon edc81534c4 ws modify 2022-03-11 17:29:20 +08:00
wenxu12345 b10ba999cd join time 2022-03-10 12:27:16 +08:00
wenxu12345 12d10ce8b5 fix bug: group member jointime 2022-03-10 12:01:28 +08:00
wenxu12345 c4554cb4e9 1.statistics log
2. Handle exception : etcd keepalive failed
2022-03-09 11:25:51 +08:00
wenxu12345 0e575a9366 keepalive ttl * 3
add user.ex
2022-03-08 18:48:36 +08:00
Gordon 13efbf5f98 log level 2022-03-07 11:50:35 +08:00
Gordon c8be20e9f2 tag update 2022-03-04 19:31:03 +08:00
Gordon 15aabb3859 log 2022-03-04 19:19:06 +08:00
Gordon b2a9867297 Merge branch 'tuoyun' 2022-03-04 19:10:32 +08:00
Gordon e734b000de log 2022-03-04 19:01:32 +08:00
wangchuxiao 127e5af6f3 cfg 2022-03-04 18:44:38 +08:00
wangchuxiao 319f46406c cfg 2022-03-04 18:37:55 +08:00
wangchuxiao ddf79d06d0 callback 2022-03-04 18:26:07 +08:00
wangchuxiao fafad9217d cb 2022-03-04 18:23:58 +08:00
Gordon 08022497e6 log 2022-03-04 18:21:14 +08:00
Gordon 29f849c184 log 2022-03-04 18:20:57 +08:00
wangchuxiao 1572d9df89 cb 2022-03-04 18:17:44 +08:00
wangchuxiao 4c297164a5 cb 2022-03-04 18:03:22 +08:00
Gordon a7c8eda290 log 2022-03-04 17:29:15 +08:00
Gordon 1bcd2d4531 log 2022-03-04 17:26:50 +08:00
Gordon eb1e596cde log 2022-03-04 17:26:08 +08:00
Gordon 9bbcf0c5d7 log 2022-03-04 17:16:21 +08:00
Gordon 341ec6e9a0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-03-04 17:13:33 +08:00
Gordon 7e9234e712 log 2022-03-04 17:13:23 +08:00
wangchuxiao fec33c0b96 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-04 16:53:27 +08:00
Gordon af2917adb9 log 2022-03-04 16:38:53 +08:00
wangchuxiao 2e1459e29c Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-04 16:38:03 +08:00
wangchuxiao 95f6035aa8 add cb 2022-03-04 16:37:49 +08:00
Gordon d6e7cfb044 shell update 2022-03-04 16:24:28 +08:00
Gordon 8dc04667b0 test recover 2022-03-04 16:11:04 +08:00
wangchuxiao c108115c83 add callback 2022-03-04 15:20:59 +08:00
wangchuxiao bcae7720e1 add callback 2022-03-04 14:27:54 +08:00
wangchuxiao 399d0b94d5 msg callback 2022-03-03 19:47:30 +08:00
wangchuxiao a5712e1216 msg callback 2022-03-03 19:44:34 +08:00
wangchuxiao 3805db1263 msg callback 2022-03-03 19:39:49 +08:00
wangchuxiao 88b8a5323a msg callback 2022-03-03 19:23:16 +08:00
wangchuxiao 02510528d1 msg callback 2022-03-03 19:09:59 +08:00
wangchuxiao 7deffeffd8 msg callback 2022-03-03 19:06:00 +08:00
wangchuxiao 4d4520226d msg callback 2022-03-03 18:49:36 +08:00
wangchuxiao 9f80e0a0e6 alter callback fg 2022-03-03 17:54:31 +08:00
wangchuxiao 2ed3fd3cba alter callback fg 2022-03-03 17:53:37 +08:00
wangchuxiao 3698f1dab8 alter callback fg 2022-03-03 16:50:06 +08:00
wangchuxiao fb4c02ca9b alter callback fg 2022-03-03 16:47:03 +08:00
wangchuxiao 9cec4b0c8e alter callback fg 2022-03-03 16:41:17 +08:00
wangchuxiao 6cef26f893 alter callback fg 2022-03-03 16:23:59 +08:00
wangchuxiao e2b5b7016c add debug log 2022-03-03 16:08:46 +08:00
wangchuxiao 2d55e2edd5 alter cfg 2022-03-03 15:59:31 +08:00
wangchuxiao 85dbf4f98f alter port 2022-03-03 15:52:19 +08:00
wangchuxiao d13a6b0c36 add callback 2022-03-03 14:42:50 +08:00
wangchuxiao 48f03f306a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-03 14:18:35 +08:00
wangchuxiao f1c11ac114 add callback 2022-03-03 14:18:28 +08:00
Gordon 97ec9602f7 callback note 2022-03-03 12:11:38 +08:00
Gordon 53cdf884ef Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	config/config.yaml
2022-03-03 10:56:37 +08:00
Gordon d8a729c961 config update 2022-03-03 10:53:44 +08:00
FG 25f24801d6 log 2022-03-02 22:52:39 +08:00
skiffer-git e6b302abf9 log 2022-03-02 21:02:21 +08:00
skiffer-git c0c08fe373 adjust log 2022-03-02 20:59:54 +08:00
wangchuxiao 60e29cc894 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-02 19:07:28 +08:00
wangchuxiao dcfd802757 callback add 2022-03-02 19:07:17 +08:00
skiffer-git 84a01569d6 limit mongo memory 2022-03-02 09:45:12 +08:00
Gordon 72ed38156a test code 2022-03-01 17:48:53 +08:00
Gordon 0e9e02de0b statistics code 2022-03-01 15:53:33 +08:00
skiffer-git 58163cefa0 set max open file num 2022-03-01 15:32:47 +08:00
skiffer-git c4ec54f6e4 Statistics 2022-03-01 15:22:02 +08:00
skiffer-git de7dae4455 statistics 2022-03-01 15:17:43 +08:00
skiffer-git 6362500741 Statistics 2022-03-01 15:14:56 +08:00
skiffer-git 9b3d1f5734 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 19:10:44 +08:00
skiffer-git 123aad2707 statistics log 2022-02-28 19:10:32 +08:00
wangchuxiao 0bed7ee669 merge code 2022-02-28 17:57:03 +08:00
wangchuxiao 7d8d314962 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-28 17:52:25 +08:00
wangchuxiao f01a6e82dc fix minio bug 2022-02-28 17:52:13 +08:00
wangchuxiao 67d7ee2751 fix bug 2022-02-28 17:47:53 +08:00
skiffer-git 04f8a7247d replace find with take 2022-02-28 17:28:00 +08:00
skiffer-git 7b6ef76d54 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 17:24:21 +08:00
skiffer-git ed65ad842f Replace find with take 2022-02-28 17:20:40 +08:00
Gordon a33fe330f7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 17:03:41 +08:00
Gordon b30da3eea4 database judge modify 2022-02-28 17:03:29 +08:00
skiffer-git 05fbbfcf39 grpc-etcd log 2022-02-28 15:28:13 +08:00
wenxu12345 09aec06790 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 20:01:11 +08:00
wenxu12345 00a52475de statistics 2022-02-25 20:01:02 +08:00
Gordon 6c03211ac4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 19:56:15 +08:00
Gordon ca18958669 test config 2022-02-25 19:56:00 +08:00
wenxu12345 e1f58f07fe 2.0.1 2022-02-25 19:55:58 +08:00
wenxu12345 9d28736849 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 19:50:40 +08:00
wenxu12345 739096a9c0 statistics performance 2022-02-25 19:50:18 +08:00
Gordon 2775d9b78a test 2022-02-25 19:49:38 +08:00
Gordon 4f01b0b2ad remove mysql for test 2022-02-25 19:39:42 +08:00
wenxu12345 2427671093 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 19:29:54 +08:00
wenxu12345 8c9d1b7dec statistics 2022-02-25 19:29:39 +08:00
Gordon 55c8399084 remove mysql for test 2022-02-25 19:19:23 +08:00
Gordon a1067492b7 server msg id update 2022-02-25 18:35:04 +08:00
Gordon 961beb3e85 Merge remote-tracking branch 'origin/main' 2022-02-25 16:00:15 +08:00
Gordon 23e86f1067 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-25 15:59:42 +08:00
Gordon a1333dcace config update 2022-02-25 15:59:33 +08:00
wenxu12345 82690b5f2f Merge branch 'tuoyun' 2022-02-25 15:36:45 +08:00
wenxu12345 70b97aa856 version: "3" 2022-02-25 15:36:29 +08:00
wenxu12345 05210e2a8b Merge branch 'tuoyun' 2022-02-25 15:31:44 +08:00
wenxu12345 751c278052 version: "2" 2022-02-25 15:31:18 +08:00
wenxu12345 9a1620d51f Merge branch 'tuoyun' 2022-02-25 15:28:19 +08:00
wenxu12345 157cd9a035 2.0.1 2022-02-25 15:27:37 +08:00
wenxu12345 010736839a 2.0.1 2022-02-25 15:26:55 +08:00
Gordon 2c26efb5a9 log remove 2022-02-25 15:02:02 +08:00
Gordon fe9e2aa287 config update 2022-02-25 11:49:52 +08:00
Gordon 2585014ace Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	config/config.yaml
2022-02-24 18:14:25 +08:00
Gordon 0410003ceb api update 2022-02-24 18:08:53 +08:00
wangchuxiao e1a0c2fc48 fix bug 2022-02-24 14:47:21 +08:00
wangchuxiao b0a8c0a35a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-23 19:55:49 +08:00
wenxu12345 0fca91ca37 config description 2022-02-23 18:22:44 +08:00
wangchuxiao 65ba2d2e27 Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-23 17:19:30 +08:00
wangchuxiao 188ca8fc58 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-23 15:46:21 +08:00
wangchuxiao 3b80b74730 test mongo driver 2022-02-23 15:46:02 +08:00
Gordon d9f5f960a5 test 2022-02-23 15:33:22 +08:00
Gordon e31da8bbd0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-23 15:27:31 +08:00
Gordon 1e602975f3 test 2022-02-23 15:27:23 +08:00
wangchuxiao 541ccda754 test mongo driver 2022-02-23 14:30:21 +08:00
wangchuxiao 1b68363b80 test mongo driver 2022-02-23 12:30:47 +08:00
wangchuxiao fc11b3c463 test mongo driver 2022-02-23 12:30:18 +08:00
wangchuxiao f9f36cd1d6 test mongo driver 2022-02-23 12:27:01 +08:00
wangchuxiao 566c05bcef mongodriver test 2022-02-23 12:00:02 +08:00
wenxu12345 effb21bc6c dbMysqlDatabaseName: openIM_v2 2022-02-23 10:35:16 +08:00
wenxu12345 4c92ee4a8a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-23 10:31:26 +08:00
wenxu12345 8f5b5ab0f9 openIM_v2 2022-02-23 10:31:11 +08:00
wangchuxiao 5dacbfc17e Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-23 10:18:57 +08:00
wangchuxiao 5defc18a64 alter cfg codettl 2022-02-23 10:18:43 +08:00
Gordon d2ba299f42 shell update 2022-02-23 10:10:28 +08:00
Gordon e78e5d6f32 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-23 09:49:11 +08:00
Gordon ebbdcbe5a5 shell update 2022-02-23 09:49:02 +08:00
wangchuxiao 1d0ca5f11e Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-22 19:05:33 +08:00
wangchuxiao d22935703d forget pwd 2022-02-22 19:05:12 +08:00
Gordon d66a567b8f shell update 2022-02-22 19:02:39 +08:00
wenxu12345 34695f2aa3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-22 18:02:11 +08:00
wenxu12345 dcacd88f11 UserNotificationBegin = 1301 2022-02-22 18:02:00 +08:00
wangchuxiao 2bbf794501 alter cfg 2022-02-22 17:19:56 +08:00
wangchuxiao e3937c5ef2 alter yaml 2022-02-22 17:14:29 +08:00
Gordon a93775bb64 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-22 16:02:46 +08:00
Gordon eddcac2343 send msg time modify 2022-02-22 16:01:32 +08:00
wenxu12345 95c125a5af Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-22 14:23:16 +08:00
wenxu12345 927380741c v2.0.0 2022-02-22 14:23:05 +08:00
Gordon 861dfc43a8 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-22 14:13:14 +08:00
Gordon a1cbf8724f log 2022-02-22 14:13:04 +08:00
wangchuxiao cae88e7946 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-22 12:27:46 +08:00
wangchuxiao 952ad0e162 fix deploy 2022-02-22 12:27:39 +08:00
Gordon b751156b5c redis ttl 2022-02-21 21:19:06 +08:00
wangchuxiao aad27f40cf verrify 2022-02-21 21:07:50 +08:00
wangchuxiao 55d7c6e672 add log 2022-02-21 21:02:37 +08:00
wenxu12345 75590eb765 VerificationCodeForRegisterSuffix 2022-02-21 20:09:26 +08:00
wangchuxiao dfdb952e2b fix reset password api 2022-02-21 19:12:51 +08:00
wangchuxiao c09ebc146b Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-21 18:50:25 +08:00
wangchuxiao 139ef08af3 fix bug 2022-02-21 18:50:11 +08:00
Gordon 2d13a5fd35 msg judge 2022-02-21 18:18:53 +08:00
wangchuxiao a3fb32dfc6 fix bug and add reset pwd api 2022-02-21 16:41:56 +08:00
wangchuxiao 079efe5de6 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-21 16:25:36 +08:00
wangchuxiao 4d28ccebad add reset pwd 2022-02-21 16:24:25 +08:00
wenxu12345 2171acc909 replace mongo driver 2022-02-21 15:23:04 +08:00
wenxu12345 1e05811c13 replace mongo driver 2022-02-21 15:22:40 +08:00
wenxu12345 ec023ec13e replace mongo driver 2022-02-21 15:22:12 +08:00
wenxu12345 996570cc57 replace mongo driver 2022-02-21 15:21:45 +08:00
wenxu12345 7cf712daff replace mongo driver 2022-02-21 15:20:39 +08:00
wenxu12345 9a35af9fb2 replace mongo driver 2022-02-21 15:17:55 +08:00
wenxu12345 ede3b07963 replace mongo driver 2022-02-21 15:14:24 +08:00
wenxu12345 53a4b90d96 replace mongo driver 2022-02-21 15:12:48 +08:00
wenxu12345 bf948789ea replace mongo driver 2022-02-21 15:07:50 +08:00
wenxu12345 db116f39fd Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-21 15:03:49 +08:00
wenxu12345 c962a19eb7 replace mongo driver 2022-02-21 15:03:29 +08:00
wenxu12345 571c83314a Refactoring code 2022-02-21 15:01:06 +08:00
Gordon d906d49930 model modify 2022-02-21 14:11:51 +08:00
Gordon 344bafff45 push modify 2022-02-21 12:20:05 +08:00
wenxu12345 4858390346 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	config/config.yaml
2022-02-21 11:06:34 +08:00
wenxu12345 f16f0e3069 Refactoring code 2022-02-21 11:06:06 +08:00
Gordon 3ee12221a4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-21 10:10:22 +08:00
Gordon 8915848a52 login modify 2022-02-21 10:10:11 +08:00
wangchuxiao a2cd7c8007 add minio 2022-02-19 18:48:15 +08:00
wangchuxiao 6e9b9341d4 mini cr 2022-02-18 17:06:27 +08:00
Gordon e90d8a87ee config 2022-02-18 15:16:33 +08:00
Gordon 45c43888e7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-18 12:56:53 +08:00
Gordon 68e7dfb1cc conversation add 2022-02-18 12:56:43 +08:00
wangchuxiao f086f33097 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-17 19:41:03 +08:00
wangchuxiao 737ce2c2e7 fix bug 2022-02-17 19:35:17 +08:00
Gordon 3c7c7cde3c close console log 2022-02-17 16:28:59 +08:00
Gordon 3913d9e48e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-17 16:18:47 +08:00
Gordon 84d4645efa close console log 2022-02-17 16:18:37 +08:00
wangchuxiao 8a7442648c Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-17 14:37:54 +08:00
wangchuxiao f1616461f7 add log 2022-02-17 14:36:34 +08:00
Gordon ed2a5af5ed Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	internal/api/third/tencent_cloud_storage_credential.go
2022-02-17 11:14:27 +08:00
Gordon 3b73a4c69a send msg modify 2022-02-17 11:13:51 +08:00
wenxu12345 17954dfdc9 Refactoring code 2022-02-16 19:41:44 +08:00
wenxu12345 3aadf61fde Refactoring code 2022-02-16 18:58:02 +08:00
wenxu12345 5e65e394a6 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-16 18:30:36 +08:00
wenxu12345 8c357ec213 Refactoring code 2022-02-16 18:30:24 +08:00
wangchuxiao a599a334a3 alter cfg 2022-02-16 14:11:47 +08:00
wangchuxiao 36d39669e4 alter deploy 2022-02-16 12:23:08 +08:00
wangchuxiao 028171a91a yaml cfg alter 2022-02-16 11:13:13 +08:00
wangchuxiao 2647e1cdac alter yaml cfg 2022-02-16 11:06:35 +08:00
wangchuxiao 994cebea82 makefile 2022-02-15 18:57:41 +08:00
wangchuxiao a533a3e0ef makefile 2022-02-15 18:43:03 +08:00
wangchuxiao caa915b31d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-15 18:29:46 +08:00
wangchuxiao 2996d8537d add makefile 2022-02-15 18:29:38 +08:00
wangchuxiao 65be1263b9 make file 2022-02-15 18:28:54 +08:00
wenxu12345 d81ae835aa Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-15 14:34:20 +08:00
wenxu12345 c405cedc41 Refactoring code 2022-02-15 14:34:03 +08:00
Gordon 2a7f366cbf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-15 14:32:40 +08:00
Gordon ea580e4c64 send message 2022-02-15 14:31:55 +08:00
wangchuxiao 445100f32d Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-15 14:11:30 +08:00
wangchuxiao 648a852ba7 conversation opt 2022-02-15 14:11:20 +08:00
Gordon 9f136fb150 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-15 13:16:41 +08:00
Gordon 6d5b38fc8a send message 2022-02-15 13:16:31 +08:00
skiffer-git 2e7fd5fe93 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-14 17:50:38 +08:00
root 626895166a Merge branch 'tuoyun' of https://github.com/OpenIMSDK/Open-IM-Server into tuoyun 2022-02-14 17:01:26 +08:00
skiffer-git 1ca8d2b2db log 2022-02-14 16:59:52 +08:00
Gordon aa57f25b2c tes log 2022-02-14 16:59:26 +08:00
root a321676b99 Merge branch 'tuoyun' of https://github.com/OpenIMSDK/Open-IM-Server into tuoyun 2022-02-14 16:29:30 +08:00
Gordon 5b49b105f6 config file 2022-02-14 16:29:15 +08:00
Gordon d610b19f4e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-14 16:28:40 +08:00
root b9241288c4 config file 2022-02-14 16:23:05 +08:00
Gordon a7470dc284 update 2022-02-14 16:13:27 +08:00
Gordon 154624a767 update 2022-02-14 16:04:35 +08:00
skiffer-git 6f1a5eb79c log 2022-02-14 16:03:55 +08:00
Judgelight a8334a22f8 Merge pull request #131 from OpenIMSDK/cms-dev
Cms dev
2022-02-14 15:18:05 +08:00
wangchuxiao 8cdea2bfeb cms dev 2022-02-14 15:16:59 +08:00
wangchuxiao c413eda330 merge code 2022-02-14 10:57:23 +08:00
wangchuxiao 22bfb6be4b merge code 2022-02-14 10:46:32 +08:00
Gordon 6bfbf37749 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-14 09:44:18 +08:00
wangchuxiao 7797e47561 add 2022-02-14 00:02:15 +08:00
wangchuxiao 52579c5fab add 2022-02-12 17:13:31 +08:00
wenxu12345 a5ed6d897c Refactor code 2022-02-11 20:32:51 +08:00
wenxu12345 439605bafc Refactor code 2022-02-11 20:31:57 +08:00
wenxu12345 9f6fd3ee6a Refactor code 2022-02-11 19:58:42 +08:00
Gordon 1539c0b2f2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-11 19:56:01 +08:00
wenxu12345 109e8b53a1 Refactor code 2022-02-11 19:49:21 +08:00
Gordon 216697d4b5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-11 19:46:04 +08:00
wenxu12345 77bb88ed59 Refactor code 2022-02-11 19:41:32 +08:00
wenxu12345 7e52477908 Refactor code 2022-02-11 19:35:51 +08:00
wenxu12345 45816fa84f Refactor code 2022-02-11 19:34:18 +08:00
wenxu12345 18babef78b Refactor code 2022-02-11 19:06:48 +08:00
Gordon df8970f59b demo modify 2022-02-11 19:06:29 +08:00
wenxu12345 3103c33dda Refactor code 2022-02-11 18:57:37 +08:00
wenxu12345 a9fa7ee26a Refactor code 2022-02-11 18:52:21 +08:00
wenxu12345 e605560e5c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-11 18:49:27 +08:00
wenxu12345 af330d7f8a Refactor code 2022-02-11 18:49:17 +08:00
Gordon 563d466374 demo modify 2022-02-11 17:51:36 +08:00
Gordon fd59cc6226 demo modify 2022-02-11 17:44:02 +08:00
Gordon 6a8a0f2249 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-11 16:45:28 +08:00
Gordon 8c43b0953b demo modify 2022-02-11 16:36:02 +08:00
Gordon a885d7f003 demo modify 2022-02-11 16:25:28 +08:00
wenxu12345 63af591938 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-10 18:54:32 +08:00
wenxu12345 bf6efc3530 Refactor code 2022-02-10 18:32:02 +08:00
Gordon 609ec24c6a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-10 17:13:54 +08:00
Gordon c99cbec3df db 2022-02-10 17:13:19 +08:00
Gordon 6eb44cb9d8 db 2022-02-10 16:52:18 +08:00
wenxu12345 f67f2a31ee Refactor code 2022-02-10 16:44:58 +08:00
wenxu12345 3d5b8287ce Refactor code 2022-02-10 16:15:57 +08:00
wenxu12345 548a27fe48 Refactor code 2022-02-10 16:14:18 +08:00
wenxu12345 7970a0b3b4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-10 12:28:17 +08:00
wenxu12345 2c67845dd6 Refactor code 2022-02-10 12:28:06 +08:00
Gordon e02ca2f7e3 db 2022-02-10 12:01:00 +08:00
Gordon 84a2197027 db 2022-02-10 11:57:03 +08:00
Gordon 41dd808c9a db 2022-02-10 11:47:44 +08:00
Gordon 6a7a76dce3 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-10 11:45:52 +08:00
Gordon b7a8f6c2a1 db 2022-02-10 11:41:34 +08:00
Gordon f574017b66 db 2022-02-10 11:40:16 +08:00
wenxu12345 b35d5ded77 Refactor code 2022-02-10 09:35:24 +08:00
wenxu12345 a3f712306e Refactor code 2022-02-10 09:31:50 +08:00
wenxu12345 e455b3ff00 Refactor code 2022-02-10 09:17:48 +08:00
wenxu12345 17dd73834f Refactor code 2022-02-09 20:25:25 +08:00
wenxu12345 189020298e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-09 19:38:57 +08:00
wangchuxiao 375b400b1e Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-09 19:21:08 +08:00
wangchuxiao 192ac0e013 api 2022-02-09 19:20:46 +08:00
wangchuxiao b80c8013c0 add user req group reqlist api 2022-02-09 19:19:22 +08:00
wenxu12345 0606428cd9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-09 18:35:58 +08:00
wenxu12345 8cd7b85711 Refactor code 2022-02-09 18:35:46 +08:00
Gordon e91f2b89df Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-09 17:47:25 +08:00
Gordon 93706c94af mysql coding 2022-02-09 17:40:59 +08:00
wangchuxiao 6de61cb214 cms dev 2022-02-09 16:22:58 +08:00
wenxu12345 a21e7adeb5 Refactor code 2022-02-09 15:30:57 +08:00
wenxu12345 11aecf43ba Refactor code 2022-02-09 15:07:31 +08:00
wenxu12345 ee3490a520 Refactor code 2022-02-09 15:03:24 +08:00
wenxu12345 178c1afdea Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-09 13:25:23 +08:00
wenxu12345 3a2cd0276a Refactor code 2022-02-09 13:21:46 +08:00
Gordon a81e5aa6e4 log 2022-02-09 13:05:17 +08:00
Gordon 927cde3777 log 2022-02-09 12:59:20 +08:00
Gordon bed2bfb6db push msg specify receiver 2022-02-09 12:50:36 +08:00
wenxu12345 72f87b449b Refactor code 2022-02-09 12:12:19 +08:00
wenxu12345 02b95b16f9 Refactor code 2022-02-09 09:50:03 +08:00
wenxu12345 3e16519793 Refactor code 2022-02-09 09:44:45 +08:00
wenxu12345 a4b6cb3232 Refactor code 2022-02-09 09:31:17 +08:00
wenxu12345 8883701297 Refactor code 2022-02-09 09:26:58 +08:00
wenxu12345 225c0a9b03 Refactor code 2022-02-09 09:13:07 +08:00
wangchuxiao 43a9bba96f msg cms 2022-02-09 00:45:23 +08:00
wenxu12345 2c670b3b21 Refactor code 2022-02-08 20:25:39 +08:00
wangchuxiao 02aad295f9 group 2022-02-08 20:24:59 +08:00
wenxu12345 163da78bc6 Refactor code 2022-02-08 20:22:07 +08:00
wenxu12345 a549f86624 Refactor code 2022-02-08 19:33:37 +08:00
wenxu12345 27262436d1 Refactor code 2022-02-08 19:28:46 +08:00
wenxu12345 fa2b691dc1 Refactor code 2022-02-08 19:22:15 +08:00
wenxu12345 03a010406f Refactor code 2022-02-08 19:18:07 +08:00
wenxu12345 1e5245efd0 Refactor code 2022-02-08 19:10:06 +08:00
wenxu12345 abd8369dd9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 18:44:38 +08:00
wenxu12345 d0dbffebe1 Refactor code 2022-02-08 18:40:15 +08:00
wenxu12345 c202cee81f Refactor code 2022-02-08 18:34:23 +08:00
Gordon 95153a6609 push msg specify receiver 2022-02-08 18:06:35 +08:00
Gordon e157bc195b push msg specify receiver 2022-02-08 17:34:53 +08:00
Gordon ac09da9efc push msg specify receiver 2022-02-08 17:12:47 +08:00
Gordon dc1ad8fb2d push msg specify receiver 2022-02-08 17:12:02 +08:00
Gordon ba5d178ba0 push msg specify receiver 2022-02-08 16:49:45 +08:00
Gordon 9ceebacfb1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 15:52:26 +08:00
Gordon 2a872eb995 notification 2022-02-08 15:30:48 +08:00
wenxu12345 9077b56df1 Refactor code 2022-02-08 15:19:31 +08:00
wenxu12345 3380cab2c3 Refactor code 2022-02-08 14:50:47 +08:00
wenxu12345 1355fa0636 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 14:45:34 +08:00
wenxu12345 70fb869852 Refactor code 2022-02-08 14:45:21 +08:00
Gordon 73da15586b Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 14:10:41 +08:00
Gordon b3024a6f7c test 2022-02-08 14:06:49 +08:00
wenxu12345 4c42f5a2f5 Refactor code 2022-02-08 12:22:37 +08:00
wenxu12345 14cf30cd98 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 11:54:52 +08:00
wangchuxiao e94dbe4965 cms dev 2022-02-07 19:42:09 +08:00
wangchuxiao a7f9faf868 statistics 2022-02-07 08:44:21 +08:00
skiffer-git 6cbdc958cd notification 2022-01-28 11:18:31 +08:00
wangchuxiao fb396d9cf0 add 2022-01-27 18:31:31 +08:00
skiffer-git fca092d392 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	config/config.yaml
#	internal/rpc/chat/send_msg.go
#	internal/rpc/group/create_group.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-01-27 11:51:34 +08:00
wangchuxiao 0ed393b1a5 group 2022-01-27 01:08:02 +08:00
wangchuxiao b992faa468 group rpc 2022-01-26 18:43:01 +08:00
wangchuxiao 3f911ab437 Merge branch 'cms-dev' of https://github.com/OpenIMSDK/Open-IM-Server into cms-dev 2022-01-26 09:53:54 +08:00
wangchuxiao 84586b675a group 2022-01-26 09:53:49 +08:00
wangchuxiao f952f715c8 group pb 2022-01-26 00:37:58 +08:00
wangchuxiao 79d097c903 group pb 2022-01-26 00:37:28 +08:00
wangchuxiao cdc2428aca cms 2022-01-25 19:18:04 +08:00
wangchuxiao 82c8ace8df cms dev 2022-01-24 18:22:47 +08:00
Gordon 8525dcb376 fix time convert 2022-01-24 16:44:14 +08:00
wangchuxiao 1607853393 cms 2022-01-24 01:40:49 +08:00
skiffer-git 27d402104e Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	cmd/Open-IM-SDK-Core
#	pkg/common/config/config.go
2022-01-22 09:55:54 +08:00
wangchuxiao d58bcd136a pb api 2022-01-21 18:39:57 +08:00
Gordon 1944b24fba push message modify 2022-01-21 09:39:09 +08:00
Gordon 8e10533681 msg test 2022-01-20 19:23:20 +08:00
Gordon 5a9f3f1f5e msg test 2022-01-20 19:20:56 +08:00
Gordon 64f2fb9e73 msg test 2022-01-20 18:38:20 +08:00
Gordon cbed698a1c msg test 2022-01-20 18:36:30 +08:00
Gordon cd7efee49c msg test 2022-01-20 18:28:45 +08:00
Gordon f7ab90724e msg test 2022-01-20 18:04:24 +08:00
Gordon aa7b891150 chat log model update 2022-01-20 17:29:38 +08:00
Gordon 911100923f chat log model update 2022-01-20 17:18:41 +08:00
Gordon 3c64d84980 protocol modify 2022-01-20 11:55:08 +08:00
Gordon e4f87b53b4 protocol modify 2022-01-20 11:53:57 +08:00
Gordon ff779fcc7c protocol modify 2022-01-20 11:42:43 +08:00
Gordon e7c7784fec protocol modify 2022-01-20 11:37:14 +08:00
Gordon 184f0900fb protocol modify 2022-01-20 11:36:43 +08:00
wenxu12345 9ca83b7349 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-20 10:02:41 +08:00
Gordon 8b3df83e7e ws proto 2022-01-20 10:00:02 +08:00
Gordon da24249850 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-19 18:18:57 +08:00
Gordon 04e509fc49 update user 2022-01-19 18:14:53 +08:00
wenxu12345 99a8eaea91 Refactor code 2022-01-19 18:02:57 +08:00
wenxu12345 4c3474a9f7 Refactor code 2022-01-19 17:29:25 +08:00
wenxu12345 14ccbf335d Refactor code 2022-01-19 17:17:51 +08:00
wenxu12345 14841a44ad Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-19 16:11:18 +08:00
Gordon d2b411ecbb nil modify 2022-01-19 14:50:36 +08:00
Gordon 544e60eb6d nil modify 2022-01-19 14:45:23 +08:00
wenxu12345 db80d8f56f Refactor code 2022-01-19 14:12:29 +08:00
wenxu12345 ae09d73257 Refactor code 2022-01-19 14:10:15 +08:00
Gordon ca0f095d6b db charset set utf-8 2022-01-19 14:00:25 +08:00
Gordon 1a0f626a80 model length add 2022-01-19 12:31:28 +08:00
Gordon c23426425e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-19 12:02:55 +08:00
Gordon de52439276 model length add 2022-01-19 11:49:01 +08:00
Gordon 757b296fd0 model length add 2022-01-19 11:47:40 +08:00
wenxu12345 83e842d121 Refactor code 2022-01-19 09:33:31 +08:00
wenxu12345 7f00a3075f Refactor code 2022-01-19 09:32:46 +08:00
wenxu12345 1c362e4871 Refactor code 2022-01-18 21:42:27 +08:00
wenxu12345 0dc5c9dbac Refactor code 2022-01-18 21:17:35 +08:00
wenxu12345 28d9304ec6 Refactor code 2022-01-18 20:27:46 +08:00
wenxu12345 d132e53c06 Refactor code 2022-01-18 20:04:58 +08:00
wenxu12345 e28a8db3b4 Refactor code 2022-01-18 19:46:17 +08:00
Gordon b6380a17ce ws send msg modify 2022-01-18 18:39:27 +08:00
wenxu12345 f4ceef485b Refactor code 2022-01-18 15:58:57 +08:00
wenxu12345 f3507569b5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-18 15:30:37 +08:00
wenxu12345 da5e60a009 Refactor code 2022-01-18 15:26:06 +08:00
Gordon 896a69086b ws send msg modify 2022-01-18 15:09:47 +08:00
Gordon b375877a6d ws send msg modify 2022-01-18 14:06:42 +08:00
Gordon 0ed5f8081a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-18 12:22:06 +08:00
Gordon 7416fa3a4c ws send msg modify 2022-01-18 11:54:48 +08:00
wenxu12345 b90bb10a3f Refactor code 2022-01-18 10:43:30 +08:00
wenxu12345 69643c37c1 Refactor code 2022-01-18 10:41:12 +08:00
wenxu12345 bf208485f8 Refactor code 2022-01-18 09:40:08 +08:00
wenxu12345 d12d571c2b Refactor code 2022-01-18 09:25:41 +08:00
wenxu12345 a456936853 Refactor code 2022-01-17 18:25:35 +08:00
wenxu12345 655f7ff7d0 Refactor code 2022-01-17 18:00:25 +08:00
wenxu12345 5d8e972ac7 Refactor code 2022-01-17 14:10:45 +08:00
wenxu12345 31a6797fc3 Refactor code 2022-01-17 14:07:21 +08:00
wenxu12345 b9b0e9cf43 Refactor code 2022-01-17 14:06:37 +08:00
wenxu12345 7f4eb5624b Refactor code 2022-01-17 14:05:09 +08:00
wenxu12345 766a05236a Refactor code 2022-01-17 10:11:26 +08:00
wenxu12345 92a6c7b89e Refactor code 2022-01-16 18:58:07 +08:00
wenxu12345 a583a31220 Refactor code 2022-01-16 16:31:28 +08:00
wenxu12345 87f14be30c Refactor code 2022-01-16 12:25:41 +08:00
wenxu12345 7e13cc84c8 Refactor code 2022-01-15 18:36:40 +08:00
wenxu12345 a2440a2e80 Refactor code 2022-01-15 15:30:48 +08:00
wenxu12345 17b96dd7c1 Refactor code 2022-01-15 15:25:12 +08:00
wenxu12345 b2c2c1247b Refactor code 2022-01-15 11:14:29 +08:00
wenxu12345 e4b6b18712 Refactor code 2022-01-14 18:33:06 +08:00
wenxu12345 4601633605 Refactor code 2022-01-14 18:29:09 +08:00
wenxu12345 839123408b Refactor code 2022-01-14 18:16:50 +08:00
wenxu12345 2a3cf5f002 Refactor code 2022-01-14 16:48:42 +08:00
wenxu12345 4d172ec4f5 Refactor code 2022-01-14 16:11:23 +08:00
wenxu12345 6f411e96ed Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-14 13:53:43 +08:00
wenxu12345 7f7664eb4f Refactor code 2022-01-14 13:52:09 +08:00
wenxu12345 3d994cc2cf Refactor code 2022-01-14 13:44:46 +08:00
Gordon 6bc69d5a75 proto json tag modify 2022-01-14 09:59:25 +08:00
Gordon 0db2c271a0 proto json tag modify 2022-01-14 09:51:43 +08:00
Gordon 02b09c58a1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-14 09:47:46 +08:00
Gordon b0a8ad1ac1 tidy 2022-01-13 18:33:11 +08:00
wenxu12345 3e6302e44a Refactor code 2022-01-13 11:20:21 +08:00
wenxu12345 1f493c427a Refactor code 2022-01-13 11:16:55 +08:00
wenxu12345 89eb39ca3e Refactor code 2022-01-13 11:10:29 +08:00
wenxu12345 b495761283 Refactor code 2022-01-06 20:34:00 +08:00
wenxu12345 29e92015d5 Refactor code 2022-01-06 20:33:09 +08:00
wenxu12345 c71f2f7fae Refactor code 2022-01-06 20:21:13 +08:00
wenxu12345 548c92dc0d Refactor code 2022-01-06 20:17:22 +08:00
wenxu12345 59a5f675f6 Refactor code 2022-01-06 20:16:14 +08:00
wenxu12345 d80a669515 Refactor code 2022-01-06 20:07:40 +08:00
wenxu12345 bc0c5d4fcb Refactor code 2022-01-06 19:59:13 +08:00
wenxu12345 1a69fdf1e0 Refactor code 2022-01-06 18:30:58 +08:00
wenxu12345 df6643f1c5 Refactor code 2022-01-06 18:26:50 +08:00
wenxu12345 03fc008dfc Refactor code 2022-01-06 18:23:29 +08:00
wenxu12345 fa330c766f Refactor code 2022-01-06 18:22:09 +08:00
wenxu12345 cb80742eaa Refactor code 2022-01-06 18:16:36 +08:00
wenxu12345 0ae46455af Refactor code 2022-01-06 18:16:08 +08:00
wenxu12345 d6133c325a Refactor code 2022-01-06 18:14:54 +08:00
wenxu12345 edfb89a8d9 Refactor code 2022-01-06 18:09:48 +08:00
wenxu12345 aafbee2a28 Refactor code 2022-01-06 18:08:54 +08:00
wenxu12345 5c9dc62015 Refactor code 2022-01-06 18:04:30 +08:00
wenxu12345 5fef41e132 Refactor code 2022-01-06 18:00:15 +08:00
wenxu12345 a677d4da5f Refactor code 2022-01-06 17:55:37 +08:00
wenxu12345 136e0cde06 Refactor code 2022-01-06 15:24:57 +08:00
wenxu12345 06af2b6aa3 Refactor code 2022-01-06 15:19:24 +08:00
wenxu12345 29e2a00109 Refactor code 2022-01-06 15:18:23 +08:00
wenxu12345 d5b5929e9b Refactor code 2022-01-06 14:17:25 +08:00
wenxu12345 fea89ad451 Refactor code 2022-01-04 13:38:38 +08:00
wenxu12345 3d6f1e42d2 Refactor code 2022-01-04 13:19:14 +08:00
wenxu12345 1ad80e1870 Refactor code 2022-01-04 13:01:57 +08:00
wenxu12345 ea0b8df5d4 Refactor code 2022-01-04 13:01:07 +08:00
wenxu12345 0e39aac5cd Refactor code 2022-01-04 12:58:11 +08:00
wenxu12345 7e88621aa1 Refactor code 2022-01-04 12:56:10 +08:00
wenxu12345 9b76407193 Refactor code 2021-12-31 11:18:32 +08:00
wenxu12345 b6bd2687d2 Refactor code 2021-12-31 11:11:41 +08:00
wenxu12345 82c0f8a863 Refactor code 2021-12-31 11:08:16 +08:00
wenxu12345 9782802bd8 Refactor code 2021-12-31 11:01:48 +08:00
wenxu12345 87659b56a4 Refactor code 2021-12-31 10:57:45 +08:00
wenxu12345 cd62d7f0d9 Refactor code 2021-12-31 10:49:37 +08:00
wenxu12345 1290bc8cc9 Refactor code 2021-12-31 10:45:11 +08:00
wenxu12345 fe285ecd6b Refactor code 2021-12-31 10:41:06 +08:00
wenxu12345 da7d187612 Refactor code 2021-12-31 10:40:32 +08:00
wenxu12345 9b2fde6ea2 Refactor code 2021-12-31 09:43:22 +08:00
wenxu12345 da1a563a3c Refactor code 2021-12-31 09:40:08 +08:00
wenxu12345 9bee5c79c8 Refactor code 2021-12-31 09:25:11 +08:00
wenxu12345 aab6ad96eb Refactor code 2021-12-31 09:04:04 +08:00
wenxu12345 c8d803b559 Refactor code 2021-12-31 08:49:05 +08:00
wenxu12345 ab5faec68c Refactor code 2021-12-30 21:29:10 +08:00
wenxu12345 dcba4fef48 Refactor code 2021-12-30 21:28:38 +08:00
wenxu12345 a654073c71 Refactor code 2021-12-30 21:09:37 +08:00
wenxu12345 eb417c7e22 Refactor code 2021-12-30 21:03:52 +08:00
wenxu12345 0fce4c6177 Refactor code 2021-12-30 20:51:33 +08:00
wenxu12345 e964ff0b70 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 20:42:19 +08:00
wenxu12345 a5765fc25a Refactor code 2021-12-30 20:39:49 +08:00
wenxu12345 18600bcd11 Refactor code 2021-12-30 20:09:45 +08:00
Gordon 7a3bb59d3e add null value handle 2021-12-30 19:12:50 +08:00
Gordon 29e1535c64 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	cmd/open_im_api/main.go
2021-12-30 18:38:37 +08:00
wenxu12345 7b41ce1f24 Refactor code 2021-12-30 18:33:01 +08:00
wenxu12345 1e6a170c3c Refactor code 2021-12-30 18:31:13 +08:00
wenxu12345 887028a1b4 Refactor code 2021-12-30 18:30:03 +08:00
wenxu12345 816ceab057 Refactor code 2021-12-30 18:28:37 +08:00
wenxu12345 324152e363 Refactor code 2021-12-30 18:22:56 +08:00
wenxu12345 1b11cd571e Refactor code 2021-12-30 18:19:54 +08:00
Gordon 627419aa5f add null value handle 2021-12-30 17:56:12 +08:00
Gordon aa99e710d1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	cmd/open_im_api/main.go
#	internal/api/group/group.go
2021-12-30 17:55:32 +08:00
wenxu12345 f3a9857747 Refactor code 2021-12-30 17:54:11 +08:00
Gordon fdf1c0448b add null value handle 2021-12-30 17:48:20 +08:00
wenxu12345 a09b39dd69 Refactor code 2021-12-30 17:48:19 +08:00
Gordon e4989d8b9f add null value handle 2021-12-30 17:46:29 +08:00
wenxu12345 b135de80c0 Refactor code 2021-12-30 17:46:11 +08:00
wenxu12345 79a39b39d9 Refactor code 2021-12-30 17:44:06 +08:00
wenxu12345 0c02afa54e Refactor code 2021-12-30 17:34:54 +08:00
wenxu12345 1e9ef321f0 Refactor code 2021-12-30 17:27:11 +08:00
Gordon 7301bc30b1 add null value handle 2021-12-30 16:53:06 +08:00
wenxu12345 ccecd8f4f0 Refactor code 2021-12-30 16:30:13 +08:00
wenxu12345 93e669d7d3 Refactor code 2021-12-30 16:27:57 +08:00
wenxu12345 a0f28c07f2 Refactor code 2021-12-30 16:24:37 +08:00
wenxu12345 bd14e5019f Refactor code 2021-12-30 16:19:06 +08:00
wenxu12345 6d0f454e6a Refactor code 2021-12-30 14:17:29 +08:00
wenxu12345 a031311ab5 Refactor code 2021-12-30 14:03:55 +08:00
wenxu12345 492915567b Refactor code 2021-12-30 13:53:05 +08:00
wenxu12345 8b1a7def38 Refactor code 2021-12-30 13:49:39 +08:00
wenxu12345 2f62339f0c Refactor code 2021-12-30 13:39:36 +08:00
wenxu12345 288f25c827 Refactor code 2021-12-30 13:29:32 +08:00
wenxu12345 1392a8ecf1 Refactor code 2021-12-30 13:26:07 +08:00
wenxu12345 1eee8f439b Refactor code 2021-12-30 12:30:30 +08:00
wenxu12345 0db7aca1cd Refactor code 2021-12-30 12:29:27 +08:00
wenxu12345 89d69a8fb6 Refactor code 2021-12-30 12:27:26 +08:00
wenxu12345 7574d06718 Refactor code 2021-12-30 12:07:13 +08:00
wenxu12345 4336a1a13e Refactor code 2021-12-30 12:05:10 +08:00
wenxu12345 9409d6e05e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 11:53:59 +08:00
wenxu12345 0971445289 Refactor code 2021-12-30 11:53:50 +08:00
Gordon 32fe763c0c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 11:50:31 +08:00
Gordon 6790d2be44 err log 2021-12-30 11:50:20 +08:00
wenxu12345 f579c6b56d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 11:47:14 +08:00
wenxu12345 81aaa95170 Refactor code 2021-12-30 11:42:10 +08:00
Gordon e0c91f7fda Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 11:40:30 +08:00
Gordon bd0596dd86 err log 2021-12-30 11:35:48 +08:00
wenxu12345 cc5125d51d Refactor code 2021-12-30 11:28:24 +08:00
wenxu12345 e90be1bb88 Refactor code 2021-12-30 11:13:19 +08:00
wenxu12345 b32567681f Refactor code 2021-12-30 11:07:12 +08:00
wenxu12345 9f5897e06c Refactor code 2021-12-30 11:04:53 +08:00
wenxu12345 e8ffcb0630 Refactor code 2021-12-30 10:59:25 +08:00
wenxu12345 88aaa38676 Refactor code 2021-12-30 10:56:17 +08:00
wenxu12345 6692867db5 Refactor code 2021-12-30 10:49:09 +08:00
wenxu12345 42c898d5aa Refactor code 2021-12-30 10:36:37 +08:00
wenxu12345 2936f886a9 Refactor code 2021-12-30 10:35:09 +08:00
Gordon f582967711 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 10:35:06 +08:00
Gordon 68985e9eda log add 2021-12-30 10:30:47 +08:00
wenxu12345 7c3e429f22 Refactor code 2021-12-30 10:20:16 +08:00
wenxu12345 cb79b1aea5 Refactor code 2021-12-30 10:18:49 +08:00
wenxu12345 b687eb09b4 Refactor code 2021-12-30 10:14:30 +08:00
wenxu12345 83874ad466 Refactor code 2021-12-30 09:46:53 +08:00
wenxu12345 c0172b0a49 Refactor code 2021-12-30 09:39:37 +08:00
wenxu12345 f59208b9cf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 09:38:17 +08:00
wenxu12345 6d9ee74360 Refactor code 2021-12-30 09:38:07 +08:00
wenxu12345 5ae6e98572 Refactor code 2021-12-30 09:34:19 +08:00
wenxu12345 3f639e2ffe Refactor code 2021-12-30 09:33:51 +08:00
Gordon 43a690c8cf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-30 09:30:59 +08:00
wenxu12345 2725a1cd8d Refactor code 2021-12-30 09:30:46 +08:00
wenxu12345 ac3159193f Refactor code 2021-12-30 09:26:40 +08:00
wenxu12345 f2c0a3994a Refactor code 2021-12-30 09:23:18 +08:00
wenxu12345 d7dbe986f1 Refactor code 2021-12-30 09:17:49 +08:00
wenxu12345 f93090596a Refactor code 2021-12-30 09:11:38 +08:00
wenxu12345 8b7e62e819 Refactor code 2021-12-30 09:10:31 +08:00
wenxu12345 28ef79f371 Refactor code 2021-12-29 22:06:27 +08:00
wenxu12345 e39312828c Refactor code 2021-12-29 22:00:18 +08:00
Gordon 3bbf9d2e0f nil return modify 2021-12-29 21:55:07 +08:00
wenxu12345 be4ba6cc69 Refactor code 2021-12-29 21:50:11 +08:00
wenxu12345 51126ca941 Refactor code 2021-12-29 21:47:56 +08:00
wenxu12345 faae2d7a1e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 21:36:54 +08:00
wenxu12345 ca92bc899b Refactor code 2021-12-29 21:26:56 +08:00
Gordon ace5fd61bd nil return modify 2021-12-29 19:37:52 +08:00
Gordon 31fabb4624 nil return modify 2021-12-29 19:35:04 +08:00
Gordon b4935fef76 nil return modify 2021-12-29 19:33:54 +08:00
Gordon d1fba4c125 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 19:25:37 +08:00
Gordon de8ac68466 nil return modify 2021-12-29 19:17:43 +08:00
Gordon 0392eab129 nil return modify 2021-12-29 19:12:33 +08:00
wenxu12345 479ce592fa Refactor code 2021-12-29 18:36:56 +08:00
wenxu12345 9eaa180c10 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 18:32:26 +08:00
wenxu12345 4b38f0bc6b Refactor code 2021-12-29 18:26:49 +08:00
Gordon 40ed7258d4 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 18:23:14 +08:00
wenxu12345 b0c05fd80d Refactor code 2021-12-29 18:12:23 +08:00
wenxu12345 1537330b61 Refactor code 2021-12-29 18:10:19 +08:00
Gordon abd91260ab nil return modify 2021-12-29 18:09:55 +08:00
wenxu12345 5dcb321a6f Refactor code 2021-12-29 18:04:24 +08:00
wenxu12345 38cc72a3f9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 17:55:51 +08:00
Gordon 6f03c470ae nil return modify 2021-12-29 17:53:08 +08:00
wenxu12345 4cb02bd3a5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 17:52:11 +08:00
wenxu12345 9f55418bfb Refactor code 2021-12-29 17:52:01 +08:00
Gordon 8faf1140fb nil return modify 2021-12-29 17:51:06 +08:00
wenxu12345 6e14375b86 Refactor code 2021-12-29 17:46:27 +08:00
wenxu12345 7138d7ac59 Refactor code 2021-12-29 17:43:49 +08:00
wenxu12345 a02b810412 Refactor code 2021-12-29 17:42:22 +08:00
Gordon bd5480b264 nil return modify 2021-12-29 17:39:04 +08:00
Gordon 7c04bcae26 nil return modify 2021-12-29 17:34:44 +08:00
Gordon efa61dcb39 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 17:31:30 +08:00
wenxu12345 6c137d9098 Refactor code 2021-12-29 17:26:06 +08:00
wenxu12345 3ca92c7a03 Refactor code 2021-12-29 17:13:45 +08:00
wenxu12345 bb2d5e570a Refactor code 2021-12-29 17:06:40 +08:00
Gordon 1ce2a86f37 nil return modify 2021-12-29 17:05:52 +08:00
wenxu12345 c6ee7c5082 Refactor code 2021-12-29 16:55:45 +08:00
wenxu12345 a52d674a14 Refactor code 2021-12-29 16:52:12 +08:00
wenxu12345 69b1ee2ec7 Refactor code 2021-12-29 16:46:33 +08:00
wenxu12345 95a771c2fb Refactor code 2021-12-29 16:44:24 +08:00
wenxu12345 cf59f57ab8 Refactor code 2021-12-29 16:39:52 +08:00
wenxu12345 8cd38693dd Refactor code 2021-12-29 16:31:33 +08:00
wenxu12345 ef67aa9e48 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 16:18:17 +08:00
wenxu12345 4623b5d5db Refactor code 2021-12-29 16:17:55 +08:00
Gordon 65456d331b nil return modify 2021-12-29 16:04:08 +08:00
Gordon 20f51092ad nil return modify 2021-12-29 15:53:56 +08:00
Gordon 0b0173f155 nil return modify 2021-12-29 15:52:19 +08:00
wenxu12345 4e4bab2bf0 Refactor code 2021-12-29 15:50:50 +08:00
Gordon 679c907b78 nil return modify 2021-12-29 15:19:49 +08:00
Gordon cd6bb1b98f Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 15:08:57 +08:00
wenxu12345 667ceb2115 Refactor code 2021-12-29 15:08:27 +08:00
Gordon 03f491ab5a nil return modify 2021-12-29 15:07:36 +08:00
wenxu12345 fb7c4114c1 Refactor code 2021-12-29 14:57:36 +08:00
wenxu12345 669ea69357 Refactor code 2021-12-29 14:39:54 +08:00
wenxu12345 5b32e0db6f Refactor code 2021-12-29 14:36:13 +08:00
wenxu12345 20aa2bdc6e Refactor code 2021-12-29 14:25:39 +08:00
wenxu12345 c7b7847a82 Refactor code 2021-12-29 14:14:08 +08:00
wenxu12345 d99f3e1522 Refactor code 2021-12-29 14:08:46 +08:00
wenxu12345 903b53033d Refactor code 2021-12-29 14:06:25 +08:00
wenxu12345 f2fa08ea82 Refactor code 2021-12-29 13:56:50 +08:00
wenxu12345 c049cde8cf Refactor code 2021-12-29 13:49:39 +08:00
wenxu12345 d58dc29550 Refactor code 2021-12-29 13:45:22 +08:00
wenxu12345 e75e36e999 Refactor code 2021-12-29 13:40:26 +08:00
wenxu12345 7903dc7c2e Refactor code 2021-12-29 13:34:13 +08:00
wenxu12345 a8e13d86e2 Refactor code 2021-12-29 13:30:50 +08:00
wenxu12345 8e173d8273 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 12:32:45 +08:00
wenxu12345 7b67dc03f7 Refactor code 2021-12-29 12:29:39 +08:00
Gordon c4fca3b23d nil return modify 2021-12-29 12:22:10 +08:00
wenxu12345 c42e70686d Refactor code 2021-12-29 12:13:00 +08:00
wenxu12345 df861b59c1 Refactor code 2021-12-29 12:06:26 +08:00
wenxu12345 447ccdf042 Refactor code 2021-12-29 12:02:55 +08:00
wenxu12345 db37d0197a Refactor code 2021-12-29 11:57:28 +08:00
wenxu12345 e6f21d166a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 11:52:58 +08:00
wenxu12345 2e0923a26a Refactor code 2021-12-29 11:52:51 +08:00
Gordon bd1af2223d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 11:40:06 +08:00
wenxu12345 ec395acae0 Refactor code 2021-12-29 11:37:52 +08:00
wenxu12345 5ff69b86db Refactor code 2021-12-29 11:36:45 +08:00
Gordon ce6cd8070f conversation update 2021-12-29 11:32:20 +08:00
wenxu12345 ddf985b445 Refactor code 2021-12-29 11:31:53 +08:00
Gordon 6a37072b9a conversation update 2021-12-29 11:31:51 +08:00
wenxu12345 d2ea06ef4a Refactor code 2021-12-29 11:29:51 +08:00
wenxu12345 943f58f2c0 Refactor code 2021-12-29 11:19:55 +08:00
wenxu12345 0891e2d432 Refactor code 2021-12-29 11:16:23 +08:00
wenxu12345 740dd0e0a6 Refactor code 2021-12-29 11:15:20 +08:00
wenxu12345 2fcd21ae94 Refactor code 2021-12-29 11:02:55 +08:00
wenxu12345 c312f079fb Refactor code 2021-12-29 11:01:57 +08:00
wenxu12345 a480dfe59e Refactor code 2021-12-29 11:01:14 +08:00
wenxu12345 453eddc089 Refactor code 2021-12-29 10:57:48 +08:00
wenxu12345 51cb558317 Refactor code 2021-12-29 10:55:28 +08:00
wenxu12345 f0c5b1e544 Refactor code 2021-12-29 10:52:52 +08:00
wenxu12345 348ce56776 Refactor code 2021-12-29 10:41:05 +08:00
wenxu12345 d8ab13e249 Refactor code 2021-12-29 10:39:47 +08:00
wenxu12345 376f61e213 Refactor code 2021-12-29 10:32:26 +08:00
wenxu12345 b30cb5254e Refactor code 2021-12-29 10:18:10 +08:00
wenxu12345 3737e889ea Refactor code 2021-12-29 09:36:48 +08:00
wenxu12345 ec144da8ce Refactor code 2021-12-29 09:32:35 +08:00
wenxu12345 e61b37b6bf Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 09:08:33 +08:00
wenxu12345 47a3c3c253 tidy code 2021-12-28 21:17:41 +08:00
Gordon 23c5f4040e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-28 21:03:31 +08:00
wenxu12345 39ceb20332 tidy code 2021-12-28 21:03:03 +08:00
Gordon e80c5c89e0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-28 20:44:58 +08:00
Gordon 8cfc5925da management modify 2021-12-28 20:44:19 +08:00
wenxu12345 da73347231 tidy code 2021-12-28 20:28:01 +08:00
wenxu12345 e26c3d9462 tidy code 2021-12-28 20:21:09 +08:00
wenxu12345 f4c3c86dd1 tidy code 2021-12-28 20:03:20 +08:00
wenxu12345 5c509ee85a tidy code 2021-12-28 19:28:33 +08:00
wenxu12345 12ebf232d5 tidy code 2021-12-28 18:37:16 +08:00
wenxu12345 05ee76b0a9 tidy code 2021-12-28 18:33:36 +08:00
wenxu12345 12df670681 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-28 18:23:03 +08:00
wenxu12345 6d589a1204 tidy code 2021-12-28 18:18:35 +08:00
Gordon 1e50556f64 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-28 18:09:07 +08:00
Gordon 7ee703f077 token modify 2021-12-28 18:05:25 +08:00
wenxu12345 141936e609 tidy code 2021-12-28 18:03:51 +08:00
wenxu12345 188a90f97d tidy code 2021-12-28 18:01:40 +08:00
wenxu12345 ec95f0a7af tidy code 2021-12-28 17:49:52 +08:00
wenxu12345 848510d4ca tidy code 2021-12-28 17:48:21 +08:00
wenxu12345 16e276d08e tidy code 2021-12-28 17:45:57 +08:00
wenxu12345 62d0a7e6ff tidy code 2021-12-28 17:15:51 +08:00
wenxu12345 eeee9a54d7 tidy code 2021-12-28 17:13:31 +08:00
Gordon 3ec1d1a965 token modify 2021-12-28 17:12:07 +08:00
wenxu12345 2b60430c55 tidy code 2021-12-28 17:03:37 +08:00
wenxu12345 dbd3ed49ed tidy code 2021-12-28 16:59:17 +08:00
wenxu12345 eb640157f2 tidy code 2021-12-28 16:58:01 +08:00
wenxu12345 166ec71a28 tidy code 2021-12-28 16:50:05 +08:00
wenxu12345 8e4f3b4f06 tidy code 2021-12-28 16:48:20 +08:00
wenxu12345 f43e1a1018 tidy code 2021-12-28 16:36:02 +08:00
wenxu12345 508ccf4f9c tidy code 2021-12-28 16:31:38 +08:00
wenxu12345 6f92fa0069 tidy code 2021-12-28 16:30:00 +08:00
wenxu12345 2293253d52 tidy code 2021-12-28 16:26:59 +08:00
wenxu12345 1cb7b6a67e tidy code 2021-12-28 16:24:45 +08:00
wenxu12345 817a5e4b64 tidy code 2021-12-28 16:23:14 +08:00
wenxu12345 8286c10406 tidy code 2021-12-28 16:06:06 +08:00
wenxu12345 12c2d18325 tidy code 2021-12-28 16:03:47 +08:00
wenxu12345 28cfc2a9c1 tidy code 2021-12-28 16:01:57 +08:00
wenxu12345 1e3cad4b20 tidy code 2021-12-28 15:47:20 +08:00
wenxu12345 b6944c4308 tidy code 2021-12-28 15:33:47 +08:00
wenxu12345 38542f9888 tidy code 2021-12-28 14:23:14 +08:00
wenxu12345 4223b2d0f0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-28 14:10:49 +08:00
wenxu12345 c0db257e9b tidy code 2021-12-28 14:07:06 +08:00
wenxu12345 6b1f4e1686 tidy code 2021-12-28 11:57:12 +08:00
Gordon 6e8080b87d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-28 11:30:47 +08:00
Gordon 292a8620e0 remove invalid token 2021-12-28 10:59:01 +08:00
wenxu12345 f0f1c54244 tidy code 2021-12-27 21:08:42 +08:00
wenxu12345 30024c9814 tidy code 2021-12-27 18:22:32 +08:00
wenxu12345 3446442eca Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-27 16:57:36 +08:00
wenxu12345 e439ef4ddd tidy code 2021-12-27 16:48:05 +08:00
Gordon 774e348f95 send msg file modify 2021-12-27 11:49:01 +08:00
wenxu12345 3d4e0a0479 tidy code 2021-12-26 18:47:11 +08:00
wenxu12345 30b9ca7f37 notification 2021-12-24 16:02:21 +08:00
wenxu12345 04e064e86e notification 2021-12-24 15:39:26 +08:00
wenxu12345 6a88d64a90 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-24 15:02:58 +08:00
wenxu12345 e64bc40ca9 notification 2021-12-24 15:02:47 +08:00
Gordon 33ae9dae0a send msg file modify 2021-12-23 19:50:04 +08:00
Gordon ba249d294e send msg file modify 2021-12-23 19:37:41 +08:00
wenxu12345 d40e1e47fd notification 2021-12-23 18:29:39 +08:00
Gordon 1be993801f send msg file modify 2021-12-23 17:48:06 +08:00
Gordon b76aa03d3a Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
2021-12-23 17:39:31 +08:00
Gordon 743715fa73 send msg file modify 2021-12-23 17:35:07 +08:00
Gordon 5f09d6a26f send msg file modify 2021-12-23 17:34:32 +08:00
wenxu12345 27fd4f444b notification 2021-12-23 17:22:49 +08:00
Gordon 2d56dacd0e send msg file modify 2021-12-23 17:22:26 +08:00
Gordon 333453df79 send msg file modify 2021-12-23 17:19:57 +08:00
Gordon cfddc75ccb config file modify 2021-12-23 14:28:44 +08:00
Gordon 3a01ee9973 config file modify 2021-12-23 10:04:21 +08:00
wenxu12345 1efe753a04 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-22 15:25:00 +08:00
wenxu12345 a8e80a44e6 notification 2021-12-22 15:24:49 +08:00
Gordon cf94122406 proto file 2021-12-22 11:20:10 +08:00
wenxu12345 a5518eb492 OpUserID 2021-12-22 11:14:57 +08:00
Gordon 6bdfc570a8 proto file 2021-12-22 11:14:03 +08:00
Gordon 26640b3b07 proto file 2021-12-22 11:13:51 +08:00
Gordon 777805fc1a proto file 2021-12-22 11:10:13 +08:00
Gordon 57e08e282c proto file 2021-12-22 10:50:03 +08:00
Gordon fb5ea3be84 proto file 2021-12-22 10:47:07 +08:00
Gordon 05c15a104f Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	pkg/proto/sdk_ws/ws.proto
2021-12-22 10:10:51 +08:00
Gordon 5f18723e2c proto file 2021-12-22 09:37:19 +08:00
Gordon 7db98e55c5 proto file 2021-12-22 09:31:33 +08:00
wenxu12345 75e1e2e678 notification 2021-12-21 21:40:50 +08:00
wenxu12345 2876e77a08 UserInfo FriendInfo GroupInfo 2021-12-20 17:27:05 +08:00
wenxu12345 3ba881f641 pb: open_im_sdk.OfflinePushInfo 2021-12-20 16:29:24 +08:00
skiffer-git 264451d923 notification 2021-12-19 21:03:05 +08:00
Gordon e63b3ab0e3 add management interface 2021-12-17 16:43:41 +08:00
Gordon 8987005e60 add management interface 2021-12-17 16:23:44 +08:00
Gordon d6614decd1 rpc restore 2021-12-17 15:55:43 +08:00
Gordon 42726cf2b6 add check user is registered 2021-12-17 15:10:24 +08:00
Gordon ff1ac3387b add check user is registered 2021-12-17 15:07:17 +08:00
Gordon f933abe48e add check user is registered 2021-12-17 14:28:43 +08:00
Gordon be94674507 pb file 2021-12-17 12:52:12 +08:00
Gordon c8b1e5bafc pb file 2021-12-17 12:15:33 +08:00
Gordon 7403619cbc err handle 2021-12-17 11:14:43 +08:00
itltf512116 7a6df3abd3 Tuoyun 新增单容器单进程的部署方式 (#103)
* feat 新增deploy:单容器单进程模型部署

* feat 新增openim内部各组件的host名称配置;
fix 独立容器部署镜像文档;

* feat 新增注释说明
2021-12-17 10:49:01 +08:00
skiffer-git b84dbbc3b8 notification 2021-12-14 15:11:35 +08:00
skiffer-git 7adde6a0a9 notification 2021-12-14 14:53:27 +08:00
Gordon a328080ba4 sync message 2021-12-10 18:07:09 +08:00
Gordon 525889e366 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-10 17:58:59 +08:00
Gordon 88d181f9fe sync message 2021-12-10 17:51:19 +08:00
Gordon 2dc773ebe6 sync message 2021-12-10 17:50:29 +08:00
wenxu12345 043ce653a9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-10 17:30:25 +08:00
wenxu12345 8b4da90497 pb 2021-12-10 17:30:11 +08:00
Gordon 59fffc6fbe server version update 2021-12-10 17:18:20 +08:00
Gordon 8b81d60dce Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-10 17:06:29 +08:00
Gordon 0ed9aa5372 sender message sync 2021-12-10 17:00:24 +08:00
wenxu12345 2ace964573 pb: open_im_sdk.OfflinePushInfo 2021-12-10 11:07:44 +08:00
wenxu12345 a8201aaa58 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-10 11:06:32 +08:00
Gordon 776fa2f4f6 pb change 2021-12-10 11:04:05 +08:00
Gordon eabef540cf pb change 2021-12-10 10:51:20 +08:00
Gordon d6ec8f4930 pb change 2021-12-10 10:49:49 +08:00
Gordon aaf834a33b pb change 2021-12-10 10:35:21 +08:00
Gordon 043f9bde59 msg add notification 2021-12-09 21:22:54 +08:00
Gordon 170310e23c push add ios push 2021-12-09 18:15:40 +08:00
Gordon 31a558cfea push add ios push 2021-12-09 18:10:39 +08:00
Gordon adc4fec19b push add ios push 2021-12-09 17:54:58 +08:00
Gordon 74beec2b85 push add ios push 2021-12-09 17:52:05 +08:00
Gordon d7cd8ba780 push add ios push 2021-12-09 17:42:02 +08:00
Gordon a69ebf4299 push add ios push 2021-12-09 17:41:06 +08:00
Gordon 8085c62774 push add ios push 2021-12-09 17:14:24 +08:00
Gordon 3e51e781a6 push add ios push 2021-12-09 16:05:20 +08:00
Gordon fa028fdafd push add ios push 2021-12-09 15:43:36 +08:00
Gordon d2ce4192cc rpc protocol update 2021-12-08 18:30:23 +08:00
Gordon 822f689c48 rpc protocol update 2021-12-08 18:17:57 +08:00
Gordon c6ade8d9bc rpc protocol update 2021-12-08 18:15:14 +08:00
Gordon 0e99fb27b5 rpc protocol update 2021-12-08 18:09:34 +08:00
Gordon 058a191e61 rpc protocol update 2021-12-08 18:08:48 +08:00
Gordon ebd867a6d5 conversation update 2021-12-08 17:44:16 +08:00
Gordon 687933a63e conversation update 2021-12-08 17:23:26 +08:00
wenxu12345 1f40c87dd9 demo log 2021-12-08 14:56:09 +08:00
wenxu12345 93ffbe2a79 demo log 2021-12-08 14:49:47 +08:00
Gordon a090e602b3 conversation update 2021-12-08 12:30:17 +08:00
Gordon c9a48081fd conversation update 2021-12-08 12:24:55 +08:00
Gordon 5b026e13f6 conversation update 2021-12-08 10:42:04 +08:00
Gordon f1aab5ad3b Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-07 21:22:00 +08:00
wenxu12345 d7028f22e2 fix bug 2021-12-07 16:15:21 +08:00
Gordon 570c0cb9a1 remove log 2021-12-07 16:13:11 +08:00
wenxu12345 053792e89d ReceiveMessageOpt debug log 2021-12-07 16:12:55 +08:00
wenxu12345 31212d4f4b ReceiveMessageOpt debug log 2021-12-07 16:10:49 +08:00
wenxu12345 19489afefc ReceiveMessageOpt debug log 2021-12-07 16:07:56 +08:00
wenxu12345 5dd494d9a2 ReceiveMessageOpt debug log 2021-12-07 16:01:48 +08:00
wenxu12345 2adbf9f686 ReceiveMessageOpt debug log 2021-12-07 15:56:33 +08:00
wenxu12345 9dbad9ce53 ReceiveMessageOpt 2021-12-07 15:44:12 +08:00
wenxu12345 52498bf05e ReceiveMessageOpt 2021-12-07 14:39:56 +08:00
wenxu12345 e4e5608c8c ReceiveMessageOpt 2021-12-07 14:34:41 +08:00
wenxu12345 d629874468 ReceiveMessageOpt 2021-12-07 14:28:07 +08:00
Gordon 7da98935b9 redis add func 2021-12-07 11:46:24 +08:00
Gordon d50a0abd2a send message by message receive opt 2021-12-07 10:22:49 +08:00
Gordon 33b9685985 send message by message receive opt 2021-12-06 20:03:59 +08:00
Gordon cd14f3e649 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-06 16:16:56 +08:00
Gordon 70eaa7d968 redis add message receive opt 2021-12-06 16:06:19 +08:00
wenxu12345 f1b51f9c97 fix bug: QuitGroup Find ->Scan 2021-12-03 11:50:30 +08:00
wenxu12345 65398fb147 callback config 2021-12-02 21:35:01 +08:00
wenxu12345 a8575b4fc7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-02 20:47:49 +08:00
wenxu12345 67ede12fd8 online state 2021-12-02 20:42:17 +08:00
Gordon e6b5819099 redis prefix modify 2021-12-02 14:10:47 +08:00
wenxu12345 5cd1af5b48 script 2021-12-02 11:47:30 +08:00
wenxu12345 6d1c70b8d3 get online state by secret 2021-12-02 11:27:06 +08:00
wenxu12345 cda28cb2ee Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-01 20:05:56 +08:00
wenxu12345 aac7a0f5af script 2021-12-01 20:03:06 +08:00
Gordon 0501cbcf4c demo merge into project 2021-12-01 14:52:55 +08:00
Gordon f08941c0bd demo merge into project 2021-12-01 14:39:29 +08:00
Gordon c1ed2f14c8 demo merge into project 2021-12-01 14:28:47 +08:00
Gordon 3ae5c9dca1 demo merge into project 2021-12-01 13:35:28 +08:00
Gordon ace6ef0029 demo merge into project 2021-12-01 13:14:17 +08:00
Gordon 140724d665 demo merge into project 2021-12-01 12:44:39 +08:00
Gordon c476c255b8 demo merge into project 2021-12-01 12:44:34 +08:00
Gordon cf069970bd demo merge into project 2021-12-01 12:35:21 +08:00
Gordon a8341ec86d demo merge into project 2021-12-01 12:31:51 +08:00
Gordon 23b965a20a demo merge into project 2021-12-01 12:30:27 +08:00
Gordon 2104ba787a Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-01 12:16:18 +08:00
Gordon 15660663f6 demo merge into project 2021-12-01 12:16:02 +08:00
wenxu12345 4d3e79281d script 2021-12-01 11:57:43 +08:00
wenxu12345 21ff7a36b8 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-01 10:41:34 +08:00
wenxu12345 42e2957bee script 2021-12-01 10:37:56 +08:00
Gordon bd62da8e1a test modify 2021-11-30 21:17:20 +08:00
Gordon df592d99dd test modify 2021-11-30 21:12:03 +08:00
Gordon 39f5e13463 test modify 2021-11-30 21:08:52 +08:00
Gordon 58785e9470 test modify 2021-11-30 21:06:10 +08:00
Gordon 3495d75a6f test modify 2021-11-30 21:05:24 +08:00
Gordon bee12423b0 test modify 2021-11-30 20:50:38 +08:00
Gordon a705e595ee test modify 2021-11-30 20:43:58 +08:00
Gordon 45f29c4c6f test modify 2021-11-30 20:38:23 +08:00
Gordon 5f90851458 test modify 2021-11-30 20:33:34 +08:00
Gordon 01515f919d test modify 2021-11-30 20:15:34 +08:00
Gordon a2292b1177 test modify 2021-11-30 19:58:57 +08:00
Gordon b2f5f56fa0 test modify 2021-11-30 19:54:27 +08:00
Gordon 2be1e1a70d test modify 2021-11-30 19:52:14 +08:00
Gordon b416cd380a test modify 2021-11-30 19:37:14 +08:00
Gordon f18f54afc6 test modify 2021-11-30 19:35:55 +08:00
Gordon b02830c891 token modify 2021-11-30 15:37:51 +08:00
Gordon aff733bbd9 constan 2021-11-29 18:24:39 +08:00
Gordon 4a66911a61 get all node online user status 2021-11-29 17:22:23 +08:00
Gordon c9b3a017a4 get all node online user status 2021-11-29 16:43:22 +08:00
root 6712d65de4 pbfile 2021-11-29 16:31:13 +08:00
Gordon c2a45cdbeb get all node online user status 2021-11-29 16:26:57 +08:00
Gordon 0f20e58a46 not token 2021-11-29 15:03:19 +08:00
root 2f37767899 pb file 2021-11-29 14:10:42 +08:00
Gordon f4c7272305 pb file 2021-11-29 14:09:10 +08:00
root 8a8e33763c pbfile 2021-11-29 12:01:53 +08:00
Gordon d55eda0bb3 pb file 2021-11-29 12:00:52 +08:00
root 6c7483733f pbfile 2021-11-29 11:44:51 +08:00
Gordon c7590c120d pb file 2021-11-29 11:25:57 +08:00
Gordon b3dec3653a pb file 2021-11-29 11:22:49 +08:00
Gordon 7cb42c49de pb file 2021-11-29 11:19:24 +08:00
Gordon 32dffb0375 Merge branch 'main' into tuoyun 2021-11-26 20:25:41 +08:00
Gordon c3d13c73ce Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-11-26 14:37:28 +08:00
Gordon 0ea48af892 panic output detail info 2021-11-26 14:34:00 +08:00
Gordon 72b09864ce panic output detail info 2021-11-26 14:20:50 +08:00
wenxu12345 d8e5fe367b config 2021-11-25 21:06:07 +08:00
wenxu12345 b1244c0a1b config 2021-11-25 20:32:24 +08:00
Gordon 7a3b56955c multi terminal kick eachOther 2021-11-25 16:37:36 +08:00
Gordon 5dcb7f2a80 multi terminal kick eachOther 2021-11-25 16:09:26 +08:00
Gordon 64e71440e2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-11-25 16:09:12 +08:00
Gordon e7e3b6dd15 multi terminal kick eachOther 2021-11-25 14:12:52 +08:00
wenxu12345 06551575b1 0.0.0.0 2021-11-25 13:57:11 +08:00
wenxu12345 912ec51315 sleep 10 15 2021-11-24 10:19:12 +08:00
wenxu12345 1363c98cd8 0.0.0.0 2021-11-24 09:39:10 +08:00
wenxu12345 b9e49e37ea sleep 15 2021-11-23 15:30:28 +08:00
wenxu12345 4bb64e301e open-im-server -> open_im_server 2021-11-23 10:54:40 +08:00
wenxu12345 1c9c911373 configure update 2021-11-23 09:57:58 +08:00
wenxu12345 75a638f728 configure update 2021-11-23 09:57:09 +08:00
Gordon 09fd45346e add management interface and callback args optimization 2021-11-16 16:04:34 +08:00
Gordon 3329068bcc picture 2021-11-15 16:30:16 +08:00
Gordon aae6874928 null pointer fix 2021-11-15 16:10:56 +08:00
Gordon 6dacf23312 log change 2021-11-15 11:46:02 +08:00
Gordon bcc0cd33f1 log change 2021-11-15 11:44:04 +08:00
Gordon 0daa840eaa log change 2021-11-15 11:31:38 +08:00
Gordon ea5e69e26d log change 2021-11-15 10:22:20 +08:00
Gordon 26f0234e3d config modify 2021-11-15 10:18:59 +08:00
Gordon 95ac2c62e8 config modify 2021-11-12 18:54:51 +08:00
Gordon f65e4aad63 push modify 2021-11-12 18:51:39 +08:00
Gordon d7f82196dc push modify 2021-11-12 18:15:28 +08:00
Gordon e88f41323f push modify 2021-11-12 17:59:37 +08:00
Gordon 8f483b498b push modify 2021-11-12 17:25:17 +08:00
Gordon 85a75be30e notification modify 2021-11-12 16:09:21 +08:00
Gordon 4b13874d44 new server version 2021-11-11 20:14:59 +08:00
Gordon ace77e6fd0 new server version 2021-11-11 20:13:45 +08:00
Gordon 46deb5a099 merge newest branch 2021-11-11 19:04:35 +08:00
Gordon 6158ea436d merge newest branch 2021-11-11 18:47:21 +08:00
Gordon 7accffd7cd shell update 2021-11-11 10:15:28 +08:00
Gordon f337b8d7cc sub moudule 2021-11-11 09:48:26 +08:00
Gordon aeaab0a8d9 make file 2021-11-10 20:20:15 +08:00
Gordon d81b95d5a6 make file 2021-11-10 20:05:40 +08:00
Gordon 34e8961601 shell update 2021-11-10 19:11:49 +08:00
Gordon b729cac998 add timer update redis minSeq 2021-11-10 18:13:04 +08:00
Gordon a08aeee0c2 main modify 2021-11-10 16:03:07 +08:00
Gordon 90a466ef01 merge all branch and change project structure 2021-11-10 15:31:18 +08:00
Gordon ad14e259ba Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	config/config.yaml
2021-11-10 15:30:10 +08:00
Gordon 8a92326241 merge all branch and change project structure 2021-11-10 15:24:59 +08:00
tzw 3e45d489b8 修正配置中的token过期时间单位 (#52)
Co-authored-by: tanzhongwu <tanzhongwu@mail.wjhudong.com>
2021-11-10 14:40:16 +08:00
binyan.li 04ad424efa fix :mysql index field is too long, resulting in table creation failure (#40) 2021-11-05 17:37:12 +08:00
Xan 7f2270844e feat:uid generator & rm incompatible gopkg (#34) 2021-11-05 16:37:17 +08:00
Gordon c97e39fc09 user change 2021-11-04 21:01:25 +08:00
Gordon 515d7bb318 config change 2021-11-04 18:07:39 +08:00
Gordon cdf928d64e push content modify 2021-11-04 17:27:12 +08:00
Gordon 2440575093 push content modify 2021-11-04 16:52:48 +08:00
Gordon 817d2b11a5 push modify 2021-11-04 10:19:33 +08:00
Gordon 4b4dce80cf push modify 2021-11-03 21:16:46 +08:00
Gordon 52e15fc9d4 push modify 2021-11-03 20:03:43 +08:00
Gordon 7dbaa1b8c1 compose commit 2021-11-03 17:54:31 +08:00
Gordon 4215d65aa7 compose commit 2021-11-03 17:51:53 +08:00
Gordon 62a6195a4f push log add 2021-11-03 16:10:24 +08:00
Gordon 51622e77d4 push log add 2021-11-03 15:59:08 +08:00
Gordon 2e14e0f767 jpush secret 2021-11-03 14:13:41 +08:00
Gordon b219f8542b push fix 2021-11-03 09:37:26 +08:00
Gordon 6d67bb9d65 docker-compose modify 2021-11-02 18:00:43 +08:00
Gordon af37abb394 docker-compose modify 2021-11-02 17:37:51 +08:00
Gordon dfd028625d fix secret check and management 2021-11-02 16:12:55 +08:00
Gordon a87c16de0d push fix 2021-11-02 12:00:24 +08:00
muistar e77a156f29 fix offline push bug (#33)
Co-authored-by: xin.he <xin.he@rokid.com>
2021-11-02 10:18:47 +08:00
Gordon 082de2b6b7 group message fix bug 2021-11-01 17:16:47 +08:00
Gordon 7f19f2f046 fix import friend panic 2021-11-01 16:14:39 +08:00
Gordon 0cc641d1f8 script 2021-10-29 21:00:59 +08:00
Yaxian 51cef0bc53 feat: test utils (#26) 2021-10-29 20:51:15 +08:00
Gordon d6168cbad9 Add files via upload
update script
2021-10-29 20:48:43 +08:00
skiffer-git 76f2ea01bf update config (#31)
* Update README.md

* Add files via upload

update config

* Add files via upload

update script

* update config

Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2021-10-29 15:08:43 +08:00
skiffer-git 37a8ddbae6 Update README.md (#30)
* Update README.md

* Add files via upload

update config

* Add files via upload

update script
2021-10-29 15:02:52 +08:00
Gordon 71873f7f0e docker-compose.yaml change 2021-10-29 14:14:27 +08:00
Gordon e124a26c52 docker-compose.yaml change 2021-10-29 12:00:10 +08:00
Gordon 09b501f7df msg split num change 2021-10-29 10:41:02 +08:00
Gordon a86980657c remove note 2021-10-29 09:53:39 +08:00
Gordon 579a6f7181 consumer consume async 2021-10-28 21:14:20 +08:00
Gordon a9d85c3957 test 2021-10-28 19:50:36 +08:00
Gordon ad8bf93677 add push 2021-10-28 18:02:20 +08:00
Gordon fe80b7da5c add push and fix name and faceurl 2021-10-28 15:56:36 +08:00
Gordon 30be5c2c48 add jpush offline notification 2021-10-28 09:51:36 +08:00
Gordon 97fa1146b2 test 2021-10-27 12:26:22 +08:00
Gordon 2ad8177e6b test msg 2021-10-26 20:39:22 +08:00
Gordon d39f61122b test msg 2021-10-26 19:52:43 +08:00
Gordon 66017df0b9 test msg 2021-10-26 19:19:52 +08:00
Gordon 6ec2993930 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	src/common/db/mongoModel.go
2021-10-26 16:33:44 +08:00
Gordon 94f515fa42 msg slice storage 2021-10-26 16:20:21 +08:00
Gordon 8d7897cd1e msg slice storage 2021-10-26 16:16:48 +08:00
wenxu12345 f92b7ea86b Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-10-26 16:03:18 +08:00
wenxu12345 8b981f2ec6 mongo index 2021-10-26 14:53:12 +08:00
Gordon 5782b85b02 msg modify 2021-10-26 14:18:11 +08:00
Gordon cb487e3e79 msg modify 2021-10-26 12:37:22 +08:00
wenxu12345 2234e4cbed Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-10-26 12:10:31 +08:00
wenxu12345 29f3fd46a8 exception handling 2021-10-26 12:03:16 +08:00
Gordon bd31d4ff9c shell modify 2021-10-26 12:02:07 +08:00
Gordon 4ce0c6be50 api change 2021-10-26 11:08:03 +08:00
Gordon c9f326c722 seq pull change 2021-10-26 10:59:59 +08:00
wenxu12345 2b9a3536e7 exception handling 2021-10-26 10:46:00 +08:00
root 90cde99f06 pb file 2021-10-26 10:29:02 +08:00
Gordon a55b288e4d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-10-26 10:22:09 +08:00
Gordon 723bac8afe pb file 2021-10-26 10:20:51 +08:00
root ddd4854fd5 pb file 2021-10-26 10:05:53 +08:00
Gordon 29e570e16d pb file 2021-10-26 10:03:33 +08:00
Gordon 50e344b9fb ws modify 2021-10-25 22:28:50 +08:00
Gordon fb5bed9cce log 2021-10-25 22:15:35 +08:00
root 55cfec827a pbfile 2021-10-25 22:01:04 +08:00
Gordon 738feab0d6 log 2021-10-25 21:59:59 +08:00
Gordon 10d350942c log 2021-10-25 21:44:18 +08:00
Gordon 7b96810d8f log 2021-10-25 21:13:49 +08:00
Gordon aa3b73044b log 2021-10-25 20:57:30 +08:00
Gordon 70b326ff07 pb file 2021-10-25 20:36:11 +08:00
Gordon 2fbe6102cd pb file 2021-10-25 20:24:26 +08:00
Gordon 219e97f3f6 pb file 2021-10-25 20:12:50 +08:00
Gordon aecfea4d83 pb path 2021-10-25 17:21:23 +08:00
Gordon 8c0a94c31c ws modify 2021-10-25 17:00:31 +08:00
antcorp 7c3aa7ee0b fix: Startup error (#11)
* fix: Startup error

Fixed a path error that prompted that the configuration file could not be found at startup

* Update config.go

Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2021-10-25 16:42:56 +08:00
Gordon 0e69f7953a ws modify 2021-10-25 16:39:06 +08:00
Gordon 299736b92a ws modify 2021-10-25 16:13:35 +08:00
Gordon 5dabd9bf4b ws modify 2021-10-25 16:03:14 +08:00
root d98253db43 pb file 2021-10-25 12:19:24 +08:00
Gordon 99792ae8d7 pb file 2021-10-25 12:09:57 +08:00
Away 65157ede23 Update jwt token version (#27)
* add sdk svr to docker script

* panic handle

* fix build from dockerfile on docker-compose

* Update deploy.Dockerfile

* log and scripts optimization

* ci: ignore files created by docker-compose (#19)

* feat: optimise get server ip (#20)

* feat: optimise get server ip

* feat: test ServerIP

* fix issue#15 (#18)

Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>

* Modify bug for getting lastest seq

* Reduce the MongoDB version to adapt to a few machine (#22)

* Feature/optimise jwt token (#24)

* Pr branch (#25)

* fix update jwt-token version to avoid attackers to bypass intended access restrictions in situations with []string{} for m["aud"]

* del accountAddr

* Create codeql-analysis.yml

* del unuse filed

* fix update jwt-token version to avoid attackers to bypass intended access restrictions in situations with []string{} for m["aud"]

Co-authored-by: Gordon <1432970085@qq.com>
Co-authored-by: Yaxian <yaxian.gu@gmail.com>
Co-authored-by: Zzr <bhg889@163.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: brennanli <brennanli@tencent.com>
2021-10-25 11:08:10 +08:00
Gordon 8777dd35df validate modify 2021-10-25 11:00:01 +08:00
Gordon 8ac9090171 send message modify and ws add binary pt 2021-10-25 10:00:52 +08:00
Zzr 8913ca161f Fix #21 (#23)
* fix issue#15

* fix #21

Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2021-10-23 14:18:55 +08:00
senyu 3d7fd2c192 del unuse filed 2021-10-23 10:51:57 +08:00
Away b2cc597755 Create codeql-analysis.yml 2021-10-23 09:21:05 +08:00
Away d6ba0a803d Pr branch (#25)
* fix update jwt-token version to avoid attackers to bypass intended access restrictions in situations with []string{} for m["aud"]

* del accountAddr
2021-10-22 21:20:31 +08:00
root 6ab6a49e15 pbfile 2021-10-22 21:08:44 +08:00
Gordon a0fec4afa0 pb file 2021-10-22 21:07:35 +08:00
root 9cd8aa5e7a pbfile 2021-10-22 20:52:55 +08:00
Gordon ff4e1a3c71 pb file 2021-10-22 20:49:42 +08:00
root 784ac4ecfc pbfile 2021-10-22 20:09:38 +08:00
Gordon d88ba3545b pb file 2021-10-22 20:02:29 +08:00
Yaxian 0e6432f95a Feature/optimise jwt token (#24) 2021-10-22 18:49:44 +08:00
Gordon 2e0cb09cdd pb file 2021-10-22 16:31:15 +08:00
Away 0dfaa49c97 Reduce the MongoDB version to adapt to a few machine (#22) 2021-10-22 10:14:32 +08:00
Gordon 098c7cfa9e change send message by ws and optimization 2021-10-21 19:10:55 +08:00
skiffer-git efeba3432c Merge pull request #12 from njulk/main
Modify bug for getting lastest seq
2021-10-21 17:11:37 +08:00
skiffer-git f16cd5b8db Merge pull request #9 from xmcy0011/dev
change project layout
2021-10-21 17:10:47 +08:00
Zzr 72b23ca235 fix issue#15 (#18)
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2021-10-21 12:10:38 +08:00
Yaxian c8155553b8 feat: optimise get server ip (#20)
* feat: optimise get server ip

* feat: test ServerIP
2021-10-21 11:30:48 +08:00
Yaxian 7caf5a0df9 ci: ignore files created by docker-compose (#19) 2021-10-20 23:03:55 +08:00
brennanli 1871b616ba Modify bug for getting lastest seq 2021-10-17 13:25:10 +08:00
xmcy0011 f21623e1b8 fixed submodule path 2021-10-11 22:52:06 +08:00
xmcy0011 a2e204667f Merge branch 'main' into v0926_project_layout
# Conflicts:
#	cmd/open_im_api/main.go
#	internal/rpc/auth/rpcAuth.go
#	internal/rpc/chat/rpcChat.go
#	src/common/log/logrus.go
2021-10-11 22:50:24 +08:00
xmcy0011 1ec9486452 fixed build error 2021-10-11 22:42:10 +08:00
xmcy0011 2b66aafdba change Open-IM-SDK-Core to cmd/ 2021-10-11 22:19:34 +08:00
xmcy0011 3169900f80 mv src/timed_task to internal/timed_task 2021-10-11 22:13:36 +08:00
xmcy0011 737edb985b mv src/common src/utils src/grpc-etcdv3 to pkg 2021-10-11 22:12:01 +08:00
xmcy0011 bc94d4e0b3 mv src/proto to pkg/proto 2021-10-11 22:00:38 +08:00
xmcy0011 585715adbf add cmd/rpc 2021-10-11 21:51:37 +08:00
xmcy0011 1a12eb9703 add cmd/open_im_push 2021-10-11 21:43:36 +08:00
xmcy0011 b4195bd81c add cmd/open_im_msg_transfer 2021-10-11 21:40:31 +08:00
xmcy0011 5fb4ea2aa3 add cmd/open_im_msg_gateway 2021-10-11 21:39:05 +08:00
xmcy0011 9367ad901d add cmd/open_im_api 2021-10-11 21:36:28 +08:00
Gordon 7d7818bc38 log and scripts optimization 2021-10-11 18:18:50 +08:00
Away a9bd657543 Update deploy.Dockerfile 2021-10-11 15:21:57 +08:00
xmcy0011 c956add8b0 add gitignore 2021-10-10 19:50:03 +08:00
Gordon bb47444c3b Merge remote-tracking branch 'origin/main' 2021-10-08 21:37:35 +08:00
Gordon d9b6510b2e panic handle 2021-10-08 21:37:22 +08:00
Away 4c9137c409 Merge pull request #7 from memory-qianxiao/docker-compose_update
fix build from dockerFile on docker-compose
2021-10-08 21:36:51 +08:00
Away 1182a2450b fix build from dockerfile on docker-compose 2021-10-08 21:34:44 +08:00
Gordon c48245fc9b add sdk svr to docker script 2021-10-08 17:50:09 +08:00
Gordon a1e9332606 update readme 2021-09-30 15:23:59 +08:00
Gordon bf944caff9 shell update 2021-09-29 11:56:19 +08:00
Gordon 54aaa9eca7 shell modify 2021-09-28 20:21:04 +08:00
Gordon e46552fecb submodule add 2021-09-28 20:09:52 +08:00
Gordon 4dd24c44de submodule 2021-09-28 20:05:06 +08:00
Gordon 3b98a4c6ee submodule remove 2021-09-28 20:00:54 +08:00
Gordon f87310e018 web svr update 2021-09-27 21:05:52 +08:00
Gordon e6419599c8 add open-im web svr 2021-09-27 21:03:36 +08:00
Gordon ab84a42f98 manager validate modify 2021-09-27 16:09:28 +08:00
Gordon 432a91cc64 Merge pull request #6 from Bloomingg/int
Update README.md
2021-09-26 19:39:55 +08:00
Bloomingg 629a322d1d Update README.md
test fork
2021-09-26 19:37:57 +08:00
Gordon b27fc2ba35 management system add api 2021-09-26 14:26:45 +08:00
Gordon 98ed0234fc Merge pull request #4 from wujingke/patch-1
Update README.md
2021-09-26 10:52:16 +08:00
Away f161f55ecb docker-compose check service of kafka in shell 2021-09-25 16:10:34 +08:00
Away 5a276064e0 docker-compose check service of kafka in shell 2021-09-25 16:08:13 +08:00
skiffer-git 9a677ab6d0 Update README.md 2021-09-24 09:07:35 +08:00
Gordon 66c1b19696 add management interface 2021-09-22 20:10:38 +08:00
skiffer-git 68eaa51ebe Update README.md 2021-09-22 17:48:45 +08:00
skiffer-git 9ffa8ca0ee Update README.md 2021-09-22 17:47:27 +08:00
skiffer-git cb3e9a16b9 Update README.md 2021-09-22 17:44:38 +08:00
wujingke 6c419e98e1 Update README.md 2021-09-21 15:00:11 +08:00
away 05cb390510 dockerfile update 2021-09-17 10:30:55 +08:00
Gordon 8c6997cc49 docker start shell script 2021-09-17 09:53:17 +08:00
away 3a2f4e3953 fix "host" network mode is incompatible with port bindings on CentOS 2021-09-15 20:21:21 +08:00
away 81bb5fe7ee Documentation update 2021-09-14 11:48:44 +08:00
away 3112eefbb3 image update 2021-09-14 11:45:43 +08:00
away 7a8efce8c2 docker-compose server check shell 2021-09-14 11:39:32 +08:00
away 4ea1c75ac1 update 2021-09-14 11:39:06 +08:00
Gordon 0d04955bdd shell update 2021-09-13 21:25:06 +08:00
Gordon 90e626c261 Merge remote-tracking branch 'origin/main' 2021-09-13 15:52:00 +08:00
Gordon 649bc5657e bug fix and shell optimization 2021-09-13 15:48:19 +08:00
away 9cc36ffebd delete unused code 2021-09-13 15:37:37 +08:00
away c1bcadd9ed shell start all service for linux and for docker 2021-09-13 15:29:11 +08:00
away 493916ce80 docker file update 2021-09-13 15:27:59 +08:00
away 82ed6249f2 image upload 2021-09-13 10:07:00 +08:00
away 018185f2b0 Documentation update 2021-09-13 10:04:03 +08:00
away f9505e6f11 rename deployment images 2021-09-13 09:59:53 +08:00
Away 8d5cddebfb Add files via upload
show  deployment image
2021-09-13 09:52:53 +08:00
away 9d300217a9 Documentation update 2021-09-13 09:47:30 +08:00
Away 7e7b904e1a docker-compose update 2021-09-11 23:33:26 +08:00
Away f1163d819c fix docker-compose.yaml address missing 2021-09-11 23:01:13 +08:00
Away b0482da557 docker-compose update 2021-09-11 21:00:18 +08:00
Away 73f41e5f07 dockerfile update 2021-09-11 20:58:09 +08:00
away 8b156dc962 Create group extension field 2021-09-06 17:48:14 +08:00
away 13038514df fix docker-compose run on CentOS error 2021-08-09 09:46:36 +08:00
away 4a2fe5c791 Merge remote-tracking branch 'origin/main' 2021-08-06 16:22:52 +08:00
away bab15d857c dockerfile multi-stage build update 2021-08-06 16:21:54 +08:00
away 5af768619f start shell update 2021-08-06 16:20:16 +08:00
Gordon 6117f2df15 Merge remote-tracking branch 'origin/main' 2021-08-06 14:58:49 +08:00
Gordon b36c041d35 message update 2021-08-06 14:56:41 +08:00
away bf9fe0bea5 del print 2021-08-05 17:16:09 +08:00
away fb43fa9b4f fix dockerfile loop start bug 2021-08-05 15:45:15 +08:00
away 616415c0fe Merge remote-tracking branch 'origin/main' 2021-08-05 11:25:56 +08:00
away ad39bec990 docker-compose update 2021-08-05 11:17:40 +08:00
away 906a1e0d62 Dockerfile multi-stage build 2021-08-05 11:17:13 +08:00
away 8d2427bd0f shell update 2021-08-05 11:15:24 +08:00
skiffer-git b53c3f120b Update README.md 2021-07-31 12:06:41 +08:00
skiffer-git 558296ee84 Add files via upload 2021-07-29 19:39:50 +08:00
Gordon bfc28cab8a Merge remote-tracking branch 'origin/main' 2021-07-22 10:18:29 +08:00
Gordon f6189a281e log test 2021-07-22 10:18:18 +08:00
skiffer-git 8039d30e09 Update README.md 2021-07-22 08:39:11 +08:00
Away 0cfec35f4b Update README.md
.
2021-07-15 17:35:14 +08:00
Away a37baceb4d Update README.md
.
2021-07-15 17:23:45 +08:00
away 226cee5e74 Documentation update 2021-07-15 17:19:50 +08:00
away 4a5295318e Documentation update 2021-07-15 17:13:53 +08:00
away 7f9e5dd381 docker-compose.yaml update 2021-07-15 16:34:21 +08:00
away 5b9f56ca32 docker-compose update 2021-07-15 15:13:14 +08:00
away 78fe3902f0 Merge remote-tracking branch 'origin/main' 2021-07-15 12:34:58 +08:00
Gordon 41f02e51f6 send msg change 2021-07-15 12:33:59 +08:00
away 4855aef0e4 docker-compose.yaml update 2021-07-15 12:33:24 +08:00
away 18d3523cf2 api services update 2021-07-15 11:23:20 +08:00
away 392b1c1d2b gomod update 2021-07-15 11:20:06 +08:00
away 0d9febc406 utils update 2021-07-15 11:18:31 +08:00
away 59522ea387 rpc services update 2021-07-15 11:16:24 +08:00
away 9db427de70 constant update 2021-07-15 11:14:46 +08:00
away 34a67e07b6 db model update 2021-07-15 11:14:07 +08:00
away 0cea353558 proto update 2021-07-15 11:10:31 +08:00
away 63da57fb90 grpc register etcd 2021-07-15 11:08:41 +08:00
away f893391200 docker-compose.yaml update 2021-07-15 11:02:54 +08:00
away 14228b503a script update 2021-07-15 11:00:07 +08:00
away 8b04929f3d script update 2021-07-15 10:57:47 +08:00
away 7772b9ff88 config upate 2021-07-15 10:48:01 +08:00
away 0a94bd6c97 del 2021-07-15 10:45:52 +08:00
skiffer-git 3bba6b006c Add files via upload 2021-07-12 11:03:52 +08:00
Gordon a3a7b5b803 kick proto modify 2021-07-09 18:07:06 +08:00
Gordon 14e500d62a kick proto modify 2021-07-09 18:06:24 +08:00
Gordon f2913c5c10 kafka producer modify 2021-07-08 11:56:39 +08:00
Gordon 205229ee60 persistent message modify 2021-07-06 20:04:57 +08:00
away e74e963b8a Annotation push on server 2021-07-05 17:21:13 +08:00
away 483e96fbe3 fix get group all member 2021-07-05 10:06:56 +08:00
away 2f21ff32c7 Merge remote-tracking branch 'origin/main' 2021-07-02 18:57:28 +08:00
away c3492a3a44 get the group all member 2021-07-02 18:56:39 +08:00
Gordon 6ea0555544 Merge remote-tracking branch 'origin/main' 2021-07-02 18:18:16 +08:00
Gordon af23a84f26 friend push modify 2021-07-02 18:13:31 +08:00
Gordon ba0ac9b604 Revert "friend modify"
This reverts commit b398ec98
2021-07-02 18:11:33 +08:00
Gordon b398ec98e1 好友修改 2021-07-02 18:10:45 +08:00
away 2cb48f3c32 Merge remote-tracking branch 'origin/main' 2021-07-02 14:50:11 +08:00
away 7805f12dc5 group owner 2021-07-02 14:49:06 +08:00
Gordon 509286698f message send module changes 2021-07-02 14:24:33 +08:00
away 0ac4dbfa34 nohup start 2021-06-30 12:09:12 +08:00
away 7a11281012 del redis config password 2021-06-29 14:18:16 +08:00
away 2c83e7980c config path update 2021-06-29 10:04:42 +08:00
away 473c956b1b msg update 2021-06-28 19:23:43 +08:00
away 9b4af25e26 msg update 2021-06-28 19:21:23 +08:00
away 36d1585609 Revert "update"
This reverts commit 185c2204
2021-06-28 16:25:42 +08:00
away 185c220429 update 2021-06-28 16:24:43 +08:00
away 94428bfc40 del 2021-06-28 16:22:15 +08:00
away 4c90036f2a del 2021-06-28 16:21:12 +08:00
away 2d41b0ff4f config update 2021-06-28 16:10:07 +08:00
away d0b669bbee add docker compose file 2021-06-28 15:43:00 +08:00
away 9f867b81cb add time task server 2021-06-28 15:42:25 +08:00
away 734a8a0fbd update user rpc server and push to friend 2021-06-28 15:39:13 +08:00
away b6c4948bf2 add group rpc server 2021-06-28 15:36:09 +08:00
away 9f001ee2e6 friend rpc server update 2021-06-28 15:35:41 +08:00
away 540484f83f send msg server update 2021-06-28 15:35:18 +08:00
away c12cafae32 msg server update 2021-06-28 15:34:08 +08:00
away 3f9c37043c update proto 2021-06-28 15:33:26 +08:00
away 1e4a1dffdd update db model 2021-06-28 15:32:26 +08:00
away 75d308de37 update 2021-06-28 15:31:36 +08:00
away ed52d40d8d error msg 2021-06-28 15:29:06 +08:00
away d01403e6fb update 2021-06-28 15:28:07 +08:00
away 24a44114c1 group api 2021-06-28 15:27:35 +08:00
away b699fd899a friend api 2021-06-28 15:27:20 +08:00
away ca0ee35d46 msg api 2021-06-28 15:26:59 +08:00
away a2c097ff0e update script 2021-06-28 15:22:37 +08:00
away e50ac3221a Merge remote-tracking branch 'origin/main' 2021-06-28 15:19:56 +08:00
away 744cc98690 Latest sql file 2021-06-28 15:19:43 +08:00
skiffer-git a341d53fe6 Add files via upload 2021-06-16 14:26:39 +08:00
skiffer-git d6e7ca9836 Add files via upload 2021-06-07 09:18:25 +08:00
skiffer-git cd714f32c8 Delete Wechat.jpg 2021-06-07 09:17:30 +08:00
skiffer-git 24f074ebe0 Add files via upload 2021-06-07 09:16:54 +08:00
skiffer-git b5a94ed8b0 Delete Wechat.jpg 2021-06-07 09:16:42 +08:00
skiffer-git 9be575b78f Add files via upload 2021-06-07 09:16:15 +08:00
skiffer-git 0ad9259c6f Update README.md 2021-05-31 10:48:58 +08:00
skiffer-git 59c03cbd1c Add files via upload 2021-05-31 10:47:28 +08:00
Gordon 91243e991b Merge remote-tracking branch 'origin/main' 2021-05-31 10:04:08 +08:00
Gordon fbb079fb8c Log add automatic cutting function 2021-05-31 10:03:57 +08:00
away 641d7c6cd4 Automatically created when there is no bin, logs folder 2021-05-31 10:00:28 +08:00
away 5f12c584a9 Delete empty folder 2021-05-31 10:00:15 +08:00
away 536f511b38 update websocketPort 2021-05-28 10:38:53 +08:00
away 0ef37bf082 Merge remote-tracking branch 'origin/main' 2021-05-28 10:36:22 +08:00
away 7dbb46e632 Update README.md 2021-05-28 10:36:11 +08:00
skiffer-git 500e6f6813 Update README.md 2021-05-27 21:05:22 +08:00
skiffer-git 6f4f53c52e Update README.md 2021-05-27 21:03:29 +08:00
skiffer-git d7d31e4b23 Update README.md 2021-05-27 21:01:11 +08:00
away bc0ef4f8fb Read the configuration file to initialize mysql 2021-05-27 20:34:27 +08:00
away 0d2753c3bd Merge remote-tracking branch 'origin/main' 2021-05-27 20:02:01 +08:00
away 1bf061a86e defer close etcd connection 2021-05-27 20:00:00 +08:00
wenxu12345 b1d4d3c850 Merge remote-tracking branch 'origin/main' 2021-05-27 19:38:57 +08:00
wenxu12345 476f499329 grpc-etcdv3 1.0.6 2021-05-27 19:38:39 +08:00
away 429ce146f0 Merge remote-tracking branch 'origin/main' 2021-05-27 19:19:26 +08:00
away 9e2319c8fd Check the friend relationship before agreeing to add a friend 2021-05-27 19:19:15 +08:00
away 2529312a1d friend relationship insert --->replace 2021-05-27 19:17:45 +08:00
away c5c8bef5f9 friend model insert --->replace relationship 2021-05-27 19:17:14 +08:00
wenxu12345 b10f016e8f ulimit -n 300000 open files 300000 2021-05-27 16:40:14 +08:00
wenxu12345 8822b00ed2 . 2021-05-27 16:22:35 +08:00
away c46f26f2ac mysql database init shell 2021-05-27 15:10:31 +08:00
away 4140d2c571 Merge remote-tracking branch 'origin/main' 2021-05-27 15:09:42 +08:00
away f179b2502c mysql sql file 2021-05-27 15:09:15 +08:00
Gordon fb7465c6e6 shell name replace 2021-05-27 12:08:09 +08:00
Gordon 0397a2d179 Merge remote-tracking branch 'origin/main' 2021-05-27 11:41:04 +08:00
Gordon 4ff8a75b3f system text format changes 2021-05-27 11:40:39 +08:00
skiffer-git 274b2e0420 Update README.md 2021-05-27 10:57:57 +08:00
skiffer-git da646fd2f1 Add files via upload 2021-05-27 10:57:07 +08:00
hailong 63809e5dd7 Update README.md 2021-05-27 09:30:10 +08:00
Away 3b365a830e Update README.md
update readme.md
2021-05-26 20:57:01 +08:00
away d419983a36 update readme.md 2021-05-26 20:50:33 +08:00
away 0f3098d9e0 Default ip 2021-05-26 20:25:18 +08:00
away 6ff04a0748 Merge remote-tracking branch 'origin/main' 2021-05-26 20:21:43 +08:00
away aca07fae8a Default ip 2021-05-26 20:21:33 +08:00
skiffer-git d769c5911d Update README.md 2021-05-26 20:18:03 +08:00
skiffer-git 4b57d19995 Update README.md 2021-05-26 20:12:45 +08:00
skiffer-git 7d0ae69ebb Update README.md 2021-05-26 20:12:09 +08:00
away 4571685fd7 jwt-token dependent package 2021-05-26 20:11:19 +08:00
away a43996567f go mod update 2021-05-26 20:10:27 +08:00
Gordon 32d5e1515c Merge remote-tracking branch 'origin/main' 2021-05-26 20:07:09 +08:00
Gordon 1f02e753f1 bin and logs 2021-05-26 20:06:58 +08:00
away b0a0896c2e group proto initial commit 2021-05-26 20:06:02 +08:00
away 381475e883 Merge remote-tracking branch 'origin/main' 2021-05-26 20:03:00 +08:00
Gordon 5b0c2c8759 msg model 2021-05-26 20:00:55 +08:00
Gordon 574ed54d6b proto file 2021-05-26 19:58:57 +08:00
away e93e4f5e52 move Place 2021-05-26 19:57:47 +08:00
Gordon 9bea8eac77 Merge remote-tracking branch 'origin/main' 2021-05-26 19:57:17 +08:00
hailong 8ccc3ed967 Merge remote-tracking branch 'origin/main' 2021-05-26 19:53:03 +08:00
skiffer-git 2f7d0c656e Update README.md 2021-05-26 19:52:17 +08:00
Gordon c13cf968ef Merge remote-tracking branch 'origin/main' 2021-05-26 19:46:48 +08:00
away cf82b4fc6f user proto initial commit 2021-05-26 19:44:49 +08:00
away 647e35d97f friend proto initial commit 2021-05-26 19:44:38 +08:00
Gordon bb115b29fd Log and kafka module 2021-05-26 19:43:18 +08:00
away e84521e173 dockerfile initial commit 2021-05-26 19:42:58 +08:00
away b8fd1e7403 go mod initial commit 2021-05-26 19:42:43 +08:00
hailong 26ea2cdc3d rpc chat 2021-05-26 19:40:38 +08:00
away b959f4a3fc Merge remote-tracking branch 'origin/main' 2021-05-26 19:40:28 +08:00
away 5eba5e8c9b Internal user rpc service initial commit 2021-05-26 19:39:31 +08:00
Gordon 6c2beab9e5 Merge remote-tracking branch 'origin/main' 2021-05-26 19:38:57 +08:00
away 2c3d0ae0e8 user rpc service initial commit 2021-05-26 19:38:34 +08:00
away 62d5714093 friend rpc service initial commit 2021-05-26 19:37:45 +08:00
skiffer-git fabc7ed524 Update README.md 2021-05-26 19:37:19 +08:00
Gordon 2e61678413 Log and kafka module 2021-05-26 19:37:10 +08:00
skiffer-git ff0e398a55 Update README.md 2021-05-26 19:36:31 +08:00
away f1e3912edd utils initial commit 2021-05-26 19:35:56 +08:00
away 4e621ebc69 multi_terminal_login initial commit 2021-05-26 19:35:34 +08:00
away d8a5b7e368 Merge remote-tracking branch 'origin/main' 2021-05-26 19:35:02 +08:00
hailong a4334bd246 Update README.md 2021-05-26 19:33:53 +08:00
away 772ecc7ab5 mysql model initial commit 2021-05-26 19:32:30 +08:00
hailong 940d8dff02 Update README.md 2021-05-26 19:31:43 +08:00
away 0d54547dd3 Merge remote-tracking branch 'origin/main' 2021-05-26 19:30:47 +08:00
hailong b87900b070 Merge remote-tracking branch 'origin/main' 2021-05-26 19:29:44 +08:00
away 7f70cf6c31 Shell script initial commit 2021-05-26 19:27:41 +08:00
skiffer-git 4f873d7c43 Update README.md 2021-05-26 19:27:09 +08:00
Gordon 943f981183 Merge remote-tracking branch 'origin/main' 2021-05-26 19:25:04 +08:00
Gordon f686fbb4ee msg_gateway and msg_transfer modules 2021-05-26 19:24:25 +08:00
hailong 70f50115fe push auth 2021-05-26 19:24:06 +08:00
away e654e765f6 user api service initial commit 2021-05-26 19:23:48 +08:00
away 86bcee514e Merge remote-tracking branch 'origin/main' 2021-05-26 19:22:49 +08:00
hailong a7bedf1f79 push server 2021-05-26 19:22:11 +08:00
away d7d2200a41 Merge remote-tracking branch 'origin/main' 2021-05-26 19:21:40 +08:00
away 064c5a8940 friend api service initial commit 2021-05-26 19:20:47 +08:00
hailong dbf2e56f37 AUTH AND CHAT PB 2021-05-26 19:19:41 +08:00
away f2bbd4b924 Merge remote-tracking branch 'origin/main' 2021-05-26 19:18:05 +08:00
hailong c96498e531 add db and config 2021-05-26 19:17:51 +08:00
hailong dc698ec6a8 add api 2021-05-26 19:15:25 +08:00
away 7c695e4431 Merge remote-tracking branch 'origin/main' 2021-05-26 19:14:40 +08:00
Gordon b26bd4a707 Merge remote-tracking branch 'origin/main' 2021-05-26 19:12:18 +08:00
away fafae81896 Merge remote-tracking branch 'origin/main' 2021-05-26 19:09:03 +08:00
hailong 8a5f51f50b Merge remote-tracking branch 'origin/main' 2021-05-26 19:03:56 +08:00
skiffer-git ef1feab5b5 Update README.md 2021-05-26 19:01:22 +08:00
skiffer-git 728337b63e Add files via upload 2021-05-26 19:00:59 +08:00
Gordon d5d4983198 Merge remote-tracking branch 'origin/main' 2021-05-26 18:59:50 +08:00
away 7d0e87274d Merge remote-tracking branch 'origin/main' 2021-05-26 18:59:29 +08:00
Away ad21b6ce4a Update README.md
.
2021-05-26 18:58:45 +08:00
Gordon 19ff006829 Startup script and path information 2021-05-26 18:58:28 +08:00
hailong ae882a3a8f add png 2021-05-26 18:57:31 +08:00
skiffer-git 825134a3fb Update README.md 2021-05-26 18:57:24 +08:00
skiffer-git 534ba448b4 Update README.md 2021-05-26 18:51:20 +08:00
skiffer-git 963902373b Create README.md 2021-05-26 18:50:53 +08:00
skiffer-git f3203c7ecf Add files via upload 2021-05-26 18:49:50 +08:00
skiffer-git 2d5932262d Create LICENSE 2021-05-26 18:48:36 +08:00
away 5b59f213a3 Initial commit 2021-05-26 18:47:52 +08:00
skiffer-git 04b3e30b8e Add files via upload 2021-05-26 18:43:09 +08:00
664 changed files with 48824 additions and 32114 deletions
-14
View File
@@ -1,17 +1,3 @@
# 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.
#---------------Infrastructure configuration---------------------#
etcd:
etcdSchema: openim #默认即可
@@ -1,17 +1,3 @@
# 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.
#more datasource-compose.yaml
apiVersion: 1
+2 -2
View File
@@ -306,7 +306,7 @@ content_security_policy = false
# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
# $NONCE in the template includes a random nonce.
# $ROOT_PATH is server.root_url without the protocol.
content_security_policy_template = """scripts-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
# Controls if old angular plugins are supported or not. This will be disabled by default in future release
angular_support_enabled = true
@@ -633,7 +633,7 @@ active_sync_enabled = true
#################################### AWS ###########################
[aws]
# Enter a comma-separated list of allowed AWS authentication providers.
# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 OpenIM Role)
# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
allowed_auth_providers = default,keys,credentials
# Allow AWS users to assume a role using temporary security credentials.
@@ -1,17 +1,3 @@
# 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.
#more prometheus-compose.yml
global:
scrape_interval: 15s
-31
View File
@@ -1,31 +0,0 @@
# Ignore files and directories starting with a dot
# Ignore specific files
.dockerignore
# Ignore build artifacts
_output/
logs/
# Ignore non-essential documentation
README.md
README-zh_CN.md
CONTRIBUTING.md
CHANGELOG/
# LICENSE
# Ignore testing and linting configuration
scripts/golangci.yml
# Ignore deployment-related files
docker-compose.yaml
deployments/
# Ignore assets
assets/
# Ignore components
components/
# Ignore tools and scripts
.github/
+1 -2
View File
@@ -1,5 +1,4 @@
USER=root
PASSWORD=openIM123
MINIO_ENDPOINT=http://127.0.0.1:10005
API_URL=http://127.0.0.1:10002/object/
DATA_DIR=./
DATA_DIR=./
-23
View File
@@ -1,23 +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.
coverage:
status:
project:
default: false # disable the default status that measures entire project
pkg: # declare a new status context "pkg"
paths:
- pkg/* # only include coverage in "pkg/" folder
informational: true # Always pass check
patch: off # disable the commit only checks
+37
View File
@@ -0,0 +1,37 @@
---
name: "\U0001F41E Bug"
about: File a bug/issue
title: "[BUG] <title>"
labels: ''
assignees: ''
---
<!--
Note: Please search to see if an issue already exists for the bug you encountered.
-->
### Environment:
<!-- linux? windows? or Mac?
Example:
- OS: Ubuntu 20.04 -->
### Physical Memory Capacity:
<!-- 8G or above is better -->
### Docker Image:
<!-- Did you pull the docker image before execute docker images -->
### Code Version:
<!-- Did you pull code from github? Make sure the code is up to date-->
### Component installation:
<!-- Has etcd, mysql, mongodb, redis or Kafka been installed on the server before Open-IM-Server deployment-->
### Log File:
<!-- view log file(logs/openIM.log) content. -->
### screenshot:
<!---->
@@ -0,0 +1,36 @@
---
name: Deployment issues
about: Deployment issues
title: ''
labels: ''
assignees: ''
---
If you are deploying OpenIM for the first time
```
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
```
screenshot here
```
cd Open-IM-Server/script ; chmod +x *.sh ; ./env_check.sh
```
screenshot here
```
cd .. ; docker-compose up -d
```
screenshot here
```
cd script ; ./docker_check_service.sh
```
screenshot here
+38
View File
@@ -0,0 +1,38 @@
---
name: 'update '
about: update docker image
title: update docker image
labels: ''
assignees: ''
---
```
cd Open-IM-Server ; docker-compose down
```
screenshot here
```
git pull
```
screenshot here
```
docker-compose pull
```
screenshot here
```
chmod +x script/*.sh ; docker-compose up -d
```
screenshot here
```
cd script ; ./docker_check_service.sh
```
screenshot here
-59
View File
@@ -1,59 +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.
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
time: "08:00"
labels:
- "dependencies"
commit-message:
prefix: "feat"
include: "scope"
groups:
gomod-deps:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
time: "08:00"
labels:
- "dependencies"
commit-message:
prefix: "chore"
include: "scope"
groups:
github-actions:
patterns:
- "*"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "daily"
time: "08:00"
labels:
- "dependencies"
commit-message:
prefix: "feat"
include: "scope"
-43
View File
@@ -1,43 +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.
# Refer to Kubernetes for size/* Settings
# https://github.com/Kubernetes/Kubernetes
XS:
name: size/XS
lines: 0
color: 3CBF00
S:
name: size/S
lines: 10
color: 5D9801
M:
name: size/M
lines: 30
color: 7F7203
L:
name: size/L
lines: 100
color: A14C05
XL:
name: size/XL
lines: 500
color: C32607
XXL:
name: size/XXL
lines: 1000
color: E50009
comment: |
# Whoa! Easy there, Partner!
This PR is too big. Please break it up into smaller PRs.
-119
View File
@@ -1,119 +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.
# https://github.com/BetaHuhn/repo-file-sync-action
# Synchronization for the.github repository
OpenIMSDK/.github:
- source: LICENSE
dest: LICENSE
- source: scripts/LICENSE/
dest: scripts/LICENSE/
replace: false
OpenIMSDK/community:
- source: LICENSE
dest: LICENSE
- source: scripts/LICENSE/
dest: scripts/LICENSE/
replace: false
- source: .github/workflows/
dest: .github/workflows/
OpenIMSDK/openim-sdk-core:
- source: LICENSE
dest: LICENSE
- source: scripts/LICENSE/
dest: scripts/LICENSE/
replace: false
- source: .github/workflows/issue-robot.yml
dest: .github/workflows/issue-robot.yml
replace: false
- source: .github/workflows/stale.yml
dest: .github/workflows/stale.yml
replace: false
- source: .github/.codecov.yml
dest: .github/.codecov.yml
replace: false
OpenIMSDK/OpenIM-Docs:
- source: .github/workflows/
dest: .github/workflows/
exclude: |
e2e-test.yml
sync.yml
- source: scripts/githooks/
dest: scripts/githooks/
replace: true
- source: .github/.codecov.yml
dest: .github/.codecov.yml
replace: false
OpenIMSDK/OpenKF:
- source: LICENSE
dest: LICENSE
- source: scripts/LICENSE/
dest: scripts/LICENSE/
replace: false
- source: .github/workflows/issue-robot.yml
dest: .github/workflows/issue-robot.yml
replace: false
- source: .github/workflows/stale.yml
dest: .github/workflows/stale.yml
replace: false
- source: .github/.codecov.yml
dest: .github/.codecov.yml
replace: false
group:
# first groupcommon to all warehouses
# TODO: add the required warehouse here
- repos: |
OpenIMSDK/OpenKF@main
OpenIMSDK/openim-miniprogram-demo@main
OpenIMSDK/docs
OpenIMSDK/chat
OpenIMSDK/community
OpenIMSDK/openim-charts
OpenIMSDK/openim-sdk-cpp@main
files:
- source: LICENSE
dest: LICENSE
replace: false
- source: .github/workflows/issue-robot.yml
dest: .github/workflows/issue-robot.yml
replace: false
- source: .github/workflows/stale.yml
dest: .github/workflows/stale.yml
replace: false
- source: .github/workflows/project-progress.yml
dest: .github/workflows/project-progress.yml
replace: false
- source: .github/workflows/help-comment-issue.yml
dest: .github/workflows/help-comment-issue.yml
replace: false
- source: .github/.codecov.yml
dest: .github/.codecov.yml
replace: false
- source: .github/workflows/cla.yml
dest: .github/workflows/cla.yml
replace: false
- source: .github/workflows/auto-assign-issue.yml
dest: .github/workflows/auto-assign-issue.yml
replace: false
- source: .github/workflows/release.yml
dest: .github/workflows/release.yml
replace: false
- source: ./scripts/githooks/
dest: ./scripts/githooks/
replace: true
-21
View File
@@ -1,21 +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.
# https://github.com/apps/weekly-digest/installations/new
publishDay: sun
canPublishIssues: true
canPublishPullRequests: true
canPublishContributors: true
canPublishStargazers: true
canPublishCommits: true
-43
View File
@@ -1,43 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Assign issue to comment author
on:
issue_comment:
types: [created]
jobs:
assign-issue:
if: |
contains(github.event.comment.body, '/assign') || contains(github.event.comment.body, '/accept') &&
!contains(github.event.comment.user.login, 'openimbot') &&
!contains(github.event.comment.user.login, 'kubbot')
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Assign the issue
run: |
export LETASE_MILESTONES=$(curl 'https://api.github.com/repos/$OWNER/$PEPO/milestones' | jq -r 'last(.[]).title')
gh issue edit ${{ github.event.issue.number }} --add-assignee "${{ github.event.comment.user.login }}"
gh issue edit ${{ github.event.issue.number }} --add-label "triage/accepted"
gh issue edit ${{ github.event.issue.number }} --milestone "$LETASE_MILESTONES"
gh issue comment $ISSUE --body "@${{ github.event.comment.user.login }} Glad to see you accepted this issue🤲, this issue has been assigned to you. I set the milestones for this issue to [$LETASE_MILESTONES](https://github.com/$OWNER/$PEPO/milestones), We are looking forward to your PR!"
env:
GH_TOKEN: ${{ secrets.REDBOT_GITHUB_TOKEN }}
ISSUE: ${{ github.event.issue.html_url }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
-60
View File
@@ -1,60 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Auto PR to release
on:
pull_request:
# types:
# - closed
issue_comment:
types: [created]
pull_request_review_comment:
types: [created]
jobs:
create-pr:
runs-on: ubuntu-latest
if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.merged == true
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Create PR to release branch
run: |
ISSUEID=$(gh pr view ${{ github.event.pull_request.number }} --repo $OWNER/$REPO | grep -oP 'Fixes #\K\d+')
echo "===========> $ISSUEID"
ISSUE=$(gh issue view $ISSUEID --repo $OWNER/$REPO --json labels,assignees,milestone,title)
echo "===========> $ISSUE"
LABELS=$(echo $ISSUE | jq -r '.labels[] | select(.name) | .name' | jq -R -r -s -c 'split("\n")[:-1] | join(",")')
ASSIGNEES=$(echo $ISSUE | jq -r '.assignees[] | select(.login) | .login' | jq -R -s -c 'split("\n")[:-1] | join(",")')
MILESTONE=$(echo $ISSUE | jq -r '.milestone | select(.title) | .title')
TITLE=$(echo $ISSUE | jq -r '.title')
gh pr edit ${{ github.event.pull_request.number }} --repo $OWNER/$REPO --add-label "$LABELS" --add-assignee "$ASSIGNEES" --milestone "$MILESTONE"
# git checkout -b bot/merge-to-release-$ISSUEID
# git push origin bot/merge-to-release-$ISSUEID
# gh pr create --base release --head bot/merge-to-release-$ISSUEID --title "Merge main to release" --body ""
# gh pr create --base main --head feat/auto-release-pr-624 --title "The bug is fixed" --body "$x" --repo OpenIMSDK/Open-IM-Server --reviewer "cubxxw"
continue-on-error: true
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
GH_TOKEN: ${{ github.token }}
ISSUE: ${{ github.event.issue.html_url }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
-53
View File
@@ -1,53 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Invite users to join our group
on:
issue_comment:
types:
- created
jobs:
issue_comment:
name: Invite users to join our group
if: ${{ github.event.comment.body == '/invite' || github.event.comment.body == '/close' || github.event.comment.body == '/comment' }}
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Invite user to join our group
uses: peter-evans/create-or-update-comment@v3
with:
token: ${{ secrets.BOT_GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
We value close connections with our users, developers, and contributors here at Open-IM-Server. With a large community and maintainer team, we're always here to help and support you. Whether you're looking to join our community or have any questions or suggestions, we welcome you to get in touch with us.
Our most recommended way to get in touch is through [Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg). Even if you're in China, Slack is usually not blocked by firewalls, making it an easy way to connect with us. Our Slack community is the ideal place to discuss and share ideas and suggestions with other users and developers of Open-IM-Server. You can ask technical questions, seek help, or share your experiences with other users of Open-IM-Server.
In addition to Slack, we also offer the following ways to get in touch:
+ <a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg" target="_blank"><img src="https://img.shields.io/badge/Slack-OpenIM%2B-blueviolet?logo=slack&amp;logoColor=white"></a> We also have Slack channels for you to communicate and discuss. To join, visit https://slack.com/ and join our [👀 Open-IM-Server slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) team channel.
+ <a href="https://mail.google.com/mail/u/0/?fs=1&tf=cm&to=winxu81@gmail.com" target="_blank"><img src="https://img.shields.io/badge/gmail-%40OOpenIMSDKCore?style=social&logo=gmail"></a> Get in touch with us on [Gmail](https://mail.google.com/mail/u/0/?fs=1&tf=cm&to=winxu81@gmail.com). If you have any questions or issues that need resolving, or any suggestions and feedback for our open source projects, please feel free to contact us via email.
+ <a href="https://doc.rentsoft.cn/" target="_blank"><img src="https://img.shields.io/badge/%E5%8D%9A%E5%AE%A2-%40OpenIMSDKCore-blue?style=social&logo=Octopus%20Deploy"></a> Read our [blog](https://doc.rentsoft.cn/). Our blog is a great place to stay up-to-date with Open-IM-Server projects and trends. On the blog, we share our latest developments, tech trends, and other interesting information.
+ <a href="https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg" target="_blank"><img src="https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-OpenIMSDKCore-brightgreen?logo=wechat&style=flat-square"></a> Add [Wechat](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg) and indicate that you are a user or developer of Open-IM-Server. We will process your request as soon as possible.
- name: Close Issue
uses: peter-evans/close-issue@v3
with:
token: ${{ secrets.BOT_GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
comment: 🤖 Auto-closing issue, if you still need help please reopen the issue or ask for help in the community above
labels: |
triage/accepted
-52
View File
@@ -1,52 +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.
name: Create Tag
on:
issue_comment:
types: [created]
pull_request_review_comment:
types: [created]
jobs:
create_tag:
runs-on: ubuntu-latest
if: startsWith(github.event.comment.body, '/create tag')
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Validate version number and get comment
id: validate
run: |
COMMENT="${{ github.event.comment.body }}"
VERSION=$(echo $COMMENT | cut -d ' ' -f 3)
TAG_COMMENT=$(echo $COMMENT | cut -d '"' -f 2)
if [[ $VERSION =~ ^v([0-9]+\.){2}[0-9]+$ ]]; then
echo "version=$VERSION" >> $GITHUB_STATE
echo "tag_comment=$TAG_COMMENT" >> $GITHUB_STATE
else
echo "Invalid version number."
exit 1
fi
- name: Create a new tag
env:
GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
run: |
source $GITHUB_STATE
git tag -a $VERSION -m "$tag_comment"
git push origin $VERSION
echo "tag_created=$VERSION" >> $GITHUB_OUTPUT
@@ -1,67 +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.
name: 'Github Rebot for Cherry Pick when PR is merged'
on:
pull_request_target:
types:
- closed
jobs:
comment:
runs-on: ubuntu-latest
steps:
- name: Comment cherry-pick command
uses: actions/github-script@v6
with:
script: |
const pr = context.payload.pull_request;
if (!pr.merged) {
console.log("PR is not merged. Skipping...");
return;
}
if (!pr.milestone || !pr.milestone.title) {
console.log("Milestone is not set. Skipping...");
return;
}
const milestone = pr.milestone.title;
const ref = `heads/release-${milestone}`;
let branchExists;
try {
await github.rest.git.getRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: ref
});
branchExists = true;
} catch (error) {
if (error.status === 404) {
console.log(`Branch ${ref} does not exist. Skipping...`);
branchExists = false;
} else {
throw error; // Rethrow if it's another error
}
}
if (!branchExists) {
return;
}
const cherryPickCmd = `/cherry-pick release-${milestone}`;
console.log(`Adding comment: ${cherryPickCmd}`);
await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pr.number,
body: cherryPickCmd
});
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
-33
View File
@@ -1,33 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Github Rebot for Cherry Pick On Comment
on:
issue_comment:
types: [created]
jobs:
cherry-pick:
name: Cherry Pick
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/cherry-pick') && github.event.comment.user.login=='kubbot'
runs-on: ubuntu-latest
steps:
- name: Checkout the latest code
uses: actions/checkout@v3
with:
token: ${{ secrets.BOT_GITHUB_TOKEN }}
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
- name: Automatic Cherry Pick
uses: vendoo/gha-cherry-pick@v1
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
-137
View File
@@ -1,137 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Publish Docker image
on:
push:
branches:
- main
- release-*
tags:
- v*
workflow_dispatch:
env:
# Common versions
GO_VERSION: "1.20"
jobs:
build-dockerhub:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
# docker.io/openim/openim-server:latest
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4.6.0
with:
images: openim/openim-server
# generate Docker tags based on the following events/attributes
tags: |
type=schedule
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
# linux/ppc64le,linux/s390x
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-aliyun:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
- name: Extract metadata (tags, labels) for Docker
id: meta2
uses: docker/metadata-action@v4.6.0
with:
images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
- name: Log in to AliYun Docker Hub
uses: docker/login-action@v2
with:
registry: registry.cn-hangzhou.aliyuncs.com
username: ${{ secrets.ALIREGISTRY_USERNAME }}
password: ${{ secrets.ALIREGISTRY_TOKEN }}
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
# linux/ppc64le,linux/s390x
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta2.outputs.tags }}
labels: ${{ steps.meta2.outputs.labels }}
build-ghcr:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
# ghcr.io/openimsdk/openim-server:latest
- name: Extract metadata (tags, labels) for Docker
id: meta3
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-server
- name: Log in to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
# linux/ppc64le,linux/s390x
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta3.outputs.tags }}
labels: ${{ steps.meta3.outputs.labels }}
-59
View File
@@ -1,59 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Check-Coverage
on:
workflow_dispatch:
push:
branches: [ "main" ]
paths-ignore:
- "docs/**"
- "**/*.md"
- "**/*.yaml"
- "CONTRIBUTORS"
- "CHANGELOG/**"
pull_request:
branches: [ "*" ]
paths-ignore:
- "docs/**"
- "**/*.md"
- "**/*.yaml"
- "CONTRIBUTORS"
- "CHANGELOG/**"
env:
# Common versions
GO_VERSION: "1.20"
jobs:
coverage:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Golang with cache
uses: magnetikonline/action-golang-cache@v4
with:
go-version: ${{ env.GO_VERSION }}
- name: Install Dependencies
run: sudo apt update && sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
- name: Run Cover
run: make cover
continue-on-error: true
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v3
-62
View File
@@ -1,62 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: "OpenIM CLA Assistant"
on:
issue_comment:
types: [created]
pull_request_target:
types: [opened,closed,synchronize]
# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
permissions:
actions: write
contents: write
pull-requests: write
statuses: write
env:
# Define Open-IM-Server variables here
OPEN_IM_SERVER_REMOTE_ORGANIZATION: openim-sigs
REMOTE_REPOSITORY: cla
OPEN_IM_SERVER_CLA_DOCUMENT: https://github.com/openim-sigs/cla/blob/main/README.md
OPEN_IM_SERVER_SIGNATURES_PATH: signatures/${{ github.event.repository.name }}/cla.json
OPEN_IM_SERVER_ALLOWLIST: kubbot,bot*
jobs:
CLAAssistant:
runs-on: ubuntu-latest
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: contributor-assistant/github-action@v2.3.0
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN: ${{ secrets.REDBOT_GITHUB_TOKEN }}
with:
path-to-signatures: ${{ env.OPEN_IM_SERVER_SIGNATURES_PATH }}
path-to-document: ${{ env.OPEN_IM_SERVER_CLA_DOCUMENT }}
branch: 'main'
allowlist: ${{ env.OPEN_IM_SERVER_ALLOWLIST }}
remote-organization-name: ${{ env.OPEN_IM_SERVER_REMOTE_ORGANIZATION }}
remote-repository-name: ${{ env.REMOTE_REPOSITORY }}
create-file-commit-message: '📚 Docs: Creating file for storing ${{ github.event.repository.name }} CLA Signatures'
custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our [🎯https://github.com/openim-sigs/cla/blob/main/README.md](https://github.com/openim-sigs/cla/blob/main/README.md). <br> If you wish to sign the CRA, **Please copy and comment on the following sentence:**'
custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
custom-allsigned-prcomment: '🤖 All Contributors have signed the [${{ github.event.repository.name }} CLA](https://github.com/openim-sigs/cla/blob/main/README.md).<br> The signed information is recorded [🤖here](https://github.com/openim-sigs/cla/tree/main/signatures/${{ github.event.repository.name }}/cla.json)'
# lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
# use-dco-flag: true - If you are using DCO instead of CLA
+49 -54
View File
@@ -1,76 +1,71 @@
# Copyright © 2023 OpenIM open source community. All rights reserved.
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# 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
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# http://www.apache.org/licenses/LICENSE-2.0
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
# 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.
name: "OpenIM Code Scanning - Action"
name: "CodeQL"
on:
push:
branches: [main]
branches: [ main ]
pull_request:
branches: [main]
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)
# │ │ ┌───────────── day of the month (1 - 31)
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
# │ │ │ │ │
# │ │ │ │ │
# │ │ │ │ │
# * * * * *
- cron: '30 1 * * 0'
- cron: '23 2 * * 2'
jobs:
CodeQL-Build:
# CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
# required for all workflows
actions: read
contents: read
security-events: write
# only required for workflows in private repositories
actions: write
contents: write
strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
# Override language selection by uncommenting this and choosing your languages
with:
languages: go
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below).
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following
# three lines and modify them (or add more) to build your code if your
# project uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# - run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
@@ -1,76 +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.
name: Create Branch on Tag
on:
push:
tags:
- 'v*.*.0'
jobs:
create-branch:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Git
run: |
git config --global user.name 'kubbot'
git config --global user.email '3293172751yxy@gmail.com'
- name: Install git-chglog
run: make install.git-chglog
- name: Create Branch
run: |
TAG_NAME=${GITHUB_REF/refs\/tags\//}
IFS='.' read -ra VERSION_PARTS <<< "$TAG_NAME"
if [[ "${VERSION_PARTS[2]}" = "0" ]]; then
BRANCH_NAME="release-v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
echo "Creating branch $BRANCH_NAME"
git checkout -b "$BRANCH_NAME"
git push origin "$BRANCH_NAME"
fi
- name: Push Changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Auto Commit CHANGELOG"
branch: release-v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
- name: Create and Push CHANGELOG
run: |
git checkout main
TAG_NAME=${GITHUB_REF/refs\/tags\//}
IFS='.' read -ra VERSION_PARTS <<< "$TAG_NAME"
if [[ "${VERSION_PARTS[2]}" = "0" ]]; then
cd CHANGELOG
git-chglog --tag-filter-pattern "v${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.*" -o "CHANGELOG-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.md"
git add "CHANGELOG-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.md"
git commit -m "Update CHANGELOG for $TAG_NAME"
fi
- name: Push Changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Auto Commit CHANGELOG"
branch: main
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
-73
View File
@@ -1,73 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: OpenIM Deploy for dev
on:
push:
branches:
- 'devops' # Only for the dev branch
- 'main'
paths:
- '.github/workflows/*'
# - '__test__/**' # dev No immediate testing is required
- 'src/**'
- 'Dockerfile'
- 'docker-compose.yml'
- 'bin/*'
jobs:
deploy-dev:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: executing remote ssh commands using password
uses: appleboy/ssh-action@v1.0.0
env:
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
with:
host: "${{ secrets.SG_M1_HOST }}, ${{ secrets.SG_N1_HOST }}, ${{ secrets.SG_N2_HOST}}"
username: ${{ secrets.SG_USERNAME }}
password: ${{ secrets.SG_PASSWORD }}
port: ${{ secrets.SG_PORT }}
envs: OWNER,REPO
script_stop: true
script: |
mkdir -p /test/openim
cd /test/openim
pwd;ls -al
echo "OWNER: $OWNER"
echo "REPO: $REPO"
git clone -b develop https://github.com/${OWNER}/${REPO}.git; cd ${REPO}
docker compose up -d
# - name: deploy # Deployment
# run: |
# ssh work@182.92.xxx.xxx "
# # 【Attention】Log in with the 'work' account, manually create /home/work/imooc-lego directory
# # Then git clone https://username:password@github.com/imooc-lego/biz-editor-server.git -b dev (private repository, use GitHub username and password)
# # Remember to delete origin to avoid exposing GitHub password
# cd /home/work/imooc-lego/biz-editor-server;
# git remote add origin https://openimbot:${{secrets.WFP_PASSWORD}}@github.com/OpenIMSDK/open-im-server.git;
# git checkout dev;
# git pull origin dev; # Download the latest code again
# git remote remove origin; # Remove origin to avoid exposing GitHub password
# # Start docker
# docker-compose build editor-server; # Same as the service name in docker-compose.yml
# docker-compose up -d;
# "
# - name: delete ssh key # Delete ssh key
# run: rm -rf ~/.ssh/id_rsa
-18
View File
@@ -1,18 +0,0 @@
# Copyright © 2023 KubeCub open source community. All rights reserved.
# Licensed under the MIT License (the "License");
# you may not use this file except in compliance with the License.
name: Dependency Review
on: [pull_request]
permissions:
contents: read
jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
-320
View File
@@ -1,320 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Docker Buildx Images CI
on:
schedule:
- cron: '30 1 * * *'
push:
branches:
- release-*
tags:
- v*
workflow_dispatch:
jobs:
build-ghcr:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
install: true
- name: Cache Docker layers
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Log in to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
################################################
# build/
# └── docker
# ├── openim-api
# │ └── Dockerfile
# ├── openim-cmdutils
# │ └── Dockerfile
# ├── openim-crontask
# │ └── Dockerfile
# ├── openim-msggateway
# │ └── Dockerfile
# ├── openim-msgtransfer
# │ └── Dockerfile
# ├── openim-push
# │ └── Dockerfile
# ├── openim-rpc-auth
# │ └── Dockerfile
# ├── openim-rpc-conversation
# │ └── Dockerfile
# ├── openim-rpc-friend
# │ └── Dockerfile
# ├── openim-rpc-group
# │ └── Dockerfile
# ├── openim-rpc-msg
# │ └── Dockerfile
# ├── openim-rpc-third
# │ └── Dockerfile
# └── openim-rpc-user
# └── Dockerfile
#############################################
- name: Extract metadata (tags, labels) for Docker openim-api
id: meta1
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-api
- name: Build and push Docker image for openim-api
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-api/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta1.outputs.tags }}
labels: ${{ steps.meta1.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-cmdutils
id: meta2
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-cmdutils
- name: Build and push Docker image for openim-cmdutils
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-cmdutils/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta2.outputs.tags }}
labels: ${{ steps.meta2.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-crontask
id: meta3
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-crontask
- name: Build and push Docker image for openim-crontask
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-crontask/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta3.outputs.tags }}
labels: ${{ steps.meta3.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-msggateway
id: meta4
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-msggateway
- name: Build and push Docker image for openim-msggateway
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-msggateway/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta4.outputs.tags }}
labels: ${{ steps.meta4.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-msgtransfer
id: meta5
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-msgtransfer
- name: Build and push Docker image for openim-msgtransfer
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-msgtransfer/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta5.outputs.tags }}
labels: ${{ steps.meta5.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-push
id: meta6
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-push
- name: Build and push Docker image for openim-push
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-push/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta6.outputs.tags }}
labels: ${{ steps.meta6.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-auth
id: meta7
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-auth
- name: Build and push Docker image for openim-rpc-auth
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-auth/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta7.outputs.tags }}
labels: ${{ steps.meta7.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-conversation
id: meta8
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-conversation
- name: Build and push Docker image for openim-rpc-conversation
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-conversation/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta8.outputs.tags }}
labels: ${{ steps.meta8.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-friend
id: meta9
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-friend
- name: Build and push Docker image for openim-rpc-friend
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-friend/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta9.outputs.tags }}
labels: ${{ steps.meta9.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-group
id: meta10
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-group
- name: Build and push Docker image for openim-rpc-group
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-group/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta10.outputs.tags }}
labels: ${{ steps.meta10.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-msg
id: meta11
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-msg
- name: Build and push Docker image for openim-rpc-msg
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-msg/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta11.outputs.tags }}
labels: ${{ steps.meta11.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-third
id: meta12
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-third
- name: Build and push Docker image for openim-rpc-third
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-third/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta12.outputs.tags }}
labels: ${{ steps.meta12.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
- name: Extract metadata (tags, labels) for Docker openim-rpc-user
id: meta13
uses: docker/metadata-action@v4.6.0
with:
images: ghcr.io/openimsdk/openim-rpc-user
- name: Build and push Docker image for openim-rpc-user
uses: docker/build-push-action@v4
with:
context: .
file: ./build/docker/openim-rpc-user/Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta13.outputs.tags }}
labels: ${{ steps.meta13.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
-16
View File
@@ -1,16 +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.
# name: OpenIM e2e Test
-51
View File
@@ -1,51 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: OpenIM golangci-lint
on:
push:
branches: [main]
pull_request:
branches: [main]
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.20'
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
# Require: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.53
# Optional: working directory, useful for monorepos
working-directory: server
# Optional: golangci-lint command line arguments.
#
# Note: by default the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
args: --timeout=30m --config=/scripts/golangci.yml # --issues-exit-code=0
# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true
# Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
install-mode: "goinstall"
-45
View File
@@ -1,45 +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.
name: OpenIM Run Gosec
# gosec is a source code security audit tool for the Go language. It performs a static
# analysis of the Go code, looking for potential security problems. The main functions of gosec are:
# 1. Find common security vulnerabilities, such as SQL injection, command injection, and cross-site scripting (XSS).
# 2. Audit codes according to common security standards and find non-standard codes.
# 3. Assist the Go language engineer to write safe and reliable code.
# https://github.com/securego/gosec/
on:
push:
branches: "*"
pull_request:
branches: "*"
paths-ignore:
- '*.md'
- '*.yml'
- '.github'
jobs:
golang-security-action:
runs-on: ubuntu-latest
env:
GO111MODULE: on
steps:
- name: Check out code
uses: actions/checkout@v3
- name: Run Gosec Security Scanner
uses: securego/gosec@master
with:
args: ./...
continue-on-error: true
-35
View File
@@ -1,35 +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.
name: Good frist issue add comment
on:
issues:
types:
- labeled
jobs:
add-comment:
if: github.event.label.name == 'help wanted' || github.event.label.name == 'good first issue'
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Add comment
uses: peter-evans/create-or-update-comment@v3
with:
issue-number: ${{ github.event.issue.number }}
token: ${{ secrets.BOT_GITHUB_TOKEN }}
body: |
This issue is available for anyone to work on. **Make sure to reference this issue in your pull request.** :sparkles: Thank you for your contribution! :sparkles:
[Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) to connect and communicate with our developers.
If you wish to accept this assignment, please leave a comment in the comments section: `/accept`.🎯
-31
View File
@@ -1,31 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: 'issue translator'
on:
issue_comment:
types: [created]
issues:
types: [opened]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: usthe/issues-translate-action@v2.7
with:
# it is not necessary to decide whether you need to modify the issue header content
IS_MODIFY_TITLE: true
BOT_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
# Required, input your bot github token
-53
View File
@@ -1,53 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: Github Rebot for Link check error
# Every Monday at 12:30 p.m
on:
schedule:
- cron: '30 12 * * 1'
jobs:
linkChecker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@v1.8.0
with:
# For parameter description, see https://github.com/lycheeverse/lychee#commandline-parameters
# Actions Link address -> https://github.com/lycheeverse/lychee-action
# -E, --exclude-all-private Exclude all private IPs from checking.
# -i, --insecure Proceed for server connections considered insecure (invalid TLS)
# -n, --no-progress Do not show progress bar.
# -t, --timeout <timeout> Website timeout in seconds from connect to response finished [default:20]
# --max-concurrency <max-concurrency> Maximum number of concurrent network requests [default: 128]
# -a --accept <accept> Comma-separated list of accepted status codes for valid links
# docs/.vitepress/dist the site directory to check
# ./*.md all markdown files in the root directory
args: --verbose -E -i --no-progress --exclude-path './CHANGELOG' './**/*.md'
env:
GITHUB_TOKEN: ${{secrets.GH_PAT}}
- name: Create Issue From File
if: env.lychee_exit_code != 0
uses: peter-evans/create-issue-from-file@v4
with:
title: Bug reports for links in OpenIM docs
content-filepath: ./lychee/out.md
labels: kind/documentation, triage/unresolved, report
token: ${{ secrets.BOT_GITHUB_TOKEN }}
-65
View File
@@ -1,65 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: 'Lock Threads'
on:
schedule:
- cron: '0 * * * *'
workflow_dispatch:
permissions:
issues: write
pull-requests: write
concurrency:
group: lock
jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v4
with:
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
issue-inactive-days: '365'
exclude-issue-created-before: ''
exclude-issue-created-after: ''
exclude-issue-created-between: ''
exclude-issue-closed-before: ''
exclude-issue-closed-after: ''
exclude-issue-closed-between: ''
include-any-issue-labels: ''
include-all-issue-labels: ''
exclude-any-issue-labels: ''
add-issue-labels: ''
remove-issue-labels: ''
issue-comment: ''
issue-lock-reason: 'resolved'
pr-inactive-days: '365'
exclude-pr-created-before: ''
exclude-pr-created-after: ''
exclude-pr-created-between: ''
exclude-pr-closed-before: ''
exclude-pr-closed-after: ''
exclude-pr-closed-between: ''
include-any-pr-labels: ''
include-all-pr-labels: ''
exclude-any-pr-labels: ''
add-pr-labels: ''
remove-pr-labels: ''
pr-comment: ''
pr-lock-reason: 'resolved'
process-only: ''
log-output: false
-72
View File
@@ -1,72 +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.
# shamelessly copied from https://github.com/sigstore/cosign/blob/main/.github/workflows/milestone.yaml
name: milestone
on:
pull_request_target:
types: [closed]
branches:
- main
jobs:
milestone:
runs-on: ubuntu-latest
permissions:
actions: none
checks: none
contents: read
deployments: none
issues: write
packages: none
pull-requests: write
repository-projects: none
security-events: none
statuses: none
steps:
- uses: actions/github-script@v6 # v6
with:
script: |
if (!context.payload.pull_request.merged) {
console.log('PR was not merged, skipping.');
return;
}
if (!!context.payload.pull_request.milestone) {
console.log('PR has existing milestone, skipping.');
return;
}
milestones = await github.rest.issues.listMilestones({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open',
sort: 'due_on',
direction: 'asc'
})
if (milestones.data.length === 0) {
console.log('There are no milestones, skipping.');
return;
}
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
milestone: milestones.data[0].number
});
-52
View File
@@ -1,52 +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.
name: 'OpenIM Commit Action'
on:
push:
branches:
- main
jobs:
opencommit:
timeout-minutes: 10
name: OpenCommit
runs-on: ubuntu-latest
permissions: write-all
steps:
- name: Setup Node.js Environment
uses: actions/setup-node@v3
with:
node-version: '16'
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: di-sukharev/opencommit@github-action-v1.0.4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
env:
# set openAI api key in repo actions secrets,
# for openAI keys go to: https://platform.openai.com/account/api-keys
# for repo secret go to: https://github.com/kuebcub/settings/secrets/actions
OCO_OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
# customization
OCO_OPENAI_MAX_TOKENS: 500
OCO_OPENAI_BASE_PATH: ''
OCO_DESCRIPTION: false
OCO_EMOJI: false
OCO_MODEL: gpt-3.5-turbo
OCO_LANGUAGE: en
-176
View File
@@ -1,176 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
name: OpenIM CI Aotu Build and Install
on:
push:
branches:
- main
paths-ignore:
- "docs/**"
- "README.md"
- "README_zh-CN.md"
- "CONTRIBUTING.md"
pull_request:
branches:
- main
paths-ignore:
- "README.md"
- "README_zh-CN.md"
- "CONTRIBUTING.md"
- "docs/**"
env:
GO_VERSION: "1.19"
GOLANGCI_VERSION: "v1.50.1"
jobs:
openim:
name: Test with go ${{ matrix.go_version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
permissions:
# Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
contents: write
environment:
name: openim
strategy:
matrix:
go_version: ["1.18","1.19","1.20"]
os: [ubuntu-latest]
steps:
- name: Set up Go ${{ matrix.go_version }}
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go_version }}
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v3
- name: Install Task
uses: arduino/setup-task@v1
with:
version: 2.x
- name: Run go modules tidy
run: |
sudo make tidy
sudo make tools.verify.go-gitlint
echo "Run go modules tidy successfully"
- name: Run go format
run: |
sudo make format
echo "Run go format successfully"
continue-on-error: true
- name: Generate all necessary files, such as error code files
run: |
make generate
echo "Generate all necessary files successfully"
continue-on-error: true
- name: Run unit test and get test coverage
run: |
make cover
echo "Run unit test and get test coverage successfully"
continue-on-error: true
- name: Build source code for host platform
run: |
sudo make build
echo "Build source code for host platform successfully"
- name: OpenIM verify copyright
run: |
sudo make verify-copyright
sudo make add-copyright
echo "OpenIM verify successfully"
continue-on-error: true
- name: Clean all build
run: |
sudo make clean
echo "Clean all build successfully"
- name: push OpenIM
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "cicd: robot automated Change"
# commit_options: '--no-verify --signoff'
branch: main
# create_branch: true
# # Optional commit user and author settings
# commit_user_name: kubbot # defaults to "github-actions[bot]"
# commit_user_email: 3293172751ysy@gmail.com # defaults to "41898282+github-actions[bot]@users.noreply.github.com"
# commit_author: Kubbot # defaults to author of the commit that triggered the run
continue-on-error: true
- name: Commit Changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "chore(fmt): robot automated format and lint Change"
commit_options: '--no-verify --signoff'
branch: main
continue-on-error: true
- name: Set Current Directory
id: set_directory
run: |
echo "::set-output name=directory::$(pwd)"
continue-on-error: true
- name: Collect Test Coverage File
id: collect_coverage
run: |
cd ${{ steps.set_directory.outputs.directory }}
make cover
echo "::set-output name=coverage_file::./_output/tmp/coverage.out"
continue-on-error: true
- name: Display Test Coverage
run: |
echo "Test Coverage:"
cat ${{ steps.collect_coverage.outputs.coverage_file }}
continue-on-error: true
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
continue-on-error: true
openim-start:
name: Teat OpenIM make install start on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
environment:
name: openim
strategy:
matrix:
go_version: ["1.20"]
os: ["ubuntu-latest"]
steps:
- name: Set up Go ${{ matrix.go_version }}
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go_version }}
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v3
- name: Run OpenIM make install start
run: |
sudo make install
-36
View File
@@ -1,36 +0,0 @@
# Copyright © 2023 OpenIM open source community. 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.
# GitHub recommends pinning actions to a commit SHA.
# To get a newer version, you will need to update the SHA.
# You can also reference a tag or branch, but the action may change without warning.
name: Move assigned card
on:
issues:
types:
- assigned
pull_request:
types:
- assigned
jobs:
move-assigned-card:
runs-on: ubuntu-latest
steps:
- uses: alex-page/github-project-automation-plus@v0.8.3
with:
project: OpenIM-V3.1
column: In Progress
repo-token: ${{ secrets.BOT_GITHUB_TOKEN }}
-114
View File
@@ -1,114 +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.
name: Github Pull Request
on:
push:
branches: [main]
paths-ignore:
- 'README.md'
- 'CONTRIBUTING.md'
- 'docs/**'
pull_request:
branches: [main]
paths-ignore:
- 'README.md'
- 'CONTRIBUTING.md'
- 'docs/**'
permissions:
pull-requests: write
contents: write
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Get League branch Patch
run: |
git config user.name 'openimbot'
git config user.email 'openimsdk@qq.com'
git checkout -b cicd/patch-${{ github.event.number }}
- uses: actions/setup-node@v3
- name: Setup Go
uses: actions/setup-go@v4
- name: Run go modules tidy
run: |
sudo make tidy
sudo make tools.verify.go-gitlint
echo "Run go modules tidy successfully"
- name: Run go format
run: |
sudo make format
echo "Run go format successfully"
continue-on-error: true
- name: Generate all necessary files, such as error code files
run: |
make generate
echo "Generate all necessary files successfully"
continue-on-error: true
- name: Run unit test and get test coverage
run: |
make cover
echo "Run unit test and get test coverage successfully"
continue-on-error: true
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: go
- name: Build source code for host platform
run: |
sudo make build
echo "Build source code for host platform successfully"
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: OpenIM verify copyright
run: |
sudo make verify-copyright
sudo make add-copyright
echo "OpenIM verify successfully"
continue-on-error: true
- name: Commit code
run: |
git add .
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
commit-message: "cicd: bump League Patch to cicd/patch-${{ github.event.number }}"
title: Bump League Patch to cicd/patch-${{ github.event.number }}
body: |
Review criteria:
- [ ] Disenchanter can connect and issue actions
This is an automated PR.
<sub>[workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/.github/workflows/pull-request.yml).</sub>
base: main
branch: cicd/patch-${{ github.event.number }}
labels: kind/documentation, area/test, ok-to-test
token: ${{ secrets.REDBOT_GITHUB_TOKEN }}
-81
View File
@@ -1,81 +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.
name: OpenIM Server Release
on:
push:
# run only against tags
tags:
- '*'
permissions:
contents: write
packages: write
issues: write
jobs:
goreleaser:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- run: git fetch --force --tags
- uses: actions/setup-go@v4
with:
go-version: stable
# More assembly might be required: Docker logins, GPG, etc. It all depends
# on your needs.
- uses: goreleaser/goreleaser-action@v4
with:
# either 'goreleaser' (default) or 'goreleaser-pro':
distribution: goreleaser
version: latest
workdir: .
args: release -f ./build/goreleaser.yaml --rm-dist --clean --release-footer-tmpl=scripts/template/footer.md.tmpl --release-header-tmpl=scripts/template/head.md.tmpl
env:
USERNAME: ${{ github.repository_owner }}
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
FURY_TOKEN: ${{ secrets.FURY_TOKEN }}
# Your GoReleaser Pro key, if you are using the 'goreleaser-pro'
# distribution:
# GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
goreleaser-check-pkgs:
runs-on: ubuntu-latest
env:
DOCKER_CLI_EXPERIMENTAL: "enabled"
needs: [ goreleaser ]
if: github.ref == 'refs/heads/main'
strategy:
matrix:
format: [ deb, rpm, apk ]
steps:
- uses: actions/checkout@v3 # v3
with:
fetch-depth: 0
- uses: arduino/setup-task@e26d8975574116b0097a1161e0fe16ba75d84c1c # v1
with:
version: 3.x
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2
- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
with:
path: |
./_output/dist/*.deb
./_output/dist/*.rpm
./_output/dist/*.apk
key: ${{ github.ref }}
- run: task goreleaser:test:${{ matrix.format }}
-89
View File
@@ -1,89 +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.
name: OpenIM Start Execute Scripts
on:
push:
branches:
- main
paths-ignore:
- "docs/**"
- "README.md"
- "README_zh-CN.md"
- "CONTRIBUTING.md"
pull_request:
branches:
- main
paths-ignore:
- "README.md"
- "README_zh-CN.md"
- "CONTRIBUTING.md"
- "docs/**"
jobs:
execute-scripts:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Download Docker Compose
run: |
curl -o docker-compose.yaml https://gist.githubusercontent.com/cubxxw/b1d5cbd2edfa23fee911118aa3e8249e/raw/openim-server.sh
shell: bash
- name: Start Docker Compose
run: |
sudo docker compose up -d
sudo sleep 60
continue-on-error: true
- name: Stop all services
run: |
sudo chmod +x ./scripts/stop_all.sh
sudo ./scripts/stop_all.sh
sudo cat logs/openIM.log 2>/dev/null
shell: bash
continue-on-error: true
- name: Build all services
run: |
sudo chmod +x ./scripts/build_all_service.sh
sudo ./scripts/build_all_service.sh
sudo cat logs/openIM.log 2>/dev/null
shell: bash
- name: Start all services
run: |
sudo chmod +x ./scripts/start_all.sh
sudo ./scripts/start_all.sh
sudo cat logs/openIM.log 2>/dev/null
continue-on-error: true
shell: bash
- name: Check all services
run: |
sudo chmod +x ./scripts/check_all.sh
sudo ./scripts/check_all.sh
sudo cat logs/openIM.log 2>/dev/null
shell: bash
- name: Print openIM.log
run: |
sudo cat logs/* 2>/dev/null
sudo cat logs/* 2>/dev/null >> "$GITHUB_OUTPUT"
shell: bash
continue-on-error: true
-48
View File
@@ -1,48 +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.
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
#
# You can adjust the behavior by modifying this file.
# For more information, see:
# https://github.com/actions/stale
name: Mark stale issues and pull requests
on:
schedule:
- cron: '0 8 * * *'
jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.BOT_GITHUB_TOKEN }}
days-before-stale: 60
days-before-close: 7
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
stale-pr-message: 'This issue is stale because it has been open 60 days with no activity.'
close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity. You can reopen it if you want.'
stale-pr-label: lifecycle/stale
stale-issue-label: lifecycle/stale
exempt-issue-labels: 'openim'
exempt-pr-labels: 'openim'
exempt-draft-pr: true
-39
View File
@@ -1,39 +0,0 @@
# Copyright © 2023 KubeCub open source community. All rights reserved.
# Licensed under the MIT License (the "License");
# you may not use this file except in compliance with the License.
# https://github.com/BetaHuhn/repo-file-sync-action
name: Synchronize kubecub public code to other repositories
on:
push:
branches:
- main
workflow_dispatch:
jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Run GitHub File Sync
uses: BetaHuhn/repo-file-sync-action@latest
with:
GH_INSTALLATION_TOKEN: "${{ secrets.BOT_GITHUB_TOKEN }}"
CONFIG_PATH: .github/sync.yml
ORIGINAL_MESSAGE: true
SKIP_PR: true
COMMIT_EACH_FILE: false
COMMIT_BODY: "🤖 kubbot to synchronize the warehouse"
GIT_EMAIL: "3293172751ysy@gmail.com"
GIT_USERNAME: "kubbot"
PR_BODY: 👌 kubecub provides automated community services
REVIEWERS: |
kubbot
cubxxw
PR_LABELS: |
file-sync
automerge
ASSIGNEES: |
kubbot
+13 -387
View File
@@ -1,394 +1,20 @@
# 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.
# ==============================================================================
# For the entire design of.gitignore, ignore git commits and ignore files
#===============================================================================
#
### OpenIM developer supplement ###
bin
logs
.devcontainer
components
out-test
Dockerfile.cross
### Makefile ###
tmp/
bin/
output/
.github
.idea
.exe
_output/
### OpenIM deploy ###
deploy/openim_demo
deploy/openim-api
deploy/openim-rpc-msg_gateway
deploy/openim-msgtransfer
deploy/openim-push
deploy/openim_timer_task
deploy/openim-rpc-user
deploy/openim-rpc-friend
deploy/openim-rpc-group
deploy/openim-rpc-msg
deploy/openim-rpc-auth
deploy/open_im_api
deploy/open_im_msg_gateway
deploy/open_im_msg_transfer
deploy/open_im_push
deploy/open_im_rpc_user
deploy/open_im_rpc_friend
deploy/open_im_rpc_group
deploy/open_im_rpc_msg
deploy/open_im_rpc_auth
deploy/Open-IM-SDK-Core
# files used by the developer
.idea.md
.todo.md
.note.md
# ==============================================================================
# Created by https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
# Edit at https://www.toptal.com/developers/gitignore?templates=go,git,vim,tags,test,emacs,backup,jetbrains
### Backup ###
*.bak
*.gho
*.ori
*.orig
*.tmp
### Emacs ###
# -*- mode: gitignore; -*-
*~
\#*\#
/.emacs.desktop
/.emacs.desktop.lock
*.elc
auto-save-list
tramp
.\#*
# Org-mode
.org-id-locations
*_archive
# flymake-mode
*_flymake.*
# eshell files
/eshell/history
/eshell/lastdir
# elpa packages
/elpa/
# reftex files
*.rel
# AUCTeX auto folder
/auto/
# cask packages
.cask/
dist/
# Flycheck
flycheck_*.el
# server auth directory
/server/
# projectiles files
.projectile
# directory configuration
.dir-locals.el
# network security
/network-security.data
### vscode ###
.vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# End of https://www.toptal.com/developers/gitignore/api/vim,jetbrains,vscode,git,go,tags,backup,test
### Git ###
# Created by git for backups. To disable backups in Git:
# $ git config --global mergetool.keepBackup false
# Created by git when using merge tools for conflicts
*.BACKUP.*
*.BASE.*
*.LOCAL.*
*.REMOTE.*
*_BACKUP_*.txt
*_BASE_*.txt
*_LOCAL_*.txt
*_REMOTE_*.txt
### Go ###
# If you prefer the allow list template instead of the deny list, see community template:
# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
#
# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib
# Test binary, built with `go test -c`
*.test
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
# Dependency directories (remove the comment below to include it)
# vendor/
# Go workspace file
# go.work
### JetBrains ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# AWS User-specific
.idea/**/aws.xml
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# SonarLint plugin
.idea/sonarlint/
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### JetBrains Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr
# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/
# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml
# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/
# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$
# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml
# Azure Toolkit for IntelliJ plugin
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml
### Tags ###
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS
.TAGS
!TAGS/
tags
.tags
!tags/
gtags.files
GTAGS
GRTAGS
GPATH
GSYMS
cscope.files
cscope.out
cscope.in.out
cscope.po.out
### Test ###
### Ignore all files that could be used to test your code and
### you wouldn't want to push
# Reference https://en.wikipedia.org/wiki/Metasyntactic_variable
# Most common
*foo
*bar
*fubar
*foobar
*baz
# Less common
*qux
*quux
*bongo
*bazola
*ztesch
# UK, Australia
*wibble
*wobble
*wubble
*flob
*blep
*blah
*boop
*beep
# Japanese
*hoge
*piyo
*fuga
*hogera
*hogehoge
# Portugal, Spain
*fulano
*sicrano
*beltrano
*mengano
*perengano
*zutano
# France, Italy, the Netherlands
*toto
*titi
*tata
*tutu
*pipppo
*pluto
*paperino
*aap
*noot
*mies
# Other names that would make sense
*tests
*testsdir
*testsfile
*testsfiles
*testdir
*testfile
*testfiles
*testing
*testingdir
*testingfile
*testingfiles
*temp
*tempdir
*tempfile
*tempfiles
*tmp
*tmpdir
*tmpfile
*tmpfiles
*lol
### Vim ###
# Swap
[._]*.s[a-v][a-z]
!*.svg # comment out if you don't need vector files
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Session
Session.vim
Sessionx.vim
# Temporary
.netrwhist
# Auto-generated tag files
# Persistent undo
[._]*.un~
# End of https://www.toptal.com/developers/gitignore/api/go,git,vim,tags,test,emacs,backup,jetbrains
.idea
dist/
+4
View File
@@ -0,0 +1,4 @@
[submodule "cmd/Open-IM-SDK-Core"]
path = cmd/Open-IM-SDK-Core
url = https://github.com/OpenIMSDK/Open-IM-SDK-Core.git
-1
View File
@@ -1 +0,0 @@
CHANGELOG/CHANGELOG.md
-62
View File
@@ -1,62 +0,0 @@
# Version logging for OpenIM
<!-- BEGIN MUNGE: GENERATED_TOC -->
<!-- END MUNGE: GENERATED_TOC -->
{{ if .Versions -}}
<a name="unreleased"></a>
## [Unreleased]
{{ if .Unreleased.CommitGroups -}}
{{ range .Unreleased.CommitGroups -}}
### {{ .Title }}
{{ range .Commits -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
{{ end }}
{{ end -}}
{{ end -}}
{{ end -}}
{{ range .Versions }}
<a name="{{ .Tag.Name }}"></a>
## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
{{ range .CommitGroups -}}
### {{ .Title }}
{{ range .Commits -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
{{ end }}
{{ end -}}
{{- if .RevertCommits -}}
### Reverts
{{ range .RevertCommits -}}
- {{ .Revert.Header }}
{{ end }}
{{ end -}}
{{- if .MergeCommits -}}
### Pull Requests
{{ range .MergeCommits -}}
- {{ .Header }}
{{ end }}
{{ end -}}
{{- if .NoteGroups -}}
{{ range .NoteGroups -}}
### {{ .Title }}
{{ range .Notes }}
{{ .Body }}
{{ end }}
{{ end -}}
{{ end -}}
{{ end -}}
{{- if .Versions }}
[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
{{ range .Versions -}}
{{ if .Tag.Previous -}}
[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
{{ end -}}
{{ end -}}
{{ end -}}
-67
View File
@@ -1,67 +0,0 @@
bin: git
style: github
template: CHANGELOG.tpl.md
info:
title: CHANGELOG
repository_url: https://github.com/OpenIMSDK/Open-IM-Server
options:
tag_filter_pattern: '^v'
sort: "date"
commits:
filters:
Type:
- feat
- fix
- perf
- refactor
- docs
- test
- chore
- ci
- build
sort_by: Scope
commit_groups:
group_by: Type
sort_by: Title
title_order:
- feat
- fix
- perf
- refactor
- docs
- test
- chore
- ci
- build
title_maps:
feat: Features
header:
pattern: "<regexp>"
pattern_maps:
- PropName
issues:
prefix:
- #
refs:
actions:
- Closes
- Fixes
merges:
pattern: "^Merge branch '(\\w+)'$"
pattern_maps:
- Source
reverts:
pattern: "^Revert \"([\\s\\S]*)\"$"
pattern_maps:
- Header
notes:
keywords:
- BREAKING CHANGE
-56
View File
@@ -1,56 +0,0 @@
# Version logging for OpenIM
> **Note**:
> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM](#version-logging-for-openim)
- [Unreleased](#unreleased)
- [v1.0.7 - 2021-12-17](#v107---2021-12-17)
- [v1.0.6 - 2021-12-10](#v106---2021-12-10)
- [v1.0.5 - 2021-12-03](#v105---2021-12-03)
- [v1.0.4 - 2021-11-25](#v104---2021-11-25)
- [v1.0.3 - 2021-11-12](#v103---2021-11-12)
- [v1.0.1 - 2021-11-04](#v101---2021-11-04)
- [v1.0.0 - 2021-10-28](#v100---2021-10-28)
- [Reverts](#reverts)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v1.0.7"></a>
## [v1.0.7] - 2021-12-17
<a name="v1.0.6"></a>
## [v1.0.6] - 2021-12-10
<a name="v1.0.5"></a>
## [v1.0.5] - 2021-12-03
<a name="v1.0.4"></a>
## [v1.0.4] - 2021-11-25
<a name="v1.0.3"></a>
## [v1.0.3] - 2021-11-12
<a name="v1.0.1"></a>
## [v1.0.1] - 2021-11-04
<a name="v1.0.0"></a>
## v1.0.0 - 2021-10-28
### Reverts
- friend modify
- update
[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...HEAD
[v1.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7
[v1.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6
[v1.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5
[v1.0.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4
[v1.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3
[v1.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1
-121
View File
@@ -1,121 +0,0 @@
# Version logging for OpenIM:v2.0
> **Note**:
> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM:v2.0](#version-logging-for-openimv20)
- [\[Unreleased\]](#unreleased)
- [\[v2.0.10\] - 2022-05-13](#v2010---2022-05-13)
- [\[v2.0.9\] - 2022-04-29](#v209---2022-04-29)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
- [\[v2.0.8\] - 2022-04-24](#v208---2022-04-24)
- [Pull Requests](#pull-requests-1)
- [\[v2.0.7\] - 2022-04-08](#v207---2022-04-08)
- [Pull Requests](#pull-requests-2)
- [\[v2.0.6\] - 2022-04-01](#v206---2022-04-01)
- [Pull Requests](#pull-requests-3)
- [\[v2.0.5\] - 2022-03-24](#v205---2022-03-24)
- [\[v2.04\] - 2022-03-18](#v204---2022-03-18)
- [\[v2.0.3\] - 2022-03-11](#v203---2022-03-11)
- [\[v2.0.2\] - 2022-03-04](#v202---2022-03-04)
- [Pull Requests](#pull-requests-4)
- [\[v2.0.1\] - 2022-02-25](#v201---2022-02-25)
- [v2.0.0 - 2022-02-23](#v200---2022-02-23)
- [Reverts](#reverts-1)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v2.0.10"></a>
## [v2.0.10] - 2022-05-13
<a name="v2.0.9"></a>
## [v2.0.9] - 2022-04-29
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.8"></a>
## [v2.0.8] - 2022-04-24
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.7"></a>
## [v2.0.7] - 2022-04-08
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.6"></a>
## [v2.0.6] - 2022-04-01
### Pull Requests
- Merge branch 'tuoyun'
<a name="v2.0.5"></a>
## [v2.0.5] - 2022-03-24
<a name="v2.04"></a>
## [v2.04] - 2022-03-18
<a name="v2.0.3"></a>
## [v2.0.3] - 2022-03-11
<a name="v2.0.2"></a>
## [v2.0.2] - 2022-03-04
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.1"></a>
## [v2.0.1] - 2022-02-25
<a name="v2.0.0"></a>
## v2.0.0 - 2022-02-23
### Reverts
-50
View File
@@ -1,50 +0,0 @@
# Version logging for OpenIM:v2.1
> **Note**:
> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM:v2.1](#version-logging-for-openimv21)
- [Unreleased](#unreleased)
- [v2.1.0 - 2022-06-17](#v210---2022-06-17)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v2.1.0"></a>
## v2.1.0 - 2022-06-17
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
- friend modify
- update
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...HEAD
-50
View File
@@ -1,50 +0,0 @@
# Version logging for OpenIM:v2.2
> **Note**:
> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM:v2.2](#version-logging-for-openimv22)
- [Unreleased](#unreleased)
- [v2.2.0 - 2022-07-01](#v220---2022-07-01)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v2.2.0"></a>
## v2.2.0 - 2022-07-01
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
- friend modify
- update
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...HEAD
-70
View File
@@ -1,70 +0,0 @@
# Version logging for OpenIM:v2.3
> **Note**:
> Deprecated version logging for OpenIM, please refer to [CHANGELOG.md](../CHANGELOG.md)
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM:v2.3](#version-logging-for-openimv23)
- [Unreleased](#unreleased)
- [v2.3.3 - 2022-09-18](#v233---2022-09-18)
- [v2.3.2 - 2022-09-09](#v232---2022-09-09)
- [v2.3.0-rc2 - 2022-07-29](#v230-rc2---2022-07-29)
- [v2.3.0-rc1 - 2022-07-25](#v230-rc1---2022-07-25)
- [v2.3.0-rc0 - 2022-07-15](#v230-rc0---2022-07-15)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v2.3.3"></a>
## [v2.3.3] - 2022-09-18
<a name="v2.3.2"></a>
## [v2.3.2] - 2022-09-09
<a name="v2.3.0-rc2"></a>
## [v2.3.0-rc2] - 2022-07-29
<a name="v2.3.0-rc1"></a>
## [v2.3.0-rc1] - 2022-07-25
<a name="v2.3.0-rc0"></a>
## v2.3.0-rc0 - 2022-07-15
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
- friend modify
- update
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...HEAD
[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3
[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2
[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2
[v2.3.0-rc1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1
-52
View File
@@ -1,52 +0,0 @@
# Version logging for OpenIM
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM](#version-logging-for-openim)
- [Unreleased](#unreleased)
- [v2.9.0+1.839643f - 2023-07-07](#v2901839643f---2023-07-07)
- [v2.9.0+2.35f07fe - 2023-07-06](#v290235f07fe---2023-07-06)
- [v2.9.0+1.b5072b1 - 2023-07-05](#v2901b5072b1---2023-07-05)
- [v2.9.0+3.2667a3a - 2023-07-05](#v29032667a3a---2023-07-05)
- [v2.9.0+7.04818ca - 2023-07-05](#v290704818ca---2023-07-05)
- [v2.9.0 - 2023-07-04](#v290---2023-07-04)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v2.9.0+1.839643f"></a>
## [v2.9.0+1.839643f] - 2023-07-07
<a name="v2.9.0+2.35f07fe"></a>
## [v2.9.0+2.35f07fe] - 2023-07-06
<a name="v2.9.0+1.b5072b1"></a>
## [v2.9.0+1.b5072b1] - 2023-07-05
<a name="v2.9.0+3.2667a3a"></a>
## [v2.9.0+3.2667a3a] - 2023-07-05
<a name="v2.9.0+7.04818ca"></a>
## [v2.9.0+7.04818ca] - 2023-07-05
<a name="v2.9.0"></a>
## v2.9.0 - 2023-07-04
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
### Pull Requests
- Merge branch 'tuoyun'
[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.839643f...HEAD
[v2.9.0+1.839643f]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+2.35f07fe...v2.9.0+1.839643f
[v2.9.0+2.35f07fe]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+1.b5072b1...v2.9.0+2.35f07fe
[v2.9.0+1.b5072b1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+3.2667a3a...v2.9.0+1.b5072b1
[v2.9.0+3.2667a3a]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0+7.04818ca...v2.9.0+3.2667a3a
[v2.9.0+7.04818ca]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...v2.9.0+7.04818ca
-188
View File
@@ -1,188 +0,0 @@
# Version logging for OpenIM
<!-- BEGIN MUNGE: GENERATED_TOC -->
- [Version logging for OpenIM](#version-logging-for-openim)
- [Unreleased](#unreleased)
- [v2.9.0 - 2023-07-04](#v290---2023-07-04)
- [Reverts](#reverts)
- [Pull Requests](#pull-requests)
- [v2.3.3 - 2022-09-18](#v233---2022-09-18)
- [v2.3.2 - 2022-09-09](#v232---2022-09-09)
- [v2.3.0-rc2 - 2022-07-29](#v230-rc2---2022-07-29)
- [v2.3.0-rc1 - 2022-07-25](#v230-rc1---2022-07-25)
- [v2.3.0-rc0 - 2022-07-15](#v230-rc0---2022-07-15)
- [v2.2.0 - 2022-07-01](#v220---2022-07-01)
- [v2.1.0 - 2022-06-17](#v210---2022-06-17)
- [Pull Requests](#pull-requests-1)
- [v2.0.10 - 2022-05-13](#v2010---2022-05-13)
- [v2.0.9 - 2022-04-29](#v209---2022-04-29)
- [Reverts](#reverts-1)
- [Pull Requests](#pull-requests-2)
- [v2.0.7 - 2022-04-08](#v207---2022-04-08)
- [Pull Requests](#pull-requests-3)
- [v2.0.6 - 2022-04-01](#v206---2022-04-01)
- [Pull Requests](#pull-requests-4)
- [v2.0.5 - 2022-03-24](#v205---2022-03-24)
- [v2.04 - 2022-03-18](#v204---2022-03-18)
- [v2.0.3 - 2022-03-11](#v203---2022-03-11)
- [v2.0.2 - 2022-03-04](#v202---2022-03-04)
- [Pull Requests](#pull-requests-5)
- [v2.0.1 - 2022-02-25](#v201---2022-02-25)
- [v2.0.0 - 2022-02-23](#v200---2022-02-23)
- [v1.0.7 - 2021-12-17](#v107---2021-12-17)
- [v1.0.6 - 2021-12-10](#v106---2021-12-10)
- [v1.0.5 - 2021-12-03](#v105---2021-12-03)
- [v1.0.4 - 2021-11-25](#v104---2021-11-25)
- [v1.0.3 - 2021-11-12](#v103---2021-11-12)
- [v1.0.1 - 2021-11-04](#v101---2021-11-04)
- [v1.0.0 - 2021-10-28](#v100---2021-10-28)
- [Reverts](#reverts-2)
<!-- END MUNGE: GENERATED_TOC -->
<a name="unreleased"></a>
## [Unreleased]
<a name="v2.9.0"></a>
## [v2.9.0] - 2023-07-04
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
### Pull Requests
- Merge branch 'tuoyun'
<a name="v2.3.3"></a>
## [v2.3.3] - 2022-09-18
<a name="v2.3.2"></a>
## [v2.3.2] - 2022-09-09
<a name="v2.3.0-rc2"></a>
## [v2.3.0-rc2] - 2022-07-29
<a name="v2.3.0-rc1"></a>
## [v2.3.0-rc1] - 2022-07-25
<a name="v2.3.0-rc0"></a>
## [v2.3.0-rc0] - 2022-07-15
<a name="v2.2.0"></a>
## [v2.2.0] - 2022-07-01
<a name="v2.1.0"></a>
## [v2.1.0] - 2022-06-17
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.10"></a>
## [v2.0.10] - 2022-05-13
<a name="v2.0.9"></a>
## [v2.0.9] - 2022-04-29
### Reverts
- update etcd to v3.5.2 ([#206](https://github.com/OpenIMSDK/Open-IM-Server/issues/206))
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.7"></a>
## [v2.0.7] - 2022-04-08
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.6"></a>
## [v2.0.6] - 2022-04-01
### Pull Requests
- Merge branch 'tuoyun'
<a name="v2.0.5"></a>
## [v2.0.5] - 2022-03-24
<a name="v2.04"></a>
## [v2.04] - 2022-03-18
<a name="v2.0.3"></a>
## [v2.0.3] - 2022-03-11
<a name="v2.0.2"></a>
## [v2.0.2] - 2022-03-04
### Pull Requests
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
- Merge branch 'tuoyun'
<a name="v2.0.1"></a>
## [v2.0.1] - 2022-02-25
<a name="v2.0.0"></a>
## [v2.0.0] - 2022-02-23
<a name="v1.0.7"></a>
## [v1.0.7] - 2021-12-17
<a name="v1.0.6"></a>
## [v1.0.6] - 2021-12-10
<a name="v1.0.5"></a>
## [v1.0.5] - 2021-12-03
<a name="v1.0.4"></a>
## [v1.0.4] - 2021-11-25
<a name="v1.0.3"></a>
## [v1.0.3] - 2021-11-12
<a name="v1.0.1"></a>
## [v1.0.1] - 2021-11-04
<a name="v1.0.0"></a>
## v1.0.0 - 2021-10-28
### Reverts
- friend modify
- update
[Unreleased]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.9.0...HEAD
[v2.9.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.3...v2.9.0
[v2.3.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.2...v2.3.3
[v2.3.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc2...v2.3.2
[v2.3.0-rc2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc1...v2.3.0-rc2
[v2.3.0-rc1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.3.0-rc0...v2.3.0-rc1
[v2.3.0-rc0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.2.0...v2.3.0-rc0
[v2.2.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.1.0...v2.2.0
[v2.1.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.10...v2.1.0
[v2.0.10]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.9...v2.0.10
[v2.0.9]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.7...v2.0.9
[v2.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.6...v2.0.7
[v2.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.5...v2.0.6
[v2.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.04...v2.0.5
[v2.04]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.3...v2.04
[v2.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.2...v2.0.3
[v2.0.2]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.1...v2.0.2
[v2.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v2.0.0...v2.0.1
[v2.0.0]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.7...v2.0.0
[v1.0.7]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.6...v1.0.7
[v1.0.6]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.5...v1.0.6
[v1.0.5]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.4...v1.0.5
[v1.0.4]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.3...v1.0.4
[v1.0.3]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.1...v1.0.3
[v1.0.1]: https://github.com/OpenIMSDK/Open-IM-Server/compare/v1.0.0...v1.0.1
-109
View File
@@ -1,109 +0,0 @@
# Changelog
- [Changelog](#changelog)
- [OpenIM versioning policy](#openim-versioning-policy)
- [command](#command)
- [create next tag](#create-next-tag)
- [Release version logs](#release-version-logs)
- [Introduction](#introduction)
- [Naming Format](#naming-format)
- [Examples](#examples)
- [Version Modifiers](#version-modifiers)
- [Versioning Strategy](#versioning-strategy)
All notable changes to this project will be documented in this file.
+ [https://github.com/OpenIMSDK/Open-IM-Server/releases](https://github.com/OpenIMSDK/Open-IM-Server/releases)
## OpenIM versioning policy
+ [OpenIM Version](../docs/conversions/version.md)
## command
```bash
git-chglog --tag-filter-pattern 'v2.0.*' -o CHANGELOG-2.0.md
```
## create next tag
```bash
git-chglog --next-tag 2.0.0 -o CHANGELOG.md
git commit -am "release 2.0.0"
git tag 2.0.0
```
| Query | Description | Example |
| -------------- | ---------------------------------------------- | --------------------------- |
| `<old>..<new>` | Commit contained in `<new>` tags from `<old>`. | `$ git-chglog 1.0.0..2.0.0` |
| `<name>..` | Commit from the `<name>` to the latest tag. | `$ git-chglog 1.0.0..` |
| `..<name>` | Commit from the oldest tag to `<name>`. | `$ git-chglog ..2.0.0` |
| `<name>` | Commit contained in `<name>`. | `$ git-chglog 1.0.0` |
## Release version logs
+ [OpenIM CHANGELOG-V1.0](CHANGELOG-1.0.md)
+ [OpenIM CHANGELOG-V2.0](CHANGELOG-2.0.md)
+ [OpenIM CHANGELOG-V2.1](CHANGELOG-2.1.md)
+ [OpenIM CHANGELOG-V2.2](CHANGELOG-2.2.md)
+ [OpenIM CHANGELOG-V2.3](CHANGELOG-2.3.md)
+ [OpenIM CHANGELOG-V2.9](CHANGELOG-2.9.md)
+ [OpenIM CHANGELOG-V3.0](CHANGELOG-3.0.md)
## Introduction
In both the open-source and closed-source software development communities, it is important to follow a consistent and understandable versioning scheme for software projects. This ensures clear communication of changes, compatibility, and stability across different releases. One widely adopted naming convention is the Semantic Versioning 2.0.0.
## Naming Format
The most common format for version numbers is as follows:
```
major.minor[.patch[.build]]
```
Let's take a closer look at each component:
1. **Major Version**: This is the first number in the versioning scheme and indicates significant changes that may not be backward compatible (specific to each project).
2. **Minor Version**: The second number signifies the addition of new features while maintaining backward compatibility.
3. **Patch Version**: The third number represents bug fixes or code optimizations without introducing new features. It is generally backward compatible.
4. **Build Version**: Typically an automatically generated number that increments with each code commit.
## Examples
Here are a few examples to illustrate the versioning scheme:
1. `1.0`
2. `2.14.0.1478`
3. `3.2.1 build-354`
## Version Modifiers
Apart from the version numbers, there are also version modifiers used to indicate specific stages or statuses of a release. Some commonly used version modifiers include:
- **alpha**: An internal testing version with numerous known bugs. It is primarily used for communication among developers.
- **beta**: A testing version released to enthusiastic users for feedback and bug detection.
- **rc (release candidate)**: The final testing version before the official release.
- **ga (general availability)**: The initial stable release for public distribution.
- **r/release** (or no modifier at all): The final released version intended for general users.
- **lts (long-term support)**: Designates a version that will receive extended maintenance and bug fixes for a specified number of years.
## Versioning Strategy
To effectively manage version numbers, the following strategies are commonly employed:
- The initial version of a project can be either `0.1` or `1.0`.
- When fixing bugs, the patch version is incremented by 1.
- When adding new features, the minor version is incremented by 1, and the patch version is reset to 0.
- In the case of significant modifications, the major version is incremented by 1.
- The build version is usually automatically generated by the compilation process and follows a defined format. It does not require manual control.
By adhering to these strategies and guidelines, developers can maintain consistency and clarity in versioning their software projects. This enables users and collaborators to understand the nature of changes between different releases and ensure compatibility with their systems.
(Note: Markdown formatting has been used to structure this article. Markdown is a lightweight markup language used to format text on platforms like GitHub.)
------
**Note**: The above article is based on the given content and aims to provide a Markdown-formatted English article explaining the naming conventions for software project versions, specifically focusing on the Semantic Versioning 2.0.0.
-128
View File
@@ -1,128 +0,0 @@
# Contributor Covenant Code of Conduct
## Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
## Our Standards
Examples of behavior that contributes to a positive environment for our
community include:
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
Examples of unacceptable behavior include:
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.
## Scope
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
3293172751nss@gmail.com.
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
## Enforcement Guidelines
Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
### 1. Correction
**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.
**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.
### 2. Warning
**Community Impact**: A violation through a single incident or series
of actions.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
### 3. Temporary Ban
**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.
**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.
**Consequence**: A permanent ban from any sort of public interaction within
the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
-372
View File
@@ -1,372 +0,0 @@
# Contributing to Open-IM-Server
So, you want to hack on Open-IM-Server? Yay!
First of all, thank you for considering contributing to our project! We appreciate your time and effort, and we value any contribution, whether it's reporting a bug, suggesting a new feature, or submitting a pull request.
This document provides guidelines and best practices to help you contribute effectively.
## 📇Topics
- [Contributing to Open-IM-Server](#contributing-to-open-im-server)
- [📇Topics](#topics)
- [What we expect of you](#what-we-expect-of-you)
- [Code of ConductCode of Conduct](#code-of-conductcode-of-conduct)
- [Code and doc contribution](#code-and-doc-contribution)
- [Where should I start?](#where-should-i-start)
- [Design documents](#design-documents)
- [Getting Started](#getting-started)
- [Style and Specification](#style-and-specification)
- [Reporting security issues](#reporting-security-issues)
- [Reporting general issues](#reporting-general-issues)
- [Commit Rules](#commit-rules)
- [PR Description](#pr-description)
- [Docs Contribution](#docs-contribution)
- [Engage to help anything](#engage-to-help-anything)
- [Release version](#release-version)
- [Contact Us](#contact-us)
## What we expect of you
We hope that anyone can join Open-IM-Server , even if you are a student, writer, translator
Please meet the minimum version of the Go language published in [go.mod](./go.mod). If you want to manage the Go language version, we provide tools to install [gvm](https://github.com/moovweb/gvm) in our [Makefile](./Makefile)
You'd better use Linux OR WSL as the development environment, Linux with [Makefile](./Makefile) can help you quickly build and test Open-IM-Server project.
If you are familiar with [Makefile](./Makefile) , you can easily see the clever design of the Open-IM-Server Makefile. Storing the necessary tools such as golangci in the `/tools` directory can avoid some tool version issues.
The [Makefile](./Makefile) is for every developer, even if you don't know how to use the Makefile tool, don't worry, we provide two great commands to get you up to speed with the Makefile architecture, `make help` and `make help-all`, it can reduce problems of the developing environment.
## Code of ConductCode of Conduct
#### Code and doc contribution
Every action to make project Open-IM-Server better is encouraged. On GitHub, every improvement for Open-IM-Server could be via a [PR](https://github.com/OpenIMSDK/Open-IM-Server/pulls) (short for pull request).
+ If you find a typo, try to fix it!
+ If you find a bug, try to fix it!
+ If you find some redundant codes, try to remove them!
+ If you find some test cases missing, try to add them!
+ If you could enhance a feature, please **DO NOT** hesitate!
+ If you find code implicit, try to add comments to make it clear!
+ If you find code ugly, try to refactor that!
+ If you can help to improve documents, it could not be better!
+ If you find document incorrect, just do it and fix that!
+ ...
#### Where should I start?
+ If you are new to the project, don't know how to contribute Open-IM-Server, please check out the [good first issue](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aopen+label%3A"good+first+issue"+sort%3Aupdated-desc) label.
+ You should be good at filtering the Open-IM-Server issue tags and finding the ones you like, such as [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) for big initiatives, features for [feature](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Afeature) proposals, and [bug](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+label%3Abug+) fixes.
+ If you are looking for something to work on, check out our [open issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc).
+ If you have an idea for a new feature, please [open an issue](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose), and we can discuss it.
#### Design documents
For any substantial design, there should be a well-crafted design document. This document is not just a simple record, but also a detailed description and manifestation, which can help team members better understand the design thinking and grasp the design direction. In the process of writing the design document, we can choose to use tools such as `Google Docs` or `Notion`, and even mark RFC in [issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) or [discussions](https://github.com/OpenIMSDK/Open-IM-Server/discussions) for better collaboration. Of course, after completing the design document, we should also add it to our [Shared Drive](https://drive.google.com/drive/) and notify the appropriate working group to let everyone know of its existence. Only by doing so can we maximize the effectiveness of the design document and provide strong support for the smooth progress of the project.
Anybody can access the shared Drive for reading. To get access to comment. Once you've done that, head to the [shared Drive](https://drive.google.com/) and behold all the docs.
In addition to that, we'd love to invite you to [join our Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) where you can play with your imagination, tell us what you're working on, and get a quick response.
When documenting a new design, we recommend a 2-step approach:
1. Use the short-form RFC template to outline your ideas and get early feedback.
2. Once you have received sufficient feedback and consensus, you may use the longer-form design doc template to specify and discuss your design in more details.
In order to contribute a feature to Open-IM-Server you'll need to go through the following steps:
+ Discuss your idea with the appropriate [working groups](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) on the working group's Slack channel.
+ Once there is general agreement that the feature is useful, create a GitHub issue to track the discussion. The issue should include information about the requirements and use cases that it is trying to address.
+ Include a discussion of the proposed design and technical details of the implementation in the issue.
But keep in mind that there is no guarantee of it being accepted and so it is usually best to get agreement on the idea/design before time is spent coding it. However, sometimes seeing the exact code change can help focus discussions, so the choice is up to you.
## Getting Started
To propose PR for the Open-IM-Server item, we assume you have registered a GitHub ID. Then you could finish the preparation in the following steps:
1. Fork the repository(Open-IM-Server)
2. **CLONE** your own repository to main locally. Use `git clone https://github.com/<your-username>/Open-IM-Server.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make.
3. **Set Remote** upstream to be `https://github.com/OpenIMSDK/Open-IM-Server.git` using the following two commands:
```bash
git remote add upstream https://github.com/OpenIMSDK/Open-IM-Server.git
git remote set-url --push upstream no-pushing
```
With this remote setting, you can check your git remote configuration like this:
```bash
git remote -v
origin https://github.com/<your-username>/Open-IM-Server.git (fetch)
origin https://github.com/<your-username>/Open-IM-Server.git (push)
upstream https://github.com/OpenIMSDK/Open-IM-Server.git (fetch)
upstream no-pushing (push)
```
Adding this, we can easily synchronize local branches with upstream branches.
4. Create a new branch for your changes (use a descriptive name, such as `fix-bug-123` or `add-new-feature`).
```bash
cd Open-IM-Server
git fetch upstream
git checkout upstream/main
```
Create a new branch:
```bash
git checkout -b <new-branch>
```
Make any change on the `new-branch` then use [Makefile](./Makefile) build and test your codes.
5. **Commit your changes** to your local branch, lint before committing and commit with sign-off
```bash
git rebase upstream/main
make lint # golangci-lint run -c .golangci.yml
git add -A # add changes to staging
git commit -a -s -m "message for your changes" # -s adds a Signed-off-by trailer
```
6. **Push your branch** to your forked repository, it is recommended to have only one commit for a PR.
```bash
# sync up with upstream
git fetch upstream main
git rebase upstream/main
git rebase -i <commit-id> # rebase with interactive mode to squash your commits into a single one
git push # push to the remote repository, if it's a first time push, run git push --set-upstream origin <new-branch># sync up with upstream
git fetch upstream main
git rebase upstream/main
git rebase -i <commit-id> # rebase with interactive mode to squash your commits into a single one
git push # push to the remote repository, if it's a first time push, run git push --set-upstream origin <new-branch>
```
You can also use `git commit -s --amend && git push -f` to update modifications on the previous commit.
If you have developed multiple features in the same branch, you should create PR separately by rebasing to the main branch between each push:
```bash
# create new branch, for example git checkout -b feature/infra
git checkout -b <new branch>
# update some code, feature1
git add -A
git commit -m -s "feat: feature one"
git push # if it's first time push, run git push --set-upstream origin <new-branch>
# then create pull request, and merge
# update some new feature, feature2, rebase main branch first.
git rebase upstream/main # rebase the current branch to upstream/main branch
git add -A
git commit -m -s "feat: feature two"
# then create pull request, and merge
```
7. **Open a pull request** to `OpenIMSDK/Open-IM-Server:main`
It is recommended to review your changes before filing a pull request. Check if your code doesn't conflict with the main branch and no redundant code is included.
## Style and Specification
We divide the problem into security and general problems:
#### Reporting security issues
Security issues are always treated seriously. As our usual principle, we discourage anyone to spread security issues. If you find a security issue of Open-IM-Server, please do not discuss it in public and even do not open a public issue.
Instead we encourage you to send us a private email to winxu81@gmail.com to report this.
#### Reporting general issues
To be honest, we regard every user of Open-IM-Serveras a very kind contributor. After experiencing Open-IM-Server, you may have some feedback for the project. Then feel free to open an issue via [NEW ISSUE](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose).
Since we collaborate project Open-IM-Server in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. To make the communication more efficient, we wish everyone could search if your issue is an existing one in the searching list. If you find it existing, please add your details in comments under the existing issue instead of opening a brand new one.
To make the issue details as standard as possible, we setup an [ISSUE TEMPLATE](https://github.com/OpenIMSDK/.github/tree/main/.github/ISSUE_TEMPLATE) for issue reporters. You can find three kinds of issue templates there: question, bug report and feature request. Please **BE SURE** to follow the instructions to fill fields in template.
**There are a lot of cases when you could open an issue:**
+ bug report
+ feature request
+ Open-IM-Server performance issues
+ feature proposal
+ feature design
+ help wanted
+ doc incomplete
+ test improvement
+ any questions on Open-IM-Server project
+ and so on
Also, we must be reminded when submitting a new question about Open-IM-Server, please remember to remove the sensitive data from your post. Sensitive data could be password, secret key, network locations, private business data and so on.
#### Commit Rules
Actually in Open-IM-Server, we take two rules serious when committing:
**🥇 Commit Message:**
Commit message could help reviewers better understand what the purpose of submitted PR is. It could help accelerate the code review procedure as well. We encourage contributors to use **EXPLICIT** commit message rather than ambiguous message. In general, we advocate the following commit message type:
We use [Semantic Commits](https://www.conventionalcommits.org/en/v1.0.0/) to make it easier to understand what a commit does and to build pretty changelogs. Please use the following prefixes for your commits:
+ `docs: xxxx`. For example, "docs: add docs about storage installation".
+ `feature: xxxx`.For example, "feature: make result show in sorted order".
+ `bugfix: xxxx`. For example, "bugfix: fix panic when input nil parameter".
+ `style: xxxx`. For example, "style: format the code style of Constants.java".
+ `refactor: xxxx.` For example, "refactor: simplify to make codes more readable".
+ `test: xxx`. For example, "test: add unit test case for func InsertIntoArray".
+ `chore: xxx.` For example, "chore: integrate travis-ci". It's the type of mantainance change.
+ other readable and explicit expression ways.
On the other side, we discourage contributors from committing message like the following ways:
+ ~~fix bug~~
+ ~~update~~
+ ~~add doc~~
**🥈 Commit Content:**
Commit content represents all content changes included in one commit. We had better include things in one single commit which could support reviewer's complete review without any other commits' help.
In another word, contents in one single commit can pass the CI to avoid code mess. In brief, there are two minor rules for us to keep in mind:
1. avoid very large change in a commit.
2. complete and reviewable for each commit.
3. words are written in lowercase English, not uppercase English or other languages such as Chinese.
No matter what the commit message, or commit content is, we do take more emphasis on code review.
An example for this could be:
```bash
git commit -a -s -m "docs: add a new section to the README"
```
#### PR Description
PR is the only way to make change to Open-IM-Server project files. To help reviewers better get your purpose, PR description could not be too detailed. We encourage contributors to follow the [PR template](https://github.com/OpenIMSDK/.github/tree/main/.github/PULL_REQUEST_TEMPLATE.md) to finish the pull request.
You can find some very formal PR in [RFC](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+RFC+label%3ARFC) issues and learn about them.
**📖 Opening PRs:**
+ As long as you are working on your PR, please mark it as a draft
+ Please make sure that your PR is up-to-date with the latest changes in `main`
+ Mention the issue that your PR is addressing (Fix: #{ID_1}, #{ID_2})
+ Make sure that your PR passes all checks
**🈴 Reviewing PRs:**
+ Be respectful and constructive
+ Assign yourself to the PR
+ Check if all checks are passing
+ Suggest changes instead of simply commenting on found issues
+ If you are unsure about something, ask the author
+ If you are not sure if the changes work, try them out
+ Reach out to other reviewers if you are unsure about something
+ If you are happy with the changes, approve the PR
+ Merge the PR once it has all approvals and the checks are passing
**⚠️ DCO check:**
We have a DCO check that runs on every pull request to ensure code quality and maintainability. This check verifies that the commit has been signed off, indicating that you have read and agreed to the provisions of the Developer Certificate of Origin. If you have not yet signed off on the commit, you can use the following command to sign off on the last commit you made:
```bash
git commit --amend --signoff
```
Please note that signing off on a commit is a commitment that you have read and agreed to the provisions of the Developer Certificate of Origin. If you have not yet read this document, we strongly recommend that you take some time to read it carefully. If you have any questions about the content of this document, or if you need further assistance, please contact an administrator or relevant personnel.
You can also automate signing off your commits by adding the following to your `.zshrc` or `.bashrc`:
```go
git() {
if [ $# -gt 0 ] && [[ "$1" == "commit" ]] ; then
shift
command git commit --signoff "$@"
else
command git "$@"
fi
}
```
#### Docs Contribution
The documentation for Open-IM-Server includes:
+ [README.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/README.md): This file includes the basic information and instructions for getting started with Open-IM-Server.
+ [CONTRIBUTING.md](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md): This file contains guidelines for contributing to Open-IM-Server's codebase, such as how to submit issues, pull requests, and code reviews.
+ [Official Documentation](https://doc.rentsoft.cn/): This is the official documentation for Open-IM-Server, which includes comprehensive information on all of its features, configuration options, and troubleshooting tips.
Please obey the following rules to better format the docs, which would greatly improve the reading experience.
1. Please do not use Chinese punctuations in English docs, and vice versa.
2. Please use upper case letters where applicable, like the first letter of sentences / headings, etc.
3. Please specify a language for each Markdown code blocks, unless there's no associated languages.
4. Please insert a whitespace between Chinese and English words.
5. Please use the correct case for technical terms, such as using `HTTP` instead of http, `MySQL` rather than mysql, `Kubernetes` instead of kubernetes, etc.
6. Please check if there's any typos in the docs before submitting PRs.
## Engage to help anything
We choose GitHub as the primary place for Open-IM-Server to collaborate. So the latest updates of Open-IM-Server are always here. Although contributions via PR is an explicit way to help, we still call for any other ways.
+ reply to other's [issues](https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) if you could;
+ help solve other user's problems;
+ help review other's [PR](https://github.com/OpenIMSDK/Open-IM-Server/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) design;
+ discuss about Open-IM-Server to make things clearer;
+ advocate [Open-IM-Server](https://google.com/search?q=Open-IM-Server) technology beyond GitHub;
+ write blogs on Open-IM-Server and so on.
In a word, **ANY HELP IS CONTRIBUTION.**
## Release version
Releases of Open-IM-Server are done using [Release Please](https://github.com/googleapis/release-please) and [GoReleaser](https://goreleaser.com/). The workflow looks like this:
🎯 A PR is merged to the `main` branch:
+ Release please is triggered, creates or updates a new release PR
+ This is done with every merge to main, the current release PR is updated every time
🎯 Merging the 'release please' PR to `main`:
+ Release please is triggered, creates a new release and updates the changelog based on the commit messages
+ GoReleaser is triggered, builds the binaries and attaches them to the release
+ Containers are created and pushed to the container registry
With the next relevant merge, a new release PR will be created and the process starts again
**👀 Manually setting the version:**
If you want to manually set the version, you can create a PR with an empty commit message that contains the version number in the commit message. For example:
Such a commit can get produced as follows:
````bash
git commit --allow-empty -m "chore: release 0.0.3" -m "Release-As: 0.0.3
````
## Contact Us
We value close connections with our users, developers, and contributors here at Open-IM-Server. With a large community and maintainer team, we're always here to help and support you. Whether you're looking to join our community or have any questions or suggestions, we welcome you to get in touch with us.
Our most recommended way to get in touch is through [Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg). Even if you're in China, Slack is usually not blocked by firewalls, making it an easy way to connect with us. Our Slack community is the ideal place to discuss and share ideas and suggestions with other users and developers of Open-IM-Server. You can ask technical questions, seek help, or share your experiences with other users of Open-IM-Server.
In addition to Slack, we also offer the following ways to get in touch:
+ <a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg" target="_blank"><img src="https://img.shields.io/badge/slack-%40OpenIMSDKCore-informational?logo=slack&style=flat-square"></a>: We also have Slack channels for you to communicate and discuss. To join, visit https://slack.com/ and join our [👀 Open-IM-Server slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) team channel.
+ <a href="https://mail.google.com/mail/u/0/?fs=1&tf=cm&to=4closetool3@gmail.com" target="_blank"><img src="https://img.shields.io/badge/gmail-%40OOpenIMSDKCore?style=social&logo=gmail"></a>: Get in touch with us on [Gmail](winxu81@gmail.com). If you have any questions or issues that need resolving, or any suggestions and feedback for our open source projects, please feel free to contact us via email.
+ <a href="https://doc.rentsoft.cn/" target="_blank"><img src="https://img.shields.io/badge/%E5%8D%9A%E5%AE%A2-%40OpenIMSDKCore-blue?style=social&logo=Octopus%20Deploy"></a>: Read our [blog](https://doc.rentsoft.cn/). Our blog is a great place to stay up-to-date with Open-IM-Server projects and trends. On the blog, we share our latest developments, tech trends, and other interesting information.
+ <a href="https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg" target="_blank"><img src="https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-OpenIMSDKCore-brightgreen?logo=wechat&style=flat-square"></a>: Add [Wechat](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg) and indicate that you are a user or developer of Open-IM-Server. We will process your request as soon as possible.
Whether you're looking to join our community or have any questions or suggestions, we welcome you to get in touch with us.
-31
View File
@@ -1,31 +0,0 @@
# Build Stage
FROM golang:1.20 AS builder
# Set go mod installation source and proxy
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
# Set up the working directory
WORKDIR /openim/openim-server
COPY go.mod go.sum ./
RUN go mod download
# Copy all files to the container
ADD . .
RUN make clean
RUN make build
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR ${SERVER_WORKDIR}
# Copy scripts and binary files to the production image
COPY --from=builder ${OPENIM_SERVER_CMDDIR} /openim/openim-server/scripts
COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms
CMD ["bash","-c","${OPENIM_SERVER_CMDDIR}/docker_start_all.sh"]
-207
View File
@@ -1,207 +0,0 @@
# ==============================================================================
# define the default goal
#
.DEFAULT_GOAL := help
## all: Run tidy, gen, add-copyright, format, lint, cover, build ✨
.PHONY: all
all: tidy gen add-copyright format lint cover build
# ==============================================================================
# Build set
ROOT_PACKAGE=github.com/OpenIMSDK/Open-IM-Server
# TODO: This is version control for the future https://github.com/OpenIMSDK/Open-IM-Server/issues/574
VERSION_PACKAGE=github.com/OpenIMSDK/Open-IM-Server/pkg/version
# ==============================================================================
# Includes
include scripts/make-rules/common.mk # make sure include common.mk at the first include line
include scripts/make-rules/golang.mk
include scripts/make-rules/image.mk
include scripts/make-rules/copyright.mk
include scripts/make-rules/gen.mk
include scripts/make-rules/dependencies.mk
include scripts/make-rules/tools.mk
include scripts/make-rules/release.mk
include scripts/make-rules/swagger.mk
# ==============================================================================
# Usage
define USAGE_OPTIONS
Options:
DEBUG Whether or not to generate debug symbols. Default is 0.
BINS Binaries to build. Default is all binaries under cmd.
This option is available when using: make {build}(.multiarch)
Example: make build BINS="openim-api openim-cmdutils".
PLATFORMS Platform to build for. Default is linux_arm64 and linux_amd64.
This option is available when using: make {build}.multiarch
Example: make multiarch PLATFORMS="linux_s390x linux_mips64
linux_mips64le darwin_amd64 windows_amd64 linux_amd64 linux_arm64".
V Set to 1 enable verbose build. Default is 0.
endef
export USAGE_OPTIONS
# ==============================================================================
# Targets
## build: Build binaries by default ✨
.PHONY: build
build:
@$(MAKE) go.build
## multiarch: Build binaries for multiple platforms. See option PLATFORMS. ✨
.PHONY: multiarch
multiarch:
@$(MAKE) go.build.multiarch
## install: Install deployment openim ✨
.PHONY: install
install:
@$(MAKE) go.install
## check: Check OpenIM deployment ✨
.PHONY: check
check:
@$(MAKE) go.check
## tidy: tidy go.mod ✨
.PHONY: tidy
tidy:
@$(GO) mod tidy
## vendor: vendor go.mod ✨
.PHONY: vendor
vendor:
@$(GO) mod vendor
## style: code style -> fmt,vet,lint ✨
.PHONY: style
style: fmt vet lint
## fmt: Run go fmt against code. ✨
.PHONY: fmt
fmt:
@$(GO) fmt ./...
## vet: Run go vet against code. ✨
.PHONY: vet
vet:
@$(GO) vet ./...
## lint: Check syntax and styling of go sources. ✨
.PHONY: lint
lint:
@$(MAKE) go.lint
## format: Gofmt (reformat) package sources (exclude vendor dir if existed). ✨
.PHONY: format
format:
@$(MAKE) go.format
## test: Run unit test. ✨
.PHONY: test
test:
@$(MAKE) go.test
## cover: Run unit test and get test coverage. ✨
.PHONY: cover
cover:
@$(MAKE) go.test.cover
## updates: Check for updates to go.mod dependencies. ✨
.PHONY: updates
@$(MAKE) go.updates
## imports: task to automatically handle import packages in Go files using goimports tool. ✨
.PHONY: imports
imports:
@$(MAKE) go.imports
## clean: Remove all files that are created by building. ✨
.PHONY: clean
clean:
@$(MAKE) go.clean
## image: Build docker images for host arch. ✨
.PHONY: image
image:
@$(MAKE) image.build
## image.multiarch: Build docker images for multiple platforms. See option PLATFORMS. ✨
.PHONY: image.multiarch
image.multiarch:
@$(MAKE) image.build.multiarch
## push: Build docker images for host arch and push images to registry. ✨
.PHONY: push
push:
@$(MAKE) image.push
## push.multiarch: Build docker images for multiple platforms and push images to registry. ✨
.PHONY: push.multiarch
push.multiarch:
@$(MAKE) image.push.multiarch
## tools: Install dependent tools. ✨
.PHONY: tools
tools:
@$(MAKE) tools.install
## gen: Generate all necessary files. ✨
.PHONY: gen
gen:
@$(MAKE) gen.run
## swagger: Generate swagger document. ✨
.PHONY: swagger
swagger:
@$(MAKE) swagger.run
## serve-swagger: Serve swagger spec and docs. ✨
.PHONY: swagger.serve
serve-swagger:
@$(MAKE) swagger.serve
## verify-copyright: Verify the license headers for all files. ✨
.PHONY: verify-copyright
verify-copyright:
@$(MAKE) copyright.verify
## add-copyright: Add copyright ensure source code files have license headers. ✨
.PHONY: add-copyright
add-copyright:
@$(MAKE) copyright.add
## advertise: Project introduction, become a contributor ✨
.PHONY: advertise
advertise:
@$(MAKE) copyright.advertise
## release: release the project ✨
.PHONY: release
release: release.verify release.ensure-tag
@scripts/release.sh
## demo: Run demo ✨
.PHONY: demo
demo:
@$(MAKE) go.demo
## help: Show this help info. ✨
.PHONY: help
help: Makefile
$(call makehelp)
## help-all: Show all help details info. ✨
.PHONY: help-all
help-all: go.help copyright.help tools.help image.help dependencies.help gen.help release.help swagger.help help
$(call makeallhelp)
-265
View File
@@ -1,265 +0,0 @@
<h1 align="center" style="border-bottom: none">
<b>
<a href="https://doc.rentsoft.cn/">Open IM Server</a><br>
</b>
⭐️ Open source Instant Messaging Server ⭐️ <br>
</h1>
<p align=center>
<a href="https://goreportcard.com/report/github.com/OpenIMSDK/Open-IM-Server"><img src="https://goreportcard.com/badge/github.com/OpenIMSDK/Open-IM-Server" alt="A+"></a>
<a href="https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22"><img src="https://img.shields.io/github/issues/OpenIMSDK/Open-IM-Server/good%20first%20issue?logo=%22github%22" alt="good first"></a>
<a href="https://github.com/OpenIMSDK/Open-IM-Server"><img src="https://img.shields.io/github/stars/OpenIMSDK/Open-IM-Server.svg?style=flat&logo=github&colorB=deeppink&label=stars"></a>
<a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg"><img src="https://img.shields.io/badge/Slack-100%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
<a href="https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-Apache--2.0-green"></a>
<a href="https://golang.org/"><img src="https://img.shields.io/badge/Language-Go-blue.svg"></a>
</p>
</p>
<p align="center">
<a href="./README.md"><b>English</b></a> •
<a href="./README_zh-CN.md"><b>中文</b></a>
</p>
</p>
## Open-IM-Server 是什么
Open-IM-Server 是一款即时通讯服务器,使用纯 Golang 开发,采用 JSON over WebSocket 传输协议。在 Open-IM-Server 中,所有东西都是消息,因此您可以轻松扩展自定义消息,而无需修改服务器代码。使用微服务架构,Open-IM-Server 可以使用集群进行部署。通过在服务器上部署 Open-IM-Server,开发人员可以快速地将即时通讯和实时网络功能集成到自己的应用程序中,并确保业务数据的安全性和隐私性。
Open-IM-Server并不是一个独立的产品,本身不包含账号的注册和登录服务。
为方便大家测试,我们开源了包括登录注册功能的 [chat 仓库](https://github.com/OpenIMSDK/chat)chat 业务服务端和 Open-IM-Server 一起部署,即可搭建一个聊天产品。
## 特点
+ 开源
+ 易于集成
+ 良好的可扩展性
+ 高性能
+ 轻量级
+ 支持多种协议
## 社区
+ 访问中文官方网站:[OpenIM中文开发文档](https://doc.rentsoft.cn/)
## 快速开始
### 使用 docker-compose 部署
1. 克隆项目
```
git clone https://github.com/OpenIMSDK/Open-IM-Server
cd Open-IM-Server
git checkout release-v3.0 #or other release branch
```
2. 修改 .env
```
此处主要修改相关组件密码
USER=root #不用修改
PASSWORD=openIM123 #8位以上的数字和字母组合密码,密码对redis mysql mongo生效,以及config/config.yaml中的accessSecret
ENDPOINT=http://127.0.0.1:10005 #minio对外服务的ip和端口,或用域名storage.xx.xx,app要能访问到此ip和端口或域名,
API_URL=http://127.0.0.1:10002/object/ #app要能访问到此ip和端口或域名,
DATA_DIR=./ #指定大磁盘目录
```
3. 部署和启动
注意:此命令只能执行一次,它会根据.env 中的 PASSWORD 变量修改 docker-compose 中组件密码,并修改 config/config.yaml 中的组件密码
如果.env 中的密码变了,需要先 docker-compose down ; rm components -rf 后再执行此命令。
```
chmod +x install_im_server.sh;
./install_im_server.sh;
```
4. 检查服务
```
cd scripts;
./docker_check_service.sh
```
![https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png)
### 使用源码编译
1. Go 1.18或更高版本。
2. 克隆
```
git clone https://github.com/OpenIMSDK/Open-IM-Server
cd Open-IM-Server
git checkout release-v3.0 #or other release branch
```
3. 编译
```
cd Open-IM-server/scripts
chmod +x *.sh
./build_all_service.sh
```
所有服务已成功构建如图所示
![编译成功](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/build.png)
### 组件配置说明
config/config.yaml中针对存储组件有详细的配置说明
+ Zookeeper
+ 用于RPC 服务发现和注册,支持集群。
````
```
zookeeper:
schema: openim #不建议修改
address: [ 127.0.0.1:2181 ] #地址
username: #用户名
password: #密码
```
````
+ MySQL
+ 用于存储用户、关系链、群组,支持数据库主备。
```
mysql:
address: [ 127.0.0.1:13306 ] #地址
username: root #用户名
password: openIM123 #密码
database: openIM_v2 #不建议修改
maxOpenConn: 1000 #最大连接数
maxIdleConn: 100 #最大空闲连接数
maxLifeTime: 60 #连接可以重复使用的最长时间(秒)
logLevel: 4 #日志级别 1=slient 2=error 3=warn 4=info
slowThreshold: 500 #慢语句阈值 (毫秒)
```
+ Mongo
+ 用于存储离线消息,支持mongo分片集群。
```
mongo:
uri: #不为空则直接使用该值
address: [ 127.0.0.1:37017 ] #地址
database: openIM #mongo db 默认即可
username: root #用户名
password: openIM123 #密码
maxPoolSize: 100 #最大连接数
```
+ Redis
+ 用于存储消息序列号、最新消息、用户token及mysql缓存,支持集群部署。
```
redis:
address: [ 127.0.0.1:16379 ] #地址
username: #用户名
password: openIM123 #密码
```
+ Kafka
+ 用于消息队列,用于消息解耦,支持集群部署。
```
kafka:
username: #用户名
password: #密码
addr: [ 127.0.0.1:9092 ] #地址
latestMsgToRedis:
topic: "latestMsgToRedis"
offlineMsgToMongo:
topic: "offlineMsgToMongoMysql"
msgToPush:
topic: "msqToPush"
msgToModify:
topic: "msgToModify"
consumerGroupID:
msgToRedis: redis
msgToMongo: mongo
msgToMySql: mysql
msgToPush: push
msgToModify: modify
```
### 启停服务
启动服务
```
./start_all.sh;
```
检查服务
```
./check_all.sh
```
停止服务
```
./stop_all.sh
```
### 开放 IM 端口
| TCP 端口 | 说明 | 操作 |
| --------- | ----------------------------------------------------- | --------------------------------------- |
| TCP:10001 | ws 协议,消息端口,如消息发送、推送等,用于客户端 SDK | 端口放行或 nginx 反向代理,并关闭防火墙 |
| TCP:10002 | api 端口,如用户、好友、群组、消息等接口。 | 端口放行或 nginx 反向代理,并关闭防火墙 |
| TCP:10005 | 选择 minio 存储时需要(openIM 默认使用 minio 存储) | 端口放行或 nginx 反向代理,并关闭防火墙 |
### 开放 Chat 端口
| TCP 端口 | 说明 | 操作 |
| --------- | ------------------------ | --------------------------------------- |
| TCP:10008 | 业务系统,如注册、登录等 | 端口放行或 nginx 反向代理,并关闭防火墙 |
| TCP:10009 | 管理后台,如统计、封号等 | 端口放行或 nginx 反向代理,并关闭防火墙 |
## APP和OpenIM关系
OpenIM 是开源的即时通讯组件,它并不是一个独立的产品,此图展示了AppServer、AppClient、Open-IM-Server以及Open-IM-SDK之间的关系
![https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-server.png](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/open-im-server.png)
## 整体架构
![https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Architecture.jpg](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/Architecture.jpg)
## 开始开发 OpenIM
[社区存储库](https://github.com/OpenIMSDK/community)包含有关从源代码构建 Kubernetes、如何贡献代码和文档。
## 贡献
欢迎对该项目进行贡献!请参见 [CONTRIBUTING.md](http://CONTRIBUTING.md) 了解详细信息。
## 社区会议
我们希望任何人都能参与我们的社区,我们提供礼品和奖励,并欢迎您每周四晚上加入我们。
我们在 [GitHub 讨论](https://github.com/OpenIMSDK/Open-IM-Server/discussions/categories/meeting) 中记录每个 [两周会议](https://github.com/OpenIMSDK/Open-IM-Server/issues/381),我们的记录写在 [Google 文档](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing) 中。
## 谁在使用 Open-IM-Server
[用户案例研究](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) 页面包括该项目的用户列表。您可以留下 [📝评论](https://github.com/OpenIMSDK/Open-IM-Server/issues/379) 让我们知道您的用例。
![https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg)
## 许可证
Open-IM-Server 使用 Apache 2.0 许可证。有关详情,请参阅 LICENSE 文件。
+101 -312
View File
@@ -1,364 +1,153 @@
<p align="center">
<a href="https://www.openim.online">
<img src="./assets/logo-gif/openim-logo.gif" width="60%" height="30%"/>
</a>
</p>
# Open-IM-Server
![avatar](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg)
<h3 align="center" style="border-bottom: none">
⭐️ Open source Instant Messaging Server ⭐️ <br>
<h3>
![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-logo.png)
[![LICENSE](https://img.shields.io/badge/license-Apache--2.0-green)](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE) [![Language](https://img.shields.io/badge/Language-Go-blue.svg)](https://golang.org/)
<p align=center>
<a href="https://goreportcard.com/report/github.com/OpenIMSDK/Open-IM-Server"><img src="https://goreportcard.com/badge/github.com/OpenIMSDK/Open-IM-Server" alt="A+"></a>
<a href="https://github.com/OpenIMSDK/Open-IM-Server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22"><img src="https://img.shields.io/github/issues/OpenIMSDK/Open-IM-Server/good%20first%20issue?logo=%22github%22" alt="good first"></a>
<a href="https://github.com/OpenIMSDK/Open-IM-Server"><img src="https://img.shields.io/github/stars/OpenIMSDK/Open-IM-Server.svg?style=flat&logo=github&colorB=deeppink&label=stars"></a>
<a href="https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg"><img src="https://img.shields.io/badge/Slack-300%2B-blueviolet?logo=slack&amp;logoColor=white"></a>
<a href="https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-Apache--2.0-green"></a>
<a href="https://golang.org/"><img src="https://img.shields.io/badge/Language-Go-blue.svg"></a>
</p>
## Open-IM-Server: Open source Instant Messaging Server
</p>
Instant messaging server. Backend in pure Golang, wire transport protocol is JSON over websocket.
<p align="center">
<a href="./README.md"><b> English </b></a> •
<a href="./README-zh_CN.md"><b> 简体中文 </b></a> •
<a href="https://www.openim.online/en"><b> Docs </b></a>
</p>
Everything is a message in Open-IM-Server, so you can extend custom messages easily, there is no need to modify the server code.
Using microservice architectures, Open-IM-Server can be deployed using clusters.
</p>
By deployment of the Open-IM-Server on the customer's server, developers can integrate instant messaging and real-time network capabilities into their own applications free of charge and quickly, and ensure the security and privacy of business data.
## ✨ About OpenIM
## Features
Open-IM-Server, crafted meticulously using pure Golang, stands as a robust instant messaging server. Its unique approach to communication, via JSON over WebSocket, treats every interaction as a message. This simplifies customization and eliminates the need for tinkering with server code. Harnessing the power of microservice architecture, the server can be deployed via clusters, promising impressive performance and scalability.
- Everything in Free
- Scalable architecture
- Easy integration
- Good scalability
- High performance
- Lightweight
- Supports multiple protocols
Open-IM-Server is more than an instant messaging server; it's a powerful tool for incorporating real-time networking into your applications, positioning itself as your premier choice for integration! 🚀
## Community
Please be aware that Open-IM-Server does not function as a standalone product and does not offer built-in account registration or login services. To ease your implementation process, we've open-sourced the [chat repository](https://github.com/OpenIMSDK/chat), which comprises these features. Deploying this chat business server in conjunction with Open-IM-Server expedites the setup of a comprehensive chat product. 👥
- 中文官网访问这里:[Open-IM中文开发文档](https://doc.rentsoft.cn/)
Further enhancing your experience, we also provide an SDK client, wherein most complex logics are implemented. The [SDK repository](https://github.com/OpenIMSDK/openim-sdk-core) can be found at [this link](https://github.com/OpenIMSDK/openim-sdk-core). The [chat repository](https://github.com/OpenIMSDK/chat) is our business server while the 'core' represents the high-level encapsulation of the SDK, synergistically working together to deliver superior results. ✨
## Quick start
## :star2: Why OpenIM
### Installing Open-IM-Server
**🔍 Function screenshot display**
> Open-IM relies on five open source high-performance components: ETCD, MySQL, MongoDB, Redis, and Kafka. Privatization deployment Before Open-IM-Server, please make sure that the above five components have been installed. If your server does not have the above components, you must first install Missing components. If you have the above components, it is recommended to use them directly. If not, it is recommended to use Docker-compose, no To install dependencies, one-click deployment, faster and more convenient.
<div align="center">
#### Deploy using Docker
| 💻🔄📱 Multi Terminal Synchronization 🔄🖥️ | 📅⚡ Efficient Meetings 🚀💼 |
| :----------------------------------------------------------: | :---------------------------------------------------------: |
| ![multiple-message](./assets/demo/multi-terminal-synchronization.png) | ![efficient-meetings](./assets/demo/efficient-meetings.png) |
| 📲🔄 **One-to-one and Group Chats** 👥🗣️ | 🎁💻 **Special Features - Custom Messages** ✉️🎨|
| ![group-chat](./assets/demo/group-chat.png) | ![special-function](./assets/demo/special-function.png) |
1. Install [Go environment](https://golang.org/doc/install). Make sure Go version is at least 1.17
</div>
2. Clone the Open-IM project to your server
1. **Comprehensive Message Type Support :speech_balloon:**
```
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
```
✅ Supports almost all types of messages, including text, images, emojis, voice, video, geographical location, files, quotes, business cards, system notifications, custom messages and more
3. Deploy
✅ Supports one-on-one and multi-person audio and video calls
1. Modify env
✅ Provides terminal support for multiple platforms such as iOS, Android, Flutter, uni-app, ReactNative, Electron, Web, H5
```
#cd Open-IM-server
USER=root
PASSWORD=openIM123 #Password with more than 8 digits, excluding special characters
ENDPOINT=http://127.0.0.1:10005 #Replace 127.0.0.1 with Internet IP
DATA_DIR=./
```
2. **Efficient Meetings Anytime, Anywhere :earth_americas:**
2. Deploy && Start
```
chmod +x install_im_server.sh;
./install_im_server.sh;
```
4. Check service
```
cd script;
./docker_check_service.sh./check_all.sh
```
![OpenIMServersonSystempng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM-Servers-on-System.png)
✅ Based on IM (Instant Messaging) with 100% reliable forced signaling capabilities, it paves the way for IM systems, deeply integrated with chat applications
#### Deploy using source code
✅ Supports hundreds of people in a single meeting, with subscription numbers reaching thousands, and server-side audio and video recording
1. Go 1.17 or above。
2. Clone
3. **One-on-one and Group Chats for Various Social Scenarios :busts_in_silhouette:**
OpenIM has four roles: application administrator, group owner, group administrator, and regular member
✅ Powerful group features such as muting, group announcements, group validation, unlimited group members, and loading group messages as needed
4. **Unique Features :star2:**
✅ Supports read-and-burn private chats, customizable duration
✅ Message editing function broadens social scenarios, making instant communication more diverse and interesting
5. **Open Source :open_hands:**
✅ The code of OpenIM is open source, self-controlled data, aimed at building a globally leading IM open source community, including client SDK and server
✅ Based on open source Server, many excellent open source projects have been developed, such as [OpenKF](https://github.com/OpenIMSDK/OpenKF) (Open source AI customer service system)
6. **Easy to Expand :wrench:**
✅ The OpenIM server is implemented in Golang, introducing an innovative "everything is a message" communication model, simplifying the implementation of custom messages and extended features
7. **High Performance :racing_car:**
✅ OpenIM supports a hierarchical governance architecture in the cluster, tested by a large number of users, and abstracts the storage model of online messages, offline messages, and historical messages
8. **Full Platform Support :tv:**
✅ Supports native iOS, Android; cross-platform Flutter, uni-app, ReactNative; major web front-end frameworks such as React, Vue; applets; and PC platforms supported by Electron
9. **The ultimate deployment experience 🤖**
✅ Supports [cluster deployment](https://github.com/OpenIMSDK/Open-IM-Server/edit/main/deployments/README.md)
✅ Supports multi-architecture mirroring, our Docker images are hosted not only on GitHub but also on Alibaba Cloud and Docker Hub supporting multiple architectures. Visit [our GitHub packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server) and read our [version management document](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md) for more information.
11. **A large ecosystem of open source communities 🤲**
✅ We have tens of thousands of users and many solutions to problems.
✅ We have a large open source community called [OpenIMSDK](https://github.com/OpenIMSDK) that runs the core modules, we have an open source community called [openim-sigs](https://github.com/openim-sigs) to explore more IM-based infrastructure products.
## :rocket: Quick Start
<details> <summary>Deploying with Docker Compose</summary>
1. Clone the project
```bash
# choose what you need
BRANCH=release-v3.1
git clone -b $BRANCH https://github.com/OpenIMSDK/Open-IM-Server openim && export openim=$(pwd)/openim && cd $openim && make build
```shell
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
cd cmd/Open-IM-SDK-Core
git checkout main
```
> **Note**
> Read our release policy: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md
1. Set executable permissions
2. Modify `.env`
```bash
USER=root #no need to modify
PASSWORD=openIM123 #A combination of 8 or more numbers and letters, this password applies to redis, mysql, mongo, as well as accessSecret in config/config.yaml
ENDPOINT=http://127.0.0.1:10005 #minio's external service IP and port, or use the domain name storage.xx.xx, the app must be able to access this IP and port or domain,
API_URL=http://127.0.0.1:10002/object/ #the app must be able to access this IP and port or domain,
DATA_DIR=./ #designate large disk directory
```shell
cd ../../script/
chmod +x *.sh
```
3. Deploy and start
1. build
> **Note**
> This command can only be executed once. It will modify the component passwords in docker-compose based on the `PASSWORD` variable in `.env`, and modify the component passwords in `config/config.yaml`. If the password in `.env` changes, you need to first execute `docker-compose down`; `rm components -rf` and then execute this command.
```bash
make install
```shell
./batch_build_all_service.sh
```
4. Check the service
all services build success
```bash
make check
```
### CONFIGURATION INSTRUCTIONS
![https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/docker_build.png)
> Open-IM configuration is divided into basic component configuration and business internal service configuration. Developers need to fill in the address of each component as the address of their server component when using the product, and ensure that the internal service port of the business is not occupied
</details>
<details> <summary>Compile from Source</summary>
Ur need `Go 1.18` or higher version, and `make`.
Version Details: https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md
```bash
# choose what you need
BRANCH=release-v3.1
git clone -b $BRANCH https://github.com/OpenIMSDK/Open-IM-Server openim && export openim=$(pwd)/openim && cd $openim && make build
```
Read about the [OpenIM Version Policy](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md)
`make help` to help you see the instructions supported by OpenIM.
All services have been successfully built as shown in the figure
![Successful Compilation](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/build.png)
</details>
<details> <summary>Component Configuration Instructions</summary>
The config/config.yaml file has detailed configuration instructions for the storage components.
- Zookeeper
- Used for RPC service discovery and registration, cluster support.
```bash
zookeeper:
schema: openim #Not recommended to modify
address: [ 127.0.0.1:2181 ] #address
username: #username
password: #password
```
#### Basic Component Configuration Instructions
- ETCD
- Etcd is used for the discovery and registration of rpc services, etcd Schema is the prefix of the registered name, it is recommended to modify it to your company name, etcd address (ip+port) supports clustered deployment, you can fill in multiple ETCD addresses separated by commas, and also only one etcd address.
- MySQL
- Used for storing users, relationships, and groups, supports master-slave database.
```bash
mysql:
address: [ 127.0.0.1:13306 ] #address
username: root #username
password: openIM123 #password
database: openIM_v2 #Not recommended to modify
maxOpenConn: 1000 #maximum connection
maxIdleConn: 100 #maximum idle connection
maxLifeTime: 60 #maximum time a connection can be reused (seconds)
logLevel: 4 #log level 1=slient 2=error 3=warn 4=info
slowThreshold: 500 #slow statement threshold (milliseconds)
```
- mysql is used for full storage of messages and user relationships. Cluster deployment is not supported for the time being. Modify addresses and users, passwords, and database names.
- Mongo
- Used for storing offline messages, supports mongo sharded clusters.
```bash
mongo:
uri: #Use this value directly if not empty
address: [ 127.0.0.1:37017 ] #address
database: openIM #default mongo db
username: root #username
password: openIM123 #password
maxPoolSize: 100 #maximum connections
```
- Mongo is used for offline storage of messages. The default storage is 7 days. Cluster deployment is temporarily not supported. Just modify the address and database name.
- Redis
- Used for storing message sequence numbers, latest messages, user tokens, and mysql cache, supports cluster deployment.
```bash
redis:
address: [ 127.0.0.1:16379 ] #address
username: #username
password: openIM123 #password
```
- Redis is currently mainly used for message serial number storage and user token information storage. Cluster deployment is temporarily not supported. Just modify the corresponding redis address and password.
- Kafka
- Kafka is used as a message transfer storage queue to support cluster deployment, just modify the corresponding address
- Used for message queues, for message decoupling, supports cluster deployment.
#### Internal Service Configuration Instructions
```bash
kafka:
username: #username
password: #password
addr: [ 127.0.0.1:9092 ] #address
latestMsgToRedis:
topic: "latestMsgToRedis"
offlineMsgToMongo:
topic: "offlineMsgToMongoMysql"
msgToPush:
topic: "msqToPush"
msgToModify:
topic: "msgToModify"
consumerGroupID:
msgToRedis: redis
msgToMongo: mongo
msgToMySql: mysql
msgToPush: push
msgToModify: modify
```
- credential&&push
- The Open-IM needs to use the three-party offline push function. Currently, Tencent's three-party push is used. It supports IOS, Android and OSX push. This information is some registration information pushed by Tencent. Developers need to go to Tencent Cloud Mobile Push to register the corresponding information. If you do not fill in the corresponding information, you cannot use the offline message push function
- api&&rpcport&&longconnsvr&&rpcregistername
- The api port is the http interface, longconnsvr is the websocket listening port, and rpcport is the internal service startup port. Both support cluster deployment. Make sure that these ports are not used. If you want to open multiple services for a single service, fill in multiple ports separated by commas. rpcregistername is the service name registered by each service to the registry etcd, no need to modify
- log&&modulename
- The log configuration includes the storage path of the log file, and the log is sent to elasticsearch for log viewing. Currently, the log is not supported to be sent to elasticsearch. The configuration does not need to be modified for the time being. The modulename is used to split the log according to the name of the service module. The default configuration is fine.
- multiloginpolicy&&tokenpolicy
- Open-IM supports multi-terminal login. Currently, there are three multi-terminal login policies. The PC terminal and the mobile terminal are online at the same time by default. When multiple policies are configured to be true, the first policy with true is used by default, and the token policy is the generated token policy. , The developer can customize the expiration time of the token
</details>
### SCRIPT DESCRIPTION
<details> <summary>Start and Stop Services</summary>
> Open-IM script provides service compilation, start, and stop scripts. There are four Open-IM script start modules, one is the http+rpc service start module, the second is the websocket service start module, then the msg_transfer module, and the last is the push module
Start services
- path_info.cfg&&style_info.cfg&&functions.sh
- Contains the path information of each module, including the path where the source code is located, the name of the service startup, the shell print font style, and some functions for processing shell strings
- build_all_service.sh
- Compile the module, compile all the source code of Open-IM into a binary file and put it into the bin directory
- start_rpc_api_service.sh&&msg_gateway_start.sh&&msg_transfer_start.sh&&push_start.sh
- Independent script startup module, followed by api and rpc modules, message gateway module, message transfer module, and push module
- start_all.sh&&stop_all.sh
- Total script, start all services and close all services
```
./scripts/start_all.sh;
```
## Authentication Clow Chart
Check services
![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-server.png)
```
./scripts/check_all.sh
```
## Architecture
Stop services
![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Architecture.jpg)
```
./scripts/stop_all.sh
```
## License
</details>
<details> <summary>Open IM Ports</summary>
| TCP Port | Description | Operation |
| --------- | ------------------------------------------------------------ | ----------------------------------------------------- |
| TCP:10001 | ws protocol, message port such as message sending, pushing etc, used for client SDK | Port release or nginx reverse proxy, and firewall off |
| TCP:10002 | api port, such as user, friend, group, message interfaces. | Port release or nginx reverse proxy, and firewall off |
| TCP:10005 | Required when choosing minio storage (openIM uses minio storage by default) | Port release or nginx reverse proxy, and firewall off |
</details>
<details> <summary>Open Chat Ports</summary>
+ chat warehouse: https://github.com/OpenIMSDK/chat
| TCP Port | Description | Operation |
| --------- | --------------------------------------------------- | ----------------------------------------------------- |
| TCP:10008 | Business system, such as registration, login etc | Port release or nginx reverse proxy, and firewall off |
| TCP:10009 | Management backend, such as statistics, banning etc | Port release or nginx reverse proxy, and firewall off |
</details>
## :link: Relationship Between APP and OpenIM
OpenIM isn't just an open-source instant messaging component, it's an integral part of your application ecosystem. Check out this diagram to understand how AppServer, AppClient, Open-IM-Server, and Open-IM-SDK interact.
![App-OpenIM Relationship](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/open-im-server.png)
## :building_construction: Overall Architecture
Delve into the heart of Open-IM-Server's functionality with our architecture diagram.
![Overall Architecture](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/images/Architecture.jpg)
## :hammer_and_wrench: To start developing OpenIM
OpenIM Our goal is to build a top-level open source community. We have a set of standards, in the [Community repository](https://github.com/OpenIMSDK/community).
If you'd like to contribute to this Open-IM-Server repository, please read our [contributor documentation](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/CONTRIBUTING.md).
Before you start, please make sure your changes are in demand. The best for that is to create a [new discussion](https://github.com/OpenIMSDK/Open-IM-Server/discussions/new/choose) OR [Slack Communication](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg), or if you find an issue, [report it](https://github.com/OpenIMSDK/Open-IM-Server/issues/new/choose) first.
- [Code Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/go_code.md)
- [Docker Images Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/images.md)
- [Directory Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/directory.md)
- [Commit Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/commit.md)
- [Versioning Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/version.md)
- [Interface Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/api.md)
- [Log Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/log.md)
- [Error Code Standards](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/conversions/error_code.md)
## :busts_in_silhouette: Community
+ 📚 [OpenIM Community](https://github.com/OpenIMSDK/community)
+ 💕 [OpenIM Interest Group](https://github.com/Openim-sigs)
+ 🚀 [Join our Slack community](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg)
+ :eyes: [Join our wechat (微信群)](https://openim-1253691595.cos.ap-nanjing.myqcloud.com/WechatIMG20.jpeg)
## :calendar: Community Meetings
We want anyone to get involved in our community and contributing code, we offer gifts and rewards, and we welcome you to join us every Thursday night.
Our conference is in the [OpenIM Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-1tmoj26uf-_FDy3dowVHBiGvLk9e5Xkg) 🎯, then you can search the Open-IM-Server pipeline to join
We take notes of each [biweekly meeting](https://github.com/orgs/OpenIMSDK/discussions/categories/meeting) in [GitHub discussions](https://github.com/OpenIMSDK/Open-IM-Server/discussions/categories/meeting), Our historical meeting notes, as well as replays of the meetings are available at [Google Docs :bookmark_tabs:](https://docs.google.com/document/d/1nx8MDpuG74NASx081JcCpxPgDITNTpIIos0DS6Vr9GU/edit?usp=sharing).
## :eyes: Who are using OpenIM
Check out our [user case studies](https://github.com/OpenIMSDK/community/blob/main/ADOPTERS.md) page for a list of the project users. Don't hesitate to leave a [📝comment](https://github.com/OpenIMSDK/Open-IM-Server/issues/379) and share your use case.
## :page_facing_up: License
OpenIM is licensed under the Apache 2.0 license. See [LICENSE](https://github.com/OpenIMSDK/Open-IM-Server/tree/main/LICENSE) for the full license text.
The OpenIM logo, including its variations and animated versions, displayed in this repository [OpenIM](https://github.com/OpenIMSDK/Open-IM-Server) under the [assets/logo](./assets/logo) and [assets/logo-gif](assets/logo-gif) directories, are protected by copyright laws.
## 🔮 Thanks to our contributors!
<a href="https://github.com/OpenIMSDK/Open-IM-Server/graphs/contributors">
<img src="https://contrib.rocks/image?repo=OpenIMSDK/Open-IM-Server" />
</a>
Open-IM-Server is under the Apache 2.0 license. See the [LICENSE](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE) file for details
-32
View File
@@ -1,32 +0,0 @@
# `/assets`
The `/assets` directory in the OpenIM repository contains various assets such as images, logos, and animated GIFs. These assets serve different purposes and contribute to the functionality and aesthetics of the OpenIM project.
## Directory Structure:
```bash
assets/
├── README.md # Documentation for the assets directory
├── images # Directory holding images related to OpenIM
│ ├── architecture.png # Image depicting the architecture of OpenIM
│ └── mvc.png # Image illustrating the Model-View-Controller (MVC) pattern
├── intive-slack.png # Image displaying the Intive Slack logo
├── logo # Directory containing various logo variations for OpenIM
│ ├── openim-logo-black.png # OpenIM logo with a black background
│ ├── openim-logo-blue.png # OpenIM logo with a blue background
│ ├── openim-logo-green.png # OpenIM logo with a green background
│ ├── openim-logo-purple.png # OpenIM logo with a purple background
│ ├── openim-logo-white.png # OpenIM logo with a white background
│ ├── openim-logo-yellow.png # OpenIM logo with a yellow background
│ └── openim-logo.png # OpenIM logo with a transparent background
└── logo-gif # Directory containing animated GIF versions of the OpenIM logo
└── openim-log.gif # Animated OpenIM logo with a transparent background
```
## Copyright Notice:
The OpenIM logo, including its variations and animated versions, displayed in this repository [OpenIM](https://github.com/OpenIMSDK/openim) under the `/assets/logo` and `/assets/logo-gif` directories, are protected by copyright laws.
The logo design is credited to @Xx(席欣).
Please respect the intellectual property rights and refrain from unauthorized use and distribution of these assets.
-14
View File
@@ -1,14 +0,0 @@
## :star2: Why OpenIM
**🔍 Function screenshot display**
<div align="center">
| multiple message | Efficient meetings |
| :---------------------------------------: | :---------------------------------------------: |
| ![multiple-message](./multiple-message.png) | ![efficient-meetings](./efficient-meetings.png) |
| **One-to-one and group chats** | **Special features - Custom messages** |
| ![group-chat](./group-chat.png) | ![special-function](./special-function.png) |
</div>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 418 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 931 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

-1
View File
@@ -1 +0,0 @@
# The OpenIM logo files are licensed under a choice of either Apache-2.0 or CC-BY-4.0 (Creative Commons Attribution 4.0 International).
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 MiB

-1
View File
@@ -1 +0,0 @@
# The OpenIM logo files are licensed under a choice of either Apache-2.0 or CC-BY-4.0 (Creative Commons Attribution 4.0 International).
Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.
File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.
File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 58 KiB

-49
View File
@@ -1,49 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-api
# FROM ghcr.io/openim-sigs/openim-bash-image:latest
FROM test:v1
WORKDIR /openim/openim-server
RUN mkdir -p /openim/openim-server/$(cat ~/os)/$(cat ~/arch)/bin
RUN mkdir -p /openim/openim-server/go/$(go env GOOS)/$(go env GOARCH)/bin
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE ${10002}
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-api --port 10002 -c ${SERVER_WORKDIR}/config"]
-45
View File
@@ -1,45 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN go mod download
RUN make clean
RUN make build BINS=openim-cmdutils
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
COPY --from=builder ${SERVER_WORKDIR}/_output/bin/platforms /openim/openim-server/_output/bin/platforms
COPY --from=builder ${SERVER_WORKDIR}/config /openim/openim-server/config
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-cmdutils"]
-44
View File
@@ -1,44 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-crontask
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-crontask"]
-50
View File
@@ -1,50 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-msggateway
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
ENV OS ${OS}
ENV ARCH ${ARCH}
EXPOSE 10140
EXPOSE 10001
CMD ${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-msggateway --port 10140 --ws_port 10001
@@ -1,47 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-msgtransfer
FROM ghcr.io/openim-sigs/openim-bash-image:latest
ENV OS ${OS}
ENV ARCH ${ARCH}
WORKDIR /openim/openim-server
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
CMD ${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-msgtransfer
-49
View File
@@ -1,49 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-push
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10170
CMD ${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-push --port 10170
-52
View File
@@ -1,52 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
# RUN make build BINS=openim-rpc
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth ./cmd/openim-rpc/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10160
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-auth --port 10160 -c ${SERVER_WORKDIR}/config"]
@@ -1,59 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-rpc
# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation ./cmd/openim-rpc/openim-rpc-conversation
RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10230
EXPOSE 20230
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-conversation --port 10230 --prometheus_port 20230 -c ${SERVER_WORKDIR}/config"]
-59
View File
@@ -1,59 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-rpc
# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend ./cmd/openim-rpc/openim-rpc-friend
RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10120
EXPOSE 20120
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-friend --port 10120 --prometheus_port 20120 -c ${SERVER_WORKDIR}/config"]
-59
View File
@@ -1,59 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-rpc
# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group ./cmd/openim-rpc/openim-rpc-group
RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10150
EXPOSE 20150
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-group --port 10150 --prometheus_port 20150 -c ${SERVER_WORKDIR}/config"]
-59
View File
@@ -1,59 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-rpc
# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg ./cmd/openim-rpc/openim-rpc-msg
RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10130
EXPOSE 20130
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-msg --port 10130 --prometheus_port 20130 -c ${SERVER_WORKDIR}/config"]
-58
View File
@@ -1,58 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-rpc
# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third ./cmd/openim-rpc/openim-rpc-third
RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10200
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-third --port 10200 -c ${SERVER_WORKDIR}/config"]
-58
View File
@@ -1,58 +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.
# OpenIM base image: https://github.com/openim-sigs/openim-base-image
# Set go mod installation source and proxy
FROM golang:1.20 AS builder
ARG GO111MODULE=on
ARG GOPROXY=https://goproxy.cn,direct
WORKDIR /openim/openim-server
ENV GO111MODULE=$GO111MODULE
ENV GOPROXY=$GOPROXY
COPY go.mod go.sum ./
RUN go mod download
COPY . .
RUN make clean
RUN make build BINS=openim-rpc
# RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-user ./cmd/openim-rpc/openim-rpc-user
RUN rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-friend && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-group && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-msg && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-third && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-conversation && \
rm -rf ./_output/bin/platforms/$(go env GOOS)/$(go env GOARCH)/openim-rpc-auth
FROM ghcr.io/openim-sigs/openim-bash-image:latest
WORKDIR /openim/openim-server
ENV OS ${OS}
ENV ARCH ${ARCH}
COPY --from=builder /openim/openim-server/_output/bin/platforms /openim/openim-server/_output/bin/platforms/
COPY --from=builder /openim/openim-server/config /openim/openim-server/config
EXPOSE 10110
CMD ["bash", "-c","${OPENIM_SERVER_BINDIR}/platforms/${OS}/${ARCH}/openim-rpc-user --port 10110 -c ${SERVER_WORKDIR}/config"]

Some files were not shown because too many files have changed in this diff Show More