将 request.requestURL 修改为 request.requestUri 等
Merge branch 'develop'

Conflicts:
	src/main/webapp/WEB-INF/views/template.ftl
修正语法错误
Merge branch 'develop'
Merge branch 'develop'
删除废弃的 css
Merge branch 'master' into develop