Elgato_dark/TDengine
1
0
Fork 0
mirror of https://github.com/taosdata/TDengine synced 2026-05-24 10:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
67094 commits 554 branches 514 tags 1.7 GiB
Commit graph

1031 commits

Author SHA1 Message Date
wangmm0220
2ab54a1335 fix:conflicts from 3.0 2024-01-15 16:54:52 +08:00
kailixu
414e15a810 chore: merge 3.0 2024-01-15 10:42:45 +08:00
kailixu
ddefc5f46a chore: merge 3.0 2024-01-11 20:05:23 +08:00
Haojun Liao
5f7ce21530 refactor: do some internal refactor. 2024-01-11 11:59:29 +08:00
Haojun Liao
284ef7d085 fix(stream): remove the related checkpoint trans when trying to drop stream. 2024-01-03 14:44:04 +08:00
wangmm0220
c83989754f fix:[TS-4391] rebalance cnt always 1 if msg lost 2023-12-29 14:09:49 +08:00
wangmm0220
b58a23df49 fix:[TS-4391] rebalance cnt always 1 if msg lost 2023-12-29 13:57:13 +08:00
wangmm0220
10e86fc733 fix:[TS-4391] rebalance cnt always 1 if msg lost 2023-12-27 19:25:08 +08:00
wade zhang
1a215daefa
Merge pull request #24176 from taosdata/FIX/TD-27916-3.0 
enh: demarcate top and bottom halves of task trans execution
 2023-12-26 18:00:41 +08:00
Haojun Liao
84583580e2 fix(stream): transfer the checkpoint trans id. 2023-12-21 19:12:49 +08:00
Benguang Zhao
f7ab8e99b5 enh: demarcate top and bottom halves of task trans execution to ensure a consistent order 2023-12-19 19:52:11 +08:00
kailixu
1f5384ad40 feat: support uniq active code 2023-12-19 18:02:53 +08:00
wangmm0220
78c8ebae7f fix:remove useless code in split logic plan & random choose vnode in stream task & add test case 2023-12-19 16:35:04 +08:00
kailixu
70006bb711 feat: support alter cluster 2023-12-18 16:34:31 +08:00
kailixu
9fa90fc953 Merge branch '3.0' into feat/TD-27463-3.0 2023-12-18 14:20:10 +08:00
Haojun Liao
0526e619ad
Merge pull request #24095 from taosdata/fix/3_liaohj 
fix(tsdb): add desc check for clean file block.
 2023-12-16 18:10:15 +08:00
Haojun Liao
f9a5485d52 fix(stream): refactor the stream trans conflict detection strategy. 2023-12-16 01:46:29 +08:00
dmchen
606a6fe891 field encode 2023-12-14 03:24:53 +00:00
kailixu
4adce7ed52 feat: support uniq grant 2023-12-07 14:11:41 +08:00
kailixu
b015077120 feat: support uniq grant 2023-12-06 19:13:54 +08:00
Hongze Cheng
04e84ba152 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4229 2023-12-06 16:43:00 +08:00
kailixu
67fd9993b0 feat: support uniq grant 2023-12-06 15:30:26 +08:00
kailixu
042291c35b feat: support machine id 2023-12-01 18:15:47 +08:00
dapan1121
32030ca130
Merge pull request #23886 from taosdata/revert-23730-enh/TD-26976-3.0 
Revert "enh:  grant and active codes"
 2023-11-30 19:04:50 +08:00
Cary Xu
f96044e09f
Revert "enh: grant and active codes" 2023-11-30 13:39:54 +08:00
yihaoDeng
5c32680cd8 Merge branch '3.0' into enh/refactorBackend 2023-11-30 10:31:27 +08:00
Haojun Liao
788194c748 fix(stream): fix deadlock. 2023-11-24 22:53:55 +08:00
dmchen
bbbdec5db7 update progress 2023-11-23 07:36:33 +00:00
dmchen
4e1a355052 mnode for compact 2023-11-23 04:43:28 +00:00
Haojun Liao
7b1f586d4f
Merge pull request #23762 from taosdata/fix/3_liaohj 
fix(stream): fix error in generating token in bucket.
 2023-11-23 09:32:14 +08:00
Haojun Liao
91e7000433 Merge branch 'enh/refactorBackend' of github.com:taosdata/tdengine into enh/refactorBackend 2023-11-22 15:29:31 +08:00
Haojun Liao
c96f7cf182 fix(stream): scheduler the checkpoint generating. 2023-11-22 15:17:21 +08:00
yihaoDeng
0eba15b4a4 Merge branch '3.0' into enh/refactorBackend 2023-11-22 10:57:41 +08:00
Haojun Liao
43e6722fd8 refactor: refactor the stream trans conflict check 2023-11-22 08:38:32 +08:00
kailixu
14a2be8ed2 enh: adjust test case 2023-11-17 08:41:47 +08:00
kailixu
63a17295a7 enh: support spread active codes 2023-11-16 20:09:56 +08:00
kailixu
50126e4425 enh: support spread active codes 2023-11-16 19:52:05 +08:00
kailixu
188a4ce6a5 enh: the latest active code take effect 2023-11-15 16:33:05 +08:00
yihaoDeng
08e3448498 add seq 2023-11-08 19:54:57 +08:00
dapan1121
dbbceae061 fix: union all view issue 2023-10-24 11:29:04 +08:00
dapan1121
42f440b0fb Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-20 08:46:32 +08:00
dapan1121
afe963a9d1 enh: support view privilege 2023-10-19 08:31:31 +08:00
wangmm0220
473142fab7 fix:conflicts from 3.0 2023-10-16 11:35:56 +08:00
dapan1121
a0699d758c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-13 16:51:38 +08:00
dapan1121
c0a4328803 feat: support view meta updating 2023-10-13 16:29:34 +08:00
dapan1121
7c67f23469 feat: update view meta 2023-10-12 19:56:17 +08:00
Haojun Liao
eb4449999f other: merge 3.0 2023-10-12 10:33:48 +08:00
dapan1121
d229492616 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-09 18:34:08 +08:00
dapan1121
6c8db261f3 feat: support show views command 2023-10-09 17:19:36 +08:00
wangmm0220
b04d57fcc3 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-26056 2023-10-08 16:15:19 +08:00
wangmm0220
3f2d890560 feat:[TD-26056] add replay logic 2023-10-08 16:06:15 +08:00
dapan1121
deb9a6875b feat: mnode processing view meta request 2023-10-07 10:40:00 +08:00
dapan1121
0a0f512023 feat: add view meta processing 2023-09-28 11:44:38 +08:00
yihaoDeng
48be800639 fix ip white for all users 2023-09-27 15:46:25 +08:00
Shungang Li
743a5b0640 feat: add db config item keep_time_offset 2023-09-25 15:46:08 +08:00
dapan1121
a67b0c99fc feat: support create/drop view 2023-09-21 19:28:07 +08:00
wangmm0220
d3f54e678f feat:support vnode split in tmq 2023-09-20 18:27:43 +08:00
dapan1121
6b87d97989 feat: support view in mnode 2023-09-20 15:01:03 +08:00
dapan1121
b9d554275c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-09-19 14:21:00 +08:00
dapan1121
14e8db289d feat: support view 2023-09-19 14:19:54 +08:00
yihaoDeng
e7815229ca update test case 2023-09-13 19:54:45 +08:00
shenglian zhou
d5f1662bf5 enh: enterprise version and community version split 2023-09-12 14:35:01 +08:00
yihaoDeng
f29880fee3 add rpc update interface 2023-09-12 11:31:06 +08:00
yihaoDeng
d9eed32167 add rpc update interface 2023-09-12 09:54:13 +08:00
yihaoDeng
0a8b1ebe46 add rpc update interface 2023-09-11 21:02:50 +08:00
yihaoDeng
39d04ed15b add rpc update interface 2023-09-11 20:48:24 +08:00
dmchen
a8e538a563 fix/TD-26210 2023-09-11 14:38:36 +08:00
yihaoDeng
56706193eb add rpc update interface 2023-09-08 11:49:12 +08:00
yihaoDeng
27e3ee8f1d add rpc update interface 2023-09-07 21:10:05 +08:00
yihaoDeng
60d6a622e1 add rpc update interface 2023-09-07 20:47:10 +08:00
wangmm0220
842bb5742a fix:[TS-3922]rollback because cases failed & avoid atomic_store_64 core if parameters not aligned by 8 2023-09-07 19:26:33 +08:00
wangmm0220
c4898bffd8 fix:[TS-3922] make SStreamObj->->currentTick aligned by 8 2023-09-07 15:23:00 +08:00
yihaoDeng
147de26eec add rpc update interface 2023-09-07 11:54:34 +08:00
yihaoDeng
ac8220012c add rpc update interface 2023-09-06 17:22:30 +08:00
yihaoDeng
6257bf1e10 add rpc update interface 2023-09-05 12:03:23 +08:00
yihaoDeng
685bdea44a add rpc update interface 2023-09-04 21:15:46 +08:00
yihaoDeng
5f78c27535 add enable white list 2023-09-01 15:11:25 +08:00
dapan1121
cc17848b78 fix: merge 3.0 to main 2023-09-01 13:24:47 +08:00
yihaoDeng
05ca71d5de stream change ver 2023-08-31 09:28:43 +08:00
Haojun Liao
24b1a050fc other: merge 3.0 2023-08-30 16:00:14 +08:00
dapan1121
f6321d0c4f Merge remote-tracking branch 'origin/main' into fix/m23.1 2023-08-30 11:03:33 +08:00
wangmm0220
047707fa17 fix:error in privilege 2023-08-25 17:56:17 +08:00
yihaoDeng
9310d138a6 Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-24 17:30:35 +08:00
wangmm0220
49216ffa54 fix:transaction in tmq 2023-08-24 16:32:15 +08:00
dm chen
b899a8b7df
Merge branch '3.0' into feat/TD-22970 2023-08-22 10:12:30 +08:00
yihaoDeng
1531e2d7d3 Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-22 09:51:38 +08:00
Benguang Zhao
f30d1ebacd enh: refactor func name as mndTransAppendPrepareLog 2023-08-18 18:35:44 +08:00
liuyao
87c65f3b68 Merge remote-tracking branch 'origin/3.0' into enh/triggerCheckPoint2 2023-08-18 15:27:02 +08:00
Benguang Zhao
f01a26f68a enh: refactor func names of new Vg prepare actions 2023-08-18 14:26:58 +08:00
dm chen
e393a98ee9
Merge branch '3.0' into feat/TD-22970 2023-08-18 13:37:18 +08:00
Benguang Zhao
dbdfee4c41 enh: update SVnodeGid of vnode info in mndProcessStatusReq 2023-08-15 19:25:08 +08:00
Haojun Liao
1f792f09c4 fix(stream): remove invalid code. 2023-08-14 10:39:47 +08:00
Haojun Liao
f24b22000f enh(stream): stop stream task before redistribute vnodes. 2023-08-11 23:46:53 +08:00
dm chen
5b03ab1705
Merge branch '3.0' into feat/TD-22970 2023-08-03 17:43:51 +08:00
Haojun Liao
8dfef8768a other: merge 3.0 2023-07-29 22:54:16 +08:00
Haojun Liao
2a78cd2d23
Merge pull request #22215 from taosdata/fix/liaohj 
other: merge main.
 2023-07-28 13:06:17 +08:00
Shungang Li
fb226c2cdb enh: check cluster ttlChangeOnWrite consistency 2023-07-27 16:49:56 +08:00
Haojun Liao
b145771a1b other: merge 3.0 2023-07-27 16:38:57 +08:00
Haojun Liao
3d403dca5a other: merge main. 2023-07-27 16:23:41 +08:00
wade zhang
cc3cc73cfc
Merge pull request #22199 from taosdata/fix/TS-3708 
fix/TS-3708: check term for role time
 2023-07-27 15:43:23 +08:00
Shungang Li
167ecea705 fix: check term for role time 
1. time of mnode becomes current role in this term
2. show 0 for offline mnodes
 2023-07-27 14:16:54 +08:00
Haojun Liao
b1596f8e3e refactor: do some internal refactor. 2023-07-27 01:55:42 +08:00
Haojun Liao
1c1bf63e1f other: merge 3.0 2023-07-25 18:17:11 +08:00
Haojun Liao
1e34f84f78 other: merge 3.0 2023-07-24 15:23:03 +08:00
Ganlin Zhao
076a425d53 fix: fix show create table issue for system tables 2023-07-20 17:21:24 +08:00
dmchen
8062d603b7 restore old change replica 2023-07-19 15:35:37 +08:00
dmchen
3711fdd865 feat/TD-22970 2023-07-18 16:09:38 +08:00
Haojun Liao
b2a905bd91
Merge branch '3.0' into enh/triggerCheckPoint2 2023-07-17 11:50:12 +08:00
wangmm0220
cb62d4cb97 fix:set firset version to reqOffset of response 2023-07-11 14:49:53 +08:00
Haojun Liao
3ffdbe923d other: merge 3.0 2023-07-11 09:12:57 +08:00
Haojun Liao
f4a3567935 other: merge 3.0 2023-07-06 11:24:30 +08:00
Haojun Liao
200575647c
Merge branch '3.0' into refact/fillhistory 2023-07-03 15:16:18 +08:00
dapan1121
a36dac2008
Merge pull request #21893 from taosdata/fix/TS-3551-M 
enh: update of user auth version
 2023-07-03 14:58:09 +08:00
kailixu
387d611179 chore: passVer and authVer refact 2023-06-30 14:52:20 +08:00
dapan1121
bb1e24dda4 Merge remote-tracking branch 'origin/main' into fix/m23.0 2023-06-29 13:59:56 +08:00
dapan1121
3519e9170e Merge remote-tracking branch 'origin/main' into 3.0 2023-06-29 11:13:45 +08:00
wangmm0220
64d8d63f3d fix:error in limit for tmq group 2023-06-29 10:47:55 +08:00
wangmm0220
7d15958509 Merge branch 'main' of https://github.com/taosdata/TDengine into mark/tmq 2023-06-27 18:18:27 +08:00
Yihao Deng
4de7db06f9
Merge branch '3.0' into enh/triggerCheckPoint2 2023-06-27 17:57:14 +08:00
Haojun Liao
3289ad62be other: merge 3.0 2023-06-27 11:33:40 +08:00
dapan1121
4dae9f4eff merge main to 3.0 2023-06-26 18:43:00 +08:00
Haojun Liao
daafe240ed fix(stream): fix memory leak. 2023-06-26 14:18:47 +08:00
Benguang Zhao
e8649670aa enh: not allow to split vgroup when streams or topics exist 2023-06-26 11:57:24 +08:00
yihaoDeng
fd85a8495a Merge branch 'dev30' into enh/triggerCheckPoint2 2023-06-17 14:17:21 +08:00
wangjiaming0909
bc2cc64873 fix: show queries returned less rows when one conn has more than 100 queries 2023-06-16 18:17:56 +08:00
yihaoDeng
b0a3a8d619 refactor checkpoint 2023-06-16 17:28:50 +08:00
wangmm0220
779e35b679 fix:drop consumer wher drop topic or group 2023-06-16 13:52:08 +08:00
wangmm0220
e019ed2cc3 fix:conflict 2023-06-15 18:50:44 +08:00
wangmm0220
5de4600739 fix:remove lost_reb status 2023-06-15 18:48:45 +08:00
wangmm0220
a7a518aaed opti:tmq logic 2023-06-15 15:44:52 +08:00
Haojun Liao
74e0138f72 Merge branch '3.0' into refact/fillhistory 2023-06-15 15:25:00 +08:00
wangmm0220
22776e60d5 fix:control memory size if consumer group is too much 2023-06-15 14:51:04 +08:00
wangmm0220
864236a8dc fix:conflicts 2023-06-14 12:05:10 +08:00
wangmm0220
c28d7d9bf8 fix:open info log in tmq client & modify parametes in show consumers 2023-06-14 12:01:54 +08:00
wangmm0220
827e84b1a5 fix:memory leak 2023-06-13 17:10:23 +08:00
wangmm0220
d8d6b6dd21 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-24749 2023-06-13 15:15:05 +08:00
wangmm0220
8a81278024 fix:load pHandle if necessary wher tq restore 2023-06-13 15:14:11 +08:00
Haojun Liao
933d08b489
Merge pull request #21690 from taosdata/feature/TS-3495 
feat:add parameters for consumer & add offset rows for subscription
 2023-06-13 14:59:15 +08:00
wangmm0220
fb123d8761 fix:conflict from 3.0 2023-06-13 09:47:08 +08:00
wangmm0220
fb59ec4591 feat:move plan msg from vginfo to subscription info 2023-06-13 09:32:54 +08:00
Benguang Zhao
3689b41f3a Merge branch '3.0' into FIX/TD-24182-3.0 2023-06-12 09:39:49 +08:00
wangmm0220
aa610b27a4 feat:add parameters for consumer & add offset rows for subscription 2023-06-09 18:51:10 +08:00
Haojun Liao
53246ed6bb other: merge other branch. 2023-06-09 09:41:10 +08:00
wangmm0220
3f46a9bbc9 feat:add parameters for consumer & add offset rows for subscription 2023-06-08 18:14:02 +08:00
dapan1121
dff35ac584
Merge pull request #21550 from wangjiaming0909/feature/3.0/TD-23974 
feature: add user priv when create db, remove priv check with create_dbs
 2023-06-06 11:06:18 +08:00
wangjiaming0909
60100a0fb6 feature: add user priv when create db, remove priv check with create_dbs 2023-05-31 18:43:56 +08:00
Benguang Zhao
4a6d81855b enh: add mndTransValidate for prepare actions 2023-05-30 18:50:00 +08:00
Haojun Liao
be8fd9e48b enh(stream): create additional task for history data processing. 2023-05-30 14:47:10 +08:00
Haojun Liao
2977a4d07f refactor: do some internal refactor. 2023-05-30 09:41:19 +08:00
Haojun Liao
cd2d225c93 refactor: do some internal refactor. 2023-05-29 17:50:39 +08:00
Benguang Zhao
3c698b2461 enh: add mndAddPrepareNewVgAction 2023-05-29 14:13:11 +08:00
Benguang Zhao
873ad8839b enh: add prepareActions in STrans 2023-05-29 14:13:11 +08:00
Benguang Zhao
f8841046bc enh: refactor func name of mndTransPerformFinishStage 2023-05-25 15:44:26 +08:00
Benguang Zhao
30104f300c enh: refactor func names of mndTransPerformFinishedStage and mndTrancCheckConflict 2023-05-25 15:44:26 +08:00
Haojun Liao
99f669434a
Merge pull request #21282 from taosdata/feature/TD-23117 
feat:[TD-23117] add schema for ins_topics
 2023-05-24 14:54:42 +08:00
wade zhang
1ade314043
Merge pull request #21325 from taosdata/feat/force-drop-dnode 
Feat/force drop dnode
 2023-05-19 09:23:54 +08:00
Haojun Liao
041ffa91bd other: merge main. 2023-05-17 15:42:15 +08:00
dmchen
9ff56a4e2b unsafe command 2023-05-16 14:02:54 +08:00
cadem
72c543563f force drop dnode 2023-05-15 11:20:27 +08:00
Haojun Liao
99148d6719 other: merge 3.0 2023-05-13 20:02:48 +08:00
wangmm0220
e17a105eff feat:[TD-23117] add schema for ins_topics 2023-05-12 18:14:43 +08:00
dapan1121
69795286fa Merge remote-tracking branch 'origin/main' into enh/tsbsPerf.4 2023-05-12 13:46:16 +08:00
dapan1121
eda4c85dbb
Merge pull request #21253 from taosdata/feat/TD-23643-3.0 
feat: support connectors licensing
 2023-05-11 18:19:04 +08:00
kailixu
fd107f2c26 chore: more code 2023-05-11 00:16:41 +08:00
yihaoDeng
5708fcb5cb Merge branch 'enh/3.0' into enh/rocksdbSstateMerge 2023-05-10 08:02:16 +00:00
cadem
843d606058 feat/restore dnode 2023-05-09 17:15:37 +08:00
kailixu
e4882765ae Merge branch '3.0' into feat/TD-23643-3.0 2023-05-08 16:28:20 +08:00
wade zhang
39369ae578
Merge pull request #21136 from taosdata/fix/transaction-multithread 
transaction multithread
 2023-05-07 14:47:25 +08:00
kailixu
2be6ff4630 chore: more code 2023-05-06 20:38:50 +08:00
Benguang Zhao
70d21efeb6 Merge branch 3.0 to FIX/TD-18702-3.0 2023-05-06 14:56:03 +08:00
Benguang Zhao
72c6292ab4 enh: declare mndSplitVgroup in mndVgroup.h 2023-05-06 10:03:03 +08:00
Benguang Zhao
ff6523fb02 enh: declare mndSplitVgroup in mndVgroup.h 2023-05-06 09:14:03 +08:00
Benguang Zhao
76a20b2221 enh: adjust enum ETrnExec 2023-05-05 18:57:15 +08:00
dmchen
38f507d941 transaction multithread 2023-05-04 05:49:36 +00:00
Haojun Liao
79342cf1f4 refactor(tqm): do some internal refactor. 2023-05-02 22:51:13 +08:00
chenhaoran
7d7a0769b3 Merge remote-tracking branch 'origin/main' into enh/tsbsPerf.1 2023-04-21 16:20:37 +08:00
kailixu
9e71b6d071 Merge branch '3.0' into enh/TD-23421-M 2023-04-21 16:04:13 +08:00
cadem
3b78d4382b add learner 2023-04-18 19:03:45 +08:00
wangmm0220
1771a54256 fix:rebalance not only one in once timer 2023-04-17 19:59:11 +08:00
dapan1121
7f518ca4ea feat: support cache db cfg 2023-04-13 10:54:57 +08:00
kailixu
ac841b02bf merge 3.0 2023-04-12 13:09:52 +08:00
Xiaoyu Wang
9578c4538a Merge remote-tracking branch 'origin/3.0' into fix/3.0_merge_main 2023-04-11 19:33:23 +08:00
Xiaoyu Wang
5ce6220106
Merge pull request #20781 from taosdata/szhou/replace-function 
feature: udf replace function
 2023-04-11 17:25:21 +08:00
Xiaoyu Wang
4c04b155d5 merge main 2023-04-11 15:56:28 +08:00
Xiaoyu Wang
416af9a58d feat: table level privilege 2023-04-11 10:11:25 +08:00
“happyguoxy”
765c09d59e update function 2023-04-10 16:40:16 +08:00
Xiaoyu Wang
e2f82f4423 merge main 2023-04-10 09:56:03 +08:00
kailixu
ec8cd0c6b8 enh: support passwd version 2023-04-09 18:44:46 +08:00
shenglian zhou
66c86a60d5 fix: add func_version to systable 2023-04-06 15:58:53 +08:00
Haojun Liao
2b2059ef18
Merge pull request #20534 from taosdata/fix/TD-22671 
fix:error in TD-23218 & remove useless logic
 2023-04-06 11:47:24 +08:00
shenglian zhou
47719b1028 Merge branch '2.0' of github.com:taosdata/TDengine into szhou/replace-function 2023-04-06 11:19:10 +08:00
“happyguoxy”
a71caffed6 add version in mnode 2023-04-04 19:53:08 +08:00
Xiaoyu Wang
e9d7a099cc merge main 2023-04-04 14:50:58 +08:00
Shengliang Guan
e783c21629
Merge pull request #20519 from taosdata/fix/coveriyScanYihao 
fix coverity scan problem
 2023-04-04 09:22:02 +08:00
wangmm0220
97b5c7abee fix:merge from main 2023-03-31 16:20:21 +08:00
cademfly
d85d1bf58e add new dup fun 2023-03-31 10:04:03 +08:00
cademfly
db725c6f6d show priviledge format 2023-03-30 18:53:50 +08:00
cademfly
824c87a6c7 binary format 2023-03-30 13:59:48 +08:00
cademfly
2fd10c2aa0 table 2023-03-29 13:30:32 +08:00
Xiaoyu Wang
97855c6233
Merge pull request #20607 from taosdata/FEAT/TD-23257-3.0 
feat: WAL cleanup not affected by topic consumption anymore
 2023-03-27 17:58:31 +08:00