从 https://github.com/APIJSON/APIJSON/tree/master/APIJSON-Java-Server/APIJSONORM 同步过来

Author: TommyLemon

pom.xml

@@ -3,9 +3,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>zuo.biao.apijson.server</groupId>
+	<groupId>apijson.server</groupId>
 	<artifactId>apijson-orm</artifactId>
-	<version>3.9.0</version>
+	<version>4.0.0</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONORM</name>

src/main/java/zuo/biao/apijson/JSON.java src/main/java/apijson/JSON.javasrc/main/java/zuo/biao/apijson/JSON.java renamed to src/main/java/apijson/JSON.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

…in/java/zuo/biao/apijson/JSONObject.java src/main/java/apijson/JSONObject.javasrc/main/java/zuo/biao/apijson/JSONObject.java renamed to src/main/java/apijson/JSONObject.java src/main/java/zuo/biao/apijson/JSONObject.java renamed to src/main/java/apijson/JSONObject.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -332,7 +332,7 @@ public JSONObject setOrder(String keys) {
 	public JSONObject setJSON(String keys) {
 		return puts(KEY_JSON, keys);
 	}
-	
+
 
 	//JSONObject内关键词 key >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
@@ -433,7 +433,7 @@ public JSONObject puts(Object value) {
 	}
 	/**put and return this
 	 * @param key
-	 * @param value 
+	 * @param value
 	 * @return this
 	 * @see {@link #put(String, Object)}
 	 */

…n/java/zuo/biao/apijson/JSONRequest.java src/main/java/apijson/JSONRequest.javasrc/main/java/zuo/biao/apijson/JSONRequest.java renamed to src/main/java/apijson/JSONRequest.java src/main/java/zuo/biao/apijson/JSONRequest.java renamed to src/main/java/apijson/JSONRequest.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,7 +69,7 @@ public JSONRequest setTag(String tag) {
 	 * @param version
 	 * @return
 	 */
-	public JSONRequest setVersion(String version) {
+	public JSONRequest setVersion(Integer version) {
 		return puts(KEY_VERSION, version);
 	}
 	/**set "format":format in outermost layer
@@ -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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 

…/java/zuo/biao/apijson/JSONResponse.java src/main/java/apijson/JSONResponse.javasrc/main/java/zuo/biao/apijson/JSONResponse.java renamed to src/main/java/apijson/JSONResponse.java src/main/java/zuo/biao/apijson/JSONResponse.java renamed to src/main/java/apijson/JSONResponse.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 import java.util.List;
 import java.util.Set;
@@ -28,7 +28,7 @@
  * <br> User user = response.getObject(User.class);//not a must
  * <br> List<Comment> commenntList = response.getList("Comment[]", Comment.class);//not a must
  */
-public class JSONResponse extends zuo.biao.apijson.JSONObject {
+public class JSONResponse extends apijson.JSONObject {
 	private static final long serialVersionUID = 1L;
 
 	private static final String TAG = "JSONResponse";

src/main/java/zuo/biao/apijson/Log.java src/main/java/apijson/Log.javasrc/main/java/zuo/biao/apijson/Log.java renamed to src/main/java/apijson/Log.java

@@ -12,15 +12,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 /**测试用Log
  * @modifier Lemon
  */
 public class Log {
 
 	public static boolean DEBUG = true;
-	
+
 	/**
 	 * @param TAG
 	 * @param msg

…/java/zuo/biao/apijson/MethodAccess.java src/main/java/apijson/MethodAccess.javasrc/main/java/zuo/biao/apijson/MethodAccess.java renamed to src/main/java/apijson/MethodAccess.java src/main/java/zuo/biao/apijson/MethodAccess.java renamed to src/main/java/apijson/MethodAccess.java

@@ -12,21 +12,21 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static apijson.RequestRole.ADMIN;
+import static apijson.RequestRole.CIRCLE;
+import static apijson.RequestRole.CONTACT;
+import static apijson.RequestRole.LOGIN;
+import static apijson.RequestRole.OWNER;
+import static apijson.RequestRole.UNKNOWN;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static zuo.biao.apijson.RequestRole.ADMIN;
-import static zuo.biao.apijson.RequestRole.CIRCLE;
-import static zuo.biao.apijson.RequestRole.CONTACT;
-import static zuo.biao.apijson.RequestRole.LOGIN;
-import static zuo.biao.apijson.RequestRole.OWNER;
-import static zuo.biao.apijson.RequestRole.UNKNOWN;
 
 /**请求方法权限，只允许某些角色通过对应方法访问
  * @author Lemon

…/main/java/zuo/biao/apijson/NotNull.java src/main/java/apijson/NotNull.javasrc/main/java/zuo/biao/apijson/NotNull.java renamed to src/main/java/apijson/NotNull.java src/main/java/zuo/biao/apijson/NotNull.java renamed to src/main/java/apijson/NotNull.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

…java/zuo/biao/apijson/RequestMethod.java src/main/java/apijson/RequestMethod.javasrc/main/java/zuo/biao/apijson/RequestMethod.java renamed to src/main/java/apijson/RequestMethod.java src/main/java/zuo/biao/apijson/RequestMethod.java renamed to src/main/java/apijson/RequestMethod.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 /**请求方法，对应org.springframework.web.bind.annotation.RequestMethod，多出GETS,HEADS方法
  * @author Lemon
@@ -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();
 	}
-	
+
 }

…n/java/zuo/biao/apijson/RequestRole.java src/main/java/apijson/RequestRole.javasrc/main/java/zuo/biao/apijson/RequestRole.java renamed to src/main/java/apijson/RequestRole.java src/main/java/zuo/biao/apijson/RequestRole.java renamed to src/main/java/apijson/RequestRole.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package apijson;
 
 /**来访的用户角色
  * @author Lemon