修改meager后的问题
add info authorization
cl
Merge branch 'cl'

Conflicts:
	src/main/resources/struts.xml