Merge branch 'feature_feature' into feature/zhangbo_model

# Conflicts:
#	recommend-server-service/pom.xml

recommend-server-service/pom.xml

@@ -76,7 +76,25 @@
         <dependency>
             <groupId>org.xm</groupId>
             <artifactId>similarity</artifactId>
-            <version>1.2</version>
+            <version>1.1</version>
+            <exclusions>
+                <!--                <exclusion>-->
+                <!--                    <artifactId>logback-access</artifactId>-->
+                <!--                    <groupId>ch.qos.logback</groupId>-->
+                <!--                </exclusion>-->
+                <!--                <exclusion>-->
+                <!--                    <artifactId>logback-classic</artifactId>-->
+                <!--                    <groupId>ch.qos.logback</groupId>-->
+                <!--                </exclusion>-->
+                <!--                <exclusion>-->
+                <!--                    <artifactId>logback-core</artifactId>-->
+                <!--                    <groupId>ch.qos.logback</groupId>-->
+                <!--                </exclusion>-->
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>