fix some bugs and change max property id to short
Merge branch 'master' of https://github.com/XingCloud/commons