内嵌jetty
调整日志
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' of https://github.com/hyxiaodili/12306ngweb
change the log4j configuration
add log4J manager