admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 17:48:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 使用默认数据源获取 dsName 为 null 的错误。

Browse Source
This commit is contained in:
Suomm 2024-03-19 09:17:22 +08:00
parent ab9f1655a0
commit 8e7ab9dca3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/AuditManager.java
View File

@ -16,6 +16,7 @@
package com.mybatisflex.core.audit; package com.mybatisflex.core.audit;
import com.mybatisflex.core.FlexConsts; import com.mybatisflex.core.FlexConsts;
import com.mybatisflex.core.FlexGlobalConfig;
import com.mybatisflex.core.datasource.DataSourceKey; import com.mybatisflex.core.datasource.DataSourceKey;
import com.mybatisflex.core.util.StringUtil; import com.mybatisflex.core.util.StringUtil;
import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.BoundSql;
@ -102,9 +103,12 @@ public class AuditManager {
return supplier.execute(); return supplier.execute();
} }
String key = DataSourceKey.get(); String key = DataSourceKey.get();
if (StringUtil.isNotBlank(key)) { if (StringUtil.isBlank(key)) {
auditMessage.setDsName(key); key = FlexGlobalConfig.getDefaultConfig()
.getDataSource()
.getDefaultDataSourceKey();
} }
auditMessage.setDsName(key);
auditMessage.setQueryTime(clock.getTick()); auditMessage.setQueryTime(clock.getTick());
try { try {
T result = supplier.execute(); T result = supplier.execute();

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/AuditMessage.java
View File

@ -96,7 +96,7 @@ public class AuditMessage implements Serializable {
private long elapsedTime; private long elapsedTime;
/** /**
* 数据库名称 * 数据库名称。
*/ */
private String dsName; private String dsName;