修复大量bug
Revert "修复大量bug"

This reverts commit 1d6086cecc5462db4caa712355a76dcfd83cce7e.
修复大量bug