APIJSON
diff --git a/‎APIJSONORM/src/main/java/apijson/JSONObject.java‎
Lines changed: 21 additions & 2 deletions b/‎APIJSONORM/src/main/java/apijson/JSONObject.java‎
Lines changed: 21 additions & 2 deletions
diff --git a/‎APIJSONORM/src/main/java/apijson/StringUtil.java‎
Lines changed: 9 additions & 1 deletion b/‎APIJSONORM/src/main/java/apijson/StringUtil.java‎
Lines changed: 9 additions & 1 deletion
@@ -145,8 +145,8 @@ public JSONObject setUserIdIn(List<Object> list) {
 	public static final String KEY_GROUP = "@group"; //分组方式
 	public static final String KEY_HAVING = "@having"; //聚合函数条件，一般和@group一起用
 	public static final String KEY_ORDER = "@order"; //排序方式
+	public static final String KEY_RAW = "@raw"; // 自定义原始 SQL 片段
 	public static final String KEY_JSON = "@json"; //SQL Server 把字段转为 JSON 输出
-	public static final String KEY_RAW = "@raw"; //自定义where条件拼接
 
 	public static final List<String> TABLE_KEY_LIST;
 	static {
@@ -162,8 +162,8 @@ public JSONObject setUserIdIn(List<Object> list) {
 		TABLE_KEY_LIST.add(KEY_GROUP);
 		TABLE_KEY_LIST.add(KEY_HAVING);
 		TABLE_KEY_LIST.add(KEY_ORDER);
-		TABLE_KEY_LIST.add(KEY_JSON);
 		TABLE_KEY_LIST.add(KEY_RAW);
+		TABLE_KEY_LIST.add(KEY_JSON);
 	}
 
 	//@key关键字都放这个类 >>>>>>>>>>>>>>>>>>>>>>
@@ -325,10 +325,29 @@ public JSONObject setOrder(String keys) {
 		return puts(KEY_ORDER, keys);
 	}
 
+	/**set keys to raw
+	 * @param keys  "key0,key1,key2..."
+	 * @return
+	 */
+	public JSONObject setRaw(String keys) {
+		return puts(KEY_RAW, keys);
+	}
+
 	/**set keys to cast to json
 	 * @param keys  "key0,key1,key2..."
 	 * @return
 	 */
+	public JSONObject setJson(String keys) {
+		return puts(KEY_JSON, keys);
+	}
+
+	/**用 setJson 替代。
+	 * set keys to cast to json
+	 * @param keys  "key0,key1,key2..."
+	 * @return
+	 * @see #{@link #setJson(String)}
+	 */
+	@Deprecated
 	public JSONObject setJSON(String keys) {
 		return puts(KEY_JSON, keys);
 	}
 
@@ -736,6 +736,14 @@ public static String[] split(String s) {
 	public static String[] split(String s, String split) {
 		return split(s, split, true);
 	}
+	/**将s用split分割成String[]
+	 * @param s
+	 * @param trim 去掉前后两端的split
+	 * @return
+	 */
+	public static String[] split(String s, boolean trim) {
+		return split(s, null, trim);
+	}
 	/**将s用split分割成String[]
 	 * @param s
 	 * @param split
@@ -747,7 +755,7 @@ public static String[] split(String s, String split, boolean trim) {
 		if (s.isEmpty()) {
 			return null;
 		}
-		if (isNotEmpty(split, false) == false) {
+		if (isEmpty(split, false)) {
 			split = ",";
 		}
 		if (trim) {