Visitar URL original
Server:同步eclipse版至idea版；Client:同步adt版至studio版 · oasis2008/APIJSON@0b24099 · GitHub
Skip to content

Commit 0b24099

Browse files
TommyLemonTommyLemon
committed
Server:同步eclipse版至idea版；Client:同步adt版至studio版
1 parent 4f476e6 commit 0b24099

26 files changed

Lines changed: 188 additions & 176 deletions

File tree

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/APIJSONLibrary/src/main/java/zuo/biao/apijson/MethodAccess.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
package zuo.biao.apijson;
1616

17-
import java.lang.annotation.Documented;
18-
import java.lang.annotation.Retention;
19-
import java.lang.annotation.Target;
20-
2117
import static java.lang.annotation.ElementType.TYPE;
2218
import static java.lang.annotation.RetentionPolicy.RUNTIME;
2319
import static zuo.biao.apijson.RequestRole.ADMIN;
@@ -27,33 +23,37 @@
2723
import static zuo.biao.apijson.RequestRole.OWNER;
2824
import static zuo.biao.apijson.RequestRole.UNKNOWN;
2925

26+
import java.lang.annotation.Documented;
27+
import java.lang.annotation.Retention;
28+
import java.lang.annotation.Target;
29+
3030
/**请求方法权限，只允许某些角色通过对应方法访问
3131
* @author Lemon
3232
*/
3333
@Documented
3434
@Retention(RUNTIME)
3535
@Target(TYPE)
3636
public @interface MethodAccess {
37-
37+
3838
/**@see {@link RequestMethod#GET}
3939
* @return 该请求方法允许的角色 default {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
4040
*/
4141
RequestRole[] GET() default {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
42-
42+
4343
/**@see {@link RequestMethod#HEAD}
4444
* @return 该请求方法允许的角色 default {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
4545
*/
4646
RequestRole[] HEAD() default {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
47-
48-
/**@see {@link RequestMethod#POST_GET}
47+
48+
/**@see {@link RequestMethod#GETS}
4949
* @return 该请求方法允许的角色 default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5050
*/
51-
RequestRole[] POST_GET() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
52-
53-
/**@see {@link RequestMethod#POST_HEAD}
51+
RequestRole[] GETS() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
52+
53+
/**@see {@link RequestMethod#HEADS}
5454
* @return 该请求方法允许的角色 default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5555
*/
56-
RequestRole[] POST_HEAD() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
56+
RequestRole[] HEADS() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5757

5858
/**@see {@link RequestMethod#POST}
5959
* @return 该请求方法允许的角色 default {LOGIN, ADMIN};
@@ -64,10 +64,10 @@
6464
* @return 该请求方法允许的角色 default {OWNER, ADMIN};
6565
*/
6666
RequestRole[] PUT() default {OWNER, ADMIN};
67-
67+
6868
/**@see {@link RequestMethod#DELETE}
6969
* @return 该请求方法允许的角色 default {OWNER, ADMIN};
7070
*/
7171
RequestRole[] DELETE() default {OWNER, ADMIN};
72-
72+
7373
}

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/APIJSONLibrary/src/main/java/zuo/biao/apijson/MethodStructure.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
@Target(TYPE)
3131
public @interface MethodStructure {
3232

33-
/**@see {@link RequestMethod#POST_HEAD}
33+
/**@see {@link RequestMethod#HEADS}
3434
* @return 该请求方法允许的结构
3535
*/
36-
String POST_HEAD() default "";
36+
String HEADS() default "";
3737

38-
/**@see {@link RequestMethod#POST_GET}
38+
/**@see {@link RequestMethod#GETS}
3939
* @return 该请求方法允许的结构
4040
*/
41-
String POST_GET() default "";
41+
String GETS() default "";
4242

4343
/**@see {@link RequestMethod#POST}
4444
* @return 该请求方法允许的结构

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/APIJSONLibrary/src/main/java/zuo/biao/apijson/RequestMethod.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package zuo.biao.apijson;
1616

17-
/**请求方法，对应org.springframework.web.bind.annotation.RequestMethod，多出POST_GET,POST_HEAD方法
17+
/**请求方法，对应org.springframework.web.bind.annotation.RequestMethod，多出GETS,HEADS方法
1818
* @author Lemon
1919
*/
2020
public enum RequestMethod {
@@ -29,15 +29,15 @@ public enum RequestMethod {
2929
*/
3030
HEAD,
3131

32-
/**TODO 改为GETS
33-
* 通过POST来GET数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
32+
/**Safe, Single, Simple
33+
* <br > 限制性GET，通过POST来GET数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
3434
*/
35-
POST_GET,
35+
GETS,
3636

37-
/**TODO 改为HEADS
38-
* 通过POST来HEAD数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
37+
/**Safe, Single, Simple
38+
* <br > 限制性HEAD，通过POST来HEAD数据，不显示请求内容和返回结果，并且校验请求，一般用于对安全要求比较高的请求
3939
*/
40-
POST_HEAD,
40+
HEADS,
4141

4242
/**
4343
* 新增(或者说插入)数据
@@ -57,22 +57,22 @@ public enum RequestMethod {
5757

5858
/**是否为GET请求方法
5959
* @param method
60-
* @param containPrivate 包含私密(非明文)获取方法POST_GET
60+
* @param containPrivate 包含私密(非明文)获取方法GETS
6161
* @return
6262
*/
6363
public static boolean isGetMethod(RequestMethod method, boolean containPrivate) {
6464
boolean is = method == null || method == GET;
65-
return containPrivate == false ? is : is || method == POST_GET;
65+
return containPrivate == false ? is : is || method == GETS;
6666
}
6767

6868
/**是否为HEAD请求方法
6969
* @param method
70-
* @param containPrivate 包含私密(非明文)获取方法POST_HEAD
70+
* @param containPrivate 包含私密(非明文)获取方法HEADS
7171
* @return
7272
*/
7373
public static boolean isHeadMethod(RequestMethod method, boolean containPrivate) {
7474
boolean is = method == HEAD;
75-
return containPrivate == false ? is : is || method == POST_HEAD;
75+
return containPrivate == false ? is : is || method == HEADS;
7676
}
7777

7878
/**是否为查询的请求方法

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/ZBLibrary/src/main/java/zuo/biao/library/util/SettingUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public static boolean noDisturb() {
237237
/**
238238
* TODO 改为你的测试服务器地址,如果有的话
239239
*/
240-
public static final String URL_SERVER_ADDRESS_TEST = "http://192.168.2.105:8080/";//测试服务器
240+
public static final String URL_SERVER_ADDRESS_TEST = "http://192.168.0.118:8080/";//测试服务器
241241

242242
/**获取当前服务器地址
243243
* isHttps = false

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/app/src/main/java/apijson/demo/client/util/HttpRequest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public class HttpRequest {
5454
public static final String URL_HEAD = URL_BASE + "head/";
5555
public static final String URL_GET = URL_BASE + "get/";
5656
public static final String URL_POST = URL_BASE + "post/";
57-
public static final String URL_POST_HEAD = URL_BASE + "post_head/";
58-
public static final String URL_POST_GET = URL_BASE + "post_get/";
57+
public static final String URL_HEADS = URL_BASE + "heads/";
58+
public static final String URL_GETS = URL_BASE + "gets/";
5959
public static final String URL_PUT = URL_BASE + "put/";
6060
public static final String URL_DELETE = URL_BASE + "delete/";
6161

@@ -91,7 +91,7 @@ public static void post(JSONObject request, int requestCode, OnHttpResponseListe
9191
* @must request最外层有tag，部分请求还要currentUserId和对应的password
9292
*/
9393
public static void postHead(JSONObject request, int requestCode, OnHttpResponseListener listener) {
94-
HttpManager.getInstance().post(URL_POST_HEAD, request, requestCode, listener);
94+
HttpManager.getInstance().post(URL_HEADS, request, requestCode, listener);
9595
}
9696
/**用POST方法GET数据，request和response都非明文，浏览器看不到，用于对安全性要求高的GET请求
9797
* @param request
@@ -100,7 +100,7 @@ public static void postHead(JSONObject request, int requestCode, OnHttpResponseL
100100
* @must request最外层有tag，部分请求还要currentUserId和对应的password
101101
*/
102102
public static void postGet(JSONObject request, int requestCode, OnHttpResponseListener listener) {
103-
HttpManager.getInstance().post(URL_POST_GET, request, requestCode, listener);
103+
HttpManager.getInstance().post(URL_GETS, request, requestCode, listener);
104104
}
105105
/**
106106
* @param request
@@ -301,7 +301,7 @@ public static void checkVerify(String phone, String verify, int requestCode, OnH
301301
request.put(PHONE, phone);
302302
request.put(VERIFY, verify);
303303

304-
HttpManager.getInstance().post(URL_BASE + "post_head/verify"
304+
HttpManager.getInstance().post(URL_BASE + "heads/verify"
305305
, request.setTag(VERIFY_)
306306
, requestCode, listener);
307307
}

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/app/src/main/java/apijson/demo/server/model/Login.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**登录类，已用session替代
2626
* @author Lemon
2727
* @see
28-
* <br >POST_HEAD:<pre>
28+
* <br >HEADS:<pre>
2929
{
3030
"Login":{
3131
"disallow":"!",
@@ -56,8 +56,8 @@
5656
@Deprecated
5757
@SuppressWarnings("serial")
5858
@MethodAccess(
59-
POST_GET = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
60-
POST_HEAD = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
59+
GETS = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
60+
HEADS = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
6161
POST = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
6262
PUT = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN},
6363
DELETE = {UNKNOWN, LOGIN, CONTACT, OWNER, ADMIN}

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/app/src/main/java/apijson/demo/server/model/Privacy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
@MethodAccess(
2727
GET = {},
28-
POST_GET = {OWNER, ADMIN},
28+
GETS = {OWNER, ADMIN},
2929
POST = {UNKNOWN, ADMIN},
3030
DELETE = {ADMIN}
3131
)

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONApp/app/src/main/java/apijson/demo/server/model/Verify.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/**验证码
2828
* @author Lemon
2929
* @see
30-
* <br >POST_GET:post_get/authCode<pre>
30+
* <br >GETS:gets/authCode<pre>
3131
{
3232
"Verify":{
3333
"disallow":"id"
@@ -46,8 +46,8 @@
4646
@MethodAccess(
4747
GET = {},
4848
HEAD = {},
49-
POST_GET = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
50-
POST_HEAD = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
49+
GETS = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
50+
HEADS = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
5151
POST = {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN},
5252
PUT = {ADMIN},
5353
DELETE = {ADMIN}

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONTest/APIJSONLibrary/src/main/java/zuo/biao/apijson/MethodAccess.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
*/
4646
RequestRole[] HEAD() default {UNKNOWN, LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
4747

48-
/**@see {@link RequestMethod#POST_GET}
48+
/**@see {@link RequestMethod#GETS}
4949
* @return 该请求方法允许的角色 default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5050
*/
51-
RequestRole[] POST_GET() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
51+
RequestRole[] GETS() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5252

53-
/**@see {@link RequestMethod#POST_HEAD}
53+
/**@see {@link RequestMethod#HEADS}
5454
* @return 该请求方法允许的角色 default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5555
*/
56-
RequestRole[] POST_HEAD() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
56+
RequestRole[] HEADS() default {LOGIN, CONTACT, CIRCLE, OWNER, ADMIN};
5757

5858
/**@see {@link RequestMethod#POST}
5959
* @return 该请求方法允许的角色 default {LOGIN, ADMIN};

‎APIJSON-Android/APIJSON-AndroidStudio/APIJSONTest/APIJSONLibrary/src/main/java/zuo/biao/apijson/MethodStructure.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
@Target(TYPE)
3131
public @interface MethodStructure {
3232

33-
/**@see {@link RequestMethod#POST_HEAD}
33+
/**@see {@link RequestMethod#HEADS}
3434
* @return 该请求方法允许的结构
3535
*/
36-
String POST_HEAD() default "";
36+
String HEADS() default "";
3737

38-
/**@see {@link RequestMethod#POST_GET}
38+
/**@see {@link RequestMethod#GETS}
3939
* @return 该请求方法允许的结构
4040
*/
41-
String POST_GET() default "";
41+
String GETS() default "";
4242

4343
/**@see {@link RequestMethod#POST}
4444
* @return 该请求方法允许的结构

0 commit comments

Comments
 (0)