diff --git a/platform-auth-server/src/main/resources/application-dev.yml b/platform-auth-server/src/main/resources/application-dev.yml
index d7dca6a0f189c51f829d706fe3cebd534e5fc656..ad2297d8c16161e82e66e86ff5dafeef2981c0ed 100644
--- a/platform-auth-server/src/main/resources/application-dev.yml
+++ b/platform-auth-server/src/main/resources/application-dev.yml
@@ -9,6 +9,15 @@ spring:
     url: jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true
     username: root
     password: ly1218
+    hikari:
+      connection-timeout: 60000
+      validation-timeout: 3000
+      idle-timeout: 60000
+      login-timeout: 5
+      max-lifetime: 60000
+      maximum-pool-size: 10
+      minimum-idle: 10
+      read-only: false
 
 micai-platform-auth:
   #jwt相关配置
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/PermissionController.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/PermissionController.java
index 48b20e45880ad633731383c548a8ff2fceac4796..dfeedf8e5a1888c159e82716923dc269722ed778 100644
--- a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/PermissionController.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/PermissionController.java
@@ -13,6 +13,7 @@ import org.micai.platform.resourcesserver.bo.PermissionFindBo;
 import org.micai.platform.resourcesserver.bo.PermissionSaveBo;
 import org.micai.platform.resourcesserver.bo.PermissionUpdateBo;
 import org.micai.platform.resourcesserver.service.PermissionService;
+import org.micai.platform.resourcesserver.vo.PermissionListVo;
 import org.micai.platform.resourcesserver.vo.RoleListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,7 +44,7 @@ public class PermissionController extends BaseController{
     public Result getPermissionList(@RequestBody PermissionFindBo bo){
         Result result;
         try {
-            Page<RoleListVo> page = permissionService.getPermissionList(bo);
+            Page<PermissionListVo> page = permissionService.getPermissionList(bo);
             result = new Result(ConstantEnum.SUCCESS,page);
         } catch (PlatformException e) {
             log.error("error info:",e);
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/RoleController.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/RoleController.java
index 8d91f7313eaa443ebf1b3a22e1470dd36014de54..74c7dd28efdfd66368d68f691ea06b43f156b03a 100644
--- a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/RoleController.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/controller/RoleController.java
@@ -13,6 +13,7 @@ import org.micai.platform.resourcesserver.bo.RoleFindBo;
 import org.micai.platform.resourcesserver.bo.RoleSaveBo;
 import org.micai.platform.resourcesserver.bo.RoleUpdateBo;
 import org.micai.platform.resourcesserver.service.RoleService;
+import org.micai.platform.resourcesserver.vo.RoleListVo;
 import org.micai.platform.resourcesserver.vo.UserListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,7 +44,7 @@ public class RoleController extends BaseController {
     public Result getRoleList(@RequestBody RoleFindBo bo){
         Result result;
         try {
-            Page<UserListVo> page = roleService.getRoleList(bo);
+            Page<RoleListVo> page = roleService.getRoleList(bo);
             result = new Result(ConstantEnum.SUCCESS,page);
         } catch (PlatformException e) {
             log.error("error info:",e);
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java
index ca8a3cbd3748829f4e5b0c522b69500d6b422f94..9258af2a0508e7add14604781585ac7cbd904580 100644
--- a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/PermissionService.java
@@ -7,6 +7,7 @@ import org.micai.platform.resourcesserver.bo.PermissionFindBo;
 import org.micai.platform.resourcesserver.bo.PermissionSaveBo;
 import org.micai.platform.resourcesserver.bo.PermissionUpdateBo;
 import org.micai.platform.resourcesserver.entity.Permission;
+import org.micai.platform.resourcesserver.vo.PermissionListVo;
 import org.micai.platform.resourcesserver.vo.RoleListVo;
 
 /**
@@ -19,7 +20,7 @@ import org.micai.platform.resourcesserver.vo.RoleListVo;
  */
 public interface PermissionService extends IService<Permission> {
 
-    Page<RoleListVo> getPermissionList(PermissionFindBo bo) throws Exception;
+    Page<PermissionListVo> getPermissionList(PermissionFindBo bo) throws Exception;
 
     void updatePermission(PermissionUpdateBo bo) throws Exception;
 
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java
index ffe069699e31152eeaa1ac370c3aa752785dfb01..1a0caf7f9c47e09475c8cc731373b8cbd027a6f9 100644
--- a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/RoleService.java
@@ -7,6 +7,7 @@ import org.micai.platform.resourcesserver.bo.RoleSaveBo;
 import org.micai.platform.resourcesserver.bo.RoleUpdateBo;
 import org.micai.platform.resourcesserver.entity.Role;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.micai.platform.resourcesserver.vo.RoleListVo;
 import org.micai.platform.resourcesserver.vo.UserListVo;
 
 /**
@@ -19,7 +20,7 @@ import org.micai.platform.resourcesserver.vo.UserListVo;
  */
 public interface RoleService extends IService<Role> {
 
-    Page<UserListVo> getRoleList(RoleFindBo bo)throws Exception;
+    Page<RoleListVo> getRoleList(RoleFindBo bo)throws Exception;
 
     void updateRole(RoleUpdateBo bo) throws Exception;
 
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java
index d948a3a9ef6b9257468632cc21a1f459df85be23..ae3725370e4d1d47215cbdb92d424a9cc93f0c4e 100644
--- a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/PermissionServiceImpl.java
@@ -17,6 +17,7 @@ import org.micai.platform.resourcesserver.entity.Permission;
 import org.micai.platform.resourcesserver.mapper.PermissionMapper;
 import org.micai.platform.resourcesserver.service.PermissionService;
 import org.micai.platform.resourcesserver.utils.AuthenticationManger;
+import org.micai.platform.resourcesserver.vo.PermissionListVo;
 import org.micai.platform.resourcesserver.vo.RoleListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,16 +39,18 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     private PermissionMapper permissionMapper;
 
     @Override
-    public Page<RoleListVo> getPermissionList(PermissionFindBo bo) throws Exception {
+    public Page<PermissionListVo> getPermissionList(PermissionFindBo bo) throws Exception {
         Page<Permission> page = new Page<>(bo.getPageNumber(), bo.getPageSize());
         Page<Permission> permissionPage = permissionMapper.selectPage(page, new QueryWrapper<Permission>().lambda()
                 .like(ObjectUtil.isNotEmpty(bo.getPermissionCode()), Permission::getPermissionCode, bo.getPermissionCode())
                 .like(ObjectUtil.isNotEmpty(bo.getPermissionName()), Permission::getPermissionName, bo.getPermissionName())
                 .eq(ObjectUtil.isNotEmpty(bo.getStatus()), Permission::getStatus, bo.getStatus()));
 
-        Page<RoleListVo> roleListVoPage = new Page<>();
-        roleListVoPage.setRecords(BeanUtil.copyToList(permissionPage.getRecords(),RoleListVo.class));
-        return roleListVoPage;
+        Page<PermissionListVo> permissionListVoPage = new Page<>();
+        permissionListVoPage.setRecords(BeanUtil.copyToList(permissionPage.getRecords(),PermissionListVo.class));
+        permissionListVoPage.setSize(permissionPage.getSize());
+        permissionListVoPage.setTotal(permissionPage.getTotal());
+        return permissionListVoPage;
     }
 
     @Override
diff --git a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java
index 4388d94dc13100dd22c7146be3ba61728d665283..9644e00ef47e528c8939395de42dd6735905f20e 100644
--- a/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java
+++ b/platform-resources-server/src/main/java/org/micai/platform/resourcesserver/service/impl/RoleServiceImpl.java
@@ -18,6 +18,7 @@ import org.micai.platform.resourcesserver.entity.Role;
 import org.micai.platform.resourcesserver.mapper.RoleMapper;
 import org.micai.platform.resourcesserver.service.RoleService;
 import org.micai.platform.resourcesserver.utils.AuthenticationManger;
+import org.micai.platform.resourcesserver.vo.RoleListVo;
 import org.micai.platform.resourcesserver.vo.UserListVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,16 +40,18 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     private RoleMapper roleMapper;
 
     @Override
-    public Page<UserListVo> getRoleList(RoleFindBo bo) throws Exception {
+    public Page<RoleListVo> getRoleList(RoleFindBo bo) throws Exception {
         Page<Role> page = new Page<>(bo.getPageNumber(), bo.getPageSize());
         Page<Role> rolePage = roleMapper.selectPage(page, new QueryWrapper<Role>().lambda()
                 .like(ObjectUtil.isNotEmpty(bo.getRoleCode()), Role::getRoleCode, bo.getRoleCode())
                 .like(ObjectUtil.isNotEmpty(bo.getRoleName()), Role::getRoleName, bo.getRoleName())
                 .eq(ObjectUtil.isNotEmpty(bo.getStatus()), Role::getStatus, bo.getStatus()));
 
-        Page<UserListVo> userListVoPage = new Page<>();
-        userListVoPage.setRecords(BeanUtil.copyToList(rolePage.getRecords(),UserListVo.class));
-        return userListVoPage;
+        Page<RoleListVo> roleListVoPage = new Page<>();
+        roleListVoPage.setRecords(BeanUtil.copyToList(rolePage.getRecords(),RoleListVo.class));
+        roleListVoPage.setSize(rolePage.getSize());
+        roleListVoPage.setTotal(rolePage.getTotal());
+        return roleListVoPage;
     }
 
     @Override
diff --git a/platform-resources-server/src/main/resources/application-dev.yml b/platform-resources-server/src/main/resources/application-dev.yml
index c5e3356d95216341a5b3afc5c9173a5bc06f7094..ea9799e5e9f39ec45c5d722b87a8a267ad65930e 100644
--- a/platform-resources-server/src/main/resources/application-dev.yml
+++ b/platform-resources-server/src/main/resources/application-dev.yml
@@ -9,6 +9,15 @@ spring:
     url: jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true
     username: root
     password: ly1218
+    hikari:
+      connection-timeout: 60000
+      validation-timeout: 3000
+      idle-timeout: 60000
+      login-timeout: 5
+      max-lifetime: 60000
+      maximum-pool-size: 10
+      minimum-idle: 10
+      read-only: false
 
 micai-platform-auth:
   #jwt相关配置