From 441fea32fb10bda17b94f50d0eea65231d79056f Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 15 May 2022 11:42:42 +0800 Subject: [PATCH] =?UTF-8?q?DiffDataUtils=20=E5=B7=AE=E5=BC=82=E6=AF=94?= =?UTF-8?q?=E8=BE=83=E5=B7=A5=E5=85=B7=EF=BC=8C=E6=96=B0=E5=A2=9E=20DiffOp?= =?UTF-8?q?tions=20=E5=B7=AE=E5=BC=82=E6=AF=94=E8=BE=83=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8C=85=E5=90=AB=E5=92=8C?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E7=AD=89=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/cms/src/main/resources/db/upgrade/cms/versions | 3 ++- .../src/main/java/com/jeesite/modules/sys/utils/LogUtils.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions index 877f0241..a450ed24 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/versions +++ b/modules/cms/src/main/resources/db/upgrade/cms/versions @@ -9,4 +9,5 @@ 4.2.3 4.3.0 5.0.0 -5.0.1 \ No newline at end of file +5.0.1 +5.0.2 \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java index dcbbd21c..949d819a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java @@ -231,7 +231,7 @@ public class LogUtils { } // 如果是修改类型的日志,则获取修改前后的差异数据 if (Log.TYPE_UPDATE.equals(log.getLogType()) && sourceData != null && targetData != null) { - log.setDiffModifyData(DiffDataUtils.getDiffData(sourceData, targetData)); + log.setDiffModifyData(DiffDataUtils.compareToString(sourceData, targetData)); } // 保存日志信息 log.setIsNewRecord(true);