From 11d312332ae898a1c9d2d4f3cf275f445a0a24c3 Mon Sep 17 00:00:00 2001 From: WenG <450292408@qq.com> Date: Thu, 25 Feb 2021 09:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- {module-permission => service-permission}/pom.xml | 2 +- .../controller/api/PermissionController.java | 13 ++++--------- .../controller/route/PermissionRouteController.java | 2 +- .../service}/permission/dao/IPermissionDao.java | 2 +- .../permission/enums/PermissionTypeEnum.java | 2 +- .../service}/permission/pojo/vos/PermissionVO.java | 4 ++-- .../service}/permission/pojo/vos/SystemApiVO.java | 2 +- .../permission/service/IPermissionService.java | 6 +++--- .../service/impl/PermissionServiceImpl.java | 11 +++++------ .../startup/ServicePermissionStartUp.java | 9 +++++---- .../resources/mybatis/mapper/permission-mapper.xml | 2 +- .../main/resources/templates/permission/list.html | 0 .../resources/templates/permission/save-quick.html | 0 .../main/resources/templates/permission/save.html | 0 .../main/resources/templates/permission/update.html | 0 service-role/pom.xml | 7 ++++++- .../service/impl/RolePermissionServiceImpl.java | 4 ---- 18 files changed, 32 insertions(+), 36 deletions(-) rename {module-permission => service-permission}/pom.xml (92%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/controller/api/PermissionController.java (93%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/controller/route/PermissionRouteController.java (95%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/dao/IPermissionDao.java (97%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/enums/PermissionTypeEnum.java (93%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/pojo/vos/PermissionVO.java (96%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/pojo/vos/SystemApiVO.java (98%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/service/IPermissionService.java (95%) rename {module-permission/src/main/java/ink/wgink/module => service-permission/src/main/java/ink/wgink/service}/permission/service/impl/PermissionServiceImpl.java (95%) rename module-permission/src/main/java/ink/wgink/module/permission/startup/ModulePermissionStartUp.java => service-permission/src/main/java/ink/wgink/service/permission/startup/ServicePermissionStartUp.java (76%) rename {module-permission => service-permission}/src/main/resources/mybatis/mapper/permission-mapper.xml (98%) rename {module-permission => service-permission}/src/main/resources/templates/permission/list.html (100%) rename {module-permission => service-permission}/src/main/resources/templates/permission/save-quick.html (100%) rename {module-permission => service-permission}/src/main/resources/templates/permission/save.html (100%) rename {module-permission => service-permission}/src/main/resources/templates/permission/update.html (100%) diff --git a/pom.xml b/pom.xml index 0ff77686..3e49e181 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ service-role module-file module-dictionary - module-permission + service-permission service-menu service-oauth-client service-group diff --git a/module-permission/pom.xml b/service-permission/pom.xml similarity index 92% rename from module-permission/pom.xml rename to service-permission/pom.xml index a4ee66d8..83923819 100644 --- a/module-permission/pom.xml +++ b/service-permission/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - module-permission + service-permission 权限模块 diff --git a/module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java b/service-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java similarity index 93% rename from module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java rename to service-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java index 453c2fbf..83f07714 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java @@ -1,11 +1,9 @@ -package ink.wgink.module.permission.controller.api; +package ink.wgink.service.permission.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; -import ink.wgink.common.component.SecurityComponent; import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.permission.pojo.vos.SystemApiVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.permission.PermissionGroupDTO; @@ -13,12 +11,12 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.permission.pojo.vos.PermissionVO; -import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.service.permission.pojo.vos.PermissionVO; +import ink.wgink.service.permission.pojo.vos.SystemApiVO; +import ink.wgink.service.permission.service.IPermissionService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.AntPathMatcher; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -39,9 +37,6 @@ public class PermissionController extends DefaultBaseController { @Autowired private IPermissionService permissionService; - @Autowired - private SecurityComponent securityComponent; - private AntPathMatcher antPathMatcher = new AntPathMatcher(); @ApiOperation(value = "新增权限", notes = "新增权限接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) diff --git a/module-permission/src/main/java/ink/wgink/module/permission/controller/route/PermissionRouteController.java b/service-permission/src/main/java/ink/wgink/service/permission/controller/route/PermissionRouteController.java similarity index 95% rename from module-permission/src/main/java/ink/wgink/module/permission/controller/route/PermissionRouteController.java rename to service-permission/src/main/java/ink/wgink/service/permission/controller/route/PermissionRouteController.java index 31bdd42b..29d727e1 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/controller/route/PermissionRouteController.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/controller/route/PermissionRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.controller.route; +package ink.wgink.service.permission.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java b/service-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java similarity index 97% rename from module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java rename to service-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java index 046c8621..80d86d20 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.dao; +package ink.wgink.service.permission.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java b/service-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java similarity index 93% rename from module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java rename to service-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java index 58b248b3..5e186762 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.enums; +package ink.wgink.service.permission.enums; /** * When you feel like quitting. Think about why you started diff --git a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java b/service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java similarity index 96% rename from module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java rename to service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java index ce7088be..ab5a7933 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java @@ -1,8 +1,8 @@ -package ink.wgink.module.permission.pojo.vos; +package ink.wgink.service.permission.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; -import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.service.permission.service.IPermissionService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/SystemApiVO.java b/service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/SystemApiVO.java similarity index 98% rename from module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/SystemApiVO.java rename to service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/SystemApiVO.java index 7b695c22..fe839f5a 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/SystemApiVO.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/pojo/vos/SystemApiVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.permission.pojo.vos; +package ink.wgink.service.permission.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckListAnnotation; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java b/service-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java similarity index 95% rename from module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java rename to service-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java index d51fde38..b2347f16 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java @@ -1,13 +1,13 @@ -package ink.wgink.module.permission.service; +package ink.wgink.service.permission.service; import ink.wgink.interfaces.permission.IPermissionCheckService; -import ink.wgink.module.permission.pojo.vos.SystemApiVO; +import ink.wgink.service.permission.pojo.vos.SystemApiVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.permission.PermissionGroupDTO; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.permission.pojo.vos.PermissionVO; +import ink.wgink.service.permission.pojo.vos.PermissionVO; import java.util.List; import java.util.Map; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java b/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java similarity index 95% rename from module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java rename to service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java index 716c1186..2a90c403 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java @@ -1,22 +1,21 @@ -package ink.wgink.module.permission.service.impl; +package ink.wgink.service.permission.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.module.permission.pojo.vos.SystemApiVO; +import ink.wgink.service.permission.pojo.vos.SystemApiVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.permission.PermissionGroupDTO; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.module.permission.dao.IPermissionDao; -import ink.wgink.module.permission.pojo.vos.PermissionVO; -import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.service.permission.dao.IPermissionDao; +import ink.wgink.service.permission.pojo.vos.PermissionVO; +import ink.wgink.service.permission.service.IPermissionService; import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/module-permission/src/main/java/ink/wgink/module/permission/startup/ModulePermissionStartUp.java b/service-permission/src/main/java/ink/wgink/service/permission/startup/ServicePermissionStartUp.java similarity index 76% rename from module-permission/src/main/java/ink/wgink/module/permission/startup/ModulePermissionStartUp.java rename to service-permission/src/main/java/ink/wgink/service/permission/startup/ServicePermissionStartUp.java index c6076b69..863bbf6b 100644 --- a/module-permission/src/main/java/ink/wgink/module/permission/startup/ModulePermissionStartUp.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/startup/ServicePermissionStartUp.java @@ -1,6 +1,7 @@ -package ink.wgink.module.permission.startup; +package ink.wgink.service.permission.startup; + +import ink.wgink.service.permission.dao.IPermissionDao; -import ink.wgink.module.permission.dao.IPermissionDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +20,9 @@ import org.springframework.stereotype.Component; * @Version: 1.0 */ @Component -public class ModulePermissionStartUp implements ApplicationRunner { +public class ServicePermissionStartUp implements ApplicationRunner { - private static final Logger LOG = LoggerFactory.getLogger(ModulePermissionStartUp.class); + private static final Logger LOG = LoggerFactory.getLogger(ServicePermissionStartUp.class); @Autowired private IPermissionDao permissionDao; diff --git a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml b/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml similarity index 98% rename from module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml rename to service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml index 374d6a10..d1c4a5dc 100644 --- a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml +++ b/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/module-permission/src/main/resources/templates/permission/list.html b/service-permission/src/main/resources/templates/permission/list.html similarity index 100% rename from module-permission/src/main/resources/templates/permission/list.html rename to service-permission/src/main/resources/templates/permission/list.html diff --git a/module-permission/src/main/resources/templates/permission/save-quick.html b/service-permission/src/main/resources/templates/permission/save-quick.html similarity index 100% rename from module-permission/src/main/resources/templates/permission/save-quick.html rename to service-permission/src/main/resources/templates/permission/save-quick.html diff --git a/module-permission/src/main/resources/templates/permission/save.html b/service-permission/src/main/resources/templates/permission/save.html similarity index 100% rename from module-permission/src/main/resources/templates/permission/save.html rename to service-permission/src/main/resources/templates/permission/save.html diff --git a/module-permission/src/main/resources/templates/permission/update.html b/service-permission/src/main/resources/templates/permission/update.html similarity index 100% rename from module-permission/src/main/resources/templates/permission/update.html rename to service-permission/src/main/resources/templates/permission/update.html diff --git a/service-role/pom.xml b/service-role/pom.xml index e992e449..c04888b9 100644 --- a/service-role/pom.xml +++ b/service-role/pom.xml @@ -15,7 +15,12 @@ ink.wgink - module-permission + service-menu + 1.0-SNAPSHOT + + + ink.wgink + service-permission 1.0-SNAPSHOT diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java index 5ebfbc72..2792a5fb 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java @@ -1,17 +1,13 @@ package ink.wgink.service.role.service.impl; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.role.RolePermissionDTO; -import ink.wgink.module.permission.service.IPermissionService; import ink.wgink.service.role.dao.IRolePermissionDao; import ink.wgink.service.role.pojo.vos.RolePermissionVO; import ink.wgink.service.role.service.IRolePermissionService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.Map;