日志管理类
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/supr/blog/log/LogManager.java