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 | 
					
					
						
						
							
							
							
						
					 |