Commit Graph

900 Commits

Author SHA1 Message Date
wangchuxiao 2c2d3e4641 cms 2022-08-30 02:02:41 +08:00
wangchuxiao 42f7af3d52 cms 2022-08-30 01:42:27 +08:00
wangchuxiao 8d4e5ad3f1 cms 2022-08-30 01:38:23 +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 7f5b12d4d2 cms 2022-08-29 15:52:39 +08:00
wangchuxiao 3886d49b0a admin cms 2022-08-26 17:51:01 +08:00
Gordon 27dd574c4d err log 2022-08-24 20:33:41 +08:00
Gordon ec0cd9a348 conversation update 2022-08-23 12:06:44 +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 7d04f06f7d conversation fix 2022-08-22 15:47:50 +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 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 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
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 85a52f5d6b get grpc conn from config 2022-08-17 11:42:12 +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 2016a1656b Merge branch 'v2.3.0release' into del 2022-08-16 12:17:07 +08:00
wangchuxiao 3f74022142 Merge branch 'main' into del 2022-08-15 21:51:12 +08:00
wangchuxiao ad1015c8b0 fix code 2022-08-15 20:41:46 +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 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 919e2543ca fix code 2022-08-15 19:50:13 +08:00
wangchuxiao b705ac24fa fix code 2022-08-15 19:27:23 +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 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
wangchuxiao d5239365be hide jwt not active yet 2022-08-14 23:34:51 +08:00
欧阳氏 ac7f905248 完善 用户注册 用户更新 2022-08-14 22:53:41 +08:00