149 Commits

Author SHA1 Message Date
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
448f20c9df doc: update readme 2023-10-23 16:59:35 +08:00
3c6b989039 feat: update code 2023-10-23 14:21:41 +08:00
5f0781ca37 Merge pull request 'main' (#17) from ccyj/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#17
2023-10-23 14:11:38 +08:00
1e86f9ca6b Merge branch 'main' into main 2023-10-23 14:11:21 +08:00
063d13a405 Merge pull request 'main' (#16) from dqy/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#16
2023-10-23 14:10:12 +08:00
7db5db66b5 build: 实现了节点的功能:向服务器发送ip和心跳包,与客户之间通信 2023-10-23 10:12:00 +08:00
dqy
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
dqy
58ca8a6564 feat: GenerateReKey增加ID元组; 修改生成s_x和Kfrag的ID参数 2023-10-21 21:58:15 +08:00
dqy
d7ca5f4725 feat: change timeout 2023-10-21 20:42:41 +08:00
1aac74592f Merge pull request 'main' (#19) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#19
2023-10-21 20:40:13 +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
dqy
a3213a4245 Merge pull request 'main' (#17) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#17
2023-10-21 20:32: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
dqy
6efb7179bb feat: 提交server.py 2023-10-21 20:25:40 +08:00
40c375bf98 feat: update feature 2023-10-21 20:25:18 +08:00
dqy
37bdde3e53 Merge pull request 'main' (#16) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#16
2023-10-21 15:50:05 +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
8d559f94ad fix: update git ignore 2023-10-20 22:26:53 +08:00
1d2bc2cee9 Merge pull request 'main' (#18) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#18
2023-10-20 17:59:36 +08:00
ebbac11778 doc: update doc folder 2023-10-20 17:18:27 +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
7e3359fe78 feat: add app requirements 2023-10-20 17:14:43 +08:00
fa039b3f24 fix: update base image 2023-10-20 17:14:22 +08:00
84659a75d5 Merge pull request 'main' (#13) from dqy/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#13
2023-10-20 17:13:02 +08:00
dqy
727dcf0176 feat: 编写中心服务器代码框架;数据库代码待补充 2023-10-20 16:57:28 +08:00
e0c8ebdb78 Merge pull request 'main' (#17) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#17
2023-10-19 14:59:03 +08:00
dqy
1122bdce86 Merge pull request 'main' (#15) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#15
2023-10-19 14:56:26 +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
dqy
28f7ff943f Merge pull request 'main' (#14) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#14
2023-10-19 13:13:58 +08:00
c49941e997 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai 2023-10-19 11:55:26 +08:00
0112821ea6 test: test demo 2023-10-19 11:55:25 +08:00
d8fe89cc96 Merge pull request 'main' (#12) from dqy/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#12
2023-10-19 11:12:34 +08:00
dqy
5edb151b05 refactor: 修改demo.py: 删除GenerateKeyPair的参数 2023-10-19 11:11:01 +08:00
dqy
a8cd0c1f71 Merge pull request 'main' (#13) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#13
2023-10-19 11:01:40 +08:00
c23d103a43 Merge pull request 'main' (#16) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#16
2023-10-19 10:55:58 +08:00
ff4579d9bc fix: fix all bugs 2023-10-19 10:42:33 +08:00
1e23dd6a3a feat: update git ignore 2023-10-19 08:14:18 +08:00
1e07dd1d35 Merge pull request 'fix: fix some bugs' (#15) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#15
2023-10-18 20:52:26 +08:00
38a15f79ed fix: fix some bugs 2023-10-18 20:51:57 +08:00
d1856f053b Merge pull request 'main' (#14) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#14
2023-10-18 17:35:17 +08:00