解决log4j下webAppRootKey冲突的bug
Merge remote-tracking branch 'origin/master'