From 9a82179d24ec670ba1aefef6906b8acadf58da6e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期六, 03 八月 2019 12:13:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 6ea970d..a49eb0f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -16,7 +16,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -119,6 +118,8 @@
out.print(JsonUtil.loadFalseResult("鍊间负绌�"));
return;
}
+ //鍘婚櫎鍓嶅悗绌烘牸
+ text=text.trim();
if (text.length() > 256) {
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
@@ -131,16 +132,7 @@
Pattern p = Pattern.compile(URL_REGEX);
Matcher matcher = p.matcher(text);
if (!matcher.find()) {// 涓嶅寘鍚摼鎺�
- // 鍟嗗搧璇︽儏
- // 鍙戠幇
- // 娌℃湁閾炬帴锛屾爣棰樿繃闀夸篃涓嶅鐞�
- if (text.startsWith("銆�") && text.contains("銆�")) {
- int end = text.indexOf("銆�");
- if (end > 2)
- text = text.substring(1, end);
- }
-
- String pattern = "^[A-Za-z0-9]+$";
+ String pattern = "^[A-Za-z0-9-]+$";
if (Pattern.matches(pattern, text)) {
out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
return;
--
Gitblit v1.8.0