ltf
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6dac64069
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/tuoyun' into our
						
						
						
						
						
						
					 | 
					
						2021-12-12 14:15:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ltf
							
						 
					 | 
					
						
						
						
						
							
						
						
							4abd2fe137
							
						
					 | 
					
						
						
							
							feat 新增openim内部各组件的host名称配置;
						
						
						
						
						
						
						
						fix 独立容器部署镜像文档; 
						
						
					 | 
					
						2021-12-07 21:55:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wenxu12345
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4e5608c8c
							
						
					 | 
					
						
						
							
							ReceiveMessageOpt
						
						
						
						
						
						
					 | 
					
						2021-12-07 14:34:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7e3b6dd15
							
						
					 | 
					
						
						
							
							multi terminal kick eachOther
						
						
						
						
						
						
					 | 
					
						2021-11-25 14:12:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							aae6874928
							
						
					 | 
					
						
						
							
							null pointer fix
						
						
						
						
						
						
					 | 
					
						2021-11-15 16:10:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gordon
							
						 
					 | 
					
						
						
						
						
							
						
						
							6158ea436d
							
						
					 | 
					
						
						
							
							merge newest branch
						
						
						
						
						
						
					 | 
					
						2021-11-11 18:47:21 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |