将cmdlet改名为api
Merge gh-core/develop into develop

Conflicts:
	web/WEB-INF/web.xml