fix serval bugs
merge new code
modify heart beat default rule
Merge pull request #543 from leonindy/master

fix serval bugs