Revert "修改了一些bug"

This reverts commit 73dd34784a4e6f8581f78a9d1fb305512077dddc.