|  | @ -57,6 +57,7 @@
 | 
	
		
			
				|  |  |         <version.logback>1.2.3</version.logback>
 | 
	
		
			
				|  |  |         <version.json>20160212</version.json>
 | 
	
		
			
				|  |  |         <version.springside>4.2.3-GA</version.springside>
 | 
	
		
			
				|  |  |         <version.spring-elasticsearch>2.1.3.RELEASE</version.spring-elasticsearch>
 | 
	
		
			
				|  |  |     </properties>
 | 
	
		
			
				|  |  |     <!--dependencyManagement作用子配置不写版本默认继承父配置-->
 | 
	
		
			
				|  |  |     <dependencyManagement>
 | 
	
	
		
			
				|  | @ -125,7 +126,6 @@
 | 
	
		
			
				|  |  |                 <groupId>org.springframework.cloud</groupId>
 | 
	
		
			
				|  |  |                 <artifactId>spring-cloud-starter-hystrix</artifactId>
 | 
	
		
			
				|  |  |                 <version>${version.springCloud}</version>
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             </dependency>
 | 
	
		
			
				|  |  |             <!--hystrix仪表盘-->
 | 
	
		
			
				|  |  |             <dependency>
 | 
	
	
		
			
				|  | @ -258,6 +258,16 @@
 | 
	
		
			
				|  |  |                 <artifactId>spring-boot-starter-aop</artifactId>
 | 
	
		
			
				|  |  |                 <version>${version.springBoot}</version>
 | 
	
		
			
				|  |  |             </dependency>
 | 
	
		
			
				|  |  |             <dependency>
 | 
	
		
			
				|  |  |                 <groupId>org.springframework.boot</groupId>
 | 
	
		
			
				|  |  |                 <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
 | 
	
		
			
				|  |  |                 <version>${version.springBoot}</version>
 | 
	
		
			
				|  |  |             </dependency>
 | 
	
		
			
				|  |  |             <dependency>
 | 
	
		
			
				|  |  |                 <groupId>org.springframework.data</groupId>
 | 
	
		
			
				|  |  |                 <artifactId>spring-data-elasticsearch</artifactId>
 | 
	
		
			
				|  |  |                 <version>${version.spring-elasticsearch}</version>
 | 
	
		
			
				|  |  |             </dependency>
 | 
	
		
			
				|  |  |             <!--springBoot end-->
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             <!--spring start-->
 | 
	
	
		
			
				|  | @ -418,7 +428,6 @@
 | 
	
		
			
				|  |  |                 <version>${version.springside}</version>
 | 
	
		
			
				|  |  |             </dependency>
 | 
	
		
			
				|  |  |             <!-- springside-core end-->
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         </dependencies>
 | 
	
		
			
				|  |  |     </dependencyManagement>
 | 
	
		
			
				|  |  | 
 |