Merge branch 'master' of http://116.63.33.55/git/zfjyjgfwpt

src/main/java/com/jd/zfjyjgfwpt/service/impl/FrontServiceImpl.java

@@ -664,7 +664,7 @@ public class FrontServiceImpl implements FrontServiceI {
 
     @Override
     public Map<String, Object> getSearchCondition() {
-        String resStr = "{\"uuid\":\"8c8b0529b52e4096922761d31fbaad31\",\"type\":\"success\",\"status\":null,\"data\":{\"data\":{\"area\":[\"渝州\",\"万州\",\"合川\"],\"price\":[\"0-50\",\"50-80\",\"80-100\",\"100-120\",\"120-150\",\"150-180\",\"180-200\",\"200以上\"],\"HX\":[\"一居室\",\"两居室\",\"三居室\"],\"MJ\":[\"0-50\",\"50-100\",\"100-150\",\"150-200\",\"200以上\"],\"YT\":[\"住宅\",\"商业\",\"办公\",\"其他\"]},\"adi_trackValue\":null}}";
+        String resStr = loadLocalJsonFile("getSearchCondition");;
 //    	String resStr = HttpUtil.get(RemoteUrlConstants.getSearchCondition());
         JSONObject resObj = JSONObject.parseObject(resStr);
         if (Blank.isEmpty(resObj)) {

src/main/java/com/jd/zfjyjgfwpt/util/Blank.java

@@ -203,7 +203,7 @@ public class Blank {
 			return false;
 		}
 
-		String pattern = "^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\\d{8}$";
+		String pattern = "^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$";
 		if (!Pattern.matches(pattern, phone)) {
 			return false;
 		}