diff --git a/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java b/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java index 0c08c61a4a..57cab10195 100644 --- a/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java +++ b/core/core-backend/src/main/java/io/dataease/config/JpaUpdateNonNullAspect.java @@ -70,7 +70,7 @@ public class JpaUpdateNonNullAspect { return dbEntity; } } catch (Exception e) { - System.out.println("合并实体属性失败: " + e.getMessage()); + LogUtil.error("合并实体属性失败", e); } return entity; } @@ -127,7 +127,7 @@ public class JpaUpdateNonNullAspect { setter.invoke(target, value); } } catch (Exception e) { - LogUtil.error(e); + LogUtil.error("copyNonNullProperties 复制属性失败: " + pd.getName(), e); throw new RuntimeException("copyNonNullProperties 复制属性失败: " + pd.getName(), e); } } diff --git a/de-xpack b/de-xpack index 4a94cc3103..e2f6f8b6b7 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 4a94cc31038d6020c1b6bc2431c00c190fc6d604 +Subproject commit e2f6f8b6b73df5b3fadf23a04445f82c80dc0618 diff --git a/sdk/common/src/main/java/io/dataease/utils/LogUtil.java b/sdk/common/src/main/java/io/dataease/utils/LogUtil.java index ffaecd0706..f3f3fca879 100644 --- a/sdk/common/src/main/java/io/dataease/utils/LogUtil.java +++ b/sdk/common/src/main/java/io/dataease/utils/LogUtil.java @@ -40,7 +40,11 @@ public class LogUtil { } } else if (ERROR.equals(level)) { if (logger != null && logger.isErrorEnabled()) { - logger.error(LogUtil.getMsg(msg)); + if (msg instanceof Throwable) { + logger.error(LogUtil.getMsg(msg), (Throwable) msg); + } else { + logger.error(LogUtil.getMsg(msg)); + } } } else { if (logger != null && logger.isErrorEnabled()) { @@ -136,7 +140,11 @@ public class LogUtil { public static void error(Object msg) { Logger logger = LogUtil.getLogger(); if (logger != null && logger.isErrorEnabled()) { - logger.error(LogUtil.getMsg(msg));// 并追加方法名称 + if (msg instanceof Throwable) { + logger.error(LogUtil.getMsg(msg), (Throwable) msg); + } else { + logger.error(LogUtil.getMsg(msg)); + } } }