Client:POST_GET改为GETS,POST_HEAD改为HEADS

Author: TommyLemon

APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/client/util/HttpRequest.java

@@ -54,8 +54,8 @@ public class HttpRequest {
 	public static final String URL_HEAD = URL_BASE + "head/";
 	public static final String URL_GET = URL_BASE + "get/";
 	public static final String URL_POST = URL_BASE + "post/";
-	public static final String URL_POST_HEAD = URL_BASE + "post_head/";
-	public static final String URL_POST_GET = URL_BASE + "post_get/";
+	public static final String URL_HEADS = URL_BASE + "heads/";
+	public static final String URL_GETS = URL_BASE + "gets/";
 	public static final String URL_PUT = URL_BASE + "put/";
 	public static final String URL_DELETE = URL_BASE + "delete/";
 
@@ -91,7 +91,7 @@ public static void post(JSONObject request, int requestCode, OnHttpResponseListe
 	 * @must request最外层有tag，部分请求还要currentUserId和对应的password
 	 */
 	public static void postHead(JSONObject request, int requestCode, OnHttpResponseListener listener) {
-		HttpManager.getInstance().post(URL_POST_HEAD, request, requestCode, listener);
+		HttpManager.getInstance().post(URL_HEADS, request, requestCode, listener);
 	}
 	/**用POST方法GET数据，request和response都非明文，浏览器看不到，用于对安全性要求高的GET请求
 	 * @param request
@@ -100,7 +100,7 @@ public static void postHead(JSONObject request, int requestCode, OnHttpResponseL
 	 * @must request最外层有tag，部分请求还要currentUserId和对应的password
 	 */
 	public static void postGet(JSONObject request, int requestCode, OnHttpResponseListener listener) {
-		HttpManager.getInstance().post(URL_POST_GET, request, requestCode, listener);
+		HttpManager.getInstance().post(URL_GETS, request, requestCode, listener);
 	}
 	/**
 	 * @param request
@@ -301,7 +301,7 @@ public static void checkVerify(String phone, String verify, int requestCode, OnH
 		request.put(PHONE, phone);
 		request.put(VERIFY, verify);
 
-		HttpManager.getInstance().post(URL_BASE + "post_head/verify"
+		HttpManager.getInstance().post(URL_BASE + "heads/verify"
 				, request.setTag(VERIFY_)
 				, requestCode, listener);
 	}

APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/server/model/Login.java

@@ -25,7 +25,7 @@
 /**登录类，已用session替代
  * @author Lemon
  * @see
- * <br >POST_HEAD:<pre>
+ * <br >HEADS:<pre>
 {
  "Login":{
      "disallow":"!",
@@ -56,8 +56,8 @@
 @Deprecated
 @SuppressWarnings("serial")
 @MethodAccess(
-		POST_GET = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
-		POST_HEAD = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
+		GETS = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
+		HEADS = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
 		POST = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
 		PUT = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
 		DELETE = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN}

APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/server/model/Privacy.java

@@ -25,7 +25,7 @@
  */
 @MethodAccess(
 		GET = {},
-		POST_GET = {OWNER, ADMIN},
+		GETS = {OWNER, ADMIN},
 		POST = {UNKNOWN, ADMIN},
 		DELETE = {ADMIN}
 		)

APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/server/model/Verify.java

@@ -27,7 +27,7 @@
 /**验证码
  * @author Lemon
  * @see
- * <br >POST_GET:post_get/authCode<pre>
+ * <br >GETS:gets/authCode<pre>
 {
     "Verify":{
         "disallow":"id"
@@ -46,8 +46,8 @@
 @MethodAccess(
 		GET = {},
 		HEAD = {},
-		POST_GET = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
-		POST_HEAD = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
+		GETS = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
+		HEADS = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
 		POST = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
 		PUT = {ADMIN},
 		DELETE = {ADMIN}

APIJSON-Android/APIJSON-ADT/APIJSONApp/ZBLibrary/src/zuo/biao/library/util/SettingUtil.java

@@ -237,7 +237,7 @@ public static boolean noDisturb() {
 	/**
 	 * TODO 改为你的测试服务器地址,如果有的话
 	 */
-	public static final String URL_SERVER_ADDRESS_TEST = "http://192.168.2.105:8080/";//测试服务器
+	public static final String URL_SERVER_ADDRESS_TEST = "http://192.168.0.118:8080/";//测试服务器
 
 	/**获取当前服务器地址
 	 * isHttps = false

APIJSON-Android/APIJSON-ADT/APIJSONLibrary/src/zuo/biao/apijson/MethodAccess.java

@@ -45,15 +45,15 @@
 	 */
 	RequestRole[] HEAD() default {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
 
-	/**@see {@link RequestMethod#POST_GET}
+	/**@see {@link RequestMethod#GETS}
 	 * @return 该请求方法允许的角色 default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
 	 */
-	RequestRole[] POST_GET() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
+	RequestRole[] GETS() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
 
-	/**@see {@link RequestMethod#POST_HEAD}
+	/**@see {@link RequestMethod#HEADS}
 	 * @return 该请求方法允许的角色 default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
 	 */
-	RequestRole[] POST_HEAD() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
+	RequestRole[] HEADS() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
 
 	/**@see {@link RequestMethod#POST}
 	 * @return 该请求方法允许的角色  default {LOGIN, ADMIN};

APIJSON-Android/APIJSON-ADT/APIJSONLibrary/src/zuo/biao/apijson/MethodStructure.java

@@ -30,15 +30,15 @@
 @Target(TYPE)
 public @interface MethodStructure {
 
-	/**@see {@link RequestMethod#POST_HEAD}
+	/**@see {@link RequestMethod#HEADS}
 	 * @return 该请求方法允许的结构
 	 */
-	String POST_HEAD() default "";
+	String HEADS() default "";
 
-	/**@see {@link RequestMethod#POST_GET}
+	/**@see {@link RequestMethod#GETS}
 	 * @return 该请求方法允许的结构
 	 */
-	String POST_GET() default "";
+	String GETS() default "";
 
 	/**@see {@link RequestMethod#POST}
 	 * @return 该请求方法允许的结构

APIJSON-Android/APIJSON-ADT/APIJSONLibrary/src/zuo/biao/apijson/RequestMethod.java

@@ -14,7 +14,7 @@
 
 package zuo.biao.apijson;
 
-/**请求方法，对应org.springframework.web.bind.annotation.RequestMethod，多出POST_GET,POST_HEAD方法
+/**请求方法，对应org.springframework.web.bind.annotation.RequestMethod，多出GETS,HEADS方法
  * @author Lemon
  */
 public enum RequestMethod {
@@ -29,15 +29,15 @@ public enum RequestMethod {
 	 */
 	HEAD,
 
-	/**TODO 改为GETS
-	 * 通过POST来GET数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
+	/**Safe, Single, Simple
+	 * <br > 限制性GET，通过POST来GET数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
 	 */
-	POST_GET,
+	GETS,
 
-	/**TODO 改为HEADS
-	 * 通过POST来HEAD数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
+	/**Safe, Single, Simple
+	 * <br > 限制性HEAD，通过POST来HEAD数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
 	 */
-	POST_HEAD,
+	HEADS,
 
 	/**
 	 * 新增(或者说插入)数据
@@ -57,22 +57,22 @@ public enum RequestMethod {
 
 	/**是否为GET请求方法
 	 * @param method
-	 * @param containPrivate 包含私密(非明文)获取方法POST_GET
+	 * @param containPrivate 包含私密(非明文)获取方法GETS
 	 * @return
 	 */
 	public static boolean isGetMethod(RequestMethod method, boolean containPrivate) {
 		boolean is = method == null || method == GET;
-		return containPrivate == false ? is : is || method == POST_GET;
+		return containPrivate == false ? is : is || method == GETS;
 	}
 
 	/**是否为HEAD请求方法
 	 * @param method
-	 * @param containPrivate 包含私密(非明文)获取方法POST_HEAD
+	 * @param containPrivate 包含私密(非明文)获取方法HEADS
 	 * @return
 	 */
 	public static boolean isHeadMethod(RequestMethod method, boolean containPrivate) {
 		boolean is = method == HEAD;
-		return containPrivate == false ? is : is || method == POST_HEAD;
+		return containPrivate == false ? is : is || method == HEADS;
 	}
 
 	/**是否为查询的请求方法

APIJSON-Android/APIJSON-ADT/APIJSONTest/src/apijson/demo/model/Privacy.java

@@ -25,7 +25,7 @@
  */
 @MethodAccess(
 		GET = {},
-		POST_GET = {OWNER, ADMIN},
+		GETS = {OWNER, ADMIN},
 		POST = {UNKNOWN, ADMIN},
 		DELETE = {ADMIN}
 		)

APIJSON-Android/APIJSON-ADT/APIJSONTest/src/apijson/demo/ui/RequestActivity.java

@@ -229,9 +229,9 @@ public void onHttpResponse(int requestCode, final String resultJson, final Excep
 			Log.d(TAG, "onHttpResponse  delete.equals(method) >>  id = " + id
 					+ "; isSucceed = " + JSONResponse.isSuccess(response));
 
-		} else if ("post_get".equals(method)) {
+		} else if ("gets".equals(method)) {
 			Privacy privacy = response.getObject(Privacy.class);
-			Log.d(TAG, "onHttpResponse  post_get.equals(method) >>  privacy = \n" + JSON.toJSONString(privacy));
+			Log.d(TAG, "onHttpResponse  gets.equals(method) >>  privacy = \n" + JSON.toJSONString(privacy));
 		}