getip improve
Merge branch 'master' of https://github.com/hjshiwbd/framework

Conflicts:
	src/framework/base/utils/CommonUtil.java