diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONRequest.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONRequest.java index 487dbea7e..68f071290 100755 --- a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONRequest.java +++ b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONRequest.java @@ -54,6 +54,7 @@ public JSONRequest(String name, Object object) { public static final String KEY_TAG = "tag";//只在最外层,最外层用JSONRequest public static final String KEY_VERSION = "version";//只在最外层,最外层用JSONRequest + public static final String KEY_FORMAT = "format";//只在最外层,最外层用JSONRequest /**set "tag":tag in outermost layer * for write operations @@ -71,6 +72,14 @@ public JSONRequest setTag(String tag) { public JSONRequest setVersion(String version) { return puts(KEY_VERSION, version); } + /**set "format":format in outermost layer + * for format APIJSON special keys to normal keys of response + * @param version + * @return + */ + public JSONRequest setFormat(Boolean format) { + return puts(KEY_FORMAT, format); + } //array object <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java index 7c76b0b77..ef3b4d57b 100755 --- a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java +++ b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java @@ -136,6 +136,11 @@ public AbstractParser setGlobleDatabase(String globleDatabase) { this.globleDatabase = globleDatabase; return this; } + protected boolean globleFormat; + public AbstractParser setGlobleFormat(Boolean globleFormat) { + this.globleFormat = globleFormat; + return this; + } @Override public boolean isNoVerify() { @@ -265,7 +270,10 @@ public JSONObject parseResponse(JSONObject request) { try { setGlobleDatabase(requestObject.getString(JSONRequest.KEY_DATABASE)); + setGlobleFormat(requestObject.getBooleanValue(JSONRequest.KEY_FORMAT)); + requestObject.remove(JSONRequest.KEY_DATABASE); + requestObject.remove(JSONRequest.KEY_FORMAT); } catch (Exception e) { return extendErrorResult(requestObject, e); } @@ -306,7 +314,7 @@ public JSONObject parseResponse(JSONObject request) { Log.d(TAG, "parseResponse endTime = " + endTime + "; duration = " + (endTime - startTime) + ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n\n"); - return requestObject; + return globleFormat ? new JSONResponse(requestObject) : requestObject; }