Server: 解决已执行 SQL 数量统计错误；解决 DemoFunction 在 Function 表的 version 为 null 时测试不通过；解决 DemoFunction.getFunctionCall 参数 arguments 为 null 时拼接错误；

TommyLemon · TommyLemon · commit eff8d952cd18 · 2019-08-20T23:56:36.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoFunction.java b/APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoFunction.java
@@ -149,7 +149,7 @@ public static JSONObject init(boolean shutdownWhenServerError) throws ServerExce
 							, true
 					)
 					.setTag(item.getString(JSONRequest.KEY_TAG))
-					.setVersion(item.getInteger(JSONRequest.KEY_VERSION))
+					.setVersion(item.getIntValue(JSONRequest.KEY_VERSION))
 					.parseResponse(demo);
 
 			if (JSONResponse.isSuccess(r) == false) {
@@ -328,10 +328,10 @@ private JSONArray getChildCommentIdList(long tid) {
 	 * @return
 	 * @throws ServerException 
 	 */
-	public JSONObject getFunctionDemo(@NotNull JSONObject request) throws ServerException {
+	public JSONObject getFunctionDemo(@NotNull JSONObject request) {
 		JSONObject demo = JSON.parseObject(request.getString("demo"));
 		if (demo == null) {
-			throw new ServerException("服务器内部错误，字段 demo 的值必须为合法且非 null 的 JSONObejct 字符串！");
+			demo = new JSONObject();
 		}
 		if (demo.containsKey("result()") == false) {
 			demo.put("result()", getFunctionCall(request.getString("name"), request.getString("arguments")));
@@ -353,15 +353,15 @@ public String getFunctionDetail(@NotNull JSONObject request) {
 	 * @return
 	 */
 	private static String getFunctionCall(String name, String arguments) {
-		return name + "(" + arguments + ")";
+		return name + "(" + StringUtil.getTrimedString(arguments) + ")";
 	}
 
 	/**TODO 仅用来测试 "key-()":"getIdList()" 和 "key()":"getIdList()"
 	 * @param request
 	 * @return JSONArray 只能用JSONArray，用long[]会在SQLConfig解析崩溃
 	 * @throws Exception
 	 */
-	public JSONArray getIdList(@NotNull JSONObject request) throws Exception {
+	public JSONArray getIdList(@NotNull JSONObject request) {
 		return new JSONArray(new ArrayList<Object>(Arrays.asList(12, 15, 301, 82001, 82002, 38710)));
 	}
 
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java
@@ -195,9 +195,9 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 			switch (config.getMethod()) {
 			case HEAD:
 			case HEADS:
-				executedSQLCount ++;
-
 				rs = executeQuery(config);
+				
+				executedSQLCount ++;
 
 				result = rs.next() ? AbstractParser.newSuccessResult()
 						: AbstractParser.newErrorResult(new SQLException("数据库错误, rs.next() 失败！"));
@@ -236,9 +236,11 @@ public JSONObject execute(@NotNull SQLConfig config, boolean unknowType) throws
 					return result;
 				}
 
-				executedSQLCount ++;
-
 				rs = executeQuery(config);
+				
+				if (config.isExplain() == false) { //只有 SELECT 才能 EXPLAIN
+					executedSQLCount ++;
+				}
 				break;
 
 			default://OPTIONS, TRACE等
