新增爱享资源、知识问答、博客群单独搜索的Action 等雷安调整搜索按钮位置
Signed-off-by: Ashel <475308724@qq.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing

Conflicts:
	WebRoot/css/messager.css
	WebRoot/messager.jsp
缓存
Signed-off-by: Ashel <475308724@qq.com>
Signed-off-by: Ashel <475308724@qq.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing

Conflicts:
	.classpath
	WebRoot/WEB-INF/classes/com/ISharing/Action/BlogAction.class
	WebRoot/WEB-INF/classes/com/ISharing/Action/ResourceAction.class
	WebRoot/WEB-INF/classes/com/ISharing/Action/UserAction.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/Impl/RecordinfoDaoImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/Impl/ResourceDaoImpl$1.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/Impl/ResourceDaoImpl$2.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/Impl/ResourceDaoImpl$3.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/Impl/ResourceDaoImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/RecordinfoDao.class
	WebRoot/WEB-INF/classes/com/ISharing/IDao/ResourceDao.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/Impl/RecordinfoServiceImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/Impl/ResourceServiceImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/Impl/UserServiceImpl.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/RecordinfoService.class
	WebRoot/WEB-INF/classes/com/ISharing/IService/ResourceService.class
	WebRoot/WEB-INF/classes/com/ISharing/ORM/Resource.hbm.xml
	WebRoot/WEB-INF/classes/com/ISharing/Tool/ConstFigure.class
	WebRoot/WEB-INF/classes/com/ISharing/Tool/SortTime.class
	WebRoot/WEB-INF/classes/struts.xml
Merge branch 'master' of https://github.com/zhengjiabin/ISharing

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/Action/MessagerAction.class
	WebRoot/WEB-INF/classes/com/ISharing/Filter/userLoginFilter.class

Signed-off-by: Ashel <475308724@qq.com>