githubzoujiayun
diff --git a/‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Password.java‎
Lines changed: 10 additions & 16 deletions b/‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Password.java‎
Lines changed: 10 additions & 16 deletions
diff --git a/‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Wallet.java‎
Lines changed: 12 additions & 16 deletions b/‎APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/apijson/demo/server/model/Wallet.java‎
Lines changed: 12 additions & 16 deletions
@@ -26,15 +26,15 @@
 {
  "Password":{
      "disallow":"!",
-     "necessary":"id,model"
+     "necessary":"id,type"
  }
 }
  * </pre>
  * <br >PUT:put/loginPassword, put/payPassword<pre>
 {
     "Password":{
         "disallow":"!",
-        "necessary":"id,password"
+        "necessary":"id,type,password"
     },
     "necessary":"oldPassword"
 }
@@ -43,25 +43,26 @@
 @SuppressWarnings("serial")
 @APIJSONRequest(
 		method = {RequestMethod.POST_HEAD, RequestMethod.PUT},
-		POST_HEAD = "{\"disallow\": \"!\", \"necessary\": \"id,model\"}",
-		PUT = "{\"Password\": {\"disallow\": \"!\", \"necessary\": \"id,password\"}, \"necessary\": \"oldPassword\"}"
+		POST_HEAD = "{\"disallow\": \"!\", \"necessary\": \"id,type\"}",
+		PUT = "{\"Password\": {\"disallow\": \"!\", \"necessary\": \"id,type,password\"}, \"necessary\": \"oldPassword\"}"
 		)
 public class Password extends BaseModel {
 
-	private String model;//table是MySQL关键字不能用！
+	public static final int TYPE_LOGIN = 0;
+	public static final int TYPE_PAY = 1;
+	
 	private Integer type;
 	private String password;
 
 	public Password() {
 		super();
 	}
-	public Password(String model, String phone) {
+	public Password(String phone) {
 		this();
-		setModel(model);
 		setPhone(phone);
 	}
-	public Password(String model, String phone, String password) {
-		this(model, phone);
+	public Password(String phone, String password) {
+		this(phone);
 		setPassword(password);
 	}
 
@@ -70,13 +71,6 @@ public Password setPhone(String phone) {
 		return this;
 	}
 
-	public String getModel() {
-		return StringUtil.isNotEmpty(model, true) ? model : "User";
-	}
-	public Password setModel(String model) {
-		this.model = model;
-		return this;
-	}
 	public Integer getType() {
 		return type;
 	}
 
@@ -27,15 +27,15 @@
 {
     "Wallet":{
         "disallow":"!",
-        "necessary":"userId"
+        "necessary":"id"
     }
 }
  * </pre>
  * <br >POST:post/wallet<pre>
 {
     "Wallet":{
         "disallow":"!",
-        "necessary":"userId"
+        "necessary":"id"
     },
     "necessary":"payPassword"
 }
@@ -44,35 +44,33 @@
 {
     "Wallet":{
         "disallow":"!",
-        "necessary":"userId,balance+"
+        "necessary":"id,balance+"
     },
-    "necessary":"payPassword,oldPassword"
+    "necessary":"payPassword"
 }
  * </pre>
  * <br >DELETE:delete/wallet<pre>
 {
     "Wallet":{
         "disallow":"!",
-        "necessary":"userId"
+        "necessary":"id"
     },
     "necessary":"payPassword"
 }
  * </pre>
  */
 @APIJSONRequest(
 		method = {RequestMethod.POST_GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE},
-		POST_GET = "{\"disallow\": \"!\", \"necessary\": \"userId\"}",
-		POST = "{\"Wallet\": {\"disallow\": \"!\", \"necessary\": \"userId\"}, \"necessary\": \"payPassword\"}",
-		PUT = "{\"Wallet\": {\"disallow\": \"!\", \"necessary\": \"userId,balance+\"}, \"necessary\": \"payPassword,oldPassword\"}",
-		DELETE = "{\"Wallet\": {\"disallow\": \"!\", \"necessary\": \"userId\"}, \"necessary\": \"payPassword\"}"
+		POST_GET = "{\"disallow\": \"!\", \"necessary\": \"id\"}",
+		POST = "{\"Wallet\": {\"disallow\": \"!\", \"necessary\": \"id\"}, \"necessary\": \"payPassword\"}",
+		PUT = "{\"Wallet\": {\"disallow\": \"!\", \"necessary\": \"id,balance+\"}, \"necessary\": \"payPassword\"}",
+		DELETE = "{\"Wallet\": {\"disallow\": \"!\", \"necessary\": \"id\"}, \"necessary\": \"payPassword\"}"
 		)
 public class Wallet extends BaseModel {
 	private static final long serialVersionUID = 4298571449155754300L;
 
 	public BigDecimal balance;
 
-	private Long userId;
-
 	/**默认构造方法，JSON等解析时必须要有
 	 */
 	public Wallet() {
@@ -83,11 +81,9 @@ public Wallet(long id) {
 		setId(id);
 	}
 
-	public Long getUserId() {
-		return userId;
-	}
-	public Wallet setUserId(Long userId) {
-		this.userId = userId;
+
+	public Wallet setUserId(long userId) {
+		setId(userId);
 		return this;
 	}