v2修改
master abc
Merge branch 'v2'

Conflicts:
	master.php
add show
showHostName
Merge branch 'dev'

Conflicts:
	master.php
add