Server:新增登录时上传全局版本号

TommyLemon · TommyLemon · commit 20464b2e3cd6 · 2017-10-29T21:04:53.000+08:00
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/Controller.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/Controller.java
@@ -211,6 +211,7 @@ public String open_head(@PathVariable String request, HttpSession session) {
 		VERIFY_ = Verify.class.getSimpleName();
 	}
 
+	public static final String VERSION = JSONRequest.KEY_VERSION;
 	public static final String COUNT = JSONResponse.KEY_COUNT;
 	public static final String TOTAL = JSONResponse.KEY_TOTAL;
 
@@ -232,6 +233,7 @@ public String open_head(@PathVariable String request, HttpSession session) {
 	public static final String TYPE = "type";
 	public static final String WAY = "way";
 	public static final String CONTENT = "content";
+	
 
 
 
@@ -400,9 +402,10 @@ private JSONObject newVerifyRequest(int type, String phone, String verify) {
 	 * @see
 	 * <pre>
 		{
-			"type": 0,
+			"type": 0,  //登录方式，非必须  0-密码 2-验证码
 			"phone": "13000082001",
-			"password": "1234567"
+			"password": "1234567",
+			"version": 1 //全局版本号，非必须
 		}
 	 * </pre>
 	 */
@@ -412,6 +415,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
 		boolean isPassword;
 		String phone;
 		String password;
+		int version;
 		try {
 			requestObject = Parser.parseRequest(request, POST);
 
@@ -432,6 +436,8 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
 					throw new IllegalArgumentException("验证码不合法！");
 				}
 			}
+			
+			version = requestObject.getIntValue(VERSION);
 		} catch (Exception e) {
 			return Parser.extendErrorResult(requestObject, e);
 		}
@@ -499,6 +505,7 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
 		session.setAttribute(TYPE, isPassword ? LOGIN_TYPE_PASSWORD : LOGIN_TYPE_VERIFY);//登录方式
 		session.setAttribute(USER_, user);//用户
 		session.setAttribute(PRIVACY_, privacy);//用户隐私信息
+		session.setAttribute(VERSION, version);//用户隐私信息
 		//		session.setMaxInactiveInterval(1*60);//设置session过期时间
 
 		return response;
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/Parser.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/Parser.java
@@ -30,6 +30,7 @@
 import com.alibaba.fastjson.JSONObject;
 
 import apijson.demo.server.Verifier;
+import apijson.demo.server.model.BaseModel;
 import apijson.demo.server.model.User;
 import zuo.biao.apijson.JSON;
 import zuo.biao.apijson.JSONResponse;
@@ -172,6 +173,11 @@ public JSONObject parseResponse(JSONObject request) {
 				//					Verifier.verifyLogin(session);
 				//				}
 				if (noVerifyRequest == false) {
+					//补充全局缺省版本号
+					if (requestObject.getIntValue(JSONRequest.KEY_VERSION) <= 0) {
+						requestObject.put(JSONRequest.KEY_VERSION, session.getAttribute(JSONRequest.KEY_VERSION));
+					}
+					
 					requestObject = getCorrectRequest(requestMethod, requestObject);
 				}
 			} catch (Exception e) {
