|
|
f0e16d0a60
|
test: tpem test
|
2023-10-24 20:01:56 +08:00 |
|
|
|
70a0e6b63f
|
Merge pull request 'fix: set timeout while init' (#24) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#24
|
2023-10-24 19:56:50 +08:00 |
|
|
|
93b6d4d38c
|
fix: set timeout while init
|
2023-10-24 19:56:12 +08:00 |
|
|
|
33c15e7143
|
Merge pull request 'doc: update server' (#23) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#23
|
2023-10-24 19:41:04 +08:00 |
|
|
|
45554c8856
|
doc: update server
|
2023-10-24 19:40:40 +08:00 |
|
|
|
569c6b1a77
|
Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai
|
2023-10-24 19:23:36 +08:00 |
|
|
|
2271369d2e
|
feat:change serveraddress
|
2023-10-24 19:23:34 +08:00 |
|
|
|
156c65570d
|
Merge pull request 'main' (#22) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#22
|
2023-10-24 19:20:52 +08:00 |
|
|
|
97e1bb49a5
|
feat: read host ip from env
|
2023-10-24 19:20:03 +08:00 |
|
|
|
a6588cde0e
|
Merge branch 'sangge-main'
|
2023-10-24 18:59:26 +08:00 |
|
|
|
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 |
|
|
|
5fd39d3c20
|
feat: update requirements
|
2023-10-23 22:20:52 +08:00 |
|
|
|
e37c849e55
|
Merge pull request 'main' (#19) from ccyj/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#19
|
2023-10-23 21:41:40 +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 |
|
|
|
0ce7f79d5f
|
Merge pull request 'main' (#20) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#20
|
2023-10-23 17:47:52 +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 |
|
|
|
448f20c9df
|
doc: update readme
|
2023-10-23 16:59:35 +08:00 |
|
|
|
5ea41956fd
|
feat: get_node_ip测试完毕
|
2023-10-23 16:41:48 +08:00 |
|
|
|
9efc8e2c7b
|
Merge pull request 'main' (#19) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#19
|
2023-10-23 16:03:14 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6efb7179bb
|
feat: 提交server.py
|
2023-10-21 20:25:40 +08:00 |
|
|
|
40c375bf98
|
feat: update feature
|
2023-10-21 20:25:18 +08:00 |
|
粤公网安备44010602013451号