Merge remote-tracking branch 'origin/HQPT_USER' into HQPT_USER

@@ -20,6 +20,7 @@ spring:
     name: hqpt-user-center
     name: hqpt-user-center
   redis:
   redis:
     host: 192.168.1.53
     host: 192.168.1.53
+#    host: 192.168.43.78
     port: 6379
     port: 6379
   jackson:
   jackson:
     serialization:
     serialization:
@@ -89,6 +90,7 @@ eureka:
     #eureka注册中心服务器地址
     #eureka注册中心服务器地址
     service-url:
     service-url:
       defaultZone: http://192.168.1.53:12345/eureka/
       defaultZone: http://192.168.1.53:12345/eureka/
+#      defaultZone: http://192.168.43.78:12345/eureka/
     registry-fetch-interval-seconds:  30
     registry-fetch-interval-seconds:  30
     lease-renewal-interval-in-seconds: 15
     lease-renewal-interval-in-seconds: 15
     lease-expiration-duration-in-seconds: 45
     lease-expiration-duration-in-seconds: 45

@@ -52,6 +52,10 @@
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 			<optional>true</optional>
 		</dependency>
 		</dependency>
@@ -174,11 +178,11 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
 		</dependency>
 		<!-- oracle-->
 		<!-- oracle-->
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-			<version>11.2.0.4.0-atlassian-hosted</version>
-		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>com.oracle</groupId>-->
+			<!--<artifactId>ojdbc6</artifactId>-->
+			<!--<version>11.2.0.4.0-atlassian-hosted</version>-->
+		<!--</dependency>-->
 		<!--分页插件-->
 		<!--分页插件-->
 		<dependency>
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<groupId>com.github.pagehelper</groupId>