From 782137761c1472b5f246cf75630a370e861381cf Mon Sep 17 00:00:00 2001 From: cuidianlong <1539160463@qq.com> Date: Mon, 6 Mar 2023 20:56:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PermissionController.java | 3 ++- .../resourcesserver/controller/RoleController.java | 3 ++- .../resourcesserver/service/PermissionService.java | 3 ++- .../platform/resourcesserver/service/RoleService.java | 3 ++- .../service/impl/PermissionServiceImpl.java | 11 +++++++---- .../resourcesserver/service/impl/RoleServiceImpl.java | 11 +++++++---- 6 files changed, 22 insertions(+), 12 deletions(-) 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 48b20e4..dfeedf8 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 page = permissionService.getPermissionList(bo); + Page 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 8d91f73..74c7dd2 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 page = roleService.getRoleList(bo); + Page 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 ca8a3cb..9258af2 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 { - Page getPermissionList(PermissionFindBo bo) throws Exception; + Page 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 ffe0696..1a0caf7 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 { - Page getRoleList(RoleFindBo bo)throws Exception; + Page 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 d948a3a..ae37253 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 getPermissionList(PermissionFindBo bo) throws Exception { + public Page getPermissionList(PermissionFindBo bo) throws Exception { Page page = new Page<>(bo.getPageNumber(), bo.getPageSize()); Page permissionPage = permissionMapper.selectPage(page, new QueryWrapper().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 roleListVoPage = new Page<>(); - roleListVoPage.setRecords(BeanUtil.copyToList(permissionPage.getRecords(),RoleListVo.class)); - return roleListVoPage; + Page 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 4388d94..9644e00 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 implements Ro private RoleMapper roleMapper; @Override - public Page getRoleList(RoleFindBo bo) throws Exception { + public Page getRoleList(RoleFindBo bo) throws Exception { Page page = new Page<>(bo.getPageNumber(), bo.getPageSize()); Page rolePage = roleMapper.selectPage(page, new QueryWrapper().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 userListVoPage = new Page<>(); - userListVoPage.setRecords(BeanUtil.copyToList(rolePage.getRecords(),UserListVo.class)); - return userListVoPage; + Page roleListVoPage = new Page<>(); + roleListVoPage.setRecords(BeanUtil.copyToList(rolePage.getRecords(),RoleListVo.class)); + roleListVoPage.setSize(rolePage.getSize()); + roleListVoPage.setTotal(rolePage.getTotal()); + return roleListVoPage; } @Override -- Gitee From b2f177c6cdf83c54dc52a14844125998fe54cbaf Mon Sep 17 00:00:00 2001 From: cuidianlong <1539160463@qq.com> Date: Tue, 7 Mar 2023 05:35:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0HikariPool=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 9 +++++++++ .../src/main/resources/application-dev.yml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/platform-auth-server/src/main/resources/application-dev.yml b/platform-auth-server/src/main/resources/application-dev.yml index d7dca6a..ad2297d 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/resources/application-dev.yml b/platform-resources-server/src/main/resources/application-dev.yml index c5e3356..ea9799e 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相关配置 -- Gitee