Commit Graph

98 Commits

Author SHA1 Message Date
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
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 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 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 f1c11ac114 add callback 2022-03-03 14:18:28 +08:00
wangchuxiao dcfd802757 callback add 2022-03-02 19:07:17 +08:00
wangchuxiao 0bed7ee669 merge code 2022-02-28 17:57:03 +08:00
Gordon ca18958669 test config 2022-02-25 19:56:00 +08:00
Gordon a1333dcace config update 2022-02-25 15:59:33 +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
wenxu12345 0fca91ca37 config description 2022-02-23 18:22:44 +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 5defc18a64 alter cfg codettl 2022-02-23 10:18:43 +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
wangchuxiao a3fb32dfc6 fix bug and add reset pwd api 2022-02-21 16:41:56 +08:00
wenxu12345 bf948789ea replace mongo driver 2022-02-21 15:07:50 +08:00
wenxu12345 f16f0e3069 Refactoring code 2022-02-21 11:06:06 +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 2996d8537d add makefile 2022-02-15 18:29:38 +08:00
wangchuxiao 65be1263b9 make file 2022-02-15 18:28:54 +08:00
wangchuxiao 648a852ba7 conversation opt 2022-02-15 14:11:20 +08:00
wangchuxiao 8cdea2bfeb cms dev 2022-02-14 15:16:59 +08:00
wangchuxiao 22bfb6be4b merge code 2022-02-14 10:46:32 +08:00
wangchuxiao 52579c5fab add 2022-02-12 17:13:31 +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 a885d7f003 demo modify 2022-02-11 16:25:28 +08:00
wenxu12345 2c67845dd6 Refactor code 2022-02-10 12:28:06 +08:00
wangchuxiao 6de61cb214 cms dev 2022-02-09 16:22:58 +08:00
wangchuxiao 02aad295f9 group 2022-02-08 20:24:59 +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 9077b56df1 Refactor code 2022-02-08 15:19:31 +08:00