项目第二次提交到公有库：主要是代码重构

Signed-off-by: xiaoxing598 <mx.tian@qq.com>
Merge branch 'master' of github.com:xiaoxing598/itganhuo

Conflicts:
	.classpath
	.gitignore
	.project
	pom.xml
	src/main/java/cn/itganhuo/app/aop/LoggerAop.java
	src/main/java/cn/itganhuo/app/common/page/Pagination.java
	src/main/java/cn/itganhuo/app/common/pool/ConfigPool.java
	src/main/java/cn/itganhuo/app/common/pool/ConstantPool.java
	src/main/java/cn/itganhuo/app/common/utils/DateUtil.java
	src/main/java/cn/itganhuo/app/common/utils/FileUtil.java
	src/main/java/cn/itganhuo/app/common/utils/HttpUtil.java
	src/main/java/cn/itganhuo/app/common/utils/MoneyUtil.java
	src/main/java/cn/itganhuo/app/common/utils/PropertiesUtil.java
	src/main/java/cn/itganhuo/app/common/utils/StringUtil.java
	src/main/java/cn/itganhuo/app/dao/ArticleDao.java
	src/main/java/cn/itganhuo/app/dao/ArticleLabelDao.java
	src/main/java/cn/itganhuo/app/dao/CommentDao.java
	src/main/java/cn/itganhuo/app/dao/DictionariesDao.java
	src/main/java/cn/itganhuo/app/dao/LabelDao.java
	src/main/java/cn/itganhuo/app/dao/MenuDao.java
	src/main/java/cn/itganhuo/app/dao/PermissionsDao.java
	src/main/java/cn/itganhuo/app/dao/ReplyDao.java
	src/main/java/cn/itganhuo/app/dao/RolesDao.java
	src/main/java/cn/itganhuo/app/dao/TemplateDao.java
	src/main/java/cn/itganhuo/app/dao/UserDao.java
	src/main/java/cn/itganhuo/app/entity/Article.java
	src/main/java/cn/itganhuo/app/entity/ArticleLabel.java
	src/main/java/cn/itganhuo/app/entity/ArticleLine.java
	src/main/java/cn/itganhuo/app/entity/AutoComplete.java
	src/main/java/cn/itganhuo/app/entity/Comment.java
	src/main/java/cn/itganhuo/app/entity/Dictionaries.java
	src/main/java/cn/itganhuo/app/entity/Label.java
	src/main/java/cn/itganhuo/app/entity/Menu.java
	src/main/java/cn/itganhuo/app/entity/Permissions.java
	src/main/java/cn/itganhuo/app/entity/Reply.java
	src/main/java/cn/itganhuo/app/entity/Roles.java
	src/main/java/cn/itganhuo/app/entity/Template.java
	src/main/java/cn/itganhuo/app/entity/User.java
	src/main/java/cn/itganhuo/app/exception/EmailUnauthorizedException.java
	src/main/java/cn/itganhuo/app/exception/InternalException.java
	src/main/java/cn/itganhuo/app/exception/PeripheralException.java
	src/main/java/cn/itganhuo/app/service/ArticleService.java
	src/main/java/cn/itganhuo/app/service/CommentService.java
	src/main/java/cn/itganhuo/app/service/DictionariesService.java
	src/main/java/cn/itganhuo/app/service/MailService.java
	src/main/java/cn/itganhuo/app/service/MenuService.java
	src/main/java/cn/itganhuo/app/service/PermissionsService.java
	src/main/java/cn/itganhuo/app/service/ReplyService.java
	src/main/java/cn/itganhuo/app/service/RolesService.java
	src/main/java/cn/itganhuo/app/service/UserService.java
	src/main/java/cn/itganhuo/app/service/impl/ArticleServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/CommentServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/DictionariesServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/MailServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/MenuServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/PermissionsServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/ReplyServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/RolesServiceImpl.java
	src/main/java/cn/itganhuo/app/service/impl/UserServiceImpl.java
	src/main/java/cn/itganhuo/app/web/controller/AdminController.java
	src/main/java/cn/itganhuo/app/web/controller/ArticleController.java
	src/main/java/cn/itganhuo/app/web/controller/CommonController.java
	src/main/java/cn/itganhuo/app/web/controller/UserController.java
	src/main/java/cn/itganhuo/app/web/interceptor/RequestHandlerExceptionResolver.java
	src/main/java/cn/itganhuo/app/web/interceptor/SecurityHandlerInterceptor.java
	src/main/java/cn/itganhuo/app/web/listener/ContextListener.java
	src/main/java/cn/itganhuo/app/web/realm/DBRealm.java
	src/main/resources/cn/itganhuo/app/mapper/ArticleMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/CommentMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/DictionariesMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/MenuMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/PermissionsMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/ReplyMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/RolesMapper.xml
	src/main/resources/cn/itganhuo/app/mapper/UserMapper.xml
	src/main/resources/javamail-context.xml
	src/main/resources/resources.properties
	src/main/webapp/WEB-INF/view/jsp/article_list.jsp
	src/main/webapp/WEB-INF/view/jsp/common/f_footer.jsp
	src/main/webapp/WEB-INF/view/jsp/common/footer.jsp