Server:优化WHERE条件连接，防SQL注入

Author: TommyLemon

APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/sql/SQLConfig.java

@@ -531,7 +531,7 @@ public static String getWhereString(RequestMethod method, Map<String, Object> wh
 				continue;
 			}
 
-			whereString += (isFirst ? "" : AND) + condition;
+			whereString += (isFirst ? "" : AND) + "(" + condition + ")";
 
 			isFirst = false;
 		}
@@ -639,7 +639,7 @@ public static String getSearchString(String key, Object[] values, int type) thro
 			condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR)) + getLikeString(key, values[i]);
 		}
 
-		return (Logic.isNot(type) ? NOT : "") + "(" + condition + ")";
+		return getCondition(Logic.isNot(type), condition);
 	}
 
 	/**WHERE key LIKE 'value'
@@ -693,7 +693,7 @@ public static String getRegExpString(String key, Object[] values, int type) thro
 			condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR)) + getRegExpString(key, (String) values[i]);
 		}
 
-		return (Logic.isNot(type) ? NOT : "") + "(" + condition + ")";
+		return getCondition(Logic.isNot(type), condition);
 	}
 
 	/**WHERE key REGEXP 'value'
@@ -747,8 +747,7 @@ public static String getRangeString(String key, Object range) throws Exception {
 			if (condition.isEmpty()) {
 				return "";
 			}
-			condition = "(" + condition + ")";
-			return logic.isNot() ? NOT + condition : condition;
+			return getCondition(logic.isNot(), condition);
 		}
 
 		throw new IllegalArgumentException(key + "{}:range 类型为" + range.getClass().getSimpleName()
@@ -770,7 +769,7 @@ public static String getInString(String key, Object[] in, boolean not) throws No
 			throw new NotExistException(TAG + ".getInString(" + key + ", [], " + not
 					+ ") >> condition.isEmpty() >> IN()");
 		}
-		return (not ? NOT : "") + " IN " + "(" + condition + ")";
+		return (not ? NOT : "") + " IN (" + condition + ")";
 	}
 	//{} range >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
@@ -814,7 +813,7 @@ public static String getContainString(String key, Object[] childs, int type) thr
 						childs[i] = "\"" + childs[i] + "\"";
 					}
 					condition += (i <= 0 ? "" : (Logic.isAnd(type) ? AND : OR))
-							+ getSearchString(
+							+ "(" + getSearchString(
 									key
 									, new String[]{
 											"[" + childs[i] + "]", //全等
@@ -823,7 +822,7 @@ public static String getContainString(String key, Object[] childs, int type) thr
 											"%, " + childs[i] + "]" //末尾
 									}
 									, Logic.TYPE_OR
-									);
+									) + ")";
 				}
 			}
 			if (condition.isEmpty()) {
@@ -833,10 +832,19 @@ public static String getContainString(String key, Object[] childs, int type) thr
 		if (condition.isEmpty()) {
 			return "";
 		}
-		return (Logic.isNot(type) ? NOT : "") + "(" + condition + ")";
+		return getCondition(Logic.isNot(type), condition);
 	}
 	//<> contain >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
+	/**拼接条件
+	 * @param not
+	 * @param condition
+	 * @return
+	 */
+	private static String getCondition(boolean not, String condition) {
+		return not ? NOT + "(" + condition + ")" : condition;
+	}
+	
 
 	/**转为JSONArray
 	 * @param tv