Merge branch 'dev' into 'test'

Dev

See merge request jygk/dsc!17
This commit is contained in:
wencai he
2025-12-29 01:54:51 +00:00

View File

@@ -26,6 +26,8 @@ import org.apache.seata.rm.datasource.undo.AbstractUndoLogManager;
import org.apache.seata.rm.datasource.undo.parser.FastjsonUndoLogParser;
import org.apache.seata.rm.datasource.undo.parser.JacksonUndoLogParser;
import org.apache.seata.sqlparser.struct.TableMeta;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
import java.math.BigDecimal;
@@ -66,6 +68,18 @@ import java.util.stream.Collectors;
*/
public class DataCompareUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(DataCompareUtils.class);
/**
* 标识补丁类是否已加载
*/
private static final boolean PATCHED;
static {
PATCHED = true;
LOGGER.info("[zt-spring-boot-starter-seata-dm] DataCompareUtils 补丁类已加载,用于解决达梦数据库 DmdbTimestamp 时区问题");
}
private DataCompareUtils() {}
/**
@@ -102,6 +116,7 @@ public class DataCompareUtils {
Instant i0 = toInstant(v0);
Instant i1 = toInstant(v1);
boolean equals = Objects.equals(i0, i1);
LOGGER.info("[zt-seata-dm-patch] DmdbTimestamp 字段比较: field={}, equals={}", f0.getName(), equals);
return equals
? Result.ok()
: Result.buildWithParams(