Revert "Revert "整理代码，简化函数调用参数""

This reverts commit 22b85b673155449cd93a098916017782a464fb76.