整理代码，未完成。

Signed-off-by: bee0060 <bee0060@126.com>
Merge branch 'master' into gh-pages