Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-03 9a82179d24ec670ba1aefef6906b8acadf58da6e

 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;