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

This reverts commit e88c33cc2077758292c349dd762fbd2f2c439c72.