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

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -338,31 +338,26 @@ public class ArticleController extends BaseController {
     private String source(String link) {
         if (link.contains("baidu.com")) {
             return "1";
-        }
-        if (link.contains("www.so.com")) {
+        } else if (link.contains("www.so.com")) {
             return "2";
-        }
-        if (link.contains("www.google.cn")) {
+        } else if (link.contains("google")) {
             return "3";
-        }
-        if (link.contains("m.sm.cn")) {
+        } else if (link.contains("m.sm.cn")) {
             return "4";
-        }
-        if (link.contains("toutiao.com")) {
+        } else if (link.contains("toutiao.com")) {
             return "5";
-        }
-        if (link.contains("www.sogou.com")) {
+        } else if (link.contains("sogou.com")) {
             return "6";
-        }
-        if (link.contains("servicewechat.com")) {
+        } else if (link.contains("servicewechat.com")) {
             return "7";
-        }
-        if (link.contains("www.caimei365.com")) {
+        } else if (link.contains("weibo.com")) {
+            return "8";
+        } else if (link.contains("caimei365.com")) {
             return "0";
-        }
-        if (link.contains("zzjtest.gz.aeert.com")) {
+        } else if (link.contains("zzjtest.gz.aeert.com")) {
+            return "0";
+        } else {
             return "0";
         }
-        return null;
     }
 }

src/main/java/com/caimei/www/controller/unlimited/HomeController.java

@@ -119,31 +119,26 @@ public class HomeController extends BaseController {
     private String source(String link) {
         if (link.contains("baidu.com")) {
             return "1";
-        }
-        if (link.contains("www.so.com")) {
+        } else if (link.contains("so.com")) {
             return "2";
-        }
-        if (link.contains("www.google.cn")) {
+        } else if (link.contains("google.cn")) {
             return "3";
-        }
-        if (link.contains("m.sm.cn")) {
+        } else if (link.contains("m.sm.cn")) {
             return "4";
-        }
-        if (link.contains("toutiao.com")) {
+        } else if (link.contains("toutiao.com")) {
             return "5";
-        }
-        if (link.contains("www.sogou.com")) {
+        } else if (link.contains("sogou.com")) {
             return "6";
-        }
-        if (link.contains("servicewechat.com")) {
+        } else if (link.contains("servicewechat.com")) {
             return "7";
-        }
-        if (link.contains("www.caimei365.com")) {
+        } else if (link.contains("weibo.com")) {
+            return "8";
+        } else if (link.contains("caimei365.com")) {
             return "0";
-        }
-        if (link.contains("zzjtest.gz.aeert.com")) {
+        } else if (link.contains("zzjtest.gz.aeert.com")) {
+            return "0";
+        } else {
             return "0";
         }
-        return null;
     }
 }