This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new edacdd7575 optimize: update README.md (#7614)
edacdd7575 is described below
commit edacdd757571733d50a9a14c28b1ee757aae7c3c
Author: jimin <[email protected]>
AuthorDate: Tue Sep 2 13:40:19 2025 +0800
optimize: update README.md (#7614)
---
README.md | 4 ++--
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../src/main/java/org/apache/seata/common/util/PageUtil.java | 12 ++++++++----
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 73b71abc8f..25b30ad7d3 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
[](https://github.com/apache/incubator-seata/actions/workflows/build.yml)
[](https://codecov.io/gh/apache/incubator-seata)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
-[](https://central.sonatype.com/search?q=org.apache.seata%3Aseata-all)
+[](https://central.sonatype.com/search?q=org.apache.seata%3Aseata-all)
## What is Seata?
@@ -101,7 +101,7 @@ For more details about principle and design, please go to
[Seata wiki page](http
Depending on the scenario, choose one of the two dependencies:
`org.apache.seata:seata-all` or `org.apache.seata:seata-spring-boot-starter`.
```xml
<properties>
- <seata.version>2.4.0</seata.version>
+ <seata.version>2.5.0</seata.version>
</properties>
<dependencies>
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index b521925c37..5513c87fd5 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -48,6 +48,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7591](https://github.com/seata/seata/pull/7591)] Optimize default
xssFilter config retrieval when no explicit configuration is provided
- [[#7608](https://github.com/seata/seata/pull/7608)] modify the parameter
name in refreshToken method
- [[#7603](https://github.com/seata/seata/pull/7603)] upgrade Apache Tomcat
dependency from 9.0.106 to 9.0.108
+- [[#7614](https://github.com/seata/seata/pull/7614)] update README.md
### security:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index afd92bb909..12f55eec46 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -47,6 +47,7 @@
- [[#7591](https://github.com/seata/seata/pull/7591)]
当没有显式配置xssFilter相关的配置时，优化获取默认配置的逻辑
- [[#7608](https://github.com/seata/seata/pull/7608)] 修改refreshToken方法中的参数名称
- [[#7603](https://github.com/seata/seata/pull/7603)] 将Apache
Tomcat依赖项从9.0.106升级到9.0.108
+- [[#7614](https://github.com/seata/seata/pull/7614)] 更新 README.md
### security:
diff --git a/common/src/main/java/org/apache/seata/common/util/PageUtil.java
b/common/src/main/java/org/apache/seata/common/util/PageUtil.java
index 8961a2147f..05b0b08bdc 100644
--- a/common/src/main/java/org/apache/seata/common/util/PageUtil.java
+++ b/common/src/main/java/org/apache/seata/common/util/PageUtil.java
@@ -234,13 +234,15 @@ public class PageUtil {
case "postgresql":
return " and " + timeColumnName + " >= TO_TIMESTAMP(?) ";
case "oracle":
- return " and " + timeColumnName + " >=
TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') +
NUMTODSINTERVAL(?, 'SECOND') ";
+ return " and " + timeColumnName
+ + " >= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD
HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
case "sqlserver":
return " and " + timeColumnName + " >= DATEADD(SECOND, ?,
'1970-01-01 00:00:00') ";
case "dm":
case "oscar":
// Compatible with Oracle syntax
- return " and " + timeColumnName + " >=
TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') +
NUMTODSINTERVAL(?, 'SECOND') ";
+ return " and " + timeColumnName
+ + " >= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD
HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
default:
throw new IllegalArgumentException("Unsupported DB type: " +
dbType);
}
@@ -259,13 +261,15 @@ public class PageUtil {
case "postgresql":
return " and " + timeColumnName + " <= TO_TIMESTAMP(?) ";
case "oracle":
- return " and " + timeColumnName + " <=
TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') +
NUMTODSINTERVAL(?, 'SECOND') ";
+ return " and " + timeColumnName
+ + " <= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD
HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
case "sqlserver":
return " and " + timeColumnName + " <= DATEADD(SECOND, ?,
'1970-01-01 00:00:00') ";
case "dm":
case "oscar":
// Compatible with Oracle syntax
- return " and " + timeColumnName + " <=
TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS') +
NUMTODSINTERVAL(?, 'SECOND') ";
+ return " and " + timeColumnName
+ + " <= TO_TIMESTAMP('1970-01-01 00:00:00', 'YYYY-MM-DD
HH24:MI:SS') + NUMTODSINTERVAL(?, 'SECOND') ";
default:
throw new IllegalArgumentException("Unsupported DB type: " +
dbType);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
