From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 3e8b365..6ea970d 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
@@ -139,9 +139,10 @@
 				if (end > 2)
 					text = text.substring(1, end);
 			}
-
-			if (NumberUtil.isNumeric(text)) {
-				out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佺函鏁板瓧"));
+			
+			String pattern = "^[A-Za-z0-9]+$";
+			if (Pattern.matches(pattern, text)) {
+				out.println(JsonUtil.loadFalseResult("涓嶆敮鎸佹帹鑽�"));
 				return;
 			}
 

--
Gitblit v1.8.0