diff --git a/pom.xml b/pom.xml
index 8a27b33f..00c69570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,9 +52,9 @@
 		<groovy.version>5.0.2</groovy.version>
 
 		<!-- xxl-sso (+xxl-tool、gson) -->
-		<xxl-sso.version>2.1.1</xxl-sso.version>
+		<xxl-sso.version>2.2.0</xxl-sso.version>
 		<!-- xxl-tool -->
-		<xxl-tool.version>2.3.1</xxl-tool.version>
+		<xxl-tool.version>2.3.2</xxl-tool.version>
 	</properties>
 
 	<licenses>
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java
index 906d1c24..56327599 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java
@@ -58,8 +58,8 @@ public class JobGroupController {
 
 		// package result
 		PageModel<XxlJobGroup> pageModel = new PageModel<>();
-		pageModel.setPageData(list);
-		pageModel.setTotalCount(list_count);
+		pageModel.setData(list);
+		pageModel.setTotal(list_count);
 
 		return Response.ofSuccess(pageModel);
 	}
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java
index f20a2b52..43ed6cf8 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java
@@ -134,8 +134,8 @@ public class JobLogController {
 
 		// package result
 		PageModel<XxlJobLog> pageModel = new PageModel<>();
-		pageModel.setPageData(list);
-		pageModel.setTotalCount(list_count);
+		pageModel.setData(list);
+		pageModel.setTotal(list_count);
 
 		return Response.ofSuccess(pageModel);
 	}
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
index 54093289..44651499 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java
@@ -69,8 +69,8 @@ public class JobUserController {
 
         // package result
         PageModel<XxlJobUser> pageModel = new PageModel<>();
-        pageModel.setPageData(list);
-        pageModel.setTotalCount(list_count);
+        pageModel.setData(list);
+        pageModel.setTotal(list_count);
 
         return Response.ofSuccess(pageModel);
     }
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
index f3b69e99..f10a6dbd 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java
@@ -56,8 +56,8 @@ public class XxlJobServiceImpl implements XxlJobService {
 
 		// package result
 		PageModel<XxlJobInfo> pageModel = new PageModel<>();
-		pageModel.setPageData(list);
-		pageModel.setTotalCount(list_count);
+		pageModel.setData(list);
+		pageModel.setTotal(list_count);
 
 		return Response.ofSuccess(pageModel);
 	}
diff --git a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
index 35d90370..dea73b75 100644
--- a/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js
@@ -19,9 +19,9 @@ $(function() {
 			dataFilter: function (json ) {
 				var result = JSON.parse(json);
 				return JSON.stringify({
-					"recordsTotal": result.data.totalCount,
-					"recordsFiltered": result.data.totalCount,
-					"data": result.data.pageData
+					"recordsTotal": result.data.total,
+					"recordsFiltered": result.data.total,
+					"data": result.data.data
 				});
 			}
 		},
diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
index 047a50dd..e16638d2 100644
--- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
@@ -22,9 +22,9 @@ $(function() {
 			dataFilter: function (json ) {
 				var result = JSON.parse(json);
 				return JSON.stringify({
-					"recordsTotal": result.data.totalCount,
-					"recordsFiltered": result.data.totalCount,
-					"data": result.data.pageData
+					"recordsTotal": result.data.total,
+					"recordsFiltered": result.data.total,
+					"data": result.data.data
 				});
 			}
 	    },
diff --git a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
index 5299e46a..ed768686 100644
--- a/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
@@ -63,9 +63,9 @@ $(function() {
 			dataFilter: function (json ) {
 				var result = JSON.parse(json);
 				return JSON.stringify({
-					"recordsTotal": result.data.totalCount,
-					"recordsFiltered": result.data.totalCount,
-					"data": result.data.pageData
+					"recordsTotal": result.data.total,
+					"recordsFiltered": result.data.total,
+					"data": result.data.data
 				});
 			}
 	    },
diff --git a/xxl-job-admin/src/main/resources/static/js/user.index.1.js b/xxl-job-admin/src/main/resources/static/js/user.index.1.js
index 49851dd4..bdbb55a2 100644
--- a/xxl-job-admin/src/main/resources/static/js/user.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/user.index.1.js
@@ -19,9 +19,9 @@ $(function() {
 			dataFilter: function (json ) {
 				var result = JSON.parse(json);
 				return JSON.stringify({
-					"recordsTotal": result.data.totalCount,
-					"recordsFiltered": result.data.totalCount,
-					"data": result.data.pageData
+					"recordsTotal": result.data.total,
+					"recordsFiltered": result.data.total,
+					"data": result.data.data
 				});
 			}
 	    },