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