Server: login接口新增defaults:{}，为每个请求JSON最外层新增默认字段

TommyLemon · TommyLemon · commit 493faa23b7b9 · 2019-02-17T12:49:32.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/Controller.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/Controller.java
@@ -360,6 +360,7 @@ private zuo.biao.apijson.JSONRequest newVerifyRequest(int type, String phone, St
 
 	public static final String LOGIN = "login";
 	public static final String REMEMBER = "remember";
+	public static final String DEFAULTS = "defaults";
 
 	public static final int LOGIN_TYPE_PASSWORD = 0;//密码登录
 	public static final int LOGIN_TYPE_VERIFY = 1;//验证码登录
@@ -382,9 +383,10 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
 		boolean isPassword;
 		String phone;
 		String password;
-		boolean remember;
 		int version;
 		Boolean format;
+		boolean remember;
+		JSONObject defaults;
 		try {
 			requestObject = DemoParser.parseRequest(request);
 
@@ -406,12 +408,14 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
 				}
 			}
 
-			remember = requestObject.getBooleanValue(REMEMBER);
 			version = requestObject.getIntValue(VERSION);
 			format = requestObject.getBoolean(FORMAT);
-			requestObject.remove(REMEMBER);
+			remember = requestObject.getBooleanValue(REMEMBER);
+			defaults = requestObject.getJSONObject(DEFAULTS); //默认加到每个请求最外层的字段
 			requestObject.remove(VERSION);
 			requestObject.remove(FORMAT);
+			requestObject.remove(REMEMBER);
+			requestObject.remove(DEFAULTS);
 		} catch (Exception e) {
 			return DemoParser.extendErrorResult(requestObject, e);
 		}
@@ -479,12 +483,14 @@ 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(REMEMBER, remember); //记住登录
 		session.setAttribute(VERSION, version); //全局默认版本号
 		session.setAttribute(FORMAT, format); //全局默认格式化配置
+		session.setAttribute(REMEMBER, remember); //是否记住登录
+		session.setAttribute(DEFAULTS, defaults); //给每个请求JSON最外层加的字段
 		session.setMaxInactiveInterval(60*60*24*(remember ? 7 : 1)); //设置session过期时间
 
 		response.put(REMEMBER, remember);
+		response.put(DEFAULTS, defaults);
 		return response;
 	}
 
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoParser.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoParser.java
@@ -14,6 +14,9 @@
 
 package apijson.demo.server;
 
+import java.util.Map;
+import java.util.Set;
+
 import javax.servlet.http.HttpSession;
 
 import com.alibaba.fastjson.JSONObject;
@@ -67,8 +70,22 @@ public DemoSQLExecutor createSQLExecutor() {
 	@Override
 	public JSONObject parseResponse(JSONObject request) {
 		//补充format
-		if (session != null && request != null && request.get(JSONRequest.KEY_FORMAT) == null) {
-			request.put(JSONRequest.KEY_FORMAT, session.getAttribute(JSONRequest.KEY_FORMAT));
+		if (session != null && request != null) {
+			if (request.get(JSONRequest.KEY_FORMAT) == null) {
+				request.put(JSONRequest.KEY_FORMAT, session.getAttribute(JSONRequest.KEY_FORMAT));
+			}
+			if (request.get(Controller.DEFAULTS) == null) {
+				JSONObject defaults = (JSONObject) session.getAttribute(Controller.DEFAULTS);
+				Set<Map.Entry<String, Object>> set = defaults == null ? null : defaults.entrySet();
+
+				if (set != null) {
+					for (Map.Entry<String, Object> e : set) {
+						if (e != null && request.get(e.getKey()) == null) {
+							request.put(e.getKey(), e.getValue());
+						}
+					}
+				}
+			}
 		}
 		return super.parseResponse(request);
 	}
