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 dd6c6af.

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDataService.java → 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;
 

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IDeptService.java → 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;

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IJobService.java → 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;

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IMenuService.java → 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;

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IResourceService.java → 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;

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IRoleService.java → 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<RoleSmallDto> findByUserId(Long userId);
+    List<RoleSmallDto> findByUserId(Long id);
 
     /**
      * 根据角色查询角色级别

eladmin-api/src/main/java/com/lwohvye/api/modules/system/service/IUserService.java → 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;

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;

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;

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;

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;

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;

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.*;

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;

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;

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;