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

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-stone/pom.xml

@@ -13,12 +13,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-web</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
+            <artifactId>liquidnet-common-cache-redis</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -12,17 +12,6 @@
     <artifactId>liquidnet-service-kylin-impl</artifactId>
     <dependencies>
         <!-- common -->
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redis</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/pom.xml

@@ -12,16 +12,6 @@
     <artifactId>liquidnet-service-order-impl</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redis</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/pom.xml

@@ -12,16 +12,6 @@
     <artifactId>liquidnet-service-stone-impl</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redis</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-cache-redisson</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/ServiceStoneApplication.java

@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
 import java.util.Arrays;
 
 @Slf4j
+@EnableFeignClients
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceStoneApplication implements CommandLineRunner {
     @Autowired