Merge branch '2.x' into 2.x_24_08_27_02

apache · Aug 27, 2024 · 6f1c42e · 6f1c42e
2 parents 2ff1b39 + 256c4a3
commit 6f1c42e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -67,6 +67,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6768](https://github.com/apache/incubator-seata/pull/6768)] report the tcc fence transaction isolation level
 - [[#6770](https://github.com/apache/incubator-seata/pull/6770)] Automatic deletion of namingserver vgroup through Caffeine map
 - [[#6780](https://github.com/apache/incubator-seata/pull/6780)] optimize the reflection operation in class `SerializerServiceLoader`
+- [[#6784](https://github.com/apache/incubator-seata/pull/6784)] upgrade axios to 1.7.4
 
 ### refactor:
 

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -68,6 +68,7 @@
 - [[#6768](https://github.com/apache/incubator-seata/pull/6768)] 上报tcc fence事务隔离级别
 - [[#6770](https://github.com/apache/incubator-seata/pull/6770)] 通过caffeine map支持namingserver事务分组的过期删除
 - [[#6780](https://github.com/apache/incubator-seata/pull/6780)] 优化类 `SerializerServiceLoader` 中的反射操作
+- [[#6784](https://github.com/apache/incubator-seata/pull/6784)] 升级 axios 至 1.7.4 版本
 
 
 ### refactor:

diff --git a/console/src/main/resources/static/console-fe/package-lock.json b/console/src/main/resources/static/console-fe/package-lock.json
diff --git a/console/src/main/resources/static/console-fe/package.json b/console/src/main/resources/static/console-fe/package.json
@@ -79,7 +79,7 @@
     "@alicloud/console-components-app-layout": "^1.1.4",
     "@alicloud/console-components-console-menu": "^1.2.12",
     "@babel/traverse": "^7.23.7",
-    "axios": "^1.6.6",
+    "axios": "^1.7.4",
     "browserify-sign": "^4.2.2",
     "decode-uri-component": "^0.4.1",
     "history": "^4.10.1",