309 Commits

Author SHA1 Message Date
cbc0194037 feat: add ci 2023-10-25 09:16:46 +08:00
3a242d713d Merge pull request 'main' (#21) from dqy/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#21
2023-10-25 09:09:02 +08:00
dqy
51880b33e6 test:test 2023-10-24 23:04:17 +08:00
dqy
af8c822c06 Merge pull request 'test: test' (#30) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#30
2023-10-24 22:53:03 +08:00
dqy
c6ad479f60 test:test 2023-10-24 22:52:39 +08:00
558552a441 test: test 2023-10-24 22:52:21 +08:00
dqy
b4247928d7 Merge pull request 'fix: update' (#29) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#29
2023-10-24 22:40:34 +08:00
1c41ab94b2 fix: update 2023-10-24 22:40:12 +08:00
dqy
6702a04d27 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-24 22:34:11 +08:00
dqy
97f5b4eac7 test:test 2023-10-24 22:33:07 +08:00
dqy
f6b074fd62 Merge pull request 'test: test' (#28) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#28
2023-10-24 22:32:51 +08:00
e9f523014f test: test 2023-10-24 22:31:43 +08:00
dqy
0ab5388a3e Merge pull request 'main' (#27) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#27
2023-10-24 21:46:16 +08:00
3076d501ec Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-24 21:45:23 +08:00
5115142c2f test: test 2023-10-24 21:44:02 +08:00
dqy
3f5fbbcc91 test: test 2023-10-24 21:43:34 +08:00
dqy
0e3ecd475a Merge pull request 'main' (#26) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#26
2023-10-24 21:03:59 +08:00
805ff90c24 Merge branch 'dqy-main' 2023-10-24 21:02:49 +08:00
45990226d8 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai into dqy-main 2023-10-24 21:02:34 +08:00
dqy
63933a1d19 test: threshold set to 2 2023-10-24 21:00:19 +08:00
b952bfeb3d fix: clean db while exit 2023-10-24 20:58:31 +08:00
ee3c55a588 fix: ip error 2023-10-24 20:39:22 +08:00
dqy
4e577e41c7 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-24 20:21:43 +08:00
dqy
452253111b test: test 2023-10-24 20:21:41 +08:00
dqy
40fd8945c8 Merge pull request 'main' (#25) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#25
2023-10-24 20:16:57 +08:00
57766a6bf3 test: test 2023-10-24 20:15:56 +08:00
9bfe0dfd42 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai 2023-10-24 20:11:51 +08:00
ce094b7305 tset: test 2023-10-24 20:11:49 +08:00
1fcdf20afb test: update test 2023-10-24 20:10:24 +08:00
f55b581059 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai 2023-10-24 20:01:57 +08:00
f0e16d0a60 test: tpem test 2023-10-24 20:01:56 +08:00
dqy
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
dqy
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
dqy
569c6b1a77 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-24 19:23:36 +08:00
dqy
2271369d2e feat:change serveraddress 2023-10-24 19:23:34 +08:00
dqy
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
dqy
a6588cde0e Merge branch 'sangge-main' 2023-10-24 18:59:26 +08:00
dqy
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
dqy
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
dqy
8dab4be36c Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-23 17:58:55 +08:00