<init-param>
            <param-name>contextConfigLocation</param-name>
            <param-value>classpath:spring-servlet-config.xml</param-value>
</init-param>
spring-config.xml 放入resources文件夹
提交代码
spring自定义拦截url
Merge branch 'master' of git@github.com:apachefarmer/spring-mvc.git

Conflicts:
	spring-mvc/pom.xml
	spring-mvc/src/main/webapp/WEB-INF/jsp/hello.jsp
	spring-mvc/src/main/webapp/WEB-INF/web.xml