Compare commits

..

3623 Commits

Author SHA1 Message Date
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 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 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
1079 changed files with 107035 additions and 80816 deletions
-28
View File
@@ -1,28 +0,0 @@
# Ignore files and directories starting with a dot
# Ignore specific files
.dockerignore
.git
# Ignore build artifacts
logs/
_output/
# Ignore non-essential documentation
README.md
README-zh_CN.md
CONTRIBUTING.md
CHANGELOG/
# LICENSE
# Ignore testing and linting configuration
.golangci.yml
# Ignore assets
assets/
# Ignore components
components/
# Ignore tools and scripts
.github/
-24
View File
@@ -1,24 +0,0 @@
MONGO_IMAGE=mongo:7.0
REDIS_IMAGE=redis:7.0.0
KAFKA_IMAGE=bitnamilegacy/kafka:3.5.1
MINIO_IMAGE=minio/minio:RELEASE.2024-01-11T07-46-16Z
ETCD_IMAGE=bitnamilegacy/etcd:3.5.13
PROMETHEUS_IMAGE=prom/prometheus:v2.45.6
ALERTMANAGER_IMAGE=prom/alertmanager:v0.27.0
GRAFANA_IMAGE=grafana/grafana:11.0.1
NODE_EXPORTER_IMAGE=prom/node-exporter:v1.7.0
OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.8.3
OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.4
#FRONT_IMAGE: use aliyun images
#OPENIM_WEB_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web-front:release-v3.8.3
#OPENIM_ADMIN_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-admin-front:release-v1.8.4
DATA_DIR=./
MONGO_BACKUP_DIR=${DATA_DIR}components/backup/mongo/
PROMETHEUS_PORT=19091
ALERTMANAGER_PORT=19093
GRAFANA_PORT=13000
-1
View File
@@ -1 +0,0 @@
*.sh text eol=lf
-26
View File
@@ -1,26 +0,0 @@
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
tools: # declare a new status context "tools"
paths:
- tools/* # only include coverage in "tools/" folder
informational: true # Always pass check
test: # declare a new status context "test"
paths:
- test/* # only include coverage in "test/" folder
informational: true # Always pass check
# internal: # declare a new status context "internal"
# paths:
# - internal/* # only include coverage in "internal/" folder
# informational: true # Always pass check
# cmd: # declare a new status context "cmd"
# paths:
# - cmd/* # only include coverage in "cmd/" 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:
<!---->
-65
View File
@@ -1,65 +0,0 @@
name: Bug Report
title: "[BUG] "
labels: ["bug"]
description: "Create a detailed report to help us identify and resolve issues."
# assignees: []
body:
- type: markdown
attributes:
value: "Thank you for taking the time to fill out the bug report. Please provide as much information as possible to help us understand and replicate the bug."
- type: input
id: openim-server-version
attributes:
label: OpenIM Server Version
description: "Please provide the version number of OpenIM Server you are using."
placeholder: "e.g., 3.8.0"
validations:
required: true
- type: dropdown
id: operating-system
attributes:
label: Operating System and CPU Architecture
description: "Please select the operating system and describe the CPU architecture."
options:
- Linux (AMD)
- Linux (ARM)
- Windows (AMD)
- Windows (ARM)
- macOS (AMD)
- macOS (ARM)
validations:
required: true
- type: dropdown
id: deployment-method
attributes:
label: Deployment Method
description: "Please specify how OpenIM Server was deployed."
options:
- Source Code Deployment
- Docker Deployment
validations:
required: true
- type: textarea
id: bug-description-reproduction
attributes:
label: Bug Description and Steps to Reproduce
description: "Provide a detailed description of the bug and a step-by-step guide on how to reproduce it."
placeholder: "Describe the bug in detail here...\n\nSteps to reproduce the bug on the server:\n1. Start the server with specific configurations (mention any relevant config details).\n2. Make an API call to '...' endpoint with the following payload '...'.\n3. Observe the behavior and note any error messages or logs.\n4. Mention any additional setup relevant to the bug (e.g., database version, external service dependencies)."
validations:
required: true
- type: markdown
attributes:
value: "If possible, please add screenshots to help explain your problem."
- type: textarea
id: screenshots-link
attributes:
label: Screenshots Link
description: "If applicable, please provide any links to screenshots here."
placeholder: "Paste your screenshot URL here, e.g., http://imgur.com/example"
-11
View File
@@ -1,11 +0,0 @@
blank_issues_enabled: false
contact_links:
# - name: "Bug Report"
# description: "Report a bug in the project"
# file: "bug-report.yml"
- name: 📢 Connect on slack
url: https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A
about: Support OpenIM-related requests or issues, get in touch with developers and help on slack
- name: 🌐 OpenIM Blog
url: https://www.openim.io/
about: Open the OpenIM community blog
@@ -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
-65
View File
@@ -1,65 +0,0 @@
name: Deployment issue
title: "[Deployment] "
labels: ["deployment"]
description: "Create a detailed report to help us identify and resolve deployment issues."
# assignees: []
body:
- type: markdown
attributes:
value: "Thank you for taking the time to fill out the deployment issue report. Please provide as much information as possible to help us understand and resolve the issue."
- type: input
id: openim-server-version
attributes:
label: OpenIM Server Version
description: "Please provide the version number of OpenIM Server you are using."
placeholder: "e.g., 3.8.0"
validations:
required: true
- type: dropdown
id: operating-system
attributes:
label: Operating System and CPU Architecture
description: "Please select the operating system and describe the CPU architecture."
options:
- Linux (AMD)
- Linux (ARM)
- Windows (AMD)
- Windows (ARM)
- macOS (AMD)
- macOS (ARM)
validations:
required: true
- type: dropdown
id: deployment-method
attributes:
label: Deployment Method
description: "Please specify how OpenIM Server was deployed."
options:
- Source Code Deployment
- Docker Deployment
validations:
required: true
- type: textarea
id: issue-description-reproduction
attributes:
label: Issue Description and Steps to Reproduce
description: "Provide a detailed description of the issue and a step-by-step guide on how to reproduce it."
placeholder: "Describe the issue in detail here...\n\nSteps to reproduce the issue on the server:\n1. Start the server with specific configurations (mention any relevant config details).\n2. Make an API call to '...' endpoint with the following payload '...'.\n3. Observe the behavior and note any error messages or logs.\n4. Mention any additional setup relevant to the bug (e.g., database version, external service dependencies)."
validations:
required: true
- type: markdown
attributes:
value: "If possible, please add screenshots to help explain your problem."
- type: textarea
id: screenshots-link
attributes:
label: Screenshots Link
description: "If applicable, please provide any links to screenshots here."
placeholder: "Paste your screenshot URL here, e.g., http://imgur.com/example"
-20
View File
@@ -1,20 +0,0 @@
---
name: Documentation Update
about: Propose updates to documentation, including README files and other docs.
title: "[DOC]: " # Prefix for the title to help identify documentation issues
labels: documentation # Labels to be automatically added
assignees: '' # Optionally, specify maintainers or teams to be auto-assigned
---
## Documentation Updates
Describe the documentation that needs to be updated or corrected. Please specify the files and sections if possible.
## Motivation
Explain why these updates are necessary. What is missing, misleading, or outdated?
## Suggested Changes
Detail the changes that you propose. If you are suggesting large changes, include examples or mockups of what the updated documentation should look like.
## Additional Information
Include any other information that might be relevant, such as links to discussions or related issues in the repository.
@@ -1,43 +0,0 @@
name: Feature Request
title: "[FEATURE REQUEST] "
labels: ["feature request","enhancement"]
description: "Propose a new feature or improvement that you believe will help enhance the project."
# assignees: []
body:
- type: markdown
attributes:
value: "Thank you for taking the time to propose a feature request. Please fill in as much detail as possible to help us understand why this feature is necessary and how it should work."
- type: textarea
id: feature-reason
attributes:
label: Why this feature?
description: "Explain why this feature is needed. What problem does it solve? How does it benefit the project and its users?"
placeholder: "Describe the need for this feature..."
validations:
required: true
- type: textarea
id: solution-proposal
attributes:
label: Suggested Solution
description: "Describe your proposed solution for this feature. How do you envision it working?"
placeholder: "Detail your solution here..."
validations:
required: true
- type: markdown
attributes:
value: "Please provide any other relevant information or screenshots that could help illustrate your idea."
- type: textarea
id: additional-info
attributes:
label: Additional Information
description: "Include any additional information, links, or screenshots that might be relevant to your feature request."
placeholder: "Add more context or links to relevant resources..."
- type: markdown
attributes:
value: "Thank you for contributing to the project! We appreciate your input and will review your suggestion as soon as possible."
-29
View File
@@ -1,29 +0,0 @@
name: 🐧 Other
description: Use this for any other issues. Please do NOT create blank issues
title: "[Other]: <give this problem a name>"
labels: ["other"]
# assignees: []
body:
- type: markdown
attributes:
value: "# Other issue"
- type: textarea
id: issuedescription
attributes:
label: What would you like to share?
description: Provide a clear and concise explanation of your issue.
validations:
required: true
- type: textarea
id: extrainfo
attributes:
label: Additional information
description: Is there anything else we should know about this issue?
validations:
required: false
- type: markdown
attributes:
value: |
You can also join our Discord community [here](https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A)
Feel free to check out other cool repositories of the openim Community [here](https://github.com/openimsdk)
-26
View File
@@ -1,26 +0,0 @@
---
name: RFC - Feature Proposal
about: Submit a proposal for a significant feature to invite community discussion.
title: "[RFC]: " # Prefix for the title to help identify RFC proposals
labels: rfc, proposal # Labels to be automatically added
assignees: '' # Optionally, specify maintainers or teams to be auto-assigned
---
## Proposal Overview
Briefly describe the content and objectives of your proposal.
## Motivation
Why is this new feature necessary? What is the background of this problem?
## Detailed Design
Describe the technical details of the proposal, including implementation steps, code snippets, or architecture diagrams.
## Alternatives Considered
Have other alternatives been considered? Why is this approach preferred over others?
## Impact
How will this proposal affect existing practices and community users?
## Additional Information
Include any other relevant information such as related discussions, prior related work, etc.
+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
-16
View File
@@ -1,16 +0,0 @@
openimsdk/openim-docker:
- source: ./config
dest: ./openim-server/release/config
replace: true
- source: ./docs
dest: ./openim-server/release/docs
replace: true
- source: ./scripts
dest: ./openim-server/release/scripts
replace: true
- source: ./scripts
dest: ./scripts
replace: false
- source: ./Makefile
dest: ./Makefile
replace: false
-29
View File
@@ -1,29 +0,0 @@
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, 'openim-robot')
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Checkout code
uses: actions/checkout@v4
- 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 "accepted"
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!"
# gh issue edit ${{ github.event.issue.number }} --milestone "$LETASE_MILESTONES"
env:
GH_TOKEN: ${{ secrets.BOT_TOKEN }}
ISSUE: ${{ github.event.issue.html_url }}
OWNER: ${{ github.repository_owner }}
REPO: ${{ github.event.repository.name }}
-38
View File
@@ -1,38 +0,0 @@
name: Invite users to join OpenIM Community.
on:
issue_comment:
types:
- created
jobs:
issue_comment:
name: Invite users to join OpenIM Community
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 OpenIM Community
uses: peter-evans/create-or-update-comment@v4
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-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A). 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-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A" 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-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A) team channel.
+ <a href="https://mail.google.com/mail/u/0/?fs=1&tf=cm&to=info@openim.io" 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: |
# accepted
-78
View File
@@ -1,78 +0,0 @@
name: Release Changelog
on:
release:
types: [released]
permissions:
contents: write
pull-requests: write
jobs:
update-changelog:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Run Go Changelog Generator
run: |
# Run the Go changelog generator, passing the release tag if available
if [ "${{ github.event.release.tag_name }}" = "latest" ]; then
go run tools/changelog/changelog.go > "${{ github.event.release.tag_name }}-changelog.md"
else
go run tools/changelog/changelog.go "${{ github.event.release.tag_name }}" > "${{ github.event.release.tag_name }}-changelog.md"
fi
- name: Handle changelog files
run: |
# Ensure that the CHANGELOG directory exists
mkdir -p CHANGELOG
# Extract Major.Minor version by removing the 'v' prefix from the tag name
TAG_NAME=${{ github.event.release.tag_name }}
CHANGELOG_VERSION_NUMBER=$(echo "$TAG_NAME" | sed 's/^v//' | grep -oP '^\d+\.\d+')
# Define the new changelog file path
CHANGELOG_FILENAME="CHANGELOG-$CHANGELOG_VERSION_NUMBER.md"
CHANGELOG_PATH="CHANGELOG/$CHANGELOG_FILENAME"
# Check if the changelog file for the current release already exists
if [ -f "$CHANGELOG_PATH" ]; then
# If the file exists, append the new changelog to the existing one
cat "$CHANGELOG_PATH" >> "${TAG_NAME}-changelog.md"
# Overwrite the existing changelog with the updated content
mv "${TAG_NAME}-changelog.md" "$CHANGELOG_PATH"
else
# If the changelog file doesn't exist, rename the temp changelog file to the new changelog file
mv "${TAG_NAME}-changelog.md" "$CHANGELOG_PATH"
# Ensure that README.md exists
if [ ! -f "CHANGELOG/README.md" ]; then
echo -e "# CHANGELOGs\n\n" > CHANGELOG/README.md
fi
# Add the new changelog entry at the top of the README.md
if ! grep -q "\[$CHANGELOG_FILENAME\]" CHANGELOG/README.md; then
sed -i "3i- [$CHANGELOG_FILENAME](./$CHANGELOG_FILENAME)" CHANGELOG/README.md
# Remove the extra newline character added by sed
# sed -i '4d' CHANGELOG/README.md
fi
fi
- name: Clean up
run: |
# Remove any temporary files that were created during the process
rm -f "${{ github.event.release.tag_name }}-changelog.md"
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7.0.5
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "Update CHANGELOG for release ${{ github.event.release.tag_name }}"
title: "Update CHANGELOG for release ${{ github.event.release.tag_name }}"
body: "This PR updates the CHANGELOG files for release ${{ github.event.release.tag_name }}"
branch: changelog-${{ github.event.release.tag_name }}
base: main
delete-branch: true
labels: changelog
-40
View File
@@ -1,40 +0,0 @@
name: 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 # this can be 'read' if the signatures are in remote repository
pull-requests: write
statuses: write
jobs:
CLA-Assistant:
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.4.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN: ${{ secrets.BOT_TOKEN }}
with:
path-to-signatures: 'signatures/cla.json'
path-to-document: 'https://github.com/OpenIM-Robot/cla/blob/main/README.md' # e.g. a CLA or a DCO document
branch: 'main'
allowlist: 'bot*,*bot,OpenIM-Robot'
# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
remote-organization-name: OpenIM-Robot
remote-repository-name: cla
create-file-commit-message: 'Creating file for storing CLA Signatures'
# signed-commit-message: '$contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our CLA. [CLA Docs](https://github.com/OpenIM-Robot/cla/blob/main/README.md)'
custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
custom-allsigned-prcomment: '🤖 All Contributors have signed the [CLA](https://github.com/OpenIM-Robot/cla/blob/main/README.md).<br> The signed information is recorded [**here**](https://github.com/OpenIM-Robot/cla/blob/main/signatures/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
@@ -1,65 +0,0 @@
name: Cleanup After Milestone PRs Merged
on:
pull_request:
types:
- closed
jobs:
handle_pr:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.0
- name: Get the PR title and extract PR numbers
id: extract_pr_numbers
run: |
# Get the PR title
PR_TITLE="${{ github.event.pull_request.title }}"
echo "PR Title: $PR_TITLE"
# Extract PR numbers from the title
PR_NUMBERS=$(echo "$PR_TITLE" | grep -oE "#[0-9]+" | tr -d '#' | tr '\n' ' ')
echo "Extracted PR Numbers: $PR_NUMBERS"
# Save PR numbers to a file
echo "$PR_NUMBERS" > pr_numbers.txt
echo "Saved PR Numbers to pr_numbers.txt"
# Check if the title matches a specific pattern
if echo "$PR_TITLE" | grep -qE "^deps: Merge( #[0-9]+)+ PRs into .+"; then
echo "proceed=true" >> $GITHUB_OUTPUT
else
echo "proceed=false" >> $GITHUB_OUTPUT
fi
- name: Use extracted PR numbers and label PRs
if: (steps.extract_pr_numbers.outputs.proceed == 'true' || contains(github.event.pull_request.labels.*.name, 'milestone-merge')) && github.event.pull_request.merged == true
run: |
# Read the previously saved PR numbers
PR_NUMBERS=$(cat pr_numbers.txt)
echo "Using extracted PR Numbers: $PR_NUMBERS"
# Loop through each PR number and add label
for PR_NUMBER in $PR_NUMBERS; do
echo "Adding 'cherry-picked' label to PR #$PR_NUMBER"
curl -X POST \
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-H "Accept: application/vnd.github+json" \
https://api.github.com/repos/${{ github.repository }}/issues/$PR_NUMBER/labels \
-d '{"labels":["cherry-picked"]}'
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Delete branch after PR close
if: steps.extract_pr_numbers.outputs.proceed == 'true' || contains(github.event.pull_request.labels.*.name, 'milestone-merge')
run: |
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
echo "Branch to delete: $BRANCH_NAME"
git push origin --delete "$BRANCH_NAME"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+10 -6
View File
@@ -8,7 +8,7 @@
# 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.
#
name: "CodeQL"
on:
@@ -18,12 +18,16 @@ on:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '18 19 * * 6'
- cron: '23 2 * * 2'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
@@ -35,11 +39,11 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
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.
@@ -50,7 +54,7 @@ jobs:
# 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@v3
uses: github/codeql-action/autobuild@v1
# ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
@@ -64,4 +68,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v1
-51
View File
@@ -1,51 +0,0 @@
name: Non-English Comments Check
on:
pull_request:
branches:
- main
workflow_dispatch:
jobs:
non-english-comments-check:
runs-on: ubuntu-latest
env:
# need ignore Dirs
EXCLUDE_DIRS: ".git docs tests scripts assets node_modules build"
# need ignore Files
EXCLUDE_FILES: "*.md *.txt *.html *.css *.min.js *.mdx"
steps:
- uses: actions/checkout@v4
- name: Search for Non-English comments
run: |
set -e
# Define the regex pattern to match Chinese characters
pattern='[\p{Han}]'
# Process the directories to be excluded
exclude_dirs=""
for dir in $EXCLUDE_DIRS; do
exclude_dirs="$exclude_dirs --exclude-dir=$dir"
done
# Process the file types to be excluded
exclude_files=""
for file in $EXCLUDE_FILES; do
exclude_files="$exclude_files --exclude=$file"
done
# Use grep to find all comments containing Non-English characters and save to file
grep -Pnr "$pattern" . $exclude_dirs $exclude_files > non_english_comments.txt || true
- name: Output non-English comments are found
run: |
if [ -s non_english_comments.txt ]; then
echo "Non-English comments found in the following locations:"
cat non_english_comments.txt
exit 1 # terminate the workflow
else
echo "No Non_English comments found."
fi
@@ -1,91 +0,0 @@
name: Build and release services Docker Images
on:
push:
branches:
- release-*
release:
types: [published]
workflow_dispatch:
inputs:
tag:
description: "Tag version to be used for Docker image"
required: true
default: "v3.8.3"
jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.8.0
- name: Log in to Docker Hub
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3.3.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Log in to Aliyun Container Registry
uses: docker/login-action@v3.3.0
with:
registry: registry.cn-hangzhou.aliyuncs.com
username: ${{ secrets.ALIREGISTRY_USERNAME }}
password: ${{ secrets.ALIREGISTRY_TOKEN }}
- name: Extract metadata for Docker (tags, labels)
id: meta
uses: docker/metadata-action@v5.6.0
with:
tags: |
type=ref,event=tag
type=schedule
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern=v{{version}}
type=semver,pattern=release-{{raw}}
type=sha
type=raw,value=${{ github.event.inputs.tag }}
- name: Build and push Docker images
run: |
IMG_DIR="build/images"
for dir in "$IMG_DIR"/*/; do
# Find Dockerfile or *.dockerfile in a case-insensitive manner
dockerfile=$(find "$dir" -maxdepth 1 -type f \( -iname 'dockerfile' -o -iname '*.dockerfile' \) | head -n 1)
if [ -n "$dockerfile" ] && [ -f "$dockerfile" ]; then
IMAGE_NAME=$(basename "$dir")
echo "Building Docker image for $IMAGE_NAME with tags:"
# Initialize tag arguments
tag_args=()
# Read each tag and append --tag arguments
while IFS= read -r tag; do
tag_args+=(--tag "${{ secrets.DOCKER_USERNAME }}/$IMAGE_NAME:$tag")
tag_args+=(--tag "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$tag")
tag_args+=(--tag "registry.cn-hangzhou.aliyuncs.com/openimsdk/$IMAGE_NAME:$tag")
done <<< "${{ steps.meta.outputs.tags }}"
# Build and push the Docker image with all tags
docker buildx build --platform linux/amd64,linux/arm64 \
--file "$dockerfile" \
"${tag_args[@]}" \
--push \
"."
else
echo "No valid Dockerfile found in $dir"
fi
done
-273
View File
@@ -1,273 +0,0 @@
name: Go Build Test
on:
push:
pull_request:
paths-ignore:
- "**/*.md"
workflow_dispatch:
jobs:
go-build:
name: Test with go ${{ matrix.go_version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
env:
SHARE_CONFIG_PATH: config/share.yml
permissions:
contents: write
pull-requests: write
strategy:
matrix:
os: [ubuntu-latest]
go_version: ["1.22.x"]
steps:
- name: Checkout Server repository
uses: actions/checkout@v4
- name: Set up Go ${{ matrix.go_version }}
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go_version }}
- name: Get Server dependencies
run: |
go install github.com/magefile/mage@latest
go mod tidy
go mod download
- name: Set up infra services
uses: hoverkraft-tech/compose-action@v2.0.1
with:
compose-file: "./docker-compose.yml"
- name: Modify Server Configuration
run: |
yq e '.secret = 123456' -i ${{ env.SHARE_CONFIG_PATH }}
# - name: Get Internal IP Address
# id: get-ip
# run: |
# IP=$(hostname -I | awk '{print $1}')
# echo "The IP Address is: $IP"
# echo "::set-output name=ip::$IP"
# - name: Update .env
# run: |
# sed -i 's|externalAddress:.*|externalAddress: "http://${{ steps.get-ip.outputs.ip }}:10005"|' config/minio.yml
# cat config/minio.yml
- name: Build and test Server Services
run: |
mage build
mage start
mage check
- name: Checkout Chat repository
uses: actions/checkout@v4
with:
repository: "openimsdk/chat"
path: "chat-repo"
- name: Get Chat dependencies
run: |
cd ${{ github.workspace }}/chat-repo
go mod tidy
go mod download
go install github.com/magefile/mage@latest
- name: Modify Chat Configuration
run: |
cd ${{ github.workspace }}/chat-repo
yq e '.openIM.secret = 123456' -i ${{ env.SHARE_CONFIG_PATH }}
- name: Build and test Chat Services
run: |
cd ${{ github.workspace }}/chat-repo
mage build
mage start
mage check
- name: Test Server and Chat
run: |
check_error() {
echo "Response: $1"
errCode=$(echo $1 | jq -r '.errCode')
if [ "$errCode" != "0" ]; then
errMsg=$(echo $1 | jq -r '.errMsg')
echo "Error: $errMsg"
exit 1
fi
}
# Test register
response1=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
"verifyCode": "666666",
"platform": 3,
"autoLogin": true,
"user":{
"nickname": "test12312",
"areaCode":"+86",
"phoneNumber": "12345678190",
"password":"test123456"
}
}' http://127.0.0.1:10008/account/register)
check_error "$response1"
userID1=$(echo $response1 | jq -r '.data.userID')
echo "userID1: $userID1"
response2=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
"verifyCode": "666666",
"platform": 3,
"autoLogin": true,
"user":{
"nickname": "test22312",
"areaCode":"+86",
"phoneNumber": "12345678290",
"password":"test123456"
}
}' http://127.0.0.1:10008/account/register)
check_error "$response2"
userID2=$(echo $response2 | jq -r '.data.userID')
echo "userID2: $userID2"
# Test login
login_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
"platform": 3,
"areaCode":"+86",
"phoneNumber": "12345678190",
"password":"test123456"
}' http://localhost:10008/account/login)
check_error "$login_response"
# Test get admin token
get_admin_token_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -d '{
"secret": "123456",
"platformID": 2,
"userID": "imAdmin"
}' http://127.0.0.1:10002/auth/get_admin_token)
check_error "$get_admin_token_response"
adminToken=$(echo $get_admin_token_response | jq -r '.data.token')
echo "adminToken: $adminToken"
# Test send message
send_msg_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -H "token: $adminToken" -d '{
"sendID": "'$userID1'",
"recvID": "'$userID2'",
"senderPlatformID": 3,
"content": {
"content": "hello!!"
},
"contentType": 101,
"sessionType": 1
}' http://127.0.0.1:10002/msg/send_msg)
check_error "$send_msg_response"
# Test get users
get_users_response=$(curl -X POST -H "Content-Type: application/json" -H "operationID: imAdmin" -H "token: $adminToken" -d '{
"pagination": {
"pageNumber": 1,
"showNumber": 100
}
}' http://127.0.0.1:10002/user/get_users)
check_error "$get_users_response"
go-test:
name: Benchmark Test with go ${{ matrix.go_version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
permissions:
contents: write
env:
SDK_DIR: openim-sdk-core
NOTIFICATION_CONFIG_PATH: config/notification.yml
SHARE_CONFIG_PATH: config/share.yml
strategy:
matrix:
os: [ubuntu-latest]
go_version: ["1.22.x"]
steps:
- name: Checkout Server repository
uses: actions/checkout@v4
- name: Checkout SDK repository
uses: actions/checkout@v4
with:
repository: "openimsdk/openim-sdk-core"
ref: "main"
path: ${{ env.SDK_DIR }}
- name: Set up Go ${{ matrix.go_version }}
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go_version }}
- name: Get Server dependencies
run: |
go install github.com/magefile/mage@latest
go mod download
- name: Modify Server Configuration
run: |
yq e '.groupCreated.isSendMsg = true' -i ${{ env.NOTIFICATION_CONFIG_PATH }}
yq e '.friendApplicationApproved.isSendMsg = true' -i ${{ env.NOTIFICATION_CONFIG_PATH }}
yq e '.secret = 123456' -i ${{ env.SHARE_CONFIG_PATH }}
- name: Start Server Services
run: |
docker compose up -d
mage build
mage start
mage check
- name: Build test SDK core
run: |
cd ${{ env.SDK_DIR }}
go mod tidy
cd integration_test
mkdir data
go run main.go -lgr 0.8 -imf -crg -ckgn -ckcon -sem -ckmsn -u 20 -su 5 -lg 2 -cg 2 -cgm 3 -sm 10 -gm 10 -reg
dockerfile-test:
name: Build and Test Dockerfile
runs-on: ubuntu-latest
strategy:
matrix:
go_version: ["1.22"]
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Set up Go ${{ matrix.go_version }}
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go_version }}
- name: Get dependencies
run: |
go mod tidy
go mod download
go install github.com/magefile/mage@latest
- name: Build Docker Image
run: |
IMAGE_NAME="${{ github.event.repository.name }}-test"
CONTAINER_NAME="${{ github.event.repository.name }}-container"
docker build -t $IMAGE_NAME .
- name: Run Docker Container
run: |
IMAGE_NAME="${{ github.event.repository.name }}-test"
CONTAINER_NAME="${{ github.event.repository.name }}-container"
docker run --name $CONTAINER_NAME -d $IMAGE_NAME
docker ps -a
- name: Test Docker Container Logs
run: |
CONTAINER_NAME="${{ github.event.repository.name }}-container"
docker logs $CONTAINER_NAME
-36
View File
@@ -1,36 +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@v4
with:
issue-number: ${{ github.event.issue.number }}
token: ${{ secrets.BOT_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-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A) to connect and communicate with our developers.
If you wish to accept this assignment, please leave a comment in the comments section: `/accept`.🎯
-19
View File
@@ -1,19 +0,0 @@
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:
BOT_GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
IS_MODIFY_TITLE: true
# not require, default false, . Decide whether to modify the issue title
# if true, the robot account @Issues-translate-bot must have modification permissions, invite @Issues-translate-bot to your project or use your custom bot.
CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿
# not require. Customize the translation robot prefix message.
-181
View File
@@ -1,181 +0,0 @@
name: Create Individual PRs from Milestone
permissions:
contents: write
pull-requests: write
issues: write
on:
workflow_dispatch:
inputs:
milestone_name:
description: "Milestone name to collect closed PRs from"
required: true
default: "v3.8.4"
target_branch:
description: "Target branch to merge the consolidated PR"
required: true
default: "pre-release-v3.8.4"
env:
MILESTONE_NAME: ${{ github.event.inputs.milestone_name || 'v3.8.4' }}
TARGET_BRANCH: ${{ github.event.inputs.target_branch || 'pre-release-v3.8.4' }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
LABEL_NAME: cherry-picked
TEMP_DIR: /tmp
jobs:
merge_milestone_prs:
runs-on: ubuntu-latest
steps:
- name: Setup temp directory
run: |
# Create the temporary directory and initialize necessary files
mkdir -p ${{ env.TEMP_DIR }}
touch ${{ env.TEMP_DIR }}/pr_numbers.txt
touch ${{ env.TEMP_DIR }}/commit_hashes.txt
touch ${{ env.TEMP_DIR }}/pr_title.txt
touch ${{ env.TEMP_DIR }}/pr_body.txt
touch ${{ env.TEMP_DIR }}/created_pr_number.txt
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.BOT_TOKEN }}
- name: Setup Git User for OpenIM-Robot
run: |
git config --global user.email "OpenIM-Robot@users.noreply.github.com"
git config --global user.name "OpenIM-Robot"
- name: Fetch Milestone ID and Filter PR Numbers
env:
MILESTONE_NAME: ${{ env.MILESTONE_NAME }}
run: |
# Fetch milestone details and extract milestone ID
milestones=$(curl -s -H "Authorization: token $BOT_TOKEN" \
-H "Accept: application/vnd.github+json" \
"https://api.github.com/repos/${{ github.repository }}/milestones")
milestone_id=$(echo "$milestones" | grep -B3 "\"title\": \"$MILESTONE_NAME\"" | grep '"number":' | head -n1 | grep -o '[0-9]\+')
if [ -z "$milestone_id" ]; then
echo "Milestone '$MILESTONE_NAME' not found. Exiting."
exit 1
fi
echo "Milestone ID: $milestone_id"
echo "MILESTONE_ID=$milestone_id" >> $GITHUB_ENV
# Fetch issues for the milestone
issues=$(curl -s -H "Authorization: token $BOT_TOKEN" \
-H "Accept: application/vnd.github+json" \
"https://api.github.com/repos/${{ github.repository }}/issues?milestone=$milestone_id&state=closed&per_page=100")
> ${{ env.TEMP_DIR }}/pr_numbers.txt
# Filter PRs that do not have the 'cherry-picked' label
for pr_number in $(echo "$issues" | jq -r '.[] | select(.pull_request != null) | .number'); do
labels=$(curl -s -H "Authorization: token $BOT_TOKEN" \
-H "Accept: application/vnd.github+json" \
"https://api.github.com/repos/${{ github.repository }}/issues/$pr_number/labels" | jq -r '.[].name')
if ! echo "$labels" | grep -q "${LABEL_NAME}"; then
echo "PR #$pr_number does not have the 'cherry-picked' label. Adding to the list."
echo "$pr_number" >> ${{ env.TEMP_DIR }}/pr_numbers.txt
fi
done
sort -n ${{ env.TEMP_DIR }}/pr_numbers.txt -o ${{ env.TEMP_DIR }}/pr_numbers.txt
- name: Create Individual PRs
run: |
for pr_number in $(cat ${{ env.TEMP_DIR }}/pr_numbers.txt); do
pr_details=$(curl -s -H "Authorization: token $BOT_TOKEN" \
-H "Accept: application/vnd.github+json" \
"https://api.github.com/repos/${{ github.repository }}/pulls/$pr_number")
pr_title=$(echo "$pr_details" | jq -r '.title')
pr_body=$(echo "$pr_details" | jq -r '.body')
pr_creator=$(echo "$pr_details" | jq -r '.user.login')
merge_commit=$(echo "$pr_details" | jq -r '.merge_commit_sha')
short_commit_hash=$(echo "$merge_commit" | cut -c 1-7)
if [ "$merge_commit" != "null" ]; then
git fetch origin
echo "Checking out target branch: $TARGET_BRANCH"
git checkout $TARGET_BRANCH
echo "Pulling latest changes from target branch: $TARGET_BRANCH"
git pull origin $TARGET_BRANCH
cherry_pick_branch="cherry-pick-${short_commit_hash}"
git checkout -b $cherry_pick_branch
echo "Cherry-picking commit: $merge_commit"
if ! git cherry-pick "$merge_commit" --strategy=recursive -X theirs; then
echo "Conflict detected for $merge_commit. Resolving with incoming changes."
conflict_files=$(git diff --name-only --diff-filter=U)
echo "Conflicting files:"
echo "$conflict_files"
for file in $conflict_files; do
if [ -f "$file" ]; then
echo "Resolving conflict for $file"
git add "$file"
else
echo "File $file has been deleted. Skipping."
git rm "$file"
fi
done
echo "Conflicts resolved. Continuing cherry-pick."
git cherry-pick --continue || { echo "Cherry-pick failed, but continuing to create PR."; }
else
echo "Cherry-pick successful for commit $merge_commit."
fi
git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git"
echo "Pushing branch: $cherry_pick_branch"
if ! git push origin $cherry_pick_branch --force; then
echo "Push failed, but continuing to create PR..."
fi
new_pr_title="$pr_title [Created by @$pr_creator from #$pr_number]"
new_pr_body="$pr_body
> This PR is created from original PR #$pr_number."
response=$(curl -s -X POST -H "Authorization: token $BOT_TOKEN" \
-H "Accept: application/vnd.github+json" \
https://api.github.com/repos/${{ github.repository }}/pulls \
-d "$(jq -n --arg title "$new_pr_title" \
--arg head "$cherry_pick_branch" \
--arg base "$TARGET_BRANCH" \
--arg body "$new_pr_body" \
'{title: $title, head: $head, base: $base, body: $body}')")
new_pr_number=$(echo "$response" | jq -r '.number')
if [[ "$new_pr_number" == "null" || -z "$new_pr_number" ]]; then
echo "Failed to create PR. Response: $response"
git checkout $TARGET_BRANCH
git branch -D $cherry_pick_branch
echo "Deleted branch: $cherry_pick_branch"
git push origin --delete $cherry_pick_branch
else
echo "Created PR #$new_pr_number"
curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
-H "Accept: application/vnd.github+json" \
-d '{"labels": ["milestone-merge"]}' \
"https://api.github.com/repos/${{ github.repository }}/issues/$new_pr_number/labels"
fi
echo ""
echo "----------------------------------------"
echo ""
fi
done
-194
View File
@@ -1,194 +0,0 @@
name: Publish Docker image to registries
on:
push:
branches:
- release-*
release:
types: [published]
workflow_dispatch:
inputs:
tag:
description: "Tag version to be used for Docker image"
required: true
default: "v3.8.3"
env:
GO_VERSION: "1.22"
IMAGE_NAME: "openim-server"
# IMAGE_NAME: ${{ github.event.repository.name }}
DOCKER_BUILDKIT: 1
jobs:
publish-docker-images:
runs-on: ubuntu-latest
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.merged == false) }}
steps:
- name: Checkout main repository
uses: actions/checkout@v4
with:
path: main-repo
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.3.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
with:
driver-opts: network=host
- name: Extract metadata for Docker
id: meta
uses: docker/metadata-action@v5.6.0
with:
images: |
${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}
ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
registry.cn-hangzhou.aliyuncs.com/openimsdk/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=tag
type=schedule
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern=v{{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
- name: Install skopeo
run: |
sudo apt-get update && sudo apt-get install -y skopeo
- name: Build multi-arch images as OCI
run: |
mkdir -p /tmp/oci-image /tmp/docker-cache
# Build multi-architecture image and save in OCI format
docker buildx build \
--platform linux/amd64,linux/arm64 \
--output type=oci,dest=/tmp/oci-image/multi-arch.tar \
--cache-to type=local,dest=/tmp/docker-cache \
--cache-from type=gha \
./main-repo
# Use skopeo to convert the amd64 image from OCI format to Docker format and load it
skopeo copy --override-arch amd64 oci-archive:/tmp/oci-image/multi-arch.tar docker-daemon:${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:local
# check image
docker image ls | grep openim
- name: Checkout compose repository
uses: actions/checkout@v4
with:
repository: "openimsdk/openim-docker"
path: "compose-repo"
- name: Get Internal IP Address
id: get-ip
run: |
IP=$(hostname -I | awk '{print $1}')
echo "The IP Address is: $IP"
echo "ip=$IP" >> $GITHUB_OUTPUT
- name: Update .env to use the local image
run: |
sed -i 's|OPENIM_SERVER_IMAGE=.*|OPENIM_SERVER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:local|' ${{ github.workspace }}/compose-repo/.env
sed -i 's|MINIO_EXTERNAL_ADDRESS=.*|MINIO_EXTERNAL_ADDRESS=http://${{ steps.get-ip.outputs.ip }}:10005|' ${{ github.workspace }}/compose-repo/.env
- name: Start services using Docker Compose
run: |
cd ${{ github.workspace }}/compose-repo
docker compose up -d
docker compose ps
# - name: Check openim-server health
# run: |
# timeout=300
# interval=30
# elapsed=0
# while [[ $elapsed -le $timeout ]]; do
# if ! docker exec openim-server mage check; then
# echo "openim-server is not ready, waiting..."
# sleep $interval
# elapsed=$(($elapsed + $interval))
# else
# echo "Health check successful"
# exit 0
# fi
# done
# echo "Health check failed after 5 minutes"
# exit 1
# - name: Check openim-chat health
# if: success()
# run: |
# if ! docker exec openim-chat mage check; then
# echo "openim-chat check failed"
# exit 1
# else
# echo "Health check successful"
# exit 0
# fi
- name: Log in to Docker Hub
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3.3.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Log in to Aliyun Container Registry
uses: docker/login-action@v3.3.0
with:
registry: registry.cn-hangzhou.aliyuncs.com
username: ${{ secrets.ALIREGISTRY_USERNAME }}
password: ${{ secrets.ALIREGISTRY_TOKEN }}
- name: Push multi-architecture images
if: success()
run: |
docker buildx build \
--platform linux/amd64,linux/arm64 \
$(echo "${{ steps.meta.outputs.tags }}" | sed 's/,/ --tag /g' | sed 's/^/--tag /') \
--cache-from type=local,src=/tmp/docker-cache \
--push \
./main-repo
- name: Verify multi-platform support
run: |
images=(
"${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}"
"ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}"
"registry.cn-hangzhou.aliyuncs.com/openimsdk/${{ env.IMAGE_NAME }}"
)
for image in "${images[@]}"; do
for tag in $(echo "${{ steps.meta.outputs.tags }}" | tr ',' '\n' | cut -d':' -f2); do
echo "Verifying multi-arch support for $image:$tag"
manifest=$(docker manifest inspect "$image:$tag" || echo "error")
if [[ "$manifest" == "error" ]]; then
echo "Manifest not found for $image:$tag"
exit 1
fi
amd64_found=$(echo "$manifest" | jq '.manifests[] | select(.platform.architecture == "amd64")')
arm64_found=$(echo "$manifest" | jq '.manifests[] | select(.platform.architecture == "arm64")')
if [[ -z "$amd64_found" ]]; then
echo "Multi-platform support check failed for $image:$tag - missing amd64"
exit 1
fi
if [[ -z "$arm64_found" ]]; then
echo "Multi-platform support check failed for $image:$tag - missing arm64"
exit 1
fi
echo "✅ $image:$tag supports both amd64 and arm64 architectures"
done
done
@@ -1,74 +0,0 @@
name: Remove Unused Labels
on:
workflow_dispatch:
jobs:
cleanup:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
contents: read
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Fetch All Issues and PRs
id: fetch_issues_prs
uses: actions/github-script@v7.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const issues = await github.paginate(github.rest.issues.listForRepo, {
owner: context.repo.owner,
repo: context.repo.repo,
state: 'all',
per_page: 100
});
const labelsInUse = new Set();
issues.forEach(issue => {
issue.labels.forEach(label => {
labelsInUse.add(label.name);
});
});
return JSON.stringify(Array.from(labelsInUse));
result-encoding: string
- name: Fetch All Labels
id: fetch_labels
uses: actions/github-script@v7.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const labels = await github.paginate(github.rest.issues.listLabelsForRepo, {
owner: context.repo.owner,
repo: context.repo.repo,
per_page: 100
});
return JSON.stringify(labels.map(label => label.name));
result-encoding: string
- name: Remove Unused Labels
uses: actions/github-script@v7.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const labelsInUse = new Set(JSON.parse(process.env.LABELS_IN_USE));
const allLabels = JSON.parse(process.env.ALL_LABELS);
const unusedLabels = allLabels.filter(label => !labelsInUse.has(label));
for (const label of unusedLabels) {
await github.rest.issues.deleteLabel({
owner: context.repo.owner,
repo: context.repo.repo,
name: label
});
console.log(`Deleted label: ${label}`);
}
env:
LABELS_IN_USE: ${{ steps.fetch_issues_prs.outputs.result }}
ALL_LABELS: ${{ steps.fetch_labels.outputs.result }}
-78
View File
@@ -1,78 +0,0 @@
name: Reopen and Update Stale Issues
on:
workflow_dispatch:
jobs:
reopen_stale_issues:
runs-on: ubuntu-latest
permissions:
issues: write
contents: read
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Fetch Closed Issues with lifecycle/stale Label
id: fetch_issues
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const issues = await github.paginate(github.rest.issues.listForRepo, {
owner: context.repo.owner,
repo: context.repo.repo,
state: 'closed',
labels: 'lifecycle/stale',
per_page: 100
});
const issueNumbers = issues
.filter(issue => !issue.pull_request) // exclude PR
.map(issue => issue.number);
console.log(`Fetched issues: ${issueNumbers}`);
return issueNumbers;
- name: Set issue numbers
id: set_issue_numbers
run: |
echo "ISSUE_NUMBERS=${{ steps.fetch_issues.outputs.result }}" >> $GITHUB_ENV
echo "Issue numbers: ${{ steps.fetch_issues.outputs.result }}"
- name: Reopen Issues
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const issueNumbers = JSON.parse(process.env.ISSUE_NUMBERS);
console.log(`Reopening issues: ${issueNumbers}`);
for (const issue_number of issueNumbers) {
// Reopen the issue
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue_number,
state: 'open'
});
console.log(`Reopened issue #${issue_number}`);
}
- name: Remove lifecycle/stale Label
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const issueNumbers = JSON.parse(process.env.ISSUE_NUMBERS);
console.log(`Removing 'lifecycle/stale' label from issues: ${issueNumbers}`);
for (const issue_number of issueNumbers) {
// Remove the lifecycle/stale label
await github.rest.issues.removeLabel({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: issue_number,
name: 'lifecycle/stale'
});
console.log(`Removed label 'lifecycle/stale' from issue #${issue_number}`);
}
@@ -1,119 +0,0 @@
name: Update Version File on Release
on:
release:
types: [created]
jobs:
update-version:
runs-on: ubuntu-latest
env:
TAG_VERSION: ${{ github.event.release.tag_name }}
steps:
# Step 1: Checkout the original repository's code
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
# submodules: "recursive"
- name: Safe submodule initialization
run: |
echo "Checking for submodules..."
if [ -f .gitmodules ]; then
if [ -s .gitmodules ]; then
echo "Initializing submodules..."
if git submodule sync --recursive 2>/dev/null; then
git submodule update --init --force --recursive || {
echo "Warning: Some submodules failed to initialize, continuing anyway..."
}
else
echo "Warning: Submodule sync failed, continuing without submodules..."
fi
else
echo ".gitmodules exists but is empty, skipping submodule initialization"
fi
else
echo "No .gitmodules file found, no submodules to initialize"
fi
# Step 2: Set up Git with official account
- name: Set up Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
# Step 3: Check and delete existing tag
- name: Check and delete existing tag
run: |
if git rev-parse ${{ env.TAG_VERSION }} >/dev/null 2>&1; then
git tag -d ${{ env.TAG_VERSION }}
git push --delete origin ${{ env.TAG_VERSION }}
fi
# Step 4: Update version file
- name: Update version file
run: |
mkdir -p version
echo -n "${{ env.TAG_VERSION }}" > version/version
# Step 5: Commit and push changes
- name: Commit and push changes
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git add version/version
git commit -m "Update version to ${{ env.TAG_VERSION }}"
# Step 6: Update tag
- name: Update tag
run: |
git tag -fa ${{ env.TAG_VERSION }} -m "Update version to ${{ env.TAG_VERSION }}"
git push origin ${{ env.TAG_VERSION }} --force
# Step 7: Find and Publish Draft Release
- name: Find and Publish Draft Release
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const { owner, repo } = context.repo;
const tagName = process.env.TAG_VERSION;
try {
let release;
try {
const response = await github.rest.repos.getReleaseByTag({
owner,
repo,
tag: tagName
});
release = response.data;
} catch (tagError) {
core.info(`Release not found by tag, searching all releases...`);
const releases = await github.rest.repos.listReleases({
owner,
repo,
per_page: 100
});
release = releases.data.find(r => r.draft && r.tag_name === tagName);
if (!release) {
throw new Error(`No release found with tag ${tagName}`);
}
}
await github.rest.repos.updateRelease({
owner,
repo,
release_id: release.id,
draft: false,
prerelease: release.prerelease
});
const status = release.draft ? "was draft" : "was already published";
core.info(`Release ${tagName} ensured to be published (${status}).`);
} catch (error) {
core.warning(`Could not find or update release for tag ${tagName}: ${error.message}`);
}
@@ -1,35 +0,0 @@
name: User First Interaction
on:
issues:
types: [opened]
pull_request:
branches: [main]
types: [opened]
jobs:
check_for_first_interaction:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/first-interaction@v1.3.0
with:
repo-token: ${{ secrets.BOT_TOKEN }}
pr-message: |
Hello! Thank you for your contribution.
If you are fixing a bug, please reference the issue number in the description.
If you are implementing a feature request, please check with the maintainers that the feature will be accepted first.
[Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A) to connect and communicate with our developers.
Please leave your information in the [✨ discussions](https://github.com/orgs/OpenIMSDK/discussions/426), we expect anyone to join OpenIM developer community.
issue-message: |
Hello! Thank you for filing an issue.
If this is a bug report, please include relevant logs to help us debug the problem.
[Join slack 🤖](https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A) to connect and communicate with our developers.
continue-on-error: true
+17 -385
View File
@@ -1,390 +1,22 @@
# 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
logs
out-test
Dockerfile.cross
### Makefile ###
tmp/
bin/
output/
_output/
deployments/charts/generated-configs/
### OpenIM Config ###
.env
config/config.yaml
config/notification.yaml
### OpenIM deploy ###
deployments/openim-server/charts
# 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
go.work.sum
### 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
.github
.idea
dist/
deploy/open_im_demo
deploy/open_im_api
deploy/open_im_msg_gateway
deploy/open_im_msg_transfer
deploy/open_im_push
deploy/open_im_timer_task
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
+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
-912
View File
@@ -1,912 +0,0 @@
# options for analysis running
run:
# default concurrency is a available CPU number
concurrency: 4
# timeout for analysis, e.g. 30s, 5m, default is 1m
timeout: 5m
# exit code when at least one issue was found, default is 1
issues-exit-code: 1
# include test files or not, default is true
tests: true
# list of build tags, all linters use it. Default is empty list.
build-tags:
- mytag
# which dirs to skip: issues from them won't be reported;
# can use regexp here: generated.*, regexp is applied on full path;
# default value is empty list, but default dirs are skipped independently
# from this option's value (see skip-dirs-use-default).
# "/" will be replaced by current OS file path separator to properly work
# on Windows.
# skip-dirs:
# - components
# - docs
# - util
# - .*~
# - api/swagger/docs
# - server/docs
# - components/mnt/config/certs
# - logs
# default is true. Enables skipping of directories:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
# skip-dirs-use-default: true
# which files to skip: they will be analyzed, but issues from them
# won't be reported. Default value is empty list, but there is
# no need to include all autogenerated files, we confidently recognize
# autogenerated files. If it's not please let us know.
# "/" will be replaced by current OS file path separator to properly work
# on Windows.
# skip-files:
# - ".*\\.my\\.go$"
# - _test.go
# - ".*_test.go"
# - "mocks/"
# - ".github/"
# - "logs/"
# - "_output/"
# - "components/"
# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
# If invoked with -mod=readonly, the go command is disallowed from the implicit
# automatic updating of go.mod described above. Instead, it fails when any changes
# to go.mod are needed. This setting is most useful to check that go.mod does
# not need updates, such as in a continuous integration and testing system.
# If invoked with -mod=vendor, the go command assumes that the vendor
# directory holds the correct copies of dependencies and ignores
# the dependency descriptions in go.mod.
#modules-download-mode: release|readonly|vendor
# Allow multiple parallel golangci-lint instances running.
# If false (default) - golangci-lint acquires file lock on start.
allow-parallel-runners: true
# output configuration options
output:
# colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
# format: colored-line-number
# print lines of code with issue, default is true
print-issued-lines: true
# print linter name in the end of issue text, default is true
print-linter-name: true
# make issues output unique by line, default is true
uniq-by-line: true
# add a prefix to the output file references; default is no prefix
path-prefix: ""
# sorts results by: filepath, line and column
sort-results: true
# all available settings of specific linters
linters-settings:
bidichk:
# The following configurations check for all mentioned invisible unicode
# runes. It can be omitted because all runes are enabled by default.
left-to-right-embedding: true
right-to-left-embedding: true
pop-directional-formatting: true
left-to-right-override: true
right-to-left-override: true
left-to-right-isolate: true
right-to-left-isolate: true
first-strong-isolate: true
pop-directional-isolate: true
dupl:
# tokens count to trigger issue, 150 by default
threshold: 200
errcheck:
# report about not checking of errors in type assertions: `a := b.(MyStruct)`;
# default is false: such cases aren't reported by default.
check-type-assertions: false
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
# default is false: such cases aren't reported by default.
check-blank: false
# [deprecated] comma-separated list of pairs of the form pkg:regex
# the regex is used to ignore names within pkg. (default "fmt:.*").
# see https://github.com/kisielk/errcheck#the-deprecated-method for details
#ignore: GenMarkdownTree,os:.*,BindPFlags,WriteTo,Help
#ignore: (os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv
# path to a file containing a list of functions to exclude from checking
# see https://github.com/kisielk/errcheck#excluding-functions for details
# exclude: errcheck.txt
errorlint:
# Check whether fmt.Errorf uses the %w verb for formatting errors. See the readme for caveats
errorf: true
# Check for plain type assertions and type switches
asserts: true
# Check for plain error comparisons
comparison: true
exhaustive:
# Program elements to check for exhaustiveness.
# Default: [ switch ]
check:
- switch
- map
# check switch statements in generated files also
check-generated: false
# indicates that switch statements are to be considered exhaustive if a
# 'default' case is present, even if all enum members aren't listed in the
# switch
default-signifies-exhaustive: false
# enum members matching the supplied regex do not have to be listed in
# switch statements to satisfy exhaustiveness
ignore-enum-members: ""
# consider enums only in package scopes, not in inner scopes
package-scope-only: false
forbidigo:
# # Forbid the following identifiers (identifiers are written using regexp):
forbid:
# - ^print.*$
- 'fmt\.Print.*'
- fmt.Println.* # too much log noise
- ^unsafe\..*$
- ^init$
- ^os.Exit$
- ^fmt.Print.*$
- errors.New.*$
- ^fmt.Println.*$
- ^panic$
- painc
# - ginkgo\\.F.* # these are used just for local development
# # Exclude godoc examples from forbidigo checks. Default is true.
# exclude_godoc_examples: false
funlen:
lines: 220
statements: 80
gocognit:
# minimal code complexity to report, 30 by default (but we recommend 10-20)
min-complexity: 30
goconst:
# minimal length of string constant, 3 by default
min-len: 3
# minimal occurrences count to trigger, 3 by default
min-occurrences: 3
# ignore test files, false by default
ignore-tests: false
# look for existing constants matching the values, true by default
match-constant: true
# search also for duplicated numbers, false by default
numbers: false
# minimum value, only works with goconst.numbers, 3 by default
min: 3
# maximum value, only works with goconst.numbers, 3 by default
max: 3
# ignore when constant is not used as function argument, true by default
ignore-calls: true
gocritic:
# Which checks should be enabled; can't be combined with 'disabled-checks';
# See https://go-critic.github.io/overview#checks-overview
# To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run`
# By default list of stable checks is used.
enabled-checks:
#- rangeValCopy
- ruleguard
# Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
disabled-checks:
- regexpMust
- ifElseChain
#- exitAfterDefer
# Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks.
# Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags".
enabled-tags:
- performance
disabled-tags:
- experimental
# Settings passed to gocritic.
# The settings key is the name of a supported gocritic checker.
# The list of supported checkers can be find in https://go-critic.github.io/overview.
settings:
captLocal: # must be valid enabled check name
# whether to restrict checker to params only (default true)
paramsOnly: true
elseif:
# whether to skip balanced if-else pairs (default true)
skipBalanced: true
hugeParam:
# size in bytes that makes the warning trigger (default 80)
sizeThreshold: 80
rangeExprCopy:
# size in bytes that makes the warning trigger (default 512)
sizeThreshold: 512
# whether to check test functions (default true)
skipTestFuncs: true
rangeValCopy:
# size in bytes that makes the warning trigger (default 128)
sizeThreshold: 32
# whether to check test functions (default true)
skipTestFuncs: true
ruleguard:
# path to a gorules file for the ruleguard checker
rules: ''
underef:
# whether to skip (*x).method() calls where x is a pointer receiver (default true)
skipRecvDeref: true
gocyclo:
# minimal code complexity to report, 30 by default (but we recommend 10-20)
min-complexity: 30
cyclop:
# the maximal code complexity to report
max-complexity: 50
# the maximal average package complexity. If it's higher than 0.0 (float) the check is enabled (default 0.0)
package-average: 0.0
# should ignore tests (default false)
skip-tests: false
godot:
# comments to be checked: `declarations`, `toplevel`, or `all`
scope: declarations
# list of regexps for excluding particular comment lines from check
exclude:
# example: exclude comments which contain numbers
- '[0-9]+'
- 'func\s+\w+'
- 'FIXME:'
- '.*func.*'
# check that each sentence starts with a capital letter
capital: true
godox:
# report any comments starting with keywords, this is useful for TODO or FIXME comments that
# might be left in the code accidentally and should be resolved before merging
keywords: # default keywords are TODO, BUG, and FIXME, these can be overwritten by this setting
#- TODO
- BUG
- FIXME
#- NOTE
- OPTIMIZE # marks code that should be optimized before merging
- HACK # marks hack-arounds that should be removed before merging
gofmt:
# simplify code: gofmt with `-s` option, true by default
simplify: true
gofumpt:
# Select the Go version to target. The default is `1.18`.
go-version: "1.21"
# Choose whether or not to use the extra rules that are disabled
# by default
extra-rules: false
# goheader:
# values:
# const:
# define here const type values in format k:v, for example:
# COMPANY: MY COMPANY
# regexp:
# define here regexp type values, for example
# AUTHOR: .*@mycompany\.com
# template: # |-
# put here copyright header template for source code files, for example:
# Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
#
# {{ AUTHOR }} {{ COMPANY }} {{ YEAR }}
# SPDX-License-Identifier: Apache-2.0
# 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.
# template-path:
# also as alternative of directive 'template' you may put the path to file with the template source
goimports:
# put imports beginning with prefix after 3rd-party packages;
# it's a comma-separated list of prefixes
local-prefixes: github.com/openimsdk/open-im-server
gomnd:
# List of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
# Default: ["argument", "case", "condition", "operation", "return", "assign"]
checks:
- argument
- case
- condition
- operation
- return
- assign
# List of numbers to exclude from analysis.
# The numbers should be written as string.
# Values always ignored: "1", "1.0", "0" and "0.0"
# Default: []
ignored-numbers:
- '0666'
- '0755'
- '42'
# List of file patterns to exclude from analysis.
# Values always ignored: `.+_test.go`
# Default: []
ignored-files:
- 'magic1_.+\.go$'
# List of function patterns to exclude from analysis.
# Following functions are always ignored: `time.Date`,
# `strconv.FormatInt`, `strconv.FormatUint`, `strconv.FormatFloat`,
# `strconv.ParseInt`, `strconv.ParseUint`, `strconv.ParseFloat`.
# Default: []
ignored-functions:
- '^math\.'
- '^webhook\.StatusText$'
gomoddirectives:
# Allow local `replace` directives. Default is false.
replace-local: true
# List of allowed `replace` directives. Default is empty.
replace-allow-list:
- google.golang.org/grpc
# Allow to not explain why the version has been retracted in the `retract` directives. Default is false.
retract-allow-no-explanation: false
# Forbid the use of the `exclude` directives. Default is false.
exclude-forbidden: false
gomodguard:
allowed:
modules:
- gorm.io/gen # List of allowed modules
- gorm.io/gorm
- gorm.io/driver/mysql
- k8s.io/klog
- github.com/allowed/module
- go.mongodb.org/mongo-driver/mongo
# - gopkg.in/yaml.v2
domains: # List of allowed module domains
- google.golang.org
- gopkg.in
- golang.org
- github.com
- go.mongodb.org
- go.uber.org
- openim.io
- go.etcd.io
blocked:
versions:
- github.com/MakeNowJust/heredoc:
version: "> 2.0.9"
reason: "use the latest version"
local_replace_directives: false # Set to true to raise lint issues for packages that are loaded from a local path via replace directive
gosec:
# To select a subset of rules to run.
# Available rules: https://github.com/securego/gosec#available-rules
includes:
- G401
- G306
- G101
# To specify a set of rules to explicitly exclude.
# Available rules: https://github.com/securego/gosec#available-rules
excludes:
- G204
# Exclude generated files
exclude-generated: true
# Filter out the issues with a lower severity than the given value. Valid options are: low, medium, high.
severity: "low"
# Filter out the issues with a lower confidence than the given value. Valid options are: low, medium, high.
confidence: "low"
# To specify the configuration of rules.
# The configuration of rules is not fully documented by gosec:
# https://github.com/securego/gosec#configuration
# https://github.com/securego/gosec/blob/569328eade2ccbad4ce2d0f21ee158ab5356a5cf/rules/rulelist.go#L60-L102
config:
G306: "0600"
G101:
pattern: "(?i)example"
ignore_entropy: false
entropy_threshold: "80.0"
per_char_threshold: "3.0"
truncate: "32"
gosimple:
# Select the Go version to target. The default is '1.13'.
go: "1.20"
# https://staticcheck.io/docs/options#checks
checks: [ "all" ]
govet:
# settings per analyzer
settings:
printf: # analyzer name, run `go tool vet help` to see all analyzers
funcs: # run `go tool vet help printf` to see available settings for `printf` analyzer
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
# enable or disable analyzers by name
enable:
- atomicalign
enable-all: false
disable:
- shadow
disable-all: false
depguard:
rules:
prevent_unmaintained_packages:
list-mode: lax # allow unless explicitely denied
files:
- $all
- "!$test"
allow:
- $gostd
deny:
- pkg: io/ioutil
desc: "replaced by io and os packages since Go 1.16: https://tip.golang.org/doc/go1.16#ioutil"
- pkg: github.com/OpenIMSDK
desc: "The OpenIM organization has been replaced with lowercase, please do not use uppercase organization name, you will use openimsdk"
- pkg: log
desc: "We have a wrapped log package at openim, we recommend you to use our wrapped log package, https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/logging.md"
- pkg: errors
desc: "We have a wrapped errors package at openim, we recommend you to use our wrapped errors package, https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/error-code.md"
importas:
# if set to `true`, force to use alias.
no-unaliased: true
# List of aliases
alias:
# using `servingv1` alias for `knative.dev/serving/pkg/apis/serving/v1` package
- pkg: knative.dev/serving/pkg/apis/serving/v1
alias: servingv1
- pkg: gopkg.in/yaml.v2
alias: yaml
# using `autoscalingv1alpha1` alias for `knative.dev/serving/pkg/apis/autoscaling/v1alpha1` package
- pkg: knative.dev/serving/pkg/apis/autoscaling/v1alpha1
alias: autoscalingv1alpha1
# You can specify the package path by regular expression,
# and alias by regular expression expansion syntax like below.
# see https://github.com/julz/importas#use-regular-expression for details
- pkg: knative.dev/serving/pkg/apis/(\w+)/(v[\w\d]+)
alias: $1$2
ireturn:
# ireturn allows using `allow` and `reject` settings at the same time.
# Both settings are lists of the keywords and regular expressions matched to interface or package names.
# keywords:
# - `empty` for `interface{}`
# - `error` for errors
# - `stdlib` for standard library
# - `anon` for anonymous interfaces
# By default, it allows using errors, empty interfaces, anonymous interfaces,
# and interfaces provided by the standard library.
allow:
- anon
- error
- empty
- stdlib
# You can specify idiomatic endings for interface
- (or|er)$
# Reject patterns
reject:
- github.com\/user\/package\/v4\.Type
lll:
# max line length, lines longer will be reported. Default is 250.
# '\t' is counted as 1 character by default, and can be changed with the tab-width option
line-length: 250
# tab width in spaces. Default to 1.
tab-width: 4
misspell:
# Correct spellings using locale preferences for US or UK.
# Default is to use a neutral variety of English.
# Setting locale to US will correct the British spelling of 'colour' to 'color'.
locale: US
ignore-words:
- someword
nakedret:
# make an issue if func has more lines of code than this setting and it has naked returns; default is 30
max-func-lines: 30
nestif:
# minimal complexity of if statements to report, 5 by default
min-complexity: 4
nilnil:
# By default, nilnil checks all returned types below.
checked-types:
- ptr
- func
- iface
- map
- chan
nlreturn:
# size of the block (including return statement that is still "OK")
# so no return split required.
block-size: 1
nolintlint:
# Disable to ensure that all nolint directives actually have an effect. Default is true.
allow-unused: false
# Exclude following linters from requiring an explanation. Default is [].
allow-no-explanation: [ ]
# Enable to require an explanation of nonzero length after each nolint directive. Default is false.
require-explanation: false
# Enable to require nolint directives to mention the specific linter being suppressed. Default is false.
require-specific: true
prealloc:
# XXX: we don't recommend using this linter before doing performance profiling.
# For most programs usage of prealloc will be a premature optimization.
# Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
# True by default.
simple: true
range-loops: true # Report preallocation suggestions on range loops, true by default
for-loops: false # Report preallocation suggestions on for loops, false by default
promlinter:
# Promlinter cannot infer all metrics name in static analysis.
# Enable strict mode will also include the errors caused by failing to parse the args.
strict: false
# Please refer to https://github.com/yeya24/promlinter#usage for detailed usage.
disabled-linters:
- "Help"
- "MetricUnits"
- "Counter"
- "HistogramSummaryReserved"
- "MetricTypeInName"
- "ReservedChars"
- "CamelCase"
predeclared:
# comma-separated list of predeclared identifiers to not report on
ignore: ""
# include method names and field names (i.e., qualified names) in checks
q: false
rowserrcheck:
packages:
- github.com/jmoiron/sqlx
revive:
# see https://github.com/mgechev/revive#available-rules for details.
ignore-generated-header: true
severity: warning
rules:
- name: indent-error-flow
severity: warning
- name: exported
severity: warning
- name: var-naming
arguments: [ [ "OpenIM"] ]
# arguments: [ ["ID", "HTTP", "URL", "URI", "API", "APIKey", "Token", "TokenID", "TokenSecret", "TokenKey", "TokenSecret", "JWT", "JWTToken", "JWTTokenID", "JWTTokenSecret", "JWTTokenKey", "JWTTokenSecret", "OAuth", "OAuthToken", "RPC" ] ]
- name: atomic
- name: line-length-limit
severity: error
arguments: [200]
- name: unhandled-error
arguments : ["fmt.Printf", "myFunction"]
staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20"
# https://staticcheck.io/docs/options#checks
checks: [ "all" ]
stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20"
# https://staticcheck.io/docs/options#checks
checks: [ "all", "-ST1000", "-ST1003", "-ST1016", "-ST1020", "-ST1021", "-ST1022" ]
# https://staticcheck.io/docs/options#dot_import_whitelist
dot-import-whitelist:
- fmt
# https://staticcheck.io/docs/options#initialisms
initialisms: [ "ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS" ]
# https://staticcheck.io/docs/options#http_status_code_whitelist
http-status-code-whitelist: [ "200", "400", "404", "500" ]
tagliatelle:
# check the struck tag name case
case:
# use the struct field name to check the name of the struct tag
use-field-name: true
rules:
# any struct tag type can be used.
# support string case: `camel`, `pascal`, `kebab`, `snake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`
json: camel
yaml: camel
xml: camel
bson: camel
avro: snake
mapstructure: kebab
testpackage:
# regexp pattern to skip files
skip-regexp: (id|export|internal)_test\.go
thelper:
# The following configurations enable all checks. It can be omitted because all checks are enabled by default.
# You can enable only required checks deleting unnecessary checks.
test:
first: true
name: true
begin: true
benchmark:
first: true
name: true
begin: true
tb:
first: true
name: true
begin: true
tenv:
# The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
# By default, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
all: false
unparam:
# Inspect exported functions, default is false. Set to true if no external program/library imports your code.
# XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
# if it's called for subdir of a project it can't find external interfaces. All text editor integrations
# with golangci-lint call it on a directory with the changed file.
check-exported: false
# unused:
# treat code as a program (not a library) and report unused exported identifiers; default is false.
# XXX: if you enable this setting, unused will report a lot of false-positives in text editors:
# if it's called for subdir of a project it can't find funcs usages. All text editor integrations
# with golangci-lint call it on a directory with the changed file.
whitespace:
multi-if: false # Enforces newlines (or comments) after every multi-line if statement
multi-func: false # Enforces newlines (or comments) after every multi-line function signature
wrapcheck:
# An array of strings that specify substrings of signatures to ignore.
# If this set, it will override the default set of ignored signatures.
# See https://github.com/tomarrell/wrapcheck#configuration for more information.
ignoreSigs:
- .Errorf(
- errors.New(
- errors.Unwrap(
- .Wrap(
- .WrapMsg(
- .Wrapf(
- .WithMessage(
- .WithMessagef(
- .WithStack(
ignorePackageGlobs:
- encoding/*
- github.com/pkg/*
- github.com/openimsdk/*
- github.com/OpenIMSDK/*
wsl:
# If true append is only allowed to be cuddled if appending value is
# matching variables, fields or types on line above. Default is true.
strict-append: true
# Allow calls and assignments to be cuddled as long as the lines have any
# matching variables, fields or types. Default is true.
allow-assign-and-call: true
# Allow assignments to be cuddled with anything. Default is false.
allow-assign-and-anything: false
# Allow multiline assignments to be cuddled. Default is true.
allow-multiline-assign: true
# Allow declarations (var) to be cuddled.
allow-cuddle-declarations: false
# Allow trailing comments in ending of blocks
allow-trailing-comment: false
# Force newlines in end of case at this limit (0 = never).
force-case-trailing-whitespace: 0
# Force cuddling of err checks with err var assignment
force-err-cuddling: false
# Allow leading comments to be separated with empty liens
allow-separated-leading-comment: false
makezero:
# Allow only slices initialized with a length of zero. Default is false.
always: false
# The custom section can be used to define linter plugins to be loaded at runtime. See README doc
# for more info.
#custom:
# Each custom linter should have a unique name.
#example:
# The path to the plugin *.so. Can be absolute or local. Required for each custom linter
#path: /path/to/example.so
# The description of the linter. Optional, just for documentation purposes.
#description: This is an example usage of a plugin linter.
# Intended to point to the repo location of the linter. Optional, just for documentation purposes.
#original-url: github.com/golangci/example-linter
linters:
# please, do not use `enable-all`: it's deprecated and will be removed soon.
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
# enable-all: true
disable-all: true
enable:
- typecheck # Basic type checking
- gofmt # Format check
- govet # Go's standard linting tool
- gosimple # Suggestions for simplifying code
- errcheck
- decorder
- ineffassign
- forbidigo
- revive
- reassign
- tparallel
- unconvert
- fieldalignment
- dupl
- dupword
- errname
- gci
- exhaustive
- gocritic
- goprintffuncname
- gomnd
- goconst
- gosec
- misspell # Spelling mistakes
- staticcheck # Static analysis
- unused # Checks for unused code
# - goimports # Checks if imports are correctly sorted and formatted
- godot # Checks for comment punctuation
- bodyclose # Ensures HTTP response body is closed
- stylecheck # Style checker for Go code
- unused # Checks for unused code
- errcheck # Checks for missed error returns
fast: true
issues:
# List of regexps of issue texts to exclude, empty list by default.
# But independently from this option we use default exclude patterns,
# it can be disabled by `exclude-use-default: false`. To list all
# excluded by default patterns execute `golangci-lint run --help`
exclude:
- tools/.*
- test/.*
- components/*
- third_party/.*
# Excluding configuration per-path, per-linter, per-text and per-source
exclude-rules:
- linters:
- revive
path: (log/.*)\.go
- linters:
- wrapcheck
path: (cmd/.*|pkg/.*)\.go
- linters:
- typecheck
#path: (pkg/storage/.*)\.go
path: (internal/.*|pkg/.*)\.go
- path: (cmd/.*|test/.*|tools/.*|internal/pump/pumps/.*)\.go
linters:
- forbidigo
- path: (cmd/[a-z]*/.*|store/.*)\.go
linters:
- dupl
- linters:
- gocritic
text: (hugeParam:|rangeValCopy:)
- path: (cmd/[a-z]*/.*)\.go
linters:
- lll
- path: (validator/.*|code/.*|validator/.*|watcher/watcher/.*)
linters:
- gochecknoinits
- path: (internal/.*/options|internal/pump|pkg/log/options.go|internal/authzserver|tools/)
linters:
- tagliatelle
- path: (pkg/app/.*)\.go
linters:
- unused
- forbidigo
# Exclude some staticcheck messages
- linters:
- staticcheck
text: "SA9003:"
# Exclude lll issues for long lines with go:generate
- linters:
- lll
source: "^//go:generate "
- text: ".*[\u4e00-\u9fa5]+.*"
linters:
- golint
source: "^//.*$"
# Independently from option `exclude` we use default exclude patterns,
# it can be disabled by this option. To list all
# excluded by default patterns execute `golangci-lint run --help`.
# Default value for this option is true.
exclude-use-default: true
# The default value is false. If set to true exclude and exclude-rules
# regular expressions become case sensitive.
exclude-case-sensitive: false
# The list of ids of default excludes to include or disable. By default it's empty.
include:
- EXC0002 # disable excluding of issues about comments from golint
# Maximum issues count per one linter. Set to 0 to disable. Default is 50.
max-issues-per-linter: 0
# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
max-same-issues: 0
# Show only new issues: if there are unstaged changes or untracked files,
# only those changes are analyzed, else only changes in HEAD~ are analyzed.
# It's a super-useful option for integration of golangci-lint into existing
# large codebase. It's not practical to fix all existing issues at the moment
# of integration: much better don't allow issues in new code.
# Default is false.
new: false
# Show only new issues created after git revision `REV`
# new-from-rev: REV
# Show only new issues created in git patch with set file path.
#new-from-patch: path/to/patch/file
# Fix found issues (if it's supported by the linter)
fix: true
severity:
# Default value is empty string.
# Set the default severity for issues. If severity rules are defined and the issues
# do not match or no severity is provided to the rule this will be the default
# severity applied. Severities should match the supported severity names of the
# selected out format.
# - Code climate: https://docs.codeclimate.com/docs/issues#issue-severity
# - Checkstyle: https://checkstyle.sourceforge.io/property_types.html#severity
# - Github: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-error-message
default-severity: error
# The default value is false.
# If set to true severity-rules regular expressions become case sensitive.
case-sensitive: false
# Default value is empty list.
# When a list of severity rules are provided, severity information will be added to lint
# issues. Severity rules have the same filtering capability as exclude rules except you
# are allowed to specify one matcher per severity rule.
# Only affects out formats that support setting severity information.
rules:
- linters:
- dupl
severity: info
-1
View File
@@ -1 +0,0 @@
CHANGELOG/CHANGELOG.md
-70
View File
@@ -1,70 +0,0 @@
## [v3.8.3-patch.6](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.6) (2025-07-23)
### Bug Fixes
* fix: Add friend DB in notification sender [#3438](https://github.com/openimsdk/open-im-server/pull/3438)
* fix: remove update version file workflows have new line in 3.8.3-patch branch. [#3452](https://github.com/openimsdk/open-im-server/pull/3452)
* fix: s3 aws init [#3454](https://github.com/openimsdk/open-im-server/pull/3454)
* fix: use safe submodule init in workflows in v3.8.3-patch. [#3469](https://github.com/openimsdk/open-im-server/pull/3469)
**Full Changelog**: [v3.8.3-patch.5...v3.8.3-patch.6](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.5...v3.8.3-patch.6)
## [v3.8.3-patch.5](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.5) (2025-06-10)
### New Features
* feat: optimize friend and group applications [#3396](https://github.com/openimsdk/open-im-server/pull/3396)
### Bug Fixes
* fix: solve unocrrect invite notification [Created [#3219](https://github.com/openimsdk/open-im-server/pull/3219)
### Builds
* build: update gomake version in dockerfile.[Patch branch] [#3416](https://github.com/openimsdk/open-im-server/pull/3416)
**Full Changelog**: [v3.8.3...v3.8.3-patch.5](https://github.com/openimsdk/open-im-server/compare/v3.8.3...v3.8.3-patch.5)
## [v3.8.3-patch.4](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.4) (2025-03-13)
### Bug Fixes
* fix: solve unocrrect invite notificationfrom #3213
**Full Changelog**: [v3.8.3-patch.3...v3.8.3-patch.4](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.3...v3.8.3-patch.4)
## [v3.8.3-patch.3](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.3) (2025-03-07)
### New Features
* feat: optimizing BatchGetIncrementalGroupMember #3180
### Bug Fixes
* fix: solve uncorrect notification when set group info #3172
* fix: the sorting is wrong after canceling the administrator in group settings #3185
* fix: solve uncorrect GroupMember enter group notification type. #3188
### Refactors
* refactor: change sendNotification to sendMessage to avoid ambiguity regarding message sending behavior. #3173
**Full Changelog**: [v3.8.3-patch.2...v3.8.3-patch.3](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.2...v3.8.3-patch.3)
## [v3.8.3-patch.2](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.2) (2025-02-28)
### Bug Fixes
* fix: Offline push does not have a badge && Android offline push (#3146) [#3174](https://github.com/openimsdk/open-im-server/pull/3174)
**Full Changelog**: [v3.8.3-patch.1...v3.8.3-patch.2](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.1...v3.8.3-patch.2)
## [v3.8.3-patch.1](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.1) (2025-02-25)
### New Features
* feat: add backup volume && optimize log print [Created [#3121](https://github.com/openimsdk/open-im-server/pull/3121)
### Bug Fixes
* fix: seq conversion failed without exiting [Created [#3120](https://github.com/openimsdk/open-im-server/pull/3120)
* fix: check error in BatchSetTokenMapByUidPid [Created [#3123](https://github.com/openimsdk/open-im-server/pull/3123)
* fix: DeleteDoc crash [Created [#3124](https://github.com/openimsdk/open-im-server/pull/3124)
* fix: the abnormal message has no sending time, causing the SDK to be abnormal [Created [#3126](https://github.com/openimsdk/open-im-server/pull/3126)
* fix: crash caused [#3127](https://github.com/openimsdk/open-im-server/pull/3127)
* fix: the user sets the conversation timer cleanup timestamp unit incorrectly [Created [#3128](https://github.com/openimsdk/open-im-server/pull/3128)
* fix: seq conversion not reading env in docker environment [Created [#3131](https://github.com/openimsdk/open-im-server/pull/3131)
### Builds
* build: improve workflows contents. [Created [#3125](https://github.com/openimsdk/open-im-server/pull/3125)
**Full Changelog**: [v3.8.3-e-v1.1.5...v3.8.3-patch.1-e-v1.1.5](https://github.com/openimsdk/open-im-server-enterprise/compare/v3.8.3-e-v1.1.5...v3.8.3-patch.1-e-v1.1.5)
-4
View File
@@ -1,4 +0,0 @@
# CHANGELOGs
- [CHANGELOG-3.8.md](./CHANGELOG-3.8.md)
-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
`security@openim.io`.
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.
-96
View File
@@ -1,96 +0,0 @@
# 如何给 OpenIM 贡献代码(提交 Pull Request
<p align="center">
<a href="./CONTRIBUTING.md">English</a> ·
<a href="./CONTRIBUTING-zh_CN.md">中文</a> ·
<a href="docs/contributing/CONTRIBUTING-UA.md">Українська</a> ·
<a href="docs/contributing/CONTRIBUTING-CS.md">Česky</a> ·
<a href="docs/contributing/CONTRIBUTING-HU.md">Magyar</a> ·
<a href="docs/contributing/CONTRIBUTING-ES.md">Español</a> ·
<a href="docs/contributing/CONTRIBUTING-FA.md">فارسی</a> ·
<a href="docs/contributing/CONTRIBUTING-FR.md">Français</a> ·
<a href="docs/contributing/CONTRIBUTING-DE.md">Deutsch</a> ·
<a href="docs/contributing/CONTRIBUTING-PL.md">Polski</a> ·
<a href="docs/contributing/CONTRIBUTING-ID.md">Indonesian</a> ·
<a href="docs/contributing/CONTRIBUTING-FI.md">Suomi</a> ·
<a href="docs/contributing/CONTRIBUTING-ML.md">മലയാളം</a> ·
<a href="docs/contributing/CONTRIBUTING-JP.md">日本語</a> ·
<a href="docs/contributing/CONTRIBUTING-NL.md">Nederlands</a> ·
<a href="docs/contributing/CONTRIBUTING-IT.md">Italiano</a> ·
<a href="docs/contributing/CONTRIBUTING-RU.md">Русский</a> ·
<a href="docs/contributing/CONTRIBUTING-PTBR.md">Português (Brasil)</a> ·
<a href="docs/contributing/CONTRIBUTING-EO.md">Esperanto</a> ·
<a href="docs/contributing/CONTRIBUTING-KR.md">한국어</a> ·
<a href="docs/contributing/CONTRIBUTING-AR.md">العربي</a> ·
<a href="docs/contributing/CONTRIBUTING-VN.md">Tiếng Việt</a> ·
<a href="docs/contributing/CONTRIBUTING-DA.md">Dansk</a> ·
<a href="docs/contributing/CONTRIBUTING-GR.md">Ελληνικά</a> ·
<a href="docs/contributing/CONTRIBUTING-TR.md">Türkçe</a>
</p>
本指南将以 [openimsdk/open-im-server](https://github.com/openimsdk/open-im-server) 为例,详细说明如何为 OpenIM 项目贡献代码。我们采用“一问题一分支”的策略,确保每个 Issue 都对应一个专门的分支,以便有效管理代码变更。
### 1. Fork 仓库
前往 [openimsdk/open-im-server](https://github.com/openimsdk/open-im-server) GitHub 页面,点击右上角的 "Fork" 按钮,将仓库 Fork 到你的 GitHub 账户下。
### 2. 克隆仓库
将你 Fork 的仓库克隆到本地:
```bash
git clone https://github.com/your-username/open-im-server.git
```
### 3. 设置远程上游
添加原始仓库为远程上游以便跟踪其更新:
```bash
git remote add upstream https://github.com/openimsdk/open-im-server.git
```
### 4. 创建 Issue
在原始仓库中创建一个新的 Issue,详细描述你遇到的问题或希望添加
的新功能。
### 5. 创建新分支
基于主分支创建一个新分支,并使用描述性的名称与 Issue ID,例如:
```bash
git checkout -b fix-bug-123
```
### 6. 提交更改
在你的本地分支上进行更改后,提交这些更改:
```bash
git add .
git commit -m "Describe your changes in detail"
```
### 7. 推送分支
将你的分支推送回你的 GitHub Fork
```bash
git push origin fix-bug-123
```
### 8. 创建 Pull Request
在 GitHub 上转到你的 Fork 仓库,点击 "Pull Request" 按钮。确保 PR 描述清楚,并链接到相关的 Issue。
### 9. 签署 CLA
如果这是你第一次提交 PR,你需要在 PR 的评论中回复:
```
I have read the CLA Document and I hereby sign the CLA
```
### 编程规范
请参考以下文档以了解关于 Go 语言编程规范的详细信息:
- [Go 编码规范](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/go-code.md)
- [代码约定](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/code-conventions.md)
### 日志规范
- **禁止使用标准的 `log` 包**。
- 应使用 `"github.com/openimsdk/tools/log"` 包来打印日志,该包支持多种日志级别:`debug``info``warn``error`
- **错误日志应仅在首次调用的函数中打印**,以防止日志重复,并确保错误的上下文清晰。
### 异常及错误处理
- **禁止使用 `panic`**:程序中不应使用 `panic`,以避免在遇到不可恢复的错误时突然终止。
- **错误包裹**:使用 `"github.com/openimsdk/tools/errs"` 来包裹错误,保持错误信息的完整性并增加调试便利。
- **错误传递**:如果函数本身不能处理错误,应将错误返回给调用者,而不是隐藏或忽略这些错误。
-94
View File
@@ -1,94 +0,0 @@
# How to Contribute to OpenIM (Submitting Pull Requests)
<p align="center">
<a href="./CONTRIBUTING.md">English</a> ·
<a href="./CONTRIBUTING-zh_CN.md">中文</a> ·
<a href="docs/contributing/CONTRIBUTING-UA.md">Українська</a> ·
<a href="docs/contributing/CONTRIBUTING-CS.md">Česky</a> ·
<a href="docs/contributing/CONTRIBUTING-HU.md">Magyar</a> ·
<a href="docs/contributing/CONTRIBUTING-ES.md">Español</a> ·
<a href="docs/contributing/CONTRIBUTING-FA.md">فارسی</a> ·
<a href="docs/contributing/CONTRIBUTING-FR.md">Français</a> ·
<a href="docs/contributing/CONTRIBUTING-DE.md">Deutsch</a> ·
<a href="docs/contributing/CONTRIBUTING-PL.md">Polski</a> ·
<a href="docs/contributing/CONTRIBUTING-ID.md">Indonesian</a> ·
<a href="docs/contributing/CONTRIBUTING-FI.md">Suomi</a> ·
<a href="docs/contributing/CONTRIBUTING-ML.md">മലയാളം</a> ·
<a href="docs/contributing/CONTRIBUTING-JP.md">日本語</a> ·
<a href="docs/contributing/CONTRIBUTING-NL.md">Nederlands</a> ·
<a href="docs/contributing/CONTRIBUTING-IT.md">Italiano</a> ·
<a href="docs/contributing/CONTRIBUTING-RU.md">Русский</a> ·
<a href="docs/contributing/CONTRIBUTING-PTBR.md">Português (Brasil)</a> ·
<a href="docs/contributing/CONTRIBUTING-EO.md">Esperanto</a> ·
<a href="docs/contributing/CONTRIBUTING-KR.md">한국어</a> ·
<a href="docs/contributing/CONTRIBUTING-AR.md">العربي</a> ·
<a href="docs/contributing/CONTRIBUTING-VN.md">Tiếng Việt</a> ·
<a href="docs/contributing/CONTRIBUTING-DA.md">Dansk</a> ·
<a href="docs/contributing/CONTRIBUTING-GR.md">Ελληνικά</a> ·
<a href="docs/contributing/CONTRIBUTING-TR.md">Türkçe</a>
</p>
This guide will use [openimsdk/open-im-server](https://github.com/openimsdk/open-im-server) as an example to explain in detail how to contribute code to the OpenIM project. We adopt a "one issue, one branch" strategy to ensure each issue corresponds to a dedicated branch for effective code change management.
### 1. Fork the Repository
Go to the [openimsdk/open-im-server](https://github.com/openimsdk/open-im-server) GitHub page, click the "Fork" button in the upper right corner to fork the repository to your GitHub account.
### 2. Clone the Repository
Clone the repository you forked to your local machine:
```bash
git clone https://github.com/your-username/open-im-server.git
```
### 3. Set Upstream Remote
Add the original repository as a remote upstream to track updates:
```bash
git remote add upstream https://github.com/openimsdk/open-im-server.git
```
### 4. Create an Issue
Create a new issue in the original repository detailing the problem you encountered or the new feature you wish to add.
### 5. Create a New Branch
Create a new branch off the main branch with a descriptive name and Issue ID, for example:
```bash
git checkout -b fix-bug-123
```
### 6. Commit Changes
After making changes on your local branch, commit these changes:
```bash
git add .
git commit -m "Describe your changes
in detail"
```
### 7. Push the Branch
Push your branch back to your GitHub fork:
```bash
git push origin fix-bug-123
```
### 8. Create a Pull Request
Go to your fork on GitHub and click the "Pull Request" button. Ensure the PR description is clear and links to the related issue.
### 9. Sign the CLA
If this is your first time submitting a PR, you will need to reply in the comments of the PR:
```
I have read the CLA Document and I hereby sign the CLA
```
### Programming Standards
Please refer to the following documents for detailed information on Go language programming standards:
- [Go Coding Standards](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/go-code.md)
- [Code Conventions](https://github.com/openimsdk/open-im-server/blob/main/docs/contrib/code-conventions.md)
### Logging Standards
- **Do not use the standard `log` package**.
- Use the `"github.com/openimsdk/tools/log"` package for logging, which supports multiple log levels: `debug`, `info`, `warn`, `error`.
- **Error logs should only be printed in the function where they are first actively called** to prevent log duplication and ensure clear error context.
### Exception and Error Handling
- **Prohibit the use of `panic`**: The code should not use `panic` to avoid abrupt termination when encountering unrecoverable errors.
- **Error Wrapping**: Use `"github.com/openimsdk/tools/errs"` to wrap errors, maintaining the integrity of error information and facilitating debugging.
- **Error Propagation**: If a function cannot handle an error itself, it should return the error to the caller, rather than hiding or ignoring it.
-49
View File
@@ -1,49 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
# ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod download
# Install Mage to use for building the application
RUN go install github.com/magefile/mage@v1.15.0
# Optionally build your application if needed
RUN mage build
# Using Alpine Linux with Go environment for the final image
FROM golang:1.22-alpine
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
COPY --from=builder /go/bin/mage /usr/local/bin/mage
COPY --from=builder $SERVER_DIR/magefile_windows.go $SERVER_DIR/
COPY --from=builder $SERVER_DIR/magefile_unix.go $SERVER_DIR/
COPY --from=builder $SERVER_DIR/magefile.go $SERVER_DIR/
COPY --from=builder $SERVER_DIR/start-config.yml $SERVER_DIR/
COPY --from=builder $SERVER_DIR/go.mod $SERVER_DIR/
COPY --from=builder $SERVER_DIR/go.sum $SERVER_DIR/
RUN go get github.com/openimsdk/gomake@v0.0.15-alpha.1
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "mage start && tail -f /dev/null"]
+120 -100
View File
@@ -1,140 +1,160 @@
<p align="center">
<a href="https://openim.io">
<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)
<div align="center">
![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-logo.png)
[![Stars](https://img.shields.io/github/stars/openimsdk/open-im-server?style=for-the-badge&logo=github&colorB=ff69b4)](https://github.com/openimsdk/open-im-server/stargazers)
[![Forks](https://img.shields.io/github/forks/openimsdk/open-im-server?style=for-the-badge&logo=github&colorB=blue)](https://github.com/openimsdk/open-im-server/network/members)
[![Codecov](https://img.shields.io/codecov/c/github/openimsdk/open-im-server?style=for-the-badge&logo=codecov&colorB=orange)](https://app.codecov.io/gh/openimsdk/open-im-server)
[![Go Report Card](https://goreportcard.com/badge/github.com/openimsdk/open-im-server?style=for-the-badge)](https://goreportcard.com/report/github.com/openimsdk/open-im-server)
[![Go Reference](https://img.shields.io/badge/Go%20Reference-blue.svg?style=for-the-badge&logo=go&logoColor=white)](https://pkg.go.dev/github.com/openimsdk/open-im-server/v3)
[![License](https://img.shields.io/badge/license-Apache--2.0-green?style=for-the-badge)](https://github.com/openimsdk/open-im-server/blob/main/LICENSE)
[![Slack](https://img.shields.io/badge/Slack-500%2B-blueviolet?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A)
[![Best Practices](https://img.shields.io/badge/Best%20Practices-purple?style=for-the-badge)](https://www.bestpractices.dev/projects/8045)
[![Good First Issues](https://img.shields.io/github/issues/openimsdk/open-im-server/good%20first%20issue?style=for-the-badge&logo=github)](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22)
[![Language](https://img.shields.io/badge/Language-Go-blue.svg?style=for-the-badge&logo=go&logoColor=white)](https://golang.org/)
[![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20OpenIM%20Guru-006BFF?style=for-the-badge)](https://gurubase.io/g/openim)
[![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="./README.md">English</a> ·
<a href="./README_zh_CN.md">中文</a> ·
<a href="./docs/readme/README_uk.md">Українська</a> ·
<a href="./docs/readme/README_cs.md">Česky</a> ·
<a href="./docs/readme/README_hu.md">Magyar</a> ·
<a href="./docs/readme/README_es.md">Español</a> ·
<a href="./docs/readme/README_fa.md">فارسی</a> ·
<a href="./docs/readme/README_fr.md">Français</a> ·
<a href="./docs/readme/README_de.md">Deutsch</a> ·
<a href="./docs/readme/README_pl.md">Polski</a> ·
<a href="./docs/readme/README_id.md">Indonesian</a> ·
<a href="./docs/readme/README_fi.md">Suomi</a> ·
<a href="./docs/readme/README_ml.md">മലയാളം</a> ·
<a href="./docs/readme/README_ja.md">日本語</a> ·
<a href="./docs/readme/README_nl.md">Nederlands</a> ·
<a href="./docs/readme/README_it.md">Italiano</a> ·
<a href="./docs/readme/README_ru.md">Русский</a> ·
<a href="./docs/readme/README_pt_BR.md">Português (Brasil)</a> ·
<a href="./docs/readme/README_eo.md">Esperanto</a> ·
<a href="./docs/readme/README_ko.md">한국어</a> ·
<a href="./docs/readme/README_ar.md">العربي</a> ·
<a href="./docs/readme/README_vi.md">Tiếng Việt</a> ·
<a href="./docs/readme/README_da.md">Dansk</a> ·
<a href="./docs/readme/README_el.md">Ελληνικά</a> ·
<a href="./docs/readme/README_tr.md">Türkçe</a>
</p>
## Open-IM-Server: Open source Instant Messaging Server
</div>
Instant messaging server. Backend in pure Golang, wire transport protocol is JSON over websocket.
</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.
## :busts_in_silhouette: Join Our Community
Using microservice architectures, Open-IM-Server can be deployed using clusters.
- 💬 [Follow us on Twitter](https://twitter.com/founder_im63606)
- 🚀 [Join our Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A)
- :eyes: [Join our WeChat Group](https://openim-1253691595.cos.ap-nanjing.myqcloud.com/WechatIMG20.jpeg)
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
Unlike standalone chat applications such as Telegram, Signal, and Rocket.Chat, OpenIM offers an open-source instant messaging solution designed specifically for developers rather than as a directly installable standalone chat app. Comprising OpenIM SDK and OpenIM Server, it provides developers with a complete set of tools and services to integrate instant messaging functions into their applications, including message sending and receiving, user management, and group management. Overall, OpenIM aims to provide developers with the necessary tools and framework to implement efficient instant messaging solutions in their applications.
- Everything in Free
- Scalable architecture
- Easy integration
- Good scalability
- High performance
- Lightweight
- Supports multiple protocols
![App-OpenIM Relationship](./docs/images/oepnim-design.png)
## Community
## 🚀 Introduction to OpenIMSDK
- Join the Telegram-OpenIM group: https://t.me/joinchat/zSJLPaHBNLZmODI1
- 中文官网访问这里:[Open-IM中文开发文档](https://doc.rentsoft.cn/)
**OpenIMSDK**, designed for **OpenIMServer**, is an IM SDK created specifically for integration into client applications. It supports various functionalities and modules:
## Quick start
- 🌟 Main Features:
### Installing Open-IM-Server
- 📦 Local Storage
- 🔔 Listener Callbacks
- 🛡️ API Wrapping
- 🌐 Connection Management
> 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.
- 📚 Main Modules:
1. 🚀 Initialization and Login
2. 👤 User Management
3. 👫 Friends Management
4. 🤖 Group Functions
5. 💬 Session Handling
#### Source code deployment
Built with Golang and supports cross-platform deployment to ensure a consistent integration experience across all platforms.
1. Install [Go environment](https://golang.org/doc/install). Make sure Go version is at least 1.15.
👉 **[Explore the GO SDK](https://github.com/openimsdk/openim-sdk-core)**
2. Clone the Open-IM project to your server.
## 🌐 Introduction to OpenIMServer
```
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
```
- **OpenIMServer** features include:
- 🌐 Microservices Architecture: Supports cluster mode, including a gateway and multiple rpc services.
- 🚀 Diverse Deployment Options: Supports source code, Kubernetes, or Docker deployment.
- Massive User Support: Supports large-scale groups with hundreds of thousands, millions of users, and billions of messages.
3. Build and start Service.
### Enhanced Business Functions:
1. Shell authorization
- **REST API**: Provides a REST API for business systems to enhance functionality, such as group creation and message pushing through backend interfaces.
```
#cd Open-IM-server/script
chmod +x *.sh
```
- **Webhooks**: Expands business forms through callbacks, sending requests to business servers before or after certain events.
2. Execute the build shell
![Overall Architecture](./docs/images/architecture-layers.png)
```
./build_all_service.sh
```
## :rocket: Quick Start
3. Start service
Experience online for iOS/Android/H5/PC/Web:
```
./start_all.sh
```
👉 **[OpenIM Online Demo](https://www.openim.io/en/commercial)**
4. Check service
To facilitate user experience, we offer various deployment solutions. You can choose your preferred deployment method from the list below:
```
./check_all.sh
```
- **[Source Code Deployment Guide](https://docs.openim.io/guides/gettingStarted/imSourceCodeDeployment)**
- **[Docker Deployment Guide](https://docs.openim.io/guides/gettingStarted/dockerCompose)**
![OpenIMServersonSystempng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM-Servers-on-System.png)
## System Support
#### Docker deployment
Supports Linux, Windows, Mac systems, and ARM and AMD CPU architectures.
All images are available at https://hub.docker.com/r/lyt1123/open_im_server
## :link: Links
1. [Install Docker](https://docs.docker.com/install/) 1.13 or above.
- **[Developer Manual](https://docs.openim.io/)**
- **[Changelog](https://github.com/openimsdk/open-im-server/blob/main/CHANGELOG.md)**
2. [Install Docker Compose](https://docs.docker.com/compose/install/) 1.22 or above.
## :writing_hand: How to Contribute
3. Clone the Open-IM project to your server.
We welcome contributions of any kind! Please make sure to read our [Contributor Documentation](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md) before submitting a Pull Request.
```
git clone https://github.com/OpenIMSDK/Open-IM-Server.git --recursive
```
- **[Report a Bug](https://github.com/openimsdk/open-im-server/issues/new?assignees=&labels=bug&template=bug_report.md&title=)**
- **[Suggest a Feature](https://github.com/openimsdk/open-im-server/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)**
- **[Submit a Pull Request](https://github.com/openimsdk/open-im-server/pulls)**
4. Start docker-compose with one click(Docker automatically pulls all images)
Thank you for contributing to building a powerful instant messaging solution!
```
cd Open-IM-Server
docker-compose up -d
```
## :closed_book: License
5. Check service
This software is licensed under the Apache License 2.0
```
./docker_check_service.sh
./check_all.sh
```
## 🔮 Thanks to our contributors!
![OpenIMServersondockerpng](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM-Servers-on-docker.png)
<a href="https://github.com/openimsdk/open-im-server/graphs/contributors">
<img src="https://contrib.rocks/image?repo=openimsdk/open-im-server" />
</a>
### CONFIGURATION INSTRUCTIONS
> 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
#### 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
- 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
- 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
- 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
#### Internal Service Configuration Instructions
- 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
### SCRIPT DESCRIPTION
> 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
- 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
## Authentication Clow Chart
![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/open-im-server.png)
## Architecture
![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Architecture.jpg)
## License
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
-139
View File
@@ -1,139 +0,0 @@
<p align="center">
<a href="https://openim.io">
<img src="./assets/logo-gif/openim-logo.gif" width="60%" height="30%"/>
</a>
</p>
<div align="center">
[![Stars](https://img.shields.io/github/stars/openimsdk/open-im-server?style=for-the-badge&logo=github&colorB=ff69b4)](https://github.com/openimsdk/open-im-server/stargazers)
[![Forks](https://img.shields.io/github/forks/openimsdk/open-im-server?style=for-the-badge&logo=github&colorB=blue)](https://github.com/openimsdk/open-im-server/network/members)
[![Codecov](https://img.shields.io/codecov/c/github/openimsdk/open-im-server?style=for-the-badge&logo=codecov&colorB=orange)](https://app.codecov.io/gh/openimsdk/open-im-server)
[![Go Report Card](https://goreportcard.com/badge/github.com/openimsdk/open-im-server?style=for-the-badge)](https://goreportcard.com/report/github.com/openimsdk/open-im-server)
[![Go Reference](https://img.shields.io/badge/Go%20Reference-blue.svg?style=for-the-badge&logo=go&logoColor=white)](https://pkg.go.dev/github.com/openimsdk/open-im-server/v3)
[![License](https://img.shields.io/badge/license-Apache--2.0-green?style=for-the-badge)](https://github.com/openimsdk/open-im-server/blob/main/LICENSE)
[![Slack](https://img.shields.io/badge/Slack-500%2B-blueviolet?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/openimsdk/shared_invite/zt-2ijy1ys1f-O0aEDCr7ExRZ7mwsHAVg9A)
[![Best Practices](https://img.shields.io/badge/Best%20Practices-purple?style=for-the-badge)](https://www.bestpractices.dev/projects/8045)
[![Good First Issues](https://img.shields.io/github/issues/openimsdk/open-im-server/good%20first%20issue?style=for-the-badge&logo=github)](https://github.com/openimsdk/open-im-server/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22)
[![Language](https://img.shields.io/badge/Language-Go-blue.svg?style=for-the-badge&logo=go&logoColor=white)](https://golang.org/)
<p align="center">
<a href="./README.md">English</a> ·
<a href="./README_zh_CN.md">中文</a> ·
<a href="./docs/readme/README_uk.md">Українська</a> ·
<a href="./docs/readme/README_cs.md">Česky</a> ·
<a href="./docs/readme/README_hu.md">Magyar</a> ·
<a href="./docs/readme/README_es.md">Español</a> ·
<a href="./docs/readme/README_fa.md">فارسی</a> ·
<a href="./docs/readme/README_fr.md">Français</a> ·
<a href="./docs/readme/README_de.md">Deutsch</a> ·
<a href="./docs/readme/README_pl.md">Polski</a> ·
<a href="./docs/readme/README_id.md">Indonesian</a> ·
<a href="./docs/readme/README_fi.md">Suomi</a> ·
<a href="./docs/readme/README_ml.md">മലയാളം</a> ·
<a href="./docs/readme/README_ja.md">日本語</a> ·
<a href="./docs/readme/README_nl.md">Nederlands</a> ·
<a href="./docs/readme/README_it.md">Italiano</a> ·
<a href="./docs/readme/README_ru.md">Русский</a> ·
<a href="./docs/readme/README_pt_BR.md">Português (Brasil)</a> ·
<a href="./docs/readme/README_eo.md">Esperanto</a> ·
<a href="./docs/readme/README_ko.md">한국어</a> ·
<a href="./docs/readme/README_ar.md">العربي</a> ·
<a href="./docs/readme/README_vi.md">Tiếng Việt</a> ·
<a href="./docs/readme/README_da.md">Dansk</a> ·
<a href="./docs/readme/README_el.md">Ελληνικά</a> ·
<a href="./docs/readme/README_tr.md">Türkçe</a>
</p>
</div>
</p>
## :busts_in_silhouette: 加入我们的社区
- 💬 [关注我们的 Twitter](https://twitter.com/founder_im63606)
- 🚀 [加入我们的 Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-2hljfom5u-9ZuzP3NfEKW~BJKbpLm0Hw)
- :eyes: [加入我们的微信群](https://openim-1253691595.cos.ap-nanjing.myqcloud.com/WechatIMG20.jpeg)
## Ⓜ️ 关于 OpenIM
与 Telegram、Signal、Rocket.Chat 等独立聊天应用不同,OpenIM 提供了专为开发者设计的开源即时通讯解决方案,而不是直接安装使用的独立聊天应用。OpenIM 由 OpenIM SDK 和 OpenIM Server 两大部分组成,为开发者提供了一整套集成即时通讯功能的工具和服务,包括消息发送接收、用户管理和群组管理等。总体来说,OpenIM 旨在为开发者提供必要的工具和框架,帮助他们在自己的应用中实现高效的即时通讯解决方案。
![App-OpenIM 关系](./docs/images/oepnim-design.png)
## 🚀 OpenIMSDK 介绍
**OpenIMSDK** 是为 **OpenIMServer** 设计的 IM SDK,专为集成到客户端应用而生。它支持多种功能和模块:
- 🌟 主要功能:
- 📦 本地存储
- 🔔 监听器回调
- 🛡️ API 封装
- 🌐 连接管理
- 📚 主要模块:
1. 🚀 初始化及登录
2. 👤 用户管理
3. 👫 好友管理
4. 🤖 群组功能
5. 💬 会话处理
它使用 Golang 构建,并支持跨平台部署,确保在所有平台上提供一致的接入体验。
👉 **[探索 GO SDK](https://github.com/openimsdk/openim-sdk-core)**
## 🌐 OpenIMServer 介绍
- **OpenIMServer** 的特点包括:
- 🌐 微服务架构:支持集群模式,包括网关(gateway)和多个 rpc 服务。
- 🚀 多样的部署方式:支持源代码、Kubernetes 或 Docker 部署。
- 海量用户支持:支持十万级超大群组,千万级用户和百亿级消息。
### 增强的业务功能:
- **REST API**:为业务系统提供 REST API,增加群组创建、消息推送等后台接口功能。
- **Webhooks**:通过事件前后的回调,向业务服务器发送请求,扩展更多的业务形态。
![整体架构](./docs/images/architecture-layers.png)
## :rocket: 快速入门
在线体验 iOS/Android/H5/PC/Web
👉 **[OpenIM 在线演示](https://www.openim.io/en/commercial)**
为了便于用户体验,我们提供了多种部署解决方案,您可以根据以下列表选择适合您的部署方式:
- **[源代码部署指南](https://docs.openim.io/guides/gettingStarted/imSourceCodeDeployment)**
- **[Docker 部署指南](https://docs.openim.io/guides/gettingStarted/dockerCompose)**
## 系统支持
支持 Linux、Windows、Mac 系统以及 ARM 和 AMD CPU 架构。
## :link: 相关链接
- **[开发手册](https://docs.openim.io/)**
- **[更新日志](https://github.com/openimsdk/open-im-server/blob/main/CHANGELOG.md)**
## :writing_hand: 如何贡献
我们欢迎任何形式的贡献!在提交 Pull Request 之前,请确保阅读我们的[贡献者文档](https://github.com/openimsdk/open-im-server/blob/main/CONTRIBUTING.md)
- **[报告 Bug](https://github.com/openimsdk/open-im-server/issues/new?assignees=&labels=bug&template=bug_report.md&title=)**
- **[提出新特性](https://github.com/openimsdk/open-im-server/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)**
- **[提交 Pull Request](https://github.com/openimsdk/open-im-server/pulls)**
感谢您的贡献,一起来打造强大的即时通讯解决方案!
## :closed_book: 开源许可证 License
This software is licensed under the Apache License 2.0
## 🔮 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>
-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/open-im-server) 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.
-11
View File
@@ -1,11 +0,0 @@
# Official Colors
The openim logo has an official blue color. When reproducing the logo, please use the official color, when possible.
## Pantone
When possible, the Pantone color is preferred for print material. The official Pantone color is *285C*.
## RGB
When used digitally, the official RGB color code is *#326CE5*.
-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: 49 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

-31
View File
@@ -1,31 +0,0 @@
@echo off
SETLOCAL
mage -version >nul 2>&1
IF %ERRORLEVEL% EQU 0 (
echo Mage is already installed.
GOTO DOWNLOAD
)
go version >nul 2>&1
IF NOT %ERRORLEVEL% EQU 0 (
echo Go is not installed. Please install Go and try again.
exit /b 1
)
echo Installing Mage...
go install github.com/magefile/mage@latest
mage -version >nul 2>&1
IF NOT %ERRORLEVEL% EQU 0 (
echo Mage installation failed.
echo Please ensure that %GOPATH%/bin is in your PATH.
exit /b 1
)
echo Mage installed successfully.
:DOWNLOAD
go mod download
ENDLOCAL
-23
View File
@@ -1,23 +0,0 @@
#!/bin/bash
if [[ ":$PATH:" == *":$HOME/.local/bin:"* ]]; then
TARGET_DIR="$HOME/.local/bin"
else
TARGET_DIR="/usr/local/bin"
echo "Using /usr/local/bin as the installation directory. Might require sudo permissions."
fi
if ! command -v mage &> /dev/null; then
echo "Installing Mage to $TARGET_DIR ..."
GOBIN=$TARGET_DIR go install github.com/magefile/mage@latest
fi
if ! command -v mage &> /dev/null; then
echo "Mage installation failed."
echo "Please ensure that $TARGET_DIR is in your \$PATH."
exit 1
fi
echo "Mage installed successfully."
go mod download
-65
View File
@@ -1,65 +0,0 @@
# Building OpenIM
Building OpenIM is easy if you take advantage of the containerized build environment. This document will help guide you through understanding this build process.
## Requirements
1. Docker, using one of the following configurations:
* **macOS** Install Docker for Mac. See installation instructions [here](https://docs.docker.com/docker-for-mac/).
**Note**: You will want to set the Docker VM to have at least 4GB of initial memory or building will likely fail.
* **Linux with local Docker** Install Docker according to the [instructions](https://docs.docker.com/installation/#installation) for your OS.
* **Windows with Docker Desktop WSL2 backend** Install Docker according to the [instructions](https://docs.docker.com/docker-for-windows/wsl-tech-preview/). Be sure to store your sources in the local Linux file system, not the Windows remote mount at `/mnt/c`.
**Note**: You will need to check if Docker CLI plugin buildx is properly installed (`docker-buildx` file should be present in `~/.docker/cli-plugins`). You can install buildx according to the [instructions](https://github.com/docker/buildx/blob/master/README.md#installing).
2. **Optional** [Google Cloud SDK](https://developers.google.com/cloud/sdk/)
You must install and configure Google Cloud SDK if you want to upload your release to Google Cloud Storage and may safely omit this otherwise.
## Actions
About [Images packages](https://github.com/orgs/OpenIMSDK/packages?repo_name=Open-IM-Server)
All files in the `build/images` directory are not templated and are instead rendered by Github Actions, which is an automated process.
Trigger condition:
1. create a new tag with the format `vX.Y.Z` (e.g. `v1.0.0`)
2. push the tag to the remote repository
3. wait for the build to finish
4. download the artifacts from the release page
## Make images
**help info:**
```bash
$ make image.help
```
**build images:**
```bash
$ make image
```
## Overview
While it is possible to build OpenIM using a local golang installation, we have a build process that runs in a Docker container. This simplifies initial set up and provides for a very consistent build and test environment.
## Basic Flow
The scripts directly under [`build/`](.) are used to build and test. They will ensure that the `openim-build` Docker image is built (based on [`build/build-image/Dockerfile`](../Dockerfile) and after base image's `OPENIM_BUILD_IMAGE_CROSS_TAG` from Dockerfile is replaced with one of those actual tags of the base image, like `v1.13.9-2`) and then execute the appropriate command in that container. These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container. You can specify a different registry/name and version for `openim-cross` by setting `OPENIM_CROSS_IMAGE` and `OPENIM_CROSS_VERSION`, see [`common.sh`](common.sh) for more details.
The `openim-build` container image is built by first creating a "context" directory in `_output/images/build-image`. It is done there instead of at the root of the OpenIM repo to minimize the amount of data we need to package up when building the image.
There are 3 different containers instances that are run from this image. The first is a "data" container to store all data that needs to persist across to support incremental builds. Next there is an "rsync" container that is used to transfer data in and out to the data container. Lastly there is a "build" container that is used for actually doing build actions. The data container persists across runs while the rsync and build containers are deleted after each use.
`rsync` is used transparently behind the scenes to efficiently move data in and out of the container. This will use an ephemeral port picked by Docker. You can modify this by setting the `OPENIM_RSYNC_PORT` env variable.
All Docker names are suffixed with a hash derived from the file path (to allow concurrent usage on things like CI machines) and a version number. When the version number changes all state is cleared and clean build is started. This allows the build infrastructure to be changed and signal to CI systems that old artifacts need to be deleted.
## Build artifacts
The build system output all its products to a top level directory in the source repository named `_output`.
These include the binary compiled packages (e.g. imctl, openim-api etc.) and archived Docker images.
If you intend to run a component with a docker image you will need to import it from this directory with
-431
View File
@@ -1,431 +0,0 @@
# This is an example .goreleaser.yml file with some sensible defaults.
# Make sure to check the documentation at https://goreleaser.com
before:
hooks:
- make clean
# You may remove this if you don't use go modules.
- make tidy
- make copyright.add
# you may remove this if you don't need go generate
- go generate ./...
git:
# What should be used to sort tags when gathering the current and previous
# tags if there are more than one tag in the same commit.
#
# Default: '-version:refname'
tag_sort: -version:creatordate
# What should be used to specify prerelease suffix while sorting tags when gathering
# the current and previous tags if there are more than one tag in the same commit.
#
# Since: v1.17
prerelease_suffix: "-"
# Tags to be ignored by GoReleaser.
# This means that GoReleaser will not pick up tags that match any of the
# provided values as either previous or current tags.
#
# Templates: allowed.
# Since: v1.21.
ignore_tags:
- nightly
# - "{{.Env.IGNORE_TAG}}"
snapshot:
name_template: "{{ incpatch .Version }}-next"
# gomod:
# proxy: true
report_sizes: true
# metadata:
# mod_timestamp: "{{ .CommitTimestamp }}"
builds:
- binary: openim-api
id: openim-api
main: ./cmd/openim-api/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-cmdutils
id: openim-cmdutils
main: ./cmd/openim-cmdutils/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-crontask
id: openim-crontask
main: ./cmd/openim-crontask/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-msggateway
id: openim-msggateway
main: ./cmd/openim-msggateway/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-msgtransfer
id: openim-msgtransfer
main: ./cmd/openim-msgtransfer/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-push
id: openim-push
main: ./cmd/openim-push/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-auth
id: openim-rpc-auth
main: ./cmd/openim-rpc/openim-rpc-auth/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-conversation
id: openim-rpc-conversation
main: ./cmd/openim-rpc/openim-rpc-conversation/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-friend
id: openim-rpc-friend
main: ./cmd/openim-rpc/openim-rpc-friend/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-group
id: openim-rpc-group
main: ./cmd/openim-rpc/openim-rpc-group/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-msg
id: openim-rpc-msg
main: ./cmd/openim-rpc/openim-rpc-msg/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-third
id: openim-rpc-third
main: ./cmd/openim-rpc/openim-rpc-third/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
- binary: openim-rpc-user
id: openim-rpc-user
main: ./cmd/openim-rpc/openim-rpc-user/main.go
goos:
- darwin
- windows
- linux
goarch:
- amd64
- arm64
# TODONeed a script, such as the init - release to help binary to find the right directory
# ,which can be compiled binary
archives:
- format: tar.gz
# this name template makes the OS and Arch compatible with the results of uname.
name_template: >-
{{ .ProjectName }}_
{{- title .Os }}_
{{- if eq .Arch "amd64" }}x86_64
{{- else if eq .Arch "386" }}i386
{{- else }}{{ .Arch }}{{ end }}
{{- if .Arm }}v{{ .Arm }}{{ end }}
# Set this to true if you want all files in the archive to be in a single directory.
# If set to true and you extract the archive 'goreleaser_Linux_arm64.tar.gz',
# you'll get a folder 'goreleaser_Linux_arm64'.
# If set to false, all files are extracted separately.
# You can also set it to a custom folder name (templating is supported).
wrap_in_directory: true
# use zip for windows archives
files:
- CHANGELOG/*
- deployment/*
- config/*
- build/*
- scripts/*
- Makefile
- install.sh
- docs/*
- src: "*.md"
dst: docs
# Strip parent folders when adding files to the archive.
strip_parent: true
# File info.
# Not all fields are supported by all formats available formats.
#
# Default: copied from the source file
info:
# Templates: allowed (since v1.14)
owner: root
# Templates: allowed (since v1.14)
group: root
# Must be in time.RFC3339Nano format.
#
# Templates: allowed (since v1.14)
mtime: "{{ .CommitDate }}"
# File mode.
mode: 0644
format_overrides:
- goos: windows
format: zip
changelog:
sort: asc
use: github
filters:
exclude:
- "^test:"
- "^chore"
- "merge conflict"
- Merge pull request
- Merge remote-tracking branch
- Merge branch
- go mod tidy
groups:
- title: Dependency updates
regexp: '^.*?(feat|fix)\(deps\)!?:.+$'
order: 300
- title: "New Features"
regexp: '^.*?feat(\([[:word:]]+\))??!?:.+$'
order: 100
- title: "Security updates"
regexp: '^.*?sec(\([[:word:]]+\))??!?:.+$'
order: 150
- title: "Bug fixes"
regexp: '^.*?fix(\([[:word:]]+\))??!?:.+$'
order: 200
- title: "Documentation updates"
regexp: ^.*?doc(\([[:word:]]+\))??!?:.+$
order: 400
- title: "Build process updates"
regexp: ^.*?build(\([[:word:]]+\))??!?:.+$
order: 400
- title: Other work
order: 9999
# dockers:
# - image_templates:
# - "openimsdk/open-im-server:{{ .Tag }}-amd64"
# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
# dockerfile: build/images/openim-api/Dockerfile.release
# ids:
# - openim-api
# use: buildx
# build_flag_templates:
# - "--pull"
# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/openimsdk/open-im-server/main/README.md"
# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/openimsdk/open-im-server/blob/main/assets/logo/openim-logo-green.png"
# - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
# - "--label=io.artifacthub.package.license=Apace-2.0"
# - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
# - "--label=org.opencontainers.image.created={{.Date}}"
# - "--label=org.opencontainers.image.name={{.ProjectName}}"
# - "--label=org.opencontainers.image.revision={{.FullCommit}}"
# - "--label=org.opencontainers.image.version={{.Version}}"
# - "--label=org.opencontainers.image.source={{.GitURL}}"
# - "--platform=linux/amd64"
# extra_files:
# - scripts/entrypoint.sh
# - image_templates:
# - "goreleaser/goreleaser:{{ .Tag }}-arm64"
# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
# dockerfile: build/images/openim-api/Dockerfile.release
# use: buildx
# build_flag_templates:
# - "--pull"
# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/openimsdk/open-im-server/main/README.md"
# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/openimsdk/open-im-server/blob/main/assets/logo/openim-logo-green.png"
# - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
# - "--label=io.artifacthub.package.license=Apace-2.0"
# - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
# - "--label=org.opencontainers.image.created={{.Date}}"
# - "--label=org.opencontainers.image.name={{.ProjectName}}"
# - "--label=org.opencontainers.image.revision={{.FullCommit}}"
# - "--label=org.opencontainers.image.version={{.Version}}"
# - "--label=org.opencontainers.image.source={{.GitURL}}"
# - "--platform=linux/arm64"
# goarch: arm64
# extra_files:
# - scripts/entrypoint.sh
# docker_manifests:
# - name_template: "goreleaser/goreleaser:{{ .Tag }}"
# image_templates:
# - "goreleaser/goreleaser:{{ .Tag }}-amd64"
# - "goreleaser/goreleaser:{{ .Tag }}-arm64"
# - name_template: "ghcr.io/goreleaser/goreleaser:{{ .Tag }}"
# image_templates:
# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
# - name_template: "goreleaser/goreleaser:latest"
# image_templates:
# - "goreleaser/goreleaser:{{ .Tag }}-amd64"
# - "goreleaser/goreleaser:{{ .Tag }}-arm64"
# - name_template: "ghcr.io/goreleaser/goreleaser:latest"
# image_templates:
# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
nfpms:
- id: packages
builds:
- openim-api
- openim-cmdutils
- openim-crontask
- openim-msggateway
- openim-msgtransfer
- openim-push
- openim-rpc-auth
- openim-rpc-conversation
- openim-rpc-friend
- openim-rpc-group
- openim-rpc-msg
- openim-rpc-third
- openim-rpc-user
# Your app's vendor.
vendor: OpenIMSDK
homepage: https://github.com/openimsdk/open-im-server
maintainer: kubbot <https://github.com/kubbot>
description: |-
Auto sync github labels
kubbot && openimbot
license: MIT
formats:
- apk
- deb
- rpm
- termux.deb # Since: v1.11
- archlinux # Since: v1.13
dependencies:
- git
recommends:
- golang
# The lines beneath this are called `modelines`. See `:help modeline`
# Feel free to remove those if you don't want/use them.
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
# vim: set ts=2 sw=2 tw=0 fo=cnqoj
# Default: './dist'
dist: ./_output/dist
# .goreleaser.yaml
milestones:
# You can have multiple milestone configs
-
# Repository for the milestone
# Default is extracted from the origin remote URL
repo:
owner: OpenIMSDK
name: Open-IM-Server
# Whether to close the milestone
close: true
# Fail release on errors, such as missing milestone.
fail_on_error: false
# Name of the milestone
#
# Default: '{{ .Tag }}'
name_template: "Current Release"
# publishers:
# - name: "fury.io"
# ids:
# - packages
# dir: "{{ dir .ArtifactPath }}"
# cmd: |
# bash -c '
# if [[ "{{ .Tag }}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
# curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/{{ .Env.USERNAME }}/
# else
# echo "Skipping deployment: Non-production release detected"
# fi'
checksum:
name_template: "{{ .ProjectName }}_checksums.txt"
algorithm: sha256
release:
prerelease: auto
-24
View File
@@ -1,24 +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.
# FROM BASE_IMAGE
# WORKDIR ${SERVER_WORKDIR}
# # Set HTTP proxy
# ARG BINARY_NAME
# COPY BINARY_NAME ./bin/BINARY_NAME
# ENTRYPOINT ["./bin/BINARY_NAME"]
-36
View File
@@ -1,36 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-api ./cmd/openim-api
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-api"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-crontask ./cmd/openim-crontask
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-crontask"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-msggateway ./cmd/openim-msggateway
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-msggateway"]
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-msgtransfer ./cmd/openim-msgtransfer
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-msgtransfer"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-push ./cmd/openim-push
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-push"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-auth ./cmd/openim-rpc/openim-rpc-auth
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-auth"]
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-conversation ./cmd/openim-rpc/openim-rpc-conversation
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-conversation"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-friend ./cmd/openim-rpc/openim-rpc-friend
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-friend"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-group ./cmd/openim-rpc/openim-rpc-group
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-group"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-msg ./cmd/openim-rpc/openim-rpc-msg
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-msg"]
-39
View File
@@ -1,39 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-third ./cmd/openim-rpc/openim-rpc-third
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-third"]
-37
View File
@@ -1,37 +0,0 @@
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod tidy
RUN go build -o _output/openim-rpc-user ./cmd/openim-rpc/openim-rpc-user
# Using Alpine Linux for the final image
FROM alpine:latest
# Install necessary packages, such as bash
RUN apk add --no-cache bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
# COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "_output/openim-rpc-user"]
@@ -1,108 +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
#
# WORKDIR /openim/openim-server
#
# ENV GOPROXY=$GOPROXY
# COPY go.mod go.sum ./
# RUN go mod download
# COPY . .
# RUN make clean
# RUN make build BINS=component
# # FROM ghcr.io/openim-sigs/openim-bash-image:latest
# FROM ghcr.io/openim-sigs/openim-bash-image:latest
# WORKDIR /openim/openim-server
# COPY --from=builder /openim/openim-server/_output/bin/tools /openim/openim-server/_output/bin/tools/
# COPY --from=builder /openim/openim-server/config /openim/openim-server/config
# ENV OPENIM_SERVER_CONFIG_NAME=/openim/openim-server/config
# RUN mv ${OPENIM_SERVER_BINDIR}/platforms/$(get_os)/$(get_arch)/component /usr/bin/component
# ENTRYPOINT ["bash", "-c", "component -c $OPENIM_SERVER_CONFIG_NAME"]
# Use Go 1.22 Alpine as the base image for building the application
FROM golang:1.22-alpine AS builder
# Define the base directory for the application as an environment variable
ENV SERVER_DIR=/openim-server
# Set the working directory inside the container based on the environment variable
WORKDIR $SERVER_DIR
# Set the Go proxy to improve dependency resolution speed
#ENV GOPROXY=https://goproxy.io,direct
# Copy all files from the current directory into the container
COPY . .
RUN go mod download
# Install Mage to use for building the application
RUN go install github.com/magefile/mage@v1.15.0
# ENV BINS=openim-rpc-user
# Optionally build your application if needed
# RUN mage build ${BINS} check-free-memory seq || true
RUN mage build check-free-memory seq || true
# Using Alpine Linux with Go environment for the final image
FROM golang:1.22-alpine
# Install necessary packages, such as bash
RUN apk add bash
# Set the environment and work directory
ENV SERVER_DIR=/openim-server
WORKDIR $SERVER_DIR
# Copy the compiled binaries and mage from the builder image to the final image
COPY --from=builder $SERVER_DIR/_output $SERVER_DIR/_output
COPY --from=builder $SERVER_DIR/config $SERVER_DIR/config
COPY --from=builder /go/bin/mage /usr/local/bin/mage
COPY --from=builder $SERVER_DIR/magefile_windows.go $SERVER_DIR/
COPY --from=builder $SERVER_DIR/magefile_unix.go $SERVER_DIR/
COPY --from=builder $SERVER_DIR/magefile.go $SERVER_DIR/
# COPY --from=builder $SERVER_DIR/start-config.yml $SERVER_DIR/
COPY --from=builder $SERVER_DIR/go.mod $SERVER_DIR/
COPY --from=builder $SERVER_DIR/go.sum $SERVER_DIR/
RUN echo -e "serviceBinaries:\n \n" \
> $SERVER_DIR/start-config.yml && \
echo -e "toolBinaries:\n - check-free-memory\n - seq\n" >> $SERVER_DIR/start-config.yml && \
echo "maxFileDescriptors: 10000" >> $SERVER_DIR/start-config.yml
RUN go get github.com/openimsdk/gomake@v0.0.15-alpha.1
# Set the command to run when the container starts
ENTRYPOINT ["sh", "-c", "mage start && tail -f /dev/null"]
-406
View File
@@ -1,406 +0,0 @@
package main
import (
"bytes"
"context"
"flag"
"fmt"
"net"
"os"
"os/signal"
"path"
"path/filepath"
"reflect"
"runtime"
"strings"
"sync"
"syscall"
"time"
"github.com/mitchellh/mapstructure"
"github.com/openimsdk/open-im-server/v3/internal/api"
"github.com/openimsdk/open-im-server/v3/internal/msggateway"
"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
"github.com/openimsdk/open-im-server/v3/internal/push"
"github.com/openimsdk/open-im-server/v3/internal/rpc/auth"
"github.com/openimsdk/open-im-server/v3/internal/rpc/conversation"
"github.com/openimsdk/open-im-server/v3/internal/rpc/group"
"github.com/openimsdk/open-im-server/v3/internal/rpc/msg"
"github.com/openimsdk/open-im-server/v3/internal/rpc/relation"
"github.com/openimsdk/open-im-server/v3/internal/rpc/third"
"github.com/openimsdk/open-im-server/v3/internal/rpc/user"
"github.com/openimsdk/open-im-server/v3/internal/tools/cron"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/openimsdk/open-im-server/v3/version"
"github.com/openimsdk/tools/discovery"
"github.com/openimsdk/tools/discovery/standalone"
"github.com/openimsdk/tools/log"
"github.com/openimsdk/tools/system/program"
"github.com/openimsdk/tools/utils/datautil"
"github.com/spf13/viper"
"google.golang.org/grpc"
)
func init() {
config.SetStandalone()
prommetrics.RegistryAll()
}
func main() {
var configPath string
flag.StringVar(&configPath, "c", "", "config path")
flag.Parse()
if configPath == "" {
_, _ = fmt.Fprintln(os.Stderr, "config path is empty")
os.Exit(1)
return
}
cmd := newCmds(configPath)
putCmd(cmd, false, auth.Start)
putCmd(cmd, false, conversation.Start)
putCmd(cmd, false, relation.Start)
putCmd(cmd, false, group.Start)
putCmd(cmd, false, msg.Start)
putCmd(cmd, false, third.Start)
putCmd(cmd, false, user.Start)
putCmd(cmd, false, push.Start)
putCmd(cmd, true, msggateway.Start)
putCmd(cmd, true, msgtransfer.Start)
putCmd(cmd, true, api.Start)
putCmd(cmd, true, cron.Start)
ctx := context.Background()
if err := cmd.run(ctx); err != nil {
_, _ = fmt.Fprintf(os.Stderr, "server exit %s", err)
os.Exit(1)
return
}
}
func newCmds(confPath string) *cmds {
return &cmds{confPath: confPath}
}
type cmdName struct {
Name string
Func func(ctx context.Context) error
Block bool
}
type cmds struct {
confPath string
cmds []cmdName
config config.AllConfig
conf map[string]reflect.Value
}
func (x *cmds) getTypePath(typ reflect.Type) string {
return path.Join(typ.PkgPath(), typ.Name())
}
func (x *cmds) initDiscovery() {
x.config.Discovery.Enable = "standalone"
vof := reflect.ValueOf(&x.config.Discovery.RpcService).Elem()
tof := reflect.TypeOf(&x.config.Discovery.RpcService).Elem()
num := tof.NumField()
for i := 0; i < num; i++ {
field := tof.Field(i)
if !field.IsExported() {
continue
}
if field.Type.Kind() != reflect.String {
continue
}
vof.Field(i).SetString(field.Name)
}
}
func (x *cmds) initAllConfig() error {
x.conf = make(map[string]reflect.Value)
vof := reflect.ValueOf(&x.config).Elem()
num := vof.NumField()
for i := 0; i < num; i++ {
field := vof.Field(i)
for ptr := true; ptr; {
if field.Kind() == reflect.Ptr {
field = field.Elem()
} else {
ptr = false
}
}
x.conf[x.getTypePath(field.Type())] = field
val := field.Addr().Interface()
name := val.(interface{ GetConfigFileName() string }).GetConfigFileName()
confData, err := os.ReadFile(filepath.Join(x.confPath, name))
if err != nil {
if os.IsNotExist(err) {
continue
}
return err
}
v := viper.New()
v.SetConfigType("yaml")
if err := v.ReadConfig(bytes.NewReader(confData)); err != nil {
return err
}
opt := func(conf *mapstructure.DecoderConfig) {
conf.TagName = config.StructTagName
}
if err := v.Unmarshal(val, opt); err != nil {
return err
}
}
x.initDiscovery()
x.config.Redis.Disable = false
x.config.LocalCache = config.LocalCache{}
config.InitNotification(&x.config.Notification)
return nil
}
func (x *cmds) parseConf(conf any) error {
vof := reflect.ValueOf(conf)
for {
if vof.Kind() == reflect.Ptr {
vof = vof.Elem()
} else {
break
}
}
tof := vof.Type()
numField := vof.NumField()
for i := 0; i < numField; i++ {
typeField := tof.Field(i)
if !typeField.IsExported() {
continue
}
field := vof.Field(i)
pkt := x.getTypePath(field.Type())
val, ok := x.conf[pkt]
if !ok {
switch field.Interface().(type) {
case config.Index:
case config.Path:
field.SetString(x.confPath)
case config.AllConfig:
field.Set(reflect.ValueOf(x.config))
case *config.AllConfig:
field.Set(reflect.ValueOf(&x.config))
default:
return fmt.Errorf("config field %s %s not found", vof.Type().Name(), typeField.Name)
}
continue
}
field.Set(val)
}
return nil
}
func (x *cmds) add(name string, block bool, fn func(ctx context.Context) error) {
x.cmds = append(x.cmds, cmdName{Name: name, Block: block, Func: fn})
}
func (x *cmds) initLog() error {
conf := x.config.Log
if err := log.InitLoggerFromConfig(
"openim-server",
program.GetProcessName(),
"", "",
conf.RemainLogLevel,
conf.IsStdout,
conf.IsJson,
conf.StorageLocation,
conf.RemainRotationCount,
conf.RotationTime,
strings.TrimSpace(version.Version),
conf.IsSimplify,
); err != nil {
return err
}
return nil
}
func (x *cmds) run(ctx context.Context) error {
if len(x.cmds) == 0 {
return fmt.Errorf("no command to run")
}
if err := x.initAllConfig(); err != nil {
return err
}
if err := x.initLog(); err != nil {
return err
}
ctx, cancel := context.WithCancelCause(ctx)
go func() {
<-ctx.Done()
log.ZError(ctx, "context server exit cause", context.Cause(ctx))
}()
if prometheus := x.config.API.Prometheus; prometheus.Enable {
var (
port int
err error
)
if !prometheus.AutoSetPorts {
port, err = datautil.GetElemByIndex(prometheus.Ports, 0)
if err != nil {
return err
}
}
listener, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
if err != nil {
return fmt.Errorf("prometheus listen %d error %w", port, err)
}
defer listener.Close()
log.ZDebug(ctx, "prometheus start", "addr", listener.Addr())
go func() {
err := prommetrics.Start(listener)
if err == nil {
err = fmt.Errorf("http done")
}
cancel(fmt.Errorf("prometheus %w", err))
}()
}
go func() {
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
select {
case <-ctx.Done():
return
case val := <-sigs:
log.ZDebug(ctx, "recv signal", "signal", val.String())
cancel(fmt.Errorf("signal %s", val.String()))
}
}()
for i := range x.cmds {
cmd := x.cmds[i]
if cmd.Block {
continue
}
if err := cmd.Func(ctx); err != nil {
cancel(fmt.Errorf("server %s exit %w", cmd.Name, err))
return err
}
go func() {
if cmd.Block {
cancel(fmt.Errorf("server %s exit", cmd.Name))
}
}()
}
var wait cmdManger
for i := range x.cmds {
cmd := x.cmds[i]
if !cmd.Block {
continue
}
wait.Start(cmd.Name)
go func() {
defer wait.Shutdown(cmd.Name)
if err := cmd.Func(ctx); err != nil {
cancel(fmt.Errorf("server %s exit %w", cmd.Name, err))
return
}
cancel(fmt.Errorf("server %s exit", cmd.Name))
}()
}
<-ctx.Done()
exitCause := context.Cause(ctx)
log.ZWarn(ctx, "notification of service closure", exitCause)
done := wait.Wait()
timeout := time.NewTimer(time.Second * 10)
defer timeout.Stop()
for {
select {
case <-timeout.C:
log.ZWarn(ctx, "server exit timeout", nil, "running", wait.Running())
return exitCause
case _, ok := <-done:
if ok {
log.ZWarn(ctx, "waiting for the service to exit", nil, "running", wait.Running())
} else {
log.ZInfo(ctx, "all server exit done")
return exitCause
}
}
}
}
func putCmd[C any](cmd *cmds, block bool, fn func(ctx context.Context, config *C, client discovery.SvcDiscoveryRegistry, server grpc.ServiceRegistrar) error) {
name := path.Base(runtime.FuncForPC(reflect.ValueOf(fn).Pointer()).Name())
if index := strings.Index(name, "."); index >= 0 {
name = name[:index]
}
cmd.add(name, block, func(ctx context.Context) error {
var conf C
if err := cmd.parseConf(&conf); err != nil {
return err
}
return fn(ctx, &conf, standalone.GetSvcDiscoveryRegistry(), standalone.GetServiceRegistrar())
})
}
type cmdManger struct {
lock sync.Mutex
done chan struct{}
count int
names map[string]struct{}
}
func (x *cmdManger) Start(name string) {
x.lock.Lock()
defer x.lock.Unlock()
if x.names == nil {
x.names = make(map[string]struct{})
}
if x.done == nil {
x.done = make(chan struct{}, 1)
}
if _, ok := x.names[name]; ok {
panic(fmt.Errorf("cmd %s already exists", name))
}
x.count++
x.names[name] = struct{}{}
}
func (x *cmdManger) Shutdown(name string) {
x.lock.Lock()
defer x.lock.Unlock()
if _, ok := x.names[name]; !ok {
panic(fmt.Errorf("cmd %s not exists", name))
}
delete(x.names, name)
x.count--
if x.count == 0 {
close(x.done)
} else {
select {
case x.done <- struct{}{}:
default:
}
}
}
func (x *cmdManger) Wait() <-chan struct{} {
x.lock.Lock()
defer x.lock.Unlock()
if x.count == 0 || x.done == nil {
tmp := make(chan struct{})
close(tmp)
return tmp
}
return x.done
}
func (x *cmdManger) Running() []string {
x.lock.Lock()
defer x.lock.Unlock()
names := make([]string, 0, len(x.names))
for name := range x.names {
names = append(names, name)
}
return names
}
+25
View File
@@ -0,0 +1,25 @@
.PHONY: all build run gotool install clean help
BINARY_NAME=open_im_api
BIN_DIR=../../bin/
all: gotool build
build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
run:
@go run ./
gotool:
go fmt ./
go vet ./
install:
make build
mv ${BINARY_NAME} ${BIN_DIR}
clean:
@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+231
View File
@@ -0,0 +1,231 @@
package main
import (
_ "Open_IM/cmd/open_im_api/docs"
apiAuth "Open_IM/internal/api/auth"
clientInit "Open_IM/internal/api/client_init"
"Open_IM/internal/api/conversation"
"Open_IM/internal/api/friend"
"Open_IM/internal/api/group"
"Open_IM/internal/api/manage"
apiChat "Open_IM/internal/api/msg"
"Open_IM/internal/api/office"
"Open_IM/internal/api/organization"
apiThird "Open_IM/internal/api/third"
"Open_IM/internal/api/user"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/utils"
"flag"
"fmt"
//_ "github.com/razeencheng/demo-go/swaggo-gin/docs"
"io"
"os"
"strconv"
swaggerFiles "github.com/swaggo/files"
ginSwagger "github.com/swaggo/gin-swagger"
"github.com/gin-gonic/gin"
//"syscall"
"Open_IM/pkg/common/constant"
)
// @title open-IM-Server API
// @version 1.0
// @description open-IM-Server 的API服务器文档, 文档中所有请求都有一个operationID字段用于链路追踪
// @license.name Apache 2.0
// @license.url http://www.apache.org/licenses/LICENSE-2.0.html
// @BasePath /
func main() {
log.NewPrivateLog(constant.LogFileName)
gin.SetMode(gin.ReleaseMode)
f, _ := os.Create("../logs/api.log")
gin.DefaultWriter = io.MultiWriter(f)
// gin.SetMode(gin.DebugMode)
r := gin.Default()
r.Use(utils.CorsHandler())
log.Info("load config: ", config.Config)
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
// user routing group, which handles user registration and login services
userRouterGroup := r.Group("/user")
{
userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1
userRouterGroup.POST("/set_global_msg_recv_opt", user.SetGlobalRecvMessageOpt)
userRouterGroup.POST("/get_users_info", user.GetUsersPublicInfo) //1
userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1
userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) //1
userRouterGroup.POST("/get_users_info_from_cache", user.GetUsersInfoFromCache)
userRouterGroup.POST("/get_user_friend_from_cache", user.GetFriendIDListFromCache)
userRouterGroup.POST("/get_black_list_from_cache", user.GetBlackIDListFromCache)
userRouterGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) //1
userRouterGroup.POST("/account_check", manage.AccountCheck) //1
// userRouterGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) //1
userRouterGroup.POST("/get_users", user.GetUsers)
}
//friend routing group
friendRouterGroup := r.Group("/friend")
{
// friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo)
friendRouterGroup.POST("/add_friend", friend.AddFriend) //1
friendRouterGroup.POST("/delete_friend", friend.DeleteFriend) //1
friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1
friendRouterGroup.POST("/get_self_friend_apply_list", friend.GetSelfFriendApplyList) //1
friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) //1
friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse) //1
friendRouterGroup.POST("/set_friend_remark", friend.SetFriendRemark) //1
friendRouterGroup.POST("/add_black", friend.AddBlack) //1
friendRouterGroup.POST("/get_black_list", friend.GetBlacklist) //1
friendRouterGroup.POST("/remove_black", friend.RemoveBlack) //1
friendRouterGroup.POST("/import_friend", friend.ImportFriend) //1
friendRouterGroup.POST("/is_friend", friend.IsFriend) //1
}
//group related routing group
groupRouterGroup := r.Group("/group")
{
groupRouterGroup.POST("/create_group", group.CreateGroup) //1
groupRouterGroup.POST("/set_group_info", group.SetGroupInfo) //1
groupRouterGroup.POST("/join_group", group.JoinGroup) //1
groupRouterGroup.POST("/quit_group", group.QuitGroup) //1
groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) //1
groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner) //1
groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1
groupRouterGroup.POST("/get_user_req_group_applicationList", group.GetUserReqGroupApplicationList)
groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo) //1
groupRouterGroup.POST("/kick_group", group.KickGroupMember) //1
// groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList) //no use
groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList) //1
groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo) //1
groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup) //1
groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)
groupRouterGroup.POST("/dismiss_group", group.DismissGroup) //
groupRouterGroup.POST("/mute_group_member", group.MuteGroupMember)
groupRouterGroup.POST("/cancel_mute_group_member", group.CancelMuteGroupMember) //MuteGroup
groupRouterGroup.POST("/mute_group", group.MuteGroup)
groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup)
groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname)
groupRouterGroup.POST("/set_group_member_info", group.SetGroupMemberInfo)
groupRouterGroup.POST("/get_group_abstract_info", group.GetGroupAbstractInfo)
//groupRouterGroup.POST("/get_group_all_member_list_by_split", group.GetGroupAllMemberListBySplit)
}
superGroupRouterGroup := r.Group("/super_group")
{
superGroupRouterGroup.POST("/get_joined_group_list", group.GetJoinedSuperGroupList)
superGroupRouterGroup.POST("/get_groups_info", group.GetSuperGroupsInfo)
}
//certificate
authRouterGroup := r.Group("/auth")
{
authRouterGroup.POST("/user_register", apiAuth.UserRegister) //1
authRouterGroup.POST("/user_token", apiAuth.UserToken) //1
authRouterGroup.POST("/parse_token", apiAuth.ParseToken) //1
authRouterGroup.POST("/force_logout", apiAuth.ForceLogout) //1
}
//Third service
thirdGroup := r.Group("/third")
{
thirdGroup.POST("/tencent_cloud_storage_credential", apiThird.TencentCloudStorageCredential)
thirdGroup.POST("/ali_oss_credential", apiThird.AliOSSCredential)
thirdGroup.POST("/minio_storage_credential", apiThird.MinioStorageCredential)
thirdGroup.POST("/minio_upload", apiThird.MinioUploadFile)
thirdGroup.POST("/upload_update_app", apiThird.UploadUpdateApp)
thirdGroup.POST("/get_download_url", apiThird.GetDownloadURL)
thirdGroup.POST("/get_rtc_invitation_info", apiThird.GetRTCInvitationInfo)
thirdGroup.POST("/get_rtc_invitation_start_app", apiThird.GetRTCInvitationInfoStartApp)
thirdGroup.POST("/fcm_update_token", apiThird.FcmUpdateToken)
thirdGroup.POST("/aws_storage_credential", apiThird.AwsStorageCredential)
thirdGroup.POST("/set_app_badge", apiThird.SetAppBadge)
}
//Message
chatGroup := r.Group("/msg")
{
chatGroup.POST("/newest_seq", apiChat.GetSeq)
chatGroup.POST("/send_msg", apiChat.SendMsg)
chatGroup.POST("/pull_msg_by_seq", apiChat.PullMsgBySeqList)
chatGroup.POST("/del_msg", apiChat.DelMsg)
chatGroup.POST("/del_super_group_msg", apiChat.DelSuperGroupMsg)
chatGroup.POST("/clear_msg", apiChat.ClearMsg)
chatGroup.POST("/manage_send_msg", manage.ManagementSendMsg)
chatGroup.POST("/batch_send_msg", manage.ManagementBatchSendMsg)
chatGroup.POST("/check_msg_is_send_success", manage.CheckMsgIsSendSuccess)
chatGroup.POST("/set_msg_min_seq", apiChat.SetMsgMinSeq)
}
//Conversation
conversationGroup := r.Group("/conversation")
{ //1
conversationGroup.POST("/get_all_conversations", conversation.GetAllConversations)
conversationGroup.POST("/get_conversation", conversation.GetConversation)
conversationGroup.POST("/get_conversations", conversation.GetConversations)
conversationGroup.POST("/set_conversation", conversation.SetConversation)
conversationGroup.POST("/batch_set_conversation", conversation.BatchSetConversations)
conversationGroup.POST("/set_recv_msg_opt", conversation.SetRecvMsgOpt)
conversationGroup.POST("/modify_conversation_field", conversation.ModifyConversationField)
}
// office
officeGroup := r.Group("/office")
{
officeGroup.POST("/get_user_tags", office.GetUserTags)
officeGroup.POST("/get_user_tag_by_id", office.GetUserTagByID)
officeGroup.POST("/create_tag", office.CreateTag)
officeGroup.POST("/delete_tag", office.DeleteTag)
officeGroup.POST("/set_tag", office.SetTag)
officeGroup.POST("/send_msg_to_tag", office.SendMsg2Tag)
officeGroup.POST("/get_send_tag_log", office.GetTagSendLogs)
officeGroup.POST("/create_one_work_moment", office.CreateOneWorkMoment)
officeGroup.POST("/delete_one_work_moment", office.DeleteOneWorkMoment)
officeGroup.POST("/like_one_work_moment", office.LikeOneWorkMoment)
officeGroup.POST("/comment_one_work_moment", office.CommentOneWorkMoment)
officeGroup.POST("/get_work_moment_by_id", office.GetWorkMomentByID)
officeGroup.POST("/get_user_work_moments", office.GetUserWorkMoments)
officeGroup.POST("/get_user_friend_work_moments", office.GetUserFriendWorkMoments)
officeGroup.POST("/set_user_work_moments_level", office.SetUserWorkMomentsLevel)
officeGroup.POST("/delete_comment", office.DeleteComment)
}
organizationGroup := r.Group("/organization")
{
organizationGroup.POST("/create_department", organization.CreateDepartment)
organizationGroup.POST("/update_department", organization.UpdateDepartment)
organizationGroup.POST("/get_sub_department", organization.GetSubDepartment)
organizationGroup.POST("/delete_department", organization.DeleteDepartment)
organizationGroup.POST("/get_all_department", organization.GetAllDepartment)
organizationGroup.POST("/create_organization_user", organization.CreateOrganizationUser)
organizationGroup.POST("/update_organization_user", organization.UpdateOrganizationUser)
organizationGroup.POST("/delete_organization_user", organization.DeleteOrganizationUser)
organizationGroup.POST("/create_department_member", organization.CreateDepartmentMember)
organizationGroup.POST("/get_user_in_department", organization.GetUserInDepartment)
organizationGroup.POST("/update_user_in_department", organization.UpdateUserInDepartment)
organizationGroup.POST("/get_department_member", organization.GetDepartmentMember)
organizationGroup.POST("/delete_user_in_department", organization.DeleteUserInDepartment)
}
initGroup := r.Group("/init")
{
initGroup.POST("/set_client_config", clientInit.SetClientInitConfig)
initGroup.POST("/get_client_config", clientInit.GetClientInitConfig)
}
go apiThird.MinioInit()
defaultPorts := config.Config.Api.GinPort
ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10002 as port")
flag.Parse()
address := "0.0.0.0:" + strconv.Itoa(*ginPort)
if config.Config.Api.ListenIP != "" {
address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
}
address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
fmt.Println("start api server, address: ", address)
err := r.Run(address)
if err != nil {
log.Error("", "api run failed ", *ginPort, err.Error())
}
}
+25
View File
@@ -0,0 +1,25 @@
.PHONY: all build run gotool install clean help
BINARY_NAME=open_im_cms_api
BIN_DIR=../../bin/
all: gotool build
build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
run:
@go run ./
gotool:
go fmt ./
go vet ./
install:
make build
mv ${BINARY_NAME} ${BIN_DIR}
clean:
@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
+29
View File
@@ -0,0 +1,29 @@
package main
import (
"Open_IM/internal/cms_api"
"Open_IM/pkg/utils"
"flag"
"fmt"
"strconv"
"Open_IM/pkg/common/config"
"github.com/gin-gonic/gin"
)
func main() {
gin.SetMode(gin.ReleaseMode)
router := cms_api.NewGinRouter()
router.Use(utils.CorsHandler())
defaultPorts := config.Config.CmsApi.GinPort
ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10006 as port")
flag.Parse()
address := "0.0.0.0:" + strconv.Itoa(*ginPort)
if config.Config.Api.ListenIP != "" {
address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
}
address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
fmt.Println("start cms api server, address: ", address)
router.Run(address)
}
+23
View File
@@ -0,0 +1,23 @@
.PHONY: all build run gotool install clean help
BINARY_NAME=open_im_cron_task
BIN_DIR=../../bin/
all: gotool build
build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
run:
@go run ./
gotool:
go fmt ./
go vet ./
install:
make build
mv ${BINARY_NAME} ${BIN_DIR}
clean:
@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
+11
View File
@@ -0,0 +1,11 @@
package main
import (
"Open_IM/internal/cron_task"
"fmt"
)
func main() {
fmt.Println("start cronTask")
cronTask.StartCronTask()
}
+25
View File
@@ -0,0 +1,25 @@
.PHONY: all build run gotool install clean help
BINARY_NAME=open_im_demo
BIN_DIR=../../bin/
all: gotool build
build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s"
run:
@go run ./
gotool:
go fmt ./
go vet ./
install:
make build
mv ${BINARY_NAME} ${BIN_DIR}
clean:
@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi

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