Server：优化注释，登录密码apijson123改为apijson；Client：调整获取Wallet的请求

TommyLemon · TommyLemon · commit f8b72890dcf7 · 2017-03-01T11:43:18.000+08:00
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/layout/query_activity.xml b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/layout/query_activity.xml
@@ -43,7 +43,7 @@
 
         <Button
             android:id="@+id/btnQueryQuery"
-            android:layout_width="90dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="Query" />
     </LinearLayout>
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/RequestUtil.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/RequestUtil.java
@@ -96,15 +96,15 @@ public static JSONObject newComplexRequest() {
 	}
 
 	public static JSONObject newAccessErrorRequest(long id) {
-		return new JSONRequest(new Wallet().setUserId(id <= 0 ? 38710 : id));
+		return new JSONRequest(new Wallet().setUserId(id <= 0 ? 38710 : id)).setTag(Wallet.class.getSimpleName());
 	}
 
 	public static JSONObject newAccessPermittedRequest(long id) {
 		JSONRequest request = new JSONRequest();
 		request.put(new Wallet().setUserId(id <= 0 ? 38710 : id));
 		request.put("currentUserId", 38710);
-		request.put("payPassword", "123456");
-		return request;
+		request.put("loginPassword", "apijson");
+		return request.setTag(Wallet.class.getSimpleName());
 	}
 
 }
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/QueryActivity.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/QueryActivity.java
@@ -88,8 +88,8 @@ public static Intent createIntent(Context context, int type, String url, long id
 	public static final int TYPE_RELY = 12;
 	public static final int TYPE_ARRAY = 13;
 	public static final int TYPE_COMPLEX = 14;
-	public static final int TYPE_ACCESS_ERROR = 15;
-	public static final int TYPE_ACCESS_PERMITTED = 16;
+	public static final int TYPE_ACCESS_ERROR = 5;
+	public static final int TYPE_ACCESS_PERMITTED = 6;
 
 
 
@@ -217,6 +217,9 @@ private String getMethod(int type) {
 			return "put";
 		case TYPE_DELETE:
 			return "delete";
+		case TYPE_ACCESS_ERROR:
+		case TYPE_ACCESS_PERMITTED:
+			return "post_get";
 		default:
 			return "get";
 		}
diff --git a/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/sql/AccessVerifier.java b/APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/sql/AccessVerifier.java
@@ -35,9 +35,12 @@ public class AccessVerifier {
 
 	private static Map<String, RequestMethod[]> accessMap;
 
+	/**初始化，建议在Applicaiton的onCreate方法中调用
+	 */
 	public static void init() {
 		accessMap = new HashMap<String, RequestMethod[]>();
 		accessMap.put("User", RequestMethod.values());
+		accessMap.put("Work", RequestMethod.values());
 		accessMap.put("Moment", RequestMethod.values());
 		accessMap.put("Comment", RequestMethod.values());
 		accessMap.put("Wallet", new RequestMethod[]{POST_GET, POST, PUT, DELETE});
@@ -184,7 +187,7 @@ public static int getAccessId(RequestMethod method, String table) {
 	 */
 	public static String getLoginPassword(long userId) {
 		// TODO 查询并返回对应userId的登录密码
-		return "apijson123";//仅测试用
+		return "apijson";//仅测试用
 	}
 
 	/**获取支付密码

Original file line number	Diff line number	Diff line change
`@@ -96,15 +96,15 @@ public static JSONObject newComplexRequest() {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public static JSONObject newAccessErrorRequest(long id) {`
`99`		`- return new JSONRequest(new Wallet().setUserId(id <= 0 ? 38710 : id));`
	`99`	`+ return new JSONRequest(new Wallet().setUserId(id <= 0 ? 38710 : id)).setTag(Wallet.class.getSimpleName());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public static JSONObject newAccessPermittedRequest(long id) {`
`103`	`103`	`JSONRequest request = new JSONRequest();`
`104`	`104`	`request.put(new Wallet().setUserId(id <= 0 ? 38710 : id));`
`105`	`105`	`request.put("currentUserId", 38710);`
`106`		`- request.put("payPassword", "123456");`
`107`		`- return request;`
	`106`	`+ request.put("loginPassword", "apijson");`
	`107`	`+ return request.setTag(Wallet.class.getSimpleName());`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`}`