From 73f6a682fe236055643f3cae0a1c3cf90fc04fb7 Mon Sep 17 00:00:00 2001 From: Bunny Date: Fri, 18 Jul 2025 10:42:59 +0800 Subject: [PATCH] =?UTF-8?q?:package:=20=E6=B7=BB=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=92=8C=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/dao/base/mapper/v1/DeptMapper.java | 4 +-- .../auth/dao/base/mapper/v1/DictMapper.java | 4 +-- .../dao/base/mapper/v1/EmailConfigMapper.java | 4 +-- .../base/mapper/v1/EmailTemplateMapper.java | 4 +-- .../auth/dao/base/mapper/v1/FileMapper.java | 4 +-- .../dao/base/mapper/v1/LoginLogMapper.java | 4 +-- .../auth/dao/base/mapper/v1/MenuMapper.java | 4 +-- .../dao/base/mapper/v1/MenuRoleMapper.java | 4 +-- .../base/mapper/v1/OperationLogMapper.java | 4 +-- .../dao/base/mapper/v1/PermissionMapper.java | 4 +-- .../base/mapper/v1/RoleDataScopeMapper.java | 4 +-- .../auth/dao/base/mapper/v1/RoleMapper.java | 4 +-- .../base/mapper/v1/RolePermissionMapper.java | 4 +-- .../dao/base/mapper/v1/UserDeptMapper.java | 4 +-- .../auth/dao/base/mapper/v1/UserMapper.java | 4 +-- .../dao/base/mapper/v1/UserRoleMapper.java | 4 +-- .../main/resources/mapper/v1/DeptMapper.xml | 2 +- .../main/resources/mapper/v1/DictMapper.xml | 2 +- .../resources/mapper/v1/EmailConfigMapper.xml | 2 +- .../mapper/v1/EmailTemplateMapper.xml | 2 +- .../main/resources/mapper/v1/FileMapper.xml | 2 +- .../resources/mapper/v1/LoginLogMapper.xml | 2 +- .../main/resources/mapper/v1/MenuMapper.xml | 2 +- .../resources/mapper/v1/MenuRoleMapper.xml | 2 +- .../mapper/v1/OperationLogMapper.xml | 2 +- .../resources/mapper/v1/PermissionMapper.xml | 2 +- .../mapper/v1/RoleDataScopeMapper.xml | 2 +- .../main/resources/mapper/v1/RoleMapper.xml | 2 +- .../mapper/v1/RolePermissionMapper.xml | 2 +- .../resources/mapper/v1/UserDeptMapper.xml | 2 +- .../main/resources/mapper/v1/UserMapper.xml | 2 +- .../resources/mapper/v1/UserRoleMapper.xml | 2 +- .../model/base/dto/{base => }/DeptDto.java | 2 +- .../model/base/dto/{base => }/DictDto.java | 2 +- .../base/dto/{base => }/EmailConfigDto.java | 2 +- .../base/dto/{base => }/EmailTemplateDto.java | 2 +- .../model/base/dto/{base => }/FileDto.java | 2 +- .../com/auth/model/base/dto/LoginDto.java | 19 ++++++++++ .../base/dto/{base => }/LoginLogDto.java | 2 +- .../model/base/dto/{base => }/MenuDto.java | 2 +- .../base/dto/{base => }/MenuRoleDto.java | 2 +- .../base/dto/{base => }/OperationLogDto.java | 2 +- .../base/dto/{base => }/PermissionDto.java | 2 +- .../base/dto/{base => }/RoleDataScopeDto.java | 2 +- .../model/base/dto/{base => }/RoleDto.java | 2 +- .../dto/{base => }/RolePermissionDto.java | 2 +- .../base/dto/{base => }/UserDeptDto.java | 2 +- .../model/base/dto/{base => }/UserDto.java | 2 +- .../base/dto/{base => }/UserRoleDto.java | 2 +- .../auth/model/base/vo/{base => }/DeptVo.java | 2 +- .../auth/model/base/vo/{base => }/DictVo.java | 2 +- .../base/vo/{base => }/EmailConfigVo.java | 2 +- .../base/vo/{base => }/EmailTemplateVo.java | 2 +- .../auth/model/base/vo/{base => }/FileVo.java | 2 +- .../model/base/vo/{base => }/LoginLogVo.java | 2 +- .../java/com/auth/model/base/vo/LoginVo.java | 35 +++++++++++++++++++ .../model/base/vo/{base => }/MenuRoleVo.java | 2 +- .../auth/model/base/vo/{base => }/MenuVo.java | 2 +- .../base/vo/{base => }/OperationLogVo.java | 2 +- .../base/vo/{base => }/PermissionVo.java | 2 +- .../base/vo/{base => }/RoleDataScopeVo.java | 2 +- .../base/vo/{base => }/RolePermissionVo.java | 2 +- .../auth/model/base/vo/{base => }/RoleVo.java | 2 +- .../model/base/vo/{base => }/UserDeptVo.java | 2 +- .../model/base/vo/{base => }/UserRoleVo.java | 2 +- .../auth/model/base/vo/{base => }/UserVo.java | 2 +- .../{v1 => }/controller/DeptController.java | 8 ++--- .../{v1 => }/controller/DictController.java | 8 ++--- .../controller/EmailConfigController.java | 8 ++--- .../controller/EmailTemplateController.java | 8 ++--- .../{v1 => }/controller/FileController.java | 8 ++--- .../controller/LoginLogController.java | 8 ++--- .../{v1 => }/controller/MenuController.java | 8 ++--- .../controller/MenuRoleController.java | 8 ++--- .../controller/OperationLogController.java | 8 ++--- .../controller/PermissionController.java | 8 ++--- .../{v1 => }/controller/RoleController.java | 8 ++--- .../controller/RoleDataScopeController.java | 8 ++--- .../controller/RolePermissionController.java | 8 ++--- .../{v1 => }/controller/UserController.java | 8 ++--- .../controller/UserDeptController.java | 8 ++--- .../controller/UserRoleController.java | 8 ++--- .../base/{v1 => }/service/DeptService.java | 6 ++-- .../base/{v1 => }/service/DictService.java | 6 ++-- .../{v1 => }/service/EmailConfigService.java | 6 ++-- .../service/EmailTemplateService.java | 6 ++-- .../base/{v1 => }/service/FileService.java | 6 ++-- .../{v1 => }/service/LoginLogService.java | 6 ++-- .../{v1 => }/service/MenuRoleService.java | 6 ++-- .../base/{v1 => }/service/MenuService.java | 6 ++-- .../{v1 => }/service/OperationLogService.java | 6 ++-- .../{v1 => }/service/PermissionService.java | 6 ++-- .../service/RoleDataScopeService.java | 6 ++-- .../service/RolePermissionService.java | 6 ++-- .../base/{v1 => }/service/RoleService.java | 6 ++-- .../{v1 => }/service/UserDeptService.java | 6 ++-- .../{v1 => }/service/UserRoleService.java | 6 ++-- .../base/{v1 => }/service/UserService.java | 6 ++-- .../service/impl/DeptServiceImpl.java | 8 ++--- .../service/impl/DictServiceImpl.java | 8 ++--- .../service/impl/EmailConfigServiceImpl.java | 8 ++--- .../impl/EmailTemplateServiceImpl.java | 8 ++--- .../service/impl/FileServiceImpl.java | 8 ++--- .../service/impl/LoginLogServiceImpl.java | 8 ++--- .../service/impl/MenuRoleServiceImpl.java | 8 ++--- .../service/impl/MenuServiceImpl.java | 8 ++--- .../service/impl/OperationLogServiceImpl.java | 8 ++--- .../service/impl/PermissionServiceImpl.java | 8 ++--- .../impl/RoleDataScopeServiceImpl.java | 8 ++--- .../impl/RolePermissionServiceImpl.java | 8 ++--- .../service/impl/RoleServiceImpl.java | 8 ++--- .../service/impl/UserDeptServiceImpl.java | 8 ++--- .../service/impl/UserRoleServiceImpl.java | 8 ++--- .../service/impl/UserServiceImpl.java | 8 ++--- .../base/v2/controller/package-info.java | 1 - .../service/base/v2/service/package-info.java | 1 - 116 files changed, 310 insertions(+), 258 deletions(-) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/DeptDto.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/DictDto.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/EmailConfigDto.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/EmailTemplateDto.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/FileDto.java (97%) create mode 100644 auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginDto.java rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/LoginLogDto.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/MenuDto.java (98%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/MenuRoleDto.java (93%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/OperationLogDto.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/PermissionDto.java (98%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/RoleDataScopeDto.java (93%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/RoleDto.java (96%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/RolePermissionDto.java (94%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/UserDeptDto.java (95%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/UserDto.java (98%) rename auth-model/model-base/src/main/java/com/auth/model/base/dto/{base => }/UserRoleDto.java (94%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/DeptVo.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/DictVo.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/EmailConfigVo.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/EmailTemplateVo.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/FileVo.java (98%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/LoginLogVo.java (97%) create mode 100644 auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginVo.java rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/MenuRoleVo.java (92%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/MenuVo.java (98%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/OperationLogVo.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/PermissionVo.java (98%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/RoleDataScopeVo.java (93%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/RolePermissionVo.java (94%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/RoleVo.java (97%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/UserDeptVo.java (95%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/UserRoleVo.java (94%) rename auth-model/model-base/src/main/java/com/auth/model/base/vo/{base => }/UserVo.java (98%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/DeptController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/DictController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/EmailConfigController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/EmailTemplateController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/FileController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/LoginLogController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/MenuController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/MenuRoleController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/OperationLogController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/PermissionController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/RoleController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/RoleDataScopeController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/RolePermissionController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/UserController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/UserDeptController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/controller/UserRoleController.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/DeptService.java (89%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/DictService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/EmailConfigService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/EmailTemplateService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/FileService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/LoginLogService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/MenuRoleService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/MenuService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/OperationLogService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/PermissionService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/RoleDataScopeService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/RolePermissionService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/RoleService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/UserDeptService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/UserRoleService.java (90%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/UserService.java (89%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/DeptServiceImpl.java (92%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/DictServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/EmailConfigServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/EmailTemplateServiceImpl.java (92%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/FileServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/LoginLogServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/MenuRoleServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/MenuServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/OperationLogServiceImpl.java (92%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/PermissionServiceImpl.java (92%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/RoleDataScopeServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/RolePermissionServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/RoleServiceImpl.java (92%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/UserDeptServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/UserRoleServiceImpl.java (93%) rename auth-services/service-base/src/main/java/com/auth/service/base/{v1 => }/service/impl/UserServiceImpl.java (92%) delete mode 100644 auth-services/service-base/src/main/java/com/auth/service/base/v2/controller/package-info.java delete mode 100644 auth-services/service-base/src/main/java/com/auth/service/base/v2/service/package-info.java diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java index e8f82bd..018f601 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.DeptDto; -import com.auth.model.base.vo.base.DeptVo; +import com.auth.model.base.dto.DeptDto; +import com.auth.model.base.vo.DeptVo; import com.auth.dao.base.entity.base.DeptEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java index c0232f8..030258b 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.DictDto; -import com.auth.model.base.vo.base.DictVo; +import com.auth.model.base.dto.DictDto; +import com.auth.model.base.vo.DictVo; import com.auth.dao.base.entity.base.DictEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java index 7de12ec..5e9b8b1 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.EmailConfigDto; -import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.model.base.dto.EmailConfigDto; +import com.auth.model.base.vo.EmailConfigVo; import com.auth.dao.base.entity.base.EmailConfigEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java index 2da34eb..cdc1409 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.EmailTemplateDto; -import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.EmailTemplateDto; +import com.auth.model.base.vo.EmailTemplateVo; import com.auth.dao.base.entity.base.EmailTemplateEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java index 9e8c243..62e6a0f 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.FileDto; -import com.auth.model.base.vo.base.FileVo; +import com.auth.model.base.dto.FileDto; +import com.auth.model.base.vo.FileVo; import com.auth.dao.base.entity.base.FileEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java index 7dc1828..a1c311d 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.LoginLogDto; -import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.model.base.dto.LoginLogDto; +import com.auth.model.base.vo.LoginLogVo; import com.auth.dao.base.entity.base.LoginLogEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java index 1b470d4..213b4b9 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.MenuDto; -import com.auth.model.base.vo.base.MenuVo; +import com.auth.model.base.dto.MenuDto; +import com.auth.model.base.vo.MenuVo; import com.auth.dao.base.entity.base.MenuEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java index 06a655d..ad0a884 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.MenuRoleDto; -import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.model.base.dto.MenuRoleDto; +import com.auth.model.base.vo.MenuRoleVo; import com.auth.dao.base.entity.base.MenuRoleEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java index a3fb767..f7cc62d 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.OperationLogDto; -import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.model.base.dto.OperationLogDto; +import com.auth.model.base.vo.OperationLogVo; import com.auth.dao.base.entity.base.OperationLogEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java index 75bf68d..643363e 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.PermissionDto; -import com.auth.model.base.vo.base.PermissionVo; +import com.auth.model.base.dto.PermissionDto; +import com.auth.model.base.vo.PermissionVo; import com.auth.dao.base.entity.base.PermissionEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java index 0cd67a8..572e44d 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.RoleDataScopeDto; -import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.RoleDataScopeDto; +import com.auth.model.base.vo.RoleDataScopeVo; import com.auth.dao.base.entity.base.RoleDataScopeEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java index 43f8bb6..56819d2 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.RoleDto; -import com.auth.model.base.vo.base.RoleVo; +import com.auth.model.base.dto.RoleDto; +import com.auth.model.base.vo.RoleVo; import com.auth.dao.base.entity.base.RoleEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java index e6a8c26..56a1fdf 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.RolePermissionDto; -import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.model.base.dto.RolePermissionDto; +import com.auth.model.base.vo.RolePermissionVo; import com.auth.dao.base.entity.base.RolePermissionEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java index bc413ac..3c1ac0b 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.UserDeptDto; -import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.model.base.dto.UserDeptDto; +import com.auth.model.base.vo.UserDeptVo; import com.auth.dao.base.entity.base.UserDeptEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java index 6416c7a..2430ef7 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.UserDto; -import com.auth.model.base.vo.base.UserVo; +import com.auth.model.base.dto.UserDto; +import com.auth.model.base.vo.UserVo; import com.auth.dao.base.entity.base.PermissionEntity; import com.auth.dao.base.entity.base.RoleEntity; import com.auth.dao.base.entity.base.UserEntity; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java index 0903e84..9347c55 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.model.base.dto.base.UserRoleDto; -import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.model.base.dto.UserRoleDto; +import com.auth.model.base.vo.UserRoleVo; import com.auth.dao.base.entity.base.UserRoleEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml index b0813b1..944888b 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml @@ -32,7 +32,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml index 0a4a06d..bba09d6 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml @@ -31,7 +31,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml index b542388..f2b8689 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml @@ -32,7 +32,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml index 058610b..48fc6b9 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml @@ -34,7 +34,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml index 132e5c6..1f66459 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml @@ -35,7 +35,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml index 5ef0b09..3e5a730 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml @@ -30,7 +30,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml index a1f492d..e9fa6a0 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml @@ -37,7 +37,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml index 693e65d..db824af 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml index 9423d68..a654f55 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml @@ -34,7 +34,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml index 2291ddb..321f8d4 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml @@ -36,7 +36,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml index f573bb8..27eb591 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml index 2a2faab..119834b 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml @@ -28,7 +28,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml index b4b26bf..a84f366 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml index 5cc37ae..dab730f 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml index b4ade7b..8e295bb 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml @@ -41,7 +41,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml index 9bfa504..c8f69d0 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DeptDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/DeptDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DeptDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/DeptDto.java index 00953ba..d3d19c7 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DeptDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/DeptDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DictDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/DictDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DictDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/DictDto.java index f68baf3..7b4d9cd 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DictDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/DictDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailConfigDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailConfigDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailConfigDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailConfigDto.java index f3a3eb7..4c0265b 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailConfigDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailConfigDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailTemplateDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailTemplateDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailTemplateDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailTemplateDto.java index 36868ff..0c6b1d6 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailTemplateDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/FileDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/FileDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/FileDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/FileDto.java index 15a87cf..91ee4d2 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/FileDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/FileDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginDto.java new file mode 100644 index 0000000..1df4b01 --- /dev/null +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginDto.java @@ -0,0 +1,19 @@ +package com.auth.model.base.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(name = "LoginDto", title = "LoginDto登录参数", description = "登录请求参数") +public class LoginDto { + + @Schema(name = "type", description = "登录类型") + private String type = "default"; + + @Schema(name = "username", title = "用户名") + private String username; + + @Schema(name = "password", description = "密码") + private String password; + +} diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/LoginLogDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginLogDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/LoginLogDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginLogDto.java index de30722..c88c645 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/LoginLogDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginLogDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuDto.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuDto.java index 230186c..b64db6d 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuRoleDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuRoleDto.java similarity index 93% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuRoleDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuRoleDto.java index 6aa3ee3..e2fe1f0 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuRoleDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuRoleDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/OperationLogDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/OperationLogDto.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/OperationLogDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/OperationLogDto.java index 6419938..79f3418 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/OperationLogDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/OperationLogDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/PermissionDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/PermissionDto.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/PermissionDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/PermissionDto.java index 5f00a9b..93edbd2 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/PermissionDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/PermissionDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDataScopeDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDataScopeDto.java similarity index 93% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDataScopeDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDataScopeDto.java index 88d6cb4..5629c92 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDataScopeDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDataScopeDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDto.java similarity index 96% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDto.java index 08658aa..087c0db 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RolePermissionDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/RolePermissionDto.java similarity index 94% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RolePermissionDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/RolePermissionDto.java index 2f01bcf..64b221b 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RolePermissionDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/RolePermissionDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDeptDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDeptDto.java similarity index 95% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDeptDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDeptDto.java index b910734..9d4a4be 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDeptDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDeptDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDto.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDto.java index b3e5f7d..0590ced 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserRoleDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/UserRoleDto.java similarity index 94% rename from auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserRoleDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/UserRoleDto.java index 3cc2484..0202c7c 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserRoleDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/UserRoleDto.java @@ -1,4 +1,4 @@ -package com.auth.model.base.dto.base; +package com.auth.model.base.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DeptVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/DeptVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DeptVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/DeptVo.java index 0379264..cf33576 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DeptVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/DeptVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DictVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/DictVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DictVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/DictVo.java index e75b97d..9cdf5af 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DictVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/DictVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailConfigVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailConfigVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailConfigVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailConfigVo.java index 857e451..2200e08 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailConfigVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailConfigVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailTemplateVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailTemplateVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailTemplateVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailTemplateVo.java index 1a79af8..ac602de 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailTemplateVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/FileVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/FileVo.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/FileVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/FileVo.java index 8507aef..78867f2 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/FileVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/FileVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/LoginLogVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginLogVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/LoginLogVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginLogVo.java index 88998a8..95d0210 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/LoginLogVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginLogVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginVo.java new file mode 100644 index 0000000..1a6869d --- /dev/null +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginVo.java @@ -0,0 +1,35 @@ +package com.auth.model.base.vo; + +import com.auth.common.model.common.BaseVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@EqualsAndHashCode(callSuper = true) +@AllArgsConstructor +@NoArgsConstructor +@Schema(name = "LoginVo对象", title = "登录成功返回内容", description = "登录成功返回内容") +public class LoginVo extends BaseVo { + + @Schema(name = "nickname", title = "昵称") + private String nickname; + + @Schema(name = "username", title = "用户名") + private String username; + + @Schema(name = "email", title = "邮箱") + private String email; + + @Schema(name = "token", title = "令牌") + private String token; + + @Schema(name = "expires", title = "过期时间") + private String expires; + + @Schema(name = "readMeDay", title = "记住我多久") + private Long readMeDay; + +} \ No newline at end of file diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuRoleVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuRoleVo.java similarity index 92% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuRoleVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuRoleVo.java index a79851f..f78bb0d 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuRoleVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuRoleVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuVo.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuVo.java index 4b29773..a507b4c 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/OperationLogVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/OperationLogVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/OperationLogVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/OperationLogVo.java index 30d69dd..85c585c 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/OperationLogVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/OperationLogVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/PermissionVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/PermissionVo.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/PermissionVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/PermissionVo.java index 217dca9..20a2a30 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/PermissionVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/PermissionVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleDataScopeVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleDataScopeVo.java similarity index 93% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleDataScopeVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleDataScopeVo.java index c078d36..2f7bb0c 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleDataScopeVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleDataScopeVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RolePermissionVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/RolePermissionVo.java similarity index 94% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RolePermissionVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/RolePermissionVo.java index de834b2..4a96a6e 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RolePermissionVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/RolePermissionVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleVo.java similarity index 97% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleVo.java index 4dcce6b..9f67ce9 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserDeptVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/UserDeptVo.java similarity index 95% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserDeptVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/UserDeptVo.java index 35c60ca..1e22dc7 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserDeptVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/UserDeptVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserRoleVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/UserRoleVo.java similarity index 94% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserRoleVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/UserRoleVo.java index cc6b3b0..ed940e2 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserRoleVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/UserRoleVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/UserVo.java similarity index 98% rename from auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/UserVo.java index bc83b45..e83efa8 100644 --- a/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/UserVo.java @@ -1,4 +1,4 @@ -package com.auth.model.base.vo.base; +package com.auth.model.base.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java index 2e766e7..823fdcd 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.DeptDto; -import com.auth.model.base.vo.base.DeptVo; +import com.auth.model.base.dto.DeptDto; +import com.auth.model.base.vo.DeptVo; import com.auth.dao.base.entity.base.DeptEntity; -import com.auth.service.base.v1.service.DeptService; +import com.auth.service.base.service.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DictController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/DictController.java index 3f4027f..a4feb01 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DictController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.DictDto; -import com.auth.model.base.vo.base.DictVo; +import com.auth.model.base.dto.DictDto; +import com.auth.model.base.vo.DictVo; import com.auth.dao.base.entity.base.DictEntity; -import com.auth.service.base.v1.service.DictService; +import com.auth.service.base.service.DictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailConfigController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailConfigController.java index c3418ea..922a0c2 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailConfigController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.EmailConfigDto; -import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.model.base.dto.EmailConfigDto; +import com.auth.model.base.vo.EmailConfigVo; import com.auth.dao.base.entity.base.EmailConfigEntity; -import com.auth.service.base.v1.service.EmailConfigService; +import com.auth.service.base.service.EmailConfigService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailTemplateController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailTemplateController.java index d9be5b1..ac9ad52 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailTemplateController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.EmailTemplateDto; -import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.EmailTemplateDto; +import com.auth.model.base.vo.EmailTemplateVo; import com.auth.dao.base.entity.base.EmailTemplateEntity; -import com.auth.service.base.v1.service.EmailTemplateService; +import com.auth.service.base.service.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/FileController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/FileController.java index 747ac57..e55a1b6 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/FileController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.FileDto; -import com.auth.model.base.vo.base.FileVo; +import com.auth.model.base.dto.FileDto; +import com.auth.model.base.vo.FileVo; import com.auth.dao.base.entity.base.FileEntity; -import com.auth.service.base.v1.service.FileService; +import com.auth.service.base.service.FileService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/LoginLogController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/LoginLogController.java index cc49c92..5515363 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/LoginLogController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.LoginLogDto; -import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.model.base.dto.LoginLogDto; +import com.auth.model.base.vo.LoginLogVo; import com.auth.dao.base.entity.base.LoginLogEntity; -import com.auth.service.base.v1.service.LoginLogService; +import com.auth.service.base.service.LoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuController.java index 6dc81aa..07023d7 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.MenuDto; -import com.auth.model.base.vo.base.MenuVo; +import com.auth.model.base.dto.MenuDto; +import com.auth.model.base.vo.MenuVo; import com.auth.dao.base.entity.base.MenuEntity; -import com.auth.service.base.v1.service.MenuService; +import com.auth.service.base.service.MenuService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuRoleController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuRoleController.java index f3c0db1..0e933fc 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuRoleController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.MenuRoleDto; -import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.model.base.dto.MenuRoleDto; +import com.auth.model.base.vo.MenuRoleVo; import com.auth.dao.base.entity.base.MenuRoleEntity; -import com.auth.service.base.v1.service.MenuRoleService; +import com.auth.service.base.service.MenuRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/OperationLogController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/OperationLogController.java index e57f20c..09c23e5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/OperationLogController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.OperationLogDto; -import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.model.base.dto.OperationLogDto; +import com.auth.model.base.vo.OperationLogVo; import com.auth.dao.base.entity.base.OperationLogEntity; -import com.auth.service.base.v1.service.OperationLogService; +import com.auth.service.base.service.OperationLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/PermissionController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/PermissionController.java index e090078..30b5a44 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/PermissionController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.PermissionDto; -import com.auth.model.base.vo.base.PermissionVo; +import com.auth.model.base.dto.PermissionDto; +import com.auth.model.base.vo.PermissionVo; import com.auth.dao.base.entity.base.PermissionEntity; -import com.auth.service.base.v1.service.PermissionService; +import com.auth.service.base.service.PermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleController.java index 8524b29..118f87c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.RoleDto; -import com.auth.model.base.vo.base.RoleVo; +import com.auth.model.base.dto.RoleDto; +import com.auth.model.base.vo.RoleVo; import com.auth.dao.base.entity.base.RoleEntity; -import com.auth.service.base.v1.service.RoleService; +import com.auth.service.base.service.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleDataScopeController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleDataScopeController.java index d625725..f7e04f7 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleDataScopeController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.RoleDataScopeDto; -import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.RoleDataScopeDto; +import com.auth.model.base.vo.RoleDataScopeVo; import com.auth.dao.base.entity.base.RoleDataScopeEntity; -import com.auth.service.base.v1.service.RoleDataScopeService; +import com.auth.service.base.service.RoleDataScopeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RolePermissionController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/RolePermissionController.java index cdc445e..3629535 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RolePermissionController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.RolePermissionDto; -import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.model.base.dto.RolePermissionDto; +import com.auth.model.base.vo.RolePermissionVo; import com.auth.dao.base.entity.base.RolePermissionEntity; -import com.auth.service.base.v1.service.RolePermissionService; +import com.auth.service.base.service.RolePermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/UserController.java index 43a8f19..ba52a67 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.UserDto; -import com.auth.model.base.vo.base.UserVo; +import com.auth.model.base.dto.UserDto; +import com.auth.model.base.vo.UserVo; import com.auth.dao.base.entity.base.UserEntity; -import com.auth.service.base.v1.service.UserService; +import com.auth.service.base.service.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserDeptController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/UserDeptController.java index 428b340..671b84d 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserDeptController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.UserDeptDto; -import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.model.base.dto.UserDeptDto; +import com.auth.model.base.vo.UserDeptVo; import com.auth.dao.base.entity.base.UserDeptEntity; -import com.auth.service.base.v1.service.UserDeptService; +import com.auth.service.base.service.UserDeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserRoleController.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java rename to auth-services/service-base/src/main/java/com/auth/service/base/controller/UserRoleController.java index db923d7..163bd6b 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserRoleController.java @@ -1,12 +1,12 @@ -package com.auth.service.base.v1.controller; +package com.auth.service.base.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.model.base.dto.base.UserRoleDto; -import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.model.base.dto.UserRoleDto; +import com.auth.model.base.vo.UserRoleVo; import com.auth.dao.base.entity.base.UserRoleEntity; -import com.auth.service.base.v1.service.UserRoleService; +import com.auth.service.base.service.UserRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java similarity index 89% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java index 8ef2f93..3de23b9 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.DeptDto; -import com.auth.model.base.vo.base.DeptVo; +import com.auth.model.base.dto.DeptDto; +import com.auth.model.base.vo.DeptVo; import com.auth.dao.base.entity.base.DeptEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/DictService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/DictService.java index 85e3475..6b695c0 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/DictService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.DictDto; -import com.auth.model.base.vo.base.DictVo; +import com.auth.model.base.dto.DictDto; +import com.auth.model.base.vo.DictVo; import com.auth.dao.base.entity.base.DictEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailConfigService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/EmailConfigService.java index 4be9cb8..cc284bb 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailConfigService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.EmailConfigDto; -import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.model.base.dto.EmailConfigDto; +import com.auth.model.base.vo.EmailConfigVo; import com.auth.dao.base.entity.base.EmailConfigEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailTemplateService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/EmailTemplateService.java index da58021..f610098 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailTemplateService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.EmailTemplateDto; -import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.EmailTemplateDto; +import com.auth.model.base.vo.EmailTemplateVo; import com.auth.dao.base.entity.base.EmailTemplateEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/FileService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/FileService.java index 3842fc8..28d3f6a 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/FileService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.FileDto; -import com.auth.model.base.vo.base.FileVo; +import com.auth.model.base.dto.FileDto; +import com.auth.model.base.vo.FileVo; import com.auth.dao.base.entity.base.FileEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/LoginLogService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/LoginLogService.java index c8c9253..8c64c8c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/LoginLogService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.LoginLogDto; -import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.model.base.dto.LoginLogDto; +import com.auth.model.base.vo.LoginLogVo; import com.auth.dao.base.entity.base.LoginLogEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuRoleService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/MenuRoleService.java index b00bbf0..443cc2b 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuRoleService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.MenuRoleDto; -import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.model.base.dto.MenuRoleDto; +import com.auth.model.base.vo.MenuRoleVo; import com.auth.dao.base.entity.base.MenuRoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/MenuService.java index 0c61089..2ecc933 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.MenuDto; -import com.auth.model.base.vo.base.MenuVo; +import com.auth.model.base.dto.MenuDto; +import com.auth.model.base.vo.MenuVo; import com.auth.dao.base.entity.base.MenuEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/OperationLogService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/OperationLogService.java index 8485ae0..fd620b1 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/OperationLogService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.OperationLogDto; -import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.model.base.dto.OperationLogDto; +import com.auth.model.base.vo.OperationLogVo; import com.auth.dao.base.entity.base.OperationLogEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/PermissionService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/PermissionService.java index 8b5ddb8..0ed8cbf 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/PermissionService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.PermissionDto; -import com.auth.model.base.vo.base.PermissionVo; +import com.auth.model.base.dto.PermissionDto; +import com.auth.model.base.vo.PermissionVo; import com.auth.dao.base.entity.base.PermissionEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleDataScopeService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/RoleDataScopeService.java index 4b5dc51..97f7363 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleDataScopeService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.RoleDataScopeDto; -import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.RoleDataScopeDto; +import com.auth.model.base.vo.RoleDataScopeVo; import com.auth.dao.base.entity.base.RoleDataScopeEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/RolePermissionService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/RolePermissionService.java index ebfc0d1..27bd17c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/RolePermissionService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.RolePermissionDto; -import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.model.base.dto.RolePermissionDto; +import com.auth.model.base.vo.RolePermissionVo; import com.auth.dao.base.entity.base.RolePermissionEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/RoleService.java index 99b9868..956e69d 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.RoleDto; -import com.auth.model.base.vo.base.RoleVo; +import com.auth.model.base.dto.RoleDto; +import com.auth.model.base.vo.RoleVo; import com.auth.dao.base.entity.base.RoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserDeptService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/UserDeptService.java index 5b0cba9..300728f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserDeptService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.UserDeptDto; -import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.model.base.dto.UserDeptDto; +import com.auth.model.base.vo.UserDeptVo; import com.auth.dao.base.entity.base.UserDeptEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserRoleService.java similarity index 90% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/UserRoleService.java index 24f2003..9d14bff 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserRoleService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.UserRoleDto; -import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.model.base.dto.UserRoleDto; +import com.auth.model.base.vo.UserRoleVo; import com.auth.dao.base.entity.base.UserRoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserService.java similarity index 89% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/UserService.java index 03fec87..fd3d106 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserService.java @@ -1,8 +1,8 @@ -package com.auth.service.base.v1.service; +package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.UserDto; -import com.auth.model.base.vo.base.UserVo; +import com.auth.model.base.dto.UserDto; +import com.auth.model.base.vo.UserVo; import com.auth.dao.base.entity.base.UserEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java similarity index 92% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java index 7c521d5..0790f7e 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.DeptDto; -import com.auth.model.base.vo.base.DeptVo; +import com.auth.model.base.dto.DeptDto; +import com.auth.model.base.vo.DeptVo; import com.auth.dao.base.entity.base.DeptEntity; import com.auth.dao.base.mapper.v1.DeptMapper; -import com.auth.service.base.v1.service.DeptService; +import com.auth.service.base.service.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java index 09991cc..7152ce3 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.DictDto; -import com.auth.model.base.vo.base.DictVo; +import com.auth.model.base.dto.DictDto; +import com.auth.model.base.vo.DictVo; import com.auth.dao.base.entity.base.DictEntity; import com.auth.dao.base.mapper.v1.DictMapper; -import com.auth.service.base.v1.service.DictService; +import com.auth.service.base.service.DictService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java index d1ba17a..ff8463e 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.EmailConfigDto; -import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.model.base.dto.EmailConfigDto; +import com.auth.model.base.vo.EmailConfigVo; import com.auth.dao.base.entity.base.EmailConfigEntity; import com.auth.dao.base.mapper.v1.EmailConfigMapper; -import com.auth.service.base.v1.service.EmailConfigService; +import com.auth.service.base.service.EmailConfigService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java similarity index 92% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java index 6c4928c..bc54d1b 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.EmailTemplateDto; -import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.EmailTemplateDto; +import com.auth.model.base.vo.EmailTemplateVo; import com.auth.dao.base.entity.base.EmailTemplateEntity; import com.auth.dao.base.mapper.v1.EmailTemplateMapper; -import com.auth.service.base.v1.service.EmailTemplateService; +import com.auth.service.base.service.EmailTemplateService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java index 41dd353..3c2da2d 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.FileDto; -import com.auth.model.base.vo.base.FileVo; +import com.auth.model.base.dto.FileDto; +import com.auth.model.base.vo.FileVo; import com.auth.dao.base.entity.base.FileEntity; import com.auth.dao.base.mapper.v1.FileMapper; -import com.auth.service.base.v1.service.FileService; +import com.auth.service.base.service.FileService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java index d4ea8ce..e48ab9f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.LoginLogDto; -import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.model.base.dto.LoginLogDto; +import com.auth.model.base.vo.LoginLogVo; import com.auth.dao.base.entity.base.LoginLogEntity; import com.auth.dao.base.mapper.v1.LoginLogMapper; -import com.auth.service.base.v1.service.LoginLogService; +import com.auth.service.base.service.LoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java index 69eafc2..38a88ba 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.MenuRoleDto; -import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.model.base.dto.MenuRoleDto; +import com.auth.model.base.vo.MenuRoleVo; import com.auth.dao.base.entity.base.MenuRoleEntity; import com.auth.dao.base.mapper.v1.MenuRoleMapper; -import com.auth.service.base.v1.service.MenuRoleService; +import com.auth.service.base.service.MenuRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java index 74d0298..20c28f5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.MenuDto; -import com.auth.model.base.vo.base.MenuVo; +import com.auth.model.base.dto.MenuDto; +import com.auth.model.base.vo.MenuVo; import com.auth.dao.base.entity.base.MenuEntity; import com.auth.dao.base.mapper.v1.MenuMapper; -import com.auth.service.base.v1.service.MenuService; +import com.auth.service.base.service.MenuService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java similarity index 92% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java index 4f55973..ccce945 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.OperationLogDto; -import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.model.base.dto.OperationLogDto; +import com.auth.model.base.vo.OperationLogVo; import com.auth.dao.base.entity.base.OperationLogEntity; import com.auth.dao.base.mapper.v1.OperationLogMapper; -import com.auth.service.base.v1.service.OperationLogService; +import com.auth.service.base.service.OperationLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java similarity index 92% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java index 2f66aaf..692a616 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.PermissionDto; -import com.auth.model.base.vo.base.PermissionVo; +import com.auth.model.base.dto.PermissionDto; +import com.auth.model.base.vo.PermissionVo; import com.auth.dao.base.entity.base.PermissionEntity; import com.auth.dao.base.mapper.v1.PermissionMapper; -import com.auth.service.base.v1.service.PermissionService; +import com.auth.service.base.service.PermissionService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java index 88fa839..68aca71 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.RoleDataScopeDto; -import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.RoleDataScopeDto; +import com.auth.model.base.vo.RoleDataScopeVo; import com.auth.dao.base.entity.base.RoleDataScopeEntity; import com.auth.dao.base.mapper.v1.RoleDataScopeMapper; -import com.auth.service.base.v1.service.RoleDataScopeService; +import com.auth.service.base.service.RoleDataScopeService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java index 385e3d5..33b1213 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.RolePermissionDto; -import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.model.base.dto.RolePermissionDto; +import com.auth.model.base.vo.RolePermissionVo; import com.auth.dao.base.entity.base.RolePermissionEntity; import com.auth.dao.base.mapper.v1.RolePermissionMapper; -import com.auth.service.base.v1.service.RolePermissionService; +import com.auth.service.base.service.RolePermissionService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java similarity index 92% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java index 8fe332f..88d7f18 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.RoleDto; -import com.auth.model.base.vo.base.RoleVo; +import com.auth.model.base.dto.RoleDto; +import com.auth.model.base.vo.RoleVo; import com.auth.dao.base.entity.base.RoleEntity; import com.auth.dao.base.mapper.v1.RoleMapper; -import com.auth.service.base.v1.service.RoleService; +import com.auth.service.base.service.RoleService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java index cf0c160..d665155 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.UserDeptDto; -import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.model.base.dto.UserDeptDto; +import com.auth.model.base.vo.UserDeptVo; import com.auth.dao.base.entity.base.UserDeptEntity; import com.auth.dao.base.mapper.v1.UserDeptMapper; -import com.auth.service.base.v1.service.UserDeptService; +import com.auth.service.base.service.UserDeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java similarity index 93% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java index f4fee6d..947a914 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.UserRoleDto; -import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.model.base.dto.UserRoleDto; +import com.auth.model.base.vo.UserRoleVo; import com.auth.dao.base.entity.base.UserRoleEntity; import com.auth.dao.base.mapper.v1.UserRoleMapper; -import com.auth.service.base.v1.service.UserRoleService; +import com.auth.service.base.service.UserRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java similarity index 92% rename from auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java rename to auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java index 6e3466c..ac58c0e 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java @@ -1,11 +1,11 @@ -package com.auth.service.base.v1.service.impl; +package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.model.base.dto.base.UserDto; -import com.auth.model.base.vo.base.UserVo; +import com.auth.model.base.dto.UserDto; +import com.auth.model.base.vo.UserVo; import com.auth.dao.base.entity.base.UserEntity; import com.auth.dao.base.mapper.v1.UserMapper; -import com.auth.service.base.v1.service.UserService; +import com.auth.service.base.service.UserService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v2/controller/package-info.java b/auth-services/service-base/src/main/java/com/auth/service/base/v2/controller/package-info.java deleted file mode 100644 index 6d0c603..0000000 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v2/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.auth.service.base.v2.controller; \ No newline at end of file diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v2/service/package-info.java b/auth-services/service-base/src/main/java/com/auth/service/base/v2/service/package-info.java deleted file mode 100644 index 7376d1a..0000000 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v2/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.auth.service.base.v2.service; \ No newline at end of file