Server:同步eclipse版至studio版；Client:优化put User

TommyLemon · TommyLemon · commit 6a2aa0f1ca1b · 2017-03-01T12:21:32.000+08:00
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/values/strings.xml b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_name">APIJSON</string>
     <string name="app_version">1.0</string>
     <string name="demo_post">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"name\":\"Tommy\",\n&#160;&#160;&#160;&#160;&#160;&#160;\"sex\":0,\n&#160;&#160;&#160;&#160;&#160;&#160;\"phone\":\"1234567890\"\n&#160;&#160;&#160;}\n}</string>
-    <string name="demo_put">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":38710,\n&#160;&#160;&#160;&#160;&#160;&#160;\"name\":\"Lemon\",\n&#160;&#160;&#160;&#160;&#160;&#160;\"picture\":\"[\"http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000\", \"http://common.cnblogs.com/images/icon_weibo_24.png\"]\"\n&#160;&#160;&#160;}\n}</string>
+    <string name="demo_put">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":38710,\n&#160;&#160;&#160;&#160;&#160;&#160;\"name\":\"Lemon\",\n&#160;&#160;&#160;&#160;&#160;&#160;\"pictureList\":[\"http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000\", \"http://common.cnblogs.com/images/icon_weibo_24.png\"]\n&#160;&#160;&#160;}\n}</string>
     <string name="demo_delete">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":10000\n&#160;&#160;&#160;}\n}</string>
     <string name="demo_single">{\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":38710\n&#160;&#160;&#160;}\n}</string>
     <string name="demo_columns">{\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"columns\":\"id,name,phone\",\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":38710\n&#160;&#160;&#160;}\n}</string>
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/RequestUtil.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/RequestUtil.java
@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import zuo.biao.apijson.JSON;
 import zuo.biao.apijson.client.JSONObject;
 import zuo.biao.apijson.client.JSONRequest;
 import apijson.demo.model.Comment;
@@ -49,7 +48,7 @@ public static JSONObject newPutRequest(long id) {
 		List<String> list = new ArrayList<String>();
 		list.add("http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000");
 		list.add("http://common.cnblogs.com/images/icon_weibo_24.png");
-		data.setPicture(JSON.toJSONString(list));//"\"" + JSON.toJSONString(new JSONObject("{\"id\":2}")) + "\"");//
+		data.setPictureList(list);
 
 		return new JSONRequest(data).setTag(User.class.getSimpleName());
 	}
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/User.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/User.java
@@ -14,6 +14,8 @@
 
 package apijson.demo.model;
 
+import java.util.List;
+
 /**用户类
  * @author Lemon
  */
@@ -24,7 +26,7 @@ public class User extends BaseModel {
 	public String head;
 	public String name;
 	public String phone;
-	public String picture;
+	public List<String> pictureList;
 
 	/**默认构造方法，JSON等解析时必须要有
 	 */
@@ -65,20 +67,10 @@ public String getPhone() {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
-	public String getPicture() {
-		return picture;
+	public List<String> getPictureList() {
+		return pictureList;
 	}
-	public void setPicture(String picture) {
-		this.picture = picture;
+	public void setPictureList(List<String> pictureList) {
+		this.pictureList = pictureList;
 	}
-
-	////	@Override
-	////	public boolean isCorrect() {//根据自己的需求决定，也可以直接 return true
-	////		return id != null && id > 0;// && StringUtil.isNotEmpty(phone, true);
-	////	}
-	//
-	//	@Override
-	//	public JSONObject toJSONObject() {
-	//		return toJSONObject(this);
-	//	}
 }
diff --git a/APIJSON(Server)/APIJSON(Idea)/src/main/java/zuo/biao/apijson/server/sql/AccessVerifier.java b/APIJSON(Server)/APIJSON(Idea)/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";//仅测试用
 	}
 
 	/**获取支付密码
