Commit Graph

Select branches

Hide Pull Requests

main

main-paper

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#3

#32

#36

#37

#4

#5

#6

#7

#8

#9

1.0

v1.0.0

Mono Color

• b952bfeb3d fix: clean db while exit Smart-SangGe 2023-10-24 20:58:31 +08:00
• ee3c55a588 fix: ip error Smart-SangGe 2023-10-24 20:39:22 +08:00
• 4e577e41c7 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai dqy 2023-10-24 20:21:43 +08:00
• 452253111b test: test dqy 2023-10-24 20:21:41 +08:00
• 40fd8945c8 Merge pull request 'main' (#25) from sangge/mimajingsai:main into main dqy 2023-10-24 20:16:57 +08:00
• 57766a6bf3 test: test Smart-SangGe 2023-10-24 20:15:56 +08:00
• 9bfe0dfd42 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai Smart-SangGe 2023-10-24 20:11:51 +08:00
• ce094b7305 tset: test Smart-SangGe 2023-10-24 20:11:49 +08:00
• 1fcdf20afb test: update test sangge 2023-10-24 20:10:24 +08:00
• f55b581059 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai sangge 2023-10-24 20:01:57 +08:00
• f0e16d0a60 test: tpem test sangge 2023-10-24 20:01:56 +08:00
• 70a0e6b63f Merge pull request 'fix: set timeout while init' (#24) from sangge/mimajingsai:main into main dqy 2023-10-24 19:56:50 +08:00
• 93b6d4d38c fix: set timeout while init Smart-SangGe 2023-10-24 19:56:12 +08:00
• 33c15e7143 Merge pull request 'doc: update server' (#23) from sangge/mimajingsai:main into main dqy 2023-10-24 19:41:04 +08:00
• 45554c8856 doc: update server sangge 2023-10-24 19:40:40 +08:00
• 569c6b1a77 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai dqy 2023-10-24 19:23:36 +08:00
• 2271369d2e feat:change serveraddress dqy 2023-10-24 19:23:34 +08:00
• 156c65570d Merge pull request 'main' (#22) from sangge/mimajingsai:main into main dqy 2023-10-24 19:20:52 +08:00
• 97e1bb49a5 feat: read host ip from env sangge 2023-10-24 19:20:03 +08:00
• a6588cde0e Merge branch 'sangge-main' dqy 2023-10-24 18:59:26 +08:00
• 54fcf431e1 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai into sangge-main dqy 2023-10-24 18:58:49 +08:00
• e304771743 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai sangge 2023-10-23 22:21:16 +08:00
• 2277cd577d test: temp change sangge 2023-10-23 22:21:15 +08:00
• 5fd39d3c20 feat: update requirements sangge 2023-10-23 22:20:52 +08:00
• e37c849e55 Merge pull request 'main' (#19) from ccyj/mimajingsai:main into main sangge 2023-10-23 21:41:40 +08:00
• 3349474f22 Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main ccyj 2023-10-23 21:40:43 +08:00
• ba8bab8a17 fix: 修改了中心服务器接收心跳包函数；修改客户端变量类型id ccyj 2023-10-23 21:39:12 +08:00
• 47a48d448f Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main dqy 2023-10-23 18:37:28 +08:00
• 9ed7a7ecf7 test: temp test sangge 2023-10-23 18:36:56 +08:00
• 8dab4be36c Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai dqy 2023-10-23 17:58:55 +08:00
• a45cd66e9d modified: src/client.ini modified: src/client.py modified: src/node.py dqy 2023-10-23 17:54:30 +08:00
• 0ce7f79d5f Merge pull request 'main' (#20) from sangge/mimajingsai:main into main ccyj 2023-10-23 17:47:52 +08:00
• e6d1119d4f Merge pull request 'main' (#20) from sangge/mimajingsai:main into main dqy 2023-10-23 17:30:52 +08:00
• 4e67b03565 sytle: modify code sangge 2023-10-23 17:30:17 +08:00
• 989300a841 feat: update receive_user_src_message sangge 2023-10-23 17:29:52 +08:00
• 55add91467 style: 美化代码 dqy 2023-10-23 17:12:18 +08:00
• 83b50056f6 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai sangge 2023-10-23 17:02:04 +08:00
• acef670d1d fix: update demo sangge 2023-10-23 17:00:30 +08:00
• aeccc72b97 fix: fix some errors sangge 2023-10-23 17:00:09 +08:00
• 7977557fc4 feat: add client_cli sangge 2023-10-23 16:59:52 +08:00
• 448f20c9df doc: update readme sangge 2023-10-23 16:59:35 +08:00
• 5ea41956fd feat: get_node_ip测试完毕 dqy 2023-10-23 16:41:48 +08:00
• 9efc8e2c7b Merge pull request 'main' (#19) from sangge/mimajingsai:main into main dqy 2023-10-23 16:03:14 +08:00
• 3c6b989039 feat: update code sangge 2023-10-23 14:21:41 +08:00
• 5f0781ca37 Merge pull request 'main' (#17) from ccyj/mimajingsai:main into main sangge 2023-10-23 14:11:38 +08:00
• 1e86f9ca6b Merge branch 'main' into main sangge 2023-10-23 14:11:21 +08:00
• 063d13a405 Merge pull request 'main' (#16) from dqy/mimajingsai:main into main sangge 2023-10-23 14:10:12 +08:00
• 7db5db66b5 build: 实现了节点的功能：向服务器发送ip和心跳包，与客户之间通信 ccyj 2023-10-23 10:12:00 +08:00
• dfb3a06aa0 Merge pull request 'main' (#18) from sangge/mimajingsai:main into main dqy 2023-10-22 17:01:07 +08:00
• 58ca8a6564 feat: GenerateReKey增加ID元组; 修改生成s_x和Kfrag的ID参数 dqy 2023-10-21 21:58:15 +08:00
• d7ca5f4725 feat: change timeout dqy 2023-10-21 20:42:41 +08:00
• 1aac74592f Merge pull request 'main' (#19) from sangge/mimajingsai:main into main ccyj 2023-10-21 20:40:13 +08:00
• 4f2dd9727e feat: add heartbeat package sangge 2023-10-21 20:39:43 +08:00
• e784b526ce Merge pull request 'main' (#15) from ccyj/mimajingsai:main into main sangge 2023-10-21 20:38:27 +08:00
• 2334cb68cf build: 节点功能构建 ccyj 2023-10-21 20:36:58 +08:00
• a3213a4245 Merge pull request 'main' (#17) from sangge/mimajingsai:main into main dqy 2023-10-21 20:32:58 +08:00
• 8a049fbe6f feat: finish timer sangge 2023-10-21 20:31:23 +08:00
• ad3f14ae1f Merge pull request 'main' (#14) from dqy/mimajingsai:main into main sangge 2023-10-21 20:27:20 +08:00
• 6efb7179bb feat: 提交server.py dqy 2023-10-21 20:25:40 +08:00
• 40c375bf98 feat: update feature sangge 2023-10-21 20:25:18 +08:00
• 37bdde3e53 Merge pull request 'main' (#16) from sangge/mimajingsai:main into main dqy 2023-10-21 15:50:05 +08:00
• 459b03c872 feat: add init config sangge 2023-10-21 14:39:37 +08:00
• 7b6e45690e feat: init client sangge 2023-10-20 22:27:14 +08:00
• 8d559f94ad fix: update git ignore sangge 2023-10-20 22:26:53 +08:00
• 1d2bc2cee9 Merge pull request 'main' (#18) from sangge/mimajingsai:main into main ccyj 2023-10-20 17:59:36 +08:00
• ebbac11778 doc: update doc folder sangge 2023-10-20 17:18:27 +08:00
• 8e961eda8e doc: create doc folder sangge 2023-10-20 17:17:02 +08:00
• 811274c956 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai sangge 2023-10-20 17:15:34 +08:00
• 4225ae52fc feat: add timer sangge 2023-10-20 17:15:31 +08:00
• 7e3359fe78 feat: add app requirements sangge 2023-10-20 17:14:43 +08:00
• fa039b3f24 fix: update base image sangge 2023-10-20 17:14:22 +08:00
• 84659a75d5 Merge pull request 'main' (#13) from dqy/mimajingsai:main into main sangge 2023-10-20 17:13:02 +08:00
• 727dcf0176 feat: 编写中心服务器代码框架；数据库代码待补充 dqy 2023-10-20 16:57:28 +08:00
• e0c8ebdb78 Merge pull request 'main' (#17) from sangge/mimajingsai:main into main ccyj 2023-10-19 14:59:03 +08:00
• 1122bdce86 Merge pull request 'main' (#15) from sangge/mimajingsai:main into main dqy 2023-10-19 14:56:26 +08:00
• a17adc8f4b feat: init 3 types of machine sangge 2023-10-19 14:56:01 +08:00
• edcc0c60d8 docs: init docs sangge 2023-10-19 14:54:03 +08:00
• 22909c2976 style: clean code sangge 2023-10-19 14:33:14 +08:00
• 28f7ff943f Merge pull request 'main' (#14) from sangge/mimajingsai:main into main dqy 2023-10-19 13:13:58 +08:00
• c49941e997 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai sangge 2023-10-19 11:55:26 +08:00
• 0112821ea6 test: test demo sangge 2023-10-19 11:55:25 +08:00
• d8fe89cc96 Merge pull request 'main' (#12) from dqy/mimajingsai:main into main sangge 2023-10-19 11:12:34 +08:00
• 5edb151b05 refactor: 修改demo.py: 删除GenerateKeyPair的参数 dqy 2023-10-19 11:11:01 +08:00
• a8cd0c1f71 Merge pull request 'main' (#13) from sangge/mimajingsai:main into main dqy 2023-10-19 11:01:40 +08:00
• c23d103a43 Merge pull request 'main' (#16) from sangge/mimajingsai:main into main ccyj 2023-10-19 10:55:58 +08:00
• ff4579d9bc fix: fix all bugs sangge 2023-10-19 10:42:33 +08:00
• 1e23dd6a3a feat: update git ignore sangge 2023-10-19 08:14:18 +08:00
• 1e07dd1d35 Merge pull request 'fix: fix some bugs' (#15) from sangge/mimajingsai:main into main ccyj 2023-10-18 20:52:26 +08:00
• 38a15f79ed fix: fix some bugs sangge 2023-10-18 20:51:57 +08:00
• d1856f053b Merge pull request 'main' (#14) from sangge/mimajingsai:main into main ccyj 2023-10-18 17:35:17 +08:00
• 77c61db035 Merge pull request 'feat: update demo' (#12) from sangge/mimajingsai:main into main dqy 2023-10-18 17:28:29 +08:00
• 854bb17cac feat: update demo sangge 2023-10-18 17:27:52 +08:00
• 3caef433f8 Merge pull request 'main' (#11) from sangge/mimajingsai:main into main dqy 2023-10-18 17:18:01 +08:00
• 6c1fefd9d3 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai sangge 2023-10-18 17:13:20 +08:00
• db6c6bef23 perf: remove i, j sangge 2023-10-18 17:11:31 +08:00
• c8975a104b refactor: refactor: 添加f函数注释；f、Encapsulate增加模P dqy 2023-10-18 16:59:22 +08:00
• e4ce861ec7 refactor: 添加f函数注释；f、Encapsulate增加模P dqy 2023-10-18 16:49:40 +08:00
• b6e4106ae1 Merge pull request 'main' (#13) from sangge/mimajingsai:main into main ccyj 2023-10-18 16:08:03 +08:00
• a196530fde perf: rewrite DecapsulateFrags sangge 2023-10-18 16:02:21 +08:00
• a68fcf1eec style: replace chinese comma sangge 2023-10-18 15:28:31 +08:00