Skip to content

Commit 61883bc

Browse files
committed
优化 Response JSON 中的 debug:info|help, trace:stack 等调试字段及相关提示语
1 parent 8740bed commit 61883bc

File tree

2 files changed

+145
-64
lines changed

2 files changed

+145
-64
lines changed

APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,10 @@ else if (method == PUT && value instanceof JSONArray && (whereList == null || wh
288288
try {
289289
String db = sqlConfig.getDatabase();
290290
if (db == null) {
291-
if (sqlConfig.isPostgreSQL()) {
291+
if (sqlConfig.isMySQL()) {
292+
db = SQLConfig.DATABASE_MYSQL;
293+
}
294+
else if (sqlConfig.isPostgreSQL()) {
292295
db = SQLConfig.DATABASE_POSTGRESQL;
293296
}
294297
else if (sqlConfig.isSQLServer()) {
@@ -304,18 +307,18 @@ else if (sqlConfig.isClickHouse()) {
304307
db = SQLConfig.DATABASE_CLICKHOUSE;
305308
}
306309
else {
307-
db = SQLConfig.DATABASE_MYSQL;
310+
db = AbstractSQLConfig.DEFAULT_DATABASE;
308311
}
309312
}
310313

311314
Class<? extends Exception> clazz = e.getClass();
312315
e = clazz.getConstructor(String.class).newInstance(
313316
e.getMessage()
314-
+ " " + Log.KEY_SYSTEM_INFO_DIVIDER + " \n**环境信息** "
315-
+ "\n系统: " + System.getProperty("os.name") + " " + System.getProperty("os.version")
316-
+ "\n数据库: " + db + " " + sqlConfig.getDBVersion()
317-
+ "\nJDK: " + System.getProperty("java.version") + " " + System.getProperty("os.arch")
318-
+ "\nAPIJSON: " + Log.VERSION
317+
+ " " + Log.KEY_SYSTEM_INFO_DIVIDER + " \n **环境信息** "
318+
+ " \n 系统: " + System.getProperty("os.name") + " " + System.getProperty("os.version")
319+
+ " \n 数据库: " + db + " " + sqlConfig.getDBVersion()
320+
+ " \n JDK: " + System.getProperty("java.version") + " " + System.getProperty("os.arch")
321+
+ " \n APIJSON: " + Log.VERSION
319322
);
320323
} catch (Throwable e2) {}
321324
}

0 commit comments

Comments
 (0)