改进代码使之兼容java 8
Merge branch 'dev-3.2.3' into dev-3.1.5