Merge branch 'dev-xdata'

Author: liangrui198

README.md

@@ -25,20 +25,10 @@ gradle初始项目demo,jetty简单main运行项目 mysql 脚本在WEB-INF/change
 </pre>
 
 发张效果图看看
-
-![图1](/doc/imgEffect/20160609145114.png)
-![图2](/doc/imgEffect/20160607140339.png)
-![图3](/doc/imgEffect/20160609145311.png)
-![图3](/doc/imgEffect/20160609145345.png)
-![图3](/doc/imgEffect/20160609153358.png)
-![图3](/doc/imgEffect/20160619193031.png)
-![图3](/doc/imgEffect/20160619193054.png)
-
-
-因为之前的前端不支持三级菜单，不方便再进行修改，现在改了前端主页框架，谢谢
- [https://github.com/huangyaoxin/hAdmin](https://github.com/huangyaoxin/hAdmin "https://github.com/huangyaoxin/hAdmin") ！，根据这个改版简易进行后台整合，效果如下
-
-![图3](/doc/imgEffect/v2_1.png)
-![图3](/doc/imgEffect/v2_2.png)
-![图3](/doc/imgEffect/v2_3.png)
+![图3](/doc/imgEffect/01.png)
+![图3](/doc/imgEffect/02.png)
+![图3](/doc/imgEffect/03.png)
+![图3](/doc/imgEffect/04.png)
+![图3](/doc/imgEffect/05.png)
+![图3](/doc/imgEffect/06.png)
 

build.gradle

@@ -121,6 +121,8 @@ dependencies {
 	    //compile group: 'javax.enterprise', name: 'cdi-api', version: '2.0-EDR1'
 		compile group: 'org.postgresql', name: 'postgresql', version: '42.0.0'
         compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.19.3'
+		//compile group: 'org.elasticsearch.client', name: 'rest', version: '5.5.0'
+		//compile group: 'org.elasticsearch.client', name: 'sniffer', version: '5.5.0'
 
 }