update
update config
Merge branch 'master' of https://github.com/EricleeCrystal/huoshi-core

Conflicts:
	README.md
	src/main/java/com/huoshi/im/dao/BookDao.java