Server:解决login接口在数据库异常时返回结果缺少必要信息；删除Verifier.removeAccessInfo

TommyLemon · TommyLemon · commit 70b2283828de · 2018-12-23T03:53:20.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/Controller.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/Controller.java
@@ -424,10 +424,10 @@ public JSONObject login(@RequestBody String request, HttpSession session) {
 						new Privacy().setPhone(phone)
 						)
 				);
-		JSONResponse response = new JSONResponse(phoneResponse).getJSONResponse(PRIVACY_);
-		if (JSONResponse.isSuccess(response) == false) {
-			return response;
+		if (JSONResponse.isSuccess(phoneResponse) == false) {
+			return DemoParser.newResult(phoneResponse.getIntValue(JSONResponse.KEY_CODE), phoneResponse.getString(JSONResponse.KEY_MSG));
 		}
+		JSONResponse response = new JSONResponse(phoneResponse).getJSONResponse(PRIVACY_);
 		if(JSONResponse.isExist(response) == false) {
 			return DemoParser.newErrorResult(new NotExistException("手机号未注册"));
 		}
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoVerifier.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoVerifier.java
@@ -115,13 +115,5 @@ public static long value(Long v) {
 		return v == null ? 0 : v;
 	}
 
-	/**删除请求里的权限信息
-	 * @param requestObject
-	 * @return
-	 */
-	@Deprecated
-	public JSONObject removeAccessInfo(JSONObject requestObject) {
-		return requestObject;
-	}
 
 }
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -297,7 +297,6 @@ public JSONObject parseResponse(JSONObject request) {
 		sqlExecutor = null;
 
 
-		requestObject = verifier.removeAccessInfo(requestObject);
 		requestObject = error == null ? extendSuccessResult(requestObject) : extendErrorResult(requestObject, error);
 
 
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractVerifier.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractVerifier.java
@@ -358,6 +358,5 @@ public void verifyRepeat(String table, String key, Object value, long exceptId)
 			throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");
 		}
 	}
-
-
+	
 }
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Verifier.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Verifier.java
@@ -74,8 +74,6 @@ public interface Verifier<T> {
 	void verifyRepeat(String table, String key, Object value, long exceptId) throws Exception;
 	
 
-	JSONObject removeAccessInfo(JSONObject request);
-	
 	@NotNull
 	Parser<T> createParser();
 	

Original file line number	Diff line number	Diff line change
`@@ -424,10 +424,10 @@ public JSONObject login(@RequestBody String request, HttpSession session) {`
`424`	`424`	`new Privacy().setPhone(phone)`
`425`	`425`	`)`
`426`	`426`	`);`
`427`		`- JSONResponse response = new JSONResponse(phoneResponse).getJSONResponse(PRIVACY_);`
`428`		`- if (JSONResponse.isSuccess(response) == false) {`
`429`		`- return response;`
	`427`	`+ if (JSONResponse.isSuccess(phoneResponse) == false) {`
	`428`	`+ return DemoParser.newResult(phoneResponse.getIntValue(JSONResponse.KEY_CODE), phoneResponse.getString(JSONResponse.KEY_MSG));`
`430`	`429`	`}`
	`430`	`+ JSONResponse response = new JSONResponse(phoneResponse).getJSONResponse(PRIVACY_);`
`431`	`431`	`if(JSONResponse.isExist(response) == false) {`
`432`	`432`	`return DemoParser.newErrorResult(new NotExistException("手机号未注册"));`
`433`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,5 @@ public static long value(Long v) {`
`115`	`115`	`return v == null ? 0 : v;`
`116`	`116`	`}`
`117`	`117`
`118`		`- /**删除请求里的权限信息`
`119`		`- * @param requestObject`
`120`		`- * @return`
`121`		`- */`
`122`		`- @Deprecated`
`123`		`- public JSONObject removeAccessInfo(JSONObject requestObject) {`
`124`		`- return requestObject;`
`125`		`- }`
`126`	`118`
`127`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,6 @@ public JSONObject parseResponse(JSONObject request) {`
`297`	`297`	`sqlExecutor = null;`
`298`	`298`
`299`	`299`
`300`		`- requestObject = verifier.removeAccessInfo(requestObject);`
`301`	`300`	`requestObject = error == null ? extendSuccessResult(requestObject) : extendErrorResult(requestObject, error);`
`302`	`301`
`303`	`302`
Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,5 @@ public void verifyRepeat(String table, String key, Object value, long exceptId)`
`358`	`358`	`throw new ConflictException(key + ": " + value + " 已经存在，不能重复！");`
`359`	`359`	`}`
`360`	`360`	`}`
`361`		`-`
`362`		`-`
	`361`	`+`
`363`	`362`	`}`