From ad2f493349074d7e5328a924921f11f63ff686c2 Mon Sep 17 00:00:00 2001 From: lWoHvYe Date: Sat, 6 Aug 2022 11:26:20 +0800 Subject: [PATCH] Revert "Move the Sys-Service to api-module" Gateway is Based on WebFlux, while the common-module is based on WebMVC, this is a conflict This reverts commit dd6c6afda31da200730878bc80af0489276201b4. --- eladmin-api/src/main/java/module-info.java | 1 - .../mongodb/service/impl/MongoDBUserServiceIOCImpl.java | 2 +- .../mongodb/service/impl/MongoDBUserServiceImpl.java | 2 +- .../sys/modules/security/config/SpringSecurityConfig.java | 2 +- .../CustomFilterInvocationSecurityMetadataSource.java | 2 +- .../modules/security/service/UserDetailsServiceImpl.java | 2 +- .../sys/modules/security/service/UserLocalCache.java | 6 +++--- .../lwohvye/sys/modules/system/rest/DeptController.java | 4 ++-- .../lwohvye/sys/modules/system/rest/JobController.java | 2 +- .../lwohvye/sys/modules/system/rest/MenuController.java | 2 +- .../sys/modules/system/rest/ResourceController.java | 2 +- .../lwohvye/sys/modules/system/rest/RoleController.java | 2 +- .../lwohvye/sys/modules/system/rest/UserController.java | 8 ++++---- .../lwohvye/sys}/modules/system/service/IDataService.java | 2 +- .../lwohvye/sys}/modules/system/service/IDeptService.java | 2 +- .../lwohvye/sys}/modules/system/service/IJobService.java | 2 +- .../lwohvye/sys}/modules/system/service/IMenuService.java | 2 +- .../sys}/modules/system/service/IResourceService.java | 2 +- .../lwohvye/sys}/modules/system/service/IRoleService.java | 4 ++-- .../lwohvye/sys}/modules/system/service/IUserService.java | 2 +- .../sys/modules/system/service/impl/DataServiceImpl.java | 6 +++--- .../sys/modules/system/service/impl/DeptServiceImpl.java | 6 +++--- .../sys/modules/system/service/impl/JobServiceImpl.java | 4 ++-- .../sys/modules/system/service/impl/MenuServiceImpl.java | 4 ++-- .../modules/system/service/impl/ResourceServiceImpl.java | 3 ++- .../sys/modules/system/service/impl/RoleServiceImpl.java | 4 ++-- .../sys/modules/system/service/impl/UserServiceImpl.java | 2 +- .../sys/modules/system/service/local/AuthMQService.java | 2 +- .../modules/system/strategy/NormalUserTypeStrategy.java | 2 +- 29 files changed, 43 insertions(+), 43 deletions(-) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IDataService.java (95%) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IDeptService.java (98%) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IJobService.java (97%) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IMenuService.java (98%) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IResourceService.java (97%) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IRoleService.java (97%) rename {eladmin-api/src/main/java/com/lwohvye/api => eladmin-system/src/main/java/com/lwohvye/sys}/modules/system/service/IUserService.java (98%) diff --git a/eladmin-api/src/main/java/module-info.java b/eladmin-api/src/main/java/module-info.java index 4481ffd4..ef8783b7 100644 --- a/eladmin-api/src/main/java/module-info.java +++ b/eladmin-api/src/main/java/module-info.java @@ -12,7 +12,6 @@ exports com.lwohvye.api.modules.system.domain; exports com.lwohvye.api.modules.system.domain.vo; exports com.lwohvye.api.modules.system.domain.projection; - exports com.lwohvye.api.modules.system.service; exports com.lwohvye.api.modules.system.service.dto; opens com.lwohvye.api.modules.mnt.domain; diff --git a/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceIOCImpl.java b/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceIOCImpl.java index a02d7d20..025bff4c 100644 --- a/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceIOCImpl.java +++ b/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceIOCImpl.java @@ -16,7 +16,7 @@ package com.lwohvye.search.modules.mongodb.service.impl; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.api.modules.system.service.dto.RoleSmallDto; import com.lwohvye.api.modules.system.service.dto.UserQueryCriteria; import com.lwohvye.search.modules.mongodb.domain.MongoDBUser; diff --git a/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceImpl.java b/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceImpl.java index 75704342..fa78f4e4 100644 --- a/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceImpl.java +++ b/eladmin-search/src/main/java/com/lwohvye/search/modules/mongodb/service/impl/MongoDBUserServiceImpl.java @@ -16,7 +16,7 @@ package com.lwohvye.search.modules.mongodb.service.impl; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.api.modules.system.service.dto.RoleSmallDto; import com.lwohvye.api.modules.system.service.dto.UserQueryCriteria; import com.lwohvye.search.modules.mongodb.domain.MongoDBUser; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/config/SpringSecurityConfig.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/config/SpringSecurityConfig.java index 885254d1..501d6ba2 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/config/SpringSecurityConfig.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/config/SpringSecurityConfig.java @@ -28,7 +28,7 @@ import com.lwohvye.sys.modules.security.security.handler.JwtAccessDeniedHandler; import com.lwohvye.sys.modules.security.security.handler.JwtAuthenticationEntryPoint; import com.lwohvye.sys.modules.security.service.dto.JwtUserDto; -import com.lwohvye.api.modules.system.service.IResourceService; +import com.lwohvye.sys.modules.system.service.IResourceService; import com.lwohvye.utils.StringUtils; import com.lwohvye.utils.json.JsonUtils; import com.lwohvye.utils.rabbitmq.AmqpMsgEntity; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/security/filter/CustomFilterInvocationSecurityMetadataSource.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/security/filter/CustomFilterInvocationSecurityMetadataSource.java index 00b9cce4..10597fb9 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/security/filter/CustomFilterInvocationSecurityMetadataSource.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/security/filter/CustomFilterInvocationSecurityMetadataSource.java @@ -18,7 +18,7 @@ import com.lwohvye.annotation.AnonymousAccess; import com.lwohvye.constant.SecurityConstant; import com.lwohvye.sys.modules.security.config.SpringSecurityConfig; -import com.lwohvye.api.modules.system.service.IResourceService; +import com.lwohvye.sys.modules.system.service.IResourceService; import com.lwohvye.utils.enums.RequestMethodEnum; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationContext; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserDetailsServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserDetailsServiceImpl.java index 2f4bb922..1b0bce95 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserDetailsServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserDetailsServiceImpl.java @@ -17,7 +17,7 @@ import com.lwohvye.sys.modules.security.config.bean.LoginProperties; import com.lwohvye.sys.modules.security.service.dto.JwtUserDto; -import com.lwohvye.api.modules.system.service.IDataService; +import com.lwohvye.sys.modules.system.service.IDataService; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserLocalCache.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserLocalCache.java index 0c399f1a..da31d09b 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserLocalCache.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/security/service/UserLocalCache.java @@ -24,9 +24,9 @@ import com.lwohvye.sys.modules.rabbitmq.config.RabbitMQConfig; import com.lwohvye.sys.modules.rabbitmq.service.RabbitMQProducerService; import com.lwohvye.sys.modules.security.service.dto.JwtUserDto; -import com.lwohvye.api.modules.system.service.IDataService; -import com.lwohvye.api.modules.system.service.IRoleService; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IDataService; +import com.lwohvye.sys.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.utils.StringUtils; import com.lwohvye.utils.rabbitmq.AmqpMsgEntity; import org.jetbrains.annotations.NotNull; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/DeptController.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/DeptController.java index 44d0da80..f0f8d380 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/DeptController.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/DeptController.java @@ -21,8 +21,8 @@ import com.lwohvye.exception.BadRequestException; import com.lwohvye.api.modules.system.api.SysDeptAPI; import com.lwohvye.api.modules.system.domain.Dept; -import com.lwohvye.api.modules.system.service.IDataService; -import com.lwohvye.api.modules.system.service.IDeptService; +import com.lwohvye.sys.modules.system.service.IDataService; +import com.lwohvye.sys.modules.system.service.IDeptService; import com.lwohvye.api.modules.system.service.dto.DeptDto; import com.lwohvye.api.modules.system.service.dto.DeptQueryCriteria; import com.lwohvye.utils.PageUtil; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/JobController.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/JobController.java index be9f8144..7c797cf0 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/JobController.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/JobController.java @@ -20,7 +20,7 @@ import com.lwohvye.exception.BadRequestException; import com.lwohvye.api.modules.system.api.SysJobAPI; import com.lwohvye.api.modules.system.domain.Job; -import com.lwohvye.api.modules.system.service.IJobService; +import com.lwohvye.sys.modules.system.service.IJobService; import com.lwohvye.api.modules.system.service.dto.JobQueryCriteria; import com.lwohvye.utils.result.ResultInfo; import io.swagger.v3.oas.annotations.Operation; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/MenuController.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/MenuController.java index ad17e473..ab6a1618 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/MenuController.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/MenuController.java @@ -23,7 +23,7 @@ import com.lwohvye.exception.BadRequestException; import com.lwohvye.api.modules.system.api.SysMenuAPI; import com.lwohvye.api.modules.system.domain.Menu; -import com.lwohvye.api.modules.system.service.IMenuService; +import com.lwohvye.sys.modules.system.service.IMenuService; import com.lwohvye.api.modules.system.service.dto.MenuDto; import com.lwohvye.api.modules.system.service.dto.MenuQueryCriteria; import com.lwohvye.sys.modules.system.service.mapstruct.MenuMapper; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/ResourceController.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/ResourceController.java index 89032410..7247b8be 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/ResourceController.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/ResourceController.java @@ -20,7 +20,7 @@ import com.lwohvye.api.modules.system.domain.Resource; import com.lwohvye.api.modules.system.service.dto.ResourceDto; import com.lwohvye.api.modules.system.service.dto.ResourceQueryCriteria; -import com.lwohvye.api.modules.system.service.IResourceService; +import com.lwohvye.sys.modules.system.service.IResourceService; import com.lwohvye.utils.result.ResultInfo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/RoleController.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/RoleController.java index fa678e04..f6b5108c 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/RoleController.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/RoleController.java @@ -21,7 +21,7 @@ import com.lwohvye.exception.BadRequestException; import com.lwohvye.api.modules.system.api.SysRoleAPI; import com.lwohvye.api.modules.system.domain.Role; -import com.lwohvye.api.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IRoleService; import com.lwohvye.api.modules.system.service.dto.RoleDto; import com.lwohvye.api.modules.system.service.dto.RoleQueryCriteria; import com.lwohvye.api.modules.system.service.dto.RoleSmallDto; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/UserController.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/UserController.java index 67aa894e..944376d6 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/rest/UserController.java @@ -27,10 +27,10 @@ import com.lwohvye.api.modules.system.domain.User; import com.lwohvye.api.modules.system.domain.vo.UserBaseVo; import com.lwohvye.api.modules.system.domain.vo.UserPassVo; -import com.lwohvye.api.modules.system.service.IDataService; -import com.lwohvye.api.modules.system.service.IDeptService; -import com.lwohvye.api.modules.system.service.IRoleService; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IDataService; +import com.lwohvye.sys.modules.system.service.IDeptService; +import com.lwohvye.sys.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.api.modules.system.service.dto.RoleSmallDto; import com.lwohvye.api.modules.system.service.dto.UserQueryCriteria; import com.lwohvye.utils.PageUtil; diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDataService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IDataService.java similarity index 95% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDataService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IDataService.java index 075d7fe6..51bf7200 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDataService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IDataService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.base.BaseService; diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDeptService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IDeptService.java similarity index 98% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDeptService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IDeptService.java index 4e9aed69..1e52ed37 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDeptService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IDeptService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.base.BaseService; import com.lwohvye.api.modules.system.service.dto.DeptDto; diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IJobService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IJobService.java similarity index 97% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IJobService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IJobService.java index 5066aeb1..a543b013 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IJobService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IJobService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.base.BaseService; import com.lwohvye.api.modules.system.service.dto.JobDto; diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IMenuService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IMenuService.java similarity index 98% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IMenuService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IMenuService.java index 4953856c..1e3ad6da 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IMenuService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IMenuService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.api.modules.system.domain.vo.MenuVo; import com.lwohvye.base.BaseService; diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IResourceService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IResourceService.java similarity index 97% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IResourceService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IResourceService.java index e7265e42..699579bf 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IResourceService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IResourceService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.api.modules.system.domain.Resource; import com.lwohvye.base.BaseService; diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IRoleService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IRoleService.java similarity index 97% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IRoleService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IRoleService.java index 84c3d7a1..457af3b6 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IRoleService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IRoleService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.base.BaseService; import com.lwohvye.api.modules.system.domain.Dept; @@ -78,7 +78,7 @@ public interface IRoleService extends BaseService { * @param id 用户ID * @return / */ - List findByUserId(Long userId); + List findByUserId(Long id); /** * 根据角色查询角色级别 diff --git a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IUserService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IUserService.java similarity index 98% rename from eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IUserService.java rename to eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IUserService.java index 74ca4fd8..00d7c407 100644 --- a/eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IUserService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/IUserService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.lwohvye.api.modules.system.service; +package com.lwohvye.sys.modules.system.service; import com.lwohvye.base.BaseService; import com.lwohvye.api.modules.system.domain.Dept; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DataServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DataServiceImpl.java index 253e01b3..b126ad69 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DataServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DataServiceImpl.java @@ -18,9 +18,9 @@ import com.lwohvye.api.modules.system.domain.Dept; import com.lwohvye.api.modules.system.service.dto.RoleSmallDto; import com.lwohvye.sys.modules.system.event.UserEvent; -import com.lwohvye.api.modules.system.service.IDataService; -import com.lwohvye.api.modules.system.service.IDeptService; -import com.lwohvye.api.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IDataService; +import com.lwohvye.sys.modules.system.service.IDeptService; +import com.lwohvye.sys.modules.system.service.IRoleService; import com.lwohvye.utils.CacheKey; import com.lwohvye.utils.enums.DataScopeEnum; import com.lwohvye.utils.redis.RedisUtils; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DeptServiceImpl.java index ce24dc48..6baa959e 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/DeptServiceImpl.java @@ -23,9 +23,9 @@ import com.lwohvye.exception.BadRequestException; import com.lwohvye.sys.modules.system.event.DeptEvent; import com.lwohvye.sys.modules.system.repository.DeptRepository; -import com.lwohvye.api.modules.system.service.IDeptService; -import com.lwohvye.api.modules.system.service.IRoleService; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IDeptService; +import com.lwohvye.sys.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.sys.modules.system.service.mapstruct.DeptMapper; import com.lwohvye.utils.*; import com.lwohvye.utils.enums.DataScopeEnum; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/JobServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/JobServiceImpl.java index d53c19ce..f55cc81e 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/JobServiceImpl.java @@ -21,8 +21,8 @@ import com.lwohvye.exception.BadRequestException; import com.lwohvye.exception.EntityExistException; import com.lwohvye.sys.modules.system.repository.JobRepository; -import com.lwohvye.api.modules.system.service.IJobService; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IJobService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.utils.FileUtil; import com.lwohvye.utils.PageUtil; import com.lwohvye.utils.QueryHelp; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/MenuServiceImpl.java index 1f740968..b1162da4 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/MenuServiceImpl.java @@ -29,8 +29,8 @@ import com.lwohvye.sys.modules.system.event.MenuEvent; import com.lwohvye.sys.modules.system.event.UserEvent; import com.lwohvye.sys.modules.system.repository.MenuRepository; -import com.lwohvye.api.modules.system.service.IMenuService; -import com.lwohvye.api.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IMenuService; +import com.lwohvye.sys.modules.system.service.IRoleService; import com.lwohvye.utils.*; import com.lwohvye.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/ResourceServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/ResourceServiceImpl.java index 395d432f..171b5936 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/ResourceServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/ResourceServiceImpl.java @@ -16,11 +16,12 @@ package com.lwohvye.sys.modules.system.service.impl; import com.lwohvye.api.modules.system.domain.Resource; +import com.lwohvye.api.modules.system.domain.Role; import com.lwohvye.api.modules.system.service.dto.ResourceDto; import com.lwohvye.api.modules.system.service.dto.ResourceQueryCriteria; import com.lwohvye.sys.modules.system.event.RoleEvent; import com.lwohvye.sys.modules.system.repository.ResourceRepository; -import com.lwohvye.api.modules.system.service.IResourceService; +import com.lwohvye.sys.modules.system.service.IResourceService; import com.lwohvye.utils.*; import com.lwohvye.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/RoleServiceImpl.java index 93cdca10..c49e184c 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/RoleServiceImpl.java @@ -26,8 +26,8 @@ import com.lwohvye.sys.modules.system.event.MenuEvent; import com.lwohvye.sys.modules.system.event.RoleEvent; import com.lwohvye.sys.modules.system.repository.RoleRepository; -import com.lwohvye.api.modules.system.service.IRoleService; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.sys.modules.system.service.mapstruct.RoleMapper; import com.lwohvye.sys.modules.system.strategy.AuthHandlerContext; import com.lwohvye.utils.*; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/UserServiceImpl.java index 270fcb39..3e53bacc 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/impl/UserServiceImpl.java @@ -32,7 +32,7 @@ import com.lwohvye.sys.modules.system.event.RoleEvent; import com.lwohvye.sys.modules.system.event.UserEvent; import com.lwohvye.sys.modules.system.repository.UserRepository; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.utils.*; import com.lwohvye.utils.redis.RedisUtils; import io.jsonwebtoken.lang.Assert; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/local/AuthMQService.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/local/AuthMQService.java index f3758039..e7717c2f 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/local/AuthMQService.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/service/local/AuthMQService.java @@ -19,7 +19,7 @@ import cn.hutool.core.util.StrUtil; import com.lwohvye.sys.modules.rabbitmq.service.RabbitMQProducerService; import com.lwohvye.sys.modules.security.service.UserLocalCache; -import com.lwohvye.api.modules.system.service.IUserService; +import com.lwohvye.sys.modules.system.service.IUserService; import com.lwohvye.utils.json.JsonUtils; import com.lwohvye.utils.rabbitmq.AmqpMsgEntity; import com.lwohvye.utils.redis.RedisUtils; diff --git a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/strategy/NormalUserTypeStrategy.java b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/strategy/NormalUserTypeStrategy.java index 321eab9d..5383f74c 100644 --- a/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/strategy/NormalUserTypeStrategy.java +++ b/eladmin-system/src/main/java/com/lwohvye/sys/modules/system/strategy/NormalUserTypeStrategy.java @@ -17,7 +17,7 @@ import com.lwohvye.sys.modules.system.annotation.UserTypeHandlerAnno; import com.lwohvye.sys.modules.system.enums.UserTypeEnum; -import com.lwohvye.api.modules.system.service.IRoleService; +import com.lwohvye.sys.modules.system.service.IRoleService; import com.lwohvye.utils.SpringContextHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired;