diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index c17210062..68961d219 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -1,12 +1,26 @@ package com.fangjia.core.util; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; +import com.hankcs.hanlp.HanLP; +import com.hankcs.hanlp.dictionary.py.Pinyin; +import com.mongodb.BasicDBList; +import com.mongodb.BasicDBObject; +import net.sf.json.JSONArray; +import net.sf.json.JSONNull; +import net.sf.json.JSONObject; +import net.sourceforge.pinyin4j.PinyinHelper; +import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; +import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; +import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType; +import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sothis.core.util.CollectionUtils; + +import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -23,28 +37,6 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import com.hankcs.hanlp.HanLP; -import com.hankcs.hanlp.dictionary.py.Pinyin; -import net.sf.json.JSONArray; -import net.sf.json.JSONNull; -import net.sf.json.JSONObject; -import net.sourceforge.pinyin4j.PinyinHelper; -import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; -import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; -import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType; -import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; - -import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.lucene.queryParser.QueryParser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.sothis.core.util.CollectionUtils; - -import com.mongodb.BasicDBList; -import com.mongodb.BasicDBObject; - public class DataUtil { public static Pattern cellPhonePattern = Pattern.compile("^(1[23456789][0-9]{1})(-)?([0-9]{8})$");// ÅжÏÊÇ·ñÊÖ»úºÅÂë private final static Logger LOGGER = LoggerFactory.getLogger(DataUtil.class); @@ -1040,10 +1032,11 @@ public class DataUtil { keyword = keyword.replace("\"", ""); keyword = keyword.replaceAll(SPACIAL_PATTERN, ""); keyword = keyword.replace("\\", " "); - keyword = QueryParser.escape(keyword.trim()).trim(); +// keyword = QueryParser.escape(keyword.trim()); keyword = DataUtil.toDBCcase(keyword.replace(";", " ")); keyword = keyword.replaceAll(SPACIAL_PATTERN, ""); - keyword = QueryParser.escape(keyword.trim()).trim(); +// keyword = QueryParser.escape(keyword.trim()).trim(); + keyword = keyword.trim(); for (String reservedWord : new String[] { "AND", "OR" }) { if (keyword.contains(reservedWord)) { keyword = keyword.replace(keyword, "\\" + keyword); @@ -1063,10 +1056,11 @@ public class DataUtil { s = s.replace("\"", ""); s = s.replaceAll(SPACIAL_PATTERN, ""); s = s.replace("\\", " "); - s = QueryParser.escape(s.trim()).trim(); +// s = QueryParser.escape(s.trim()).trim(); s = DataUtil.toDBCcase(s.replace(";", " ")); s = s.replaceAll(SPACIAL_PATTERN, ""); - s = QueryParser.escape(s.trim()).trim(); +// s = QueryParser.escape(s.trim()).trim(); + s = s.trim(); StringBuilder sb = new StringBuilder(); for (int i = 0; i < s.length(); i++) { char c = s.charAt(i);