从主项目同步过来

Author: TommyLemon

src/main/java/apijson/JSONObject.java

@@ -18,6 +18,8 @@
 import java.util.List;
 import java.util.Map;
 
+import apijson.server.JSONRequest;
+
 /**use this class instead of com.alibaba.fastjson.JSONObject
  * @author Lemon
  * @see #put
@@ -78,6 +80,13 @@ public static boolean isArrayKey(String key) {
 	public static boolean isTableKey(String key) {
 		return StringUtil.isBigName(key);
 	}
+	/**判断是否为对应Table数组的 key
+	 * @param key
+	 * @return
+	 */
+	public static boolean isTableArray(String key) {
+		return isArrayKey(key) && isTableKey(key.substring(0, key.length() - KEY_ARRAY.length()));
+	}
 	//judge >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
@@ -332,7 +341,7 @@ public JSONObject setOrder(String keys) {
 	public JSONObject setJSON(String keys) {
 		return puts(KEY_JSON, keys);
 	}
-
+	
 
 	//JSONObject内关键词 key >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
@@ -433,7 +442,7 @@ public JSONObject puts(Object value) {
 	}
 	/**put and return this
 	 * @param key
-	 * @param value
+	 * @param value 
 	 * @return this
 	 * @see {@link #put(String, Object)}
 	 */

src/main/java/apijson/JSONRequest.java

@@ -87,14 +87,14 @@ public JSONRequest setFormat(Boolean format) {
 	public static final int QUERY_TABLE = 0;
 	public static final int QUERY_TOTAL = 1;
 	public static final int QUERY_ALL = 2;
-
+	
 	public static final String QUERY_TABLE_STRING = "TABLE";
 	public static final String QUERY_TOTAL_STRING = "TOTAL";
 	public static final String QUERY_ALL_STRING = "ALL";
 
 	public static final String SUBQUERY_RANGE_ALL = "ALL";
 	public static final String SUBQUERY_RANGE_ANY = "ANY";
-
+	
 	public static final String KEY_QUERY = "query";
 	public static final String KEY_COUNT = "count";
 	public static final String KEY_PAGE = "page";
@@ -137,15 +137,15 @@ public JSONRequest setCount(int count) {
 	public JSONRequest setPage(int page) {
 		return puts(KEY_PAGE, page);
 	}
-
+	
 	/**set joins of Main Table and it's Vice Tables in Array layer
 	 * @param joins "@/User/id@", "&/User/id@,>/Comment/momentId@" ...
 	 * @return
 	 */
 	public JSONRequest setJoin(String... joins) {
 		return puts(KEY_JOIN, StringUtil.getString(joins));
 	}
-
+	
 	/**set range for Subquery
 	 * @param range
 	 * @return
@@ -155,15 +155,15 @@ public JSONRequest setJoin(String... joins) {
 	public JSONRequest setSubqueryRange(String range) {
 		return puts(KEY_SUBQUERY_RANGE, range);
 	}
-
+	
 	/**set from for Subquery
 	 * @param range
 	 * @return
 	 */
 	public JSONRequest setSubqueryFrom(String from) {
 		return puts(KEY_SUBQUERY_FROM, from);
 	}
-
+	
 	//array object >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 

src/main/java/apijson/Log.java

@@ -20,7 +20,7 @@
 public class Log {
 
 	public static boolean DEBUG = true;
-
+	
 	/**
 	 * @param TAG
 	 * @param msg

src/main/java/apijson/RequestMethod.java

@@ -23,38 +23,38 @@ public enum RequestMethod {
 	 * 常规获取数据方式
 	 */
 	GET,
-
+	
 	/**
 	 * 检查，默认是非空检查，返回数据总数
 	 */
 	HEAD,
-
+	
 	/**Safe, Single, Simple
 	 * <br > 限制性GET，通过POST来GET数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
 	 */
 	GETS,
-
+	
 	/**Safe, Single, Simple
 	 * <br > 限制性HEAD，通过POST来HEAD数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
 	 */
 	HEADS,
-
+	
 	/**
 	 * 新增(或者说插入)数据
 	 */
 	POST,
-
+	
 	/**
 	 * 修改数据，只修改传入字段对应的值
 	 */
 	PUT,
-
+	
 	/**
 	 * 删除数据
 	 */
 	DELETE;
-
-
+	
+	
 	/**是否为GET请求方法
 	 * @param method
 	 * @param containPrivate 包含私密(非明文)获取方法GETS
@@ -64,7 +64,7 @@ public static boolean isGetMethod(RequestMethod method, boolean containPrivate)
 		boolean is = method == null || method == GET;
 		return containPrivate == false ? is : is || method == GETS;
 	}
-
+	
 	/**是否为HEAD请求方法
 	 * @param method
 	 * @param containPrivate 包含私密(非明文)获取方法HEADS
@@ -74,15 +74,15 @@ public static boolean isHeadMethod(RequestMethod method, boolean containPrivate)
 		boolean is = method == HEAD;
 		return containPrivate == false ? is : is || method == HEADS;
 	}
-
+	
 	/**是否为查询的请求方法
 	 * @param method
 	 * @return 读操作(GET型或HEAD型) - true, 写操作(POST,PUT,DELETE) - false
 	 */
 	public static boolean isQueryMethod(RequestMethod method) {
 		return isGetMethod(method, true) || isHeadMethod(method, true);
 	}
-
+	
 	/**是否为开放(不限制请求的结构或内容；明文，浏览器能直接访问及查看)的请求方法
 	 * @param method
 	 * @return
@@ -94,5 +94,5 @@ public static boolean isPublicMethod(RequestMethod method) {
 	public static String getName(RequestMethod method) {
 		return method == null ? GET.name() : method.name();
 	}
-
+	
 }

src/main/java/apijson/RequestRole.java

@@ -60,7 +60,7 @@ public static RequestRole get(String name) throws Exception {
 			return null;
 		}
 		try { //Enum.valueOf只要找不到对应的值就会抛异常
-			return RequestRole.valueOf(StringUtil.toUpperCase(name));
+			return RequestRole.valueOf(name);
 		} catch (Exception e) {
 			throw new IllegalArgumentException("角色 " + name + " 不存在！只能是[" + StringUtil.getString(NAMES) + "]中的一种！", e);
 		}

src/main/java/apijson/SQL.java

@@ -25,7 +25,7 @@ public class SQL {
 	public static final String AS = " AS ";
 	public static final String IS = " is ";
 	public static final String NULL = " null ";
-
+	
 	//括号必须紧跟函数名！ count (...) 报错！
 	public static final String COUNT = "count";
 	public static final String SUM = "sum";
@@ -34,7 +34,7 @@ public class SQL {
 	public static final String AVG = "avg";
 
 	/**
-	 * isNull = true
+	 * isNull = true 
 	 * @return {@link #isNull(boolean)}
 	 */
 	public static String isNull() {
@@ -195,7 +195,7 @@ public static String indexOf(String s, String c) {
 	public static String replace(String s, String c1, String c2) {
 		return "replace(" + s + ", " + c1 + ", " + c2 + ")";
 	}
-
+	
 	/**
 	 * @param s1
 	 * @param s2
@@ -229,11 +229,11 @@ public static String toLowerCase(String s) {
 		return "lower(" + s + ")";
 	}
 
-
-
+	
+	
 
 	//column and function<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
+	
 	/**字段
 	 * @param column
 	 * @return column.isEmpty() ? "*" : column;
@@ -249,7 +249,7 @@ public static String column(String column) {
 	public static String columnAs(String column) {
 		return count(column) + AS;
 	}
-
+	
 	/**函数
 	 * @param column if (StringUtil.isEmpty(column, true) || column.contains(",")) -> column = null;
 	 * @return " " + fun + "(" + {@link #column(String)} + ") ";
@@ -267,7 +267,7 @@ public static String function(String fun, String column) {
 	public static String functionAs(String fun, String column) {
 		return function(fun, column) + AS + fun + " ";
 	}
-
+	
 	/**计数
 	 * column = null
 	 * @return {@link #count(String)}
@@ -317,9 +317,9 @@ public static String avg(String column) {
 	}
 
 	//column and function>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-
-
+	
+	
+	
 	//search<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 	public static final int SEARCH_TYPE_CONTAIN_FULL = 0;
@@ -392,7 +392,7 @@ public static String search(String s, int type, boolean ignoreCase) {
 			return "%" + s + "%";
 		}
 	}
-
+	
 	//search>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 }

src/main/java/apijson/package-info.java

@@ -13,10 +13,10 @@
 limitations under the License.*/
 
 /**
- * the same files for server and client projects
+ * the same files for server and client projects 
  */
 /**
  * @author Lemon
- *
+ * 
  */
 package apijson;