diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index caa7dc95..fede7a5c 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -370,7 +370,7 @@ public class GenUtil { } if ("Mapper".equals(templateName)) { - return packagePath + "service" + File.separator + "mapper" + File.separator + className + "Mapper.java"; + return packagePath + "service" + File.separator + "mapstruct" + File.separator + className + "Mapper.java"; } if ("Repository".equals(templateName)) { diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java index dda2b235..c7309b7b 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java @@ -23,8 +23,8 @@ import me.zhengjie.domain.Log; import me.zhengjie.repository.LogRepository; import me.zhengjie.service.LogService; import me.zhengjie.service.dto.LogQueryCriteria; -import me.zhengjie.service.mapper.LogErrorMapper; -import me.zhengjie.service.mapper.LogSmallMapper; +import me.zhengjie.service.mapstruct.LogErrorMapper; +import me.zhengjie.service.mapstruct.LogSmallMapper; import me.zhengjie.utils.*; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java b/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java similarity index 96% rename from eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java rename to eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java index 6272382f..3ae02c90 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogErrorMapper.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.mapper; +package me.zhengjie.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.domain.Log; diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java b/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java similarity index 96% rename from eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java rename to eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java index 8873ea7f..9f2972ad 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapper/LogSmallMapper.java +++ b/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.mapper; +package me.zhengjie.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.domain.Log; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java index afd1da95..cdd58dff 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java @@ -22,7 +22,7 @@ import me.zhengjie.modules.mnt.repository.AppRepository; import me.zhengjie.modules.mnt.service.AppService; import me.zhengjie.modules.mnt.service.dto.AppDto; import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria; -import me.zhengjie.modules.mnt.service.mapper.AppMapper; +import me.zhengjie.modules.mnt.service.mapstruct.AppMapper; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.QueryHelp; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java index bbac10fe..3d8e8f46 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java @@ -23,7 +23,7 @@ import me.zhengjie.modules.mnt.repository.DatabaseRepository; import me.zhengjie.modules.mnt.service.DatabaseService; import me.zhengjie.modules.mnt.service.dto.DatabaseDto; import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria; -import me.zhengjie.modules.mnt.service.mapper.DatabaseMapper; +import me.zhengjie.modules.mnt.service.mapstruct.DatabaseMapper; import me.zhengjie.modules.mnt.util.SqlUtils; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java index 27d8eb98..78b5901d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java @@ -22,7 +22,7 @@ import me.zhengjie.modules.mnt.repository.DeployHistoryRepository; import me.zhengjie.modules.mnt.service.DeployHistoryService; import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria; -import me.zhengjie.modules.mnt.service.mapper.DeployHistoryMapper; +import me.zhengjie.modules.mnt.service.mapstruct.DeployHistoryMapper; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.QueryHelp; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java index 0f66577a..783edec8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java @@ -29,7 +29,7 @@ import me.zhengjie.modules.mnt.service.DeployHistoryService; import me.zhengjie.modules.mnt.service.DeployService; import me.zhengjie.modules.mnt.service.ServerDeployService; import me.zhengjie.modules.mnt.service.dto.*; -import me.zhengjie.modules.mnt.service.mapper.DeployMapper; +import me.zhengjie.modules.mnt.service.mapstruct.DeployMapper; import me.zhengjie.modules.mnt.util.ExecuteShellUtil; import me.zhengjie.modules.mnt.util.ScpClientUtil; import me.zhengjie.modules.mnt.websocket.MsgType; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java index 35313086..cf02bc52 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java @@ -21,7 +21,7 @@ import me.zhengjie.modules.mnt.repository.ServerDeployRepository; import me.zhengjie.modules.mnt.service.ServerDeployService; import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria; -import me.zhengjie.modules.mnt.service.mapper.ServerDeployMapper; +import me.zhengjie.modules.mnt.service.mapstruct.ServerDeployMapper; import me.zhengjie.modules.mnt.util.ExecuteShellUtil; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java index 4e9e1905..fc39eeb2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/AppMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapper; +package me.zhengjie.modules.mnt.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.App; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java index 05bb096d..3cc6e8dd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DatabaseMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapper; +package me.zhengjie.modules.mnt.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.Database; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java index cd0ac991..2522ab02 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployHistoryMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapper; +package me.zhengjie.modules.mnt.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.DeployHistory; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java index a5e3ae47..cd3edee8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/DeployMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapper; +package me.zhengjie.modules.mnt.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.Deploy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java index a393a879..960b25b1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapper/ServerDeployMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapper; +package me.zhengjie.modules.mnt.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.mnt.domain.ServerDeploy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java index 31fec577..21a2782c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java @@ -25,7 +25,7 @@ import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.DeptRepository; import me.zhengjie.modules.system.service.DeptService; -import me.zhengjie.modules.system.service.mapper.DeptMapper; +import me.zhengjie.modules.system.service.mapstruct.DeptMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java index 53a078eb..3893337d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java @@ -24,7 +24,7 @@ import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.DictDetailRepository; import me.zhengjie.modules.system.service.DictDetailService; import me.zhengjie.modules.system.service.dto.DictDetailDto; -import me.zhengjie.modules.system.service.mapper.DictDetailMapper; +import me.zhengjie.modules.system.service.mapstruct.DictDetailMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index bcea6634..b351d003 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -27,7 +27,7 @@ import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.DictRepository; import me.zhengjie.modules.system.service.DictService; import me.zhengjie.modules.system.service.dto.DictDto; -import me.zhengjie.modules.system.service.mapper.DictMapper; +import me.zhengjie.modules.system.service.mapstruct.DictMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java index cd58f9cb..01c14fa2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java @@ -26,7 +26,7 @@ import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.system.repository.JobRepository; import me.zhengjie.modules.system.service.JobService; import me.zhengjie.modules.system.service.dto.JobDto; -import me.zhengjie.modules.system.service.mapper.JobMapper; +import me.zhengjie.modules.system.service.mapstruct.JobMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java index 50dd02dd..e3f0031d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java @@ -29,7 +29,7 @@ import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.dto.MenuDto; import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; import me.zhengjie.modules.system.service.dto.RoleSmallDto; -import me.zhengjie.modules.system.service.mapper.MenuMapper; +import me.zhengjie.modules.system.service.mapstruct.MenuMapper; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.QueryHelp; import me.zhengjie.utils.StringUtils; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index a32b58c4..02b1ef2c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -28,8 +28,8 @@ import me.zhengjie.modules.system.service.dto.RoleDto; import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; import me.zhengjie.modules.system.service.dto.RoleSmallDto; import me.zhengjie.modules.system.service.dto.UserDto; -import me.zhengjie.modules.system.service.mapper.RoleMapper; -import me.zhengjie.modules.system.service.mapper.RoleSmallMapper; +import me.zhengjie.modules.system.service.mapstruct.RoleMapper; +import me.zhengjie.modules.system.service.mapstruct.RoleSmallMapper; import me.zhengjie.utils.*; import me.zhengjie.utils.enums.DataScopeEnum; import org.springframework.cache.annotation.CacheConfig; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index 2eb34b2d..24655117 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -26,7 +26,7 @@ import me.zhengjie.modules.system.service.dto.JobSmallDto; import me.zhengjie.modules.system.service.dto.RoleSmallDto; import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.modules.system.service.dto.UserQueryCriteria; -import me.zhengjie.modules.system.service.mapper.UserMapper; +import me.zhengjie.modules.system.service.mapstruct.UserMapper; import me.zhengjie.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptMapper.java index 2885d788..e45f3f8e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dept; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptSmallMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptSmallMapper.java index 5fb40791..75076001 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptSmallMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dept; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictDetailMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictDetailMapper.java index 8832a04d..3f9fe84e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictDetailMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.DictDetail; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictMapper.java index 54bfa490..1047b3bb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dict; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictSmallMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictSmallMapper.java index e834adcc..80ccc4e3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictSmallMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Dict; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobMapper.java index 388d05a2..37719302 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Job; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobSmallMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobSmallMapper.java index e73f99f0..36a59cf3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobSmallMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Job; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/MenuMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/MenuMapper.java index 4d704cdb..50f22be6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/MenuMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Menu; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleMapper.java index 0bda9dc1..5dc551df 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Role; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleSmallMapper.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleSmallMapper.java index 17ea9592..db034b5c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/RoleSmallMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleSmallMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.Role; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserMapper.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java rename to eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserMapper.java index eac3331e..510c21b4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/UserMapper.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapper; +package me.zhengjie.modules.system.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.modules.system.domain.User; diff --git a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl index 670ab65b..aac1aeac 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ${package}.service.mapper; +package ${package}.service.mapstruct; import me.zhengjie.base.BaseMapper; import ${package}.domain.${className}; diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index 5dd3d1b6..0ef66513 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -32,7 +32,7 @@ import ${package}.repository.${className}Repository; import ${package}.service.${className}Service; import ${package}.service.dto.${className}Dto; import ${package}.service.dto.${className}QueryCriteria; -import ${package}.service.mapper.${className}Mapper; +import ${package}.service.mapstruct.${className}Mapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java index 671e549a..0eb0ab79 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java @@ -21,7 +21,7 @@ import me.zhengjie.config.FileProperties; import me.zhengjie.domain.LocalStorage; import me.zhengjie.service.dto.LocalStorageDto; import me.zhengjie.service.dto.LocalStorageQueryCriteria; -import me.zhengjie.service.mapper.LocalStorageMapper; +import me.zhengjie.service.mapstruct.LocalStorageMapper; import me.zhengjie.exception.BadRequestException; import me.zhengjie.utils.*; import me.zhengjie.repository.LocalStorageRepository; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java b/eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java rename to eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java index 8fd83bc1..4c6d9555 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.mapper; +package me.zhengjie.service.mapstruct; import me.zhengjie.base.BaseMapper; import me.zhengjie.service.dto.LocalStorageDto;