Server: OnParseCallback和Structure对服务端代码依赖过多已移出公共包； Client:与Server同步公共类

Author: TommyLemon

APIJSON(Android)/APIJSON(ADT)/APIJSONLibrary/src/zuo/biao/apijson/APIJSONRequest.java

@@ -33,16 +33,16 @@
 	 */
 	RequestMethod[] method() default {};
 
-	
-	/**@see {@link RequestMethod#POST_GET}
-	 * @return 该请求方法允许的结构
-	 */
-	String POST_GET() default "";
 
 	/**@see {@link RequestMethod#POST_HEAD}
 	 * @return 该请求方法允许的结构
 	 */
 	String POST_HEAD() default "";
+	
+	/**@see {@link RequestMethod#POST_GET}
+	 * @return 该请求方法允许的结构
+	 */
+	String POST_GET() default "";
 
 	/**@see {@link RequestMethod#POST}
 	 * @return 该请求方法允许的结构

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/JSONObject.java

@@ -102,6 +102,8 @@ public JSONObject add(com.alibaba.fastjson.JSONObject object) {
 	 * @return this
 	 */
 	public JSONObject add(com.alibaba.fastjson.JSONObject object, boolean encode) {
+		//TODO  putAll(object);
+		
 		Set<String> set = object == null ? null : object.keySet();
 		if (set != null) {
 			for (String key : set) {

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/APIJSONApplication.java

@@ -17,8 +17,6 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import zuo.biao.apijson.Structure;
-
 /**application
  * @author Lemon
  */

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Controller.java

@@ -29,7 +29,6 @@
 import zuo.biao.apijson.JSONResponse;
 import zuo.biao.apijson.RequestMethod;
 import zuo.biao.apijson.StringUtil;
-import zuo.biao.apijson.Structure;
 import zuo.biao.apijson.server.exception.ConditionNotMatchException;
 import zuo.biao.apijson.server.exception.ConflictException;
 import zuo.biao.apijson.server.model.Login;

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/OnParseCallback.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/OnParseCallback.java

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

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Parser.java

@@ -39,7 +39,6 @@
 import zuo.biao.apijson.Log;
 import zuo.biao.apijson.RequestMethod;
 import zuo.biao.apijson.StringUtil;
-import zuo.biao.apijson.Structure;
 import zuo.biao.apijson.server.exception.ConditionNotMatchException;
 import zuo.biao.apijson.server.exception.ConflictException;
 import zuo.biao.apijson.server.sql.AccessVerifier;

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/Structure.java renamed to APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/Structure.java

@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-package zuo.biao.apijson;
+package zuo.biao.apijson.server;
 
 import static zuo.biao.apijson.RequestMethod.POST;
 
@@ -28,9 +28,10 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
-import zuo.biao.apijson.server.Logic;
-import zuo.biao.apijson.server.Pair;
-import zuo.biao.apijson.server.Parser;
+import zuo.biao.apijson.JSON;
+import zuo.biao.apijson.Log;
+import zuo.biao.apijson.RequestMethod;
+import zuo.biao.apijson.StringUtil;
 import zuo.biao.apijson.server.sql.QueryConfig;
 
 /**结构类
@@ -47,7 +48,7 @@ private Structure() {}
 
 
 	static final String requestString = "{\"Comment\":{\"disallow\": \"id\", \"necessary\": \"userId,momentId,content\"}, \"add\":{\"Comment:to\":{}}}";
-	static final String responseString = "{\"User\":{\"remove\": \"phone\", \"replace\":{\"sex\":2}, \"add\":{\"name\":\"api\"}}, \"add\":{\"Comment:to\":{}}}";
+	static final String responseString = "{\"User\":{\"remove\": \"phone\", \"replace\":{\"sex\":2}, \"add\":{\"name\":\"api\"}}, \"put\":{\"Comment:to\":{}}}";
 
 	public static void test() throws Exception {
 		JSONObject request;