ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ShowSqlGlobal

Browse Source
This commit is contained in:
Holy 2023-08-05 08:27:26 +08:00
parent 9a82679dd9
commit 18b540eba6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hutool-db/src/main/java/org/dromara/hutool/db/DbUtil.java
View File

@ -14,7 +14,6 @@ package org.dromara.hutool.db;
import org.dromara.hutool.core.convert.Convert; import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.db.ds.DSKeys; import org.dromara.hutool.db.ds.DSKeys;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.level.Level; import org.dromara.hutool.log.level.Level;
import org.dromara.hutool.setting.Setting; import org.dromara.hutool.setting.Setting;
@ -33,9 +32,9 @@ public final class DbUtil {
*/ */
public static void setShowSqlGlobal(final Setting setting) { public static void setShowSqlGlobal(final Setting setting) {
// 初始化SQL显示 // 初始化SQL显示
final boolean isShowSql = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_SQL)); final Boolean isShowSql = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_SQL));
final boolean isFormatSql = Convert.toBoolean(setting.remove(DSKeys.KEY_FORMAT_SQL)); final Boolean isFormatSql = Convert.toBoolean(setting.remove(DSKeys.KEY_FORMAT_SQL));
final boolean isShowParams = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_PARAMS)); final Boolean isShowParams = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_PARAMS));
String sqlLevelStr = setting.remove(DSKeys.KEY_SQL_LEVEL); String sqlLevelStr = setting.remove(DSKeys.KEY_SQL_LEVEL);
if (null != sqlLevelStr) { if (null != sqlLevelStr) {
sqlLevelStr = sqlLevelStr.toUpperCase(); sqlLevelStr = sqlLevelStr.toUpperCase();
@ -51,10 +50,10 @@ public final class DbUtil {
* @param isFormatSql 是否格式化显示的SQL，{@code null}表示保持默认 * @param isFormatSql 是否格式化显示的SQL，{@code null}表示保持默认
* @param isShowParams 是否打印参数，{@code null}表示保持默认 * @param isShowParams 是否打印参数，{@code null}表示保持默认
* @param level 日志级别，{@code null}表示保持默认 * @param level 日志级别，{@code null}表示保持默认
* @see GlobalDbConfig#setShowSql(boolean, boolean, boolean, Level) * @see GlobalDbConfig#setShowSql(Boolean, Boolean, Boolean, Level)
* @since 4.1.7 * @since 4.1.7
*/ */
public static void setShowSqlGlobal(final boolean isShowSql, final boolean isFormatSql, final boolean isShowParams, final Level level) { public static void setShowSqlGlobal(final Boolean isShowSql, final Boolean isFormatSql, final Boolean isShowParams, final Level level) {
GlobalDbConfig.setShowSql(isShowSql, isFormatSql, isShowParams, level); GlobalDbConfig.setShowSql(isShowSql, isFormatSql, isShowParams, level);
} }

2
hutool-db/src/main/java/org/dromara/hutool/db/GlobalDbConfig.java
View File

@ -117,7 +117,7 @@ public class GlobalDbConfig {
* @param isShowParams 是否打印参数，{@code null}表示保持默认 * @param isShowParams 是否打印参数，{@code null}表示保持默认
* @param level 日志级别，{@code null}表示保持默认 * @param level 日志级别，{@code null}表示保持默认
*/ */
public static void setShowSql(final boolean isShowSql, final boolean isFormatSql, final boolean isShowParams, final Level level) { public static void setShowSql(final Boolean isShowSql, final Boolean isFormatSql, final Boolean isShowParams, final Level level) {
SqlLog.INSTANCE.init(isShowSql, isFormatSql, isShowParams, level); SqlLog.INSTANCE.init(isShowSql, isFormatSql, isShowParams, level);
} }
} }