更改一系列BUG

Signed-off-by: Wanghaoran <whrlmc@139.com>