| 
						
					 | 
					
						
						
							
						
						54fcf431e1
					 | 
					
						
						
							
							Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai into sangge-main
						
						
						
						
						
						
					 | 
					
						2023-10-24 18:58:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e304771743
					 | 
					
						
						
							
							Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai
						
						
						
						
						
						
					 | 
					
						2023-10-23 22:21:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2277cd577d
					 | 
					
						
						
							
							test: temp change
						
						
						
						
						
						
					 | 
					
						2023-10-23 22:21:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3349474f22
					 | 
					
						
						
							
							Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main
						
						
						
						
						
						
						
						Reviewed-on: ccyj/mimajingsai#21 
						
						
					 | 
					
						2023-10-23 21:40:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba8bab8a17
					 | 
					
						
						
							
							fix: 修改了中心服务器接收心跳包函数;修改客户端变量类型id
						
						
						
						
						
						
					 | 
					
						2023-10-23 21:39:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47a48d448f
					 | 
					
						
						
							
							Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main
						
						
						
						
						
						
						
						Reviewed-on: dqy/mimajingsai#21 
						
						
					 | 
					
						2023-10-23 18:37:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ed7a7ecf7
					 | 
					
						
						
							
							test: temp test
						
						
						
						
						
						
					 | 
					
						2023-10-23 18:36:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8dab4be36c
					 | 
					
						
						
							
							Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:58:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a45cd66e9d
					 | 
					
						
						
							
							modified:   src/client.ini
						
						
						
						
						
						
						
						modified:   src/client.py
	modified:   src/node.py 
						
						
					 | 
					
						2023-10-23 17:54:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6d1119d4f
					 | 
					
						
						
							
							Merge pull request 'main' (#20) from sangge/mimajingsai:main into main
						
						
						
						
						
						
						
						Reviewed-on: dqy/mimajingsai#20 
						
						
					 | 
					
						2023-10-23 17:30:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e67b03565
					 | 
					
						
						
							
							sytle: modify code
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:30:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						989300a841
					 | 
					
						
						
							
							feat: update receive_user_src_message
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:29:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55add91467
					 | 
					
						
						
							
							style: 美化代码
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:12:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83b50056f6
					 | 
					
						
						
							
							Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:02:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						acef670d1d
					 | 
					
						
						
							
							fix: update demo
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:00:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aeccc72b97
					 | 
					
						
						
							
							fix: fix some errors
						
						
						
						
						
						
					 | 
					
						2023-10-23 17:00:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7977557fc4
					 | 
					
						
						
							
							feat: add client_cli
						
						
						
						
						
						
					 | 
					
						2023-10-23 16:59:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5ea41956fd
					 | 
					
						
						
							
							feat: get_node_ip测试完毕
						
						
						
						
						
						
					 | 
					
						2023-10-23 16:41:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c6b989039
					 | 
					
						
						
							
							feat: update code
						
						
						
						
						
						
					 | 
					
						2023-10-23 14:21:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e86f9ca6b
					 | 
					
						
						
							
							Merge branch 'main' into main
						
						
						
						
						
						
					 | 
					
						2023-10-23 14:11:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7db5db66b5
					 | 
					
						
						
							
							build: 实现了节点的功能:向服务器发送ip和心跳包,与客户之间通信
						
						
						
						
						
						
					 | 
					
						2023-10-23 10:12:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dfb3a06aa0
					 | 
					
						
						
							
							Merge pull request 'main' (#18) from sangge/mimajingsai:main into main
						
						
						
						
						
						
						
						Reviewed-on: dqy/mimajingsai#18 
						
						
					 | 
					
						2023-10-22 17:01:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						58ca8a6564
					 | 
					
						
						
							
							feat: GenerateReKey增加ID元组; 修改生成s_x和Kfrag的ID参数
						
						
						
						
						
						
					 | 
					
						2023-10-21 21:58:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7ca5f4725
					 | 
					
						
						
							
							feat: change timeout
						
						
						
						
						
						
					 | 
					
						2023-10-21 20:42:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4f2dd9727e
					 | 
					
						
						
							
							feat: add heartbeat package
						
						
						
						
						
						
					 | 
					
						2023-10-21 20:39:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e784b526ce
					 | 
					
						
						
							
							Merge pull request 'main' (#15) from ccyj/mimajingsai:main into main
						
						
						
						
						
						
						
						Reviewed-on: sangge/mimajingsai#15 
						
						
					 | 
					
						2023-10-21 20:38:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2334cb68cf
					 | 
					
						
						
							
							build: 节点功能构建
						
						
						
						
						
						
					 | 
					
						2023-10-21 20:36:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a049fbe6f
					 | 
					
						
						
							
							feat: finish timer
						
						
						
						
						
						
					 | 
					
						2023-10-21 20:31:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ad3f14ae1f
					 | 
					
						
						
							
							Merge pull request 'main' (#14) from dqy/mimajingsai:main into main
						
						
						
						
						
						
						
						Reviewed-on: sangge/mimajingsai#14 
						
						
					 | 
					
						2023-10-21 20:27:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6efb7179bb
					 | 
					
						
						
							
							feat: 提交server.py
						
						
						
						
						
						
					 | 
					
						2023-10-21 20:25:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40c375bf98
					 | 
					
						
						
							
							feat: update feature
						
						
						
						
						
						
					 | 
					
						2023-10-21 20:25:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						459b03c872
					 | 
					
						
						
							
							feat: add init config
						
						
						
						
						
						
					 | 
					
						2023-10-21 14:39:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b6e45690e
					 | 
					
						
						
							
							feat: init client
						
						
						
						
						
						
					 | 
					
						2023-10-20 22:27:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e961eda8e
					 | 
					
						
						
							
							doc: create doc folder
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:17:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						811274c956
					 | 
					
						
						
							
							Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:15:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4225ae52fc
					 | 
					
						
						
							
							feat: add timer
						
						
						
						
						
						
					 | 
					
						2023-10-20 17:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						727dcf0176
					 | 
					
						
						
							
							feat: 编写中心服务器代码框架;数据库代码待补充
						
						
						
						
						
						
					 | 
					
						2023-10-20 16:57:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a17adc8f4b
					 | 
					
						
						
							
							feat: init 3 types of machine
						
						
						
						
						
						
					 | 
					
						2023-10-19 14:56:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edcc0c60d8
					 | 
					
						
						
							
							docs: init docs
						
						
						
						
						
						
					 | 
					
						2023-10-19 14:54:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22909c2976
					 | 
					
						
						
							
							style: clean code
						
						
						
						
						
						
					 | 
					
						2023-10-19 14:33:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0112821ea6
					 | 
					
						
						
							
							test: test demo
						
						
						
						
						
						
					 | 
					
						2023-10-19 11:55:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff4579d9bc
					 | 
					
						
						
							
							fix: fix all bugs
						
						
						
						
						
						
					 | 
					
						2023-10-19 10:42:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						38a15f79ed
					 | 
					
						
						
							
							fix: fix some bugs
						
						
						
						
						
						
					 | 
					
						2023-10-18 20:51:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						854bb17cac
					 | 
					
						
						
							
							feat: update demo
						
						
						
						
						
						
					 | 
					
						2023-10-18 17:27:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c1fefd9d3
					 | 
					
						
						
							
							Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai
						
						
						
						
						
						
					 | 
					
						2023-10-18 17:13:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db6c6bef23
					 | 
					
						
						
							
							perf: remove i, j
						
						
						
						
						
						
					 | 
					
						2023-10-18 17:11:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c8975a104b
					 | 
					
						
						
							
							refactor: refactor: 添加f函数注释;f、Encapsulate增加模P
						
						
						
						
						
						
					 | 
					
						2023-10-18 16:59:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4ce861ec7
					 | 
					
						
						
							
							refactor: 添加f函数注释;f、Encapsulate增加模P
						
						
						
						
						
						
					 | 
					
						2023-10-18 16:49:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a196530fde
					 | 
					
						
						
							
							perf: rewrite DecapsulateFrags
						
						
						
						
						
						
					 | 
					
						2023-10-18 16:02:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a68fcf1eec
					 | 
					
						
						
							
							style: replace chinese comma
						
						
						
						
						
						
					 | 
					
						2023-10-18 15:28:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |