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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -132,7 +132,7 @@
      Pattern p = Pattern.compile(URL_REGEX);

      Matcher matcher = p.matcher(text);

      if (!matcher.find()) {// 不包含链接

         String pattern = "^[A-Za-z0-9]+$";

         String pattern = "^[A-Za-z0-9-]+$";

         if (Pattern.matches(pattern, text)) {

            out.println(JsonUtil.loadFalseResult("不支持推荐"));

            return;