From 533cd1d33dbe44522666da3b10c7396f5fb9cf8f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 28 Apr 2021 00:01:14 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - pom.xml | 368 +-------- yudao-admin-server/pom.xml | 367 +++++++++ .../dashboard/DashboardApplication.java | 0 .../common/core/IntArrayValuable.java | 0 .../dashboard/common/core/KeyValue.java | 0 .../common/enums/CommonStatusEnum.java | 0 .../common/enums/DefaultBitFieldEnum.java | 0 .../dashboard/common/enums/UserTypeEnum.java | 0 .../dashboard/common/exception/ErrorCode.java | 0 .../common/exception/ServiceException.java | 0 .../enums/GlobalErrorCodeConstants.java | 0 .../enums/ServiceErrorCodeRange.java | 0 .../exception/util/ServiceExceptionUtil.java | 0 .../dashboard/common/package-info.java | 0 .../dashboard/common/pojo/CommonResult.java | 0 .../dashboard/common/pojo/PageParam.java | 0 .../dashboard/common/pojo/PageResult.java | 0 .../dashboard/common/pojo/SortingField.java | 0 .../framework/apollo/core/ConfigConsts.java | 0 .../apollo/internals/ConfigFrameworkDAO.java | 0 .../apollo/internals/DBConfigRepository.java | 0 .../apollo/internals/DefaultXInjector.java | 0 .../framework/apollo/package-info.java | 0 .../framework/apollo/spi/DBConfigFactory.java | 0 .../ApolloApplicationContextInitializer.java | 0 .../async/config/AsyncConfiguration.java | 0 .../framework/async/package-info.java | 0 .../《芋道 Spring Boot 异步任务入门》.md | 0 .../captcha/config/CaptchaConfig.java | 0 .../captcha/config/CaptchaProperties.java | 0 .../framework/captcha/package-info.java | 0 .../codegen/config/CodegenConfiguration.java | 0 .../codegen/config/CodegenProperties.java | 0 .../framework/codegen/package-info.java | 0 .../config/DataSourceConfiguration.java | 0 .../datasource/core/enums/DataSourceEnum.java | 0 .../core/filter/DruidAdRemoveFilter.java | 0 ...道 Spring Boot 多数据源（读写分离）入门》.md | 0 .../《芋道 Spring Boot 数据库连接池入门》.md | 0 .../dict/config/DictConfiguration.java | 0 .../service/DictDataFrameworkService.java | 0 .../framework/dict/core/util/DictUtils.java | 0 .../framework/dict/package-info.java | 0 .../config/ErrorCodeConfiguration.java | 0 .../errorcode/config/ErrorCodeProperties.java | 0 .../core/dto/ErrorCodeAutoGenerateReqDTO.java | 0 .../errorcode/core/dto/ErrorCodeRespDTO.java | 0 .../generator/ErrorCodeAutoGenerator.java | 0 .../generator/ErrorCodeAutoGeneratorImpl.java | 0 .../core/loader/ErrorCodeLoader.java | 0 .../core/loader/ErrorCodeLoaderImpl.java | 0 .../service/ErrorCodeFrameworkService.java | 0 .../framework/errorcode/package-info.java | 0 .../excel/core/annotations/DictFormat.java | 0 .../excel/core/convert/DictConvert.java | 0 .../excel/core/convert/JsonConvert.java | 0 .../framework/excel/core/util/ExcelUtils.java | 0 .../framework/excel/package-info.java | 0 .../file/config/FileConfiguration.java | 0 .../framework/file/config/FileProperties.java | 0 .../framework/file/package-info.java | 0 .../config/IdempotentConfiguration.java | 0 .../core/annotation/Idempotent.java | 0 .../idempotent/core/aop/IdempotentAspect.java | 0 .../keyresolver/IdempotentKeyResolver.java | 0 .../impl/DefaultIdempotentKeyResolver.java | 0 .../impl/ExpressionIdempotentKeyResolver.java | 0 .../core/redis/IdempotentRedisDAO.java | 0 .../framework/idempotent/package-info.java | 0 .../jackson/config/JacksonConfig.java | 0 .../deser/LocalDateTimeDeserializer.java | 0 .../jackson/ser/LocalDateTimeSerializer.java | 0 .../lock4j/config/Lock4jConfiguration.java | 0 .../core/DefaultLockFailureStrategy.java | 0 .../lock4j/core/Lock4jRedisKeyConstants.java | 0 .../framework/lock4j/package-info.java | 0 .../apilog/config/ApiLogConfiguration.java | 0 .../core/filter/ApiAccessLogFilter.java | 0 .../service/ApiAccessLogFrameworkService.java | 0 .../service/ApiErrorLogFrameworkService.java | 0 .../service/dto/ApiAccessLogCreateDTO.java | 0 .../service/dto/ApiErrorLogCreateDTO.java | 0 .../config/OperateLogConfiguration.java | 0 .../core/annotations/OperateLog.java | 0 .../operatelog/core/aop/OperateLogAspect.java | 0 .../core/enums/OperateTypeEnum.java | 0 .../logger/operatelog/core/package-info.java | 0 .../service/OperateLogFrameworkService.java | 0 .../operatelog/core/util/OperateLogUtils.java | 0 .../framework/logger/package-info.java | 0 .../config/AdminServerConfiguration.java | 0 .../framework/monitor/package-info.java | 0 ...芋道 Spring Boot 监控工具 Admin 入门》.md | 0 .../mybatis/config/MybatisConfiguration.java | 0 .../mybatis/core/dataobject/BaseDO.java | 0 .../core/handler/DefaultDBFieldHandler.java | 0 .../mybatis/core/mapper/BaseMapperX.java | 0 .../mybatis/core/query/QueryWrapperX.java | 0 .../core/type/JsonLongSetTypeHandler.java | 0 .../mybatis/core/util/MyBatisUtils.java | 0 .../framework/mybatis/package-info.java | 0 .../《芋道 Spring Boot MyBatis 入门》.md | 0 .../dashboard/framework/package-info.java | 0 .../framework/quartz/config/QuartzConfig.java | 0 .../quartz/core/enums/JobDataKeyEnum.java | 0 .../quartz/core/handler/JobHandler.java | 0 .../core/handler/JobHandlerInvoker.java | 0 .../core/scheduler/SchedulerManager.java | 0 .../core/service/JobLogFrameworkService.java | 0 .../framework/quartz/core/util/CronUtils.java | 0 .../framework/quartz/package-info.java | 0 .../《芋道 Spring Boot 定时任务入门》.md | 0 .../framework/redis/config/RedisConfig.java | 0 .../framework/redis/core/RedisKeyDefine.java | 0 .../redis/core/RedisKeyRegistry.java | 0 .../AbstractChannelMessageListener.java | 0 .../redis/core/pubsub/ChannelMessage.java | 0 .../stream/AbstractStreamMessageListener.java | 0 .../redis/core/stream/StreamMessage.java | 0 .../redis/core/util/RedisMessageUtils.java | 0 .../framework/redis/package-info.java | 0 .../redis/《芋道 Spring Boot Redis 入门》.md | 0 .../framework/resilience4j/package-info.java | 0 ... Spring Boot 服务容错 Resilience4j 入门》.md | 0 .../config/SecurityConfiguration.java | 0 .../security/config/SecurityProperties.java | 0 .../framework/security/core/LoginUser.java | 0 .../security/core/enums/DataScopeEnum.java | 0 .../filter/JwtAuthenticationTokenFilter.java | 0 .../core/handler/AccessDeniedHandlerImpl.java | 0 .../handler/AuthenticationEntryPointImpl.java | 0 .../handler/LogoutSuccessHandlerImpl.java | 0 .../service/SecurityAuthFrameworkService.java | 0 .../SecurityPermissionFrameworkService.java | 0 .../core/util/SecurityFrameworkUtils.java | 0 .../framework/security/package-info.java | 0 ...pring Boot 安全框架 Spring Security 入门》.md | 0 .../sms/config/SmsConfiguration.java | 0 .../framework/sms/core/client/SmsClient.java | 0 .../sms/core/client/SmsClientFactory.java | 0 .../sms/core/client/SmsCodeMapping.java | 0 .../sms/core/client/SmsCommonResult.java | 0 .../core/client/dto/SmsReceiveRespDTO.java | 0 .../sms/core/client/dto/SmsSendRespDTO.java | 0 .../core/client/dto/SmsTemplateRespDTO.java | 0 .../core/client/impl/AbstractSmsClient.java | 0 .../client/impl/SmsClientFactoryImpl.java | 0 .../client/impl/aliyun/AliyunSmsClient.java | 0 .../impl/aliyun/AliyunSmsCodeMapping.java | 0 .../impl/debug/DebugDingTalkCodeMapping.java | 0 .../impl/debug/DebugDingTalkSmsClient.java | 0 .../client/impl/yunpian/YunpianSmsClient.java | 0 .../impl/yunpian/YunpianSmsCodeMapping.java | 0 .../sms/core/enums/SmsChannelEnum.java | 0 .../enums/SmsFrameworkErrorCodeConstants.java | 0 .../enums/SmsTemplateAuditStatusEnum.java | 0 .../core/property/SmsChannelProperties.java | 0 .../config/SwaggerAutoConfiguration.java | 0 .../swagger/config/SwaggerProperties.java | 0 .../framework/swagger/package-info.java | 0 ... Spring Boot API 接口文档 Swagger 入门》.md | 0 .../config/TracerAutoConfiguration.java | 0 .../tracer/config/TracerProperties.java | 0 .../tracer/core/annotation/BizTrace.java | 0 .../tracer/core/aop/BizTraceAspect.java | 0 .../tracer/core/filter/TraceFilter.java | 0 .../tracer/core/util/TracerUtils.java | 0 .../framework/tracer/package-info.java | 0 ...道 Spring Boot 链路追踪 SkyWalking 入门》.md | 0 .../dashboard/framework/validator/InEnum.java | 0 .../framework/validator/InEnumValidator.java | 0 .../framework/validator/package-info.java | 0 ...道 Spring Boot 参数校验 Validation 入门》.md | 0 .../web/config/WebConfiguration.java | 0 .../framework/web/config/WebProperties.java | 0 .../framework/web/config/XssProperties.java | 0 .../web/core/enums/FilterOrderEnum.java | 0 .../core/filter/CacheRequestBodyFilter.java | 0 .../core/filter/CacheRequestBodyWrapper.java | 0 .../framework/web/core/filter/DemoFilter.java | 0 .../framework/web/core/filter/XssFilter.java | 0 .../web/core/filter/XssRequestWrapper.java | 0 .../core/handler/GlobalExceptionHandler.java | 0 .../handler/GlobalResponseBodyHandler.java | 0 .../web/core/util/WebFrameworkUtils.java | 0 .../dashboard/framework/web/package-info.java | 0 .../《芋道 Spring Boot SpringMVC 入门》.md | 0 .../config/InfConfigController.java | 0 .../controller/config/vo/InfConfigBaseVO.java | 0 .../config/vo/InfConfigCreateReqVO.java | 0 .../config/vo/InfConfigExcelVO.java | 0 .../config/vo/InfConfigExportReqVO.java | 0 .../config/vo/InfConfigPageReqVO.java | 0 .../controller/config/vo/InfConfigRespVO.java | 0 .../config/vo/InfConfigUpdateReqVO.java | 0 .../controller/doc/InfDbDocController.java | 0 .../controller/file/InfFileController.java | 0 .../controller/file/vo/InfFilePageReqVO.java | 0 .../controller/file/vo/InfFileRespVO.java | 0 .../controller/job/InfJobController.java | 0 .../controller/job/InfJobLogController.java | 0 .../controller/job/vo/job/InfJobBaseVO.java | 0 .../job/vo/job/InfJobCreateReqVO.java | 0 .../controller/job/vo/job/InfJobExcelVO.java | 0 .../job/vo/job/InfJobExportReqVO.java | 0 .../job/vo/job/InfJobPageReqVO.java | 0 .../controller/job/vo/job/InfJobRespVO.java | 0 .../job/vo/job/InfJobUpdateReqVO.java | 0 .../job/vo/log/InfJobLogBaseVO.java | 0 .../job/vo/log/InfJobLogExcelVO.java | 0 .../job/vo/log/InfJobLogExportReqVO.java | 0 .../job/vo/log/InfJobLogPageReqVO.java | 0 .../job/vo/log/InfJobLogRespVO.java | 0 .../logger/InfApiAccessLogController.java | 0 .../logger/InfApiErrorLogController.java | 0 .../apiaccesslog/InfApiAccessLogBaseVO.java | 0 .../apiaccesslog/InfApiAccessLogExcelVO.java | 0 .../InfApiAccessLogExportReqVO.java | 0 .../InfApiAccessLogPageReqVO.java | 0 .../apiaccesslog/InfApiAccessLogRespVO.java | 0 .../vo/apierrorlog/InfApiErrorLogBaseVO.java | 0 .../vo/apierrorlog/InfApiErrorLogExcelVO.java | 0 .../InfApiErrorLogExportReqVO.java | 0 .../apierrorlog/InfApiErrorLogPageReqVO.java | 0 .../vo/apierrorlog/InfApiErrorLogRespVO.java | 0 .../controller/redis/RedisController.http | 0 .../controller/redis/RedisController.java | 0 .../redis/vo/InfRedisKeyRespVO.java | 0 .../redis/vo/InfRedisMonitorRespVO.java | 0 .../convert/config/InfConfigConvert.java | 0 .../infra/convert/file/InfFileConvert.java | 0 .../infra/convert/job/InfJobConvert.java | 0 .../infra/convert/job/InfJobLogConvert.java | 0 .../logger/InfApiAccessLogConvert.java | 0 .../convert/logger/InfApiErrorLogConvert.java | 0 .../modules/infra/convert/package-info.java | 0 .../infra/convert/redis/RedisConvert.java | 0 ...道 Spring Boot 对象转换 MapStruct 入门》.md | 0 .../dal/dataobject/config/InfConfigDO.java | 0 .../infra/dal/dataobject/file/InfFileDO.java | 0 .../infra/dal/dataobject/job/InfJobDO.java | 0 .../infra/dal/dataobject/job/InfJobLogDO.java | 0 .../dataobject/logger/InfApiAccessLogDO.java | 0 .../dataobject/logger/InfApiErrorLogDO.java | 0 .../dal/mysql/config/InfConfigDAOImpl.java | 0 .../dal/mysql/config/InfConfigMapper.java | 0 .../infra/dal/mysql/file/InfFileMapper.java | 0 .../infra/dal/mysql/job/InfJobLogMapper.java | 0 .../infra/dal/mysql/job/InfJobMapper.java | 0 .../mysql/logger/InfApiAccessLogMapper.java | 0 .../mysql/logger/InfApiErrorLogMapper.java | 0 .../infra/enums/InfErrorCodeConstants.java | 0 .../infra/enums/config/InfConfigTypeEnum.java | 0 .../infra/enums/job/InfJobLogStatusEnum.java | 0 .../infra/enums/job/InfJobStatusEnum.java | 0 .../InfApiErrorLogProcessStatusEnum.java | 0 .../config/InfConfigRefreshConsumer.java | 0 .../infra/mq/consumer/package-info.java | 0 .../config/InfConfigRefreshMessage.java | 0 .../infra/mq/message/package-info.java | 0 .../mq/producer/config/InfConfigProducer.java | 0 .../infra/mq/producer/package-info.java | 0 .../dashboard/modules/infra/package-info.java | 0 .../service/config/InfConfigService.java | 0 .../config/impl/InfConfigServiceImpl.java | 0 .../infra/service/file/InfFileService.java | 0 .../service/file/impl/InfFileServiceImpl.java | 0 .../infra/service/job/InfJobLogService.java | 0 .../infra/service/job/InfJobService.java | 0 .../job/impl/InfJobLogServiceImpl.java | 0 .../service/job/impl/InfJobServiceImpl.java | 0 .../logger/InfApiAccessLogService.java | 0 .../service/logger/InfApiErrorLogService.java | 0 .../impl/InfApiAccessLogServiceImpl.java | 0 .../impl/InfApiErrorLogServiceImpl.java | 0 .../controller/auth/SysAuthController.http | 0 .../controller/auth/SysAuthController.java | 0 .../auth/SysUserSessionController.java | 0 .../auth/vo/auth/SysAuthLoginReqVO.java | 0 .../auth/vo/auth/SysAuthLoginRespVO.java | 0 .../auth/vo/auth/SysAuthMenuRespVO.java | 0 .../vo/auth/SysAuthPermissionInfoRespVO.java | 0 .../session/SysUserSessionPageItemRespVO.java | 0 .../vo/session/SysUserSessionPageReqVO.java | 0 .../common/SysCaptchaController.http | 0 .../common/SysCaptchaController.java | 0 .../common/vo/SysCaptchaImageRespVO.java | 0 .../controller/dept/SysDeptController.java | 0 .../controller/dept/SysPostController.java | 0 .../dept/vo/dept/SysDeptBaseVO.java | 0 .../dept/vo/dept/SysDeptCreateReqVO.java | 0 .../dept/vo/dept/SysDeptListReqVO.java | 0 .../dept/vo/dept/SysDeptRespVO.java | 0 .../dept/vo/dept/SysDeptSimpleRespVO.java | 0 .../dept/vo/dept/SysDeptUpdateReqVO.java | 0 .../dept/vo/post/SysPostBaseVO.java | 0 .../dept/vo/post/SysPostCreateReqVO.java | 0 .../dept/vo/post/SysPostExcelVO.java | 0 .../dept/vo/post/SysPostExportReqVO.java | 0 .../dept/vo/post/SysPostListReqVO.java | 0 .../dept/vo/post/SysPostPageReqVO.java | 0 .../dept/vo/post/SysPostRespVO.java | 0 .../dept/vo/post/SysPostSimpleRespVO.java | 0 .../dept/vo/post/SysPostUpdateReqVO.java | 0 .../dict/SysDictDataController.http | 0 .../dict/SysDictDataController.java | 0 .../dict/SysDictTypeController.java | 0 .../dict/vo/data/SysDictDataBaseVO.java | 0 .../dict/vo/data/SysDictDataCreateReqVO.java | 0 .../dict/vo/data/SysDictDataExcelVO.java | 0 .../dict/vo/data/SysDictDataExportReqVO.java | 0 .../dict/vo/data/SysDictDataPageReqVO.java | 0 .../dict/vo/data/SysDictDataRespVO.java | 0 .../dict/vo/data/SysDictDataSimpleRespVO.java | 0 .../dict/vo/data/SysDictDataUpdateReqVO.java | 0 .../dict/vo/type/SysDictTypeBaseVO.java | 0 .../dict/vo/type/SysDictTypeCreateReqVO.java | 0 .../dict/vo/type/SysDictTypeExcelVO.java | 0 .../dict/vo/type/SysDictTypeExportReqVO.java | 0 .../dict/vo/type/SysDictTypePageReqVO.java | 0 .../dict/vo/type/SysDictTypeRespVO.java | 0 .../dict/vo/type/SysDictTypeSimpleRespVO.java | 0 .../dict/vo/type/SysDictTypeUpdateReqVO.java | 0 .../errorcode/SysErrorCodeController.http | 0 .../errorcode/SysErrorCodeController.java | 0 .../errorcode/vo/SysErrorCodeBaseVO.java | 0 .../errorcode/vo/SysErrorCodeCreateReqVO.java | 0 .../errorcode/vo/SysErrorCodeExcelVO.java | 0 .../errorcode/vo/SysErrorCodeExportReqVO.java | 0 .../errorcode/vo/SysErrorCodePageReqVO.java | 0 .../errorcode/vo/SysErrorCodeRespVO.java | 0 .../errorcode/vo/SysErrorCodeUpdateReqVO.java | 0 .../logger/SysLoginLogController.java | 0 .../logger/SysOperateLogController.http | 0 .../logger/SysOperateLogController.java | 0 .../logger/vo/loginlog/SysLoginLogBaseVO.java | 0 .../vo/loginlog/SysLoginLogCreateReqVO.java | 0 .../vo/loginlog/SysLoginLogExcelVO.java | 0 .../vo/loginlog/SysLoginLogExportReqVO.java | 0 .../vo/loginlog/SysLoginLogPageReqVO.java | 0 .../logger/vo/loginlog/SysLoginLogRespVO.java | 0 .../vo/operatelog/SysOperateLogBaseVO.java | 0 .../operatelog/SysOperateLogCreateReqVO.java | 0 .../vo/operatelog/SysOperateLogExcelVO.java | 0 .../operatelog/SysOperateLogExportReqVO.java | 0 .../vo/operatelog/SysOperateLogPageReqVO.java | 0 .../vo/operatelog/SysOperateLogRespVO.java | 0 .../notice/SysNoticeController.java | 0 .../controller/notice/vo/SysNoticeBaseVO.java | 0 .../notice/vo/SysNoticeCreateReqVO.java | 0 .../notice/vo/SysNoticePageReqVO.java | 0 .../controller/notice/vo/SysNoticeRespVO.java | 0 .../notice/vo/SysNoticeUpdateReqVO.java | 0 .../permission/SysMenuController.http | 0 .../permission/SysMenuController.java | 0 .../permission/SysPermissionController.java | 0 .../permission/SysRoleController.http | 0 .../permission/SysRoleController.java | 0 .../permission/vo/menu/SysMenuBaseVO.java | 0 .../vo/menu/SysMenuCreateReqVO.java | 0 .../permission/vo/menu/SysMenuListReqVO.java | 0 .../permission/vo/menu/SysMenuRespVO.java | 0 .../vo/menu/SysMenuSimpleRespVO.java | 0 .../vo/menu/SysMenuUpdateReqVO.java | 0 ...SysPermissionAssignRoleDataScopeReqVO.java | 0 .../SysPermissionAssignRoleMenuReqVO.java | 0 .../SysPermissionAssignUserRoleReqVO.java | 0 .../permission/vo/role/SysRoleBaseVO.java | 0 .../vo/role/SysRoleCreateReqVO.java | 0 .../permission/vo/role/SysRoleExcelVO.java | 0 .../vo/role/SysRoleExportReqVO.java | 0 .../permission/vo/role/SysRolePageReqVO.java | 0 .../permission/vo/role/SysRoleRespVO.java | 0 .../vo/role/SysRoleSimpleRespVO.java | 0 .../vo/role/SysRoleUpdateReqVO.java | 0 .../vo/role/SysRoleUpdateStatusReqVO.java | 0 .../controller/sms/SmsCallbackController.java | 0 .../sms/SysSmsChannelController.java | 0 .../controller/sms/SysSmsLogController.java | 0 .../sms/SysSmsTemplateController.http | 0 .../sms/SysSmsTemplateController.java | 0 .../sms/vo/channel/SysSmsChannelBaseVO.java | 0 .../vo/channel/SysSmsChannelCreateReqVO.java | 0 .../vo/channel/SysSmsChannelPageReqVO.java | 0 .../sms/vo/channel/SysSmsChannelRespVO.java | 0 .../vo/channel/SysSmsChannelSimpleRespVO.java | 0 .../vo/channel/SysSmsChannelUpdateReqVO.java | 0 .../sms/vo/log/SysSmsLogExcelVO.java | 0 .../sms/vo/log/SysSmsLogExportReqVO.java | 0 .../sms/vo/log/SysSmsLogPageReqVO.java | 0 .../sms/vo/log/SysSmsLogRespVO.java | 0 .../sms/vo/template/SysSmsTemplateBaseVO.java | 0 .../template/SysSmsTemplateCreateReqVO.java | 0 .../vo/template/SysSmsTemplateExcelVO.java | 0 .../template/SysSmsTemplateExportReqVO.java | 0 .../vo/template/SysSmsTemplatePageReqVO.java | 0 .../sms/vo/template/SysSmsTemplateRespVO.java | 0 .../vo/template/SysSmsTemplateSendReqVO.java | 0 .../template/SysSmsTemplateUpdateReqVO.java | 0 .../controller/user/SysUserController.http | 0 .../controller/user/SysUserController.java | 0 .../user/SysUserProfileController.java | 0 .../user/vo/profile/SysUserProfileRespVO.java | 0 .../SysUserProfileUpdatePasswordReqVO.java | 0 .../vo/profile/SysUserProfileUpdateReqVO.java | 0 .../user/vo/user/SysUserBaseVO.java | 0 .../user/vo/user/SysUserCreateReqVO.java | 0 .../user/vo/user/SysUserExcelVO.java | 0 .../user/vo/user/SysUserExportReqVO.java | 0 .../user/vo/user/SysUserImportExcelVO.java | 0 .../user/vo/user/SysUserImportRespVO.java | 0 .../user/vo/user/SysUserPageItemRespVO.java | 0 .../user/vo/user/SysUserPageReqVO.java | 0 .../user/vo/user/SysUserRespVO.java | 0 .../vo/user/SysUserUpdatePasswordReqVO.java | 0 .../user/vo/user/SysUserUpdateReqVO.java | 0 .../vo/user/SysUserUpdateStatusReqVO.java | 0 .../system/convert/auth/SysAuthConvert.java | 0 .../convert/auth/SysUserSessionConvert.java | 0 .../convert/common/SysCaptchaConvert.java | 0 .../system/convert/dept/SysDeptConvert.java | 0 .../system/convert/dept/SysPostConvert.java | 0 .../convert/dict/SysDictDataConvert.java | 0 .../convert/dict/SysDictTypeConvert.java | 0 .../errorcode/SysErrorCodeConvert.java | 0 .../convert/logger/SysLoginLogConvert.java | 0 .../convert/logger/SysOperateLogConvert.java | 0 .../convert/notice/SysNoticeConvert.java | 0 .../modules/system/convert/package-info.java | 0 .../convert/permission/SysMenuConvert.java | 0 .../convert/permission/SysRoleConvert.java | 0 .../convert/sms/SysSmsChannelConvert.java | 0 .../system/convert/sms/SysSmsLogConvert.java | 0 .../convert/sms/SysSmsTemplateConvert.java | 0 .../system/convert/user/SysUserConvert.java | 0 ...道 Spring Boot 对象转换 MapStruct 入门》.md | 0 .../dal/dataobject/auth/SysUserSessionDO.java | 0 .../system/dal/dataobject/dept/SysDeptDO.java | 0 .../system/dal/dataobject/dept/SysPostDO.java | 0 .../dal/dataobject/dict/SysDictDataDO.java | 0 .../dal/dataobject/dict/SysDictTypeDO.java | 0 .../dataobject/errorcode/SysErrorCodeDO.java | 0 .../dal/dataobject/logger/SysLoginLogDO.java | 0 .../dataobject/logger/SysOperateLogDO.java | 0 .../dal/dataobject/notice/SysNoticeDO.java | 0 .../dal/dataobject/permission/SysMenuDO.java | 0 .../dal/dataobject/permission/SysRoleDO.java | 0 .../dataobject/permission/SysRoleMenuDO.java | 0 .../dataobject/permission/SysUserRoleDO.java | 0 .../dal/dataobject/sms/SysSmsChannelDO.java | 0 .../dal/dataobject/sms/SysSmsLogDO.java | 0 .../dal/dataobject/sms/SysSmsTemplateDO.java | 0 .../system/dal/dataobject/user/SysUserDO.java | 0 .../dal/mysql/auth/SysUserSessionMapper.java | 0 .../system/dal/mysql/dept/SysDeptMapper.java | 0 .../system/dal/mysql/dept/SysPostMapper.java | 0 .../dal/mysql/dict/SysDictDataMapper.java | 0 .../dal/mysql/dict/SysDictTypeMapper.java | 0 .../mysql/errorcode/SysErrorCodeMapper.java | 0 .../dal/mysql/logger/SysLoginLogMapper.java | 0 .../dal/mysql/logger/SysOperateLogMapper.java | 0 .../dal/mysql/notice/SysNoticeMapper.java | 0 .../dal/mysql/permission/SysMenuMapper.java | 0 .../dal/mysql/permission/SysRoleMapper.java | 0 .../mysql/permission/SysRoleMenuMapper.java | 0 .../mysql/permission/SysUserRoleMapper.java | 0 .../dal/mysql/sms/SysSmsChannelMapper.java | 0 .../system/dal/mysql/sms/SysSmsLogMapper.java | 0 .../dal/mysql/sms/SysSmsTemplateMapper.java | 0 .../system/dal/mysql/user/SysUserMapper.java | 0 .../system/dal/redis/RedisKeyConstants.java | 0 .../dal/redis/SysRedisKeyConstants.java | 0 .../dal/redis/auth/SysLoginUserRedisDAO.java | 0 .../dal/redis/common/SysCaptchaRedisDAO.java | 0 .../system/enums/SysErrorCodeConstants.java | 0 .../system/enums/common/SysSexEnum.java | 0 .../modules/system/enums/dept/DeptIdEnum.java | 0 .../system/enums/dict/SysDictTypeEnum.java | 0 .../enums/errorcode/SysErrorCodeTypeEnum.java | 0 .../enums/logger/SysLoginLogTypeEnum.java | 0 .../enums/logger/SysLoginResultEnum.java | 0 .../enums/notice/SysNoticeTypeEnum.java | 0 .../system/enums/permission/MenuIdEnum.java | 0 .../system/enums/permission/MenuTypeEnum.java | 0 .../system/enums/permission/RoleCodeEnum.java | 0 .../enums/permission/SysRoleTypeEnum.java | 0 .../enums/sms/SysSmsReceiveStatusEnum.java | 0 .../enums/sms/SysSmsSendStatusEnum.java | 0 .../enums/sms/SysSmsTemplateTypeEnum.java | 0 .../job/auth/SysUserSessionTimeoutJob.java | 0 .../modules/system/job/package-info.java | 0 .../consumer/dept/SysDeptRefreshConsumer.java | 0 .../dict/SysDictDataRefreshConsumer.java | 0 .../mq/consumer/mail/SysMailSendConsumer.java | 0 .../permission/SysMenuRefreshConsumer.java | 0 .../SysRoleMenuRefreshConsumer.java | 0 .../permission/SysRoleRefreshConsumer.java | 0 .../sms/SysSmsChannelRefreshConsumer.java | 0 .../mq/consumer/sms/SysSmsSendConsumer.java | 0 .../sms/SysSmsTemplateRefreshConsumer.java | 0 .../message/dept/SysDeptRefreshMessage.java | 0 .../dict/SysDictDataRefreshMessage.java | 0 .../mq/message/mail/SysMailSendMessage.java | 0 .../permission/SysMenuRefreshMessage.java | 0 .../permission/SysRoleMenuRefreshMessage.java | 0 .../permission/SysRoleRefreshMessage.java | 0 .../sms/SysSmsChannelRefreshMessage.java | 0 .../mq/message/sms/SysSmsSendMessage.java | 0 .../sms/SysSmsTemplateRefreshMessage.java | 0 .../mq/producer/dept/SysDeptProducer.java | 0 .../mq/producer/dict/SysDictDataProducer.java | 0 .../producer/permission/SysMenuProducer.java | 0 .../permission/SysPermissionProducer.java | 0 .../producer/permission/SysRoleProducer.java | 0 .../mq/producer/sms/SysSmsProducer.java | 0 .../modules/system/package-info.java | 0 .../system/service/auth/SysAuthService.java | 0 .../service/auth/SysUserSessionService.java | 0 .../service/auth/impl/SysAuthServiceImpl.java | 0 .../auth/impl/SysUserSessionServiceImpl.java | 0 .../service/common/SysCaptchaService.java | 0 .../common/impl/SysCaptchaServiceImpl.java | 0 .../system/service/dept/SysDeptService.java | 0 .../system/service/dept/SysPostService.java | 0 .../service/dept/impl/SysDeptServiceImpl.java | 0 .../service/dept/impl/SysPostServiceImpl.java | 0 .../service/dict/SysDictDataService.java | 0 .../service/dict/SysDictTypeService.java | 0 .../dict/impl/SysDictDataServiceImpl.java | 0 .../dict/impl/SysDictTypeServiceImpl.java | 0 .../errorcode/SysErrorCodeService.java | 0 .../impl/SysErrorCodeServiceImpl.java | 0 .../service/logger/SysLoginLogService.java | 0 .../service/logger/SysOperateLogService.java | 0 .../logger/impl/SysLoginLogServiceImpl.java | 0 .../logger/impl/SysOperateLogServiceImpl.java | 0 .../service/notice/SysNoticeService.java | 0 .../notice/impl/SysNoticeServiceImpl.java | 0 .../service/permission/SysMenuService.java | 0 .../permission/SysPermissionService.java | 0 .../service/permission/SysRoleService.java | 0 .../permission/impl/SysMenuServiceImpl.java | 0 .../impl/SysPermissionServiceImpl.java | 0 .../permission/impl/SysRoleServiceImpl.java | 0 .../service/sms/SysSmsChannelService.java | 0 .../system/service/sms/SysSmsLogService.java | 0 .../system/service/sms/SysSmsService.java | 0 .../service/sms/SysSmsTemplateService.java | 0 .../sms/impl/SysSmsChannelServiceImpl.java | 0 .../sms/impl/SysSmsLogServiceImpl.java | 0 .../service/sms/impl/SysSmsServiceImpl.java | 0 .../sms/impl/SysSmsTemplateServiceImpl.java | 0 .../system/service/user/SysUserService.java | 0 .../service/user/SysUserServiceImpl.java | 0 .../codegen/ToolCodegenController.java | 0 .../codegen/vo/ToolCodegenDetailRespVO.java | 0 .../codegen/vo/ToolCodegenPreviewRespVO.java | 0 .../codegen/vo/ToolCodegenUpdateReqVO.java | 0 .../vo/column/ToolCodegenColumnBaseVO.java | 0 .../vo/column/ToolCodegenColumnRespVO.java | 0 .../vo/table/ToolCodegenTableBaseVO.java | 0 .../vo/table/ToolCodegenTablePageReqVO.java | 0 .../vo/table/ToolCodegenTableRespVO.java | 0 .../vo/table/ToolSchemaTableRespVO.java | 0 .../test/ToolTestDemoController.http | 0 .../test/ToolTestDemoController.java | 0 .../test/vo/ToolTestDemoBaseVO.java | 0 .../test/vo/ToolTestDemoCreateReqVO.java | 0 .../test/vo/ToolTestDemoExcelVO.java | 0 .../test/vo/ToolTestDemoExportReqVO.java | 0 .../test/vo/ToolTestDemoPageReqVO.java | 0 .../test/vo/ToolTestDemoRespVO.java | 0 .../test/vo/ToolTestDemoUpdateReqVO.java | 0 .../convert/codegen/ToolCodegenConvert.java | 0 .../convert/test/ToolTestDemoConvert.java | 0 .../codegen/ToolCodegenColumnDO.java | 0 .../codegen/ToolCodegenTableDO.java | 0 .../codegen/ToolSchemaColumnDO.java | 0 .../dataobject/codegen/ToolSchemaTableDO.java | 0 .../dal/dataobject/test/ToolTestDemoDO.java | 0 .../codegen/ToolCodegenColumnMapper.java | 0 .../mysql/codegen/ToolCodegenTableMapper.java | 0 .../mysql/codegen/ToolSchemaColumnMapper.java | 0 .../mysql/codegen/ToolSchemaTableMapper.java | 0 .../dal/mysql/test/ToolTestDemoMapper.java | 0 .../tool/enums/ToolErrorCodeConstants.java | 0 .../ToolCodegenColumnHtmlTypeEnum.java | 0 .../ToolCodegenColumnListConditionEnum.java | 0 .../codegen/ToolCodegenImportTypeEnum.java | 0 .../codegen/ToolCodegenTemplateTypeEnum.java | 0 .../dashboard/modules/tool/package-info.java | 0 .../service/codegen/ToolCodegenService.java | 0 .../codegen/impl/ToolCodegenBuilder.java | 0 .../codegen/impl/ToolCodegenEngine.java | 0 .../codegen/impl/ToolCodegenSQLParser.java | 0 .../codegen/impl/ToolCodegenServiceImpl.java | 0 .../service/test/ToolTestDemoService.java | 0 .../test/impl/ToolTestDemoServiceImpl.java | 0 .../dashboard/util/collection/ArrayUtils.java | 0 .../util/collection/CollectionUtils.java | 0 .../dashboard/util/collection/MapUtils.java | 0 .../dashboard/util/collection/SetUtils.java | 0 .../dashboard/util/date/DateUtils.java | 0 .../dashboard/util/json/JsonUtils.java | 0 .../dashboard/util/object/ObjectUtils.java | 0 .../iocoder/dashboard/util/package-info.java | 0 .../dashboard/util/servlet/ServletUtils.java | 0 .../dashboard/util/sping/SpringAopUtils.java | 0 .../util/sping/SpringExpressionUtils.java | 0 .../dashboard/util/string/StrUtils.java | 0 ....ctrip.framework.apollo.internals.Injector | 0 .../main/resources/META-INF/spring.factories | 0 .../src}/main/resources/application-dev.yaml | 0 .../main/resources/application-local.yaml | 0 .../src}/main/resources/application.yaml | 0 .../src}/main/resources/banner.txt | 0 .../codegen/java/controller/controller.vm | 0 .../codegen/java/controller/vo/_column.vm | 0 .../codegen/java/controller/vo/baseVO.vm | 0 .../codegen/java/controller/vo/createReqVO.vm | 0 .../codegen/java/controller/vo/excelVO.vm | 0 .../codegen/java/controller/vo/exportReqVO.vm | 0 .../codegen/java/controller/vo/pageReqVO.vm | 0 .../codegen/java/controller/vo/respVO.vm | 0 .../codegen/java/controller/vo/updateReqVO.vm | 0 .../resources/codegen/java/convert/convert.vm | 0 .../main/resources/codegen/java/dal/do.vm | 0 .../main/resources/codegen/java/dal/mapper.vm | 0 .../resources/codegen/java/enums/errorcode.vm | 0 .../resources/codegen/java/service/service.vm | 0 .../codegen/java/service/serviceImpl.vm | 0 .../codegen/java/test/serviceTest.vm | 0 .../src}/main/resources/codegen/sql/sql.vm | 0 .../main/resources/codegen/vue/api/api.js.vm | 0 .../resources/codegen/vue/views/index.vue.vm | 0 .../src}/main/resources/logback-spring.xml | 0 .../BaseDbAndRedisIntegrationTest.java | 0 .../dashboard/BaseRedisIntegrationTest.java | 0 .../quartz/core/SchedulerManagerTest.java | 0 .../redis/core/stream/RedisStreamTest.java | 0 .../AliyunSmsClientIntegrationTest.java | 0 ...DebugDingTalkSmsClientIntegrationTest.java | 0 .../YunpianSmsClientIntegrationTest.java | 0 .../sms/core/client/package-info.java | 0 .../modules/system/service/package-info.java | 0 .../sms/SysSmsServiceIntegrationTest.java | 0 ...ToolInformationSchemaColumnMapperTest.java | 0 .../ToolInformationSchemaTableMapperTest.java | 0 .../codegen/ToolCodegenEngineTest.java | 0 .../codegen/ToolCodegenSQLParserTest.java | 0 .../codegen/ToolCodegenServiceImplTest.java | 0 .../application-integration-test.yaml | 0 .../dashboard/BaseDbAndRedisUnitTest.java | 0 .../cn/iocoder/dashboard/BaseDbUnitTest.java | 0 .../dashboard/BaseMockitoUnitTest.java | 0 .../iocoder/dashboard/BaseRedisUnitTest.java | 0 .../config/QuartzTestConfiguration.java | 0 .../config/RedisTestConfiguration.java | 0 .../dashboard/framework/package-info.java | 0 .../impl/aliyun/AliyunSmsClientTest.java | 0 .../impl/aliyun/AliyunSmsCodeMappingTest.java | 0 .../impl/yunpian/YunpianSmsClientTest.java | 0 .../yunpian/YunpianSmsCodeMappingTest.java | 0 .../service/config/InfConfigServiceTest.java | 0 .../service/file/InfFileServiceTest.java | 0 .../service/job/InfJobLogServiceTest.java | 0 .../infra/service/job/InfJobServiceTest.java | 0 .../InfApiAccessLogServiceImplTest.java | 0 .../logger/InfApiErrorLogServiceImplTest.java | 0 .../service/auth/SysAuthServiceImplTest.java | 538 ++++++------- .../auth/SysUserSessionServiceImplTest.java | 0 .../service/common/SysCaptchaServiceTest.java | 0 .../service/dept/SysDeptServiceTest.java | 0 .../service/dept/SysPostServiceTest.java | 0 .../service/dict/SysDictDataServiceTest.java | 0 .../service/dict/SysDictTypeServiceTest.java | 0 .../errorcode/SysErrorCodeServiceTest.java | 0 .../logger/SysLoginLogServiceImplTest.java | 0 .../logger/SysOperateLogServiceImplTest.java | 0 .../notice/SysNoticeServiceImplTest.java | 0 .../permission/SysMenuServiceTest.java | 732 +++++++++--------- .../permission/SysPermissionServiceTest.java | 0 .../permission/SysRoleServiceTest.java | 604 +++++++-------- .../service/sms/SysSmsChannelServiceTest.java | 0 .../service/sms/SysSmsLogServiceTest.java | 0 .../system/service/sms/SysSmsServiceTest.java | 0 .../sms/SysSmsTemplateServiceTest.java | 0 .../service/user/SysUserServiceImplTest.java | 0 .../iocoder/dashboard/util/AssertUtils.java | 0 .../iocoder/dashboard/util/RandomUtils.java | 0 .../test/resources/application-unit-test.yaml | 0 .../src}/test/resources/file/erweima.jpg | Bin .../src}/test/resources/sql/clean.sql | 0 .../src}/test/resources/sql/create_tables.sql | 0 yudao-dependencies/pom.xml | 37 + 696 files changed, 1353 insertions(+), 1294 deletions(-) create mode 100644 yudao-admin-server/pom.xml rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/DashboardApplication.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/core/KeyValue.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/async/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/dict/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/excel/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/file/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/logger/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/validator/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFileRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/enums/config/InfConfigTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobLogStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/mq/message/config/InfConfigRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/mq/message/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/config/InfConfigProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthMenuRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthPermissionInfoRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/common/vo/SysCaptchaImageRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptListReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostListReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuListReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleDataScopeReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignUserRoleReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateStatusReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdatePasswordReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageItemRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdatePasswordReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateStatusReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/common/SysCaptchaConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/errorcode/SysErrorCodeDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/dal/redis/common/SysCaptchaRedisDAO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/common/SysSexEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/dept/DeptIdEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginLogTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginResultEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/notice/SysNoticeTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuIdEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/permission/RoleCodeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/permission/SysRoleTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsReceiveStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsSendStatusEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsTemplateTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/job/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dept/SysDeptRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dict/SysDictDataRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/mail/SysMailSendConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysMenuRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleMenuRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsChannelRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsSendConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsTemplateRefreshConsumer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/dept/SysDeptRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/dict/SysDictDataRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/mail/SysMailSendMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysMenuRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleMenuRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsChannelRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsTemplateRefreshMessage.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dept/SysDeptProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dict/SysDictDataProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysMenuProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysPermissionProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysRoleProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysCaptchaServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoRespVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenBuilder.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/date/DateUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/package-info.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java (100%) rename {src => yudao-admin-server/src}/main/java/cn/iocoder/dashboard/util/string/StrUtils.java (100%) rename {src => yudao-admin-server/src}/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector (100%) rename {src => yudao-admin-server/src}/main/resources/META-INF/spring.factories (100%) rename {src => yudao-admin-server/src}/main/resources/application-dev.yaml (100%) rename {src => yudao-admin-server/src}/main/resources/application-local.yaml (100%) rename {src => yudao-admin-server/src}/main/resources/application.yaml (100%) rename {src => yudao-admin-server/src}/main/resources/banner.txt (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/controller.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/_column.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/baseVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/createReqVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/excelVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/exportReqVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/pageReqVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/respVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/controller/vo/updateReqVO.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/convert/convert.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/dal/do.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/dal/mapper.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/enums/errorcode.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/service/service.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/service/serviceImpl.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/java/test/serviceTest.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/sql/sql.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/vue/api/api.js.vm (100%) rename {src => yudao-admin-server/src}/main/resources/codegen/vue/views/index.vue.vm (100%) rename {src => yudao-admin-server/src}/main/resources/logback-spring.xml (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/framework/quartz/core/SchedulerManagerTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/framework/redis/core/stream/RedisStreamTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/system/service/package-info.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenEngineTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenSQLParserTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test-integration/resources/application-integration-test.yaml (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/BaseDbUnitTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/framework/package-info.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java (97%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java (97%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java (97%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/util/AssertUtils.java (100%) rename {src => yudao-admin-server/src}/test/java/cn/iocoder/dashboard/util/RandomUtils.java (100%) rename {src => yudao-admin-server/src}/test/resources/application-unit-test.yaml (100%) rename {src => yudao-admin-server/src}/test/resources/file/erweima.jpg (100%) rename {src => yudao-admin-server/src}/test/resources/sql/clean.sql (100%) rename {src => yudao-admin-server/src}/test/resources/sql/create_tables.sql (100%) create mode 100644 yudao-dependencies/pom.xml diff --git a/README.md b/README.md index 9f676106c..b6b313734 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ ### 系统功能 - | | 功能 | 描述 | | --- | --- | --- | | | 用户管理 | 用户是系统操作者，该功能主要完成系统用户配置 | diff --git a/pom.xml b/pom.xml index 546c01014..60163cc01 100644 --- a/pom.xml +++ b/pom.xml @@ -4,364 +4,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.iocoder - dashboard - 1.0.0 + cn.iocoder.boot + yudao + ${revision} + pom + + yudao-dependencies + + yudao-admin-server + - dashboard - http://www.iocoder.cn - 芋道管理系统 - jar - - - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 - - 2.4.4 - - 3.0.2 - 1.5.22 - - 5.1.46 - 1.2.4 - 3.4.2 - 3.3.2 - 3.15.1 - - 1.7.0 - - 2.2.0 - 1.7.0 - - 8.5.0 - 6.1 - 2.3.1 - - 1.16.14 - 1.4.1.Final - 5.6.1 - 2.2.7 - 2.2 - 1.0.5 - 7.2.6.RELEASE - 0.1.16 - - 4.5.18 - 2.1.0 - 1.2.7 - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.boot - spring-boot-starter-aop - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-validation - - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j.version} - - - mapstruct - org.mapstruct - - - guava - com.google.guava - - - swagger-annotations - io.swagger - - - - - io.swagger - swagger-annotations - ${swagger-annotations.version} - - - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - - - com.ctrip.framework.apollo - apollo-client - ${apollo.version} - - - - - org.springframework.boot - spring-boot-starter-quartz - - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - - - - - io.github.resilience4j - resilience4j-spring-boot2 - ${resilience4j.version} - - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - org.springframework.boot - spring-boot-starter-test - test - - - asm - org.ow2.asm - - - - - - com.h2database - h2 - test - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - test - - - - uk.co.jemos.podam - podam - ${podam.version} - test - - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - true - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.alibaba - easyexcel - ${easyexcel.verion} - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - cn.smallbun.screw - screw-core - ${screw.version} - - - - - - - com.yunpian.sdk - yunpian-java-sdk - ${yunpian-java-sdk.version} - - - - com.aliyun - aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} - - - com.aliyun - aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} - - - - + yudao + 芋道项目基础脚手架 + https://github.com/YunaiV/ruoyi-vue-pro - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml new file mode 100644 index 000000000..5c2560b67 --- /dev/null +++ b/yudao-admin-server/pom.xml @@ -0,0 +1,367 @@ + + + 4.0.0 + + cn.iocoder.boot + yudao-admin-server + ${revision} + jar + + yudao-admin-server + 管理后台 Server，提供其 API 接口 + https://github.com/YunaiV/ruoyi-vue-pro + + + 1.0.0 + UTF-8 + UTF-8 + @ + 1.8 + ${java.version} + ${java.version} + 3.8.0 + + + 2.4.4 + + 3.0.2 + 1.5.22 + + 5.1.46 + 1.2.4 + 3.4.2 + 3.3.2 + 3.15.1 + + 1.7.0 + + 2.2.0 + 1.7.0 + + 8.5.0 + 6.1 + 2.3.1 + + 1.16.14 + 1.4.1.Final + 5.6.1 + 2.2.7 + 2.2 + 1.0.5 + 7.2.6.RELEASE + 0.1.16 + + 4.5.18 + 2.1.0 + 1.2.7 + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-validation + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + mapstruct + org.mapstruct + + + guava + com.google.guava + + + swagger-annotations + io.swagger + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + + com.ctrip.framework.apollo + apollo-client + ${apollo.version} + + + + + org.springframework.boot + spring-boot-starter-quartz + + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + redisson-spring-boot-starter + org.redisson + + + + + + io.github.resilience4j + resilience4j-spring-boot2 + ${resilience4j.version} + + + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-logback-1.x + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-opentracing + ${skywalking.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + + + org.springframework.boot + spring-boot-starter-test + test + + + asm + org.ow2.asm + + + + + + com.h2database + h2 + test + + + + com.github.fppt + jedis-mock + ${jedis-mock.version} + test + + + + uk.co.jemos.podam + podam + ${podam.version} + test + + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + true + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.alibaba + easyexcel + ${easyexcel.verion} + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + cn.smallbun.screw + screw-core + ${screw.version} + + + + + + + com.yunpian.sdk + yunpian-java-sdk + ${yunpian-java-sdk.version} + + + + com.aliyun + aliyun-java-sdk-core + ${aliyun-java-sdk-core.version} + + + com.aliyun + aliyun-java-sdk-dysmsapi + ${aliyun-java-sdk-dysmsapi.version} + + + + + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + diff --git a/src/main/java/cn/iocoder/dashboard/DashboardApplication.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/DashboardApplication.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java diff --git a/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java diff --git a/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java diff --git a/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java diff --git a/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java diff --git a/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java diff --git a/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java diff --git a/src/main/java/cn/iocoder/dashboard/common/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java diff --git a/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java diff --git a/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java diff --git a/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/async/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/file/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/doc/InfDbDocController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/InfFileController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFilePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFileRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFileRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFileRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/file/vo/InfFileRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/InfJobLogController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiAccessLogController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/InfApiErrorLogController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisKeyRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/vo/InfRedisMonitorRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/file/InfFileConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/job/InfJobLogConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiAccessLogConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/logger/InfApiErrorLogConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/redis/RedisConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/file/InfFileDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/job/InfJobLogDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiAccessLogDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/file/InfFileMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobLogMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/job/InfJobMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiAccessLogMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/logger/InfApiErrorLogMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfErrorCodeConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/enums/config/InfConfigTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/config/InfConfigTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/enums/config/InfConfigTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/config/InfConfigTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobLogStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobLogStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobLogStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobLogStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/job/InfJobStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/logger/InfApiErrorLogProcessStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/config/InfConfigRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/consumer/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/config/InfConfigRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/config/InfConfigRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/config/InfConfigRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/config/InfConfigRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/message/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/config/InfConfigProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/config/InfConfigProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/config/InfConfigProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/config/InfConfigProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/mq/producer/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/file/impl/InfFileServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobLogServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/job/impl/InfJobServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiAccessLogServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/service/logger/impl/InfApiErrorLogServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthLoginRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthMenuRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthMenuRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthMenuRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthMenuRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthPermissionInfoRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthPermissionInfoRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthPermissionInfoRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/auth/SysAuthPermissionInfoRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/vo/session/SysUserSessionPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysCaptchaController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/vo/SysCaptchaImageRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/vo/SysCaptchaImageRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/common/vo/SysCaptchaImageRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/common/vo/SysCaptchaImageRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptListReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptListReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptListReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptListReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/dept/SysDeptUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostListReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostListReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostListReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostListReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/SysErrorCodeController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/SysNoticeController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/notice/vo/SysNoticeUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysPermissionController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuListReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuListReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuListReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuListReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/menu/SysMenuUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleDataScopeReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleDataScopeReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleDataScopeReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleDataScopeReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignRoleMenuReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignUserRoleReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignUserRoleReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignUserRoleReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/permission/SysPermissionAssignUserRoleReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRolePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateStatusReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateStatusReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateStatusReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleUpdateStatusReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SmsCallbackController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsChannelController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsLogController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/SysSmsTemplateController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelSimpleRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/channel/SysSmsChannelUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplatePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateSendReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdatePasswordReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdatePasswordReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdatePasswordReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdatePasswordReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/profile/SysUserProfileUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageItemRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageItemRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageItemRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageItemRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdatePasswordReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdatePasswordReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdatePasswordReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdatePasswordReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateStatusReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateStatusReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateStatusReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserUpdateStatusReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/common/SysCaptchaConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/common/SysCaptchaConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/common/SysCaptchaConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/common/SysCaptchaConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/errorcode/SysErrorCodeConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsChannelConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsLogConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/sms/SysSmsTemplateConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/errorcode/SysErrorCodeDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/errorcode/SysErrorCodeDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/errorcode/SysErrorCodeDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/errorcode/SysErrorCodeDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsChannelDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsLogDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/sms/SysSmsTemplateDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/errorcode/SysErrorCodeMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsChannelMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsLogMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/sms/SysSmsTemplateMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/SysRedisKeyConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/auth/SysLoginUserRedisDAO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/common/SysCaptchaRedisDAO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/common/SysCaptchaRedisDAO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/common/SysCaptchaRedisDAO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/common/SysCaptchaRedisDAO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysErrorCodeConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/common/SysSexEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/common/SysSexEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/common/SysSexEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/common/SysSexEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/dept/DeptIdEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/dept/DeptIdEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/dept/DeptIdEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/dept/DeptIdEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/errorcode/SysErrorCodeTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginLogTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginLogTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginLogTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginLogTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginResultEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginResultEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginResultEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/logger/SysLoginResultEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/notice/SysNoticeTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/notice/SysNoticeTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/notice/SysNoticeTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/notice/SysNoticeTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuIdEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuIdEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuIdEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuIdEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/MenuTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/RoleCodeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/RoleCodeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/RoleCodeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/RoleCodeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/SysRoleTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/SysRoleTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/SysRoleTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/permission/SysRoleTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsReceiveStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsReceiveStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsReceiveStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsReceiveStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsSendStatusEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsSendStatusEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsSendStatusEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsSendStatusEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsTemplateTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsTemplateTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsTemplateTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/sms/SysSmsTemplateTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/job/auth/SysUserSessionTimeoutJob.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/job/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/job/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/job/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/job/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dept/SysDeptRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dept/SysDeptRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dept/SysDeptRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dept/SysDeptRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dict/SysDictDataRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dict/SysDictDataRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dict/SysDictDataRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/dict/SysDictDataRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/mail/SysMailSendConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/mail/SysMailSendConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/mail/SysMailSendConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/mail/SysMailSendConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysMenuRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysMenuRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysMenuRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysMenuRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleMenuRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleMenuRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleMenuRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleMenuRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/permission/SysRoleRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsChannelRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsChannelRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsChannelRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsChannelRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsSendConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsSendConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsSendConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsSendConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsTemplateRefreshConsumer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsTemplateRefreshConsumer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsTemplateRefreshConsumer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/consumer/sms/SysSmsTemplateRefreshConsumer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dept/SysDeptRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dept/SysDeptRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dept/SysDeptRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dept/SysDeptRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dict/SysDictDataRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dict/SysDictDataRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dict/SysDictDataRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/dict/SysDictDataRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/mail/SysMailSendMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/mail/SysMailSendMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/mail/SysMailSendMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/mail/SysMailSendMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysMenuRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysMenuRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysMenuRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysMenuRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleMenuRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleMenuRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleMenuRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleMenuRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/permission/SysRoleRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsChannelRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsChannelRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsChannelRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsChannelRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsSendMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsTemplateRefreshMessage.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsTemplateRefreshMessage.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsTemplateRefreshMessage.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/message/sms/SysSmsTemplateRefreshMessage.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dept/SysDeptProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dept/SysDeptProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dept/SysDeptProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dept/SysDeptProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dict/SysDictDataProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dict/SysDictDataProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dict/SysDictDataProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/dict/SysDictDataProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysMenuProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysMenuProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysMenuProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysMenuProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysPermissionProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysPermissionProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysPermissionProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysPermissionProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysRoleProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysRoleProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysRoleProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/permission/SysRoleProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/mq/producer/sms/SysSmsProducer.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysCaptchaServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysCaptchaServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysCaptchaServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysCaptchaServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsChannelServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsLogServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/sms/impl/SysSmsTemplateServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/ToolCodegenController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenDetailRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenPreviewRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/ToolCodegenUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/column/ToolCodegenColumnRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTablePageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolCodegenTableRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/codegen/vo/table/ToolSchemaTableRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoBaseVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoCreateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExportReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoPageReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoRespVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoRespVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoRespVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoUpdateReqVO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/codegen/ToolCodegenConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/convert/test/ToolTestDemoConvert.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaColumnDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolSchemaTableDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/test/ToolTestDemoDO.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenColumnMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolCodegenTableMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/test/ToolTestDemoMapper.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/ToolErrorCodeConstants.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnHtmlTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenColumnListConditionEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenImportTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/enums/codegen/ToolCodegenTemplateTypeEnum.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenBuilder.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenBuilder.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenBuilder.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenBuilder.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/ToolTestDemoService.java diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/test/impl/ToolTestDemoServiceImpl.java diff --git a/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/package-info.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/package-info.java diff --git a/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java diff --git a/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java similarity index 100% rename from src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java diff --git a/src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector b/yudao-admin-server/src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector similarity index 100% rename from src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector rename to yudao-admin-server/src/main/resources/META-INF/services/com.ctrip.framework.apollo.internals.Injector diff --git a/src/main/resources/META-INF/spring.factories b/yudao-admin-server/src/main/resources/META-INF/spring.factories similarity index 100% rename from src/main/resources/META-INF/spring.factories rename to yudao-admin-server/src/main/resources/META-INF/spring.factories diff --git a/src/main/resources/application-dev.yaml b/yudao-admin-server/src/main/resources/application-dev.yaml similarity index 100% rename from src/main/resources/application-dev.yaml rename to yudao-admin-server/src/main/resources/application-dev.yaml diff --git a/src/main/resources/application-local.yaml b/yudao-admin-server/src/main/resources/application-local.yaml similarity index 100% rename from src/main/resources/application-local.yaml rename to yudao-admin-server/src/main/resources/application-local.yaml diff --git a/src/main/resources/application.yaml b/yudao-admin-server/src/main/resources/application.yaml similarity index 100% rename from src/main/resources/application.yaml rename to yudao-admin-server/src/main/resources/application.yaml diff --git a/src/main/resources/banner.txt b/yudao-admin-server/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to yudao-admin-server/src/main/resources/banner.txt diff --git a/src/main/resources/codegen/java/controller/controller.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/controller.vm similarity index 100% rename from src/main/resources/codegen/java/controller/controller.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/controller.vm diff --git a/src/main/resources/codegen/java/controller/vo/_column.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/_column.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/_column.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/_column.vm diff --git a/src/main/resources/codegen/java/controller/vo/baseVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/baseVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/baseVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/baseVO.vm diff --git a/src/main/resources/codegen/java/controller/vo/createReqVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/createReqVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/createReqVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/createReqVO.vm diff --git a/src/main/resources/codegen/java/controller/vo/excelVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/excelVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/excelVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/excelVO.vm diff --git a/src/main/resources/codegen/java/controller/vo/exportReqVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/exportReqVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/exportReqVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/exportReqVO.vm diff --git a/src/main/resources/codegen/java/controller/vo/pageReqVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/pageReqVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/pageReqVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/pageReqVO.vm diff --git a/src/main/resources/codegen/java/controller/vo/respVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/respVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/respVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/respVO.vm diff --git a/src/main/resources/codegen/java/controller/vo/updateReqVO.vm b/yudao-admin-server/src/main/resources/codegen/java/controller/vo/updateReqVO.vm similarity index 100% rename from src/main/resources/codegen/java/controller/vo/updateReqVO.vm rename to yudao-admin-server/src/main/resources/codegen/java/controller/vo/updateReqVO.vm diff --git a/src/main/resources/codegen/java/convert/convert.vm b/yudao-admin-server/src/main/resources/codegen/java/convert/convert.vm similarity index 100% rename from src/main/resources/codegen/java/convert/convert.vm rename to yudao-admin-server/src/main/resources/codegen/java/convert/convert.vm diff --git a/src/main/resources/codegen/java/dal/do.vm b/yudao-admin-server/src/main/resources/codegen/java/dal/do.vm similarity index 100% rename from src/main/resources/codegen/java/dal/do.vm rename to yudao-admin-server/src/main/resources/codegen/java/dal/do.vm diff --git a/src/main/resources/codegen/java/dal/mapper.vm b/yudao-admin-server/src/main/resources/codegen/java/dal/mapper.vm similarity index 100% rename from src/main/resources/codegen/java/dal/mapper.vm rename to yudao-admin-server/src/main/resources/codegen/java/dal/mapper.vm diff --git a/src/main/resources/codegen/java/enums/errorcode.vm b/yudao-admin-server/src/main/resources/codegen/java/enums/errorcode.vm similarity index 100% rename from src/main/resources/codegen/java/enums/errorcode.vm rename to yudao-admin-server/src/main/resources/codegen/java/enums/errorcode.vm diff --git a/src/main/resources/codegen/java/service/service.vm b/yudao-admin-server/src/main/resources/codegen/java/service/service.vm similarity index 100% rename from src/main/resources/codegen/java/service/service.vm rename to yudao-admin-server/src/main/resources/codegen/java/service/service.vm diff --git a/src/main/resources/codegen/java/service/serviceImpl.vm b/yudao-admin-server/src/main/resources/codegen/java/service/serviceImpl.vm similarity index 100% rename from src/main/resources/codegen/java/service/serviceImpl.vm rename to yudao-admin-server/src/main/resources/codegen/java/service/serviceImpl.vm diff --git a/src/main/resources/codegen/java/test/serviceTest.vm b/yudao-admin-server/src/main/resources/codegen/java/test/serviceTest.vm similarity index 100% rename from src/main/resources/codegen/java/test/serviceTest.vm rename to yudao-admin-server/src/main/resources/codegen/java/test/serviceTest.vm diff --git a/src/main/resources/codegen/sql/sql.vm b/yudao-admin-server/src/main/resources/codegen/sql/sql.vm similarity index 100% rename from src/main/resources/codegen/sql/sql.vm rename to yudao-admin-server/src/main/resources/codegen/sql/sql.vm diff --git a/src/main/resources/codegen/vue/api/api.js.vm b/yudao-admin-server/src/main/resources/codegen/vue/api/api.js.vm similarity index 100% rename from src/main/resources/codegen/vue/api/api.js.vm rename to yudao-admin-server/src/main/resources/codegen/vue/api/api.js.vm diff --git a/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-admin-server/src/main/resources/codegen/vue/views/index.vue.vm similarity index 100% rename from src/main/resources/codegen/vue/views/index.vue.vm rename to yudao-admin-server/src/main/resources/codegen/vue/views/index.vue.vm diff --git a/src/main/resources/logback-spring.xml b/yudao-admin-server/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to yudao-admin-server/src/main/resources/logback-spring.xml diff --git a/src/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseDbAndRedisIntegrationTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/BaseRedisIntegrationTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/framework/quartz/core/SchedulerManagerTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/quartz/core/SchedulerManagerTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/framework/quartz/core/SchedulerManagerTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/quartz/core/SchedulerManagerTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/framework/redis/core/stream/RedisStreamTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/redis/core/stream/RedisStreamTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/framework/redis/core/stream/RedisStreamTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/redis/core/stream/RedisStreamTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientIntegrationTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClientIntegrationTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientIntegrationTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/package-info.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/package-info.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/system/service/package-info.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/package-info.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceIntegrationTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaColumnMapperTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolInformationSchemaTableMapperTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenEngineTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenEngineTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenEngineTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenEngineTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenSQLParserTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenSQLParserTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenSQLParserTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenSQLParserTest.java diff --git a/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenServiceImplTest.java b/yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenServiceImplTest.java similarity index 100% rename from src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenServiceImplTest.java rename to yudao-admin-server/src/test-integration/java/cn/iocoder/dashboard/modules/tool/service/codegen/ToolCodegenServiceImplTest.java diff --git a/src/test-integration/resources/application-integration-test.yaml b/yudao-admin-server/src/test-integration/resources/application-integration-test.yaml similarity index 100% rename from src/test-integration/resources/application-integration-test.yaml rename to yudao-admin-server/src/test-integration/resources/application-integration-test.yaml diff --git a/src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbAndRedisUnitTest.java diff --git a/src/test/java/cn/iocoder/dashboard/BaseDbUnitTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbUnitTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/BaseDbUnitTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseDbUnitTest.java diff --git a/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java diff --git a/src/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/BaseRedisUnitTest.java diff --git a/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/config/QuartzTestConfiguration.java diff --git a/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/config/RedisTestConfiguration.java diff --git a/src/test/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/package-info.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/framework/package-info.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/package-info.java diff --git a/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java diff --git a/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java diff --git a/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java diff --git a/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java similarity index 97% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java index 7f923677e..baccf727d 100644 --- a/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java @@ -1,269 +1,269 @@ -package cn.iocoder.dashboard.modules.system.service.auth; - -import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.framework.security.core.LoginUser; -import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; -import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; -import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; -import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; -import cn.iocoder.dashboard.modules.system.service.auth.impl.SysAuthServiceImpl; -import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; -import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; -import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; -import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.AssertUtils; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Import; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.DisabledException; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UsernameNotFoundException; - -import javax.annotation.Resource; -import java.util.Set; - -import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; -import static java.util.Collections.singleton; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; - -/** - * {@link SysAuthServiceImpl} 的单元测试 - * - * @author 芋道源码 - */ -@Import(SysAuthServiceImpl.class) -public class SysAuthServiceImplTest extends BaseDbUnitTest { - - @Resource - private SysAuthServiceImpl authService; - - @MockBean - private SysUserService userService; - @MockBean - private SysPermissionService permissionService; - @MockBean - private AuthenticationManager authenticationManager; - @MockBean - private Authentication authentication; - @MockBean - private SysCaptchaService captchaService; - @MockBean - private SysLoginLogService loginLogService; - @MockBean - private SysUserSessionService userSessionService; - - @Test - public void testLoadUserByUsername_success() { - // 准备参数 - String username = randomString(); - // mock 方法 - SysUserDO user = randomUserDO(o -> o.setUsername(username)); - when(userService.getUserByUsername(eq(username))).thenReturn(user); - - // 调用 - LoginUser loginUser = (LoginUser) authService.loadUserByUsername(username); - // 校验 - AssertUtils.assertPojoEquals(user, loginUser, "updateTime"); - assertNull(loginUser.getRoleIds()); // 此时不会加载角色，所以是空的 - } - - @Test - public void testLoadUserByUsername_userNotFound() { - // 准备参数 - String username = randomString(); - // mock 方法 - - // 调用, 并断言异常 - assertThrows(UsernameNotFoundException.class, // 抛出 UsernameNotFoundException 异常 - () -> authService.loadUserByUsername(username), - username); // 异常提示为 username - } - - @Test - public void testMockLogin_success() { - // 准备参数 - Long userId = randomLongId(); - // mock 方法 01 - SysUserDO user = randomUserDO(o -> o.setId(userId)); - when(userService.getUser(eq(userId))).thenReturn(user); - // mock 方法 02 - Set roleIds = randomSet(Long.class); - when(permissionService.getUserRoleIds(eq(userId), eq(singleton(CommonStatusEnum.ENABLE.getStatus())))) - .thenReturn(roleIds); - - // 调用 - LoginUser loginUser = authService.mockLogin(userId); - // 断言 - AssertUtils.assertPojoEquals(user, loginUser, "updateTime"); - assertEquals(roleIds, loginUser.getRoleIds()); - } - - @Test - public void testMockLogin_userNotFound() { - // 准备参数 - Long userId = randomLongId(); - // mock 方法 - - // 调用, 并断言异常 - assertThrows(UsernameNotFoundException.class, // 抛出 UsernameNotFoundException 异常 - () -> authService.mockLogin(userId), - String.valueOf(userId)); // 异常提示为 userId - } - - @Test - public void testLogin_captchaNotFound() { - // 准备参数 - SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); - String userIp = randomString(); - String userAgent = randomString(); - // 调用, 并断言异常 - assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_CAPTCHA_NOT_FOUND); - // 校验调用参数 - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) - && o.getResult().equals(SysLoginResultEnum.CAPTCHA_NOT_FOUND.getResult())) - ); - } - - @Test - public void testLogin_captchaCodeError() { - // 准备参数 - String userIp = randomString(); - String userAgent = randomString(); - String code = randomString(); - SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); - // mock 验证码不正确 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(code); - // 调用, 并断言异常 - assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_CAPTCHA_CODE_ERROR); - // 校验调用参数 - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) - && o.getResult().equals(SysLoginResultEnum.CAPTCHA_CODE_ERROR.getResult())) - ); - } - - @Test - public void testLogin_badCredentials() { - // 准备参数 - String userIp = randomString(); - String userAgent = randomString(); - SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); - // mock 验证码正确 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); - // mock 抛出异常 - when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) - .thenThrow(new BadCredentialsException("测试账号或密码不正确")); - // 调用, 并断言异常 - assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_BAD_CREDENTIALS); - // 校验调用参数 - verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) - && o.getResult().equals(SysLoginResultEnum.BAD_CREDENTIALS.getResult())) - ); - } - - @Test - public void testLogin_userDisabled() { - // 准备参数 - String userIp = randomString(); - String userAgent = randomString(); - SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); - // mock 验证码正确 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); - // mock 抛出异常 - when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) - .thenThrow(new DisabledException("测试用户被禁用")); - // 调用, 并断言异常 - assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_USER_DISABLED); - // 校验调用参数 - verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) - && o.getResult().equals(SysLoginResultEnum.USER_DISABLED.getResult())) - ); - } - - @Test - public void testLogin_unknownError() { - // 准备参数 - String userIp = randomString(); - String userAgent = randomString(); - SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); - // mock 验证码正确 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); - // mock 抛出异常 - when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) - .thenThrow(new AuthenticationException("测试未知异常") {}); - // 调用, 并断言异常 - assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_FAIL_UNKNOWN); - // 校验调用参数 - verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) - && o.getResult().equals(SysLoginResultEnum.UNKNOWN_ERROR.getResult())) - ); - } - - @Test - public void testLogin_success() { - // 准备参数 - String userIp = randomString(); - String userAgent = randomString(); - Long userId = randomLongId(); - Set userRoleIds = randomSet(Long.class); - String sessionId = randomString(); - SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); - LoginUser loginUser = randomPojo(LoginUser.class, o -> { - o.setId(userId); - o.setRoleIds(userRoleIds); - }); - // mock 验证码正确 - when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); - // mock authentication - when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) - .thenReturn(authentication); - when(authentication.getPrincipal()).thenReturn(loginUser); - // mock 获得 User 拥有的角色编号数组 - when(permissionService.getUserRoleIds(userId, singleton(CommonStatusEnum.ENABLE.getStatus()))).thenReturn(userRoleIds); - // mock 缓存登陆用户到 Redis - when(userSessionService.createUserSession(loginUser, userIp, userAgent)).thenReturn(sessionId); - // 调用, 并断言异常 - String login = authService.login(reqVO, userIp, userAgent); - assertEquals(sessionId, login); - // 校验调用参数 - verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) - && o.getResult().equals(SysLoginResultEnum.SUCCESS.getResult())) - ); - } - - @Test - public void testLogout_success() { - // 准备参数 - String token = randomString(); - LoginUser loginUser = randomPojo(LoginUser.class); - // mock - when(userSessionService.getLoginUser(token)).thenReturn(loginUser); - // 调用 - authService.logout(token); - // 校验调用参数 - verify(userSessionService, times(1)).deleteUserSession(token); - verify(loginLogService, times(1)).createLoginLog( - argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGOUT_SELF.getType()) - && o.getResult().equals(SysLoginResultEnum.SUCCESS.getResult())) - ); - } - -} +package cn.iocoder.dashboard.modules.system.service.auth; + +import cn.iocoder.dashboard.BaseDbUnitTest; +import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.dashboard.framework.security.core.LoginUser; +import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO; +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; +import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; +import cn.iocoder.dashboard.modules.system.service.auth.impl.SysAuthServiceImpl; +import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; +import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; +import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; +import cn.iocoder.dashboard.modules.system.service.user.SysUserService; +import cn.iocoder.dashboard.util.AssertUtils; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.DisabledException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UsernameNotFoundException; + +import javax.annotation.Resource; +import java.util.Set; + +import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; +import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.RandomUtils.*; +import static java.util.Collections.singleton; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + +/** + * {@link SysAuthServiceImpl} 的单元测试 + * + * @author 芋道源码 + */ +@Import(SysAuthServiceImpl.class) +public class SysAuthServiceImplTest extends BaseDbUnitTest { + + @Resource + private SysAuthServiceImpl authService; + + @MockBean + private SysUserService userService; + @MockBean + private SysPermissionService permissionService; + @MockBean + private AuthenticationManager authenticationManager; + @MockBean + private Authentication authentication; + @MockBean + private SysCaptchaService captchaService; + @MockBean + private SysLoginLogService loginLogService; + @MockBean + private SysUserSessionService userSessionService; + + @Test + public void testLoadUserByUsername_success() { + // 准备参数 + String username = randomString(); + // mock 方法 + SysUserDO user = randomUserDO(o -> o.setUsername(username)); + when(userService.getUserByUsername(eq(username))).thenReturn(user); + + // 调用 + LoginUser loginUser = (LoginUser) authService.loadUserByUsername(username); + // 校验 + AssertUtils.assertPojoEquals(user, loginUser, "updateTime"); + assertNull(loginUser.getRoleIds()); // 此时不会加载角色，所以是空的 + } + + @Test + public void testLoadUserByUsername_userNotFound() { + // 准备参数 + String username = randomString(); + // mock 方法 + + // 调用, 并断言异常 + assertThrows(UsernameNotFoundException.class, // 抛出 UsernameNotFoundException 异常 + () -> authService.loadUserByUsername(username), + username); // 异常提示为 username + } + + @Test + public void testMockLogin_success() { + // 准备参数 + Long userId = randomLongId(); + // mock 方法 01 + SysUserDO user = randomUserDO(o -> o.setId(userId)); + when(userService.getUser(eq(userId))).thenReturn(user); + // mock 方法 02 + Set roleIds = randomSet(Long.class); + when(permissionService.getUserRoleIds(eq(userId), eq(singleton(CommonStatusEnum.ENABLE.getStatus())))) + .thenReturn(roleIds); + + // 调用 + LoginUser loginUser = authService.mockLogin(userId); + // 断言 + AssertUtils.assertPojoEquals(user, loginUser, "updateTime"); + assertEquals(roleIds, loginUser.getRoleIds()); + } + + @Test + public void testMockLogin_userNotFound() { + // 准备参数 + Long userId = randomLongId(); + // mock 方法 + + // 调用, 并断言异常 + assertThrows(UsernameNotFoundException.class, // 抛出 UsernameNotFoundException 异常 + () -> authService.mockLogin(userId), + String.valueOf(userId)); // 异常提示为 userId + } + + @Test + public void testLogin_captchaNotFound() { + // 准备参数 + SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); + String userIp = randomString(); + String userAgent = randomString(); + // 调用, 并断言异常 + assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_CAPTCHA_NOT_FOUND); + // 校验调用参数 + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) + && o.getResult().equals(SysLoginResultEnum.CAPTCHA_NOT_FOUND.getResult())) + ); + } + + @Test + public void testLogin_captchaCodeError() { + // 准备参数 + String userIp = randomString(); + String userAgent = randomString(); + String code = randomString(); + SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); + // mock 验证码不正确 + when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(code); + // 调用, 并断言异常 + assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_CAPTCHA_CODE_ERROR); + // 校验调用参数 + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) + && o.getResult().equals(SysLoginResultEnum.CAPTCHA_CODE_ERROR.getResult())) + ); + } + + @Test + public void testLogin_badCredentials() { + // 准备参数 + String userIp = randomString(); + String userAgent = randomString(); + SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); + // mock 验证码正确 + when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); + // mock 抛出异常 + when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) + .thenThrow(new BadCredentialsException("测试账号或密码不正确")); + // 调用, 并断言异常 + assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_BAD_CREDENTIALS); + // 校验调用参数 + verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) + && o.getResult().equals(SysLoginResultEnum.BAD_CREDENTIALS.getResult())) + ); + } + + @Test + public void testLogin_userDisabled() { + // 准备参数 + String userIp = randomString(); + String userAgent = randomString(); + SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); + // mock 验证码正确 + when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); + // mock 抛出异常 + when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) + .thenThrow(new DisabledException("测试用户被禁用")); + // 调用, 并断言异常 + assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_USER_DISABLED); + // 校验调用参数 + verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) + && o.getResult().equals(SysLoginResultEnum.USER_DISABLED.getResult())) + ); + } + + @Test + public void testLogin_unknownError() { + // 准备参数 + String userIp = randomString(); + String userAgent = randomString(); + SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); + // mock 验证码正确 + when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); + // mock 抛出异常 + when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) + .thenThrow(new AuthenticationException("测试未知异常") {}); + // 调用, 并断言异常 + assertServiceException(() -> authService.login(reqVO, userIp, userAgent), AUTH_LOGIN_FAIL_UNKNOWN); + // 校验调用参数 + verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) + && o.getResult().equals(SysLoginResultEnum.UNKNOWN_ERROR.getResult())) + ); + } + + @Test + public void testLogin_success() { + // 准备参数 + String userIp = randomString(); + String userAgent = randomString(); + Long userId = randomLongId(); + Set userRoleIds = randomSet(Long.class); + String sessionId = randomString(); + SysAuthLoginReqVO reqVO = randomPojo(SysAuthLoginReqVO.class); + LoginUser loginUser = randomPojo(LoginUser.class, o -> { + o.setId(userId); + o.setRoleIds(userRoleIds); + }); + // mock 验证码正确 + when(captchaService.getCaptchaCode(reqVO.getUuid())).thenReturn(reqVO.getCode()); + // mock authentication + when(authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(reqVO.getUsername(), reqVO.getPassword()))) + .thenReturn(authentication); + when(authentication.getPrincipal()).thenReturn(loginUser); + // mock 获得 User 拥有的角色编号数组 + when(permissionService.getUserRoleIds(userId, singleton(CommonStatusEnum.ENABLE.getStatus()))).thenReturn(userRoleIds); + // mock 缓存登陆用户到 Redis + when(userSessionService.createUserSession(loginUser, userIp, userAgent)).thenReturn(sessionId); + // 调用, 并断言异常 + String login = authService.login(reqVO, userIp, userAgent); + assertEquals(sessionId, login); + // 校验调用参数 + verify(captchaService, times(1)).deleteCaptchaCode(reqVO.getUuid()); + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGIN_USERNAME.getType()) + && o.getResult().equals(SysLoginResultEnum.SUCCESS.getResult())) + ); + } + + @Test + public void testLogout_success() { + // 准备参数 + String token = randomString(); + LoginUser loginUser = randomPojo(LoginUser.class); + // mock + when(userSessionService.getLoginUser(token)).thenReturn(loginUser); + // 调用 + authService.logout(token); + // 校验调用参数 + verify(userSessionService, times(1)).deleteUserSession(token); + verify(loginLogService, times(1)).createLoginLog( + argThat(o -> o.getLogType().equals(SysLoginLogTypeEnum.LOGOUT_SELF.getType()) + && o.getResult().equals(SysLoginResultEnum.SUCCESS.getResult())) + ); + } + +} diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java similarity index 97% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java index c120fd870..9cefaada3 100644 --- a/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java @@ -1,366 +1,366 @@ -package cn.iocoder.dashboard.modules.system.service.permission; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.lang.Assert; -import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO; -import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; -import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO; -import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; -import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper; -import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; -import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; -import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; -import cn.iocoder.dashboard.util.sping.SpringAopUtils; -import cn.iocoder.dashboard.util.RandomUtils; -import cn.iocoder.dashboard.util.object.ObjectUtils; -import com.google.common.collect.Multimap; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Import; - -import javax.annotation.Resource; -import java.util.*; - -import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.verify; - -@Import(SysMenuServiceImpl.class) -public class SysMenuServiceTest extends BaseDbUnitTest { - - @Resource - private SysMenuServiceImpl sysMenuService; - - @MockBean - private SysPermissionService sysPermissionService; - - @MockBean - private SysMenuProducer sysMenuProducer; - - @Resource - private SysMenuMapper menuMapper; - - @Test - public void testInitLocalCache_success() throws Exception { - SysMenuDO menuDO1 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L); - menuMapper.insert(menuDO1); - SysMenuDO menuDO2 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L); - menuMapper.insert(menuDO2); - - // 调用 - sysMenuService.initLocalCache(); - - // 获取代理对象 - SysMenuServiceImpl target = (SysMenuServiceImpl) SpringAopUtils.getTarget(sysMenuService); - - Map menuCache = - (Map) BeanUtil.getFieldValue(target, "menuCache"); - Assert.isTrue(menuCache.size() == 2); - assertPojoEquals(menuDO1, menuCache.get(menuDO1.getId())); - assertPojoEquals(menuDO2, menuCache.get(menuDO2.getId())); - - Multimap permissionMenuCache = - (Multimap) BeanUtil.getFieldValue(target, "permissionMenuCache"); - Assert.isTrue(permissionMenuCache.size() == 2); - assertPojoEquals(menuDO1, permissionMenuCache.get(menuDO1.getPermission())); - assertPojoEquals(menuDO2, permissionMenuCache.get(menuDO2.getPermission())); - - Date maxUpdateTime = (Date) BeanUtil.getFieldValue(target, "maxUpdateTime"); - assertEquals(ObjectUtils.max(menuDO1.getUpdateTime(), menuDO2.getUpdateTime()), maxUpdateTime); - } - - @Test - public void testCreateMenu_success() { - //构造父目录 - SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); - menuMapper.insert(menuDO); - Long parentId = menuDO.getId(); - - //调用 - SysMenuCreateReqVO vo = randomPojo(SysMenuCreateReqVO.class, o -> { - o.setParentId(parentId); - o.setName("testSonName"); - o.setType(MenuTypeEnum.MENU.getType()); - o.setStatus(RandomUtils.randomCommonStatus()); - }); - Long menuId = sysMenuService.createMenu(vo); - - //断言 - Assertions.assertNotNull(menuId); - // 校验记录的属性是否正确 - SysMenuDO ret = menuMapper.selectById(menuId); - assertPojoEquals(vo, ret); - // 校验调用 - verify(sysMenuProducer).sendMenuRefreshMessage(); - } - - @Test - public void testUpdateMenu_success() { - //构造父子目录 - SysMenuDO sonMenuDO = initParentAndSonMenuDO(); - Long sonId = sonMenuDO.getId(); - Long parentId = sonMenuDO.getParentId(); - - //调用 - SysMenuUpdateReqVO vo = RandomUtils.randomPojo(SysMenuUpdateReqVO.class, o -> { - o.setId(sonId); - o.setParentId(parentId); - o.setType(MenuTypeEnum.MENU.getType()); - o.setStatus(RandomUtils.randomCommonStatus()); - o.setName("pppppp"); //修改名字 - }); - sysMenuService.updateMenu(vo); - - //断言 - // 校验记录的属性是否正确 - SysMenuDO ret = menuMapper.selectById(sonId); - assertPojoEquals(vo, ret); - // 校验调用 - verify(sysMenuProducer).sendMenuRefreshMessage(); - } - - @Test - public void testUpdateMenu_sonIdNotExist() { - Long sonId = 99999L; - Long parentId = 10000L; - - //调用 - SysMenuUpdateReqVO vo = RandomUtils.randomPojo(SysMenuUpdateReqVO.class, o -> { - o.setId(sonId); - o.setParentId(parentId); - o.setType(MenuTypeEnum.MENU.getType()); - o.setStatus(RandomUtils.randomCommonStatus()); - }); - //断言 - assertServiceException(() -> sysMenuService.updateMenu(vo), MENU_NOT_EXISTS); - } - - @Test - public void testDeleteMenu_success() { - SysMenuDO sonMenuDO = initParentAndSonMenuDO(); - Long sonId = sonMenuDO.getId(); - - //调用 - sysMenuService.deleteMenu(sonId); - - //断言 - SysMenuDO menuDO = menuMapper.selectById(sonId); - Assert.isNull(menuDO); - verify(sysPermissionService).processMenuDeleted(sonId); - verify(sysMenuProducer).sendMenuRefreshMessage(); - } - - @Test - public void testDeleteMenu_menuNotExist() { - Long sonId = 99999L; - - assertServiceException(() -> sysMenuService.deleteMenu(sonId), MENU_NOT_EXISTS); - } - - @Test - public void testDeleteMenu_existChildren() { - SysMenuDO sonMenu = initParentAndSonMenuDO(); - Long parentId = sonMenu.getParentId(); - - assertServiceException(() -> sysMenuService.deleteMenu(parentId), MENU_EXISTS_CHILDREN); - } - - @Test - public void testGetMenus_success() { - Map idMenuMap = new HashMap<>(); - SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); - menuMapper.insert(menuDO); - idMenuMap.put(menuDO.getId(), menuDO); - - SysMenuDO sonMenu = createMenuDO(MenuTypeEnum.MENU, "son", menuDO.getId()); - menuMapper.insert(sonMenu); - idMenuMap.put(sonMenu.getId(), sonMenu); - - //调用 - List menuDOS = sysMenuService.getMenus(); - - //断言 - Assert.isTrue(menuDOS.size() == idMenuMap.size()); - menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m)); - } - - @Test - public void testGetMenusReqVo_success() { - Map idMenuMap = new HashMap<>(); - //用于验证可以模糊搜索名称包含"name"，状态为1的menu - SysMenuDO menu = createMenuDO(MenuTypeEnum.MENU, "name2", 0L, 1); - menuMapper.insert(menu); - idMenuMap.put(menu.getId(), menu); - - menu = createMenuDO(MenuTypeEnum.MENU, "11name111", 0L, 1); - menuMapper.insert(menu); - idMenuMap.put(menu.getId(), menu); - - menu = createMenuDO(MenuTypeEnum.MENU, "name", 0L, 1); - menuMapper.insert(menu); - idMenuMap.put(menu.getId(), menu); - - //以下是不符合搜索条件的的menu - menu = createMenuDO(MenuTypeEnum.MENU, "xxxxxx", 0L, 1); - menuMapper.insert(menu); - menu = createMenuDO(MenuTypeEnum.MENU, "name", 0L, 2); - menuMapper.insert(menu); - - //调用 - SysMenuListReqVO reqVO = new SysMenuListReqVO(); - reqVO.setStatus(1); - reqVO.setName("name"); - List menuDOS = sysMenuService.getMenus(reqVO); - - //断言 - Assert.isTrue(menuDOS.size() == idMenuMap.size()); - menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m)); - } - - @Test - public void testListMenusFromCache_success() throws Exception { - Map mockCacheMap = new HashMap<>(); - //获取代理对象 - SysMenuServiceImpl target = (SysMenuServiceImpl) SpringAopUtils.getTarget(sysMenuService); - BeanUtil.setFieldValue(target, "menuCache", mockCacheMap); - - Map idMenuMap = new HashMap<>(); - //用于验证搜索类型为MENU,状态为1的menu - SysMenuDO menuDO = createMenuDO(1L, MenuTypeEnum.MENU, "name", 0L, 1); - mockCacheMap.put(menuDO.getId(), menuDO); - idMenuMap.put(menuDO.getId(), menuDO); - - menuDO = createMenuDO(2L, MenuTypeEnum.MENU, "name", 0L, 1); - mockCacheMap.put(menuDO.getId(), menuDO); - idMenuMap.put(menuDO.getId(), menuDO); - - //以下是不符合搜索条件的menu - menuDO = createMenuDO(3L, MenuTypeEnum.BUTTON, "name", 0L, 1); - mockCacheMap.put(menuDO.getId(), menuDO); - menuDO = createMenuDO(4L, MenuTypeEnum.MENU, "name", 0L, 2); - mockCacheMap.put(menuDO.getId(), menuDO); - - List menuDOS = sysMenuService.listMenusFromCache(Collections.singletonList(MenuTypeEnum.MENU.getType()), - Collections.singletonList(CommonStatusEnum.DISABLE.getStatus())); - Assert.isTrue(menuDOS.size() == idMenuMap.size()); - menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m)); - } - - @Test - public void testListMenusFromCache2_success() throws Exception { - Map mockCacheMap = new HashMap<>(); - //获取代理对象 - SysMenuServiceImpl target = (SysMenuServiceImpl) SpringAopUtils.getTarget(sysMenuService); - BeanUtil.setFieldValue(target, "menuCache", mockCacheMap); - - Map idMenuMap = new HashMap<>(); - //验证搜索id为1, 类型为MENU, 状态为1 的menu - SysMenuDO menuDO = createMenuDO(1L, MenuTypeEnum.MENU, "name", 0L, 1); - mockCacheMap.put(menuDO.getId(), menuDO); - idMenuMap.put(menuDO.getId(), menuDO); - - //以下是不符合搜索条件的menu - menuDO = createMenuDO(2L, MenuTypeEnum.MENU, "name", 0L, 1); - mockCacheMap.put(menuDO.getId(), menuDO); - menuDO = createMenuDO(3L, MenuTypeEnum.BUTTON, "name", 0L, 1); - mockCacheMap.put(menuDO.getId(), menuDO); - menuDO = createMenuDO(4L, MenuTypeEnum.MENU, "name", 0L, 2); - mockCacheMap.put(menuDO.getId(), menuDO); - - List menuDOS = sysMenuService.listMenusFromCache(Collections.singletonList(1L), - Collections.singletonList(MenuTypeEnum.MENU.getType()), Collections.singletonList(1)); - Assert.isTrue(menuDOS.size() == idMenuMap.size()); - menuDOS.forEach(menu -> assertPojoEquals(idMenuMap.get(menu.getId()), menu)); - } - - @Test - public void testCheckParentResource_success() { - SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); - menuMapper.insert(menuDO); - Long parentId = menuDO.getId(); - - sysMenuService.checkParentResource(parentId, null); - } - - @Test - public void testCheckParentResource_canNotSetSelfToBeParent() { - assertServiceException(() -> sysMenuService.checkParentResource(1L, 1L), MENU_PARENT_ERROR); - } - - @Test - public void testCheckParentResource_parentNotExist() { - assertServiceException(() -> sysMenuService.checkParentResource(randomLongId(), null), MENU_PARENT_NOT_EXISTS); - } - - @Test - public void testCheckParentResource_parentTypeError() { - SysMenuDO menuDO = createMenuDO(MenuTypeEnum.BUTTON, "parent", 0L); - menuMapper.insert(menuDO); - Long parentId = menuDO.getId(); - - assertServiceException(() -> sysMenuService.checkParentResource(parentId, null), MENU_PARENT_NOT_DIR_OR_MENU); - } - - @Test - public void testCheckResource_success() { - SysMenuDO sonMenu = initParentAndSonMenuDO(); - Long parentId = sonMenu.getParentId(); - - Long otherSonMenuId = randomLongId(); - String otherSonMenuName = randomString(); - - sysMenuService.checkResource(parentId, otherSonMenuName, otherSonMenuId); - } - - @Test - public void testCheckResource_sonMenuNameDuplicate(){ - SysMenuDO sonMenu=initParentAndSonMenuDO(); - Long parentId=sonMenu.getParentId(); - - Long otherSonMenuId=randomLongId(); - String otherSonMenuName=sonMenu.getName(); //相同名称 - - assertServiceException(() -> sysMenuService.checkResource(parentId, otherSonMenuName, otherSonMenuId), MENU_NAME_DUPLICATE); - } - - /** - * 构造父子目录，返回子目录 - * - * @return - */ - private SysMenuDO initParentAndSonMenuDO() { - //构造父子目录 - SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); - menuMapper.insert(menuDO); - Long parentId = menuDO.getId(); - - SysMenuDO sonMenuDO = createMenuDO(MenuTypeEnum.MENU, "testSonName", parentId); - menuMapper.insert(sonMenuDO); - return sonMenuDO; - } - - private SysMenuDO createMenuDO(MenuTypeEnum typeEnum, String menuName, Long parentId) { - return createMenuDO(typeEnum, menuName, parentId, RandomUtils.randomCommonStatus()); - } - - private SysMenuDO createMenuDO(MenuTypeEnum typeEnum, String menuName, Long parentId, Integer status) { - return createMenuDO(null, typeEnum, menuName, parentId, status); - } - - private SysMenuDO createMenuDO(Long id, MenuTypeEnum typeEnum, String menuName, Long parentId, Integer status) { - return RandomUtils.randomPojo(SysMenuDO.class, o -> { - o.setId(id); - o.setParentId(parentId); - o.setType(typeEnum.getType()); - o.setStatus(status); - o.setName(menuName); - }); - } - -} +package cn.iocoder.dashboard.modules.system.service.permission; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.lang.Assert; +import cn.iocoder.dashboard.BaseDbUnitTest; +import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO; +import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO; +import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO; +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO; +import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper; +import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; +import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; +import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; +import cn.iocoder.dashboard.util.sping.SpringAopUtils; +import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.object.ObjectUtils; +import com.google.common.collect.Multimap; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; + +import javax.annotation.Resource; +import java.util.*; + +import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; +import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.RandomUtils.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.verify; + +@Import(SysMenuServiceImpl.class) +public class SysMenuServiceTest extends BaseDbUnitTest { + + @Resource + private SysMenuServiceImpl sysMenuService; + + @MockBean + private SysPermissionService sysPermissionService; + + @MockBean + private SysMenuProducer sysMenuProducer; + + @Resource + private SysMenuMapper menuMapper; + + @Test + public void testInitLocalCache_success() throws Exception { + SysMenuDO menuDO1 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L); + menuMapper.insert(menuDO1); + SysMenuDO menuDO2 = createMenuDO(MenuTypeEnum.MENU, "xxxx", 0L); + menuMapper.insert(menuDO2); + + // 调用 + sysMenuService.initLocalCache(); + + // 获取代理对象 + SysMenuServiceImpl target = (SysMenuServiceImpl) SpringAopUtils.getTarget(sysMenuService); + + Map menuCache = + (Map) BeanUtil.getFieldValue(target, "menuCache"); + Assert.isTrue(menuCache.size() == 2); + assertPojoEquals(menuDO1, menuCache.get(menuDO1.getId())); + assertPojoEquals(menuDO2, menuCache.get(menuDO2.getId())); + + Multimap permissionMenuCache = + (Multimap) BeanUtil.getFieldValue(target, "permissionMenuCache"); + Assert.isTrue(permissionMenuCache.size() == 2); + assertPojoEquals(menuDO1, permissionMenuCache.get(menuDO1.getPermission())); + assertPojoEquals(menuDO2, permissionMenuCache.get(menuDO2.getPermission())); + + Date maxUpdateTime = (Date) BeanUtil.getFieldValue(target, "maxUpdateTime"); + assertEquals(ObjectUtils.max(menuDO1.getUpdateTime(), menuDO2.getUpdateTime()), maxUpdateTime); + } + + @Test + public void testCreateMenu_success() { + //构造父目录 + SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); + menuMapper.insert(menuDO); + Long parentId = menuDO.getId(); + + //调用 + SysMenuCreateReqVO vo = randomPojo(SysMenuCreateReqVO.class, o -> { + o.setParentId(parentId); + o.setName("testSonName"); + o.setType(MenuTypeEnum.MENU.getType()); + o.setStatus(RandomUtils.randomCommonStatus()); + }); + Long menuId = sysMenuService.createMenu(vo); + + //断言 + Assertions.assertNotNull(menuId); + // 校验记录的属性是否正确 + SysMenuDO ret = menuMapper.selectById(menuId); + assertPojoEquals(vo, ret); + // 校验调用 + verify(sysMenuProducer).sendMenuRefreshMessage(); + } + + @Test + public void testUpdateMenu_success() { + //构造父子目录 + SysMenuDO sonMenuDO = initParentAndSonMenuDO(); + Long sonId = sonMenuDO.getId(); + Long parentId = sonMenuDO.getParentId(); + + //调用 + SysMenuUpdateReqVO vo = RandomUtils.randomPojo(SysMenuUpdateReqVO.class, o -> { + o.setId(sonId); + o.setParentId(parentId); + o.setType(MenuTypeEnum.MENU.getType()); + o.setStatus(RandomUtils.randomCommonStatus()); + o.setName("pppppp"); //修改名字 + }); + sysMenuService.updateMenu(vo); + + //断言 + // 校验记录的属性是否正确 + SysMenuDO ret = menuMapper.selectById(sonId); + assertPojoEquals(vo, ret); + // 校验调用 + verify(sysMenuProducer).sendMenuRefreshMessage(); + } + + @Test + public void testUpdateMenu_sonIdNotExist() { + Long sonId = 99999L; + Long parentId = 10000L; + + //调用 + SysMenuUpdateReqVO vo = RandomUtils.randomPojo(SysMenuUpdateReqVO.class, o -> { + o.setId(sonId); + o.setParentId(parentId); + o.setType(MenuTypeEnum.MENU.getType()); + o.setStatus(RandomUtils.randomCommonStatus()); + }); + //断言 + assertServiceException(() -> sysMenuService.updateMenu(vo), MENU_NOT_EXISTS); + } + + @Test + public void testDeleteMenu_success() { + SysMenuDO sonMenuDO = initParentAndSonMenuDO(); + Long sonId = sonMenuDO.getId(); + + //调用 + sysMenuService.deleteMenu(sonId); + + //断言 + SysMenuDO menuDO = menuMapper.selectById(sonId); + Assert.isNull(menuDO); + verify(sysPermissionService).processMenuDeleted(sonId); + verify(sysMenuProducer).sendMenuRefreshMessage(); + } + + @Test + public void testDeleteMenu_menuNotExist() { + Long sonId = 99999L; + + assertServiceException(() -> sysMenuService.deleteMenu(sonId), MENU_NOT_EXISTS); + } + + @Test + public void testDeleteMenu_existChildren() { + SysMenuDO sonMenu = initParentAndSonMenuDO(); + Long parentId = sonMenu.getParentId(); + + assertServiceException(() -> sysMenuService.deleteMenu(parentId), MENU_EXISTS_CHILDREN); + } + + @Test + public void testGetMenus_success() { + Map idMenuMap = new HashMap<>(); + SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); + menuMapper.insert(menuDO); + idMenuMap.put(menuDO.getId(), menuDO); + + SysMenuDO sonMenu = createMenuDO(MenuTypeEnum.MENU, "son", menuDO.getId()); + menuMapper.insert(sonMenu); + idMenuMap.put(sonMenu.getId(), sonMenu); + + //调用 + List menuDOS = sysMenuService.getMenus(); + + //断言 + Assert.isTrue(menuDOS.size() == idMenuMap.size()); + menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m)); + } + + @Test + public void testGetMenusReqVo_success() { + Map idMenuMap = new HashMap<>(); + //用于验证可以模糊搜索名称包含"name"，状态为1的menu + SysMenuDO menu = createMenuDO(MenuTypeEnum.MENU, "name2", 0L, 1); + menuMapper.insert(menu); + idMenuMap.put(menu.getId(), menu); + + menu = createMenuDO(MenuTypeEnum.MENU, "11name111", 0L, 1); + menuMapper.insert(menu); + idMenuMap.put(menu.getId(), menu); + + menu = createMenuDO(MenuTypeEnum.MENU, "name", 0L, 1); + menuMapper.insert(menu); + idMenuMap.put(menu.getId(), menu); + + //以下是不符合搜索条件的的menu + menu = createMenuDO(MenuTypeEnum.MENU, "xxxxxx", 0L, 1); + menuMapper.insert(menu); + menu = createMenuDO(MenuTypeEnum.MENU, "name", 0L, 2); + menuMapper.insert(menu); + + //调用 + SysMenuListReqVO reqVO = new SysMenuListReqVO(); + reqVO.setStatus(1); + reqVO.setName("name"); + List menuDOS = sysMenuService.getMenus(reqVO); + + //断言 + Assert.isTrue(menuDOS.size() == idMenuMap.size()); + menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m)); + } + + @Test + public void testListMenusFromCache_success() throws Exception { + Map mockCacheMap = new HashMap<>(); + //获取代理对象 + SysMenuServiceImpl target = (SysMenuServiceImpl) SpringAopUtils.getTarget(sysMenuService); + BeanUtil.setFieldValue(target, "menuCache", mockCacheMap); + + Map idMenuMap = new HashMap<>(); + //用于验证搜索类型为MENU,状态为1的menu + SysMenuDO menuDO = createMenuDO(1L, MenuTypeEnum.MENU, "name", 0L, 1); + mockCacheMap.put(menuDO.getId(), menuDO); + idMenuMap.put(menuDO.getId(), menuDO); + + menuDO = createMenuDO(2L, MenuTypeEnum.MENU, "name", 0L, 1); + mockCacheMap.put(menuDO.getId(), menuDO); + idMenuMap.put(menuDO.getId(), menuDO); + + //以下是不符合搜索条件的menu + menuDO = createMenuDO(3L, MenuTypeEnum.BUTTON, "name", 0L, 1); + mockCacheMap.put(menuDO.getId(), menuDO); + menuDO = createMenuDO(4L, MenuTypeEnum.MENU, "name", 0L, 2); + mockCacheMap.put(menuDO.getId(), menuDO); + + List menuDOS = sysMenuService.listMenusFromCache(Collections.singletonList(MenuTypeEnum.MENU.getType()), + Collections.singletonList(CommonStatusEnum.DISABLE.getStatus())); + Assert.isTrue(menuDOS.size() == idMenuMap.size()); + menuDOS.forEach(m -> assertPojoEquals(idMenuMap.get(m.getId()), m)); + } + + @Test + public void testListMenusFromCache2_success() throws Exception { + Map mockCacheMap = new HashMap<>(); + //获取代理对象 + SysMenuServiceImpl target = (SysMenuServiceImpl) SpringAopUtils.getTarget(sysMenuService); + BeanUtil.setFieldValue(target, "menuCache", mockCacheMap); + + Map idMenuMap = new HashMap<>(); + //验证搜索id为1, 类型为MENU, 状态为1 的menu + SysMenuDO menuDO = createMenuDO(1L, MenuTypeEnum.MENU, "name", 0L, 1); + mockCacheMap.put(menuDO.getId(), menuDO); + idMenuMap.put(menuDO.getId(), menuDO); + + //以下是不符合搜索条件的menu + menuDO = createMenuDO(2L, MenuTypeEnum.MENU, "name", 0L, 1); + mockCacheMap.put(menuDO.getId(), menuDO); + menuDO = createMenuDO(3L, MenuTypeEnum.BUTTON, "name", 0L, 1); + mockCacheMap.put(menuDO.getId(), menuDO); + menuDO = createMenuDO(4L, MenuTypeEnum.MENU, "name", 0L, 2); + mockCacheMap.put(menuDO.getId(), menuDO); + + List menuDOS = sysMenuService.listMenusFromCache(Collections.singletonList(1L), + Collections.singletonList(MenuTypeEnum.MENU.getType()), Collections.singletonList(1)); + Assert.isTrue(menuDOS.size() == idMenuMap.size()); + menuDOS.forEach(menu -> assertPojoEquals(idMenuMap.get(menu.getId()), menu)); + } + + @Test + public void testCheckParentResource_success() { + SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); + menuMapper.insert(menuDO); + Long parentId = menuDO.getId(); + + sysMenuService.checkParentResource(parentId, null); + } + + @Test + public void testCheckParentResource_canNotSetSelfToBeParent() { + assertServiceException(() -> sysMenuService.checkParentResource(1L, 1L), MENU_PARENT_ERROR); + } + + @Test + public void testCheckParentResource_parentNotExist() { + assertServiceException(() -> sysMenuService.checkParentResource(randomLongId(), null), MENU_PARENT_NOT_EXISTS); + } + + @Test + public void testCheckParentResource_parentTypeError() { + SysMenuDO menuDO = createMenuDO(MenuTypeEnum.BUTTON, "parent", 0L); + menuMapper.insert(menuDO); + Long parentId = menuDO.getId(); + + assertServiceException(() -> sysMenuService.checkParentResource(parentId, null), MENU_PARENT_NOT_DIR_OR_MENU); + } + + @Test + public void testCheckResource_success() { + SysMenuDO sonMenu = initParentAndSonMenuDO(); + Long parentId = sonMenu.getParentId(); + + Long otherSonMenuId = randomLongId(); + String otherSonMenuName = randomString(); + + sysMenuService.checkResource(parentId, otherSonMenuName, otherSonMenuId); + } + + @Test + public void testCheckResource_sonMenuNameDuplicate(){ + SysMenuDO sonMenu=initParentAndSonMenuDO(); + Long parentId=sonMenu.getParentId(); + + Long otherSonMenuId=randomLongId(); + String otherSonMenuName=sonMenu.getName(); //相同名称 + + assertServiceException(() -> sysMenuService.checkResource(parentId, otherSonMenuName, otherSonMenuId), MENU_NAME_DUPLICATE); + } + + /** + * 构造父子目录，返回子目录 + * + * @return + */ + private SysMenuDO initParentAndSonMenuDO() { + //构造父子目录 + SysMenuDO menuDO = createMenuDO(MenuTypeEnum.MENU, "parent", 0L); + menuMapper.insert(menuDO); + Long parentId = menuDO.getId(); + + SysMenuDO sonMenuDO = createMenuDO(MenuTypeEnum.MENU, "testSonName", parentId); + menuMapper.insert(sonMenuDO); + return sonMenuDO; + } + + private SysMenuDO createMenuDO(MenuTypeEnum typeEnum, String menuName, Long parentId) { + return createMenuDO(typeEnum, menuName, parentId, RandomUtils.randomCommonStatus()); + } + + private SysMenuDO createMenuDO(MenuTypeEnum typeEnum, String menuName, Long parentId, Integer status) { + return createMenuDO(null, typeEnum, menuName, parentId, status); + } + + private SysMenuDO createMenuDO(Long id, MenuTypeEnum typeEnum, String menuName, Long parentId, Integer status) { + return RandomUtils.randomPojo(SysMenuDO.class, o -> { + o.setId(id); + o.setParentId(parentId); + o.setType(typeEnum.getType()); + o.setStatus(status); + o.setName(menuName); + }); + } + +} diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java similarity index 97% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java index 34784fe11..ed647798a 100644 --- a/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java @@ -1,302 +1,302 @@ -package cn.iocoder.dashboard.modules.system.service.permission; - -import cn.hutool.core.bean.BeanUtil; -import cn.iocoder.dashboard.BaseDbUnitTest; -import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.common.pojo.PageResult; -import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; -import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; -import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; -import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; -import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; -import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper; -import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; -import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer; -import cn.iocoder.dashboard.modules.system.service.permission.impl.SysRoleServiceImpl; -import cn.iocoder.dashboard.util.sping.SpringAopUtils; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.Import; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; -import static cn.iocoder.dashboard.util.object.ObjectUtils.max; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.verify; - -@Import(SysRoleServiceImpl.class) -public class SysRoleServiceTest extends BaseDbUnitTest { - - @Resource - private SysRoleServiceImpl sysRoleService; - - @Resource - private SysRoleMapper roleMapper; - - @MockBean - private SysPermissionService sysPermissionService; - - @MockBean - private SysRoleProducer sysRoleProducer; - - @Test - public void testInitLocalCache_success() throws Exception { - SysRoleDO roleDO1 = createRoleDO("role1", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO1); - SysRoleDO roleDO2 = createRoleDO("role2", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO2); - - //调用 - sysRoleService.initLocalCache(); - - //断言 - //获取代理对象 - SysRoleServiceImpl target = (SysRoleServiceImpl) SpringAopUtils.getTarget(sysRoleService); - - Map roleCache = (Map) BeanUtil.getFieldValue(target, "roleCache"); - assertPojoEquals(roleDO1, roleCache.get(roleDO1.getId())); - assertPojoEquals(roleDO2, roleCache.get(roleDO2.getId())); - - Date maxUpdateTime = (Date) BeanUtil.getFieldValue(target, "maxUpdateTime"); - assertEquals(max(roleDO1.getUpdateTime(), roleDO2.getUpdateTime()), maxUpdateTime); - } - - @Test - public void testCreateRole_success() { - SysRoleCreateReqVO reqVO = randomPojo(SysRoleCreateReqVO.class, o -> { - o.setCode("role_code"); - o.setName("role_name"); - o.setRemark("remark"); - o.setType(SysRoleTypeEnum.CUSTOM.getType()); - o.setSort(1); - }); - Long roleId = sysRoleService.createRole(reqVO); - - //断言 - assertNotNull(roleId); - SysRoleDO roleDO = roleMapper.selectById(roleId); - assertPojoEquals(reqVO, roleDO); - - verify(sysRoleProducer).sendRoleRefreshMessage(); - } - - @Test - public void testUpdateRole_success() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO); - Long roleId = roleDO.getId(); - - //调用 - SysRoleUpdateReqVO reqVO = randomPojo(SysRoleUpdateReqVO.class, o -> { - o.setId(roleId); - o.setCode("role_code"); - o.setName("update_name"); - o.setType(SysRoleTypeEnum.SYSTEM.getType()); - o.setSort(999); - }); - sysRoleService.updateRole(reqVO); - - //断言 - SysRoleDO newRoleDO = roleMapper.selectById(roleId); - assertPojoEquals(reqVO, newRoleDO); - - verify(sysRoleProducer).sendRoleRefreshMessage(); - } - - @Test - public void testUpdateRoleStatus_success() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, CommonStatusEnum.ENABLE.getStatus()); - roleMapper.insert(roleDO); - Long roleId = roleDO.getId(); - - //调用 - sysRoleService.updateRoleStatus(roleId, CommonStatusEnum.DISABLE.getStatus()); - - //断言 - SysRoleDO newRoleDO = roleMapper.selectById(roleId); - assertEquals(CommonStatusEnum.DISABLE.getStatus(), newRoleDO.getStatus()); - - verify(sysRoleProducer).sendRoleRefreshMessage(); - } - - @Test - public void testUpdateRoleDataScope_success() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO); - Long roleId = roleDO.getId(); - - //调用 - Set deptIdSet = Arrays.asList(1L, 2L, 3L, 4L, 5L).stream().collect(Collectors.toSet()); - sysRoleService.updateRoleDataScope(roleId, DataScopeEnum.DEPT_CUSTOM.getScore(), deptIdSet); - - //断言 - SysRoleDO newRoleDO = roleMapper.selectById(roleId); - assertEquals(DataScopeEnum.DEPT_CUSTOM.getScore(), newRoleDO.getDataScope()); - - Set newDeptIdSet = newRoleDO.getDataScopeDeptIds(); - assertTrue(deptIdSet.size() == newDeptIdSet.size()); - deptIdSet.stream().forEach(d -> assertTrue(newDeptIdSet.contains(d))); - - verify(sysRoleProducer).sendRoleRefreshMessage(); - } - - @Test - public void testDeleteRole_success() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO); - Long roleId = roleDO.getId(); - - //调用 - sysRoleService.deleteRole(roleId); - - //断言 - SysRoleDO newRoleDO = roleMapper.selectById(roleId); - assertNull(newRoleDO); - - verify(sysRoleProducer).sendRoleRefreshMessage(); - } - - @Test - public void testGetRoles_success() { - Map idRoleMap = new HashMap<>(); - // 验证查询状态为1的角色 - SysRoleDO roleDO1 = createRoleDO("role1", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1); - roleMapper.insert(roleDO1); - idRoleMap.put(roleDO1.getId(), roleDO1); - - SysRoleDO roleDO2 = createRoleDO("role2", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1); - roleMapper.insert(roleDO2); - idRoleMap.put(roleDO2.getId(), roleDO2); - - // 以下是排除的角色 - SysRoleDO roleDO3 = createRoleDO("role3", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 2); - roleMapper.insert(roleDO3); - - //调用 - List roles = sysRoleService.getRoles(Arrays.asList(1)); - - //断言 - assertEquals(2, roles.size()); - roles.stream().forEach(r -> assertPojoEquals(idRoleMap.get(r.getId()), r)); - - } - - @Test - public void testGetRolePage_success() { - Map idRoleMap = new HashMap<>(); - // 验证名称包含"role", 状态为1,code为"code"的角色 - // 第一页 - SysRoleDO roleDO = createRoleDO("role1", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1, "code"); - roleMapper.insert(roleDO); - idRoleMap.put(roleDO.getId(), roleDO); - // 第二页 - roleDO = createRoleDO("role2", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1, "code"); - roleMapper.insert(roleDO); - - // 以下是排除的角色 - roleDO = createRoleDO("role3", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 2, "code"); - roleMapper.insert(roleDO); - roleDO = createRoleDO("role4", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1, "xxxxx"); - roleMapper.insert(roleDO); - - //调用 - SysRolePageReqVO reqVO = randomPojo(SysRolePageReqVO.class, o -> { - o.setName("role"); - o.setCode("code"); - o.setStatus(1); - o.setPageNo(1); - o.setPageSize(1); - o.setBeginTime(null); - o.setEndTime(null); - }); - PageResult result = sysRoleService.getRolePage(reqVO); - assertEquals(2, result.getTotal()); - result.getList().stream().forEach(r -> assertPojoEquals(idRoleMap.get(r.getId()), r)); - } - - @Test - public void testCheckDuplicateRole_success() { - sysRoleService.checkDuplicateRole(randomString(), randomString(), null); - } - - @Test - public void testCheckDuplicateRole_nameDuplicate() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO); - - String duplicateName = "role_name"; - - assertServiceException(() -> sysRoleService.checkDuplicateRole(duplicateName, randomString(), null), ROLE_NAME_DUPLICATE, duplicateName); - } - - @Test - public void testCheckDuplicateRole_codeDuplicate() { - SysRoleDO roleDO = randomPojo(SysRoleDO.class, o -> { - o.setName("role_999"); - o.setCode("code"); - o.setType(SysRoleTypeEnum.CUSTOM.getType()); - o.setStatus(1); - o.setDataScope(DataScopeEnum.ALL.getScore()); - }); - roleMapper.insert(roleDO); - - String randomName = randomString(); - String duplicateCode = "code"; - - assertServiceException(() -> sysRoleService.checkDuplicateRole(randomName, duplicateCode, null), ROLE_CODE_DUPLICATE, duplicateCode); - } - - @Test - public void testCheckUpdateRole_success() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); - roleMapper.insert(roleDO); - Long roleId = roleDO.getId(); - - sysRoleService.checkUpdateRole(roleId); - } - - @Test - public void testCheckUpdateRole_roleIdNotExist() { - assertServiceException(() -> sysRoleService.checkUpdateRole(randomLongId()), ROLE_NOT_EXISTS); - } - - @Test - public void testCheckUpdateRole_systemRoleCanNotBeUpdate() { - SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.SYSTEM, DataScopeEnum.ALL); - roleMapper.insert(roleDO); - Long roleId = roleDO.getId(); - - assertServiceException(() -> sysRoleService.checkUpdateRole(roleId), ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE); - } - - private SysRoleDO createRoleDO(String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status) { - return createRoleDO( name, typeEnum, scopeEnum, status, randomString()); - } - - private SysRoleDO createRoleDO(String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status, String code) { - return createRoleDO(null, name, typeEnum, scopeEnum, status, code); - } - - private SysRoleDO createRoleDO(String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum) { - return createRoleDO(null, name, typeEnum, scopeEnum, randomCommonStatus(), randomString()); - } - - private SysRoleDO createRoleDO(Long id, String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status, String code) { - SysRoleDO roleDO = randomPojo(SysRoleDO.class, o -> { - o.setId(id); - o.setName(name); - o.setType(typeEnum.getType()); - o.setStatus(status); - o.setDataScope(scopeEnum.getScore()); - o.setCode(code); - }); - return roleDO; - } - -} +package cn.iocoder.dashboard.modules.system.service.permission; + +import cn.hutool.core.bean.BeanUtil; +import cn.iocoder.dashboard.BaseDbUnitTest; +import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.dashboard.framework.security.core.enums.DataScopeEnum; +import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; +import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO; +import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; +import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper; +import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum; +import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer; +import cn.iocoder.dashboard.modules.system.service.permission.impl.SysRoleServiceImpl; +import cn.iocoder.dashboard.util.sping.SpringAopUtils; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; +import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.object.ObjectUtils.max; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.verify; + +@Import(SysRoleServiceImpl.class) +public class SysRoleServiceTest extends BaseDbUnitTest { + + @Resource + private SysRoleServiceImpl sysRoleService; + + @Resource + private SysRoleMapper roleMapper; + + @MockBean + private SysPermissionService sysPermissionService; + + @MockBean + private SysRoleProducer sysRoleProducer; + + @Test + public void testInitLocalCache_success() throws Exception { + SysRoleDO roleDO1 = createRoleDO("role1", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO1); + SysRoleDO roleDO2 = createRoleDO("role2", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO2); + + //调用 + sysRoleService.initLocalCache(); + + //断言 + //获取代理对象 + SysRoleServiceImpl target = (SysRoleServiceImpl) SpringAopUtils.getTarget(sysRoleService); + + Map roleCache = (Map) BeanUtil.getFieldValue(target, "roleCache"); + assertPojoEquals(roleDO1, roleCache.get(roleDO1.getId())); + assertPojoEquals(roleDO2, roleCache.get(roleDO2.getId())); + + Date maxUpdateTime = (Date) BeanUtil.getFieldValue(target, "maxUpdateTime"); + assertEquals(max(roleDO1.getUpdateTime(), roleDO2.getUpdateTime()), maxUpdateTime); + } + + @Test + public void testCreateRole_success() { + SysRoleCreateReqVO reqVO = randomPojo(SysRoleCreateReqVO.class, o -> { + o.setCode("role_code"); + o.setName("role_name"); + o.setRemark("remark"); + o.setType(SysRoleTypeEnum.CUSTOM.getType()); + o.setSort(1); + }); + Long roleId = sysRoleService.createRole(reqVO); + + //断言 + assertNotNull(roleId); + SysRoleDO roleDO = roleMapper.selectById(roleId); + assertPojoEquals(reqVO, roleDO); + + verify(sysRoleProducer).sendRoleRefreshMessage(); + } + + @Test + public void testUpdateRole_success() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO); + Long roleId = roleDO.getId(); + + //调用 + SysRoleUpdateReqVO reqVO = randomPojo(SysRoleUpdateReqVO.class, o -> { + o.setId(roleId); + o.setCode("role_code"); + o.setName("update_name"); + o.setType(SysRoleTypeEnum.SYSTEM.getType()); + o.setSort(999); + }); + sysRoleService.updateRole(reqVO); + + //断言 + SysRoleDO newRoleDO = roleMapper.selectById(roleId); + assertPojoEquals(reqVO, newRoleDO); + + verify(sysRoleProducer).sendRoleRefreshMessage(); + } + + @Test + public void testUpdateRoleStatus_success() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, CommonStatusEnum.ENABLE.getStatus()); + roleMapper.insert(roleDO); + Long roleId = roleDO.getId(); + + //调用 + sysRoleService.updateRoleStatus(roleId, CommonStatusEnum.DISABLE.getStatus()); + + //断言 + SysRoleDO newRoleDO = roleMapper.selectById(roleId); + assertEquals(CommonStatusEnum.DISABLE.getStatus(), newRoleDO.getStatus()); + + verify(sysRoleProducer).sendRoleRefreshMessage(); + } + + @Test + public void testUpdateRoleDataScope_success() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO); + Long roleId = roleDO.getId(); + + //调用 + Set deptIdSet = Arrays.asList(1L, 2L, 3L, 4L, 5L).stream().collect(Collectors.toSet()); + sysRoleService.updateRoleDataScope(roleId, DataScopeEnum.DEPT_CUSTOM.getScore(), deptIdSet); + + //断言 + SysRoleDO newRoleDO = roleMapper.selectById(roleId); + assertEquals(DataScopeEnum.DEPT_CUSTOM.getScore(), newRoleDO.getDataScope()); + + Set newDeptIdSet = newRoleDO.getDataScopeDeptIds(); + assertTrue(deptIdSet.size() == newDeptIdSet.size()); + deptIdSet.stream().forEach(d -> assertTrue(newDeptIdSet.contains(d))); + + verify(sysRoleProducer).sendRoleRefreshMessage(); + } + + @Test + public void testDeleteRole_success() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO); + Long roleId = roleDO.getId(); + + //调用 + sysRoleService.deleteRole(roleId); + + //断言 + SysRoleDO newRoleDO = roleMapper.selectById(roleId); + assertNull(newRoleDO); + + verify(sysRoleProducer).sendRoleRefreshMessage(); + } + + @Test + public void testGetRoles_success() { + Map idRoleMap = new HashMap<>(); + // 验证查询状态为1的角色 + SysRoleDO roleDO1 = createRoleDO("role1", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1); + roleMapper.insert(roleDO1); + idRoleMap.put(roleDO1.getId(), roleDO1); + + SysRoleDO roleDO2 = createRoleDO("role2", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1); + roleMapper.insert(roleDO2); + idRoleMap.put(roleDO2.getId(), roleDO2); + + // 以下是排除的角色 + SysRoleDO roleDO3 = createRoleDO("role3", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 2); + roleMapper.insert(roleDO3); + + //调用 + List roles = sysRoleService.getRoles(Arrays.asList(1)); + + //断言 + assertEquals(2, roles.size()); + roles.stream().forEach(r -> assertPojoEquals(idRoleMap.get(r.getId()), r)); + + } + + @Test + public void testGetRolePage_success() { + Map idRoleMap = new HashMap<>(); + // 验证名称包含"role", 状态为1,code为"code"的角色 + // 第一页 + SysRoleDO roleDO = createRoleDO("role1", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1, "code"); + roleMapper.insert(roleDO); + idRoleMap.put(roleDO.getId(), roleDO); + // 第二页 + roleDO = createRoleDO("role2", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1, "code"); + roleMapper.insert(roleDO); + + // 以下是排除的角色 + roleDO = createRoleDO("role3", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 2, "code"); + roleMapper.insert(roleDO); + roleDO = createRoleDO("role4", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL, 1, "xxxxx"); + roleMapper.insert(roleDO); + + //调用 + SysRolePageReqVO reqVO = randomPojo(SysRolePageReqVO.class, o -> { + o.setName("role"); + o.setCode("code"); + o.setStatus(1); + o.setPageNo(1); + o.setPageSize(1); + o.setBeginTime(null); + o.setEndTime(null); + }); + PageResult result = sysRoleService.getRolePage(reqVO); + assertEquals(2, result.getTotal()); + result.getList().stream().forEach(r -> assertPojoEquals(idRoleMap.get(r.getId()), r)); + } + + @Test + public void testCheckDuplicateRole_success() { + sysRoleService.checkDuplicateRole(randomString(), randomString(), null); + } + + @Test + public void testCheckDuplicateRole_nameDuplicate() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO); + + String duplicateName = "role_name"; + + assertServiceException(() -> sysRoleService.checkDuplicateRole(duplicateName, randomString(), null), ROLE_NAME_DUPLICATE, duplicateName); + } + + @Test + public void testCheckDuplicateRole_codeDuplicate() { + SysRoleDO roleDO = randomPojo(SysRoleDO.class, o -> { + o.setName("role_999"); + o.setCode("code"); + o.setType(SysRoleTypeEnum.CUSTOM.getType()); + o.setStatus(1); + o.setDataScope(DataScopeEnum.ALL.getScore()); + }); + roleMapper.insert(roleDO); + + String randomName = randomString(); + String duplicateCode = "code"; + + assertServiceException(() -> sysRoleService.checkDuplicateRole(randomName, duplicateCode, null), ROLE_CODE_DUPLICATE, duplicateCode); + } + + @Test + public void testCheckUpdateRole_success() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.CUSTOM, DataScopeEnum.ALL); + roleMapper.insert(roleDO); + Long roleId = roleDO.getId(); + + sysRoleService.checkUpdateRole(roleId); + } + + @Test + public void testCheckUpdateRole_roleIdNotExist() { + assertServiceException(() -> sysRoleService.checkUpdateRole(randomLongId()), ROLE_NOT_EXISTS); + } + + @Test + public void testCheckUpdateRole_systemRoleCanNotBeUpdate() { + SysRoleDO roleDO = createRoleDO("role_name", SysRoleTypeEnum.SYSTEM, DataScopeEnum.ALL); + roleMapper.insert(roleDO); + Long roleId = roleDO.getId(); + + assertServiceException(() -> sysRoleService.checkUpdateRole(roleId), ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE); + } + + private SysRoleDO createRoleDO(String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status) { + return createRoleDO( name, typeEnum, scopeEnum, status, randomString()); + } + + private SysRoleDO createRoleDO(String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status, String code) { + return createRoleDO(null, name, typeEnum, scopeEnum, status, code); + } + + private SysRoleDO createRoleDO(String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum) { + return createRoleDO(null, name, typeEnum, scopeEnum, randomCommonStatus(), randomString()); + } + + private SysRoleDO createRoleDO(Long id, String name, SysRoleTypeEnum typeEnum, DataScopeEnum scopeEnum, Integer status, String code) { + SysRoleDO roleDO = randomPojo(SysRoleDO.class, o -> { + o.setId(id); + o.setName(name); + o.setType(typeEnum.getType()); + o.setStatus(status); + o.setDataScope(scopeEnum.getScore()); + o.setCode(code); + }); + return roleDO; + } + +} diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java diff --git a/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java diff --git a/src/test/java/cn/iocoder/dashboard/util/AssertUtils.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/AssertUtils.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/util/AssertUtils.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/AssertUtils.java diff --git a/src/test/java/cn/iocoder/dashboard/util/RandomUtils.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/RandomUtils.java similarity index 100% rename from src/test/java/cn/iocoder/dashboard/util/RandomUtils.java rename to yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/RandomUtils.java diff --git a/src/test/resources/application-unit-test.yaml b/yudao-admin-server/src/test/resources/application-unit-test.yaml similarity index 100% rename from src/test/resources/application-unit-test.yaml rename to yudao-admin-server/src/test/resources/application-unit-test.yaml diff --git a/src/test/resources/file/erweima.jpg b/yudao-admin-server/src/test/resources/file/erweima.jpg similarity index 100% rename from src/test/resources/file/erweima.jpg rename to yudao-admin-server/src/test/resources/file/erweima.jpg diff --git a/src/test/resources/sql/clean.sql b/yudao-admin-server/src/test/resources/sql/clean.sql similarity index 100% rename from src/test/resources/sql/clean.sql rename to yudao-admin-server/src/test/resources/sql/clean.sql diff --git a/src/test/resources/sql/create_tables.sql b/yudao-admin-server/src/test/resources/sql/create_tables.sql similarity index 100% rename from src/test/resources/sql/create_tables.sql rename to yudao-admin-server/src/test/resources/sql/create_tables.sql diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml new file mode 100644 index 000000000..9a333dc37 --- /dev/null +++ b/yudao-dependencies/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + cn.iocoder.boot + yudao-dependencies + ${revision} + pom + + yudao-dependencies + 基础 bom 文件，管理整个项目的依赖版本 + https://github.com/YunaiV/ruoyi-vue-pro + + + 1.0.0 + + + 2.4.4 + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + From f99d48a79b58e92bc291fba5166b0cacad8b6b04 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 28 Apr 2021 01:09:35 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=20x=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 + yudao-admin-server/pom.xml | 349 ------------------ .../common/enums/DefaultBitFieldEnum.java | 27 -- yudao-dependencies/pom.xml | 336 ++++++++++++++++- yudao-framework/pom.xml | 212 +++++++++++ .../common/core/IntArrayValuable.java | 0 .../dashboard/common/core/KeyValue.java | 0 .../common/enums/CommonStatusEnum.java | 0 .../dashboard/common/enums/UserTypeEnum.java | 0 .../dashboard/common/exception/ErrorCode.java | 0 .../common/exception/ServiceException.java | 0 .../enums/GlobalErrorCodeConstants.java | 0 .../enums/ServiceErrorCodeRange.java | 0 .../exception/util/ServiceExceptionUtil.java | 0 .../dashboard/common/package-info.java | 0 .../dashboard/common/pojo/CommonResult.java | 0 .../dashboard/common/pojo/PageParam.java | 0 .../dashboard/common/pojo/PageResult.java | 0 .../dashboard/common/pojo/SortingField.java | 0 .../framework/apollo/core/ConfigConsts.java | 0 .../apollo/internals/ConfigFrameworkDAO.java | 0 .../apollo/internals/DBConfigRepository.java | 0 .../apollo/internals/DefaultXInjector.java | 0 .../framework/apollo/package-info.java | 0 .../framework/apollo/spi/DBConfigFactory.java | 0 .../ApolloApplicationContextInitializer.java | 0 .../async/config/AsyncConfiguration.java | 0 .../framework/async/package-info.java | 0 .../《芋道 Spring Boot 异步任务入门》.md | 0 .../captcha/config/CaptchaConfig.java | 0 .../captcha/config/CaptchaProperties.java | 0 .../framework/captcha/package-info.java | 0 .../codegen/config/CodegenConfiguration.java | 0 .../codegen/config/CodegenProperties.java | 0 .../framework/codegen/package-info.java | 0 .../config/DataSourceConfiguration.java | 0 .../datasource/core/enums/DataSourceEnum.java | 0 .../core/filter/DruidAdRemoveFilter.java | 0 ...道 Spring Boot 多数据源（读写分离）入门》.md | 0 .../《芋道 Spring Boot 数据库连接池入门》.md | 0 .../dict/config/DictConfiguration.java | 0 .../service/DictDataFrameworkService.java | 0 .../framework/dict/core/util/DictUtils.java | 0 .../framework/dict/package-info.java | 0 .../config/ErrorCodeConfiguration.java | 0 .../errorcode/config/ErrorCodeProperties.java | 0 .../core/dto/ErrorCodeAutoGenerateReqDTO.java | 0 .../errorcode/core/dto/ErrorCodeRespDTO.java | 0 .../generator/ErrorCodeAutoGenerator.java | 0 .../generator/ErrorCodeAutoGeneratorImpl.java | 0 .../core/loader/ErrorCodeLoader.java | 0 .../core/loader/ErrorCodeLoaderImpl.java | 0 .../service/ErrorCodeFrameworkService.java | 0 .../framework/errorcode/package-info.java | 0 .../excel/core/annotations/DictFormat.java | 0 .../excel/core/convert/DictConvert.java | 0 .../excel/core/convert/JsonConvert.java | 0 .../framework/excel/core/util/ExcelUtils.java | 0 .../framework/excel/package-info.java | 0 .../file/config/FileConfiguration.java | 0 .../framework/file/config/FileProperties.java | 0 .../framework/file/package-info.java | 0 .../config/IdempotentConfiguration.java | 0 .../core/annotation/Idempotent.java | 0 .../idempotent/core/aop/IdempotentAspect.java | 0 .../keyresolver/IdempotentKeyResolver.java | 0 .../impl/DefaultIdempotentKeyResolver.java | 0 .../impl/ExpressionIdempotentKeyResolver.java | 0 .../core/redis/IdempotentRedisDAO.java | 0 .../framework/idempotent/package-info.java | 0 .../jackson/config/JacksonConfig.java | 0 .../deser/LocalDateTimeDeserializer.java | 0 .../jackson/ser/LocalDateTimeSerializer.java | 0 .../lock4j/config/Lock4jConfiguration.java | 0 .../core/DefaultLockFailureStrategy.java | 0 .../lock4j/core/Lock4jRedisKeyConstants.java | 0 .../framework/lock4j/package-info.java | 0 .../apilog/config/ApiLogConfiguration.java | 0 .../core/filter/ApiAccessLogFilter.java | 0 .../service/ApiAccessLogFrameworkService.java | 0 .../service/ApiErrorLogFrameworkService.java | 0 .../service/dto/ApiAccessLogCreateDTO.java | 0 .../service/dto/ApiErrorLogCreateDTO.java | 0 .../config/OperateLogConfiguration.java | 0 .../core/annotations/OperateLog.java | 0 .../operatelog/core/aop/OperateLogAspect.java | 0 .../core/enums/OperateTypeEnum.java | 0 .../logger/operatelog/core/package-info.java | 0 .../service/OperateLogFrameworkService.java | 0 .../operatelog/core/util/OperateLogUtils.java | 0 .../framework/logger/package-info.java | 0 .../config/AdminServerConfiguration.java | 0 .../framework/monitor/package-info.java | 0 ...芋道 Spring Boot 监控工具 Admin 入门》.md | 0 .../mybatis/config/MybatisConfiguration.java | 0 .../mybatis/core/dataobject/BaseDO.java | 0 .../core/handler/DefaultDBFieldHandler.java | 0 .../mybatis/core/mapper/BaseMapperX.java | 0 .../mybatis/core/query/QueryWrapperX.java | 0 .../core/type/JsonLongSetTypeHandler.java | 0 .../mybatis/core/util/MyBatisUtils.java | 0 .../framework/mybatis/package-info.java | 0 .../《芋道 Spring Boot MyBatis 入门》.md | 0 .../dashboard/framework/package-info.java | 0 .../framework/quartz/config/QuartzConfig.java | 0 .../quartz/core/enums/JobDataKeyEnum.java | 0 .../quartz/core/handler/JobHandler.java | 0 .../core/handler/JobHandlerInvoker.java | 0 .../core/scheduler/SchedulerManager.java | 0 .../core/service/JobLogFrameworkService.java | 0 .../framework/quartz/core/util/CronUtils.java | 0 .../framework/quartz/package-info.java | 0 .../《芋道 Spring Boot 定时任务入门》.md | 0 .../framework/redis/config/RedisConfig.java | 0 .../framework/redis/core/RedisKeyDefine.java | 0 .../redis/core/RedisKeyRegistry.java | 0 .../AbstractChannelMessageListener.java | 0 .../redis/core/pubsub/ChannelMessage.java | 0 .../stream/AbstractStreamMessageListener.java | 0 .../redis/core/stream/StreamMessage.java | 0 .../redis/core/util/RedisMessageUtils.java | 0 .../framework/redis/package-info.java | 0 .../redis/《芋道 Spring Boot Redis 入门》.md | 0 .../framework/resilience4j/package-info.java | 0 ... Spring Boot 服务容错 Resilience4j 入门》.md | 0 .../config/SecurityConfiguration.java | 0 .../security/config/SecurityProperties.java | 0 .../framework/security/core/LoginUser.java | 0 .../security/core/enums/DataScopeEnum.java | 0 .../filter/JwtAuthenticationTokenFilter.java | 0 .../core/handler/AccessDeniedHandlerImpl.java | 0 .../handler/AuthenticationEntryPointImpl.java | 0 .../handler/LogoutSuccessHandlerImpl.java | 0 .../service/SecurityAuthFrameworkService.java | 0 .../SecurityPermissionFrameworkService.java | 0 .../core/util/SecurityFrameworkUtils.java | 0 .../framework/security/package-info.java | 0 ...pring Boot 安全框架 Spring Security 入门》.md | 0 .../sms/config/SmsConfiguration.java | 0 .../framework/sms/core/client/SmsClient.java | 0 .../sms/core/client/SmsClientFactory.java | 0 .../sms/core/client/SmsCodeMapping.java | 0 .../sms/core/client/SmsCommonResult.java | 0 .../core/client/dto/SmsReceiveRespDTO.java | 0 .../sms/core/client/dto/SmsSendRespDTO.java | 0 .../core/client/dto/SmsTemplateRespDTO.java | 0 .../core/client/impl/AbstractSmsClient.java | 0 .../client/impl/SmsClientFactoryImpl.java | 0 .../client/impl/aliyun/AliyunSmsClient.java | 0 .../impl/aliyun/AliyunSmsClientTest.java | 0 .../impl/aliyun/AliyunSmsCodeMapping.java | 0 .../impl/aliyun/AliyunSmsCodeMappingTest.java | 0 .../impl/debug/DebugDingTalkCodeMapping.java | 0 .../impl/debug/DebugDingTalkSmsClient.java | 0 .../client/impl/yunpian/YunpianSmsClient.java | 0 .../impl/yunpian/YunpianSmsClientTest.java | 0 .../impl/yunpian/YunpianSmsCodeMapping.java | 0 .../yunpian/YunpianSmsCodeMappingTest.java | 0 .../sms/core/enums/SmsChannelEnum.java | 0 .../enums/SmsFrameworkErrorCodeConstants.java | 0 .../enums/SmsTemplateAuditStatusEnum.java | 0 .../core/property/SmsChannelProperties.java | 0 .../config/SwaggerAutoConfiguration.java | 0 .../swagger/config/SwaggerProperties.java | 0 .../framework/swagger/package-info.java | 0 ... Spring Boot API 接口文档 Swagger 入门》.md | 0 .../config/TracerAutoConfiguration.java | 0 .../tracer/config/TracerProperties.java | 0 .../tracer/core/annotation/BizTrace.java | 0 .../tracer/core/aop/BizTraceAspect.java | 0 .../tracer/core/filter/TraceFilter.java | 0 .../tracer/core/util/TracerUtils.java | 0 .../framework/tracer/package-info.java | 0 ...道 Spring Boot 链路追踪 SkyWalking 入门》.md | 0 .../dashboard/framework/validator/InEnum.java | 0 .../framework/validator/InEnumValidator.java | 0 .../framework/validator/package-info.java | 0 ...道 Spring Boot 参数校验 Validation 入门》.md | 0 .../web/config/WebConfiguration.java | 0 .../framework/web/config/WebProperties.java | 0 .../framework/web/config/XssProperties.java | 0 .../web/core/enums/FilterOrderEnum.java | 0 .../core/filter/CacheRequestBodyFilter.java | 0 .../core/filter/CacheRequestBodyWrapper.java | 0 .../framework/web/core/filter/DemoFilter.java | 0 .../framework/web/core/filter/XssFilter.java | 0 .../web/core/filter/XssRequestWrapper.java | 0 .../core/handler/GlobalExceptionHandler.java | 0 .../handler/GlobalResponseBodyHandler.java | 0 .../web/core/util/WebFrameworkUtils.java | 0 .../dashboard/framework/web/package-info.java | 0 .../《芋道 Spring Boot SpringMVC 入门》.md | 0 .../cn/iocoder/dashboard/package-info.java | 1 + .../iocoder/dashboard/util/AssertUtils.java | 0 .../iocoder/dashboard/util/RandomUtils.java | 0 .../dashboard/util/collection/ArrayUtils.java | 0 .../util/collection/CollectionUtils.java | 0 .../dashboard/util/collection/MapUtils.java | 0 .../dashboard/util/collection/SetUtils.java | 0 .../dashboard/util/date/DateUtils.java | 0 .../dashboard/util/json/JsonUtils.java | 0 .../dashboard/util/object/ObjectUtils.java | 0 .../iocoder/dashboard/util/package-info.java | 0 .../dashboard/util/servlet/ServletUtils.java | 0 .../dashboard/util/sping/SpringAopUtils.java | 0 .../util/sping/SpringExpressionUtils.java | 0 .../dashboard/util/string/StrUtils.java | 0 207 files changed, 563 insertions(+), 377 deletions(-) delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java create mode 100644 yudao-framework/pom.xml rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java (100%) rename {yudao-admin-server/src/test => yudao-framework/src/main}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java (100%) rename {yudao-admin-server/src/test => yudao-framework/src/main}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java (100%) rename {yudao-admin-server/src/test => yudao-framework/src/main}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java (100%) rename {yudao-admin-server/src/test => yudao-framework/src/main}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md (100%) create mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/package-info.java rename {yudao-admin-server/src/test => yudao-framework/src/main}/java/cn/iocoder/dashboard/util/AssertUtils.java (100%) rename {yudao-admin-server/src/test => yudao-framework/src/main}/java/cn/iocoder/dashboard/util/RandomUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/package-info.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java (100%) rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java (100%) diff --git a/pom.xml b/pom.xml index 60163cc01..c4540b560 100644 --- a/pom.xml +++ b/pom.xml @@ -12,12 +12,27 @@ yudao-dependencies yudao-admin-server + yudao-framework yudao 芋道项目基础脚手架 https://github.com/YunaiV/ruoyi-vue-pro + + 1.0.0 + + + + + cn.iocoder.boot + yudao-dependencies + ${revision} + pom + import + + + diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 5c2560b67..5c9ba3075 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -13,355 +13,6 @@ 管理后台 Server，提供其 API 接口 https://github.com/YunaiV/ruoyi-vue-pro - - 1.0.0 - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 - - 2.4.4 - - 3.0.2 - 1.5.22 - - 5.1.46 - 1.2.4 - 3.4.2 - 3.3.2 - 3.15.1 - - 1.7.0 - - 2.2.0 - 1.7.0 - - 8.5.0 - 6.1 - 2.3.1 - - 1.16.14 - 1.4.1.Final - 5.6.1 - 2.2.7 - 2.2 - 1.0.5 - 7.2.6.RELEASE - 0.1.16 - - 4.5.18 - 2.1.0 - 1.2.7 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.boot - spring-boot-starter-aop - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-validation - - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j.version} - - - mapstruct - org.mapstruct - - - guava - com.google.guava - - - swagger-annotations - io.swagger - - - - - io.swagger - swagger-annotations - ${swagger-annotations.version} - - - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - - - com.ctrip.framework.apollo - apollo-client - ${apollo.version} - - - - - org.springframework.boot - spring-boot-starter-quartz - - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - - - - - io.github.resilience4j - resilience4j-spring-boot2 - ${resilience4j.version} - - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - org.springframework.boot - spring-boot-starter-test - test - - - asm - org.ow2.asm - - - - - - com.h2database - h2 - test - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - test - - - - uk.co.jemos.podam - podam - ${podam.version} - test - - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - true - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.alibaba - easyexcel - ${easyexcel.verion} - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - cn.smallbun.screw - screw-core - ${screw.version} - - - - - - - com.yunpian.sdk - yunpian-java-sdk - ${yunpian-java-sdk.version} - - - - com.aliyun - aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} - - - com.aliyun - aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} - - - - - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java deleted file mode 100644 index 7738d40a2..000000000 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/DefaultBitFieldEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.dashboard.common.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 通用状态枚举 - * - * @author 芋道源码 - */ -@Getter -@AllArgsConstructor -public enum DefaultBitFieldEnum { - - NO(0, "否"), - YES(1, "是"); - - /** - * 状态值 - */ - private final Integer val; - /** - * 状态名 - */ - private final String name; - -} diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 9a333dc37..c7c5c3dd4 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -15,14 +15,52 @@ 1.0.0 + UTF-8 + UTF-8 + @ + 1.8 + ${java.version} + ${java.version} + 3.8.0 2.4.4 + + 3.0.2 + 1.5.22 + + 5.1.46 + 1.2.4 + 3.4.2 + 3.3.2 + 3.15.1 + + 1.7.0 + + 2.2.0 + 1.7.0 + + 8.5.0 + 6.1 + 2.3.1 + + 1.16.14 + 1.4.1.Final + 5.6.1 + 2.2.7 + 2.2 + 1.0.5 + 7.2.6.RELEASE + 0.1.16 + + 4.5.18 + 2.1.0 + 1.2.7 - + org.springframework.boot spring-boot-dependencies @@ -30,8 +68,304 @@ pom import + + + + cn.iocoder.boot + yudao-dependencies + ${revision} + + + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-validation + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + mapstruct + org.mapstruct + + + guava + com.google.guava + + + swagger-annotations + io.swagger + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + + com.ctrip.framework.apollo + apollo-client + ${apollo.version} + + + + + org.springframework.boot + spring-boot-starter-quartz + + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + redisson-spring-boot-starter + org.redisson + + + + + + io.github.resilience4j + resilience4j-spring-boot2 + ${resilience4j.version} + + + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-logback-1.x + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-opentracing + ${skywalking.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + + + org.springframework.boot + spring-boot-starter-test + test + + + asm + org.ow2.asm + + + + + + com.h2database + h2 + test + + + + com.github.fppt + jedis-mock + ${jedis-mock.version} + test + + + + uk.co.jemos.podam + podam + ${podam.version} + test + + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + true + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.alibaba + easyexcel + ${easyexcel.verion} + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + cn.smallbun.screw + screw-core + ${screw.version} + + + + + + + com.yunpian.sdk + yunpian-java-sdk + ${yunpian-java-sdk.version} + + + + com.aliyun + aliyun-java-sdk-core + ${aliyun-java-sdk-core.version} + + + com.aliyun + aliyun-java-sdk-dysmsapi + ${aliyun-java-sdk-dysmsapi.version} + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml new file mode 100644 index 000000000..b26ecfb98 --- /dev/null +++ b/yudao-framework/pom.xml @@ -0,0 +1,212 @@ + + + + cn.iocoder.boot + yudao + ${revision} + + 4.0.0 + + yudao-framework + + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-validation + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + io.swagger + swagger-annotations + + + + + mysql + mysql-connector-java + + + com.alibaba + druid-spring-boot-starter + + + com.baomidou + mybatis-plus-boot-starter + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + + org.redisson + redisson-spring-boot-starter + + + + + com.ctrip.framework.apollo + apollo-client + + + + + org.springframework.boot + spring-boot-starter-quartz + + + + + com.baomidou + lock4j-redisson-spring-boot-starter + + + + io.github.resilience4j + resilience4j-spring-boot2 + + + + + org.apache.skywalking + apm-toolkit-trace + + + org.apache.skywalking + apm-toolkit-logback-1.x + + + org.apache.skywalking + apm-toolkit-opentracing + + + + de.codecentric + spring-boot-admin-starter-server + + + de.codecentric + spring-boot-admin-starter-client + + + + + org.springframework.boot + spring-boot-starter-test + test + + + asm + org.ow2.asm + + + + + + com.h2database + h2 + test + + + + com.github.fppt + jedis-mock + test + + + + uk.co.jemos.podam + podam + test + + + + + org.projectlombok + lombok + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-processor + true + + + org.mapstruct + mapstruct-jdk8 + + + + cn.hutool + hutool-all + + + + com.alibaba + easyexcel + + + + org.apache.velocity + velocity-engine-core + + + + cn.smallbun.screw + screw-core + + + + + + + com.yunpian.sdk + yunpian-java-sdk + + + + com.aliyun + aliyun-java-sdk-core + + + com.aliyun + aliyun-java-sdk-dysmsapi + + + + + + diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/core/IntArrayValuable.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/core/KeyValue.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/enums/CommonStatusEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/enums/UserTypeEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/ErrorCode.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/ServiceException.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/enums/ServiceErrorCodeRange.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/exception/util/ServiceExceptionUtil.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/CommonResult.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/PageParam.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/PageResult.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/common/pojo/SortingField.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DefaultXInjector.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spi/DBConfigFactory.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/async/config/AsyncConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/async/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/async/《芋道 Spring Boot 异步任务入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaConfig.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/captcha/config/CaptchaProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/captcha/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/codegen/config/CodegenProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/codegen/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/config/DataSourceConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/core/enums/DataSourceEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/core/filter/DruidAdRemoveFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 多数据源（读写分离）入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/datasource/《芋道 Spring Boot 数据库连接池入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/config/DictConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/config/ErrorCodeProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/dto/ErrorCodeRespDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/service/ErrorCodeFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/errorcode/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/util/ExcelUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/config/IdempotentConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/annotation/Idempotent.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/IdempotentKeyResolver.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/DefaultIdempotentKeyResolver.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/keyresolver/impl/ExpressionIdempotentKeyResolver.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/redis/IdempotentRedisDAO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/idempotent/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/jackson/deser/LocalDateTimeDeserializer.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/jackson/ser/LocalDateTimeSerializer.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/config/Lock4jConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/Lock4jRedisKeyConstants.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/lock4j/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/config/ApiLogConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiAccessLogFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/ApiErrorLogFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiAccessLogCreateDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/service/dto/ApiErrorLogCreateDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/config/OperateLogConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/annotations/OperateLog.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/enums/OperateTypeEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/util/OperateLogUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/monitor/config/AdminServerConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/config/MybatisConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/dataobject/BaseDO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/handler/DefaultDBFieldHandler.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/mapper/BaseMapperX.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/query/QueryWrapperX.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/util/MyBatisUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/《芋道 Spring Boot MyBatis 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/config/QuartzConfig.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/enums/JobDataKeyEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandler.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/scheduler/SchedulerManager.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/service/JobLogFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/core/util/CronUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/quartz/《芋道 Spring Boot 定时任务入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/config/RedisConfig.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/ChannelMessage.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/StreamMessage.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/redis/《芋道 Spring Boot Redis 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/enums/DataScopeEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityAuthFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/util/SecurityFrameworkUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/config/SmsConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClientFactory.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsReceiveRespDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsSendRespDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/dto/SmsTemplateRespDTO.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/SmsClientFactoryImpl.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsChannelEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsTemplateAuditStatusEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/property/SmsChannelProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerAutoConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/config/SwaggerProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/swagger/《芋道 Spring Boot API 接口文档 Swagger 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerAutoConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/config/TracerProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/filter/TraceFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/core/util/TracerUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/tracer/《芋道 Spring Boot 链路追踪 SkyWalking 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/validator/《芋道 Spring Boot 参数校验 Validation 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/config/WebConfiguration.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/config/WebProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/config/XssProperties.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/enums/FilterOrderEnum.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyWrapper.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssFilter.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/web/《芋道 Spring Boot SpringMVC 入门》.md diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/package-info.java new file mode 100644 index 000000000..f49464f8e --- /dev/null +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/AssertUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/AssertUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/RandomUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/util/RandomUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/ArrayUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/CollectionUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/MapUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/collection/SetUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/date/DateUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/json/JsonUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/object/ObjectUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/package-info.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/package-info.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/servlet/ServletUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/sping/SpringAopUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/sping/SpringExpressionUtils.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/string/StrUtils.java From 90e4966420567a33c7e371f8071f5399df5627e2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 28 Apr 2021 13:59:28 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 +- yudao-admin-server/pom.xml | 25 ++ .../dal/mysql/config/InfConfigDAOImpl.java | 5 +- .../operatelog/SysOperateLogCreateReqVO.java | 13 - .../convert/dict/SysDictDataConvert.java | 7 + .../convert/dict/SysDictTypeConvert.java | 1 + .../convert/logger/SysOperateLogConvert.java | 4 +- .../dict/impl/SysDictDataServiceImpl.java | 14 +- .../logger/impl/SysOperateLogServiceImpl.java | 4 +- .../logger/SysOperateLogServiceImplTest.java | 4 +- yudao-dependencies/pom.xml | 355 ------------------ yudao-framework/pom.xml | 158 +++++++- .../framework/apollo/core/ConfigConsts.java | 4 + .../apollo/internals/ConfigFrameworkDAO.java | 8 +- .../apollo/internals/DBConfigRepository.java | 14 +- .../apollo/internals/dto/ConfigRespDTO.java | 33 ++ .../dict/core/dto/DictDataRespDTO.java | 33 ++ .../service/DictDataFrameworkService.java | 8 +- .../framework/dict/core/util/DictUtils.java | 6 +- .../excel/core/convert/DictConvert.java | 8 +- .../framework/file/config/FileProperties.java | 3 +- .../operatelog/core/aop/OperateLogAspect.java | 84 ++--- .../core/dto/OperateLogCreateReqDTO.java | 84 +++++ .../service/OperateLogFrameworkService.java | 4 +- .../core/type/JsonLongSetTypeHandler.java | 3 +- .../filter/JwtAuthenticationTokenFilter.java | 4 +- .../SecurityPermissionFrameworkService.java | 4 +- .../system/enums/dict/SysDictTypeEnum.java | 0 .../iocoder/dashboard/util/RandomUtils.java | 6 - .../dashboard/BaseMockitoUnitTest.java | 13 + .../dashboard/framework/package-info.java | 0 .../impl/aliyun/AliyunSmsClientTest.java | 0 .../impl/aliyun/AliyunSmsCodeMappingTest.java | 0 .../sms/core/client/impl/package-info.java | 1 + .../impl/yunpian/YunpianSmsClientTest.java | 0 .../yunpian/YunpianSmsCodeMappingTest.java | 0 .../sms/core/client/package-info.java | 1 + .../framework/sms/core/package-info.java | 1 + .../dashboard/framework/sms/package-info.java | 1 + .../cn/iocoder/dashboard/package-info.java | 1 + 40 files changed, 451 insertions(+), 477 deletions(-) delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java create mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java create mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java create mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java rename {yudao-admin-server => yudao-framework}/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java (100%) create mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java rename {yudao-admin-server => yudao-framework}/src/test/java/cn/iocoder/dashboard/framework/package-info.java (100%) rename yudao-framework/src/{main => test}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java (100%) rename yudao-framework/src/{main => test}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java (100%) create mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java rename yudao-framework/src/{main => test}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java (100%) rename yudao-framework/src/{main => test}/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java (100%) create mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java create mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java create mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java create mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java diff --git a/pom.xml b/pom.xml index c4540b560..c2a18deb0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ ${revision} pom - yudao-dependencies + yudao-admin-server yudao-framework @@ -23,16 +23,4 @@ 1.0.0 - - - - cn.iocoder.boot - yudao-dependencies - ${revision} - pom - import - - - - diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 5c9ba3075..4785c31df 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -7,12 +7,37 @@ cn.iocoder.boot yudao-admin-server ${revision} + jar yudao-admin-server 管理后台 Server，提供其 API 接口 https://github.com/YunaiV/ruoyi-vue-pro + + 1.0.0 + + + + cn.iocoder.boot + yudao-framework + ${revision} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java index 58a4f1e98..48f44bd2f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.dashboard.modules.infra.dal.mysql.config; import cn.iocoder.dashboard.framework.apollo.internals.ConfigFrameworkDAO; +import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; @@ -32,8 +33,8 @@ public class InfConfigDAOImpl implements ConfigFrameworkDAO { } @Override - public List selectList() { - return jdbcTemplate.query("SELECT `key`, `value`, update_time, deleted FROM inf_config", new BeanPropertyRowMapper<>(InfConfigDO.class)); + public List selectList() { + return jdbcTemplate.query("SELECT `key`, `value`, update_time, deleted FROM inf_config", new BeanPropertyRowMapper<>(ConfigRespDTO.class)); } } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java deleted file mode 100644 index 5cb849093..000000000 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogCreateReqVO.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@ApiModel(value = "操作日志创建 Request VO", description = "暂时提供给前端，仅仅后端切面记录操作日志时，进行使用") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class SysOperateLogCreateReqVO extends SysOperateLogBaseVO { -} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java index af8fda25e..90551d641 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java @@ -1,11 +1,14 @@ package cn.iocoder.dashboard.modules.system.convert.dict; import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*; import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.Collection; import java.util.List; @Mapper @@ -25,4 +28,8 @@ public interface SysDictDataConvert { List convertList02(List bean); + DictDataRespDTO convert02(SysDictDataDO bean); + + List convertList03(Collection list); + } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java index d0ae1a3d1..6465e6709 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java @@ -1,6 +1,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict; import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*; import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO; import org.mapstruct.Mapper; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java index 92a83adf3..7eca70d49 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.convert.logger; import cn.iocoder.dashboard.common.pojo.PageResult; -import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO; +import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; @@ -21,7 +21,7 @@ public interface SysOperateLogConvert { SysOperateLogConvert INSTANCE = Mappers.getMapper(SysOperateLogConvert.class); - SysOperateLogDO convert(SysOperateLogCreateReqVO bean); + SysOperateLogDO convert(OperateLogCreateReqDTO bean); PageResult convertPage(PageResult page); diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java index 7f24cbff4..1a2b19cc0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java @@ -3,6 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.dict.impl; import cn.hutool.core.collection.CollUtil; import cn.iocoder.dashboard.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.common.pojo.PageResult; +import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO; @@ -23,7 +24,6 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; @@ -239,18 +239,18 @@ public class SysDictDataServiceImpl implements SysDictDataService { } @Override - public SysDictDataDO getDictDataFromCache(String type, String value) { - return valueDictDataCache.get(type, value); + public DictDataRespDTO getDictDataFromCache(String type, String value) { + return SysDictDataConvert.INSTANCE.convert02(valueDictDataCache.get(type, value)); } @Override - public SysDictDataDO parseDictDataFromCache(String type, String label) { - return labelDictDataCache.get(type, label); + public DictDataRespDTO parseDictDataFromCache(String type, String label) { + return SysDictDataConvert.INSTANCE.convert02(labelDictDataCache.get(type, label)); } @Override - public List listDictDatasFromCache(String type) { - return new ArrayList<>(labelDictDataCache.row(type).values()); + public List listDictDatasFromCache(String type) { + return SysDictDataConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values())); } } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java index 5251dfe05..f92d8b1dd 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.logger.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.dashboard.common.pojo.PageResult; -import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO; +import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert; @@ -40,7 +40,7 @@ public class SysOperateLogServiceImpl implements SysOperateLogService { @Override @Async - public Future createOperateLogAsync(SysOperateLogCreateReqVO reqVO) { + public Future createOperateLogAsync(OperateLogCreateReqDTO reqVO) { boolean success = false; try { SysOperateLogDO logDO = SysOperateLogConvert.INSTANCE.convert(reqVO); diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java index 67f99e35f..b1529b609 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java @@ -7,7 +7,7 @@ import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.common.pojo.PageResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; -import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO; +import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO; @@ -48,7 +48,7 @@ public class SysOperateLogServiceImplTest extends BaseDbUnitTest { @Test public void testCreateOperateLogAsync() throws InterruptedException, ExecutionException { String traceId = TracerUtils.getTraceId(); - SysOperateLogCreateReqVO reqVO = RandomUtils.randomPojo(SysOperateLogCreateReqVO.class, o -> { + OperateLogCreateReqDTO reqVO = RandomUtils.randomPojo(OperateLogCreateReqDTO.class, o -> { o.setTraceId(traceId); o.setUserId(randomLongId()); o.setExts(MapUtil.builder("orderId", randomLongId()).build()); diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index c7c5c3dd4..829d67422 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -13,359 +13,4 @@ 基础 bom 文件，管理整个项目的依赖版本 https://github.com/YunaiV/ruoyi-vue-pro - - 1.0.0 - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 - - - 2.4.4 - - 3.0.2 - 1.5.22 - - 5.1.46 - 1.2.4 - 3.4.2 - 3.3.2 - 3.15.1 - - 1.7.0 - - 2.2.0 - 1.7.0 - - 8.5.0 - 6.1 - 2.3.1 - - 1.16.14 - 1.4.1.Final - 5.6.1 - 2.2.7 - 2.2 - 1.0.5 - 7.2.6.RELEASE - 0.1.16 - - 4.5.18 - 2.1.0 - 1.2.7 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - - cn.iocoder.boot - yudao-dependencies - ${revision} - - - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - org.springframework.boot - spring-boot-starter-aop - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-validation - - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j.version} - - - mapstruct - org.mapstruct - - - guava - com.google.guava - - - swagger-annotations - io.swagger - - - - - io.swagger - swagger-annotations - ${swagger-annotations.version} - - - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - - - com.ctrip.framework.apollo - apollo-client - ${apollo.version} - - - - - org.springframework.boot - spring-boot-starter-quartz - - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - - - - - io.github.resilience4j - resilience4j-spring-boot2 - ${resilience4j.version} - - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - org.springframework.boot - spring-boot-starter-test - test - - - asm - org.ow2.asm - - - - - - com.h2database - h2 - test - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - test - - - - uk.co.jemos.podam - podam - ${podam.version} - test - - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - true - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.alibaba - easyexcel - ${easyexcel.verion} - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - cn.smallbun.screw - screw-core - ${screw.version} - - - - - - - com.yunpian.sdk - yunpian-java-sdk - ${yunpian-java-sdk.version} - - - - com.aliyun - aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} - - - com.aliyun - aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} - - - - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - - diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index b26ecfb98..6278c533e 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -11,12 +11,70 @@ yudao-framework + + UTF-8 + UTF-8 + @ + 1.8 + ${java.version} + ${java.version} + 3.8.0 + + 2.4.4 + + 3.0.2 + 1.5.22 + + 5.1.46 + 1.2.4 + 3.4.2 + 3.3.2 + 3.15.1 + + 1.7.0 + + 2.2.0 + 1.7.0 + + 8.5.0 + 6.1 + 2.3.1 + + 1.16.14 + 1.4.1.Final + 5.6.1 + 2.2.7 + 2.2 + 1.0.5 + 7.2.6.RELEASE + 0.1.16 + + 4.5.18 + 2.1.0 + 1.2.7 + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + org.springframework.boot spring-boot-configuration-processor + true @@ -43,39 +101,61 @@ com.github.xiaoymin knife4j-spring-boot-starter + ${knife4j.version} + + + mapstruct + org.mapstruct + + + guava + com.google.guava + + + swagger-annotations + io.swagger + + io.swagger swagger-annotations + ${swagger-annotations.version} mysql mysql-connector-java + ${mysql-connector-java.version} com.alibaba druid-spring-boot-starter + ${druid.version} com.baomidou mybatis-plus-boot-starter + ${mybatis-plus.version} com.baomidou dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} org.redisson redisson-spring-boot-starter + ${redisson.version} com.ctrip.framework.apollo apollo-client + ${apollo.version} @@ -88,41 +168,55 @@ com.baomidou lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + redisson-spring-boot-starter + org.redisson + + io.github.resilience4j resilience4j-spring-boot2 + ${resilience4j.version} org.apache.skywalking apm-toolkit-trace + ${skywalking.version} org.apache.skywalking apm-toolkit-logback-1.x + ${skywalking.version} org.apache.skywalking apm-toolkit-opentracing + ${skywalking.version} de.codecentric spring-boot-admin-starter-server + ${spring-boot-admin.version} de.codecentric spring-boot-admin-starter-client + ${spring-boot-admin.version} org.springframework.boot spring-boot-starter-test - test + + true asm @@ -140,53 +234,64 @@ com.github.fppt jedis-mock + ${jedis-mock.version} test uk.co.jemos.podam podam - test + ${podam.version} + + true org.projectlombok lombok + ${lombok.version} org.mapstruct mapstruct + ${mapstruct.version} org.mapstruct mapstruct-processor + ${mapstruct.version} true org.mapstruct mapstruct-jdk8 + ${mapstruct.version} cn.hutool hutool-all + ${hutool.version} com.alibaba easyexcel + ${easyexcel.verion} org.apache.velocity velocity-engine-core + ${velocity.version} cn.smallbun.screw screw-core + ${screw.version} @@ -195,18 +300,67 @@ com.yunpian.sdk yunpian-java-sdk + ${yunpian-java-sdk.version} com.aliyun aliyun-java-sdk-core + ${aliyun-java-sdk-core.version} com.aliyun aliyun-java-sdk-dysmsapi + ${aliyun-java-sdk-dysmsapi.version} + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java index 2d83836f9..8e0fe57bb 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/core/ConfigConsts.java @@ -9,6 +9,10 @@ package cn.iocoder.dashboard.framework.apollo.core; */ public class ConfigConsts { + /** + * {@link cn.iocoder.dashboard.framework.apollo.internals.ConfigFrameworkDAO} 的实现类 + */ + public static final String APOLLO_JDBC_DAO = "apollo.jdbc.dao"; public static final String APOLLO_JDBC_URL = "apollo.jdbc.url"; public static final String APOLLO_JDBC_USERNAME = "apollo.jdbc.username"; public static final String APOLLO_JDBC_PASSWORD = "apollo.jdbc.password"; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java index 3e0d4c79f..8f46b2d30 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java @@ -1,12 +1,16 @@ package cn.iocoder.dashboard.framework.apollo.internals; -import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; +import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; import java.util.Date; import java.util.List; /** * 配置 Framework DAO 接口 + * + * 注意，实现类必须提供 (String jdbcUrl, String username, String password) 构造方法 + * + * @author 芋道源码 */ public interface ConfigFrameworkDAO { @@ -23,6 +27,6 @@ public interface ConfigFrameworkDAO { * * @return 配置列表 */ - List selectList(); + List selectList(); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java index 78d8fe923..3117769e6 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java @@ -2,9 +2,8 @@ package cn.iocoder.dashboard.framework.apollo.internals; import cn.hutool.core.collection.CollUtil; import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts; +import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl; -import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO; import com.ctrip.framework.apollo.Apollo; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory; @@ -59,6 +58,7 @@ public class DBConfigRepository extends AbstractConfigRepository { this.propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class); this.m_configUtil = ApolloInjector.getInstance(ConfigUtil.class); // 初始化 DB + cn.iocoder.dashboard.modules.infra.dal.mysql.config this.configFrameworkDAO = new InfConfigDAOImpl(System.getProperty(ConfigConsts.APOLLO_JDBC_URL), System.getProperty(ConfigConsts.APOLLO_JDBC_USERNAME), System.getProperty(ConfigConsts.APOLLO_JDBC_PASSWORD)); @@ -84,7 +84,7 @@ public class DBConfigRepository extends AbstractConfigRepository { @Override protected void sync() { // 第一步，尝试获取配置 - List configs = this.loadConfigIfUpdate(this.maxUpdateTime); + List configs = this.loadConfigIfUpdate(this.maxUpdateTime); if (CollUtil.isEmpty(configs)) { // 如果没有更新，则返回 return; } @@ -94,7 +94,7 @@ public class DBConfigRepository extends AbstractConfigRepository { this.m_configCache = newProperties; // 第三步，获取最大的配置时间 assert configs.size() > 0; // 断言，避免告警 - this.maxUpdateTime = configs.stream().max(Comparator.comparing(BaseDO::getUpdateTime)).get().getUpdateTime(); + this.maxUpdateTime = configs.stream().max(Comparator.comparing(ConfigRespDTO::getUpdateTime)).get().getUpdateTime(); // 第四部，触发配置刷新！重要！！！！ super.fireRepositoryChange(m_namespace, newProperties); log.info("[sync][缓存配置，数量为:{}]", configs.size()); @@ -120,9 +120,9 @@ public class DBConfigRepository extends AbstractConfigRepository { return ConfigSourceType.REMOTE; } - private Properties buildProperties(List configs) { + private Properties buildProperties(List configs) { Properties properties = propertiesFactory.getPropertiesInstance(); - configs.stream().filter(BaseDO::getDeleted) // 过滤掉被删除的配置 + configs.stream().filter(ConfigRespDTO::getDeleted) // 过滤掉被删除的配置 .forEach(config -> properties.put(config.getKey(), config.getValue())); return properties; } @@ -153,7 +153,7 @@ public class DBConfigRepository extends AbstractConfigRepository { * @param maxUpdateTime 当前配置的最大更新时间 * @return 配置列表 */ - private List loadConfigIfUpdate(Date maxUpdateTime) { + private List loadConfigIfUpdate(Date maxUpdateTime) { // 第一步，判断是否要更新。 if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据 log.info("[loadConfigIfUpdate][首次加载全量配置]"); diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java new file mode 100644 index 000000000..3945dfbeb --- /dev/null +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/dto/ConfigRespDTO.java @@ -0,0 +1,33 @@ +package cn.iocoder.dashboard.framework.apollo.internals.dto; + +import lombok.Data; + +import java.util.Date; + +/** + * 配置 Response DTO + * + * @author 芋道源码 + */ +@Data +public class ConfigRespDTO { + + /** + * 参数键名 + */ + private String key; + /** + * 参数键值 + */ + private String value; + + /** + * 是否删除 + */ + private Boolean deleted; + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java new file mode 100644 index 000000000..bfbcee7ba --- /dev/null +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java @@ -0,0 +1,33 @@ +package cn.iocoder.dashboard.framework.dict.core.dto; + +import cn.iocoder.dashboard.common.enums.CommonStatusEnum; +import lombok.Data; + +/** + * 字典数据 Response DTO + * + * @author 芋道源码 + */ +@Data +public class DictDataRespDTO { + + /** + * 字典标签 + */ + private String label; + /** + * 字典值 + */ + private String value; + /** + * 字典类型 + */ + private String dictType; + /** + * 状态 + * + * 枚举 {@link CommonStatusEnum} + */ + private Integer status; + +} diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java index c6e7d41eb..e31241141 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.dict.core.service; -import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; +import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import java.util.List; @@ -13,7 +13,7 @@ public interface DictDataFrameworkService { * @param value 字典数据值 * @return 字典数据 */ - SysDictDataDO getDictDataFromCache(String type, String value); + DictDataRespDTO getDictDataFromCache(String type, String value); /** * 解析获得指定的字典数据，从缓存中 @@ -22,7 +22,7 @@ public interface DictDataFrameworkService { * @param label 字典数据标签 * @return 字典数据 */ - SysDictDataDO parseDictDataFromCache(String type, String label); + DictDataRespDTO parseDictDataFromCache(String type, String label); /** * 获得指定类型的字典数据，从缓存中 @@ -30,6 +30,6 @@ public interface DictDataFrameworkService { * @param type 字典类型 * @return 字典数据列表 */ - List listDictDatasFromCache(String type); + List listDictDatasFromCache(String type); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java index 5b03200c5..b80f74231 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.dict.core.util; +import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService; -import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; import lombok.extern.slf4j.Slf4j; /** @@ -17,11 +17,11 @@ public class DictUtils { log.info("[init][初始化 DictUtils 成功]"); } - public static SysDictDataDO getDictDataFromCache(String type, String value) { + public static DictDataRespDTO getDictDataFromCache(String type, String value) { return service.getDictDataFromCache(type, value); } - public static SysDictDataDO parseDictDataFromCache(String type, String label) { + public static DictDataRespDTO parseDictDataFromCache(String type, String label) { return service.getDictDataFromCache(type, label); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java index 2bda65d2b..90e13c3c0 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java @@ -2,9 +2,9 @@ package cn.iocoder.dashboard.framework.excel.core.convert; import cn.hutool.core.convert.Convert; +import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.framework.dict.core.util.DictUtils; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; -import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO; import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; @@ -14,7 +14,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; import lombok.extern.slf4j.Slf4j; /** - * Excel {@link SysDictDataDO} 数据字典转换器 + * Excel {@link DictDataRespDTO} 数据字典转换器 * * @author 芋道源码 */ @@ -37,7 +37,7 @@ public class DictConvert implements Converter { // 使用字典解析 SysDictTypeEnum type = getType(contentProperty); String label = cellData.getStringValue(); - SysDictDataDO dictData = DictUtils.parseDictDataFromCache(type.getValue(), label); + DictDataRespDTO dictData = DictUtils.parseDictDataFromCache(type.getValue(), label); if (dictData == null) { log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label); return null; @@ -58,7 +58,7 @@ public class DictConvert implements Converter { // 使用字典格式化 SysDictTypeEnum type = getType(contentProperty); String value = String.valueOf(object); - SysDictDataDO dictData = DictUtils.getDictDataFromCache(type.getValue(), value); + DictDataRespDTO dictData = DictUtils.getDictDataFromCache(type.getValue(), value); if (dictData == null) { log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); return new CellData<>(""); diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java index 4018f4437..318a97f25 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/file/config/FileProperties.java @@ -1,6 +1,5 @@ package cn.iocoder.dashboard.framework.file.config; -import cn.iocoder.dashboard.modules.infra.controller.file.InfFileController; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated; @@ -13,7 +12,7 @@ import javax.validation.constraints.NotNull; public class FileProperties { /** - * 对应 {@link InfFileController#} + * 对应 InfFileController 的 getFile 方法 */ @NotNull(message = "基础文件路径不能为空") private String basePath; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java index d7d3e5975..91412eb83 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java @@ -6,11 +6,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.iocoder.dashboard.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog; +import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum; import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; -import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO; import cn.iocoder.dashboard.util.json.JsonUtils; import cn.iocoder.dashboard.util.servlet.ServletUtils; import com.google.common.collect.Maps; @@ -55,13 +55,13 @@ public class OperateLogAspect { /** * 用于记录操作内容的上下文 * - * @see SysOperateLogCreateReqVO#getContent() + * @see OperateLogCreateReqDTO#getContent() */ private static final ThreadLocal CONTENT = new ThreadLocal<>(); /** * 用于记录拓展字段的上下文 * - * @see SysOperateLogCreateReqVO#getExts() + * @see OperateLogCreateReqDTO#getExts() */ private static final ThreadLocal> EXTS = new ThreadLocal<>(); @@ -130,106 +130,106 @@ public class OperateLogAspect { private void log0(ProceedingJoinPoint joinPoint, OperateLog operateLog, ApiOperation apiOperation, Date startTime, Object result, Throwable exception) { - SysOperateLogCreateReqVO operateLogVO = new SysOperateLogCreateReqVO(); + OperateLogCreateReqDTO operateLogDTO = new OperateLogCreateReqDTO(); // 补全通用字段 - operateLogVO.setTraceId(TracerUtils.getTraceId()); - operateLogVO.setStartTime(startTime); + operateLogDTO.setTraceId(TracerUtils.getTraceId()); + operateLogDTO.setStartTime(startTime); // 补充用户信息 - fillUserFields(operateLogVO); + fillUserFields(operateLogDTO); // 补全模块信息 - fillModuleFields(operateLogVO, joinPoint, operateLog, apiOperation); + fillModuleFields(operateLogDTO, joinPoint, operateLog, apiOperation); // 补全请求信息 - fillRequestFields(operateLogVO); + fillRequestFields(operateLogDTO); // 补全方法信息 - fillMethodFields(operateLogVO, joinPoint, operateLog, startTime, result, exception); + fillMethodFields(operateLogDTO, joinPoint, operateLog, startTime, result, exception); // 异步记录日志 - operateLogFrameworkService.createOperateLogAsync(operateLogVO); + operateLogFrameworkService.createOperateLogAsync(operateLogDTO); } - private static void fillUserFields(SysOperateLogCreateReqVO operateLogVO) { - operateLogVO.setUserId(SecurityFrameworkUtils.getLoginUserId()); + private static void fillUserFields(OperateLogCreateReqDTO operateLogDTO) { + operateLogDTO.setUserId(SecurityFrameworkUtils.getLoginUserId()); } - private static void fillModuleFields(SysOperateLogCreateReqVO operateLogVO, + private static void fillModuleFields(OperateLogCreateReqDTO operateLogDTO, ProceedingJoinPoint joinPoint, OperateLog operateLog, ApiOperation apiOperation) { // module 属性 if (operateLog != null) { - operateLogVO.setModule(operateLog.module()); + operateLogDTO.setModule(operateLog.module()); } - if (StrUtil.isEmpty(operateLogVO.getModule())) { + if (StrUtil.isEmpty(operateLogDTO.getModule())) { Api api = getClassAnnotation(joinPoint, Api.class); if (api != null) { // 优先读取 @API 的 name 属性 if (StrUtil.isNotEmpty(api.value())) { - operateLogVO.setModule(api.value()); + operateLogDTO.setModule(api.value()); } // 没有的话，读取 @API 的 tags 属性 - if (StrUtil.isEmpty(operateLogVO.getModule()) && ArrayUtil.isNotEmpty(api.tags())) { - operateLogVO.setModule(api.tags()[0]); + if (StrUtil.isEmpty(operateLogDTO.getModule()) && ArrayUtil.isNotEmpty(api.tags())) { + operateLogDTO.setModule(api.tags()[0]); } } } // name 属性 if (operateLog != null) { - operateLogVO.setName(operateLog.name()); + operateLogDTO.setName(operateLog.name()); } - if (StrUtil.isEmpty(operateLogVO.getName()) && apiOperation != null) { - operateLogVO.setName(apiOperation.value()); + if (StrUtil.isEmpty(operateLogDTO.getName()) && apiOperation != null) { + operateLogDTO.setName(apiOperation.value()); } // type 属性 if (operateLog != null && ArrayUtil.isNotEmpty(operateLog.type())) { - operateLogVO.setType(operateLog.type()[0].getType()); + operateLogDTO.setType(operateLog.type()[0].getType()); } - if (operateLogVO.getType() == null) { + if (operateLogDTO.getType() == null) { RequestMethod requestMethod = obtainFirstMatchRequestMethod(obtainRequestMethod(joinPoint)); OperateTypeEnum operateLogType = convertOperateLogType(requestMethod); - operateLogVO.setType(operateLogType != null ? operateLogType.getType() : null); + operateLogDTO.setType(operateLogType != null ? operateLogType.getType() : null); } // content 和 exts 属性 - operateLogVO.setContent(CONTENT.get()); - operateLogVO.setExts(EXTS.get()); + operateLogDTO.setContent(CONTENT.get()); + operateLogDTO.setExts(EXTS.get()); } - private static void fillRequestFields(SysOperateLogCreateReqVO operateLogVO) { + private static void fillRequestFields(OperateLogCreateReqDTO operateLogDTO) { // 获得 Request 对象 HttpServletRequest request = ServletUtils.getRequest(); if (request == null) { return; } // 补全请求信息 - operateLogVO.setRequestMethod(request.getMethod()); - operateLogVO.setRequestUrl(request.getRequestURI()); - operateLogVO.setUserIp(ServletUtil.getClientIP(request)); - operateLogVO.setUserAgent(ServletUtils.getUserAgent(request)); + operateLogDTO.setRequestMethod(request.getMethod()); + operateLogDTO.setRequestUrl(request.getRequestURI()); + operateLogDTO.setUserIp(ServletUtil.getClientIP(request)); + operateLogDTO.setUserAgent(ServletUtils.getUserAgent(request)); } - private static void fillMethodFields(SysOperateLogCreateReqVO operateLogVO, + private static void fillMethodFields(OperateLogCreateReqDTO operateLogDTO, ProceedingJoinPoint joinPoint, OperateLog operateLog, Date startTime, Object result, Throwable exception) { MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); - operateLogVO.setJavaMethod(methodSignature.toString()); + operateLogDTO.setJavaMethod(methodSignature.toString()); if (operateLog == null || operateLog.logArgs()) { - operateLogVO.setJavaMethodArgs(obtainMethodArgs(joinPoint)); + operateLogDTO.setJavaMethodArgs(obtainMethodArgs(joinPoint)); } if (operateLog == null || operateLog.logResultData()) { - operateLogVO.setResultData(obtainResultData(result)); + operateLogDTO.setResultData(obtainResultData(result)); } - operateLogVO.setDuration((int) (System.currentTimeMillis() - startTime.getTime())); + operateLogDTO.setDuration((int) (System.currentTimeMillis() - startTime.getTime())); // （正常）处理 resultCode 和 resultMsg 字段 if (result != null) { if (result instanceof CommonResult) { CommonResult commonResult = (CommonResult) result; - operateLogVO.setResultCode(commonResult.getCode()); - operateLogVO.setResultMsg(commonResult.getMsg()); + operateLogDTO.setResultCode(commonResult.getCode()); + operateLogDTO.setResultMsg(commonResult.getMsg()); } else { - operateLogVO.setResultCode(SUCCESS.getCode()); + operateLogDTO.setResultCode(SUCCESS.getCode()); } } // （异常）处理 resultCode 和 resultMsg 字段 if (exception != null) { - operateLogVO.setResultCode(INTERNAL_SERVER_ERROR.getCode()); - operateLogVO.setResultMsg(ExceptionUtil.getRootCauseMessage(exception)); + operateLogDTO.setResultCode(INTERNAL_SERVER_ERROR.getCode()); + operateLogDTO.setResultMsg(ExceptionUtil.getRootCauseMessage(exception)); } } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java new file mode 100644 index 000000000..37eeb0c23 --- /dev/null +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/dto/OperateLogCreateReqDTO.java @@ -0,0 +1,84 @@ +package cn.iocoder.dashboard.framework.logger.operatelog.core.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.Map; + +/** + * 操作日志创建 Request DTO + */ +@Data +public class OperateLogCreateReqDTO { + + @ApiModelProperty(value = "链路追踪编号", required = true, example = "89aca178-a370-411c-ae02-3f0d672be4ab") + @NotEmpty(message = "链路追踪编号不能为空") + private String traceId; + + @ApiModelProperty(value = "用户编号", required = true, example = "1024") + @NotNull(message = "用户编号不能为空") + private Long userId; + + @ApiModelProperty(value = "操作模块", required = true, example = "订单") + @NotEmpty(message = "操作模块不能为空") + private String module; + + @ApiModelProperty(value = "操作名", required = true, example = "创建订单") + @NotEmpty(message = "操作名") + private String name; + + @ApiModelProperty(value = "操作分类", required = true, example = "1", notes = "参见 SysOperateLogTypeEnum 枚举类") + @NotNull(message = "操作分类不能为空") + private Integer type; + + @ApiModelProperty(value = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。") + private String content; + + @ApiModelProperty(value = "拓展字段", example = "{'orderId': 1}") + private Map exts; + + @ApiModelProperty(value = "请求方法名", required = true, example = "GET") + @NotEmpty(message = "请求方法名不能为空") + private String requestMethod; + + @ApiModelProperty(value = "请求地址", required = true, example = "/xxx/yyy") + @NotEmpty(message = "请求地址不能为空") + private String requestUrl; + + @ApiModelProperty(value = "用户 IP", required = true, example = "127.0.0.1") + @NotEmpty(message = "用户 IP 不能为空") + private String userIp; + + @ApiModelProperty(value = "浏览器 UserAgent", required = true, example = "Mozilla/5.0") + @NotEmpty(message = "浏览器 UserAgent 不能为空") + private String userAgent; + + @ApiModelProperty(value = "Java 方法名", required = true, example = "cn.iocoder.dashboard.UserController.save(...)") + @NotEmpty(message = "Java 方法名不能为空") + private String javaMethod; + + @ApiModelProperty(value = "Java 方法的参数") + private String javaMethodArgs; + + @ApiModelProperty(value = "开始时间", required = true) + @NotNull(message = "开始时间不能为空") + private Date startTime; + + @ApiModelProperty(value = "执行时长，单位：毫秒", required = true) + @NotNull(message = "执行时长不能为空") + private Integer duration; + + @ApiModelProperty(value = "结果码", required = true) + @NotNull(message = "结果码不能为空") + private Integer resultCode; + + @ApiModelProperty(value = "结果提示") + private String resultMsg; + + @ApiModelProperty(value = "结果数据") + private String resultData; + +} diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java index d16ecf804..02489e8f9 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/service/OperateLogFrameworkService.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.logger.operatelog.core.service; -import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO; +import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO; import java.util.concurrent.Future; @@ -12,6 +12,6 @@ public interface OperateLogFrameworkService { * @param reqVO 操作日志请求 * @return true: 记录成功,false: 记录失败 */ - Future createOperateLogAsync(SysOperateLogCreateReqVO reqVO); + Future createOperateLogAsync(OperateLogCreateReqDTO reqVO); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java index 32524b51d..4532cfa62 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java @@ -1,6 +1,5 @@ package cn.iocoder.dashboard.framework.mybatis.core.type; -import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; import cn.iocoder.dashboard.util.json.JsonUtils; import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; import com.fasterxml.jackson.core.type.TypeReference; @@ -11,7 +10,7 @@ import java.util.Set; * 参考 {@link com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler} 实现 * 在我们将字符串反序列化为 Set 并且泛型为 Long 时，如果每个元素的数值太小，会被处理成 Integer 类型，导致可能存在隐性的 BUG。 * - * 例如说哦，{@link SysUserDO#getPostIds()} 属性 + * 例如说哦，SysUserDO 的 postIds 属性 * * @author 芋道源码 */ diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java index b4dcf6720..3914583de 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java @@ -4,9 +4,9 @@ import cn.hutool.core.util.StrUtil; import cn.iocoder.dashboard.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.security.config.SecurityProperties; import cn.iocoder.dashboard.framework.security.core.LoginUser; +import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService; import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.dashboard.framework.web.core.handler.GlobalExceptionHandler; -import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService; import cn.iocoder.dashboard.util.servlet.ServletUtils; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; @@ -30,7 +30,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { @Resource private SecurityProperties securityProperties; @Resource - private SysAuthService authService; + private SecurityAuthFrameworkService authService; @Resource private GlobalExceptionHandler globalExceptionHandler; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java index aef27a149..22098714e 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java @@ -1,7 +1,5 @@ package cn.iocoder.dashboard.framework.security.core.service; -import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO; - /** * Security 框架 Permission Service 接口，定义 security 组件需要的功能 * @@ -28,7 +26,7 @@ public interface SecurityPermissionFrameworkService { /** * 判断是否有角色 * - * 注意，角色使用的是 {@link SysRoleDO#getCode()} 标识 + * 注意，角色使用的是 SysRoleDO 的 code 标识 * * @param role 角色 * @return 是否 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java index 717f6d490..51cd61f89 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java @@ -3,7 +3,6 @@ package cn.iocoder.dashboard.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; import cn.iocoder.dashboard.common.enums.CommonStatusEnum; -import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO; import uk.co.jemos.podam.api.PodamFactory; import uk.co.jemos.podam.api.PodamFactoryImpl; @@ -71,11 +70,6 @@ public class RandomUtils { return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus(); } - @SafeVarargs - public static SysUserDO randomUserDO(Consumer... consumers) { - return randomPojo(SysUserDO.class, consumers); - } - @SafeVarargs public static T randomPojo(Class clazz, Consumer... consumers) { T pojo = PODAM_FACTORY.manufacturePojo(clazz); diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java new file mode 100644 index 000000000..4a595b24e --- /dev/null +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java @@ -0,0 +1,13 @@ +package cn.iocoder.dashboard; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; + +/** + * 纯 Mockito 的单元测试 + * + * @author 芋道源码 + */ +@ExtendWith(MockitoExtension.class) +public class BaseMockitoUnitTest { +} diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java similarity index 100% rename from yudao-admin-server/src/test/java/cn/iocoder/dashboard/framework/package-info.java rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java similarity index 100% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java similarity index 100% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java new file mode 100644 index 000000000..42e9b0618 --- /dev/null +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.framework.sms.core.client.impl; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java similarity index 100% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java similarity index 100% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java new file mode 100644 index 000000000..037ce8ca2 --- /dev/null +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.framework.sms.core.client; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java new file mode 100644 index 000000000..ec8f3eaf0 --- /dev/null +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.framework.sms.core; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java new file mode 100644 index 000000000..ba591dc05 --- /dev/null +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard.framework.sms; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java new file mode 100644 index 000000000..f49464f8e --- /dev/null +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.dashboard; From e35dde1207243f384dc3ff5f818a3e1c55459e37 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 28 Apr 2021 20:40:48 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-admin-server/pom.xml | 48 +++++++++++++++++++ .../dict/impl/SysDictDataServiceImpl.java | 2 +- .../src/main/resources/application-dev.yaml | 1 + .../src/main/resources/application-local.yaml | 1 + .../service/auth/SysAuthServiceImplTest.java | 4 +- .../apollo/internals/DBConfigRepository.java | 22 +++++++-- .../ApolloApplicationContextInitializer.java | 4 +- 7 files changed, 74 insertions(+), 8 deletions(-) diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 4785c31df..7b3bb7925 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,14 +16,62 @@ 1.0.0 + 2.4.4 + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + cn.iocoder.boot yudao-framework ${revision} + + + org.springframework.boot + spring-boot-starter-test + 2.4.4 + test + + + asm + org.ow2.asm + + + + + + com.h2database + h2 + test + + + + com.github.fppt + jedis-mock + 0.1.16 + test + + + + uk.co.jemos.podam + podam + 7.2.6.RELEASE + test + diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java index 1a2b19cc0..20ed72ebe 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java @@ -250,7 +250,7 @@ public class SysDictDataServiceImpl implements SysDictDataService { @Override public List listDictDatasFromCache(String type) { - return SysDictDataConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values())); + return SysDictDataConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values()); } } diff --git a/yudao-admin-server/src/main/resources/application-dev.yaml b/yudao-admin-server/src/main/resources/application-dev.yaml index 526bf3d51..9963de739 100644 --- a/yudao-admin-server/src/main/resources/application-dev.yaml +++ b/yudao-admin-server/src/main/resources/application-dev.yaml @@ -99,6 +99,7 @@ apollo: eagerLoad: enabled: true # 设置 Apollo 在日志初始化前生效，可以实现日志的动态级别配置 jdbc: # 自定义的 JDBC 配置项，用于数据库的地址 + dao: cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl url: ${spring.datasource.dynamic.datasource.master.url} username: ${spring.datasource.dynamic.datasource.master.username} password: ${spring.datasource.dynamic.datasource.master.password} diff --git a/yudao-admin-server/src/main/resources/application-local.yaml b/yudao-admin-server/src/main/resources/application-local.yaml index 8761a78a8..6e56f5071 100644 --- a/yudao-admin-server/src/main/resources/application-local.yaml +++ b/yudao-admin-server/src/main/resources/application-local.yaml @@ -99,6 +99,7 @@ apollo: eagerLoad: enabled: true # 设置 Apollo 在日志初始化前生效，可以实现日志的动态级别配置 jdbc: # 自定义的 JDBC 配置项，用于数据库的地址 + dao: cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl url: ${spring.datasource.dynamic.datasource.master.url} username: ${spring.datasource.dynamic.datasource.master.username} password: ${spring.datasource.dynamic.datasource.master.password} diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java index baccf727d..40b606836 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java @@ -66,7 +66,7 @@ public class SysAuthServiceImplTest extends BaseDbUnitTest { // 准备参数 String username = randomString(); // mock 方法 - SysUserDO user = randomUserDO(o -> o.setUsername(username)); + SysUserDO user = randomPojo(SysUserDO.class, o -> o.setUsername(username)); when(userService.getUserByUsername(eq(username))).thenReturn(user); // 调用 @@ -93,7 +93,7 @@ public class SysAuthServiceImplTest extends BaseDbUnitTest { // 准备参数 Long userId = randomLongId(); // mock 方法 01 - SysUserDO user = randomUserDO(o -> o.setId(userId)); + SysUserDO user = randomPojo(SysUserDO.class, o -> o.setId(userId)); when(userService.getUser(eq(userId))).thenReturn(user); // mock 方法 02 Set roleIds = randomSet(Long.class); diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java index 3117769e6..acf2e1f48 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java @@ -1,9 +1,13 @@ package cn.iocoder.dashboard.framework.apollo.internals; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ClassUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReflectUtil; import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts; import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO; import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.dashboard.util.object.ObjectUtils; import com.ctrip.framework.apollo.Apollo; import com.ctrip.framework.apollo.build.ApolloInjector; import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory; @@ -13,8 +17,10 @@ import com.ctrip.framework.apollo.internals.ConfigRepository; import com.ctrip.framework.apollo.tracer.Tracer; import com.ctrip.framework.apollo.util.ConfigUtil; import com.ctrip.framework.apollo.util.factory.PropertiesFactory; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import java.lang.reflect.Constructor; import java.util.Comparator; import java.util.Date; import java.util.List; @@ -58,9 +64,7 @@ public class DBConfigRepository extends AbstractConfigRepository { this.propertiesFactory = ApolloInjector.getInstance(PropertiesFactory.class); this.m_configUtil = ApolloInjector.getInstance(ConfigUtil.class); // 初始化 DB - cn.iocoder.dashboard.modules.infra.dal.mysql.config - this.configFrameworkDAO = new InfConfigDAOImpl(System.getProperty(ConfigConsts.APOLLO_JDBC_URL), - System.getProperty(ConfigConsts.APOLLO_JDBC_USERNAME), System.getProperty(ConfigConsts.APOLLO_JDBC_PASSWORD)); + this.configFrameworkDAO = createConfigFrameworkDAO(); // 初始化加载 this.trySync(); @@ -71,6 +75,18 @@ public class DBConfigRepository extends AbstractConfigRepository { INSTANCE = this; } + @SneakyThrows + private static ConfigFrameworkDAO createConfigFrameworkDAO() { + String dao = System.getProperty(ConfigConsts.APOLLO_JDBC_DAO); + String url = System.getProperty(ConfigConsts.APOLLO_JDBC_URL); + String username = System.getProperty(ConfigConsts.APOLLO_JDBC_USERNAME); + String password = System.getProperty(ConfigConsts.APOLLO_JDBC_PASSWORD); + // 创建 DBConfigRepository 对象 + Class clazz = ClassUtil.loadClass(dao); + Constructor constructor = ReflectUtil.getConstructor(clazz, String.class, String.class, String.class); + return constructor.newInstance(url, username, password); + } + /** * 通知同步， */ diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java index 86498fe74..47af6b5d3 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java @@ -23,8 +23,8 @@ public class ApolloApplicationContextInitializer implements EnvironmentPostProce private int order = DEFAULT_ORDER; - private static final String[] APOLLO_SYSTEM_PROPERTIES = {ConfigConsts.APOLLO_JDBC_URL, - ConfigConsts.APOLLO_JDBC_USERNAME, ConfigConsts.APOLLO_JDBC_PASSWORD}; + private static final String[] APOLLO_SYSTEM_PROPERTIES = {ConfigConsts.APOLLO_JDBC_DAO, + ConfigConsts.APOLLO_JDBC_URL, ConfigConsts.APOLLO_JDBC_USERNAME, ConfigConsts.APOLLO_JDBC_PASSWORD}; @Override public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { From d4cf20746349b753dd48036e330c8d9f31eb7902 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 29 Apr 2021 00:52:41 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 17 +++- .../service/config/InfConfigServiceTest.java | 6 +- .../service/file/InfFileServiceTest.java | 8 +- .../service/job/InfJobLogServiceTest.java | 8 +- .../infra/service/job/InfJobServiceTest.java | 8 +- .../InfApiAccessLogServiceImplTest.java | 4 +- .../logger/InfApiErrorLogServiceImplTest.java | 6 +- .../service/auth/SysAuthServiceImplTest.java | 6 +- .../auth/SysUserSessionServiceImplTest.java | 14 +-- .../service/common/SysCaptchaServiceTest.java | 2 +- .../service/dept/SysDeptServiceTest.java | 6 +- .../service/dept/SysPostServiceTest.java | 8 +- .../service/dict/SysDictDataServiceTest.java | 6 +- .../service/dict/SysDictTypeServiceTest.java | 6 +- .../errorcode/SysErrorCodeServiceTest.java | 6 +- .../logger/SysLoginLogServiceImplTest.java | 10 +-- .../logger/SysOperateLogServiceImplTest.java | 6 +- .../notice/SysNoticeServiceImplTest.java | 10 +-- .../permission/SysMenuServiceTest.java | 8 +- .../permission/SysPermissionServiceTest.java | 6 +- .../permission/SysRoleServiceTest.java | 6 +- .../service/sms/SysSmsChannelServiceTest.java | 4 +- .../service/sms/SysSmsLogServiceTest.java | 4 +- .../system/service/sms/SysSmsServiceTest.java | 6 +- .../sms/SysSmsTemplateServiceTest.java | 6 +- .../service/user/SysUserServiceImplTest.java | 6 +- yudao-dependencies/pom.xml | 89 +++++++++++++++++++ yudao-framework/pom.xml | 23 +---- .../test/core}/BaseMockitoUnitTest.java | 2 +- .../framework/test/package-info.java | 4 + .../util/{ => test}/AssertUtils.java | 2 +- .../util/{ => test}/RandomUtils.java | 2 +- .../impl/aliyun/AliyunSmsClientTest.java | 4 +- .../impl/aliyun/AliyunSmsCodeMappingTest.java | 2 +- .../impl/yunpian/YunpianSmsClientTest.java | 4 +- .../yunpian/YunpianSmsCodeMappingTest.java | 2 +- .../cn/iocoder/dashboard/package-info.java | 1 - 37 files changed, 197 insertions(+), 121 deletions(-) rename yudao-framework/src/{test/java/cn/iocoder/dashboard => main/java/cn/iocoder/dashboard/framework/test/core}/BaseMockitoUnitTest.java (82%) create mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java rename yudao-framework/src/main/java/cn/iocoder/dashboard/util/{ => test}/AssertUtils.java (98%) rename yudao-framework/src/main/java/cn/iocoder/dashboard/util/{ => test}/RandomUtils.java (98%) delete mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java diff --git a/pom.xml b/pom.xml index c2a18deb0..e911ac6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,9 @@ ${revision} pom - - - yudao-admin-server + yudao-dependencies yudao-framework + yudao-admin-server yudao @@ -23,4 +22,16 @@ 1.0.0 + + + + cn.iocoder.boot + yudao-dependencies + ${revision} + pom + import + + + + diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java index 12bcce62e..9f3f3f0b7 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigServiceTest.java @@ -23,9 +23,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.times; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java index 0445d1cb4..4507e9617 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/file/InfFileServiceTest.java @@ -16,10 +16,10 @@ import javax.annotation.Resource; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.FILE_NOT_EXISTS; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.FILE_PATH_EXISTS; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java index d6caa2a54..4539390b2 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobLogServiceTest.java @@ -1,10 +1,10 @@ package cn.iocoder.dashboard.modules.infra.service.job; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java index 22f4cc14c..9cb470071 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/job/InfJobServiceTest.java @@ -7,10 +7,10 @@ import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_HANDLER_EXISTS; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_NOT_EXISTS; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.JOB_UPDATE_ONLY_NORMAL_STATUS; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java index c08fee356..8e6e2a696 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiAccessLogServiceImplTest.java @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog.InfA import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiAccessLogDO; import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiAccessLogMapper; import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiAccessLogServiceImpl; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java index 4b9f46bc6..3240e5c83 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/infra/service/logger/InfApiErrorLogServiceImplTest.java @@ -11,7 +11,7 @@ import cn.iocoder.dashboard.modules.infra.dal.dataobject.logger.InfApiErrorLogDO import cn.iocoder.dashboard.modules.infra.dal.mysql.logger.InfApiErrorLogMapper; import cn.iocoder.dashboard.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; import cn.iocoder.dashboard.modules.infra.service.logger.impl.InfApiErrorLogServiceImpl; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; @@ -23,8 +23,8 @@ import java.util.concurrent.Future; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_NOT_FOUND; import static cn.iocoder.dashboard.modules.infra.enums.InfErrorCodeConstants.API_ERROR_LOG_PROCESSED; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java index 40b606836..aecba9e4f 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysAuthServiceImplTest.java @@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.service.common.SysCaptchaService; import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService; import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.AssertUtils; +import cn.iocoder.dashboard.util.test.AssertUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; @@ -28,8 +28,8 @@ import javax.annotation.Resource; import java.util.Set; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static java.util.Collections.singleton; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java index 740519430..3e5e17224 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionServiceImplTest.java @@ -1,11 +1,11 @@ package cn.iocoder.dashboard.modules.system.service.auth; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomDate; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomDate; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static cn.iocoder.dashboard.util.date.DateUtils.addTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -42,8 +42,8 @@ import cn.iocoder.dashboard.modules.system.service.auth.impl.SysUserSessionServi import cn.iocoder.dashboard.modules.system.service.dept.impl.SysDeptServiceImpl; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; import cn.iocoder.dashboard.modules.system.service.user.SysUserServiceImpl; -import cn.iocoder.dashboard.util.AssertUtils; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.AssertUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java index ed127442d..273065e47 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/common/SysCaptchaServiceTest.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import static cn.iocoder.dashboard.util.RandomUtils.randomString; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.*; @Import({SysCaptchaServiceImpl.class, CaptchaProperties.class, SysCaptchaRedisDAO.class}) diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java index 48a80056e..9d17c4cb3 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptServiceTest.java @@ -26,9 +26,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java index be8b3225d..b83937223 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostServiceTest.java @@ -21,10 +21,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java index 2874285e4..043220fc4 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataServiceTest.java @@ -26,9 +26,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java index 9dd072733..a554f0bfa 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeServiceTest.java @@ -22,9 +22,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java index c704dd6a0..84ca54130 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java @@ -27,9 +27,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java index 95f2d1985..e98ca5276 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogServiceImplTest.java @@ -1,11 +1,8 @@ package cn.iocoder.dashboard.modules.system.service.logger; -import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.ReflectUtil; import cn.iocoder.dashboard.BaseDbUnitTest; import cn.iocoder.dashboard.common.pojo.PageResult; -import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO; import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; @@ -15,18 +12,15 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper; import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum; import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysLoginLogServiceImpl; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; import javax.annotation.Resource; -import java.lang.reflect.Field; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java index b1529b609..0bf98b635 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogServiceImplTest.java @@ -16,7 +16,7 @@ import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper; import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum; import cn.iocoder.dashboard.modules.system.service.logger.impl.SysOperateLogServiceImpl; import cn.iocoder.dashboard.modules.system.service.user.SysUserService; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; @@ -27,8 +27,8 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java index 801ecea8c..c20013da2 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeServiceImplTest.java @@ -20,10 +20,10 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.NOTICE_NOT_FOUND; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.*; @Import(SysNoticeServiceImpl.class) @@ -161,4 +161,4 @@ class SysNoticeServiceImplTest extends BaseDbUnitTest { } -} \ No newline at end of file +} diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java index 9cefaada3..bff5f5b4b 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuServiceTest.java @@ -13,7 +13,7 @@ import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum; import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer; import cn.iocoder.dashboard.modules.system.service.permission.impl.SysMenuServiceImpl; import cn.iocoder.dashboard.util.sping.SpringAopUtils; -import cn.iocoder.dashboard.util.RandomUtils; +import cn.iocoder.dashboard.util.test.RandomUtils; import cn.iocoder.dashboard.util.object.ObjectUtils; import com.google.common.collect.Multimap; import org.junit.jupiter.api.Assertions; @@ -25,9 +25,9 @@ import javax.annotation.Resource; import java.util.*; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java index a4b5fa71e..9d974c7bd 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionServiceTest.java @@ -14,9 +14,9 @@ import org.springframework.context.annotation.Import; import javax.annotation.Resource; import java.util.List; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.randomLongId; -import static cn.iocoder.dashboard.util.RandomUtils.randomPojo; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomLongId; +import static cn.iocoder.dashboard.util.test.RandomUtils.randomPojo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java index ed647798a..682472881 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleServiceTest.java @@ -23,9 +23,9 @@ import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java index e1b7b145c..60980a235 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsChannelServiceTest.java @@ -25,8 +25,8 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_HAS_CHILDREN; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.SMS_CHANNEL_NOT_EXISTS; -import static cn.iocoder.dashboard.util.AssertUtils.*; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.*; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static cn.iocoder.dashboard.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java index b7152d1ba..0e1208b3d 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsLogServiceTest.java @@ -27,8 +27,8 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBoolean; import static cn.hutool.core.util.RandomUtil.randomEle; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java index f84e8753f..5391f117f 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.common.enums.UserTypeEnum; @@ -25,8 +25,8 @@ import java.util.Map; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java index f4bd9efa6..db6f06ce1 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsTemplateServiceTest.java @@ -34,9 +34,9 @@ import java.util.function.Consumer; import static cn.hutool.core.bean.BeanUtil.getFieldValue; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static cn.iocoder.dashboard.util.object.ObjectUtils.max; import static org.junit.jupiter.api.Assertions.*; diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java index bdb663f82..9f1b7d3c3 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImplTest.java @@ -35,9 +35,9 @@ import java.util.function.Consumer; import static cn.hutool.core.util.RandomUtil.randomBytes; import static cn.hutool.core.util.RandomUtil.randomEle; import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; -import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; -import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertPojoEquals; +import static cn.iocoder.dashboard.util.test.AssertUtils.assertServiceException; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.date.DateUtils.buildTime; import static org.assertj.core.util.Lists.newArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 829d67422..cc077bc0a 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -13,4 +13,93 @@ 基础 bom 文件，管理整个项目的依赖版本 https://github.com/YunaiV/ruoyi-vue-pro + + 1.0.0 + + 1.16.14 + 1.4.1.Final + 5.6.1 + 2.2.7 + 2.2 + 1.0.5 + + + 4.5.18 + 2.1.0 + 1.2.7 + + + + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + true + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.alibaba + easyexcel + ${easyexcel.verion} + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + cn.smallbun.screw + screw-core + ${screw.version} + + + + + + + com.yunpian.sdk + yunpian-java-sdk + ${yunpian-java-sdk.version} + + + + com.aliyun + aliyun-java-sdk-core + ${aliyun-java-sdk-core.version} + + + com.aliyun + aliyun-java-sdk-dysmsapi + ${aliyun-java-sdk-dysmsapi.version} + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 6278c533e..5f5713fd0 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -39,19 +39,9 @@ 8.5.0 6.1 2.3.1 - - 1.16.14 - 1.4.1.Final - 5.6.1 - 2.2.7 - 2.2 - 1.0.5 + 7.2.6.RELEASE 0.1.16 - - 4.5.18 - 2.1.0 - 1.2.7 @@ -250,48 +240,40 @@ org.projectlombok lombok - ${lombok.version} org.mapstruct mapstruct - ${mapstruct.version} org.mapstruct mapstruct-processor - ${mapstruct.version} true org.mapstruct mapstruct-jdk8 - ${mapstruct.version} cn.hutool hutool-all - ${hutool.version} com.alibaba easyexcel - ${easyexcel.verion} org.apache.velocity velocity-engine-core - ${velocity.version} cn.smallbun.screw screw-core - ${screw.version} @@ -300,18 +282,15 @@ com.yunpian.sdk yunpian-java-sdk - ${yunpian-java-sdk.version} com.aliyun aliyun-java-sdk-core - ${aliyun-java-sdk-core.version} com.aliyun aliyun-java-sdk-dysmsapi - ${aliyun-java-sdk-dysmsapi.version} diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java similarity index 82% rename from yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java index 4a595b24e..eb909a846 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/BaseMockitoUnitTest.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard; +package cn.iocoder.dashboard.framework.test.core; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java new file mode 100644 index 000000000..6e2073812 --- /dev/null +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java @@ -0,0 +1,4 @@ +/** + * 单元测试、集成测试的拓展 + */ +package cn.iocoder.dashboard.framework.test; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java similarity index 98% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java index 0d6987549..c845216fe 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/AssertUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/AssertUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util; +package cn.iocoder.dashboard.util.test; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java similarity index 98% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java rename to yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java index 51cd61f89..9ff8d1c4c 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/RandomUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.util; +package cn.iocoder.dashboard.util.test; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index a544d03d5..89c1d597b 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -29,7 +29,7 @@ import java.util.List; import java.util.function.Function; import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static cn.iocoder.dashboard.util.json.JsonUtils.toJsonString; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java index 54dba079b..67db4308d 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java index 3e4190c0a..0d1232e67 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; -import static cn.iocoder.dashboard.util.RandomUtils.*; +import static cn.iocoder.dashboard.util.test.RandomUtils.*; import static com.yunpian.sdk.constant.Code.OK; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java index de6e46432..261bc0d22 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; -import cn.iocoder.dashboard.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java deleted file mode 100644 index f49464f8e..000000000 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.dashboard; From 21e3475d82f1c51edfa11dc9e7cbbf381ab063a3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 29 Apr 2021 02:07:27 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-admin-server/pom.xml | 96 +++++++++++++++++++++++---------- yudao-dependencies/pom.xml | 106 +++++++++++++++++++++++++++++++++++-- yudao-framework/pom.xml | 73 +++++-------------------- 3 files changed, 183 insertions(+), 92 deletions(-) diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 7b3bb7925..745cdb5f9 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,22 +16,15 @@ 1.0.0 - 2.4.4 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - + + 3.8.0 + + 2.4.4 + + 1.16.14 + 1.4.1.Final + @@ -40,49 +33,96 @@ ${revision} + + + org.projectlombok + lombok + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.mapstruct + mapstruct-processor + true + + + + cn.hutool + hutool-all + + + org.springframework.boot spring-boot-starter-test - 2.4.4 test - - - asm - org.ow2.asm - - com.h2database h2 - test + test com.github.fppt jedis-mock - 0.1.16 test uk.co.jemos.podam podam - 7.2.6.RELEASE test - + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + org.apache.maven.plugins maven-compiler-plugin + ${maven-compiler-plugin.version} - 8 - 8 + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index cc077bc0a..1fa837011 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -15,6 +15,19 @@ 1.0.0 + + UTF-8 + UTF-8 + @ + 1.8 + ${java.version} + ${java.version} + 3.8.0 + + 2.4.4 + + 7.2.6.RELEASE + 0.1.16 1.16.14 1.4.1.Final @@ -22,7 +35,6 @@ 2.2.7 2.2 1.0.5 - 4.5.18 2.1.0 @@ -31,11 +43,51 @@ + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-starter-test + ${spring.boot.version} + test + + + asm + org.ow2.asm + + + + + + com.github.fppt + jedis-mock + ${jedis-mock.version} + test + + + + uk.co.jemos.podam + podam + ${podam.version} + test + + org.projectlombok lombok ${lombok.version} + true @@ -45,14 +97,14 @@ org.mapstruct - mapstruct-processor + mapstruct-jdk8 ${mapstruct.version} - true org.mapstruct - mapstruct-jdk8 + mapstruct-processor ${mapstruct.version} + true @@ -102,4 +154,50 @@ + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 5f5713fd0..23d3aa348 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -39,25 +39,8 @@ 8.5.0 6.1 2.3.1 - - 7.2.6.RELEASE - 0.1.16 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - @@ -205,34 +188,27 @@ org.springframework.boot spring-boot-starter-test - + provided true - - - asm - org.ow2.asm - - com.h2database h2 - test + true com.github.fppt jedis-mock - ${jedis-mock.version} - test + provided + true uk.co.jemos.podam podam - ${podam.version} - + provided true @@ -248,12 +224,11 @@ org.mapstruct - mapstruct-processor - true + mapstruct-jdk8 org.mapstruct - mapstruct-jdk8 + mapstruct-processor @@ -264,16 +239,19 @@ com.alibaba easyexcel + true org.apache.velocity velocity-engine-core + true cn.smallbun.screw screw-core + true @@ -282,15 +260,18 @@ com.yunpian.sdk yunpian-java-sdk + true com.aliyun aliyun-java-sdk-core + true com.aliyun aliyun-java-sdk-dysmsapi + true @@ -304,40 +285,12 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - From c4cbd730dbc0198c57668e1b24ca6e64b51a52b0 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 29 Apr 2021 09:49:08 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=207=20:=20=E6=9C=89=E7=82=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 54 ++++++++++ yudao-admin-server/pom.xml | 103 +++++++------------ yudao-dependencies/pom.xml | 204 ++++++++++++++++++++++++++++--------- yudao-framework/pom.xml | 42 +------- 4 files changed, 246 insertions(+), 157 deletions(-) diff --git a/pom.xml b/pom.xml index e911ac6c3..b28d0956d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,14 @@ 1.0.0 + + + 3.8.0 + + 2.4.4 + + 1.16.14 + 1.4.1.Final @@ -34,4 +42,50 @@ + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 745cdb5f9..c79695d19 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,46 +16,25 @@ 1.0.0 - - - 3.8.0 - - 2.4.4 - - 1.16.14 - 1.4.1.Final + + mysql + mysql-connector-java + 5.1.46 + + cn.iocoder.boot yudao-framework ${revision} - - - - - org.projectlombok - lombok - - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - org.mapstruct - mapstruct-processor - true - - - - cn.hutool - hutool-all + + + mysql + mysql-connector-java + + @@ -82,48 +61,36 @@ podam test + + + + org.projectlombok + lombok + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.mapstruct + mapstruct-processor + + + + ${project.artifactId} + - org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 1fa837011..bacb5a1f0 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -25,6 +25,21 @@ 3.8.0 2.4.4 + + 5.1.46 + 1.2.4 + 3.4.2 + 3.3.2 + 3.15.1 + + 1.7.0 + + + 2.2.0 + 1.7.0 + + 8.5.0 + 2.3.1 7.2.6.RELEASE 0.1.16 @@ -50,16 +65,111 @@ ${spring.boot.version} pom import + + + mysql + mysql-connector-java + + + + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + + + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + + com.ctrip.framework.apollo + apollo-client + ${apollo.version} + + + + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + redisson-spring-boot-starter + org.redisson + + + + + + io.github.resilience4j + resilience4j-spring-boot2 + ${resilience4j.version} + + + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-logback-1.x + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-opentracing + ${skywalking.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + org.springframework.boot spring-boot-starter-test ${spring.boot.version} - test asm @@ -72,14 +182,12 @@ com.github.fppt jedis-mock ${jedis-mock.version} - test uk.co.jemos.podam podam ${podam.version} - test @@ -87,7 +195,6 @@ org.projectlombok lombok ${lombok.version} - true @@ -104,7 +211,6 @@ org.mapstruct mapstruct-processor ${mapstruct.version} - true @@ -154,50 +260,50 @@ - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - - + + + + + + + + + + + + + + + + + + + - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 23d3aa348..d9029813f 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -24,21 +24,7 @@ 3.0.2 1.5.22 - - 5.1.46 - 1.2.4 - 3.4.2 - 3.3.2 - 3.15.1 - - 1.7.0 - - 2.2.0 - 1.7.0 - - 8.5.0 - 6.1 - 2.3.1 + @@ -100,35 +86,30 @@ mysql mysql-connector-java - ${mysql-connector-java.version} + 5.1.46 com.alibaba druid-spring-boot-starter - ${druid.version} com.baomidou mybatis-plus-boot-starter - ${mybatis-plus.version} com.baomidou dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} org.redisson redisson-spring-boot-starter - ${redisson.version} com.ctrip.framework.apollo apollo-client - ${apollo.version} @@ -141,47 +122,34 @@ com.baomidou lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - io.github.resilience4j resilience4j-spring-boot2 - ${resilience4j.version} org.apache.skywalking apm-toolkit-trace - ${skywalking.version} org.apache.skywalking apm-toolkit-logback-1.x - ${skywalking.version} org.apache.skywalking apm-toolkit-opentracing - ${skywalking.version} de.codecentric spring-boot-admin-starter-server - ${spring-boot-admin.version} de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin.version} @@ -239,19 +207,16 @@ com.alibaba easyexcel - true org.apache.velocity velocity-engine-core - true cn.smallbun.screw screw-core - true @@ -260,18 +225,15 @@ com.yunpian.sdk yunpian-java-sdk - true com.aliyun aliyun-java-sdk-core - true com.aliyun aliyun-java-sdk-dysmsapi - true From c37d5d7f1da966eacef0f1f96d588e9bfda80c59 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 29 Apr 2021 22:42:10 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=208=20:=20=E8=87=AA=E9=97=AD=201024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 54 ------------------------ yudao-admin-server/pom.xml | 47 ++------------------- yudao-dependencies/pom.xml | 85 +++++++++++++++++--------------------- yudao-framework/pom.xml | 40 ------------------ 4 files changed, 43 insertions(+), 183 deletions(-) diff --git a/pom.xml b/pom.xml index b28d0956d..e911ac6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,14 +20,6 @@ 1.0.0 - - - 3.8.0 - - 2.4.4 - - 1.16.14 - 1.4.1.Final @@ -42,50 +34,4 @@ - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - - - - - - - diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index c79695d19..e9a5ed279 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,25 +16,17 @@ 1.0.0 + + 1.8 + ${java.version} + ${java.version} - - mysql - mysql-connector-java - 5.1.46 - - cn.iocoder.boot yudao-framework ${revision} - - - mysql - mysql-connector-java - - @@ -62,37 +54,6 @@ test - - - org.projectlombok - lombok - - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - org.mapstruct - mapstruct-processor - - - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index bacb5a1f0..227a0ed7c 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -25,6 +25,9 @@ 3.8.0 2.4.4 + + 3.0.2 + 1.5.22 5.1.46 1.2.4 @@ -81,6 +84,32 @@ ${spring.boot.version} + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + mapstruct + org.mapstruct + + + guava + com.google.guava + + + swagger-annotations + io.swagger + + + + + io.swagger + swagger-annotations + ${swagger-annotations.version} + + mysql @@ -250,6 +279,16 @@ com.aliyun aliyun-java-sdk-core ${aliyun-java-sdk-core.version} + + + opentracing-api + io.opentracing + + + opentracing-noop + io.opentracing + + com.aliyun @@ -260,50 +299,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index d9029813f..9d989197f 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -19,12 +19,6 @@ ${java.version} ${java.version} 3.8.0 - - 2.4.4 - - 3.0.2 - 1.5.22 - @@ -60,26 +54,10 @@ com.github.xiaoymin knife4j-spring-boot-starter - ${knife4j.version} - - - mapstruct - org.mapstruct - - - guava - com.google.guava - - - swagger-annotations - io.swagger - - io.swagger swagger-annotations - ${swagger-annotations.version} @@ -239,22 +217,4 @@ - - - ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - From 1fe8d1cc8962f0022e8173d6d5d11c6e6fe98178 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 29 Apr 2021 23:57:12 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=208=20:=20=E8=B2=8C=E4=BC=BC=E4=B8=8D?= =?UTF-8?q?=E8=87=AA=E9=97=AD=E4=BA=86=202048?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- yudao-admin-server/pom.xml | 33 +++++++++++++++---- .../src/test/resources/logback-spring.xml | 4 +++ yudao-dependencies/pom.xml | 2 +- yudao-framework/pom.xml | 5 +++ .../framework/test/package-info.java | 4 --- .../framework}/BaseMockitoUnitTest.java | 2 +- .../dashboard/framework/package-info.java | 1 - .../impl/aliyun/AliyunSmsClientTest.java | 2 +- .../impl/aliyun/AliyunSmsCodeMappingTest.java | 2 +- .../impl/yunpian/YunpianSmsClientTest.java | 2 +- .../yunpian/YunpianSmsCodeMappingTest.java | 2 +- 12 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 yudao-admin-server/src/test/resources/logback-spring.xml delete mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java rename yudao-framework/src/{main/java/cn/iocoder/dashboard/framework/test/core => test/java/cn/iocoder/dashboard/framework}/BaseMockitoUnitTest.java (82%) delete mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java diff --git a/pom.xml b/pom.xml index e911ac6c3..c4094b83b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ yudao-admin-server - yudao + ${artifactId} 芋道项目基础脚手架 https://github.com/YunaiV/ruoyi-vue-pro diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index e9a5ed279..23082c6b5 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -2,12 +2,14 @@ + + cn.iocoder.boot + yudao + ${revision} + 4.0.0 - cn.iocoder.boot yudao-admin-server - ${revision} - jar yudao-admin-server @@ -15,8 +17,6 @@ https://github.com/YunaiV/ruoyi-vue-pro - 1.0.0 - 1.8 ${java.version} ${java.version} @@ -53,7 +53,28 @@ podam test - + + + ${artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + repackage + + + + + + + diff --git a/yudao-admin-server/src/test/resources/logback-spring.xml b/yudao-admin-server/src/test/resources/logback-spring.xml new file mode 100644 index 000000000..daf756bff --- /dev/null +++ b/yudao-admin-server/src/test/resources/logback-spring.xml @@ -0,0 +1,4 @@ + + + + diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 227a0ed7c..4d94b1291 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -9,7 +9,7 @@ ${revision} pom - yudao-dependencies + ${artifactId} 基础 bom 文件，管理整个项目的依赖版本 https://github.com/YunaiV/ruoyi-vue-pro diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 9d989197f..76d4839f1 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -10,6 +10,11 @@ 4.0.0 yudao-framework + jar + + ${artifactId} + 基础框架，各种组件的拓展 + https://github.com/YunaiV/ruoyi-vue-pro UTF-8 diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java deleted file mode 100644 index 6e2073812..000000000 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 单元测试、集成测试的拓展 - */ -package cn.iocoder.dashboard.framework.test; diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java similarity index 82% rename from yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java index eb909a846..15d6a5285 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java @@ -1,4 +1,4 @@ -package cn.iocoder.dashboard.framework.test.core; +package cn.iocoder.dashboard.framework; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java deleted file mode 100644 index 0274647fb..000000000 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.dashboard.framework; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java index 89c1d597b..3f407af62 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java index 67db4308d..42c98716b 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java index 0d1232e67..d6b412daf 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; import cn.hutool.core.util.ReflectUtil; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult; diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java index 261bc0d22..aaf200d55 100644 --- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java +++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java @@ -1,6 +1,6 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants; import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants; import org.junit.jupiter.api.Test; From 35f1eb95b6add62df4bd167bd1136dc91dcedaf3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 30 Apr 2021 00:35:04 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=209=20:=20=E5=88=86=E6=8B=86=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=9E=9A=E4=B8=BE=E5=88=86?= =?UTF-8?q?=E6=8B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++ yudao-admin-server/pom.xml | 6 --- ...ation.java => AdminServerApplication.java} | 4 +- .../config/vo/InfConfigExcelVO.java | 6 +-- .../controller/job/vo/job/InfJobExcelVO.java | 5 +-- .../job/vo/log/InfJobLogExcelVO.java | 4 +- .../apiaccesslog/InfApiAccessLogExcelVO.java | 5 +-- .../vo/apierrorlog/InfApiErrorLogExcelVO.java | 9 ++--- .../infra/enums/InfDictTypeConstants.java | 19 +++++++++ .../dept/vo/post/SysPostExcelVO.java | 5 +-- .../dict/vo/data/SysDictDataExcelVO.java | 5 +-- .../dict/vo/type/SysDictTypeExcelVO.java | 5 +-- .../errorcode/vo/SysErrorCodeExcelVO.java | 5 +-- .../vo/loginlog/SysLoginLogExcelVO.java | 4 +- .../vo/operatelog/SysOperateLogExcelVO.java | 4 +- .../permission/vo/role/SysRoleExcelVO.java | 4 +- .../sms/vo/log/SysSmsLogExcelVO.java | 11 +++--- .../vo/template/SysSmsTemplateExcelVO.java | 9 ++--- .../user/vo/user/SysUserExcelVO.java | 8 ++-- .../user/vo/user/SysUserImportExcelVO.java | 6 +-- .../system/enums/SysDictTypeConstants.java | 25 ++++++++++++ .../test/vo/ToolTestDemoExcelVO.java | 10 ++--- .../codegen/impl/ToolCodegenEngine.java | 4 +- .../system/service/sms/SysSmsServiceTest.java | 2 +- yudao-dependencies/pom.xml | 8 ---- yudao-framework/pom.xml | 10 ----- .../excel/core/annotations/DictFormat.java | 9 +++-- .../excel/core/convert/DictConvert.java | 11 +++--- .../system/enums/dict/SysDictTypeEnum.java | 39 ------------------- 29 files changed, 111 insertions(+), 135 deletions(-) rename yudao-admin-server/src/main/java/cn/iocoder/dashboard/{DashboardApplication.java => AdminServerApplication.java} (68%) create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java delete mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java diff --git a/pom.xml b/pom.xml index c4094b83b..2d8cd6cf8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,10 @@ 1.0.0 + + 1.8 + ${java.version} + ${java.version} diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 23082c6b5..dc30b5234 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,12 +16,6 @@ 管理后台 Server，提供其 API 接口 https://github.com/YunaiV/ruoyi-vue-pro - - 1.8 - ${java.version} - ${java.version} - - cn.iocoder.boot diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java similarity index 68% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java index 3161e147a..60fd641a2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java @@ -4,10 +4,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class DashboardApplication { +public class AdminServerApplication { public static void main(String[] args) { - SpringApplication.run(DashboardApplication.class, args); + SpringApplication.run(AdminServerApplication.class, args); } } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java index a11de329c..0a572ce8c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config.vo; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -30,11 +30,11 @@ public class InfConfigExcelVO { private String value; @ExcelProperty(value = "参数类型", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_CONFIG_TYPE) + @DictFormat(SysDictTypeConstants.CONFIG_TYPE) private Integer type; @ExcelProperty(value = "是否敏感", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_BOOLEAN_STRING) + @DictFormat(SysDictTypeConstants.BOOLEAN_STRING) private Boolean sensitive; @ExcelProperty("备注") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java index 531dd843d..b4fa6856a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.infra.controller.job.vo.job; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.INF_JOB_STATUS; - /** * 定时任务 Excel VO * @@ -24,7 +23,7 @@ public class InfJobExcelVO { private String name; @ExcelProperty(value = "任务状态", converter = DictConvert.class) - @DictFormat(INF_JOB_STATUS) + @DictFormat(InfDictTypeConstants.JOB_STATUS) private Integer status; @ExcelProperty("处理器的名字") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java index 6f6d829f9..ca8b25d1b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job.vo.log; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -41,7 +41,7 @@ public class InfJobLogExcelVO { private Integer duration; @ExcelProperty(value = "任务状态", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.INF_JOB_STATUS) + @DictFormat(InfDictTypeConstants.JOB_STATUS) private Integer status; @ExcelProperty("结果数据") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java index 9d2f4b1c6..9181da0e4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.USER_TYPE; - /** * API 访问日志 Excel VO * @@ -27,7 +26,7 @@ public class InfApiAccessLogExcelVO { private Long userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(USER_TYPE) + @DictFormat(SysDictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty("应用名") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java index ddf52a1ab..7d722fb93 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java @@ -2,14 +2,13 @@ package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.INF_API_ERROR_LOG_PROCESS_STATUS; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.USER_TYPE; - /** * API 错误日志 Excel VO * @@ -28,7 +27,7 @@ public class InfApiErrorLogExcelVO { private Integer userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(USER_TYPE) + @DictFormat(SysDictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty("应用名") @@ -80,7 +79,7 @@ public class InfApiErrorLogExcelVO { private Date createTime; @ExcelProperty(value = "处理状态", converter = DictConvert.class) - @DictFormat(INF_API_ERROR_LOG_PROCESS_STATUS) + @DictFormat(InfDictTypeConstants.API_ERROR_LOG_PROCESS_STATUS) private Integer processStatus; @ExcelProperty("处理时间") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java new file mode 100644 index 000000000..d229ec942 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java @@ -0,0 +1,19 @@ +package cn.iocoder.dashboard.modules.infra.enums; + +/** + * Infra 字典类型的枚举类 + * + * @author 芋道源码 + */ +public interface InfDictTypeConstants { + + String REDIS_TIMEOUT_TYPE = "inf_redis_timeout_type"; // Redis 超时类型 + + String JOB_STATUS = "inf_job_status"; // 定时任务状态的枚举 + String JOB_LOG_STATUS = "inf_job_log_status"; // 定时任务日志状态的枚举 + + String API_ERROR_LOG_PROCESS_STATUS = "inf_api_error_log_process_status"; // API 错误日志的处理状态的枚举 + + String ERROR_CODE_TYPE = "inf_error_code_type"; // 错误码的类型枚举 + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java index 74afa919e..d31b4a57f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java @@ -2,11 +2,10 @@ package cn.iocoder.dashboard.modules.system.controller.dept.vo.post; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; - /** * 岗位 Excel 导出响应 VO */ @@ -26,7 +25,7 @@ public class SysPostExcelVO { private Integer sort; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private String status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java index 3266d39cf..f137b0ede 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java @@ -2,11 +2,10 @@ package cn.iocoder.dashboard.modules.system.controller.dict.vo.data; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; - /** * 字典数据 Excel 导出响应 VO */ @@ -29,7 +28,7 @@ public class SysDictDataExcelVO { private String dictType; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java index b8a9d3d4e..d3b47c4ba 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java @@ -2,11 +2,10 @@ package cn.iocoder.dashboard.modules.system.controller.dict.vo.type; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; - /** * 字典类型 Excel 导出响应 VO */ @@ -23,7 +22,7 @@ public class SysDictTypeExcelVO { private String type; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java index 81461103e..43b8b7f9e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode.vo; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_ERROR_CODE_TYPE; - /** * 错误码 Excel VO * @@ -21,7 +20,7 @@ public class SysErrorCodeExcelVO { private Long id; @ExcelProperty(value = "错误码类型", converter = DictConvert.class) - @DictFormat(SYS_ERROR_CODE_TYPE) + @DictFormat(InfDictTypeConstants.ERROR_CODE_TYPE) private Integer type; @ExcelProperty("应用名") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java index 225f91b1f..c41a94229 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -21,7 +21,7 @@ public class SysLoginLogExcelVO { private String username; @ExcelProperty(value = "登陆结果", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_LOGIN_RESULT) + @DictFormat(SysDictTypeConstants.LOGIN_RESULT) private Integer result; @ExcelProperty("登陆 IP") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java index 475d31338..74c35ae9a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -24,7 +24,7 @@ public class SysOperateLogExcelVO { private String name; @ExcelProperty(value = "操作类型", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_OPERATE_TYPE) + @DictFormat(SysDictTypeConstants.OPERATE_TYPE) private String type; @ExcelProperty("操作人") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java index 44d92a156..a352090e2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -28,7 +28,7 @@ public class SysRoleExcelVO { private Integer dataScope; @ExcelProperty(value = "角色状态", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private String status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java index 6a385feba..f1f276112 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java @@ -3,14 +3,13 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.log; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; import cn.iocoder.dashboard.framework.excel.core.convert.JsonConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; import java.util.Map; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.*; - /** * 短信日志 Excel VO * @@ -35,7 +34,7 @@ public class SysSmsLogExcelVO { private String templateCode; @ExcelProperty(value = "短信类型", converter = DictConvert.class) - @DictFormat(SYS_SMS_TEMPLATE_TYPE) + @DictFormat(SysDictTypeConstants.SMS_TEMPLATE_TYPE) private Integer templateType; @ExcelProperty("短信内容") @@ -54,11 +53,11 @@ public class SysSmsLogExcelVO { private Long userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(USER_TYPE) + @DictFormat(SysDictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty(value = "发送状态", converter = DictConvert.class) - @DictFormat(SYS_SMS_SEND_STATUS) + @DictFormat(SysDictTypeConstants.SMS_SEND_STATUS) private Integer sendStatus; @ExcelProperty("发送时间") @@ -83,7 +82,7 @@ public class SysSmsLogExcelVO { private String apiSerialNo; @ExcelProperty(value = "接收状态", converter = DictConvert.class) - @DictFormat(SYS_SMS_RECEIVE_STATUS) + @DictFormat(SysDictTypeConstants.SMS_RECEIVE_STATUS) private Integer receiveStatus; @ExcelProperty("接收时间") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java index 3eef8133b..854f7ddf5 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.template; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.*; - /** * 短信模板 Excel VO * @@ -21,11 +20,11 @@ public class SysSmsTemplateExcelVO { private Long id; @ExcelProperty(value = "短信签名", converter = DictConvert.class) - @DictFormat(SYS_SMS_TEMPLATE_TYPE) + @DictFormat(SysDictTypeConstants.SMS_TEMPLATE_TYPE) private Integer type; @ExcelProperty(value = "开启状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty("模板编码") @@ -47,7 +46,7 @@ public class SysSmsTemplateExcelVO { private Long channelId; @ExcelProperty(value = "短信渠道编码", converter = DictConvert.class) - @DictFormat(SYS_SMS_CHANNEL_CODE) + @DictFormat(SysDictTypeConstants.SMS_CHANNEL_CODE) private String channelCode; @ExcelProperty("创建时间") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java index 37253ac4a..16167ae0b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java @@ -2,14 +2,12 @@ package cn.iocoder.dashboard.modules.system.controller.user.vo.user; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_USER_SEX; - /** * 用户 Excel 导出 VO */ @@ -32,11 +30,11 @@ public class SysUserExcelVO { private String mobile; @ExcelProperty(value = "用户性别", converter = DictConvert.class) - @DictFormat(SYS_USER_SEX) + @DictFormat(SysDictTypeConstants.USER_SEX) private Integer sex; @ExcelProperty(value = "帐号状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty("最后登录IP") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java index b50b8942d..7c52bc62d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.user.vo.user; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -34,11 +34,11 @@ public class SysUserImportExcelVO { private String mobile; @ExcelProperty(value = "用户性别", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_USER_SEX) + @DictFormat(SysDictTypeConstants.USER_SEX) private Integer sex; @ExcelProperty(value = "账号状态", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java new file mode 100644 index 000000000..69bdc064e --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java @@ -0,0 +1,25 @@ +package cn.iocoder.dashboard.modules.system.enums; + +/** + * System 字典类型的枚举类 + * + * @author 芋道源码 + */ +public interface SysDictTypeConstants { + + String USER_TYPE = "user_type"; // 用户类型 + String COMMON_STATUS = "sys_common_status"; // 系统状态 + + String USER_SEX = "sys_user_sex"; // 用户性别 + String OPERATE_TYPE = "sys_operate_type"; // 操作类型 + String LOGIN_RESULT = "sys_login_result"; // 登陆结果 + String CONFIG_TYPE = "sys_config_type"; // 参数配置类型 + String BOOLEAN_STRING = "sys_boolean_string"; // Boolean 是否类型 + + String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码 + String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型 + String SMS_SEND_STATUS = "sys_sms_send_status"; // 短信发送状态 + String SMS_RECEIVE_STATUS = "sys_sms_receive_status"; // 短信接收状态 + + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java index 5bd575299..525db8c4b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java @@ -2,13 +2,13 @@ package cn.iocoder.dashboard.modules.tool.controller.test.vo; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.*; - /** * 测试示例 Excel VO * @@ -24,15 +24,15 @@ public class ToolTestDemoExcelVO { private String name; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty(value = "类型", converter = DictConvert.class) - @DictFormat(SYS_OPERATE_TYPE) + @DictFormat(SysDictTypeConstants.OPERATE_TYPE) private Integer type; @ExcelProperty(value = "分类", converter = DictConvert.class) - @DictFormat(INF_REDIS_TIMEOUT_TYPE) + @DictFormat(InfDictTypeConstants.REDIS_TIMEOUT_TYPE) private Integer category; @ExcelProperty("备注") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java index 7ccf26001..7c61c9988 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java @@ -18,7 +18,6 @@ import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEn import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; import cn.iocoder.dashboard.util.collection.CollectionUtils; @@ -126,7 +125,8 @@ public class ToolCodegenEngine { // VO 类，独有字段 globalBindingMap.put("PageParamClassName", PageParam.class.getName()); globalBindingMap.put("DictFormatClassName", DictFormat.class.getName()); - globalBindingMap.put("SysDictTypeEnumClassName", SysDictTypeEnum.class.getName()); + // TODO 芋艿：代码生成器，解决下枚举类 +// globalBindingMap.put("SysDictTypeEnumClassName", SysDictTypeEnum.class.getName()); // DO 类，独有字段 globalBindingMap.put("baseDOFields", ToolCodegenBuilder.BASE_DO_FIELDS); globalBindingMap.put("BaseDOClassName", BaseDO.class.getName()); diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java index 5391f117f..7b944275a 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.common.enums.UserTypeEnum; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 4d94b1291..e2d8c106d 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -15,14 +15,6 @@ 1.0.0 - - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 2.4.4 diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 76d4839f1..2c06091e9 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -16,16 +16,6 @@ 基础框架，各种组件的拓展 https://github.com/YunaiV/ruoyi-vue-pro - - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 - - diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java index 8eefcafaf..ae397346a 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java @@ -1,7 +1,5 @@ package cn.iocoder.dashboard.framework.excel.core.annotations; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; - import java.lang.annotation.*; /** @@ -14,6 +12,11 @@ import java.lang.annotation.*; @Inherited public @interface DictFormat { - SysDictTypeEnum value(); + /** + * 例如说，SysDictTypeConstants、InfDictTypeConstants + * + * @return 字典类型 + */ + String value(); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java index 90e13c3c0..c16c66944 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java @@ -5,7 +5,6 @@ import cn.hutool.core.convert.Convert; import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.framework.dict.core.util.DictUtils; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.CellData; @@ -35,9 +34,9 @@ public class DictConvert implements Converter { public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { // 使用字典解析 - SysDictTypeEnum type = getType(contentProperty); + String type = getType(contentProperty); String label = cellData.getStringValue(); - DictDataRespDTO dictData = DictUtils.parseDictDataFromCache(type.getValue(), label); + DictDataRespDTO dictData = DictUtils.parseDictDataFromCache(type, label); if (dictData == null) { log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label); return null; @@ -56,9 +55,9 @@ public class DictConvert implements Converter { } // 使用字典格式化 - SysDictTypeEnum type = getType(contentProperty); + String type = getType(contentProperty); String value = String.valueOf(object); - DictDataRespDTO dictData = DictUtils.getDictDataFromCache(type.getValue(), value); + DictDataRespDTO dictData = DictUtils.getDictDataFromCache(type, value); if (dictData == null) { log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); return new CellData<>(""); @@ -67,7 +66,7 @@ public class DictConvert implements Converter { return new CellData<>(dictData.getLabel()); } - private static SysDictTypeEnum getType(ExcelContentProperty contentProperty) { + private static String getType(ExcelContentProperty contentProperty) { return contentProperty.getField().getAnnotation(DictFormat.class).value(); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java deleted file mode 100644 index 59e6d0d13..000000000 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.dashboard.modules.system.enums.dict; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 字典类型的类型枚举 - */ -@Getter -@AllArgsConstructor -public enum SysDictTypeEnum { - - USER_TYPE("user_type"), // 用户类型 - - SYS_USER_SEX("sys_user_sex"), // 用户性别 - SYS_COMMON_STATUS("sys_common_status"), // 系统状态 - SYS_OPERATE_TYPE("sys_operate_type"), // 操作类型 - SYS_LOGIN_RESULT("sys_login_result"), // 登陆结果 - SYS_CONFIG_TYPE("sys_config_type"), // 参数配置类型 - SYS_BOOLEAN_STRING("sys_boolean_string"), // Boolean 是否类型 - SYS_SMS_CHANNEL_CODE("sys_sms_channel_code"), // 短信渠道编码 - SYS_SMS_TEMPLATE_TYPE("sys_sms_template_type"), // 短信模板类型 - SYS_SMS_SEND_STATUS("sys_sms_send_status"), // 短信发送状态 - SYS_SMS_RECEIVE_STATUS("sys_sms_receive_status"), // 短信接收状态 - SYS_ERROR_CODE_TYPE("inf_error_code_type"), // 错误码的类型枚举 - - INF_REDIS_TIMEOUT_TYPE("inf_redis_timeout_type"), // Redis 超时类型 - INF_JOB_STATUS("inf_job_status"), // 定时任务状态的枚举 - INF_JOB_LOG_STATUS("inf_job_log_status"), // 定时任务日志状态的枚举 - INF_API_ERROR_LOG_PROCESS_STATUS("inf_api_error_log_process_status"), // API 错误日志的处理状态的枚举 - ; - - - /** - * 值 - */ - private final String value; - -} From d5883771c81212eedd11be8738ae5bfc183307be Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 30 Apr 2021 09:44:36 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=2010=20:=20=E4=BD=BF=E7=94=A8=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E4=BA=91=E7=9A=84=E6=BA=90=EF=BC=9B=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +++++++++ yudao-admin-server/pom.xml | 11 +++++++++++ .../service/auth/impl/SysAuthServiceImpl.java | 2 +- yudao-dependencies/pom.xml | 19 +++++++++++++++++++ yudao-framework/pom.xml | 16 ++++++++++++++++ .../dashboard/util/test/RandomUtils.java | 2 +- 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d8cd6cf8..d1a3e1291 100644 --- a/pom.xml +++ b/pom.xml @@ -38,4 +38,13 @@ + + + + aliyun + aliyun + http://maven.aliyun.com/nexus/content/groups/public + + + diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index dc30b5234..8c09991c4 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -68,6 +68,17 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M5 + diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java index 768dec9a8..40eb79ae3 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java @@ -85,7 +85,7 @@ public class SysAuthServiceImpl implements SysAuthService { @Override public String login(SysAuthLoginReqVO reqVO, String userIp, String userAgent) { // 判断验证码是否正确 -// this.verifyCaptcha(reqVO.getUsername(), reqVO.getUuid(), reqVO.getCode()); + this.verifyCaptcha(reqVO.getUsername(), reqVO.getUuid(), reqVO.getCode()); // 使用账号密码，进行登陆。 LoginUser loginUser = this.login0(reqVO.getUsername(), reqVO.getPassword()); diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index e2d8c106d..6b076f2db 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -49,6 +49,8 @@ 4.5.18 2.1.0 1.2.7 + + 3.0.0-M5 @@ -291,4 +293,21 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-surefire-plugin.version} + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 2c06091e9..55b813c83 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -212,4 +212,20 @@ + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M5 + + + diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java index 9ff8d1c4c..f5712500a 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java @@ -92,7 +92,7 @@ public class RandomUtils { @SafeVarargs public static List randomPojoList(Class clazz, Consumer... consumers) { - int size = RandomUtil.randomInt(0, RANDOM_COLLECTION_LENGTH); + int size = RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH); return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers)) .collect(Collectors.toList()); } From f336b801b9bbf86a695dd09c9ffbe6ad24b5b1dc Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 30 Apr 2021 14:15:31 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20x=2011=20:=20=E4=BF=AE=E6=94=B9=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B9=E7=9B=AE=E4=B8=BA=20yudao-admin-ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 + yudao-admin-server/pom.xml | 11 - {ruoyi-ui => yudao-admin-ui}/.editorconfig | 44 +- {ruoyi-ui => yudao-admin-ui}/.env.demo1024 | 0 {ruoyi-ui => yudao-admin-ui}/.env.development | 18 +- {ruoyi-ui => yudao-admin-ui}/.env.production | 10 +- {ruoyi-ui => yudao-admin-ui}/.env.staging | 20 +- {ruoyi-ui => yudao-admin-ui}/.eslintignore | 18 +- {ruoyi-ui => yudao-admin-ui}/.eslintrc.js | 398 ++-- {ruoyi-ui => yudao-admin-ui}/.gitignore | 46 +- {ruoyi-ui => yudao-admin-ui}/babel.config.js | 26 +- {ruoyi-ui => yudao-admin-ui}/bin/build.bat | 0 {ruoyi-ui => yudao-admin-ui}/bin/package.bat | 22 +- {ruoyi-ui => yudao-admin-ui}/bin/run-web.bat | 22 +- {ruoyi-ui => yudao-admin-ui}/build/index.js | 70 +- {ruoyi-ui => yudao-admin-ui}/package.json | 176 +- .../public/favicon.ico | Bin .../public/index.html | 414 ++-- .../public/robots.txt | 2 +- {ruoyi-ui => yudao-admin-ui}/src/App.vue | 22 +- .../src/api/infra/apiAccessLog.js | 0 .../src/api/infra/apiErrorLog.js | 0 .../src/api/infra/config.js | 0 .../src/api/infra/dbDoc.js | 0 .../src/api/infra/file.js | 0 .../src/api/infra/job.js | 0 .../src/api/infra/jobLog.js | 0 .../src/api/infra/redis.js | 0 {ruoyi-ui => yudao-admin-ui}/src/api/login.js | 80 +- {ruoyi-ui => yudao-admin-ui}/src/api/menu.js | 18 +- .../src/api/system/dept.js | 120 +- .../src/api/system/dict/data.js | 140 +- .../src/api/system/dict/type.js | 124 +- .../src/api/system/errorCode.js | 0 .../src/api/system/loginlog.js | 0 .../src/api/system/menu.js | 0 .../src/api/system/notice.js | 88 +- .../src/api/system/operatelog.js | 0 .../src/api/system/permission.js | 0 .../src/api/system/post.js | 124 +- .../src/api/system/role.js | 150 +- .../src/api/system/session.js | 0 .../src/api/system/sms/smsChannel.js | 0 .../src/api/system/sms/smsLog.js | 0 .../src/api/system/sms/smsTemplate.js | 0 .../src/api/system/user.js | 258 +-- .../src/api/tool/codegen.js | 0 .../src/api/tool/testDemo.js | 0 .../src/assets/401_images/401.gif | Bin .../src/assets/404_images/404.png | Bin .../src/assets/404_images/404_cloud.png | Bin .../src/assets/icons/index.js | 18 +- .../src/assets/icons/svg/404.svg | 0 .../src/assets/icons/svg/bug.svg | 0 .../src/assets/icons/svg/build.svg | 0 .../src/assets/icons/svg/button.svg | 0 .../src/assets/icons/svg/cascader.svg | 0 .../src/assets/icons/svg/chart.svg | 0 .../src/assets/icons/svg/checkbox.svg | 0 .../src/assets/icons/svg/clipboard.svg | 0 .../src/assets/icons/svg/code.svg | 0 .../src/assets/icons/svg/color.svg | 0 .../src/assets/icons/svg/component.svg | 0 .../src/assets/icons/svg/dashboard.svg | 0 .../src/assets/icons/svg/date-range.svg | 0 .../src/assets/icons/svg/date.svg | 0 .../src/assets/icons/svg/dict.svg | 0 .../src/assets/icons/svg/documentation.svg | 0 .../src/assets/icons/svg/download.svg | 0 .../src/assets/icons/svg/drag.svg | 0 .../src/assets/icons/svg/druid.svg | 0 .../src/assets/icons/svg/edit.svg | 0 .../src/assets/icons/svg/education.svg | 0 .../src/assets/icons/svg/email.svg | 0 .../src/assets/icons/svg/example.svg | 0 .../src/assets/icons/svg/excel.svg | 0 .../src/assets/icons/svg/exit-fullscreen.svg | 0 .../src/assets/icons/svg/eye-open.svg | 0 .../src/assets/icons/svg/eye.svg | 0 .../src/assets/icons/svg/form.svg | 0 .../src/assets/icons/svg/fullscreen.svg | 0 .../src/assets/icons/svg/github.svg | 0 .../src/assets/icons/svg/guide.svg | 0 .../src/assets/icons/svg/icon.svg | 0 .../src/assets/icons/svg/input.svg | 0 .../src/assets/icons/svg/international.svg | 0 .../src/assets/icons/svg/job.svg | 0 .../src/assets/icons/svg/language.svg | 0 .../src/assets/icons/svg/link.svg | 0 .../src/assets/icons/svg/list.svg | 0 .../src/assets/icons/svg/lock.svg | 0 .../src/assets/icons/svg/log.svg | 0 .../src/assets/icons/svg/logininfor.svg | 0 .../src/assets/icons/svg/message.svg | 0 .../src/assets/icons/svg/money.svg | 0 .../src/assets/icons/svg/monitor.svg | 2 +- .../src/assets/icons/svg/nested.svg | 0 .../src/assets/icons/svg/number.svg | 0 .../src/assets/icons/svg/online.svg | 0 .../src/assets/icons/svg/password.svg | 0 .../src/assets/icons/svg/pdf.svg | 0 .../src/assets/icons/svg/people.svg | 0 .../src/assets/icons/svg/peoples.svg | 0 .../src/assets/icons/svg/phone.svg | 0 .../src/assets/icons/svg/post.svg | 0 .../src/assets/icons/svg/qq.svg | 0 .../src/assets/icons/svg/question.svg | 0 .../src/assets/icons/svg/radio.svg | 0 .../src/assets/icons/svg/rate.svg | 0 .../src/assets/icons/svg/redis.svg | 0 .../src/assets/icons/svg/row.svg | 0 .../src/assets/icons/svg/search.svg | 0 .../src/assets/icons/svg/select.svg | 0 .../src/assets/icons/svg/server.svg | 0 .../src/assets/icons/svg/shopping.svg | 0 .../src/assets/icons/svg/size.svg | 0 .../src/assets/icons/svg/skill.svg | 0 .../src/assets/icons/svg/slider.svg | 0 .../src/assets/icons/svg/star.svg | 0 .../src/assets/icons/svg/swagger.svg | 0 .../src/assets/icons/svg/switch.svg | 0 .../src/assets/icons/svg/system.svg | 2 +- .../src/assets/icons/svg/tab.svg | 0 .../src/assets/icons/svg/table.svg | 0 .../src/assets/icons/svg/textarea.svg | 0 .../src/assets/icons/svg/theme.svg | 0 .../src/assets/icons/svg/time-range.svg | 0 .../src/assets/icons/svg/time.svg | 0 .../src/assets/icons/svg/tool.svg | 0 .../src/assets/icons/svg/tree-table.svg | 0 .../src/assets/icons/svg/tree.svg | 0 .../src/assets/icons/svg/upload.svg | 0 .../src/assets/icons/svg/user.svg | 0 .../src/assets/icons/svg/validCode.svg | 0 .../src/assets/icons/svg/wechat.svg | 0 .../src/assets/icons/svg/zip.svg | 0 .../src/assets/icons/svgo.yml | 44 +- .../src/assets/images/dark.svg | 76 +- .../src/assets/images/light.svg | 76 +- .../src/assets/images/login-background.jpg | Bin .../src/assets/images/profile.jpg | Bin .../src/assets/logo/logo.png | Bin .../src/assets/styles/btn.scss | 198 +- .../src/assets/styles/element-ui.scss | 168 +- .../src/assets/styles/element-variables.scss | 62 +- .../src/assets/styles/index.scss | 382 ++-- .../src/assets/styles/mixin.scss | 132 +- .../src/assets/styles/ruoyi.scss | 480 ++--- .../src/assets/styles/sidebar.scss | 452 ++-- .../src/assets/styles/transition.scss | 96 +- .../src/assets/styles/variables.scss | 88 +- .../src/components/Breadcrumb/index.vue | 148 +- .../src/components/Editor/index.vue | 388 ++-- .../src/components/FileUpload/index.vue | 0 .../src/components/Hamburger/index.vue | 88 +- .../src/components/HeaderSearch/index.vue | 376 ++-- .../src/components/IconSelect/index.vue | 136 +- .../src/components/IconSelect/requireIcons.js | 22 +- .../src/components/ImageUpload/index.vue | 0 .../src/components/Pagination/index.vue | 202 +- .../src/components/PanThumb/index.vue | 284 +-- .../src/components/ParentView/index.vue | 0 .../src/components/RightPanel/index.vue | 298 +-- .../src/components/RightToolbar/index.vue | 76 +- .../src/components/RuoYi/Doc/index.vue | 42 +- .../src/components/RuoYi/Git/index.vue | 42 +- .../src/components/Screenfull/index.vue | 114 +- .../src/components/SizeSelect/index.vue | 114 +- .../src/components/SvgIcon/index.vue | 122 +- .../src/components/ThemePicker/index.vue | 350 +-- .../src/components/UploadImage/index.vue | 134 +- .../src/directive/permission/hasPermi.js | 56 +- .../src/directive/permission/hasRole.js | 56 +- .../src/directive/permission/index.js | 30 +- .../src/layout/components/AppMain.vue | 114 +- .../src/layout/components/Navbar.vue | 374 ++-- .../src/layout/components/Settings/index.vue | 394 ++-- .../layout/components/Sidebar/FixiOSBug.js | 50 +- .../src/layout/components/Sidebar/Item.vue | 58 +- .../src/layout/components/Sidebar/Link.vue | 86 +- .../src/layout/components/Sidebar/Logo.vue | 186 +- .../layout/components/Sidebar/SidebarItem.vue | 192 +- .../src/layout/components/Sidebar/index.vue | 114 +- .../layout/components/TagsView/ScrollPane.vue | 188 +- .../src/layout/components/TagsView/index.vue | 606 +++--- .../src/layout/components/global.js | 6 +- .../src/layout/components/index.js | 10 +- .../src/layout/index.vue | 216 +- .../src/layout/mixin/ResizeHandler.js | 90 +- {ruoyi-ui => yudao-admin-ui}/src/main.js | 198 +- .../src/permission.js | 112 +- .../src/router/index.js | 256 +-- {ruoyi-ui => yudao-admin-ui}/src/settings.js | 72 +- .../src/store/getters.js | 36 +- .../src/store/index.js | 50 +- .../src/store/modules/app.js | 112 +- .../src/store/modules/dict.js | 0 .../src/store/modules/permission.js | 196 +- .../src/store/modules/settings.js | 70 +- .../src/store/modules/tagsView.js | 318 +-- .../src/store/modules/user.js | 196 +- .../src/utils/auth.js | 30 +- .../src/utils/constants.js | 0 .../src/utils/dict.js | 0 .../src/utils/errorCode.js | 0 .../src/utils/generator/config.js | 876 ++++---- .../src/utils/generator/css.js | 36 +- .../src/utils/generator/drawingDefalut.js | 58 +- .../src/utils/generator/html.js | 718 +++---- .../src/utils/generator/icon.json | 0 .../src/utils/generator/js.js | 472 ++--- .../src/utils/generator/render.js | 252 +-- .../src/utils/index.js | 780 +++---- .../src/utils/jsencrypt.js | 0 .../src/utils/permission.js | 100 +- .../src/utils/request.js | 0 .../src/utils/ruoyi.js | 0 .../src/utils/scroll-to.js | 116 +- .../src/utils/validate.js | 166 +- .../views/components/icons/element-icons.js | 6 +- .../src/views/components/icons/index.vue | 174 +- .../src/views/components/icons/svg-icons.js | 20 +- .../src/views/dashboard/BarChart.vue | 204 +- .../src/views/dashboard/LineChart.vue | 270 +-- .../src/views/dashboard/PanelGroup.vue | 362 ++-- .../src/views/dashboard/PieChart.vue | 158 +- .../src/views/dashboard/RaddarChart.vue | 232 +- .../src/views/dashboard/mixins/resize.js | 112 +- .../src/views/error/401.vue | 176 +- .../src/views/error/404.vue | 466 ++-- .../src/views/index.vue | 0 .../src/views/index_old.vue | 0 .../src/views/infra/apiAccessLog/index.vue | 0 .../src/views/infra/apiErrorLog/index.vue | 0 .../src/views/infra/config/index.vue | 0 .../src/views/infra/druid/index.vue | 0 .../src/views/infra/file/index.vue | 0 .../src/views/infra/job/index.vue | 0 .../src/views/infra/job/log.vue | 0 .../src/views/infra/redis/index.vue | 0 .../src/views/infra/server/index.vue | 0 .../src/views/infra/skywalking/index.vue | 0 .../src/views/infra/skywalking/log.vue | 0 .../src/views/login.vue | 408 ++-- .../src/views/redirect.vue | 0 .../src/views/system/dept/index.vue | 566 ++--- .../src/views/system/dict/data.vue | 554 ++--- .../src/views/system/dict/index.vue | 526 ++--- .../src/views/system/errorCode/index.vue | 0 .../src/views/system/loginlog/index.vue | 0 .../src/views/system/menu/index.vue | 654 +++--- .../src/views/system/notice/index.vue | 502 ++--- .../src/views/system/operatelog/index.vue | 0 .../src/views/system/post/index.vue | 498 ++--- .../src/views/system/role/index.vue | 1028 ++++----- .../src/views/system/session/index.vue | 0 .../src/views/system/sms/smsChannel.vue | 0 .../src/views/system/sms/smsLog.vue | 0 .../src/views/system/sms/smsTemplate.vue | 0 .../src/views/system/user/index.vue | 0 .../src/views/system/user/profile/index.vue | 186 +- .../views/system/user/profile/resetPwd.vue | 144 +- .../views/system/user/profile/userAvatar.vue | 332 +-- .../views/system/user/profile/userInfo.vue | 152 +- .../src/views/tool/build/CodeTypeDialog.vue | 212 +- .../src/views/tool/build/DraggableItem.vue | 200 +- .../src/views/tool/build/IconsDialog.vue | 246 +-- .../src/views/tool/build/RightPanel.vue | 1888 ++++++++--------- .../src/views/tool/build/TreeNodeDialog.vue | 298 +-- .../src/views/tool/build/index.vue | 1578 +++++++------- .../src/views/tool/codegen/basicInfoForm.vue | 0 .../src/views/tool/codegen/editTable.vue | 0 .../src/views/tool/codegen/genInfoForm.vue | 0 .../src/views/tool/codegen/importTable.vue | 0 .../src/views/tool/codegen/index.vue | 0 .../src/views/tool/dbDoc/index.vue | 0 .../src/views/tool/swagger/index.vue | 52 +- .../src/views/tool/testDemo/index.vue | 0 {ruoyi-ui => yudao-admin-ui}/vue.config.js | 236 +-- yudao-dependencies/pom.xml | 21 +- yudao-framework/pom.xml | 12 - 281 files changed, 14070 insertions(+), 14097 deletions(-) rename {ruoyi-ui => yudao-admin-ui}/.editorconfig (95%) rename {ruoyi-ui => yudao-admin-ui}/.env.demo1024 (100%) rename {ruoyi-ui => yudao-admin-ui}/.env.development (95%) rename {ruoyi-ui => yudao-admin-ui}/.env.production (95%) rename {ruoyi-ui => yudao-admin-ui}/.env.staging (95%) rename {ruoyi-ui => yudao-admin-ui}/.eslintignore (97%) rename {ruoyi-ui => yudao-admin-ui}/.eslintrc.js (96%) rename {ruoyi-ui => yudao-admin-ui}/.gitignore (91%) rename {ruoyi-ui => yudao-admin-ui}/babel.config.js (97%) rename {ruoyi-ui => yudao-admin-ui}/bin/build.bat (100%) rename {ruoyi-ui => yudao-admin-ui}/bin/package.bat (93%) rename {ruoyi-ui => yudao-admin-ui}/bin/run-web.bat (90%) rename {ruoyi-ui => yudao-admin-ui}/build/index.js (96%) rename {ruoyi-ui => yudao-admin-ui}/package.json (95%) rename {ruoyi-ui => yudao-admin-ui}/public/favicon.ico (100%) rename {ruoyi-ui => yudao-admin-ui}/public/index.html (96%) rename {ruoyi-ui => yudao-admin-ui}/public/robots.txt (96%) rename {ruoyi-ui => yudao-admin-ui}/src/App.vue (91%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/apiAccessLog.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/apiErrorLog.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/config.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/dbDoc.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/file.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/job.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/jobLog.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/infra/redis.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/login.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/menu.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/dept.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/dict/data.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/dict/type.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/errorCode.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/loginlog.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/menu.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/notice.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/operatelog.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/permission.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/post.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/role.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/session.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/sms/smsChannel.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/sms/smsLog.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/sms/smsTemplate.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/system/user.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/api/tool/codegen.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/api/tool/testDemo.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/401_images/401.gif (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/404_images/404.png (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/404_images/404_cloud.png (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/index.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/404.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/bug.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/build.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/button.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/cascader.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/chart.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/checkbox.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/clipboard.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/code.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/color.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/component.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/dashboard.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/date-range.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/date.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/dict.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/documentation.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/download.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/drag.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/druid.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/edit.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/education.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/email.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/example.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/excel.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/exit-fullscreen.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/eye-open.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/eye.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/form.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/fullscreen.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/github.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/guide.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/icon.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/input.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/international.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/job.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/language.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/link.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/list.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/lock.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/log.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/logininfor.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/message.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/money.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/monitor.svg (99%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/nested.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/number.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/online.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/password.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/pdf.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/people.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/peoples.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/phone.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/post.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/qq.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/question.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/radio.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/rate.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/redis.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/row.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/search.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/select.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/server.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/shopping.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/size.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/skill.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/slider.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/star.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/swagger.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/switch.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/system.svg (99%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/tab.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/table.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/textarea.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/theme.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/time-range.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/time.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/tool.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/tree-table.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/tree.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/upload.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/user.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/validCode.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/wechat.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svg/zip.svg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/icons/svgo.yml (91%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/images/dark.svg (98%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/images/light.svg (98%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/images/login-background.jpg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/images/profile.jpg (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/logo/logo.png (100%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/btn.scss (93%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/element-ui.scss (93%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/element-variables.scss (96%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/index.scss (93%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/mixin.scss (95%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/ruoyi.scss (93%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/sidebar.scss (94%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/transition.scss (93%) rename {ruoyi-ui => yudao-admin-ui}/src/assets/styles/variables.scss (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/Breadcrumb/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/components/Editor/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/components/FileUpload/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/components/Hamburger/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/components/HeaderSearch/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/IconSelect/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/IconSelect/requireIcons.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/ImageUpload/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/components/Pagination/index.vue (94%) rename {ruoyi-ui => yudao-admin-ui}/src/components/PanThumb/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/ParentView/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/components/RightPanel/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/RightToolbar/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/RuoYi/Doc/index.vue (93%) rename {ruoyi-ui => yudao-admin-ui}/src/components/RuoYi/Git/index.vue (93%) rename {ruoyi-ui => yudao-admin-ui}/src/components/Screenfull/index.vue (94%) rename {ruoyi-ui => yudao-admin-ui}/src/components/SizeSelect/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/SvgIcon/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/components/ThemePicker/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/components/UploadImage/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/directive/permission/hasPermi.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/directive/permission/hasRole.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/directive/permission/index.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/AppMain.vue (94%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Navbar.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Settings/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Sidebar/FixiOSBug.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Sidebar/Item.vue (94%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Sidebar/Link.vue (93%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Sidebar/Logo.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Sidebar/SidebarItem.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/Sidebar/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/TagsView/ScrollPane.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/TagsView/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/global.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/components/index.js (98%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/layout/mixin/ResizeHandler.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/main.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/permission.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/router/index.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/settings.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/store/getters.js (97%) rename {ruoyi-ui => yudao-admin-ui}/src/store/index.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/store/modules/app.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/store/modules/dict.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/store/modules/permission.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/store/modules/settings.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/store/modules/tagsView.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/store/modules/user.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/auth.js (94%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/constants.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/dict.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/errorCode.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/config.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/css.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/drawingDefalut.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/html.js (97%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/icon.json (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/js.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/generator/render.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/index.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/jsencrypt.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/permission.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/request.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/ruoyi.js (100%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/scroll-to.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/utils/validate.js (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/components/icons/element-icons.js (99%) rename {ruoyi-ui => yudao-admin-ui}/src/views/components/icons/index.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/components/icons/svg-icons.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/dashboard/BarChart.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/dashboard/LineChart.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/dashboard/PanelGroup.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/dashboard/PieChart.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/dashboard/RaddarChart.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/dashboard/mixins/resize.js (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/error/401.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/error/404.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/index_old.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/apiAccessLog/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/apiErrorLog/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/config/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/druid/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/file/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/job/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/job/log.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/redis/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/server/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/skywalking/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/infra/skywalking/log.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/login.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/redirect.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/dept/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/dict/data.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/dict/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/errorCode/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/loginlog/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/menu/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/notice/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/operatelog/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/post/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/role/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/session/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/sms/smsChannel.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/sms/smsLog.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/sms/smsTemplate.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/user/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/user/profile/index.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/user/profile/resetPwd.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/user/profile/userAvatar.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/system/user/profile/userInfo.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/build/CodeTypeDialog.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/build/DraggableItem.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/build/IconsDialog.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/build/RightPanel.vue (97%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/build/TreeNodeDialog.vue (95%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/build/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/codegen/basicInfoForm.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/codegen/editTable.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/codegen/genInfoForm.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/codegen/importTable.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/codegen/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/dbDoc/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/swagger/index.vue (96%) rename {ruoyi-ui => yudao-admin-ui}/src/views/tool/testDemo/index.vue (100%) rename {ruoyi-ui => yudao-admin-ui}/vue.config.js (97%) diff --git a/pom.xml b/pom.xml index d1a3e1291..4836de07f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ 1.8 ${java.version} ${java.version} + 3.0.0-M5 @@ -38,6 +39,20 @@ + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 8c09991c4..dc30b5234 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -68,17 +68,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M5 - diff --git a/ruoyi-ui/.editorconfig b/yudao-admin-ui/.editorconfig similarity index 95% rename from ruoyi-ui/.editorconfig rename to yudao-admin-ui/.editorconfig index 22d302ecd..7034f9bf3 100644 --- a/ruoyi-ui/.editorconfig +++ b/yudao-admin-ui/.editorconfig @@ -1,22 +1,22 @@ -# 告诉EditorConfig插件，这是根文件，不用继续往上查找 -root = true - -# 匹配全部文件 -[*] -# 设置字符集 -charset = utf-8 -# 缩进风格，可选space、tab -indent_style = space -# 缩进的空格数 -indent_size = 2 -# 结尾换行符，可选lf、cr、crlf -end_of_line = lf -# 在文件结尾插入新行 -insert_final_newline = true -# 删除一行中的前后空格 -trim_trailing_whitespace = true - -# 匹配md结尾的文件 -[*.md] -insert_final_newline = false -trim_trailing_whitespace = false +# 告诉EditorConfig插件，这是根文件，不用继续往上查找 +root = true + +# 匹配全部文件 +[*] +# 设置字符集 +charset = utf-8 +# 缩进风格，可选space、tab +indent_style = space +# 缩进的空格数 +indent_size = 2 +# 结尾换行符，可选lf、cr、crlf +end_of_line = lf +# 在文件结尾插入新行 +insert_final_newline = true +# 删除一行中的前后空格 +trim_trailing_whitespace = true + +# 匹配md结尾的文件 +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/ruoyi-ui/.env.demo1024 b/yudao-admin-ui/.env.demo1024 similarity index 100% rename from ruoyi-ui/.env.demo1024 rename to yudao-admin-ui/.env.demo1024 diff --git a/ruoyi-ui/.env.development b/yudao-admin-ui/.env.development similarity index 95% rename from ruoyi-ui/.env.development rename to yudao-admin-ui/.env.development index cbe5fa5a8..8c1875f52 100644 --- a/ruoyi-ui/.env.development +++ b/yudao-admin-ui/.env.development @@ -1,9 +1,9 @@ -# 开发环境配置 -ENV = 'development' - -# 芋道管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' -# VUE_APP_BASE_API = '/api' - -# 路由懒加载 -VUE_CLI_BABEL_TRANSPILE_MODULES = true +# 开发环境配置 +ENV = 'development' + +# 芋道管理系统/开发环境 +VUE_APP_BASE_API = '/dev-api' +# VUE_APP_BASE_API = '/api' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/.env.production b/yudao-admin-ui/.env.production similarity index 95% rename from ruoyi-ui/.env.production rename to yudao-admin-ui/.env.production index fbae57919..e00052eb6 100644 --- a/ruoyi-ui/.env.production +++ b/yudao-admin-ui/.env.production @@ -1,5 +1,5 @@ -# 生产环境配置 -ENV = 'production' - -# 芋道管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +# 生产环境配置 +ENV = 'production' + +# 芋道管理系统/生产环境 +VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/yudao-admin-ui/.env.staging similarity index 95% rename from ruoyi-ui/.env.staging rename to yudao-admin-ui/.env.staging index c475bc491..2e83e2225 100644 --- a/ruoyi-ui/.env.staging +++ b/yudao-admin-ui/.env.staging @@ -1,10 +1,10 @@ -NODE_ENV = production - -# 测试环境配置 -ENV = 'staging' - -# 芋道管理系统/测试环境 -VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' - -# 静态资源地址 -PUBLIC_PATH = 'http://static.yudao.iocoder.cn/' +NODE_ENV = production + +# 测试环境配置 +ENV = 'staging' + +# 芋道管理系统/测试环境 +VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' + +# 静态资源地址 +PUBLIC_PATH = 'http://static.yudao.iocoder.cn/' diff --git a/ruoyi-ui/.eslintignore b/yudao-admin-ui/.eslintignore similarity index 97% rename from ruoyi-ui/.eslintignore rename to yudao-admin-ui/.eslintignore index 7dd2c2a85..89be6f659 100644 --- a/ruoyi-ui/.eslintignore +++ b/yudao-admin-ui/.eslintignore @@ -1,10 +1,10 @@ -# 忽略build目录下类型为js的文件的语法检查 -build/*.js -# 忽略src/assets目录下文件的语法检查 -src/assets -# 忽略public目录下文件的语法检查 -public -# 忽略当前目录下为js的文件的语法检查 -*.js -# 忽略当前目录下为vue的文件的语法检查 +# 忽略build目录下类型为js的文件的语法检查 +build/*.js +# 忽略src/assets目录下文件的语法检查 +src/assets +# 忽略public目录下文件的语法检查 +public +# 忽略当前目录下为js的文件的语法检查 +*.js +# 忽略当前目录下为vue的文件的语法检查 *.vue \ No newline at end of file diff --git a/ruoyi-ui/.eslintrc.js b/yudao-admin-ui/.eslintrc.js similarity index 96% rename from ruoyi-ui/.eslintrc.js rename to yudao-admin-ui/.eslintrc.js index b321fbe4f..82bbdeea6 100644 --- a/ruoyi-ui/.eslintrc.js +++ b/yudao-admin-ui/.eslintrc.js @@ -1,199 +1,199 @@ -// ESlint 检查配置 -module.exports = { - root: true, - parserOptions: { - parser: 'babel-eslint', - sourceType: 'module' - }, - env: { - browser: true, - node: true, - es6: true, - }, - extends: ['plugin:vue/recommended', 'eslint:recommended'], - - // add your custom rules here - //it is base on https://github.com/vuejs/eslint-config-vue - rules: { - "vue/max-attributes-per-line": [2, { - "singleline": 10, - "multiline": { - "max": 1, - "allowFirstLine": false - } - }], - "vue/singleline-html-element-content-newline": "off", - "vue/multiline-html-element-content-newline":"off", - "vue/name-property-casing": ["error", "PascalCase"], - "vue/no-v-html": "off", - 'accessor-pairs': 2, - 'arrow-spacing': [2, { - 'before': true, - 'after': true - }], - 'block-spacing': [2, 'always'], - 'brace-style': [2, '1tbs', { - 'allowSingleLine': true - }], - 'camelcase': [0, { - 'properties': 'always' - }], - 'comma-dangle': [2, 'never'], - 'comma-spacing': [2, { - 'before': false, - 'after': true - }], - 'comma-style': [2, 'last'], - 'constructor-super': 2, - 'curly': [2, 'multi-line'], - 'dot-location': [2, 'property'], - 'eol-last': 2, - 'eqeqeq': ["error", "always", {"null": "ignore"}], - 'generator-star-spacing': [2, { - 'before': true, - 'after': true - }], - 'handle-callback-err': [2, '^(err|error)$'], - 'indent': [2, 2, { - 'SwitchCase': 1 - }], - 'jsx-quotes': [2, 'prefer-single'], - 'key-spacing': [2, { - 'beforeColon': false, - 'afterColon': true - }], - 'keyword-spacing': [2, { - 'before': true, - 'after': true - }], - 'new-cap': [2, { - 'newIsCap': true, - 'capIsNew': false - }], - 'new-parens': 2, - 'no-array-constructor': 2, - 'no-caller': 2, - 'no-console': 'off', - 'no-class-assign': 2, - 'no-cond-assign': 2, - 'no-const-assign': 2, - 'no-control-regex': 0, - 'no-delete-var': 2, - 'no-dupe-args': 2, - 'no-dupe-class-members': 2, - 'no-dupe-keys': 2, - 'no-duplicate-case': 2, - 'no-empty-character-class': 2, - 'no-empty-pattern': 2, - 'no-eval': 2, - 'no-ex-assign': 2, - 'no-extend-native': 2, - 'no-extra-bind': 2, - 'no-extra-boolean-cast': 2, - 'no-extra-parens': [2, 'functions'], - 'no-fallthrough': 2, - 'no-floating-decimal': 2, - 'no-func-assign': 2, - 'no-implied-eval': 2, - 'no-inner-declarations': [2, 'functions'], - 'no-invalid-regexp': 2, - 'no-irregular-whitespace': 2, - 'no-iterator': 2, - 'no-label-var': 2, - 'no-labels': [2, { - 'allowLoop': false, - 'allowSwitch': false - }], - 'no-lone-blocks': 2, - 'no-mixed-spaces-and-tabs': 2, - 'no-multi-spaces': 2, - 'no-multi-str': 2, - 'no-multiple-empty-lines': [2, { - 'max': 1 - }], - 'no-native-reassign': 2, - 'no-negated-in-lhs': 2, - 'no-new-object': 2, - 'no-new-require': 2, - 'no-new-symbol': 2, - 'no-new-wrappers': 2, - 'no-obj-calls': 2, - 'no-octal': 2, - 'no-octal-escape': 2, - 'no-path-concat': 2, - 'no-proto': 2, - 'no-redeclare': 2, - 'no-regex-spaces': 2, - 'no-return-assign': [2, 'except-parens'], - 'no-self-assign': 2, - 'no-self-compare': 2, - 'no-sequences': 2, - 'no-shadow-restricted-names': 2, - 'no-spaced-func': 2, - 'no-sparse-arrays': 2, - 'no-this-before-super': 2, - 'no-throw-literal': 2, - 'no-trailing-spaces': 2, - 'no-undef': 2, - 'no-undef-init': 2, - 'no-unexpected-multiline': 2, - 'no-unmodified-loop-condition': 2, - 'no-unneeded-ternary': [2, { - 'defaultAssignment': false - }], - 'no-unreachable': 2, - 'no-unsafe-finally': 2, - 'no-unused-vars': [2, { - 'vars': 'all', - 'args': 'none' - }], - 'no-useless-call': 2, - 'no-useless-computed-key': 2, - 'no-useless-constructor': 2, - 'no-useless-escape': 0, - 'no-whitespace-before-property': 2, - 'no-with': 2, - 'one-var': [2, { - 'initialized': 'never' - }], - 'operator-linebreak': [2, 'after', { - 'overrides': { - '?': 'before', - ':': 'before' - } - }], - 'padded-blocks': [2, 'never'], - 'quotes': [2, 'single', { - 'avoidEscape': true, - 'allowTemplateLiterals': true - }], - 'semi': [2, 'never'], - 'semi-spacing': [2, { - 'before': false, - 'after': true - }], - 'space-before-blocks': [2, 'always'], - 'space-before-function-paren': [2, 'never'], - 'space-in-parens': [2, 'never'], - 'space-infix-ops': 2, - 'space-unary-ops': [2, { - 'words': true, - 'nonwords': false - }], - 'spaced-comment': [2, 'always', { - 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] - }], - 'template-curly-spacing': [2, 'never'], - 'use-isnan': 2, - 'valid-typeof': 2, - 'wrap-iife': [2, 'any'], - 'yield-star-spacing': [2, 'both'], - 'yoda': [2, 'never'], - 'prefer-const': 2, - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, - 'object-curly-spacing': [2, 'always', { - objectsInObjects: false - }], - 'array-bracket-spacing': [2, 'never'] - } -} +// ESlint 检查配置 +module.exports = { + root: true, + parserOptions: { + parser: 'babel-eslint', + sourceType: 'module' + }, + env: { + browser: true, + node: true, + es6: true, + }, + extends: ['plugin:vue/recommended', 'eslint:recommended'], + + // add your custom rules here + //it is base on https://github.com/vuejs/eslint-config-vue + rules: { + "vue/max-attributes-per-line": [2, { + "singleline": 10, + "multiline": { + "max": 1, + "allowFirstLine": false + } + }], + "vue/singleline-html-element-content-newline": "off", + "vue/multiline-html-element-content-newline":"off", + "vue/name-property-casing": ["error", "PascalCase"], + "vue/no-v-html": "off", + 'accessor-pairs': 2, + 'arrow-spacing': [2, { + 'before': true, + 'after': true + }], + 'block-spacing': [2, 'always'], + 'brace-style': [2, '1tbs', { + 'allowSingleLine': true + }], + 'camelcase': [0, { + 'properties': 'always' + }], + 'comma-dangle': [2, 'never'], + 'comma-spacing': [2, { + 'before': false, + 'after': true + }], + 'comma-style': [2, 'last'], + 'constructor-super': 2, + 'curly': [2, 'multi-line'], + 'dot-location': [2, 'property'], + 'eol-last': 2, + 'eqeqeq': ["error", "always", {"null": "ignore"}], + 'generator-star-spacing': [2, { + 'before': true, + 'after': true + }], + 'handle-callback-err': [2, '^(err|error)$'], + 'indent': [2, 2, { + 'SwitchCase': 1 + }], + 'jsx-quotes': [2, 'prefer-single'], + 'key-spacing': [2, { + 'beforeColon': false, + 'afterColon': true + }], + 'keyword-spacing': [2, { + 'before': true, + 'after': true + }], + 'new-cap': [2, { + 'newIsCap': true, + 'capIsNew': false + }], + 'new-parens': 2, + 'no-array-constructor': 2, + 'no-caller': 2, + 'no-console': 'off', + 'no-class-assign': 2, + 'no-cond-assign': 2, + 'no-const-assign': 2, + 'no-control-regex': 0, + 'no-delete-var': 2, + 'no-dupe-args': 2, + 'no-dupe-class-members': 2, + 'no-dupe-keys': 2, + 'no-duplicate-case': 2, + 'no-empty-character-class': 2, + 'no-empty-pattern': 2, + 'no-eval': 2, + 'no-ex-assign': 2, + 'no-extend-native': 2, + 'no-extra-bind': 2, + 'no-extra-boolean-cast': 2, + 'no-extra-parens': [2, 'functions'], + 'no-fallthrough': 2, + 'no-floating-decimal': 2, + 'no-func-assign': 2, + 'no-implied-eval': 2, + 'no-inner-declarations': [2, 'functions'], + 'no-invalid-regexp': 2, + 'no-irregular-whitespace': 2, + 'no-iterator': 2, + 'no-label-var': 2, + 'no-labels': [2, { + 'allowLoop': false, + 'allowSwitch': false + }], + 'no-lone-blocks': 2, + 'no-mixed-spaces-and-tabs': 2, + 'no-multi-spaces': 2, + 'no-multi-str': 2, + 'no-multiple-empty-lines': [2, { + 'max': 1 + }], + 'no-native-reassign': 2, + 'no-negated-in-lhs': 2, + 'no-new-object': 2, + 'no-new-require': 2, + 'no-new-symbol': 2, + 'no-new-wrappers': 2, + 'no-obj-calls': 2, + 'no-octal': 2, + 'no-octal-escape': 2, + 'no-path-concat': 2, + 'no-proto': 2, + 'no-redeclare': 2, + 'no-regex-spaces': 2, + 'no-return-assign': [2, 'except-parens'], + 'no-self-assign': 2, + 'no-self-compare': 2, + 'no-sequences': 2, + 'no-shadow-restricted-names': 2, + 'no-spaced-func': 2, + 'no-sparse-arrays': 2, + 'no-this-before-super': 2, + 'no-throw-literal': 2, + 'no-trailing-spaces': 2, + 'no-undef': 2, + 'no-undef-init': 2, + 'no-unexpected-multiline': 2, + 'no-unmodified-loop-condition': 2, + 'no-unneeded-ternary': [2, { + 'defaultAssignment': false + }], + 'no-unreachable': 2, + 'no-unsafe-finally': 2, + 'no-unused-vars': [2, { + 'vars': 'all', + 'args': 'none' + }], + 'no-useless-call': 2, + 'no-useless-computed-key': 2, + 'no-useless-constructor': 2, + 'no-useless-escape': 0, + 'no-whitespace-before-property': 2, + 'no-with': 2, + 'one-var': [2, { + 'initialized': 'never' + }], + 'operator-linebreak': [2, 'after', { + 'overrides': { + '?': 'before', + ':': 'before' + } + }], + 'padded-blocks': [2, 'never'], + 'quotes': [2, 'single', { + 'avoidEscape': true, + 'allowTemplateLiterals': true + }], + 'semi': [2, 'never'], + 'semi-spacing': [2, { + 'before': false, + 'after': true + }], + 'space-before-blocks': [2, 'always'], + 'space-before-function-paren': [2, 'never'], + 'space-in-parens': [2, 'never'], + 'space-infix-ops': 2, + 'space-unary-ops': [2, { + 'words': true, + 'nonwords': false + }], + 'spaced-comment': [2, 'always', { + 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] + }], + 'template-curly-spacing': [2, 'never'], + 'use-isnan': 2, + 'valid-typeof': 2, + 'wrap-iife': [2, 'any'], + 'yield-star-spacing': [2, 'both'], + 'yoda': [2, 'never'], + 'prefer-const': 2, + 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, + 'object-curly-spacing': [2, 'always', { + objectsInObjects: false + }], + 'array-bracket-spacing': [2, 'never'] + } +} diff --git a/ruoyi-ui/.gitignore b/yudao-admin-ui/.gitignore similarity index 91% rename from ruoyi-ui/.gitignore rename to yudao-admin-ui/.gitignore index 2c9b3a73f..78a752d87 100644 --- a/ruoyi-ui/.gitignore +++ b/yudao-admin-ui/.gitignore @@ -1,23 +1,23 @@ -.DS_Store -node_modules/ -dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -**/*.log - -tests/**/coverage/ -tests/e2e/reports -selenium-debug.log - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.local - -package-lock.json -yarn.lock +.DS_Store +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock diff --git a/ruoyi-ui/babel.config.js b/yudao-admin-ui/babel.config.js similarity index 97% rename from ruoyi-ui/babel.config.js rename to yudao-admin-ui/babel.config.js index b732c91fc..b99f00148 100644 --- a/ruoyi-ui/babel.config.js +++ b/yudao-admin-ui/babel.config.js @@ -1,13 +1,13 @@ -module.exports = { - presets: [ - // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app - '@vue/cli-plugin-babel/preset' - ], - 'env': { - 'development': { - // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). - // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. - 'plugins': ['dynamic-import-node'] - } - } -} +module.exports = { + presets: [ + // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app + '@vue/cli-plugin-babel/preset' + ], + 'env': { + 'development': { + // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). + // This plugin can significantly increase the speed of hot updates, when you have a large number of pages. + 'plugins': ['dynamic-import-node'] + } + } +} diff --git a/ruoyi-ui/bin/build.bat b/yudao-admin-ui/bin/build.bat similarity index 100% rename from ruoyi-ui/bin/build.bat rename to yudao-admin-ui/bin/build.bat diff --git a/ruoyi-ui/bin/package.bat b/yudao-admin-ui/bin/package.bat similarity index 93% rename from ruoyi-ui/bin/package.bat rename to yudao-admin-ui/bin/package.bat index 5d9fca586..82817497e 100644 --- a/ruoyi-ui/bin/package.bat +++ b/yudao-admin-ui/bin/package.bat @@ -1,12 +1,12 @@ -@echo off -echo. -echo [Ϣ] װWeḅnode_modulesļ -echo. - -%~d0 -cd %~dp0 - -cd .. -npm install --registry=https://registry.npm.taobao.org - +@echo off +echo. +echo [Ϣ] װWeḅnode_modulesļ +echo. + +%~d0 +cd %~dp0 + +cd .. +npm install --registry=https://registry.npm.taobao.org + pause \ No newline at end of file diff --git a/ruoyi-ui/bin/run-web.bat b/yudao-admin-ui/bin/run-web.bat similarity index 90% rename from ruoyi-ui/bin/run-web.bat rename to yudao-admin-ui/bin/run-web.bat index a69628096..a938e8921 100644 --- a/ruoyi-ui/bin/run-web.bat +++ b/yudao-admin-ui/bin/run-web.bat @@ -1,12 +1,12 @@ -@echo off -echo. -echo [Ϣ] ʹ Vue Web ̡ -echo. - -%~d0 -cd %~dp0 - -cd .. -npm run dev - +@echo off +echo. +echo [Ϣ] ʹ Vue Web ̡ +echo. + +%~d0 +cd %~dp0 + +cd .. +npm run dev + pause \ No newline at end of file diff --git a/ruoyi-ui/build/index.js b/yudao-admin-ui/build/index.js similarity index 96% rename from ruoyi-ui/build/index.js rename to yudao-admin-ui/build/index.js index 385da08e5..0c57de2aa 100644 --- a/ruoyi-ui/build/index.js +++ b/yudao-admin-ui/build/index.js @@ -1,35 +1,35 @@ -const { run } = require('runjs') -const chalk = require('chalk') -const config = require('../vue.config.js') -const rawArgv = process.argv.slice(2) -const args = rawArgv.join(' ') - -if (process.env.npm_config_preview || rawArgv.includes('--preview')) { - const report = rawArgv.includes('--report') - - run(`vue-cli-service build ${args}`) - - const port = 9526 - const publicPath = config.publicPath - - var connect = require('connect') - var serveStatic = require('serve-static') - const app = connect() - - app.use( - publicPath, - serveStatic('./dist', { - index: ['index.html', '/'] - }) - ) - - app.listen(port, function () { - console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) - if (report) { - console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) - } - - }) -} else { - run(`vue-cli-service build ${args}`) -} +const { run } = require('runjs') +const chalk = require('chalk') +const config = require('../vue.config.js') +const rawArgv = process.argv.slice(2) +const args = rawArgv.join(' ') + +if (process.env.npm_config_preview || rawArgv.includes('--preview')) { + const report = rawArgv.includes('--report') + + run(`vue-cli-service build ${args}`) + + const port = 9526 + const publicPath = config.publicPath + + var connect = require('connect') + var serveStatic = require('serve-static') + const app = connect() + + app.use( + publicPath, + serveStatic('./dist', { + index: ['index.html', '/'] + }) + ) + + app.listen(port, function () { + console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) + if (report) { + console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) + } + + }) +} else { + run(`vue-cli-service build ${args}`) +} diff --git a/ruoyi-ui/package.json b/yudao-admin-ui/package.json similarity index 95% rename from ruoyi-ui/package.json rename to yudao-admin-ui/package.json index 1249d16b3..3acd6dbaf 100644 --- a/ruoyi-ui/package.json +++ b/yudao-admin-ui/package.json @@ -1,88 +1,88 @@ -{ - "name": "ruoyi", - "version": "3.3.0", - "description": "芋道管理系统", - "author": "芋道", - "license": "MIT", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "build:demo1024": "vue-cli-service build --mode demo1024", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" - ] - }, - "keywords": [ - "vue", - "admin", - "dashboard", - "element-ui", - "boilerplate", - "admin-template", - "management-system" - ], - "repository": { - "type": "git", - "url": "https://github.com/YunaiV/ruoyi-vue-pro" - }, - "dependencies": { - "@riophae/vue-treeselect": "0.4.0", - "axios": "0.21.0", - "clipboard": "2.0.6", - "core-js": "3.8.1", - "echarts": "4.9.0", - "element-ui": "2.15.0", - "file-saver": "2.0.4", - "fuse.js": "6.4.3", - "highlight.js": "9.18.5", - "js-beautify": "1.13.0", - "js-cookie": "2.2.1", - "jsencrypt": "3.0.0-rc.1", - "nprogress": "0.2.0", - "quill": "1.3.7", - "screenfull": "5.0.2", - "sortablejs": "1.10.2", - "vue": "2.6.12", - "vue-count-to": "1.0.13", - "vue-cropper": "0.5.5", - "vue-router": "3.4.9", - "vuedraggable": "2.24.3", - "vuex": "3.6.0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "4.4.6", - "@vue/cli-plugin-eslint": "4.4.6", - "@vue/cli-service": "4.4.6", - "babel-eslint": "10.1.0", - "chalk": "4.1.0", - "connect": "3.6.6", - "eslint": "7.15.0", - "eslint-plugin-vue": "7.2.0", - "lint-staged": "10.5.3", - "sass": "1.30.0", - "runjs": "4.4.2", - "sass-loader": "10.1.0", - "script-ext-html-webpack-plugin": "2.1.5", - "svg-sprite-loader": "5.1.1", - "vue-template-compiler": "2.6.12" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +{ + "name": "ruoyi", + "version": "3.3.0", + "description": "芋道管理系统", + "author": "芋道", + "license": "MIT", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "build:demo1024": "vue-cli-service build --mode demo1024", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "keywords": [ + "vue", + "admin", + "dashboard", + "element-ui", + "boilerplate", + "admin-template", + "management-system" + ], + "repository": { + "type": "git", + "url": "https://github.com/YunaiV/ruoyi-vue-pro" + }, + "dependencies": { + "@riophae/vue-treeselect": "0.4.0", + "axios": "0.21.0", + "clipboard": "2.0.6", + "core-js": "3.8.1", + "echarts": "4.9.0", + "element-ui": "2.15.0", + "file-saver": "2.0.4", + "fuse.js": "6.4.3", + "highlight.js": "9.18.5", + "js-beautify": "1.13.0", + "js-cookie": "2.2.1", + "jsencrypt": "3.0.0-rc.1", + "nprogress": "0.2.0", + "quill": "1.3.7", + "screenfull": "5.0.2", + "sortablejs": "1.10.2", + "vue": "2.6.12", + "vue-count-to": "1.0.13", + "vue-cropper": "0.5.5", + "vue-router": "3.4.9", + "vuedraggable": "2.24.3", + "vuex": "3.6.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "4.4.6", + "@vue/cli-plugin-eslint": "4.4.6", + "@vue/cli-service": "4.4.6", + "babel-eslint": "10.1.0", + "chalk": "4.1.0", + "connect": "3.6.6", + "eslint": "7.15.0", + "eslint-plugin-vue": "7.2.0", + "lint-staged": "10.5.3", + "sass": "1.30.0", + "runjs": "4.4.2", + "sass-loader": "10.1.0", + "script-ext-html-webpack-plugin": "2.1.5", + "svg-sprite-loader": "5.1.1", + "vue-template-compiler": "2.6.12" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] +} diff --git a/ruoyi-ui/public/favicon.ico b/yudao-admin-ui/public/favicon.ico similarity index 100% rename from ruoyi-ui/public/favicon.ico rename to yudao-admin-ui/public/favicon.ico diff --git a/ruoyi-ui/public/index.html b/yudao-admin-ui/public/index.html similarity index 96% rename from ruoyi-ui/public/index.html rename to yudao-admin-ui/public/index.html index 525e2acd6..6d64bf957 100644 --- a/ruoyi-ui/public/index.html +++ b/yudao-admin-ui/public/index.html @@ -1,207 +1,207 @@ - - - - - - - - - <%= webpackConfig.name %> - - - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
-
- - + + + + + + + + + <%= webpackConfig.name %> + + + +
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+
+ + diff --git a/ruoyi-ui/public/robots.txt b/yudao-admin-ui/public/robots.txt similarity index 96% rename from ruoyi-ui/public/robots.txt rename to yudao-admin-ui/public/robots.txt index c2aab7e03..77470cb39 100644 --- a/ruoyi-ui/public/robots.txt +++ b/yudao-admin-ui/public/robots.txt @@ -1,2 +1,2 @@ -User-agent: * +User-agent: * Disallow: / \ No newline at end of file diff --git a/ruoyi-ui/src/App.vue b/yudao-admin-ui/src/App.vue similarity index 91% rename from ruoyi-ui/src/App.vue rename to yudao-admin-ui/src/App.vue index 1d0634c32..e448b1130 100644 --- a/ruoyi-ui/src/App.vue +++ b/yudao-admin-ui/src/App.vue @@ -1,11 +1,11 @@ - - - + + + diff --git a/ruoyi-ui/src/api/infra/apiAccessLog.js b/yudao-admin-ui/src/api/infra/apiAccessLog.js similarity index 100% rename from ruoyi-ui/src/api/infra/apiAccessLog.js rename to yudao-admin-ui/src/api/infra/apiAccessLog.js diff --git a/ruoyi-ui/src/api/infra/apiErrorLog.js b/yudao-admin-ui/src/api/infra/apiErrorLog.js similarity index 100% rename from ruoyi-ui/src/api/infra/apiErrorLog.js rename to yudao-admin-ui/src/api/infra/apiErrorLog.js diff --git a/ruoyi-ui/src/api/infra/config.js b/yudao-admin-ui/src/api/infra/config.js similarity index 100% rename from ruoyi-ui/src/api/infra/config.js rename to yudao-admin-ui/src/api/infra/config.js diff --git a/ruoyi-ui/src/api/infra/dbDoc.js b/yudao-admin-ui/src/api/infra/dbDoc.js similarity index 100% rename from ruoyi-ui/src/api/infra/dbDoc.js rename to yudao-admin-ui/src/api/infra/dbDoc.js diff --git a/ruoyi-ui/src/api/infra/file.js b/yudao-admin-ui/src/api/infra/file.js similarity index 100% rename from ruoyi-ui/src/api/infra/file.js rename to yudao-admin-ui/src/api/infra/file.js diff --git a/ruoyi-ui/src/api/infra/job.js b/yudao-admin-ui/src/api/infra/job.js similarity index 100% rename from ruoyi-ui/src/api/infra/job.js rename to yudao-admin-ui/src/api/infra/job.js diff --git a/ruoyi-ui/src/api/infra/jobLog.js b/yudao-admin-ui/src/api/infra/jobLog.js similarity index 100% rename from ruoyi-ui/src/api/infra/jobLog.js rename to yudao-admin-ui/src/api/infra/jobLog.js diff --git a/ruoyi-ui/src/api/infra/redis.js b/yudao-admin-ui/src/api/infra/redis.js similarity index 100% rename from ruoyi-ui/src/api/infra/redis.js rename to yudao-admin-ui/src/api/infra/redis.js diff --git a/ruoyi-ui/src/api/login.js b/yudao-admin-ui/src/api/login.js similarity index 94% rename from ruoyi-ui/src/api/login.js rename to yudao-admin-ui/src/api/login.js index 274cc2726..cda0d9d23 100644 --- a/ruoyi-ui/src/api/login.js +++ b/yudao-admin-ui/src/api/login.js @@ -1,40 +1,40 @@ -import request from '@/utils/request' - -// 登录方法 -export function login(username, password, code, uuid) { - const data = { - username, - password, - code, - uuid - } - return request({ - url: '/login', - method: 'post', - data: data - }) -} - -// 获取用户详细信息 -export function getInfo() { - return request({ - url: '/get-permission-info', - method: 'get' - }) -} - -// 退出方法 -export function logout() { - return request({ - url: '/logout', - method: 'post' - }) -} - -// 获取验证码 -export function getCodeImg() { - return request({ - url: '/system/captcha/get-image', - method: 'get' - }) -} +import request from '@/utils/request' + +// 登录方法 +export function login(username, password, code, uuid) { + const data = { + username, + password, + code, + uuid + } + return request({ + url: '/login', + method: 'post', + data: data + }) +} + +// 获取用户详细信息 +export function getInfo() { + return request({ + url: '/get-permission-info', + method: 'get' + }) +} + +// 退出方法 +export function logout() { + return request({ + url: '/logout', + method: 'post' + }) +} + +// 获取验证码 +export function getCodeImg() { + return request({ + url: '/system/captcha/get-image', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/menu.js b/yudao-admin-ui/src/api/menu.js similarity index 94% rename from ruoyi-ui/src/api/menu.js rename to yudao-admin-ui/src/api/menu.js index 5dae14e7a..01fbbc9f4 100644 --- a/ruoyi-ui/src/api/menu.js +++ b/yudao-admin-ui/src/api/menu.js @@ -1,9 +1,9 @@ -import request from '@/utils/request' - -// 获取路由 -export const getRouters = () => { - return request({ - url: '/list-menus', - method: 'get' - }) -} +import request from '@/utils/request' + +// 获取路由 +export const getRouters = () => { + return request({ + url: '/list-menus', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/system/dept.js b/yudao-admin-ui/src/api/system/dept.js similarity index 94% rename from ruoyi-ui/src/api/system/dept.js rename to yudao-admin-ui/src/api/system/dept.js index d8c59cf9a..4ca13e36b 100644 --- a/ruoyi-ui/src/api/system/dept.js +++ b/yudao-admin-ui/src/api/system/dept.js @@ -1,60 +1,60 @@ -import request from '@/utils/request' - -// 查询部门列表 -export function listDept(query) { - return request({ - url: '/system/dept/list', - method: 'get', - params: query - }) -} - -// 查询部门列表（排除节点） -export function listDeptExcludeChild(deptId) { - return request({ - url: '/system/dept/list/exclude/' + deptId, - method: 'get' - }) -} - -// 查询部门详细 -export function getDept(deptId) { - return request({ - url: '/system/dept/get?id=' + deptId, - method: 'get' - }) -} - -// 获取部门精简信息列表 -export function listSimpleDepts() { - return request({ - url: '/system/dept/list-all-simple', - method: 'get' - }) -} - -// 新增部门 -export function addDept(data) { - return request({ - url: '/system/dept/create', - method: 'post', - data: data - }) -} - -// 修改部门 -export function updateDept(data) { - return request({ - url: '/system/dept/update', - method: 'put', - data: data - }) -} - -// 删除部门 -export function delDept(id) { - return request({ - url: '/system/dept/delete?id=' + id, - method: 'delete' - }) -} +import request from '@/utils/request' + +// 查询部门列表 +export function listDept(query) { + return request({ + url: '/system/dept/list', + method: 'get', + params: query + }) +} + +// 查询部门列表（排除节点） +export function listDeptExcludeChild(deptId) { + return request({ + url: '/system/dept/list/exclude/' + deptId, + method: 'get' + }) +} + +// 查询部门详细 +export function getDept(deptId) { + return request({ + url: '/system/dept/get?id=' + deptId, + method: 'get' + }) +} + +// 获取部门精简信息列表 +export function listSimpleDepts() { + return request({ + url: '/system/dept/list-all-simple', + method: 'get' + }) +} + +// 新增部门 +export function addDept(data) { + return request({ + url: '/system/dept/create', + method: 'post', + data: data + }) +} + +// 修改部门 +export function updateDept(data) { + return request({ + url: '/system/dept/update', + method: 'put', + data: data + }) +} + +// 删除部门 +export function delDept(id) { + return request({ + url: '/system/dept/delete?id=' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/system/dict/data.js b/yudao-admin-ui/src/api/system/dict/data.js similarity index 95% rename from ruoyi-ui/src/api/system/dict/data.js rename to yudao-admin-ui/src/api/system/dict/data.js index 00e614b15..396ea759a 100644 --- a/ruoyi-ui/src/api/system/dict/data.js +++ b/yudao-admin-ui/src/api/system/dict/data.js @@ -1,70 +1,70 @@ -import request from '@/utils/request' - -// 查询字典数据列表 -export function listData(query) { - return request({ - url: '/system/dict-data/page', - method: 'get', - params: query - }) -} - -// 查询字典数据详细 -export function getData(dictCode) { - return request({ - url: '/system/dict-data/get?id=' + dictCode, - method: 'get' - }) -} - -// 根据字典类型查询字典数据信息 -export function getDicts(dictType) { - return request({ - url: '/system/dict-data/type/' + dictType, - method: 'get' - }) -} - -// 新增字典数据 -export function addData(data) { - return request({ - url: '/system/dict-data/create', - method: 'post', - data: data - }) -} - -// 修改字典数据 -export function updateData(data) { - return request({ - url: '/system/dict-data/update', - method: 'put', - data: data - }) -} - -// 删除字典数据 -export function delData(dictCode) { - return request({ - url: '/system/dict-data/delete?id=' + dictCode, - method: 'delete' - }) -} - -// 导出字典数据 -export function exportData(query) { - return request({ - url: '/system/dict-data/export', - method: 'get', - params: query, - responseType: 'blob' - }) -} - -// 查询全部字典数据列表 -export function listSimpleDictDatas() { - return request({ - url: '/system/dict-data/list-all-simple', - method: 'get', - }) -} +import request from '@/utils/request' + +// 查询字典数据列表 +export function listData(query) { + return request({ + url: '/system/dict-data/page', + method: 'get', + params: query + }) +} + +// 查询字典数据详细 +export function getData(dictCode) { + return request({ + url: '/system/dict-data/get?id=' + dictCode, + method: 'get' + }) +} + +// 根据字典类型查询字典数据信息 +export function getDicts(dictType) { + return request({ + url: '/system/dict-data/type/' + dictType, + method: 'get' + }) +} + +// 新增字典数据 +export function addData(data) { + return request({ + url: '/system/dict-data/create', + method: 'post', + data: data + }) +} + +// 修改字典数据 +export function updateData(data) { + return request({ + url: '/system/dict-data/update', + method: 'put', + data: data + }) +} + +// 删除字典数据 +export function delData(dictCode) { + return request({ + url: '/system/dict-data/delete?id=' + dictCode, + method: 'delete' + }) +} + +// 导出字典数据 +export function exportData(query) { + return request({ + url: '/system/dict-data/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 查询全部字典数据列表 +export function listSimpleDictDatas() { + return request({ + url: '/system/dict-data/list-all-simple', + method: 'get', + }) +} diff --git a/ruoyi-ui/src/api/system/dict/type.js b/yudao-admin-ui/src/api/system/dict/type.js similarity index 94% rename from ruoyi-ui/src/api/system/dict/type.js rename to yudao-admin-ui/src/api/system/dict/type.js index 9fe10d418..659f70239 100644 --- a/ruoyi-ui/src/api/system/dict/type.js +++ b/yudao-admin-ui/src/api/system/dict/type.js @@ -1,62 +1,62 @@ -import request from '@/utils/request' - -// 查询字典类型列表 -export function listType(query) { - return request({ - url: '/system/dict-type/page', - method: 'get', - params: query - }) -} - -// 查询字典类型详细 -export function getType(dictId) { - return request({ - url: '/system/dict-type/get?id=' + dictId, - method: 'get' - }) -} - -// 新增字典类型 -export function addType(data) { - return request({ - url: '/system/dict-type/create', - method: 'post', - data: data - }) -} - -// 修改字典类型 -export function updateType(data) { - return request({ - url: '/system/dict-type/update', - method: 'put', - data: data - }) -} - -// 删除字典类型 -export function delType(dictId) { - return request({ - url: '/system/dict-type/delete?id=' + dictId, - method: 'delete' - }) -} - -// 导出字典类型 -export function exportType(query) { - return request({ - url: '/system/dict-type/export', - method: 'get', - params: query, - responseType: 'blob' - }) -} - -// 获取字典选择框列表 -export function listAllSimple() { - return request({ - url: '/system/dict-type/list-all-simple', - method: 'get' - }) -} +import request from '@/utils/request' + +// 查询字典类型列表 +export function listType(query) { + return request({ + url: '/system/dict-type/page', + method: 'get', + params: query + }) +} + +// 查询字典类型详细 +export function getType(dictId) { + return request({ + url: '/system/dict-type/get?id=' + dictId, + method: 'get' + }) +} + +// 新增字典类型 +export function addType(data) { + return request({ + url: '/system/dict-type/create', + method: 'post', + data: data + }) +} + +// 修改字典类型 +export function updateType(data) { + return request({ + url: '/system/dict-type/update', + method: 'put', + data: data + }) +} + +// 删除字典类型 +export function delType(dictId) { + return request({ + url: '/system/dict-type/delete?id=' + dictId, + method: 'delete' + }) +} + +// 导出字典类型 +export function exportType(query) { + return request({ + url: '/system/dict-type/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 获取字典选择框列表 +export function listAllSimple() { + return request({ + url: '/system/dict-type/list-all-simple', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/system/errorCode.js b/yudao-admin-ui/src/api/system/errorCode.js similarity index 100% rename from ruoyi-ui/src/api/system/errorCode.js rename to yudao-admin-ui/src/api/system/errorCode.js diff --git a/ruoyi-ui/src/api/system/loginlog.js b/yudao-admin-ui/src/api/system/loginlog.js similarity index 100% rename from ruoyi-ui/src/api/system/loginlog.js rename to yudao-admin-ui/src/api/system/loginlog.js diff --git a/ruoyi-ui/src/api/system/menu.js b/yudao-admin-ui/src/api/system/menu.js similarity index 100% rename from ruoyi-ui/src/api/system/menu.js rename to yudao-admin-ui/src/api/system/menu.js diff --git a/ruoyi-ui/src/api/system/notice.js b/yudao-admin-ui/src/api/system/notice.js similarity index 94% rename from ruoyi-ui/src/api/system/notice.js rename to yudao-admin-ui/src/api/system/notice.js index b8c7cf709..2e0c05dcb 100644 --- a/ruoyi-ui/src/api/system/notice.js +++ b/yudao-admin-ui/src/api/system/notice.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' - -// 查询公告列表 -export function listNotice(query) { - return request({ - url: '/system/notice/page', - method: 'get', - params: query - }) -} - -// 查询公告详细 -export function getNotice(noticeId) { - return request({ - url: '/system/notice/get?id=' + noticeId, - method: 'get' - }) -} - -// 新增公告 -export function addNotice(data) { - return request({ - url: '/system/notice/create', - method: 'post', - data: data - }) -} - -// 修改公告 -export function updateNotice(data) { - return request({ - url: '/system/notice/update', - method: 'put', - data: data - }) -} - -// 删除公告 -export function delNotice(noticeId) { - return request({ - url: '/system/notice/delete?id=' + noticeId, - method: 'delete' - }) -} +import request from '@/utils/request' + +// 查询公告列表 +export function listNotice(query) { + return request({ + url: '/system/notice/page', + method: 'get', + params: query + }) +} + +// 查询公告详细 +export function getNotice(noticeId) { + return request({ + url: '/system/notice/get?id=' + noticeId, + method: 'get' + }) +} + +// 新增公告 +export function addNotice(data) { + return request({ + url: '/system/notice/create', + method: 'post', + data: data + }) +} + +// 修改公告 +export function updateNotice(data) { + return request({ + url: '/system/notice/update', + method: 'put', + data: data + }) +} + +// 删除公告 +export function delNotice(noticeId) { + return request({ + url: '/system/notice/delete?id=' + noticeId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/system/operatelog.js b/yudao-admin-ui/src/api/system/operatelog.js similarity index 100% rename from ruoyi-ui/src/api/system/operatelog.js rename to yudao-admin-ui/src/api/system/operatelog.js diff --git a/ruoyi-ui/src/api/system/permission.js b/yudao-admin-ui/src/api/system/permission.js similarity index 100% rename from ruoyi-ui/src/api/system/permission.js rename to yudao-admin-ui/src/api/system/permission.js diff --git a/ruoyi-ui/src/api/system/post.js b/yudao-admin-ui/src/api/system/post.js similarity index 94% rename from ruoyi-ui/src/api/system/post.js rename to yudao-admin-ui/src/api/system/post.js index 3ef4a9906..df74d3fed 100644 --- a/ruoyi-ui/src/api/system/post.js +++ b/yudao-admin-ui/src/api/system/post.js @@ -1,62 +1,62 @@ -import request from '@/utils/request' - -// 查询岗位列表 -export function listPost(query) { - return request({ - url: '/system/post/page', - method: 'get', - params: query - }) -} - -// 获取岗位精简信息列表 -export function listSimplePosts() { - return request({ - url: '/system/post/list-all-simple', - method: 'get' - }) -} - -// 查询岗位详细 -export function getPost(postId) { - return request({ - url: '/system/post/get?id=' + postId, - method: 'get' - }) -} - -// 新增岗位 -export function addPost(data) { - return request({ - url: '/system/post/create', - method: 'post', - data: data - }) -} - -// 修改岗位 -export function updatePost(data) { - return request({ - url: '/system/post/update', - method: 'put', - data: data - }) -} - -// 删除岗位 -export function delPost(postId) { - return request({ - url: '/system/post/delete?id=' + postId, - method: 'delete' - }) -} - -// 导出岗位 -export function exportPost(query) { - return request({ - url: '/system/post/export', - method: 'get', - params: query, - responseType: 'blob' - }) -} +import request from '@/utils/request' + +// 查询岗位列表 +export function listPost(query) { + return request({ + url: '/system/post/page', + method: 'get', + params: query + }) +} + +// 获取岗位精简信息列表 +export function listSimplePosts() { + return request({ + url: '/system/post/list-all-simple', + method: 'get' + }) +} + +// 查询岗位详细 +export function getPost(postId) { + return request({ + url: '/system/post/get?id=' + postId, + method: 'get' + }) +} + +// 新增岗位 +export function addPost(data) { + return request({ + url: '/system/post/create', + method: 'post', + data: data + }) +} + +// 修改岗位 +export function updatePost(data) { + return request({ + url: '/system/post/update', + method: 'put', + data: data + }) +} + +// 删除岗位 +export function delPost(postId) { + return request({ + url: '/system/post/delete?id=' + postId, + method: 'delete' + }) +} + +// 导出岗位 +export function exportPost(query) { + return request({ + url: '/system/post/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/ruoyi-ui/src/api/system/role.js b/yudao-admin-ui/src/api/system/role.js similarity index 94% rename from ruoyi-ui/src/api/system/role.js rename to yudao-admin-ui/src/api/system/role.js index 27bb0500b..05d2a59fb 100644 --- a/ruoyi-ui/src/api/system/role.js +++ b/yudao-admin-ui/src/api/system/role.js @@ -1,75 +1,75 @@ -import request from '@/utils/request' - -// 查询角色列表 -export function listRole(query) { - return request({ - url: '/system/role/page', - method: 'get', - params: query - }) -} - -// 查询角色（精简)列表 -export function listSimpleRoles() { - return request({ - url: '/system/role/list-all-simple', - method: 'get' - }) -} - -// 查询角色详细 -export function getRole(roleId) { - return request({ - url: '/system/role/get?id=' + roleId, - method: 'get' - }) -} - -// 新增角色 -export function addRole(data) { - return request({ - url: '/system/role/create', - method: 'post', - data: data - }) -} - -// 修改角色 -export function updateRole(data) { - return request({ - url: '/system/role/update', - method: 'put', - data: data - }) -} - -// 角色状态修改 -export function changeRoleStatus(id, status) { - const data = { - id, - status - } - return request({ - url: '/system/role/update-status', - method: 'put', - data: data - }) -} - -// 删除角色 -export function delRole(roleId) { - return request({ - url: '/system/role/delete?id=' + roleId, - method: 'delete' - }) -} - -// 导出角色 -export function exportRole(query) { - return request({ - url: '/system/role/export', - method: 'get', - params: query, - responseType: 'blob' - }) -} +import request from '@/utils/request' + +// 查询角色列表 +export function listRole(query) { + return request({ + url: '/system/role/page', + method: 'get', + params: query + }) +} + +// 查询角色（精简)列表 +export function listSimpleRoles() { + return request({ + url: '/system/role/list-all-simple', + method: 'get' + }) +} + +// 查询角色详细 +export function getRole(roleId) { + return request({ + url: '/system/role/get?id=' + roleId, + method: 'get' + }) +} + +// 新增角色 +export function addRole(data) { + return request({ + url: '/system/role/create', + method: 'post', + data: data + }) +} + +// 修改角色 +export function updateRole(data) { + return request({ + url: '/system/role/update', + method: 'put', + data: data + }) +} + +// 角色状态修改 +export function changeRoleStatus(id, status) { + const data = { + id, + status + } + return request({ + url: '/system/role/update-status', + method: 'put', + data: data + }) +} + +// 删除角色 +export function delRole(roleId) { + return request({ + url: '/system/role/delete?id=' + roleId, + method: 'delete' + }) +} + +// 导出角色 +export function exportRole(query) { + return request({ + url: '/system/role/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/ruoyi-ui/src/api/system/session.js b/yudao-admin-ui/src/api/system/session.js similarity index 100% rename from ruoyi-ui/src/api/system/session.js rename to yudao-admin-ui/src/api/system/session.js diff --git a/ruoyi-ui/src/api/system/sms/smsChannel.js b/yudao-admin-ui/src/api/system/sms/smsChannel.js similarity index 100% rename from ruoyi-ui/src/api/system/sms/smsChannel.js rename to yudao-admin-ui/src/api/system/sms/smsChannel.js diff --git a/ruoyi-ui/src/api/system/sms/smsLog.js b/yudao-admin-ui/src/api/system/sms/smsLog.js similarity index 100% rename from ruoyi-ui/src/api/system/sms/smsLog.js rename to yudao-admin-ui/src/api/system/sms/smsLog.js diff --git a/ruoyi-ui/src/api/system/sms/smsTemplate.js b/yudao-admin-ui/src/api/system/sms/smsTemplate.js similarity index 100% rename from ruoyi-ui/src/api/system/sms/smsTemplate.js rename to yudao-admin-ui/src/api/system/sms/smsTemplate.js diff --git a/ruoyi-ui/src/api/system/user.js b/yudao-admin-ui/src/api/system/user.js similarity index 94% rename from ruoyi-ui/src/api/system/user.js rename to yudao-admin-ui/src/api/system/user.js index cf0f007d5..e06530c92 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/yudao-admin-ui/src/api/system/user.js @@ -1,129 +1,129 @@ -import request from '@/utils/request' -import { praseStrEmpty } from "@/utils/ruoyi"; - -// 查询用户列表 -export function listUser(query) { - return request({ - url: '/system/user/page', - method: 'get', - params: query - }) -} - -// 查询用户详细 -export function getUser(userId) { - return request({ - url: '/system/user/get?id=' + praseStrEmpty(userId), - method: 'get' - }) -} - -// 新增用户 -export function addUser(data) { - return request({ - url: '/system/user/create', - method: 'post', - data: data - }) -} - -// 修改用户 -export function updateUser(data) { - return request({ - url: '/system/user/update', - method: 'put', - data: data - }) -} - -// 删除用户 -export function delUser(userId) { - return request({ - url: '/system/user/delete?id=' + userId, - method: 'delete' - }) -} - -// 导出用户 -export function exportUser(query) { - return request({ - url: '/system/user/export', - method: 'get', - params: query, - responseType: 'blob' - }) -} - -// 用户密码重置 -export function resetUserPwd(id, password) { - const data = { - id, - password - } - return request({ - url: '/system/user/update-password', - method: 'put', - data: data - }) -} - -// 用户状态修改 -export function changeUserStatus(id, status) { - const data = { - id, - status - } - return request({ - url: '/system/user/update-status', - method: 'put', - data: data - }) -} - -// 查询用户个人信息 -export function getUserProfile() { - return request({ - url: '/system/user/profile/get', - method: 'get' - }) -} - -// 修改用户个人信息 -export function updateUserProfile(data) { - return request({ - url: '/system/user/profile/update', - method: 'put', - data: data - }) -} - -// 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/update-password', - method: 'put', - data: data - }) -} - -// 用户头像上传 -export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'put', - data: data - }) -} - -// 下载用户导入模板 -export function importTemplate() { - return request({ - url: '/system/user/get-import-template', - method: 'get', - responseType: 'blob' - }) -} +import request from '@/utils/request' +import { praseStrEmpty } from "@/utils/ruoyi"; + +// 查询用户列表 +export function listUser(query) { + return request({ + url: '/system/user/page', + method: 'get', + params: query + }) +} + +// 查询用户详细 +export function getUser(userId) { + return request({ + url: '/system/user/get?id=' + praseStrEmpty(userId), + method: 'get' + }) +} + +// 新增用户 +export function addUser(data) { + return request({ + url: '/system/user/create', + method: 'post', + data: data + }) +} + +// 修改用户 +export function updateUser(data) { + return request({ + url: '/system/user/update', + method: 'put', + data: data + }) +} + +// 删除用户 +export function delUser(userId) { + return request({ + url: '/system/user/delete?id=' + userId, + method: 'delete' + }) +} + +// 导出用户 +export function exportUser(query) { + return request({ + url: '/system/user/export', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 用户密码重置 +export function resetUserPwd(id, password) { + const data = { + id, + password + } + return request({ + url: '/system/user/update-password', + method: 'put', + data: data + }) +} + +// 用户状态修改 +export function changeUserStatus(id, status) { + const data = { + id, + status + } + return request({ + url: '/system/user/update-status', + method: 'put', + data: data + }) +} + +// 查询用户个人信息 +export function getUserProfile() { + return request({ + url: '/system/user/profile/get', + method: 'get' + }) +} + +// 修改用户个人信息 +export function updateUserProfile(data) { + return request({ + url: '/system/user/profile/update', + method: 'put', + data: data + }) +} + +// 用户密码重置 +export function updateUserPwd(oldPassword, newPassword) { + const data = { + oldPassword, + newPassword + } + return request({ + url: '/system/user/profile/update-password', + method: 'put', + data: data + }) +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: '/system/user/profile/avatar', + method: 'put', + data: data + }) +} + +// 下载用户导入模板 +export function importTemplate() { + return request({ + url: '/system/user/get-import-template', + method: 'get', + responseType: 'blob' + }) +} diff --git a/ruoyi-ui/src/api/tool/codegen.js b/yudao-admin-ui/src/api/tool/codegen.js similarity index 100% rename from ruoyi-ui/src/api/tool/codegen.js rename to yudao-admin-ui/src/api/tool/codegen.js diff --git a/ruoyi-ui/src/api/tool/testDemo.js b/yudao-admin-ui/src/api/tool/testDemo.js similarity index 100% rename from ruoyi-ui/src/api/tool/testDemo.js rename to yudao-admin-ui/src/api/tool/testDemo.js diff --git a/ruoyi-ui/src/assets/401_images/401.gif b/yudao-admin-ui/src/assets/401_images/401.gif similarity index 100% rename from ruoyi-ui/src/assets/401_images/401.gif rename to yudao-admin-ui/src/assets/401_images/401.gif diff --git a/ruoyi-ui/src/assets/404_images/404.png b/yudao-admin-ui/src/assets/404_images/404.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404.png rename to yudao-admin-ui/src/assets/404_images/404.png diff --git a/ruoyi-ui/src/assets/404_images/404_cloud.png b/yudao-admin-ui/src/assets/404_images/404_cloud.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404_cloud.png rename to yudao-admin-ui/src/assets/404_images/404_cloud.png diff --git a/ruoyi-ui/src/assets/icons/index.js b/yudao-admin-ui/src/assets/icons/index.js similarity index 96% rename from ruoyi-ui/src/assets/icons/index.js rename to yudao-admin-ui/src/assets/icons/index.js index d79e16464..2c6b309c9 100644 --- a/ruoyi-ui/src/assets/icons/index.js +++ b/yudao-admin-ui/src/assets/icons/index.js @@ -1,9 +1,9 @@ -import Vue from 'vue' -import SvgIcon from '@/components/SvgIcon'// svg component - -// register globally -Vue.component('svg-icon', SvgIcon) - -const req = require.context('./svg', false, /\.svg$/) -const requireAll = requireContext => requireContext.keys().map(requireContext) -requireAll(req) +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/ruoyi-ui/src/assets/icons/svg/404.svg b/yudao-admin-ui/src/assets/icons/svg/404.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/404.svg rename to yudao-admin-ui/src/assets/icons/svg/404.svg diff --git a/ruoyi-ui/src/assets/icons/svg/bug.svg b/yudao-admin-ui/src/assets/icons/svg/bug.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/bug.svg rename to yudao-admin-ui/src/assets/icons/svg/bug.svg diff --git a/ruoyi-ui/src/assets/icons/svg/build.svg b/yudao-admin-ui/src/assets/icons/svg/build.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/build.svg rename to yudao-admin-ui/src/assets/icons/svg/build.svg diff --git a/ruoyi-ui/src/assets/icons/svg/button.svg b/yudao-admin-ui/src/assets/icons/svg/button.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/button.svg rename to yudao-admin-ui/src/assets/icons/svg/button.svg diff --git a/ruoyi-ui/src/assets/icons/svg/cascader.svg b/yudao-admin-ui/src/assets/icons/svg/cascader.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/cascader.svg rename to yudao-admin-ui/src/assets/icons/svg/cascader.svg diff --git a/ruoyi-ui/src/assets/icons/svg/chart.svg b/yudao-admin-ui/src/assets/icons/svg/chart.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/chart.svg rename to yudao-admin-ui/src/assets/icons/svg/chart.svg diff --git a/ruoyi-ui/src/assets/icons/svg/checkbox.svg b/yudao-admin-ui/src/assets/icons/svg/checkbox.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/checkbox.svg rename to yudao-admin-ui/src/assets/icons/svg/checkbox.svg diff --git a/ruoyi-ui/src/assets/icons/svg/clipboard.svg b/yudao-admin-ui/src/assets/icons/svg/clipboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/clipboard.svg rename to yudao-admin-ui/src/assets/icons/svg/clipboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/code.svg b/yudao-admin-ui/src/assets/icons/svg/code.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/code.svg rename to yudao-admin-ui/src/assets/icons/svg/code.svg diff --git a/ruoyi-ui/src/assets/icons/svg/color.svg b/yudao-admin-ui/src/assets/icons/svg/color.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/color.svg rename to yudao-admin-ui/src/assets/icons/svg/color.svg diff --git a/ruoyi-ui/src/assets/icons/svg/component.svg b/yudao-admin-ui/src/assets/icons/svg/component.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/component.svg rename to yudao-admin-ui/src/assets/icons/svg/component.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/yudao-admin-ui/src/assets/icons/svg/dashboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dashboard.svg rename to yudao-admin-ui/src/assets/icons/svg/dashboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date-range.svg b/yudao-admin-ui/src/assets/icons/svg/date-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date-range.svg rename to yudao-admin-ui/src/assets/icons/svg/date-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date.svg b/yudao-admin-ui/src/assets/icons/svg/date.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date.svg rename to yudao-admin-ui/src/assets/icons/svg/date.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dict.svg b/yudao-admin-ui/src/assets/icons/svg/dict.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dict.svg rename to yudao-admin-ui/src/assets/icons/svg/dict.svg diff --git a/ruoyi-ui/src/assets/icons/svg/documentation.svg b/yudao-admin-ui/src/assets/icons/svg/documentation.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/documentation.svg rename to yudao-admin-ui/src/assets/icons/svg/documentation.svg diff --git a/ruoyi-ui/src/assets/icons/svg/download.svg b/yudao-admin-ui/src/assets/icons/svg/download.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/download.svg rename to yudao-admin-ui/src/assets/icons/svg/download.svg diff --git a/ruoyi-ui/src/assets/icons/svg/drag.svg b/yudao-admin-ui/src/assets/icons/svg/drag.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/drag.svg rename to yudao-admin-ui/src/assets/icons/svg/drag.svg diff --git a/ruoyi-ui/src/assets/icons/svg/druid.svg b/yudao-admin-ui/src/assets/icons/svg/druid.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/druid.svg rename to yudao-admin-ui/src/assets/icons/svg/druid.svg diff --git a/ruoyi-ui/src/assets/icons/svg/edit.svg b/yudao-admin-ui/src/assets/icons/svg/edit.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/edit.svg rename to yudao-admin-ui/src/assets/icons/svg/edit.svg diff --git a/ruoyi-ui/src/assets/icons/svg/education.svg b/yudao-admin-ui/src/assets/icons/svg/education.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/education.svg rename to yudao-admin-ui/src/assets/icons/svg/education.svg diff --git a/ruoyi-ui/src/assets/icons/svg/email.svg b/yudao-admin-ui/src/assets/icons/svg/email.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/email.svg rename to yudao-admin-ui/src/assets/icons/svg/email.svg diff --git a/ruoyi-ui/src/assets/icons/svg/example.svg b/yudao-admin-ui/src/assets/icons/svg/example.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/example.svg rename to yudao-admin-ui/src/assets/icons/svg/example.svg diff --git a/ruoyi-ui/src/assets/icons/svg/excel.svg b/yudao-admin-ui/src/assets/icons/svg/excel.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/excel.svg rename to yudao-admin-ui/src/assets/icons/svg/excel.svg diff --git a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg b/yudao-admin-ui/src/assets/icons/svg/exit-fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg rename to yudao-admin-ui/src/assets/icons/svg/exit-fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye-open.svg b/yudao-admin-ui/src/assets/icons/svg/eye-open.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye-open.svg rename to yudao-admin-ui/src/assets/icons/svg/eye-open.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye.svg b/yudao-admin-ui/src/assets/icons/svg/eye.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye.svg rename to yudao-admin-ui/src/assets/icons/svg/eye.svg diff --git a/ruoyi-ui/src/assets/icons/svg/form.svg b/yudao-admin-ui/src/assets/icons/svg/form.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/form.svg rename to yudao-admin-ui/src/assets/icons/svg/form.svg diff --git a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg b/yudao-admin-ui/src/assets/icons/svg/fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/fullscreen.svg rename to yudao-admin-ui/src/assets/icons/svg/fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/yudao-admin-ui/src/assets/icons/svg/github.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/github.svg rename to yudao-admin-ui/src/assets/icons/svg/github.svg diff --git a/ruoyi-ui/src/assets/icons/svg/guide.svg b/yudao-admin-ui/src/assets/icons/svg/guide.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/guide.svg rename to yudao-admin-ui/src/assets/icons/svg/guide.svg diff --git a/ruoyi-ui/src/assets/icons/svg/icon.svg b/yudao-admin-ui/src/assets/icons/svg/icon.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/icon.svg rename to yudao-admin-ui/src/assets/icons/svg/icon.svg diff --git a/ruoyi-ui/src/assets/icons/svg/input.svg b/yudao-admin-ui/src/assets/icons/svg/input.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/input.svg rename to yudao-admin-ui/src/assets/icons/svg/input.svg diff --git a/ruoyi-ui/src/assets/icons/svg/international.svg b/yudao-admin-ui/src/assets/icons/svg/international.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/international.svg rename to yudao-admin-ui/src/assets/icons/svg/international.svg diff --git a/ruoyi-ui/src/assets/icons/svg/job.svg b/yudao-admin-ui/src/assets/icons/svg/job.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/job.svg rename to yudao-admin-ui/src/assets/icons/svg/job.svg diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/yudao-admin-ui/src/assets/icons/svg/language.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/language.svg rename to yudao-admin-ui/src/assets/icons/svg/language.svg diff --git a/ruoyi-ui/src/assets/icons/svg/link.svg b/yudao-admin-ui/src/assets/icons/svg/link.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/link.svg rename to yudao-admin-ui/src/assets/icons/svg/link.svg diff --git a/ruoyi-ui/src/assets/icons/svg/list.svg b/yudao-admin-ui/src/assets/icons/svg/list.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/list.svg rename to yudao-admin-ui/src/assets/icons/svg/list.svg diff --git a/ruoyi-ui/src/assets/icons/svg/lock.svg b/yudao-admin-ui/src/assets/icons/svg/lock.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/lock.svg rename to yudao-admin-ui/src/assets/icons/svg/lock.svg diff --git a/ruoyi-ui/src/assets/icons/svg/log.svg b/yudao-admin-ui/src/assets/icons/svg/log.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/log.svg rename to yudao-admin-ui/src/assets/icons/svg/log.svg diff --git a/ruoyi-ui/src/assets/icons/svg/logininfor.svg b/yudao-admin-ui/src/assets/icons/svg/logininfor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/logininfor.svg rename to yudao-admin-ui/src/assets/icons/svg/logininfor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/message.svg b/yudao-admin-ui/src/assets/icons/svg/message.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/message.svg rename to yudao-admin-ui/src/assets/icons/svg/message.svg diff --git a/ruoyi-ui/src/assets/icons/svg/money.svg b/yudao-admin-ui/src/assets/icons/svg/money.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/money.svg rename to yudao-admin-ui/src/assets/icons/svg/money.svg diff --git a/ruoyi-ui/src/assets/icons/svg/monitor.svg b/yudao-admin-ui/src/assets/icons/svg/monitor.svg similarity index 99% rename from ruoyi-ui/src/assets/icons/svg/monitor.svg rename to yudao-admin-ui/src/assets/icons/svg/monitor.svg index 70db62b45..bc308cb0f 100644 --- a/ruoyi-ui/src/assets/icons/svg/monitor.svg +++ b/yudao-admin-ui/src/assets/icons/svg/monitor.svg @@ -1,2 +1,2 @@ -{{ item.meta.title }} - {{ item.meta.title }} - - - - - - - - + + + + + diff --git a/ruoyi-ui/src/components/Editor/index.vue b/yudao-admin-ui/src/components/Editor/index.vue similarity index 96% rename from ruoyi-ui/src/components/Editor/index.vue rename to yudao-admin-ui/src/components/Editor/index.vue index 905499536..ad35bbf5d 100644 --- a/ruoyi-ui/src/components/Editor/index.vue +++ b/yudao-admin-ui/src/components/Editor/index.vue @@ -1,195 +1,195 @@ - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/yudao-admin-ui/src/components/FileUpload/index.vue similarity index 100% rename from ruoyi-ui/src/components/FileUpload/index.vue rename to yudao-admin-ui/src/components/FileUpload/index.vue diff --git a/ruoyi-ui/src/components/Hamburger/index.vue b/yudao-admin-ui/src/components/Hamburger/index.vue similarity index 96% rename from ruoyi-ui/src/components/Hamburger/index.vue rename to yudao-admin-ui/src/components/Hamburger/index.vue index c6a4359be..368b00215 100644 --- a/ruoyi-ui/src/components/Hamburger/index.vue +++ b/yudao-admin-ui/src/components/Hamburger/index.vue @@ -1,44 +1,44 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/yudao-admin-ui/src/components/HeaderSearch/index.vue similarity index 95% rename from ruoyi-ui/src/components/HeaderSearch/index.vue rename to yudao-admin-ui/src/components/HeaderSearch/index.vue index b2533f395..67f6c309a 100644 --- a/ruoyi-ui/src/components/HeaderSearch/index.vue +++ b/yudao-admin-ui/src/components/HeaderSearch/index.vue @@ -1,188 +1,188 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/yudao-admin-ui/src/components/IconSelect/index.vue similarity index 95% rename from ruoyi-ui/src/components/IconSelect/index.vue rename to yudao-admin-ui/src/components/IconSelect/index.vue index a7512b2d6..b0ec9fa1a 100644 --- a/ruoyi-ui/src/components/IconSelect/index.vue +++ b/yudao-admin-ui/src/components/IconSelect/index.vue @@ -1,68 +1,68 @@ - - - - - - + + + + + + diff --git a/ruoyi-ui/src/components/IconSelect/requireIcons.js b/yudao-admin-ui/src/components/IconSelect/requireIcons.js similarity index 95% rename from ruoyi-ui/src/components/IconSelect/requireIcons.js rename to yudao-admin-ui/src/components/IconSelect/requireIcons.js index 5d3005df5..99e5c54cc 100644 --- a/ruoyi-ui/src/components/IconSelect/requireIcons.js +++ b/yudao-admin-ui/src/components/IconSelect/requireIcons.js @@ -1,11 +1,11 @@ - -const req = require.context('../../assets/icons/svg', false, /\.svg$/) -const requireAll = requireContext => requireContext.keys() - -const re = /\.\/(.*)\.svg/ - -const icons = requireAll(req).map(i => { - return i.match(re)[1] -}) - -export default icons + +const req = require.context('../../assets/icons/svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys() + +const re = /\.\/(.*)\.svg/ + +const icons = requireAll(req).map(i => { + return i.match(re)[1] +}) + +export default icons diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/yudao-admin-ui/src/components/ImageUpload/index.vue similarity index 100% rename from ruoyi-ui/src/components/ImageUpload/index.vue rename to yudao-admin-ui/src/components/ImageUpload/index.vue diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/yudao-admin-ui/src/components/Pagination/index.vue similarity index 94% rename from ruoyi-ui/src/components/Pagination/index.vue rename to yudao-admin-ui/src/components/Pagination/index.vue index 08ff09046..c815e132c 100644 --- a/ruoyi-ui/src/components/Pagination/index.vue +++ b/yudao-admin-ui/src/components/Pagination/index.vue @@ -1,101 +1,101 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/PanThumb/index.vue b/yudao-admin-ui/src/components/PanThumb/index.vue similarity index 95% rename from ruoyi-ui/src/components/PanThumb/index.vue rename to yudao-admin-ui/src/components/PanThumb/index.vue index 796b01b89..1bcf41709 100644 --- a/ruoyi-ui/src/components/PanThumb/index.vue +++ b/yudao-admin-ui/src/components/PanThumb/index.vue @@ -1,142 +1,142 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/ParentView/index.vue b/yudao-admin-ui/src/components/ParentView/index.vue similarity index 100% rename from ruoyi-ui/src/components/ParentView/index.vue rename to yudao-admin-ui/src/components/ParentView/index.vue diff --git a/ruoyi-ui/src/components/RightPanel/index.vue b/yudao-admin-ui/src/components/RightPanel/index.vue similarity index 95% rename from ruoyi-ui/src/components/RightPanel/index.vue rename to yudao-admin-ui/src/components/RightPanel/index.vue index 1534b9bee..fbf27eb4f 100644 --- a/ruoyi-ui/src/components/RightPanel/index.vue +++ b/yudao-admin-ui/src/components/RightPanel/index.vue @@ -1,149 +1,149 @@ - - - - - - - + + + + + + + diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/yudao-admin-ui/src/components/RightToolbar/index.vue similarity index 95% rename from ruoyi-ui/src/components/RightToolbar/index.vue rename to yudao-admin-ui/src/components/RightToolbar/index.vue index 73d2dccea..494c0b85e 100644 --- a/ruoyi-ui/src/components/RightToolbar/index.vue +++ b/yudao-admin-ui/src/components/RightToolbar/index.vue @@ -1,38 +1,38 @@ - - - + + + diff --git a/ruoyi-ui/src/components/RuoYi/Doc/index.vue b/yudao-admin-ui/src/components/RuoYi/Doc/index.vue similarity index 93% rename from ruoyi-ui/src/components/RuoYi/Doc/index.vue rename to yudao-admin-ui/src/components/RuoYi/Doc/index.vue index 1cba295aa..92ee3776c 100644 --- a/ruoyi-ui/src/components/RuoYi/Doc/index.vue +++ b/yudao-admin-ui/src/components/RuoYi/Doc/index.vue @@ -1,21 +1,21 @@ - - - + + + diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/yudao-admin-ui/src/components/RuoYi/Git/index.vue similarity index 93% rename from ruoyi-ui/src/components/RuoYi/Git/index.vue rename to yudao-admin-ui/src/components/RuoYi/Git/index.vue index 1d1cdfa75..b0d15f01d 100644 --- a/ruoyi-ui/src/components/RuoYi/Git/index.vue +++ b/yudao-admin-ui/src/components/RuoYi/Git/index.vue @@ -1,21 +1,21 @@ - - - + + + diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/yudao-admin-ui/src/components/Screenfull/index.vue similarity index 94% rename from ruoyi-ui/src/components/Screenfull/index.vue rename to yudao-admin-ui/src/components/Screenfull/index.vue index 85937c9c3..d4e539c26 100644 --- a/ruoyi-ui/src/components/Screenfull/index.vue +++ b/yudao-admin-ui/src/components/Screenfull/index.vue @@ -1,57 +1,57 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/SizeSelect/index.vue b/yudao-admin-ui/src/components/SizeSelect/index.vue similarity index 95% rename from ruoyi-ui/src/components/SizeSelect/index.vue rename to yudao-admin-ui/src/components/SizeSelect/index.vue index 5503b9712..e88065b49 100644 --- a/ruoyi-ui/src/components/SizeSelect/index.vue +++ b/yudao-admin-ui/src/components/SizeSelect/index.vue @@ -1,57 +1,57 @@ - - - + + + diff --git a/ruoyi-ui/src/components/SvgIcon/index.vue b/yudao-admin-ui/src/components/SvgIcon/index.vue similarity index 95% rename from ruoyi-ui/src/components/SvgIcon/index.vue rename to yudao-admin-ui/src/components/SvgIcon/index.vue index 340ace45c..e4bf5ade1 100644 --- a/ruoyi-ui/src/components/SvgIcon/index.vue +++ b/yudao-admin-ui/src/components/SvgIcon/index.vue @@ -1,61 +1,61 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/yudao-admin-ui/src/components/ThemePicker/index.vue similarity index 96% rename from ruoyi-ui/src/components/ThemePicker/index.vue rename to yudao-admin-ui/src/components/ThemePicker/index.vue index 9a77cd343..3879c5ad0 100644 --- a/ruoyi-ui/src/components/ThemePicker/index.vue +++ b/yudao-admin-ui/src/components/ThemePicker/index.vue @@ -1,175 +1,175 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/components/UploadImage/index.vue b/yudao-admin-ui/src/components/UploadImage/index.vue similarity index 95% rename from ruoyi-ui/src/components/UploadImage/index.vue rename to yudao-admin-ui/src/components/UploadImage/index.vue index 3941006a2..87b3ee94f 100644 --- a/ruoyi-ui/src/components/UploadImage/index.vue +++ b/yudao-admin-ui/src/components/UploadImage/index.vue @@ -1,68 +1,68 @@ - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/directive/permission/hasPermi.js b/yudao-admin-ui/src/directive/permission/hasPermi.js similarity index 96% rename from ruoyi-ui/src/directive/permission/hasPermi.js rename to yudao-admin-ui/src/directive/permission/hasPermi.js index 74f9d325d..d7107cec0 100644 --- a/ruoyi-ui/src/directive/permission/hasPermi.js +++ b/yudao-admin-ui/src/directive/permission/hasPermi.js @@ -1,28 +1,28 @@ - /** - * 操作权限处理 - * Copyright (c) 2019 ruoyi - */ - -import store from '@/store' - -export default { - inserted(el, binding, vnode) { - const { value } = binding - const all_permission = "*:*:*"; - const permissions = store.getters && store.getters.permissions - - if (value && value instanceof Array && value.length > 0) { - const permissionFlag = value - - const hasPermissions = permissions.some(permission => { - return all_permission === permission || permissionFlag.includes(permission) - }) - - if (!hasPermissions) { - el.parentNode && el.parentNode.removeChild(el) - } - } else { - throw new Error(`请设置操作权限标签值`) - } - } -} + /** + * 操作权限处理 + * Copyright (c) 2019 ruoyi + */ + +import store from '@/store' + +export default { + inserted(el, binding, vnode) { + const { value } = binding + const all_permission = "*:*:*"; + const permissions = store.getters && store.getters.permissions + + if (value && value instanceof Array && value.length > 0) { + const permissionFlag = value + + const hasPermissions = permissions.some(permission => { + return all_permission === permission || permissionFlag.includes(permission) + }) + + if (!hasPermissions) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置操作权限标签值`) + } + } +} diff --git a/ruoyi-ui/src/directive/permission/hasRole.js b/yudao-admin-ui/src/directive/permission/hasRole.js similarity index 95% rename from ruoyi-ui/src/directive/permission/hasRole.js rename to yudao-admin-ui/src/directive/permission/hasRole.js index ea966a34a..13038099d 100644 --- a/ruoyi-ui/src/directive/permission/hasRole.js +++ b/yudao-admin-ui/src/directive/permission/hasRole.js @@ -1,28 +1,28 @@ - /** - * 角色权限处理 - * Copyright (c) 2019 ruoyi - */ - -import store from '@/store' - -export default { - inserted(el, binding, vnode) { - const { value } = binding - const super_admin = "admin"; - const roles = store.getters && store.getters.roles - - if (value && value instanceof Array && value.length > 0) { - const roleFlag = value - - const hasRole = roles.some(role => { - return super_admin === role || roleFlag.includes(role) - }) - - if (!hasRole) { - el.parentNode && el.parentNode.removeChild(el) - } - } else { - throw new Error(`请设置角色权限标签值"`) - } - } -} + /** + * 角色权限处理 + * Copyright (c) 2019 ruoyi + */ + +import store from '@/store' + +export default { + inserted(el, binding, vnode) { + const { value } = binding + const super_admin = "admin"; + const roles = store.getters && store.getters.roles + + if (value && value instanceof Array && value.length > 0) { + const roleFlag = value + + const hasRole = roles.some(role => { + return super_admin === role || roleFlag.includes(role) + }) + + if (!hasRole) { + el.parentNode && el.parentNode.removeChild(el) + } + } else { + throw new Error(`请设置角色权限标签值"`) + } + } +} diff --git a/ruoyi-ui/src/directive/permission/index.js b/yudao-admin-ui/src/directive/permission/index.js similarity index 95% rename from ruoyi-ui/src/directive/permission/index.js rename to yudao-admin-ui/src/directive/permission/index.js index d6f530de1..e3d76d387 100644 --- a/ruoyi-ui/src/directive/permission/index.js +++ b/yudao-admin-ui/src/directive/permission/index.js @@ -1,15 +1,15 @@ -import hasRole from './hasRole' -import hasPermi from './hasPermi' - -const install = function(Vue) { - Vue.directive('hasRole', hasRole) - Vue.directive('hasPermi', hasPermi) -} - -if (window.Vue) { - window['hasRole'] = hasRole - window['hasPermi'] = hasPermi - Vue.use(install); // eslint-disable-line -} - -export default install +import hasRole from './hasRole' +import hasPermi from './hasPermi' + +const install = function(Vue) { + Vue.directive('hasRole', hasRole) + Vue.directive('hasPermi', hasPermi) +} + +if (window.Vue) { + window['hasRole'] = hasRole + window['hasPermi'] = hasPermi + Vue.use(install); // eslint-disable-line +} + +export default install diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/yudao-admin-ui/src/layout/components/AppMain.vue similarity index 94% rename from ruoyi-ui/src/layout/components/AppMain.vue rename to yudao-admin-ui/src/layout/components/AppMain.vue index 423437b72..a89763806 100644 --- a/ruoyi-ui/src/layout/components/AppMain.vue +++ b/yudao-admin-ui/src/layout/components/AppMain.vue @@ -1,57 +1,57 @@ - - - - - - - + + + + + + + diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/yudao-admin-ui/src/layout/components/Navbar.vue similarity index 96% rename from ruoyi-ui/src/layout/components/Navbar.vue rename to yudao-admin-ui/src/layout/components/Navbar.vue index db46ec556..b11460a37 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/yudao-admin-ui/src/layout/components/Navbar.vue @@ -1,187 +1,187 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/yudao-admin-ui/src/layout/components/Settings/index.vue similarity index 96% rename from ruoyi-ui/src/layout/components/Settings/index.vue rename to yudao-admin-ui/src/layout/components/Settings/index.vue index 7e495b7b0..9d42790a6 100644 --- a/ruoyi-ui/src/layout/components/Settings/index.vue +++ b/yudao-admin-ui/src/layout/components/Settings/index.vue @@ -1,197 +1,197 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js b/yudao-admin-ui/src/layout/components/Sidebar/FixiOSBug.js similarity index 95% rename from ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js rename to yudao-admin-ui/src/layout/components/Sidebar/FixiOSBug.js index 3d8cc21ed..682372699 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js +++ b/yudao-admin-ui/src/layout/components/Sidebar/FixiOSBug.js @@ -1,25 +1,25 @@ -export default { - computed: { - device() { - return this.$store.state.app.device - } - }, - mounted() { - // In order to fix the click on menu on the ios device will trigger the mouseleave bug - this.fixBugIniOS() - }, - methods: { - fixBugIniOS() { - const $subMenu = this.$refs.subMenu - if ($subMenu) { - const handleMouseleave = $subMenu.handleMouseleave - $subMenu.handleMouseleave = (e) => { - if (this.device === 'mobile') { - return - } - handleMouseleave(e) - } - } - } - } -} +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/yudao-admin-ui/src/layout/components/Sidebar/Item.vue similarity index 94% rename from ruoyi-ui/src/layout/components/Sidebar/Item.vue rename to yudao-admin-ui/src/layout/components/Sidebar/Item.vue index 1a99d63f9..b515f6159 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue +++ b/yudao-admin-ui/src/layout/components/Sidebar/Item.vue @@ -1,29 +1,29 @@ - + diff --git a/ruoyi-ui/src/layout/components/Sidebar/Link.vue b/yudao-admin-ui/src/layout/components/Sidebar/Link.vue similarity index 93% rename from ruoyi-ui/src/layout/components/Sidebar/Link.vue rename to yudao-admin-ui/src/layout/components/Sidebar/Link.vue index d235d10b6..530b3d5b3 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Link.vue +++ b/yudao-admin-ui/src/layout/components/Sidebar/Link.vue @@ -1,43 +1,43 @@ - - - + + + diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/yudao-admin-ui/src/layout/components/Sidebar/Logo.vue similarity index 95% rename from ruoyi-ui/src/layout/components/Sidebar/Logo.vue rename to yudao-admin-ui/src/layout/components/Sidebar/Logo.vue index 67e69e6e8..2c081d740 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/yudao-admin-ui/src/layout/components/Sidebar/Logo.vue @@ -1,93 +1,93 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/yudao-admin-ui/src/layout/components/Sidebar/SidebarItem.vue similarity index 96% rename from ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue rename to yudao-admin-ui/src/layout/components/Sidebar/SidebarItem.vue index 21f8f6a10..c4febee2d 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue +++ b/yudao-admin-ui/src/layout/components/Sidebar/SidebarItem.vue @@ -1,96 +1,96 @@ - - - + + + diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/yudao-admin-ui/src/layout/components/Sidebar/index.vue similarity index 97% rename from ruoyi-ui/src/layout/components/Sidebar/index.vue rename to yudao-admin-ui/src/layout/components/Sidebar/index.vue index 9fb23fb20..9e5d2bb3a 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/index.vue +++ b/yudao-admin-ui/src/layout/components/Sidebar/index.vue @@ -1,57 +1,57 @@ - - - + + + diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/yudao-admin-ui/src/layout/components/TagsView/ScrollPane.vue similarity index 96% rename from ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue rename to yudao-admin-ui/src/layout/components/TagsView/ScrollPane.vue index c110bf123..bb753a124 100644 --- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue +++ b/yudao-admin-ui/src/layout/components/TagsView/ScrollPane.vue @@ -1,94 +1,94 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/yudao-admin-ui/src/layout/components/TagsView/index.vue similarity index 96% rename from ruoyi-ui/src/layout/components/TagsView/index.vue rename to yudao-admin-ui/src/layout/components/TagsView/index.vue index dce967cfb..bc6ce188a 100644 --- a/ruoyi-ui/src/layout/components/TagsView/index.vue +++ b/yudao-admin-ui/src/layout/components/TagsView/index.vue @@ -1,303 +1,303 @@ - - - - - - - + + + + + + + diff --git a/ruoyi-ui/src/layout/components/global.js b/yudao-admin-ui/src/layout/components/global.js similarity index 95% rename from ruoyi-ui/src/layout/components/global.js rename to yudao-admin-ui/src/layout/components/global.js index 5d2b5b3e8..bbef1f20f 100644 --- a/ruoyi-ui/src/layout/components/global.js +++ b/yudao-admin-ui/src/layout/components/global.js @@ -1,3 +1,3 @@ -import Vue from 'vue' -const global = new Vue() -export default global +import Vue from 'vue' +const global = new Vue() +export default global diff --git a/ruoyi-ui/src/layout/components/index.js b/yudao-admin-ui/src/layout/components/index.js similarity index 98% rename from ruoyi-ui/src/layout/components/index.js rename to yudao-admin-ui/src/layout/components/index.js index 7f83004a8..104bd3ac6 100644 --- a/ruoyi-ui/src/layout/components/index.js +++ b/yudao-admin-ui/src/layout/components/index.js @@ -1,5 +1,5 @@ -export { default as AppMain } from './AppMain' -export { default as Navbar } from './Navbar' -export { default as Settings } from './Settings' -export { default as Sidebar } from './Sidebar/index.vue' -export { default as TagsView } from './TagsView/index.vue' +export { default as AppMain } from './AppMain' +export { default as Navbar } from './Navbar' +export { default as Settings } from './Settings' +export { default as Sidebar } from './Sidebar/index.vue' +export { default as TagsView } from './TagsView/index.vue' diff --git a/ruoyi-ui/src/layout/index.vue b/yudao-admin-ui/src/layout/index.vue similarity index 96% rename from ruoyi-ui/src/layout/index.vue rename to yudao-admin-ui/src/layout/index.vue index c6e9b3bc9..d4907719f 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/yudao-admin-ui/src/layout/index.vue @@ -1,108 +1,108 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/layout/mixin/ResizeHandler.js b/yudao-admin-ui/src/layout/mixin/ResizeHandler.js similarity index 96% rename from ruoyi-ui/src/layout/mixin/ResizeHandler.js rename to yudao-admin-ui/src/layout/mixin/ResizeHandler.js index b3fc8b26f..e8d0df8c2 100644 --- a/ruoyi-ui/src/layout/mixin/ResizeHandler.js +++ b/yudao-admin-ui/src/layout/mixin/ResizeHandler.js @@ -1,45 +1,45 @@ -import store from '@/store' - -const { body } = document -const WIDTH = 992 // refer to Bootstrap's responsive design - -export default { - watch: { - $route(route) { - if (this.device === 'mobile' && this.sidebar.opened) { - store.dispatch('app/closeSideBar', { withoutAnimation: false }) - } - } - }, - beforeMount() { - window.addEventListener('resize', this.$_resizeHandler) - }, - beforeDestroy() { - window.removeEventListener('resize', this.$_resizeHandler) - }, - mounted() { - const isMobile = this.$_isMobile() - if (isMobile) { - store.dispatch('app/toggleDevice', 'mobile') - store.dispatch('app/closeSideBar', { withoutAnimation: true }) - } - }, - methods: { - // use $_ for mixins properties - // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential - $_isMobile() { - const rect = body.getBoundingClientRect() - return rect.width - 1 < WIDTH - }, - $_resizeHandler() { - if (!document.hidden) { - const isMobile = this.$_isMobile() - store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') - - if (isMobile) { - store.dispatch('app/closeSideBar', { withoutAnimation: true }) - } - } - } - } -} +import store from '@/store' + +const { body } = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', { withoutAnimation: false }) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + } + } + } +} diff --git a/ruoyi-ui/src/main.js b/yudao-admin-ui/src/main.js similarity index 96% rename from ruoyi-ui/src/main.js rename to yudao-admin-ui/src/main.js index e1f067fa1..d9978300c 100644 --- a/ruoyi-ui/src/main.js +++ b/yudao-admin-ui/src/main.js @@ -1,99 +1,99 @@ -import Vue from 'vue' - -import Cookies from 'js-cookie' - -import Element from 'element-ui' -import './assets/styles/element-variables.scss' - -import '@/assets/styles/index.scss' // global css -import '@/assets/styles/ruoyi.scss' // ruoyi css -import App from './App' -import store from './store' -import router from './router' -import permission from './directive/permission' - -import './assets/icons' // icon -import './permission' // permission control -import { getDicts } from "@/api/system/dict/data"; -import { getConfigKey } from "@/api/infra/config"; -import { - parseTime, - resetForm, - addDateRange, - addBeginAndEndTime, - selectDictLabel, - download, - handleTree, - downloadExcel, - downloadWord, - downloadZip, - downloadHtml, - downloadMarkdown, -} from "@/utils/ruoyi"; -import Pagination from "@/components/Pagination"; -// 自定义表格工具扩展 -import RightToolbar from "@/components/RightToolbar" -// 代码高亮插件 -// import hljs from 'highlight.js' -// import 'highlight.js/styles/github-gist.css' -import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"; - -// 全局方法挂载 -Vue.prototype.getDicts = getDicts -Vue.prototype.getConfigKey = getConfigKey -Vue.prototype.parseTime = parseTime -Vue.prototype.resetForm = resetForm -Vue.prototype.addDateRange = addDateRange -Vue.prototype.addBeginAndEndTime = addBeginAndEndTime -Vue.prototype.selectDictLabel = selectDictLabel -Vue.prototype.getDictDatas = getDictDatas -Vue.prototype.getDictDataLabel = getDictDataLabel -Vue.prototype.DICT_TYPE = DICT_TYPE -Vue.prototype.download = download -Vue.prototype.downloadExcel = downloadExcel -Vue.prototype.downloadWord = downloadWord -Vue.prototype.downloadHtml = downloadHtml -Vue.prototype.downloadMarkdown = downloadMarkdown -Vue.prototype.downloadZip = downloadZip -Vue.prototype.handleTree = handleTree - -Vue.prototype.msgSuccess = function (msg) { - this.$message({ showClose: true, message: msg, type: "success" }); -} - -Vue.prototype.msgError = function (msg) { - this.$message({ showClose: true, message: msg, type: "error" }); -} - -Vue.prototype.msgInfo = function (msg) { - this.$message.info(msg); -} - -// 全局组件挂载 -Vue.component('Pagination', Pagination) -Vue.component('RightToolbar', RightToolbar) - -Vue.use(permission) -// Vue.use(hljs.vuePlugin); - -/** - * If you don't want to use mock-server - * you want to use MockJs for mock api - * you can execute: mockXHR() - * - * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! - */ - -Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size -}) - -Vue.config.productionTip = false - -new Vue({ - el: '#app', - router, - store, - render: h => h(App) -}) +import Vue from 'vue' + +import Cookies from 'js-cookie' + +import Element from 'element-ui' +import './assets/styles/element-variables.scss' + +import '@/assets/styles/index.scss' // global css +import '@/assets/styles/ruoyi.scss' // ruoyi css +import App from './App' +import store from './store' +import router from './router' +import permission from './directive/permission' + +import './assets/icons' // icon +import './permission' // permission control +import { getDicts } from "@/api/system/dict/data"; +import { getConfigKey } from "@/api/infra/config"; +import { + parseTime, + resetForm, + addDateRange, + addBeginAndEndTime, + selectDictLabel, + download, + handleTree, + downloadExcel, + downloadWord, + downloadZip, + downloadHtml, + downloadMarkdown, +} from "@/utils/ruoyi"; +import Pagination from "@/components/Pagination"; +// 自定义表格工具扩展 +import RightToolbar from "@/components/RightToolbar" +// 代码高亮插件 +// import hljs from 'highlight.js' +// import 'highlight.js/styles/github-gist.css' +import {DICT_TYPE, getDictDataLabel, getDictDatas} from "@/utils/dict"; + +// 全局方法挂载 +Vue.prototype.getDicts = getDicts +Vue.prototype.getConfigKey = getConfigKey +Vue.prototype.parseTime = parseTime +Vue.prototype.resetForm = resetForm +Vue.prototype.addDateRange = addDateRange +Vue.prototype.addBeginAndEndTime = addBeginAndEndTime +Vue.prototype.selectDictLabel = selectDictLabel +Vue.prototype.getDictDatas = getDictDatas +Vue.prototype.getDictDataLabel = getDictDataLabel +Vue.prototype.DICT_TYPE = DICT_TYPE +Vue.prototype.download = download +Vue.prototype.downloadExcel = downloadExcel +Vue.prototype.downloadWord = downloadWord +Vue.prototype.downloadHtml = downloadHtml +Vue.prototype.downloadMarkdown = downloadMarkdown +Vue.prototype.downloadZip = downloadZip +Vue.prototype.handleTree = handleTree + +Vue.prototype.msgSuccess = function (msg) { + this.$message({ showClose: true, message: msg, type: "success" }); +} + +Vue.prototype.msgError = function (msg) { + this.$message({ showClose: true, message: msg, type: "error" }); +} + +Vue.prototype.msgInfo = function (msg) { + this.$message.info(msg); +} + +// 全局组件挂载 +Vue.component('Pagination', Pagination) +Vue.component('RightToolbar', RightToolbar) + +Vue.use(permission) +// Vue.use(hljs.vuePlugin); + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online! ! ! + */ + +Vue.use(Element, { + size: Cookies.get('size') || 'medium' // set element-ui default size +}) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/ruoyi-ui/src/permission.js b/yudao-admin-ui/src/permission.js similarity index 96% rename from ruoyi-ui/src/permission.js rename to yudao-admin-ui/src/permission.js index ccb20eb78..dbca87b28 100644 --- a/ruoyi-ui/src/permission.js +++ b/yudao-admin-ui/src/permission.js @@ -1,56 +1,56 @@ -import router from './router' -import store from './store' -import { Message } from 'element-ui' -import NProgress from 'nprogress' -import 'nprogress/nprogress.css' -import { getToken } from '@/utils/auth' - -NProgress.configure({ showSpinner: false }) - -const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] - -router.beforeEach((to, from, next) => { - NProgress.start() - if (getToken()) { - /* has token*/ - if (to.path === '/login') { - next({ path: '/' }) - NProgress.done() - } else { - if (store.getters.roles.length === 0) { - // 获取字典数据 - store.dispatch('dict/loadDictDatas') - // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(res => { - // 拉取user_info - const roles = res.roles - store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => { - // 根据roles权限生成可访问的路由表 - router.addRoutes(accessRoutes) // 动态添加可访问路由表 - next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 - }) - }).catch(err => { - store.dispatch('LogOut').then(() => { - Message.error(err) - next({ path: '/' }) - }) - }) - } else { - next() - } - } - } else { - // 没有token - if (whiteList.indexOf(to.path) !== -1) { - // 在免登录白名单，直接进入 - next() - } else { - next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 - NProgress.done() - } - } -}) - -router.afterEach(() => { - NProgress.done() -}) +import router from './router' +import store from './store' +import { Message } from 'element-ui' +import NProgress from 'nprogress' +import 'nprogress/nprogress.css' +import { getToken } from '@/utils/auth' + +NProgress.configure({ showSpinner: false }) + +const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] + +router.beforeEach((to, from, next) => { + NProgress.start() + if (getToken()) { + /* has token*/ + if (to.path === '/login') { + next({ path: '/' }) + NProgress.done() + } else { + if (store.getters.roles.length === 0) { + // 获取字典数据 + store.dispatch('dict/loadDictDatas') + // 判断当前用户是否已拉取完user_info信息 + store.dispatch('GetInfo').then(res => { + // 拉取user_info + const roles = res.roles + store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => { + // 根据roles权限生成可访问的路由表 + router.addRoutes(accessRoutes) // 动态添加可访问路由表 + next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 + }) + }).catch(err => { + store.dispatch('LogOut').then(() => { + Message.error(err) + next({ path: '/' }) + }) + }) + } else { + next() + } + } + } else { + // 没有token + if (whiteList.indexOf(to.path) !== -1) { + // 在免登录白名单，直接进入 + next() + } else { + next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + NProgress.done() + } + } +}) + +router.afterEach(() => { + NProgress.done() +}) diff --git a/ruoyi-ui/src/router/index.js b/yudao-admin-ui/src/router/index.js similarity index 96% rename from ruoyi-ui/src/router/index.js rename to yudao-admin-ui/src/router/index.js index b4216c0db..a4f676306 100644 --- a/ruoyi-ui/src/router/index.js +++ b/yudao-admin-ui/src/router/index.js @@ -1,128 +1,128 @@ -import Vue from 'vue' -import Router from 'vue-router' - -Vue.use(Router) - -/* Layout */ -import Layout from '@/layout' -import ParentView from '@/components/ParentView'; - -/** - * Note: 路由配置项 - * - * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1 - * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 - * // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面 - * // 若你想不管路由下面的 children 声明的个数都显示你的根路由 - * // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由 - * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 - * name:'router-name' // 设定路由的名字，一定要填写不然使用时会出现各种问题 - * meta : { - noCache: true // 如果设置为true，则不会被 缓存(默认 false) - title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 - icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg - breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示 - } - */ - -// 公共路由 -export const constantRoutes = [ - { - path: '/redirect', - component: Layout, - hidden: true, - children: [ - { - path: '/redirect/:path(.*)', - component: (resolve) => require(['@/views/redirect'], resolve) - } - ] - }, - { - path: '/login', - component: (resolve) => require(['@/views/login'], resolve), - hidden: true - }, - { - path: '/404', - component: (resolve) => require(['@/views/error/404'], resolve), - hidden: true - }, - { - path: '/401', - component: (resolve) => require(['@/views/error/401'], resolve), - hidden: true - }, - { - path: '', - component: Layout, - redirect: 'index', - children: [ - { - path: 'index', - component: (resolve) => require(['@/views/index'], resolve), - name: '首页', - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } - } - ] - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [ - { - path: 'profile', - component: (resolve) => require(['@/views/system/user/profile/index'], resolve), - name: 'Profile', - meta: { title: '个人中心', icon: 'user' } - } - ] - }, - { - path: '/dict', - component: Layout, - hidden: true, - children: [ - { - path: 'type/data/:dictId(\\d+)', - component: (resolve) => require(['@/views/system/dict/data'], resolve), - name: 'Data', - meta: { title: '字典数据', icon: '' } - } - ] - }, - { - path: '/job', - component: Layout, - hidden: true, - children: [ - { - path: 'log', - component: (resolve) => require(['@/views/infra/job/log'], resolve), - name: 'JobLog', - meta: { title: '调度日志' } - } - ] - }, - { - path: '/codegen', - component: Layout, - hidden: true, - children: [ - { - path: 'edit/:tableId(\\d+)', - component: (resolve) => require(['@/views/tool/codegen/editTable'], resolve), - name: 'GenEdit', - meta: { title: '修改生成配置' } - } - ] - } -] - -export default new Router({ - mode: 'history', // 去掉url中的# - scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes -}) +import Vue from 'vue' +import Router from 'vue-router' + +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' +import ParentView from '@/components/ParentView'; + +/** + * Note: 路由配置项 + * + * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1 + * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 + * // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面 + * // 若你想不管路由下面的 children 声明的个数都显示你的根路由 + * // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由 + * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 + * name:'router-name' // 设定路由的名字，一定要填写不然使用时会出现各种问题 + * meta : { + noCache: true // 如果设置为true，则不会被 缓存(默认 false) + title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 + icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg + breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示 + } + */ + +// 公共路由 +export const constantRoutes = [ + { + path: '/redirect', + component: Layout, + hidden: true, + children: [ + { + path: '/redirect/:path(.*)', + component: (resolve) => require(['@/views/redirect'], resolve) + } + ] + }, + { + path: '/login', + component: (resolve) => require(['@/views/login'], resolve), + hidden: true + }, + { + path: '/404', + component: (resolve) => require(['@/views/error/404'], resolve), + hidden: true + }, + { + path: '/401', + component: (resolve) => require(['@/views/error/401'], resolve), + hidden: true + }, + { + path: '', + component: Layout, + redirect: 'index', + children: [ + { + path: 'index', + component: (resolve) => require(['@/views/index'], resolve), + name: '首页', + meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + } + ] + }, + { + path: '/user', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'profile', + component: (resolve) => require(['@/views/system/user/profile/index'], resolve), + name: 'Profile', + meta: { title: '个人中心', icon: 'user' } + } + ] + }, + { + path: '/dict', + component: Layout, + hidden: true, + children: [ + { + path: 'type/data/:dictId(\\d+)', + component: (resolve) => require(['@/views/system/dict/data'], resolve), + name: 'Data', + meta: { title: '字典数据', icon: '' } + } + ] + }, + { + path: '/job', + component: Layout, + hidden: true, + children: [ + { + path: 'log', + component: (resolve) => require(['@/views/infra/job/log'], resolve), + name: 'JobLog', + meta: { title: '调度日志' } + } + ] + }, + { + path: '/codegen', + component: Layout, + hidden: true, + children: [ + { + path: 'edit/:tableId(\\d+)', + component: (resolve) => require(['@/views/tool/codegen/editTable'], resolve), + name: 'GenEdit', + meta: { title: '修改生成配置' } + } + ] + } +] + +export default new Router({ + mode: 'history', // 去掉url中的# + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes +}) diff --git a/ruoyi-ui/src/settings.js b/yudao-admin-ui/src/settings.js similarity index 95% rename from ruoyi-ui/src/settings.js rename to yudao-admin-ui/src/settings.js index 9e76ba6a9..fc172cbcd 100644 --- a/ruoyi-ui/src/settings.js +++ b/yudao-admin-ui/src/settings.js @@ -1,36 +1,36 @@ -module.exports = { - title: '芋道管理系统', - - /** - * 侧边栏主题 深色主题theme-dark，浅色主题theme-light - */ - sideTheme: 'theme-dark', - - /** - * 是否系统布局配置 - */ - showSettings: false, - - /** - * 是否显示 tagsView - */ - tagsView: true, - - /** - * 是否固定头部 - */ - fixedHeader: false, - - /** - * 是否显示logo - */ - sidebarLogo: true, - - /** - * @type {string | array} 'production' | ['production', 'development'] - * @description Need show err logs component. - * The default is only used in the production env - * If you want to also use it in dev, you can pass ['production', 'development'] - */ - errorLog: 'production' -} +module.exports = { + title: '芋道管理系统', + + /** + * 侧边栏主题 深色主题theme-dark，浅色主题theme-light + */ + sideTheme: 'theme-dark', + + /** + * 是否系统布局配置 + */ + showSettings: false, + + /** + * 是否显示 tagsView + */ + tagsView: true, + + /** + * 是否固定头部 + */ + fixedHeader: false, + + /** + * 是否显示logo + */ + sidebarLogo: true, + + /** + * @type {string | array} 'production' | ['production', 'development'] + * @description Need show err logs component. + * The default is only used in the production env + * If you want to also use it in dev, you can pass ['production', 'development'] + */ + errorLog: 'production' +} diff --git a/ruoyi-ui/src/store/getters.js b/yudao-admin-ui/src/store/getters.js similarity index 97% rename from ruoyi-ui/src/store/getters.js rename to yudao-admin-ui/src/store/getters.js index 813d838a6..4d17d51ad 100644 --- a/ruoyi-ui/src/store/getters.js +++ b/yudao-admin-ui/src/store/getters.js @@ -1,18 +1,18 @@ -const getters = { - sidebar: state => state.app.sidebar, - size: state => state.app.size, - device: state => state.app.device, - visitedViews: state => state.tagsView.visitedViews, - cachedViews: state => state.tagsView.cachedViews, - token: state => state.user.token, - avatar: state => state.user.avatar, - name: state => state.user.name, - introduction: state => state.user.introduction, - roles: state => state.user.roles, - permissions: state => state.user.permissions, - permission_routes: state => state.permission.routes, - sidebarRouters:state => state.permission.sidebarRouters, - // 数据字典 - dict_datas: state => state.dict.dictDatas -} -export default getters +const getters = { + sidebar: state => state.app.sidebar, + size: state => state.app.size, + device: state => state.app.device, + visitedViews: state => state.tagsView.visitedViews, + cachedViews: state => state.tagsView.cachedViews, + token: state => state.user.token, + avatar: state => state.user.avatar, + name: state => state.user.name, + introduction: state => state.user.introduction, + roles: state => state.user.roles, + permissions: state => state.user.permissions, + permission_routes: state => state.permission.routes, + sidebarRouters:state => state.permission.sidebarRouters, + // 数据字典 + dict_datas: state => state.dict.dictDatas +} +export default getters diff --git a/ruoyi-ui/src/store/index.js b/yudao-admin-ui/src/store/index.js similarity index 95% rename from ruoyi-ui/src/store/index.js rename to yudao-admin-ui/src/store/index.js index 7e9db3347..116d6d689 100644 --- a/ruoyi-ui/src/store/index.js +++ b/yudao-admin-ui/src/store/index.js @@ -1,25 +1,25 @@ -import Vue from 'vue' -import Vuex from 'vuex' -import app from './modules/app' -import user from './modules/user' -import tagsView from './modules/tagsView' -import permission from './modules/permission' -import settings from './modules/settings' -import dict from './modules/dict' -import getters from './getters' - -Vue.use(Vuex) - -const store = new Vuex.Store({ - modules: { - app, - user, - tagsView, - permission, - settings, - dict - }, - getters -}) - -export default store +import Vue from 'vue' +import Vuex from 'vuex' +import app from './modules/app' +import user from './modules/user' +import tagsView from './modules/tagsView' +import permission from './modules/permission' +import settings from './modules/settings' +import dict from './modules/dict' +import getters from './getters' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + user, + tagsView, + permission, + settings, + dict + }, + getters +}) + +export default store diff --git a/ruoyi-ui/src/store/modules/app.js b/yudao-admin-ui/src/store/modules/app.js similarity index 95% rename from ruoyi-ui/src/store/modules/app.js rename to yudao-admin-ui/src/store/modules/app.js index c8d8ee91e..45d89bb96 100644 --- a/ruoyi-ui/src/store/modules/app.js +++ b/yudao-admin-ui/src/store/modules/app.js @@ -1,56 +1,56 @@ -import Cookies from 'js-cookie' - -const state = { - sidebar: { - opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, - withoutAnimation: false - }, - device: 'desktop', - size: Cookies.get('size') || 'medium' -} - -const mutations = { - TOGGLE_SIDEBAR: state => { - state.sidebar.opened = !state.sidebar.opened - state.sidebar.withoutAnimation = false - if (state.sidebar.opened) { - Cookies.set('sidebarStatus', 1) - } else { - Cookies.set('sidebarStatus', 0) - } - }, - CLOSE_SIDEBAR: (state, withoutAnimation) => { - Cookies.set('sidebarStatus', 0) - state.sidebar.opened = false - state.sidebar.withoutAnimation = withoutAnimation - }, - TOGGLE_DEVICE: (state, device) => { - state.device = device - }, - SET_SIZE: (state, size) => { - state.size = size - Cookies.set('size', size) - } -} - -const actions = { - toggleSideBar({ commit }) { - commit('TOGGLE_SIDEBAR') - }, - closeSideBar({ commit }, { withoutAnimation }) { - commit('CLOSE_SIDEBAR', withoutAnimation) - }, - toggleDevice({ commit }, device) { - commit('TOGGLE_DEVICE', device) - }, - setSize({ commit }, size) { - commit('SET_SIZE', size) - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop', + size: Cookies.get('size') || 'medium' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + }, + SET_SIZE: (state, size) => { + state.size = size + Cookies.set('size', size) + } +} + +const actions = { + toggleSideBar({ commit }) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({ commit }, { withoutAnimation }) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({ commit }, device) { + commit('TOGGLE_DEVICE', device) + }, + setSize({ commit }, size) { + commit('SET_SIZE', size) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/ruoyi-ui/src/store/modules/dict.js b/yudao-admin-ui/src/store/modules/dict.js similarity index 100% rename from ruoyi-ui/src/store/modules/dict.js rename to yudao-admin-ui/src/store/modules/dict.js diff --git a/ruoyi-ui/src/store/modules/permission.js b/yudao-admin-ui/src/store/modules/permission.js similarity index 96% rename from ruoyi-ui/src/store/modules/permission.js rename to yudao-admin-ui/src/store/modules/permission.js index 090b07061..0e071e7eb 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/yudao-admin-ui/src/store/modules/permission.js @@ -1,98 +1,98 @@ -import { constantRoutes } from '@/router' -import { getRouters } from '@/api/menu' -import Layout from '@/layout/index' -import ParentView from '@/components/ParentView'; - -const permission = { - state: { - routes: [], - addRoutes: [], - sidebarRouters: [] - }, - mutations: { - SET_ROUTES: (state, routes) => { - state.addRoutes = routes - state.routes = constantRoutes.concat(routes) - }, - SET_SIDEBAR_ROUTERS: (state, routers) => { - state.sidebarRouters = constantRoutes.concat(routers) - }, - }, - actions: { - // 生成路由 - GenerateRoutes({ commit }) { - return new Promise(resolve => { - // 向后端请求路由数据 - getRouters().then(res => { - const sdata = JSON.parse(JSON.stringify(res.data)) - const rdata = JSON.parse(JSON.stringify(res.data)) - const sidebarRoutes = filterAsyncRouter(sdata) - const rewriteRoutes = filterAsyncRouter(rdata, true) - rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) - commit('SET_ROUTES', rewriteRoutes) - commit('SET_SIDEBAR_ROUTERS', sidebarRoutes) - resolve(rewriteRoutes) - }) - }) - } - } -} - -// 遍历后台传来的路由字符串，转换为组件对象 -function filterAsyncRouter(asyncRouterMap, isRewrite = false) { - return asyncRouterMap.filter(route => { - // 将 ruoyi 后端原有耦合前端的逻辑，迁移到此处 - // 处理 meta 属性 - route.meta = { - title: route.name, - icon: route.icon - } - // 处理 component 属性 - if (route.children) { // 父节点 - // debugger - if (route.parentId === 0) { - route.component = Layout - } else { - route.component = ParentView - } - } else { // 根节点 - route.component = loadView(route.component) - } - - // filterChildren - if (isRewrite && route.children) { - route.children = filterChildren(route.children) - } - if (route.children != null && route.children && route.children.length) { - route.children = filterAsyncRouter(route.children, route, isRewrite) - } - return true - }) -} - -function filterChildren(childrenMap) { - var children = [] - childrenMap.forEach((el, index) => { - if (el.children && el.children.length) { - if (el.component === 'ParentView') { - el.children.forEach(c => { - c.path = el.path + '/' + c.path - if (c.children && c.children.length) { - children = children.concat(filterChildren(c.children, c)) - return - } - children.push(c) - }) - return - } - } - children = children.concat(el) - }) - return children -} - -export const loadView = (view) => { // 路由懒加载 - return (resolve) => require([`@/views/${view}`], resolve) -} - -export default permission +import { constantRoutes } from '@/router' +import { getRouters } from '@/api/menu' +import Layout from '@/layout/index' +import ParentView from '@/components/ParentView'; + +const permission = { + state: { + routes: [], + addRoutes: [], + sidebarRouters: [] + }, + mutations: { + SET_ROUTES: (state, routes) => { + state.addRoutes = routes + state.routes = constantRoutes.concat(routes) + }, + SET_SIDEBAR_ROUTERS: (state, routers) => { + state.sidebarRouters = constantRoutes.concat(routers) + }, + }, + actions: { + // 生成路由 + GenerateRoutes({ commit }) { + return new Promise(resolve => { + // 向后端请求路由数据 + getRouters().then(res => { + const sdata = JSON.parse(JSON.stringify(res.data)) + const rdata = JSON.parse(JSON.stringify(res.data)) + const sidebarRoutes = filterAsyncRouter(sdata) + const rewriteRoutes = filterAsyncRouter(rdata, true) + rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) + commit('SET_ROUTES', rewriteRoutes) + commit('SET_SIDEBAR_ROUTERS', sidebarRoutes) + resolve(rewriteRoutes) + }) + }) + } + } +} + +// 遍历后台传来的路由字符串，转换为组件对象 +function filterAsyncRouter(asyncRouterMap, isRewrite = false) { + return asyncRouterMap.filter(route => { + // 将 ruoyi 后端原有耦合前端的逻辑，迁移到此处 + // 处理 meta 属性 + route.meta = { + title: route.name, + icon: route.icon + } + // 处理 component 属性 + if (route.children) { // 父节点 + // debugger + if (route.parentId === 0) { + route.component = Layout + } else { + route.component = ParentView + } + } else { // 根节点 + route.component = loadView(route.component) + } + + // filterChildren + if (isRewrite && route.children) { + route.children = filterChildren(route.children) + } + if (route.children != null && route.children && route.children.length) { + route.children = filterAsyncRouter(route.children, route, isRewrite) + } + return true + }) +} + +function filterChildren(childrenMap) { + var children = [] + childrenMap.forEach((el, index) => { + if (el.children && el.children.length) { + if (el.component === 'ParentView') { + el.children.forEach(c => { + c.path = el.path + '/' + c.path + if (c.children && c.children.length) { + children = children.concat(filterChildren(c.children, c)) + return + } + children.push(c) + }) + return + } + } + children = children.concat(el) + }) + return children +} + +export const loadView = (view) => { // 路由懒加载 + return (resolve) => require([`@/views/${view}`], resolve) +} + +export default permission diff --git a/ruoyi-ui/src/store/modules/settings.js b/yudao-admin-ui/src/store/modules/settings.js similarity index 95% rename from ruoyi-ui/src/store/modules/settings.js rename to yudao-admin-ui/src/store/modules/settings.js index a246a3c4a..8bd81a387 100644 --- a/ruoyi-ui/src/store/modules/settings.js +++ b/yudao-admin-ui/src/store/modules/settings.js @@ -1,35 +1,35 @@ -import variables from '@/assets/styles/element-variables.scss' -import defaultSettings from '@/settings' - -const { sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings - -const state = { - theme: variables.theme, - sideTheme: sideTheme, - showSettings: showSettings, - tagsView: tagsView, - fixedHeader: fixedHeader, - sidebarLogo: sidebarLogo -} - -const mutations = { - CHANGE_SETTING: (state, { key, value }) => { - if (state.hasOwnProperty(key)) { - state[key] = value - } - } -} - -const actions = { - changeSetting({ commit }, data) { - commit('CHANGE_SETTING', data) - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} - +import variables from '@/assets/styles/element-variables.scss' +import defaultSettings from '@/settings' + +const { sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings + +const state = { + theme: variables.theme, + sideTheme: sideTheme, + showSettings: showSettings, + tagsView: tagsView, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, { key, value }) => { + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({ commit }, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/ruoyi-ui/src/store/modules/tagsView.js b/yudao-admin-ui/src/store/modules/tagsView.js similarity index 96% rename from ruoyi-ui/src/store/modules/tagsView.js rename to yudao-admin-ui/src/store/modules/tagsView.js index abec62289..2e30d1569 100644 --- a/ruoyi-ui/src/store/modules/tagsView.js +++ b/yudao-admin-ui/src/store/modules/tagsView.js @@ -1,159 +1,159 @@ -const state = { - visitedViews: [], - cachedViews: [] -} - -const mutations = { - ADD_VISITED_VIEW: (state, view) => { - if (state.visitedViews.some(v => v.path === view.path)) return - state.visitedViews.push( - Object.assign({}, view, { - title: view.meta.title || 'no-name' - }) - ) - }, - ADD_CACHED_VIEW: (state, view) => { - if (state.cachedViews.includes(view.name)) return - if (!view.meta.noCache) { - state.cachedViews.push(view.name) - } - }, - - DEL_VISITED_VIEW: (state, view) => { - for (const [i, v] of state.visitedViews.entries()) { - if (v.path === view.path) { - state.visitedViews.splice(i, 1) - break - } - } - }, - DEL_CACHED_VIEW: (state, view) => { - const index = state.cachedViews.indexOf(view.name) - index > -1 && state.cachedViews.splice(index, 1) - }, - - DEL_OTHERS_VISITED_VIEWS: (state, view) => { - state.visitedViews = state.visitedViews.filter(v => { - return v.meta.affix || v.path === view.path - }) - }, - DEL_OTHERS_CACHED_VIEWS: (state, view) => { - const index = state.cachedViews.indexOf(view.name) - if (index > -1) { - state.cachedViews = state.cachedViews.slice(index, index + 1) - } else { - state.cachedViews = [] - } - }, - - DEL_ALL_VISITED_VIEWS: state => { - // keep affix tags - const affixTags = state.visitedViews.filter(tag => tag.meta.affix) - state.visitedViews = affixTags - }, - DEL_ALL_CACHED_VIEWS: state => { - state.cachedViews = [] - }, - - UPDATE_VISITED_VIEW: (state, view) => { - for (let v of state.visitedViews) { - if (v.path === view.path) { - v = Object.assign(v, view) - break - } - } - } -} - -const actions = { - addView({ dispatch }, view) { - dispatch('addVisitedView', view) - dispatch('addCachedView', view) - }, - addVisitedView({ commit }, view) { - commit('ADD_VISITED_VIEW', view) - }, - addCachedView({ commit }, view) { - commit('ADD_CACHED_VIEW', view) - }, - - delView({ dispatch, state }, view) { - return new Promise(resolve => { - dispatch('delVisitedView', view) - dispatch('delCachedView', view) - resolve({ - visitedViews: [...state.visitedViews], - cachedViews: [...state.cachedViews] - }) - }) - }, - delVisitedView({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_VISITED_VIEW', view) - resolve([...state.visitedViews]) - }) - }, - delCachedView({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_CACHED_VIEW', view) - resolve([...state.cachedViews]) - }) - }, - - delOthersViews({ dispatch, state }, view) { - return new Promise(resolve => { - dispatch('delOthersVisitedViews', view) - dispatch('delOthersCachedViews', view) - resolve({ - visitedViews: [...state.visitedViews], - cachedViews: [...state.cachedViews] - }) - }) - }, - delOthersVisitedViews({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_OTHERS_VISITED_VIEWS', view) - resolve([...state.visitedViews]) - }) - }, - delOthersCachedViews({ commit, state }, view) { - return new Promise(resolve => { - commit('DEL_OTHERS_CACHED_VIEWS', view) - resolve([...state.cachedViews]) - }) - }, - - delAllViews({ dispatch, state }, view) { - return new Promise(resolve => { - dispatch('delAllVisitedViews', view) - dispatch('delAllCachedViews', view) - resolve({ - visitedViews: [...state.visitedViews], - cachedViews: [...state.cachedViews] - }) - }) - }, - delAllVisitedViews({ commit, state }) { - return new Promise(resolve => { - commit('DEL_ALL_VISITED_VIEWS') - resolve([...state.visitedViews]) - }) - }, - delAllCachedViews({ commit, state }) { - return new Promise(resolve => { - commit('DEL_ALL_CACHED_VIEWS') - resolve([...state.cachedViews]) - }) - }, - - updateVisitedView({ commit }, view) { - commit('UPDATE_VISITED_VIEW', view) - } -} - -export default { - namespaced: true, - state, - mutations, - actions -} +const state = { + visitedViews: [], + cachedViews: [] +} + +const mutations = { + ADD_VISITED_VIEW: (state, view) => { + if (state.visitedViews.some(v => v.path === view.path)) return + state.visitedViews.push( + Object.assign({}, view, { + title: view.meta.title || 'no-name' + }) + ) + }, + ADD_CACHED_VIEW: (state, view) => { + if (state.cachedViews.includes(view.name)) return + if (!view.meta.noCache) { + state.cachedViews.push(view.name) + } + }, + + DEL_VISITED_VIEW: (state, view) => { + for (const [i, v] of state.visitedViews.entries()) { + if (v.path === view.path) { + state.visitedViews.splice(i, 1) + break + } + } + }, + DEL_CACHED_VIEW: (state, view) => { + const index = state.cachedViews.indexOf(view.name) + index > -1 && state.cachedViews.splice(index, 1) + }, + + DEL_OTHERS_VISITED_VIEWS: (state, view) => { + state.visitedViews = state.visitedViews.filter(v => { + return v.meta.affix || v.path === view.path + }) + }, + DEL_OTHERS_CACHED_VIEWS: (state, view) => { + const index = state.cachedViews.indexOf(view.name) + if (index > -1) { + state.cachedViews = state.cachedViews.slice(index, index + 1) + } else { + state.cachedViews = [] + } + }, + + DEL_ALL_VISITED_VIEWS: state => { + // keep affix tags + const affixTags = state.visitedViews.filter(tag => tag.meta.affix) + state.visitedViews = affixTags + }, + DEL_ALL_CACHED_VIEWS: state => { + state.cachedViews = [] + }, + + UPDATE_VISITED_VIEW: (state, view) => { + for (let v of state.visitedViews) { + if (v.path === view.path) { + v = Object.assign(v, view) + break + } + } + } +} + +const actions = { + addView({ dispatch }, view) { + dispatch('addVisitedView', view) + dispatch('addCachedView', view) + }, + addVisitedView({ commit }, view) { + commit('ADD_VISITED_VIEW', view) + }, + addCachedView({ commit }, view) { + commit('ADD_CACHED_VIEW', view) + }, + + delView({ dispatch, state }, view) { + return new Promise(resolve => { + dispatch('delVisitedView', view) + dispatch('delCachedView', view) + resolve({ + visitedViews: [...state.visitedViews], + cachedViews: [...state.cachedViews] + }) + }) + }, + delVisitedView({ commit, state }, view) { + return new Promise(resolve => { + commit('DEL_VISITED_VIEW', view) + resolve([...state.visitedViews]) + }) + }, + delCachedView({ commit, state }, view) { + return new Promise(resolve => { + commit('DEL_CACHED_VIEW', view) + resolve([...state.cachedViews]) + }) + }, + + delOthersViews({ dispatch, state }, view) { + return new Promise(resolve => { + dispatch('delOthersVisitedViews', view) + dispatch('delOthersCachedViews', view) + resolve({ + visitedViews: [...state.visitedViews], + cachedViews: [...state.cachedViews] + }) + }) + }, + delOthersVisitedViews({ commit, state }, view) { + return new Promise(resolve => { + commit('DEL_OTHERS_VISITED_VIEWS', view) + resolve([...state.visitedViews]) + }) + }, + delOthersCachedViews({ commit, state }, view) { + return new Promise(resolve => { + commit('DEL_OTHERS_CACHED_VIEWS', view) + resolve([...state.cachedViews]) + }) + }, + + delAllViews({ dispatch, state }, view) { + return new Promise(resolve => { + dispatch('delAllVisitedViews', view) + dispatch('delAllCachedViews', view) + resolve({ + visitedViews: [...state.visitedViews], + cachedViews: [...state.cachedViews] + }) + }) + }, + delAllVisitedViews({ commit, state }) { + return new Promise(resolve => { + commit('DEL_ALL_VISITED_VIEWS') + resolve([...state.visitedViews]) + }) + }, + delAllCachedViews({ commit, state }) { + return new Promise(resolve => { + commit('DEL_ALL_CACHED_VIEWS') + resolve([...state.cachedViews]) + }) + }, + + updateVisitedView({ commit }, view) { + commit('UPDATE_VISITED_VIEW', view) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/ruoyi-ui/src/store/modules/user.js b/yudao-admin-ui/src/store/modules/user.js similarity index 96% rename from ruoyi-ui/src/store/modules/user.js rename to yudao-admin-ui/src/store/modules/user.js index f7084c59c..eb8669d3a 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/yudao-admin-ui/src/store/modules/user.js @@ -1,98 +1,98 @@ -import { login, logout, getInfo } from '@/api/login' -import { getToken, setToken, removeToken } from '@/utils/auth' - -const user = { - state: { - token: getToken(), - name: '', - avatar: '', - roles: [], - permissions: [] - }, - - mutations: { - SET_TOKEN: (state, token) => { - state.token = token - }, - SET_NAME: (state, name) => { - state.name = name - }, - SET_AVATAR: (state, avatar) => { - state.avatar = avatar - }, - SET_ROLES: (state, roles) => { - state.roles = roles - }, - SET_PERMISSIONS: (state, permissions) => { - state.permissions = permissions - } - }, - - actions: { - // 登录 - Login({ commit }, userInfo) { - const username = userInfo.username.trim() - const password = userInfo.password - const code = userInfo.code - const uuid = userInfo.uuid - return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { - res = res.data; - setToken(res.token) - commit('SET_TOKEN', res.token) - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // 获取用户信息 - GetInfo({ commit, state }) { - return new Promise((resolve, reject) => { - getInfo(state.token).then(res => { - res = res.data; // 读取 data 数据 - const user = res.user - const avatar = user.avatar === "" ? require("@/assets/images/profile.jpg") : user.avatar; - if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 - commit('SET_ROLES', res.roles) - commit('SET_PERMISSIONS', res.permissions) - } else { - commit('SET_ROLES', ['ROLE_DEFAULT']) - } - commit('SET_NAME', user.userName) - commit('SET_AVATAR', avatar) - resolve(res) - }).catch(error => { - reject(error) - }) - }) - }, - - // 退出系统 - LogOut({ commit, state }) { - return new Promise((resolve, reject) => { - logout(state.token).then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - commit('SET_PERMISSIONS', []) - removeToken() - resolve() - }).catch(error => { - reject(error) - }) - }) - }, - - // 前端 登出 - FedLogOut({ commit }) { - return new Promise(resolve => { - commit('SET_TOKEN', '') - removeToken() - resolve() - }) - } - } -} - -export default user +import { login, logout, getInfo } from '@/api/login' +import { getToken, setToken, removeToken } from '@/utils/auth' + +const user = { + state: { + token: getToken(), + name: '', + avatar: '', + roles: [], + permissions: [] + }, + + mutations: { + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + }, + SET_ROLES: (state, roles) => { + state.roles = roles + }, + SET_PERMISSIONS: (state, permissions) => { + state.permissions = permissions + } + }, + + actions: { + // 登录 + Login({ commit }, userInfo) { + const username = userInfo.username.trim() + const password = userInfo.password + const code = userInfo.code + const uuid = userInfo.uuid + return new Promise((resolve, reject) => { + login(username, password, code, uuid).then(res => { + res = res.data; + setToken(res.token) + commit('SET_TOKEN', res.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // 获取用户信息 + GetInfo({ commit, state }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(res => { + res = res.data; // 读取 data 数据 + const user = res.user + const avatar = user.avatar === "" ? require("@/assets/images/profile.jpg") : user.avatar; + if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 + commit('SET_ROLES', res.roles) + commit('SET_PERMISSIONS', res.permissions) + } else { + commit('SET_ROLES', ['ROLE_DEFAULT']) + } + commit('SET_NAME', user.userName) + commit('SET_AVATAR', avatar) + resolve(res) + }).catch(error => { + reject(error) + }) + }) + }, + + // 退出系统 + LogOut({ commit, state }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + commit('SET_TOKEN', '') + commit('SET_ROLES', []) + commit('SET_PERMISSIONS', []) + removeToken() + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // 前端 登出 + FedLogOut({ commit }) { + return new Promise(resolve => { + commit('SET_TOKEN', '') + removeToken() + resolve() + }) + } + } +} + +export default user diff --git a/ruoyi-ui/src/utils/auth.js b/yudao-admin-ui/src/utils/auth.js similarity index 94% rename from ruoyi-ui/src/utils/auth.js rename to yudao-admin-ui/src/utils/auth.js index 88d7b6ccb..08a43d6e2 100644 --- a/ruoyi-ui/src/utils/auth.js +++ b/yudao-admin-ui/src/utils/auth.js @@ -1,15 +1,15 @@ -import Cookies from 'js-cookie' - -const TokenKey = 'Admin-Token' - -export function getToken() { - return Cookies.get(TokenKey) -} - -export function setToken(token) { - return Cookies.set(TokenKey, token) -} - -export function removeToken() { - return Cookies.remove(TokenKey) -} +import Cookies from 'js-cookie' + +const TokenKey = 'Admin-Token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/ruoyi-ui/src/utils/constants.js b/yudao-admin-ui/src/utils/constants.js similarity index 100% rename from ruoyi-ui/src/utils/constants.js rename to yudao-admin-ui/src/utils/constants.js diff --git a/ruoyi-ui/src/utils/dict.js b/yudao-admin-ui/src/utils/dict.js similarity index 100% rename from ruoyi-ui/src/utils/dict.js rename to yudao-admin-ui/src/utils/dict.js diff --git a/ruoyi-ui/src/utils/errorCode.js b/yudao-admin-ui/src/utils/errorCode.js similarity index 100% rename from ruoyi-ui/src/utils/errorCode.js rename to yudao-admin-ui/src/utils/errorCode.js diff --git a/ruoyi-ui/src/utils/generator/config.js b/yudao-admin-ui/src/utils/generator/config.js similarity index 95% rename from ruoyi-ui/src/utils/generator/config.js rename to yudao-admin-ui/src/utils/generator/config.js index 005140a8f..7abf227d5 100644 --- a/ruoyi-ui/src/utils/generator/config.js +++ b/yudao-admin-ui/src/utils/generator/config.js @@ -1,438 +1,438 @@ -export const formConf = { - formRef: 'elForm', - formModel: 'formData', - size: 'medium', - labelPosition: 'right', - labelWidth: 100, - formRules: 'rules', - gutter: 15, - disabled: false, - span: 24, - formBtns: true -} - -export const inputComponents = [ - { - label: '单行文本', - tag: 'el-input', - tagIcon: 'input', - placeholder: '请输入', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': '', - 'suffix-icon': '', - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '多行文本', - tag: 'el-input', - tagIcon: 'textarea', - type: 'textarea', - placeholder: '请输入', - defaultValue: undefined, - span: 24, - labelWidth: null, - autosize: { - minRows: 4, - maxRows: 4 - }, - style: { width: '100%' }, - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '密码', - tag: 'el-input', - tagIcon: 'password', - placeholder: '请输入', - defaultValue: undefined, - span: 24, - 'show-password': true, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': '', - 'suffix-icon': '', - maxlength: null, - 'show-word-limit': false, - readonly: false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input' - }, - { - label: '计数器', - tag: 'el-input-number', - tagIcon: 'number', - placeholder: '', - defaultValue: undefined, - span: 24, - labelWidth: null, - min: undefined, - max: undefined, - step: undefined, - 'step-strictly': false, - precision: undefined, - 'controls-position': '', - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/input-number' - } -] - -export const selectComponents = [ - { - label: '下拉选择', - tag: 'el-select', - tagIcon: 'select', - placeholder: '请选择', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: { width: '100%' }, - clearable: true, - disabled: false, - required: true, - filterable: false, - multiple: false, - options: [{ - label: '选项一', - value: 1 - }, { - label: '选项二', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/select' - }, - { - label: '级联选择', - tag: 'el-cascader', - tagIcon: 'cascader', - placeholder: '请选择', - defaultValue: [], - span: 24, - labelWidth: null, - style: { width: '100%' }, - props: { - props: { - multiple: false - } - }, - 'show-all-levels': true, - disabled: false, - clearable: true, - filterable: false, - required: true, - options: [{ - id: 1, - value: 1, - label: '选项1', - children: [{ - id: 2, - value: 2, - label: '选项1-1' - }] - }], - dataType: 'dynamic', - labelKey: 'label', - valueKey: 'value', - childrenKey: 'children', - separator: '/', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/cascader' - }, - { - label: '单选框组', - tag: 'el-radio-group', - tagIcon: 'radio', - defaultValue: undefined, - span: 24, - labelWidth: null, - style: {}, - optionType: 'default', - border: false, - size: 'medium', - disabled: false, - required: true, - options: [{ - label: '选项一', - value: 1 - }, { - label: '选项二', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/radio' - }, - { - label: '多选框组', - tag: 'el-checkbox-group', - tagIcon: 'checkbox', - defaultValue: [], - span: 24, - labelWidth: null, - style: {}, - optionType: 'default', - border: false, - size: 'medium', - disabled: false, - required: true, - options: [{ - label: '选项一', - value: 1 - }, { - label: '选项二', - value: 2 - }], - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/checkbox' - }, - { - label: '开关', - tag: 'el-switch', - tagIcon: 'switch', - defaultValue: false, - span: 24, - labelWidth: null, - style: {}, - disabled: false, - required: true, - 'active-text': '', - 'inactive-text': '', - 'active-color': null, - 'inactive-color': null, - 'active-value': true, - 'inactive-value': false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/switch' - }, - { - label: '滑块', - tag: 'el-slider', - tagIcon: 'slider', - defaultValue: null, - span: 24, - labelWidth: null, - disabled: false, - required: true, - min: 0, - max: 100, - step: 1, - 'show-stops': false, - range: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/slider' - }, - { - label: '时间选择', - tag: 'el-time-picker', - tagIcon: 'time', - placeholder: '请选择', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - 'picker-options': { - selectableRange: '00:00:00-23:59:59' - }, - format: 'HH:mm:ss', - 'value-format': 'HH:mm:ss', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' - }, - { - label: '时间范围', - tag: 'el-time-picker', - tagIcon: 'time-range', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - 'is-range': true, - 'range-separator': '至', - 'start-placeholder': '开始时间', - 'end-placeholder': '结束时间', - format: 'HH:mm:ss', - 'value-format': 'HH:mm:ss', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' - }, - { - label: '日期选择', - tag: 'el-date-picker', - tagIcon: 'date', - placeholder: '请选择', - defaultValue: null, - type: 'date', - span: 24, - labelWidth: null, - style: { width: '100%' }, - disabled: false, - clearable: true, - required: true, - format: 'yyyy-MM-dd', - 'value-format': 'yyyy-MM-dd', - readonly: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' - }, - { - label: '日期范围', - tag: 'el-date-picker', - tagIcon: 'date-range', - defaultValue: null, - span: 24, - labelWidth: null, - style: { width: '100%' }, - type: 'daterange', - 'range-separator': '至', - 'start-placeholder': '开始日期', - 'end-placeholder': '结束日期', - disabled: false, - clearable: true, - required: true, - format: 'yyyy-MM-dd', - 'value-format': 'yyyy-MM-dd', - readonly: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' - }, - { - label: '评分', - tag: 'el-rate', - tagIcon: 'rate', - defaultValue: 0, - span: 24, - labelWidth: null, - style: {}, - max: 5, - 'allow-half': false, - 'show-text': false, - 'show-score': false, - disabled: false, - required: true, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/rate' - }, - { - label: '颜色选择', - tag: 'el-color-picker', - tagIcon: 'color', - defaultValue: null, - labelWidth: null, - 'show-alpha': false, - 'color-format': '', - disabled: false, - required: true, - size: 'medium', - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/color-picker' - }, - { - label: '上传', - tag: 'el-upload', - tagIcon: 'upload', - action: 'https://jsonplaceholder.typicode.com/posts/', - defaultValue: null, - labelWidth: null, - disabled: false, - required: true, - accept: '', - name: 'file', - 'auto-upload': true, - showTip: false, - buttonText: '点击上传', - fileSize: 2, - sizeUnit: 'MB', - 'list-type': 'text', - multiple: false, - regList: [], - changeTag: true, - document: 'https://element.eleme.cn/#/zh-CN/component/upload' - } -] - -export const layoutComponents = [ - { - layout: 'rowFormItem', - tagIcon: 'row', - type: 'default', - justify: 'start', - align: 'top', - label: '行容器', - layoutTree: true, - children: [], - document: 'https://element.eleme.cn/#/zh-CN/component/layout' - }, - { - layout: 'colFormItem', - label: '按钮', - changeTag: true, - labelWidth: null, - tag: 'el-button', - tagIcon: 'button', - span: 24, - default: '主要按钮', - type: 'primary', - icon: 'el-icon-search', - size: 'medium', - disabled: false, - document: 'https://element.eleme.cn/#/zh-CN/component/button' - } -] - -// 组件rule的触发方式，无触发方式的组件不生成rule -export const trigger = { - 'el-input': 'blur', - 'el-input-number': 'blur', - 'el-select': 'change', - 'el-radio-group': 'change', - 'el-checkbox-group': 'change', - 'el-cascader': 'change', - 'el-time-picker': 'change', - 'el-date-picker': 'change', - 'el-rate': 'change' -} +export const formConf = { + formRef: 'elForm', + formModel: 'formData', + size: 'medium', + labelPosition: 'right', + labelWidth: 100, + formRules: 'rules', + gutter: 15, + disabled: false, + span: 24, + formBtns: true +} + +export const inputComponents = [ + { + label: '单行文本', + tag: 'el-input', + tagIcon: 'input', + placeholder: '请输入', + defaultValue: undefined, + span: 24, + labelWidth: null, + style: { width: '100%' }, + clearable: true, + prepend: '', + append: '', + 'prefix-icon': '', + 'suffix-icon': '', + maxlength: null, + 'show-word-limit': false, + readonly: false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input' + }, + { + label: '多行文本', + tag: 'el-input', + tagIcon: 'textarea', + type: 'textarea', + placeholder: '请输入', + defaultValue: undefined, + span: 24, + labelWidth: null, + autosize: { + minRows: 4, + maxRows: 4 + }, + style: { width: '100%' }, + maxlength: null, + 'show-word-limit': false, + readonly: false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input' + }, + { + label: '密码', + tag: 'el-input', + tagIcon: 'password', + placeholder: '请输入', + defaultValue: undefined, + span: 24, + 'show-password': true, + labelWidth: null, + style: { width: '100%' }, + clearable: true, + prepend: '', + append: '', + 'prefix-icon': '', + 'suffix-icon': '', + maxlength: null, + 'show-word-limit': false, + readonly: false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input' + }, + { + label: '计数器', + tag: 'el-input-number', + tagIcon: 'number', + placeholder: '', + defaultValue: undefined, + span: 24, + labelWidth: null, + min: undefined, + max: undefined, + step: undefined, + 'step-strictly': false, + precision: undefined, + 'controls-position': '', + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/input-number' + } +] + +export const selectComponents = [ + { + label: '下拉选择', + tag: 'el-select', + tagIcon: 'select', + placeholder: '请选择', + defaultValue: undefined, + span: 24, + labelWidth: null, + style: { width: '100%' }, + clearable: true, + disabled: false, + required: true, + filterable: false, + multiple: false, + options: [{ + label: '选项一', + value: 1 + }, { + label: '选项二', + value: 2 + }], + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/select' + }, + { + label: '级联选择', + tag: 'el-cascader', + tagIcon: 'cascader', + placeholder: '请选择', + defaultValue: [], + span: 24, + labelWidth: null, + style: { width: '100%' }, + props: { + props: { + multiple: false + } + }, + 'show-all-levels': true, + disabled: false, + clearable: true, + filterable: false, + required: true, + options: [{ + id: 1, + value: 1, + label: '选项1', + children: [{ + id: 2, + value: 2, + label: '选项1-1' + }] + }], + dataType: 'dynamic', + labelKey: 'label', + valueKey: 'value', + childrenKey: 'children', + separator: '/', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/cascader' + }, + { + label: '单选框组', + tag: 'el-radio-group', + tagIcon: 'radio', + defaultValue: undefined, + span: 24, + labelWidth: null, + style: {}, + optionType: 'default', + border: false, + size: 'medium', + disabled: false, + required: true, + options: [{ + label: '选项一', + value: 1 + }, { + label: '选项二', + value: 2 + }], + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/radio' + }, + { + label: '多选框组', + tag: 'el-checkbox-group', + tagIcon: 'checkbox', + defaultValue: [], + span: 24, + labelWidth: null, + style: {}, + optionType: 'default', + border: false, + size: 'medium', + disabled: false, + required: true, + options: [{ + label: '选项一', + value: 1 + }, { + label: '选项二', + value: 2 + }], + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/checkbox' + }, + { + label: '开关', + tag: 'el-switch', + tagIcon: 'switch', + defaultValue: false, + span: 24, + labelWidth: null, + style: {}, + disabled: false, + required: true, + 'active-text': '', + 'inactive-text': '', + 'active-color': null, + 'inactive-color': null, + 'active-value': true, + 'inactive-value': false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/switch' + }, + { + label: '滑块', + tag: 'el-slider', + tagIcon: 'slider', + defaultValue: null, + span: 24, + labelWidth: null, + disabled: false, + required: true, + min: 0, + max: 100, + step: 1, + 'show-stops': false, + range: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/slider' + }, + { + label: '时间选择', + tag: 'el-time-picker', + tagIcon: 'time', + placeholder: '请选择', + defaultValue: null, + span: 24, + labelWidth: null, + style: { width: '100%' }, + disabled: false, + clearable: true, + required: true, + 'picker-options': { + selectableRange: '00:00:00-23:59:59' + }, + format: 'HH:mm:ss', + 'value-format': 'HH:mm:ss', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' + }, + { + label: '时间范围', + tag: 'el-time-picker', + tagIcon: 'time-range', + defaultValue: null, + span: 24, + labelWidth: null, + style: { width: '100%' }, + disabled: false, + clearable: true, + required: true, + 'is-range': true, + 'range-separator': '至', + 'start-placeholder': '开始时间', + 'end-placeholder': '结束时间', + format: 'HH:mm:ss', + 'value-format': 'HH:mm:ss', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/time-picker' + }, + { + label: '日期选择', + tag: 'el-date-picker', + tagIcon: 'date', + placeholder: '请选择', + defaultValue: null, + type: 'date', + span: 24, + labelWidth: null, + style: { width: '100%' }, + disabled: false, + clearable: true, + required: true, + format: 'yyyy-MM-dd', + 'value-format': 'yyyy-MM-dd', + readonly: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' + }, + { + label: '日期范围', + tag: 'el-date-picker', + tagIcon: 'date-range', + defaultValue: null, + span: 24, + labelWidth: null, + style: { width: '100%' }, + type: 'daterange', + 'range-separator': '至', + 'start-placeholder': '开始日期', + 'end-placeholder': '结束日期', + disabled: false, + clearable: true, + required: true, + format: 'yyyy-MM-dd', + 'value-format': 'yyyy-MM-dd', + readonly: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/date-picker' + }, + { + label: '评分', + tag: 'el-rate', + tagIcon: 'rate', + defaultValue: 0, + span: 24, + labelWidth: null, + style: {}, + max: 5, + 'allow-half': false, + 'show-text': false, + 'show-score': false, + disabled: false, + required: true, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/rate' + }, + { + label: '颜色选择', + tag: 'el-color-picker', + tagIcon: 'color', + defaultValue: null, + labelWidth: null, + 'show-alpha': false, + 'color-format': '', + disabled: false, + required: true, + size: 'medium', + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/color-picker' + }, + { + label: '上传', + tag: 'el-upload', + tagIcon: 'upload', + action: 'https://jsonplaceholder.typicode.com/posts/', + defaultValue: null, + labelWidth: null, + disabled: false, + required: true, + accept: '', + name: 'file', + 'auto-upload': true, + showTip: false, + buttonText: '点击上传', + fileSize: 2, + sizeUnit: 'MB', + 'list-type': 'text', + multiple: false, + regList: [], + changeTag: true, + document: 'https://element.eleme.cn/#/zh-CN/component/upload' + } +] + +export const layoutComponents = [ + { + layout: 'rowFormItem', + tagIcon: 'row', + type: 'default', + justify: 'start', + align: 'top', + label: '行容器', + layoutTree: true, + children: [], + document: 'https://element.eleme.cn/#/zh-CN/component/layout' + }, + { + layout: 'colFormItem', + label: '按钮', + changeTag: true, + labelWidth: null, + tag: 'el-button', + tagIcon: 'button', + span: 24, + default: '主要按钮', + type: 'primary', + icon: 'el-icon-search', + size: 'medium', + disabled: false, + document: 'https://element.eleme.cn/#/zh-CN/component/button' + } +] + +// 组件rule的触发方式，无触发方式的组件不生成rule +export const trigger = { + 'el-input': 'blur', + 'el-input-number': 'blur', + 'el-select': 'change', + 'el-radio-group': 'change', + 'el-checkbox-group': 'change', + 'el-cascader': 'change', + 'el-time-picker': 'change', + 'el-date-picker': 'change', + 'el-rate': 'change' +} diff --git a/ruoyi-ui/src/utils/generator/css.js b/yudao-admin-ui/src/utils/generator/css.js similarity index 96% rename from ruoyi-ui/src/utils/generator/css.js rename to yudao-admin-ui/src/utils/generator/css.js index 0d7f07526..c1c62e607 100644 --- a/ruoyi-ui/src/utils/generator/css.js +++ b/yudao-admin-ui/src/utils/generator/css.js @@ -1,18 +1,18 @@ -const styles = { - 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', - 'el-upload': '.el-upload__tip{line-height: 1.2;}' -} - -function addCss(cssList, el) { - const css = styles[el.tag] - css && cssList.indexOf(css) === -1 && cssList.push(css) - if (el.children) { - el.children.forEach(el2 => addCss(cssList, el2)) - } -} - -export function makeUpCss(conf) { - const cssList = [] - conf.fields.forEach(el => addCss(cssList, el)) - return cssList.join('\n') -} +const styles = { + 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', + 'el-upload': '.el-upload__tip{line-height: 1.2;}' +} + +function addCss(cssList, el) { + const css = styles[el.tag] + css && cssList.indexOf(css) === -1 && cssList.push(css) + if (el.children) { + el.children.forEach(el2 => addCss(cssList, el2)) + } +} + +export function makeUpCss(conf) { + const cssList = [] + conf.fields.forEach(el => addCss(cssList, el)) + return cssList.join('\n') +} diff --git a/ruoyi-ui/src/utils/generator/drawingDefalut.js b/yudao-admin-ui/src/utils/generator/drawingDefalut.js similarity index 95% rename from ruoyi-ui/src/utils/generator/drawingDefalut.js rename to yudao-admin-ui/src/utils/generator/drawingDefalut.js index 5f7d1c4ae..09f133ca1 100644 --- a/ruoyi-ui/src/utils/generator/drawingDefalut.js +++ b/yudao-admin-ui/src/utils/generator/drawingDefalut.js @@ -1,29 +1,29 @@ -export default [ - { - layout: 'colFormItem', - tagIcon: 'input', - label: '手机号', - vModel: 'mobile', - formId: 6, - tag: 'el-input', - placeholder: '请输入手机号', - defaultValue: '', - span: 24, - style: { width: '100%' }, - clearable: true, - prepend: '', - append: '', - 'prefix-icon': 'el-icon-mobile', - 'suffix-icon': '', - maxlength: 11, - 'show-word-limit': true, - readonly: false, - disabled: false, - required: true, - changeTag: true, - regList: [{ - pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', - message: '手机号格式错误' - }] - } -] +export default [ + { + layout: 'colFormItem', + tagIcon: 'input', + label: '手机号', + vModel: 'mobile', + formId: 6, + tag: 'el-input', + placeholder: '请输入手机号', + defaultValue: '', + span: 24, + style: { width: '100%' }, + clearable: true, + prepend: '', + append: '', + 'prefix-icon': 'el-icon-mobile', + 'suffix-icon': '', + maxlength: 11, + 'show-word-limit': true, + readonly: false, + disabled: false, + required: true, + changeTag: true, + regList: [{ + pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', + message: '手机号格式错误' + }] + } +] diff --git a/ruoyi-ui/src/utils/generator/html.js b/yudao-admin-ui/src/utils/generator/html.js similarity index 97% rename from ruoyi-ui/src/utils/generator/html.js rename to yudao-admin-ui/src/utils/generator/html.js index 340dfb439..ebf628d2b 100644 --- a/ruoyi-ui/src/utils/generator/html.js +++ b/yudao-admin-ui/src/utils/generator/html.js @@ -1,359 +1,359 @@ -/* eslint-disable max-len */ -import { trigger } from './config' - -let confGlobal -let someSpanIsNot24 - -export function dialogWrapper(str) { - return ` - ${str} -
- 取消 - 确定 -
- ` -} - -export function vueTemplate(str) { - return `` -} - -export function vueScript(str) { - return `` -} - -export function cssStyle(cssStr) { - return `` -} - -function buildFormTemplate(conf, child, type) { - let labelPosition = '' - if (conf.labelPosition !== 'right') { - labelPosition = `label-position="${conf.labelPosition}"` - } - const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' - let str = ` - ${child} - ${buildFromBtns(conf, type)} - ` - if (someSpanIsNot24) { - str = ` - ${str} - ` - } - return str -} - -function buildFromBtns(conf, type) { - let str = '' - if (conf.formBtns && type === 'file') { - str = ` - 提交 - 重置 - ` - if (someSpanIsNot24) { - str = ` - ${str} - ` - } - } - return str -} - -// span不为24的用el-col包裹 -function colWrapper(element, str) { - if (someSpanIsNot24 || element.span !== 24) { - return ` - ${str} - ` - } - return str -} - -const layouts = { - colFormItem(element) { - let labelWidth = '' - if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { - labelWidth = `label-width="${element.labelWidth}px"` - } - const required = !trigger[element.tag] && element.required ? 'required' : '' - const tagDom = tags[element.tag] ? tags[element.tag](element) : null - let str = ` - ${tagDom} - ` - str = colWrapper(element, str) - return str - }, - rowFormItem(element) { - const type = element.type === 'default' ? '' : `type="${element.type}"` - const justify = element.type === 'default' ? '' : `justify="${element.justify}"` - const align = element.type === 'default' ? '' : `align="${element.align}"` - const gutter = element.gutter ? `gutter="${element.gutter}"` : '' - const children = element.children.map(el => layouts[el.layout](el)) - let str = ` - ${children.join('\n')} - ` - str = colWrapper(element, str) - return str - } -} - -const tags = { - 'el-button': el => { - const { - tag, disabled - } = attrBuilder(el) - const type = el.type ? `type="${el.type}"` : '' - const icon = el.icon ? `icon="${el.icon}"` : '' - const size = el.size ? `size="${el.size}"` : '' - let child = buildElButtonChild(el) - - if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}` - }, - 'el-input': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' - const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' - const readonly = el.readonly ? 'readonly' : '' - const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' - const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' - const showPassword = el['show-password'] ? 'show-password' : '' - const type = el.type ? `type="${el.type}"` : '' - const autosize = el.autosize && el.autosize.minRows - ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` - : '' - let child = buildElInputChild(el) - - if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` - }, - 'el-input-number': el => { - const { disabled, vModel, placeholder } = attrBuilder(el) - const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : '' - const min = el.min ? `:min='${el.min}'` : '' - const max = el.max ? `:max='${el.max}'` : '' - const step = el.step ? `:step='${el.step}'` : '' - const stepStrictly = el['step-strictly'] ? 'step-strictly' : '' - const precision = el.precision ? `:precision='${el.precision}'` : '' - - return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` - }, - 'el-select': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const filterable = el.filterable ? 'filterable' : '' - const multiple = el.multiple ? 'multiple' : '' - let child = buildElSelectChild(el) - - if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` - }, - 'el-radio-group': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - let child = buildElRadioGroupChild(el) - - if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${size} ${disabled}>${child}` - }, - 'el-checkbox-group': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - const min = el.min ? `:min="${el.min}"` : '' - const max = el.max ? `:max="${el.max}"` : '' - let child = buildElCheckboxGroupChild(el) - - if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` - }, - 'el-switch': el => { - const { disabled, vModel } = attrBuilder(el) - const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : '' - const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : '' - const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : '' - const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' - const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : '' - const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : '' - - return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` - }, - 'el-cascader': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const options = el.options ? `:options="${el.vModel}Options"` : '' - const props = el.props ? `:props="${el.vModel}Props"` : '' - const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"' - const filterable = el.filterable ? 'filterable' : '' - const separator = el.separator === '/' ? '' : `separator="${el.separator}"` - - return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` - }, - 'el-slider': el => { - const { disabled, vModel } = attrBuilder(el) - const min = el.min ? `:min='${el.min}'` : '' - const max = el.max ? `:max='${el.max}'` : '' - const step = el.step ? `:step='${el.step}'` : '' - const range = el.range ? 'range' : '' - const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : '' - - return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` - }, - 'el-time-picker': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' - const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' - const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' - const isRange = el['is-range'] ? 'is-range' : '' - const format = el.format ? `format="${el.format}"` : '' - const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' - const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : '' - - return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>` - }, - 'el-date-picker': el => { - const { - disabled, vModel, clearable, placeholder, width - } = attrBuilder(el) - const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' - const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' - const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' - const format = el.format ? `format="${el.format}"` : '' - const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' - const type = el.type === 'date' ? '' : `type="${el.type}"` - const readonly = el.readonly ? 'readonly' : '' - - return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` - }, - 'el-rate': el => { - const { disabled, vModel } = attrBuilder(el) - const max = el.max ? `:max='${el.max}'` : '' - const allowHalf = el['allow-half'] ? 'allow-half' : '' - const showText = el['show-text'] ? 'show-text' : '' - const showScore = el['show-score'] ? 'show-score' : '' - - return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>` - }, - 'el-color-picker': el => { - const { disabled, vModel } = attrBuilder(el) - const size = `size="${el.size}"` - const showAlpha = el['show-alpha'] ? 'show-alpha' : '' - const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : '' - - return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` - }, - 'el-upload': el => { - const disabled = el.disabled ? ':disabled=\'true\'' : '' - const action = el.action ? `:action="${el.vModel}Action"` : '' - const multiple = el.multiple ? 'multiple' : '' - const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : '' - const accept = el.accept ? `accept="${el.accept}"` : '' - const name = el.name !== 'file' ? `name="${el.name}"` : '' - const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : '' - const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"` - const fileList = `:file-list="${el.vModel}fileList"` - const ref = `ref="${el.vModel}"` - let child = buildElUploadChild(el) - - if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` - } -} - -function attrBuilder(el) { - return { - vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`, - clearable: el.clearable ? 'clearable' : '', - placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '', - width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '', - disabled: el.disabled ? ':disabled=\'true\'' : '' - } -} - -// el-buttin 子级 -function buildElButtonChild(conf) { - const children = [] - if (conf.default) { - children.push(conf.default) - } - return children.join('\n') -} - -// el-input innerHTML -function buildElInputChild(conf) { - const children = [] - if (conf.prepend) { - children.push(``) - } - if (conf.append) { - children.push(``) - } - return children.join('\n') -} - -function buildElSelectChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - children.push(``) - } - return children.join('\n') -} - -function buildElRadioGroupChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) - } - return children.join('\n') -} - -function buildElCheckboxGroupChild(conf) { - const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) - } - return children.join('\n') -} - -function buildElUploadChild(conf) { - const list = [] - if (conf['list-type'] === 'picture-card') list.push('') - else list.push(`${conf.buttonText}`) - if (conf.showTip) list.push(`
只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件
`) - return list.join('\n') -} - -export function makeUpHtml(conf, type) { - const htmlList = [] - confGlobal = conf - someSpanIsNot24 = conf.fields.some(item => item.span !== 24) - conf.fields.forEach(el => { - htmlList.push(layouts[el.layout](el)) - }) - const htmlStr = htmlList.join('\n') - - let temp = buildFormTemplate(conf, htmlStr, type) - if (type === 'dialog') { - temp = dialogWrapper(temp) - } - confGlobal = null - return temp -} +/* eslint-disable max-len */ +import { trigger } from './config' + +let confGlobal +let someSpanIsNot24 + +export function dialogWrapper(str) { + return ` + ${str} +
+ 取消 + 确定 +
+ ` +} + +export function vueTemplate(str) { + return `` +} + +export function vueScript(str) { + return `` +} + +export function cssStyle(cssStr) { + return `` +} + +function buildFormTemplate(conf, child, type) { + let labelPosition = '' + if (conf.labelPosition !== 'right') { + labelPosition = `label-position="${conf.labelPosition}"` + } + const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' + let str = ` + ${child} + ${buildFromBtns(conf, type)} + ` + if (someSpanIsNot24) { + str = ` + ${str} + ` + } + return str +} + +function buildFromBtns(conf, type) { + let str = '' + if (conf.formBtns && type === 'file') { + str = ` + 提交 + 重置 + ` + if (someSpanIsNot24) { + str = ` + ${str} + ` + } + } + return str +} + +// span不为24的用el-col包裹 +function colWrapper(element, str) { + if (someSpanIsNot24 || element.span !== 24) { + return ` + ${str} + ` + } + return str +} + +const layouts = { + colFormItem(element) { + let labelWidth = '' + if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { + labelWidth = `label-width="${element.labelWidth}px"` + } + const required = !trigger[element.tag] && element.required ? 'required' : '' + const tagDom = tags[element.tag] ? tags[element.tag](element) : null + let str = ` + ${tagDom} + ` + str = colWrapper(element, str) + return str + }, + rowFormItem(element) { + const type = element.type === 'default' ? '' : `type="${element.type}"` + const justify = element.type === 'default' ? '' : `justify="${element.justify}"` + const align = element.type === 'default' ? '' : `align="${element.align}"` + const gutter = element.gutter ? `gutter="${element.gutter}"` : '' + const children = element.children.map(el => layouts[el.layout](el)) + let str = ` + ${children.join('\n')} + ` + str = colWrapper(element, str) + return str + } +} + +const tags = { + 'el-button': el => { + const { + tag, disabled + } = attrBuilder(el) + const type = el.type ? `type="${el.type}"` : '' + const icon = el.icon ? `icon="${el.icon}"` : '' + const size = el.size ? `size="${el.size}"` : '' + let child = buildElButtonChild(el) + + if (child) child = `\n${child}\n` // 换行 + return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}` + }, + 'el-input': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' + const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' + const readonly = el.readonly ? 'readonly' : '' + const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' + const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' + const showPassword = el['show-password'] ? 'show-password' : '' + const type = el.type ? `type="${el.type}"` : '' + const autosize = el.autosize && el.autosize.minRows + ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` + : '' + let child = buildElInputChild(el) + + if (child) child = `\n${child}\n` // 换行 + return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` + }, + 'el-input-number': el => { + const { disabled, vModel, placeholder } = attrBuilder(el) + const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : '' + const min = el.min ? `:min='${el.min}'` : '' + const max = el.max ? `:max='${el.max}'` : '' + const step = el.step ? `:step='${el.step}'` : '' + const stepStrictly = el['step-strictly'] ? 'step-strictly' : '' + const precision = el.precision ? `:precision='${el.precision}'` : '' + + return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` + }, + 'el-select': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const filterable = el.filterable ? 'filterable' : '' + const multiple = el.multiple ? 'multiple' : '' + let child = buildElSelectChild(el) + + if (child) child = `\n${child}\n` // 换行 + return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` + }, + 'el-radio-group': el => { + const { disabled, vModel } = attrBuilder(el) + const size = `size="${el.size}"` + let child = buildElRadioGroupChild(el) + + if (child) child = `\n${child}\n` // 换行 + return `<${el.tag} ${vModel} ${size} ${disabled}>${child}` + }, + 'el-checkbox-group': el => { + const { disabled, vModel } = attrBuilder(el) + const size = `size="${el.size}"` + const min = el.min ? `:min="${el.min}"` : '' + const max = el.max ? `:max="${el.max}"` : '' + let child = buildElCheckboxGroupChild(el) + + if (child) child = `\n${child}\n` // 换行 + return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` + }, + 'el-switch': el => { + const { disabled, vModel } = attrBuilder(el) + const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : '' + const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : '' + const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : '' + const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' + const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : '' + const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : '' + + return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` + }, + 'el-cascader': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const options = el.options ? `:options="${el.vModel}Options"` : '' + const props = el.props ? `:props="${el.vModel}Props"` : '' + const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"' + const filterable = el.filterable ? 'filterable' : '' + const separator = el.separator === '/' ? '' : `separator="${el.separator}"` + + return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` + }, + 'el-slider': el => { + const { disabled, vModel } = attrBuilder(el) + const min = el.min ? `:min='${el.min}'` : '' + const max = el.max ? `:max='${el.max}'` : '' + const step = el.step ? `:step='${el.step}'` : '' + const range = el.range ? 'range' : '' + const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : '' + + return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` + }, + 'el-time-picker': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' + const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' + const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' + const isRange = el['is-range'] ? 'is-range' : '' + const format = el.format ? `format="${el.format}"` : '' + const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' + const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : '' + + return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>` + }, + 'el-date-picker': el => { + const { + disabled, vModel, clearable, placeholder, width + } = attrBuilder(el) + const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' + const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' + const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' + const format = el.format ? `format="${el.format}"` : '' + const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' + const type = el.type === 'date' ? '' : `type="${el.type}"` + const readonly = el.readonly ? 'readonly' : '' + + return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` + }, + 'el-rate': el => { + const { disabled, vModel } = attrBuilder(el) + const max = el.max ? `:max='${el.max}'` : '' + const allowHalf = el['allow-half'] ? 'allow-half' : '' + const showText = el['show-text'] ? 'show-text' : '' + const showScore = el['show-score'] ? 'show-score' : '' + + return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>` + }, + 'el-color-picker': el => { + const { disabled, vModel } = attrBuilder(el) + const size = `size="${el.size}"` + const showAlpha = el['show-alpha'] ? 'show-alpha' : '' + const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : '' + + return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` + }, + 'el-upload': el => { + const disabled = el.disabled ? ':disabled=\'true\'' : '' + const action = el.action ? `:action="${el.vModel}Action"` : '' + const multiple = el.multiple ? 'multiple' : '' + const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : '' + const accept = el.accept ? `accept="${el.accept}"` : '' + const name = el.name !== 'file' ? `name="${el.name}"` : '' + const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : '' + const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"` + const fileList = `:file-list="${el.vModel}fileList"` + const ref = `ref="${el.vModel}"` + let child = buildElUploadChild(el) + + if (child) child = `\n${child}\n` // 换行 + return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` + } +} + +function attrBuilder(el) { + return { + vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`, + clearable: el.clearable ? 'clearable' : '', + placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '', + width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '', + disabled: el.disabled ? ':disabled=\'true\'' : '' + } +} + +// el-buttin 子级 +function buildElButtonChild(conf) { + const children = [] + if (conf.default) { + children.push(conf.default) + } + return children.join('\n') +} + +// el-input innerHTML +function buildElInputChild(conf) { + const children = [] + if (conf.prepend) { + children.push(``) + } + if (conf.append) { + children.push(``) + } + return children.join('\n') +} + +function buildElSelectChild(conf) { + const children = [] + if (conf.options && conf.options.length) { + children.push(``) + } + return children.join('\n') +} + +function buildElRadioGroupChild(conf) { + const children = [] + if (conf.options && conf.options.length) { + const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio' + const border = conf.border ? 'border' : '' + children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) + } + return children.join('\n') +} + +function buildElCheckboxGroupChild(conf) { + const children = [] + if (conf.options && conf.options.length) { + const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' + const border = conf.border ? 'border' : '' + children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) + } + return children.join('\n') +} + +function buildElUploadChild(conf) { + const list = [] + if (conf['list-type'] === 'picture-card') list.push('') + else list.push(`${conf.buttonText}`) + if (conf.showTip) list.push(`
只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件
`) + return list.join('\n') +} + +export function makeUpHtml(conf, type) { + const htmlList = [] + confGlobal = conf + someSpanIsNot24 = conf.fields.some(item => item.span !== 24) + conf.fields.forEach(el => { + htmlList.push(layouts[el.layout](el)) + }) + const htmlStr = htmlList.join('\n') + + let temp = buildFormTemplate(conf, htmlStr, type) + if (type === 'dialog') { + temp = dialogWrapper(temp) + } + confGlobal = null + return temp +} diff --git a/ruoyi-ui/src/utils/generator/icon.json b/yudao-admin-ui/src/utils/generator/icon.json similarity index 100% rename from ruoyi-ui/src/utils/generator/icon.json rename to yudao-admin-ui/src/utils/generator/icon.json diff --git a/ruoyi-ui/src/utils/generator/js.js b/yudao-admin-ui/src/utils/generator/js.js similarity index 96% rename from ruoyi-ui/src/utils/generator/js.js rename to yudao-admin-ui/src/utils/generator/js.js index 81afc7004..c6c06a996 100644 --- a/ruoyi-ui/src/utils/generator/js.js +++ b/yudao-admin-ui/src/utils/generator/js.js @@ -1,236 +1,236 @@ -import { isArray } from 'util' -import { exportDefault, titleCase } from '@/utils/index' -import { trigger } from './config' - -const units = { - KB: '1024', - MB: '1024 / 1024', - GB: '1024 / 1024 / 1024' -} -let confGlobal -const inheritAttrs = { - file: '', - dialog: 'inheritAttrs: false,' -} - - -export function makeUpJs(conf, type) { - confGlobal = conf = JSON.parse(JSON.stringify(conf)) - const dataList = [] - const ruleList = [] - const optionsList = [] - const propsList = [] - const methodList = mixinMethod(type) - const uploadVarList = [] - - conf.fields.forEach(el => { - buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) - }) - - const script = buildexport( - conf, - type, - dataList.join('\n'), - ruleList.join('\n'), - optionsList.join('\n'), - uploadVarList.join('\n'), - propsList.join('\n'), - methodList.join('\n') - ) - confGlobal = null - return script -} - -function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { - buildData(el, dataList) - buildRules(el, ruleList) - - if (el.options && el.options.length) { - buildOptions(el, optionsList) - if (el.dataType === 'dynamic') { - const model = `${el.vModel}Options` - const options = titleCase(model) - buildOptionMethod(`get${options}`, model, methodList) - } - } - - if (el.props && el.props.props) { - buildProps(el, propsList) - } - - if (el.action && el.tag === 'el-upload') { - uploadVarList.push( - `${el.vModel}Action: '${el.action}', - ${el.vModel}fileList: [],` - ) - methodList.push(buildBeforeUpload(el)) - if (!el['auto-upload']) { - methodList.push(buildSubmitUpload(el)) - } - } - - if (el.children) { - el.children.forEach(el2 => { - buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) - }) - } -} - -function mixinMethod(type) { - const list = []; const - minxins = { - file: confGlobal.formBtns ? { - submitForm: `submitForm() { - this.$refs['${confGlobal.formRef}'].validate(valid => { - if(!valid) return - // TODO 提交表单 - }) - },`, - resetForm: `resetForm() { - this.$refs['${confGlobal.formRef}'].resetFields() - },` - } : null, - dialog: { - onOpen: 'onOpen() {},', - onClose: `onClose() { - this.$refs['${confGlobal.formRef}'].resetFields() - },`, - close: `close() { - this.$emit('update:visible', false) - },`, - handelConfirm: `handelConfirm() { - this.$refs['${confGlobal.formRef}'].validate(valid => { - if(!valid) return - this.close() - }) - },` - } - } - - const methods = minxins[type] - if (methods) { - Object.keys(methods).forEach(key => { - list.push(methods[key]) - }) - } - - return list -} - -function buildData(conf, dataList) { - if (conf.vModel === undefined) return - let defaultValue - if (typeof (conf.defaultValue) === 'string' && !conf.multiple) { - defaultValue = `'${conf.defaultValue}'` - } else { - defaultValue = `${JSON.stringify(conf.defaultValue)}` - } - dataList.push(`${conf.vModel}: ${defaultValue},`) -} - -function buildRules(conf, ruleList) { - if (conf.vModel === undefined) return - const rules = [] - if (trigger[conf.tag]) { - if (conf.required) { - const type = isArray(conf.defaultValue) ? 'type: \'array\',' : '' - let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder - if (message === undefined) message = `${conf.label}不能为空` - rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`) - } - if (conf.regList && isArray(conf.regList)) { - conf.regList.forEach(item => { - if (item.pattern) { - rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) - } - }) - } - ruleList.push(`${conf.vModel}: [${rules.join(',')}],`) - } -} - -function buildOptions(conf, optionsList) { - if (conf.vModel === undefined) return - if (conf.dataType === 'dynamic') { conf.options = [] } - const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},` - optionsList.push(str) -} - -function buildProps(conf, propsList) { - if (conf.dataType === 'dynamic') { - conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey) - conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey) - conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey) - } - const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},` - propsList.push(str) -} - -function buildBeforeUpload(conf) { - const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const - returnList = [] - if (conf.fileSize) { - rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} - if(!isRightSize){ - this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}') - }` - returnList.push('isRightSize') - } - if (conf.accept) { - acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) - if(!isAccept){ - this.$message.error('应该选择${conf.accept}类型的文件') - }` - returnList.push('isAccept') - } - const str = `${conf.vModel}BeforeUpload(file) { - ${rightSizeCode} - ${acceptCode} - return ${returnList.join('&&')} - },` - return returnList.length ? str : '' -} - -function buildSubmitUpload(conf) { - const str = `submitUpload() { - this.$refs['${conf.vModel}'].submit() - },` - return str -} - -function buildOptionMethod(methodName, model, methodList) { - const str = `${methodName}() { - // TODO 发起请求获取数据 - this.${model} - },` - methodList.push(str) -} - -function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { - const str = `${exportDefault}{ - ${inheritAttrs[type]} - components: {}, - props: [], - data () { - return { - ${conf.formModel}: { - ${data} - }, - ${conf.formRules}: { - ${rules} - }, - ${uploadVar} - ${selectOptions} - ${props} - } - }, - computed: {}, - watch: {}, - created () {}, - mounted () {}, - methods: { - ${methods} - } -}` - return str -} +import { isArray } from 'util' +import { exportDefault, titleCase } from '@/utils/index' +import { trigger } from './config' + +const units = { + KB: '1024', + MB: '1024 / 1024', + GB: '1024 / 1024 / 1024' +} +let confGlobal +const inheritAttrs = { + file: '', + dialog: 'inheritAttrs: false,' +} + + +export function makeUpJs(conf, type) { + confGlobal = conf = JSON.parse(JSON.stringify(conf)) + const dataList = [] + const ruleList = [] + const optionsList = [] + const propsList = [] + const methodList = mixinMethod(type) + const uploadVarList = [] + + conf.fields.forEach(el => { + buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) + }) + + const script = buildexport( + conf, + type, + dataList.join('\n'), + ruleList.join('\n'), + optionsList.join('\n'), + uploadVarList.join('\n'), + propsList.join('\n'), + methodList.join('\n') + ) + confGlobal = null + return script +} + +function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { + buildData(el, dataList) + buildRules(el, ruleList) + + if (el.options && el.options.length) { + buildOptions(el, optionsList) + if (el.dataType === 'dynamic') { + const model = `${el.vModel}Options` + const options = titleCase(model) + buildOptionMethod(`get${options}`, model, methodList) + } + } + + if (el.props && el.props.props) { + buildProps(el, propsList) + } + + if (el.action && el.tag === 'el-upload') { + uploadVarList.push( + `${el.vModel}Action: '${el.action}', + ${el.vModel}fileList: [],` + ) + methodList.push(buildBeforeUpload(el)) + if (!el['auto-upload']) { + methodList.push(buildSubmitUpload(el)) + } + } + + if (el.children) { + el.children.forEach(el2 => { + buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) + }) + } +} + +function mixinMethod(type) { + const list = []; const + minxins = { + file: confGlobal.formBtns ? { + submitForm: `submitForm() { + this.$refs['${confGlobal.formRef}'].validate(valid => { + if(!valid) return + // TODO 提交表单 + }) + },`, + resetForm: `resetForm() { + this.$refs['${confGlobal.formRef}'].resetFields() + },` + } : null, + dialog: { + onOpen: 'onOpen() {},', + onClose: `onClose() { + this.$refs['${confGlobal.formRef}'].resetFields() + },`, + close: `close() { + this.$emit('update:visible', false) + },`, + handelConfirm: `handelConfirm() { + this.$refs['${confGlobal.formRef}'].validate(valid => { + if(!valid) return + this.close() + }) + },` + } + } + + const methods = minxins[type] + if (methods) { + Object.keys(methods).forEach(key => { + list.push(methods[key]) + }) + } + + return list +} + +function buildData(conf, dataList) { + if (conf.vModel === undefined) return + let defaultValue + if (typeof (conf.defaultValue) === 'string' && !conf.multiple) { + defaultValue = `'${conf.defaultValue}'` + } else { + defaultValue = `${JSON.stringify(conf.defaultValue)}` + } + dataList.push(`${conf.vModel}: ${defaultValue},`) +} + +function buildRules(conf, ruleList) { + if (conf.vModel === undefined) return + const rules = [] + if (trigger[conf.tag]) { + if (conf.required) { + const type = isArray(conf.defaultValue) ? 'type: \'array\',' : '' + let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder + if (message === undefined) message = `${conf.label}不能为空` + rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`) + } + if (conf.regList && isArray(conf.regList)) { + conf.regList.forEach(item => { + if (item.pattern) { + rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) + } + }) + } + ruleList.push(`${conf.vModel}: [${rules.join(',')}],`) + } +} + +function buildOptions(conf, optionsList) { + if (conf.vModel === undefined) return + if (conf.dataType === 'dynamic') { conf.options = [] } + const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},` + optionsList.push(str) +} + +function buildProps(conf, propsList) { + if (conf.dataType === 'dynamic') { + conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey) + conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey) + conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey) + } + const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},` + propsList.push(str) +} + +function buildBeforeUpload(conf) { + const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const + returnList = [] + if (conf.fileSize) { + rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} + if(!isRightSize){ + this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}') + }` + returnList.push('isRightSize') + } + if (conf.accept) { + acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) + if(!isAccept){ + this.$message.error('应该选择${conf.accept}类型的文件') + }` + returnList.push('isAccept') + } + const str = `${conf.vModel}BeforeUpload(file) { + ${rightSizeCode} + ${acceptCode} + return ${returnList.join('&&')} + },` + return returnList.length ? str : '' +} + +function buildSubmitUpload(conf) { + const str = `submitUpload() { + this.$refs['${conf.vModel}'].submit() + },` + return str +} + +function buildOptionMethod(methodName, model, methodList) { + const str = `${methodName}() { + // TODO 发起请求获取数据 + this.${model} + },` + methodList.push(str) +} + +function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { + const str = `${exportDefault}{ + ${inheritAttrs[type]} + components: {}, + props: [], + data () { + return { + ${conf.formModel}: { + ${data} + }, + ${conf.formRules}: { + ${rules} + }, + ${uploadVar} + ${selectOptions} + ${props} + } + }, + computed: {}, + watch: {}, + created () {}, + mounted () {}, + methods: { + ${methods} + } +}` + return str +} diff --git a/ruoyi-ui/src/utils/generator/render.js b/yudao-admin-ui/src/utils/generator/render.js similarity index 96% rename from ruoyi-ui/src/utils/generator/render.js rename to yudao-admin-ui/src/utils/generator/render.js index f187029d2..e8640f0a2 100644 --- a/ruoyi-ui/src/utils/generator/render.js +++ b/yudao-admin-ui/src/utils/generator/render.js @@ -1,126 +1,126 @@ -import { makeMap } from '@/utils/index' - -// 参考https://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js -const isAttr = makeMap( - 'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,' - + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,' - + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' - + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' - + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' - + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' - + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' - + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' - + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' - + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,' - + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,' - + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,' - + 'target,title,type,usemap,value,width,wrap' -) - -function vModel(self, dataObject, defaultValue) { - dataObject.props.value = defaultValue - - dataObject.on.input = val => { - self.$emit('input', val) - } -} - -const componentChild = { - 'el-button': { - default(h, conf, key) { - return conf[key] - }, - }, - 'el-input': { - prepend(h, conf, key) { - return - }, - append(h, conf, key) { - return - } - }, - 'el-select': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - list.push() - }) - return list - } - }, - 'el-radio-group': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - if (conf.optionType === 'button') list.push({item.label}) - else list.push({item.label}) - }) - return list - } - }, - 'el-checkbox-group': { - options(h, conf, key) { - const list = [] - conf.options.forEach(item => { - if (conf.optionType === 'button') { - list.push({item.label}) - } else { - list.push({item.label}) - } - }) - return list - } - }, - 'el-upload': { - 'list-type': (h, conf, key) => { - const list = [] - if (conf['list-type'] === 'picture-card') { - list.push() - } else { - list.push({conf.buttonText}) - } - if (conf.showTip) { - list.push(
只能上传不超过 {conf.fileSize}{conf.sizeUnit} 的{conf.accept}文件
) - } - return list - } - } -} - -export default { - render(h) { - const dataObject = { - attrs: {}, - props: {}, - on: {}, - style: {} - } - const confClone = JSON.parse(JSON.stringify(this.conf)) - const children = [] - - const childObjs = componentChild[confClone.tag] - if (childObjs) { - Object.keys(childObjs).forEach(key => { - const childFunc = childObjs[key] - if (confClone[key]) { - children.push(childFunc(h, confClone, key)) - } - }) - } - - Object.keys(confClone).forEach(key => { - const val = confClone[key] - if (key === 'vModel') { - vModel(this, dataObject, confClone.defaultValue) - } else if (dataObject[key]) { - dataObject[key] = val - } else if (!isAttr(key)) { - dataObject.props[key] = val - } else { - dataObject.attrs[key] = val - } - }) - return h(this.conf.tag, dataObject, children) - }, - props: ['conf'] -} +import { makeMap } from '@/utils/index' + +// 参考https://github.com/vuejs/vue/blob/v2.6.10/src/platforms/web/server/util.js +const isAttr = makeMap( + 'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,' + + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,' + + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,' + + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,' + + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,' + + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,' + + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,' + + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,' + + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,' + + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,' + + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,' + + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,' + + 'target,title,type,usemap,value,width,wrap' +) + +function vModel(self, dataObject, defaultValue) { + dataObject.props.value = defaultValue + + dataObject.on.input = val => { + self.$emit('input', val) + } +} + +const componentChild = { + 'el-button': { + default(h, conf, key) { + return conf[key] + }, + }, + 'el-input': { + prepend(h, conf, key) { + return + }, + append(h, conf, key) { + return + } + }, + 'el-select': { + options(h, conf, key) { + const list = [] + conf.options.forEach(item => { + list.push() + }) + return list + } + }, + 'el-radio-group': { + options(h, conf, key) { + const list = [] + conf.options.forEach(item => { + if (conf.optionType === 'button') list.push({item.label}) + else list.push({item.label}) + }) + return list + } + }, + 'el-checkbox-group': { + options(h, conf, key) { + const list = [] + conf.options.forEach(item => { + if (conf.optionType === 'button') { + list.push({item.label}) + } else { + list.push({item.label}) + } + }) + return list + } + }, + 'el-upload': { + 'list-type': (h, conf, key) => { + const list = [] + if (conf['list-type'] === 'picture-card') { + list.push() + } else { + list.push({conf.buttonText}) + } + if (conf.showTip) { + list.push(
只能上传不超过 {conf.fileSize}{conf.sizeUnit} 的{conf.accept}文件
) + } + return list + } + } +} + +export default { + render(h) { + const dataObject = { + attrs: {}, + props: {}, + on: {}, + style: {} + } + const confClone = JSON.parse(JSON.stringify(this.conf)) + const children = [] + + const childObjs = componentChild[confClone.tag] + if (childObjs) { + Object.keys(childObjs).forEach(key => { + const childFunc = childObjs[key] + if (confClone[key]) { + children.push(childFunc(h, confClone, key)) + } + }) + } + + Object.keys(confClone).forEach(key => { + const val = confClone[key] + if (key === 'vModel') { + vModel(this, dataObject, confClone.defaultValue) + } else if (dataObject[key]) { + dataObject[key] = val + } else if (!isAttr(key)) { + dataObject.props[key] = val + } else { + dataObject.attrs[key] = val + } + }) + return h(this.conf.tag, dataObject, children) + }, + props: ['conf'] +} diff --git a/ruoyi-ui/src/utils/index.js b/yudao-admin-ui/src/utils/index.js similarity index 95% rename from ruoyi-ui/src/utils/index.js rename to yudao-admin-ui/src/utils/index.js index 2893bc83a..918580f7b 100644 --- a/ruoyi-ui/src/utils/index.js +++ b/yudao-admin-ui/src/utils/index.js @@ -1,390 +1,390 @@ -import { parseTime } from './ruoyi' - -/** - * 表格时间格式化 - */ -export function formatDate(cellValue) { - if (cellValue == null || cellValue == "") return ""; - var date = new Date(cellValue) - var year = date.getFullYear() - var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 - var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() - var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() - var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() - var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() - return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds -} - -/** - * @param {number} time - * @param {string} option - * @returns {string} - */ -export function formatTime(time, option) { - if (('' + time).length === 10) { - time = parseInt(time) * 1000 - } else { - time = +time - } - const d = new Date(time) - const now = Date.now() - - const diff = (now - d) / 1000 - - if (diff < 30) { - return '刚刚' - } else if (diff < 3600) { - // less 1 hour - return Math.ceil(diff / 60) + '分钟前' - } else if (diff < 3600 * 24) { - return Math.ceil(diff / 3600) + '小时前' - } else if (diff < 3600 * 24 * 2) { - return '1天前' - } - if (option) { - return parseTime(time, option) - } else { - return ( - d.getMonth() + - 1 + - '月' + - d.getDate() + - '日' + - d.getHours() + - '时' + - d.getMinutes() + - '分' - ) - } -} - -/** - * @param {string} url - * @returns {Object} - */ -export function getQueryObject(url) { - url = url == null ? window.location.href : url - const search = url.substring(url.lastIndexOf('?') + 1) - const obj = {} - const reg = /([^?&=]+)=([^?&=]*)/g - search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1) - let val = decodeURIComponent($2) - val = String(val) - obj[name] = val - return rs - }) - return obj -} - -/** - * @param {string} input value - * @returns {number} output value - */ -export function byteLength(str) { - // returns the byte length of an utf8 string - let s = str.length - for (var i = str.length - 1; i >= 0; i--) { - const code = str.charCodeAt(i) - if (code > 0x7f && code <= 0x7ff) s++ - else if (code > 0x7ff && code <= 0xffff) s += 2 - if (code >= 0xDC00 && code <= 0xDFFF) i-- - } - return s -} - -/** - * @param {Array} actual - * @returns {Array} - */ -export function cleanArray(actual) { - const newArray = [] - for (let i = 0; i < actual.length; i++) { - if (actual[i]) { - newArray.push(actual[i]) - } - } - return newArray -} - -/** - * @param {Object} json - * @returns {Array} - */ -export function param(json) { - if (!json) return '' - return cleanArray( - Object.keys(json).map(key => { - if (json[key] === undefined) return '' - return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) - }) - ).join('&') -} - -/** - * @param {string} url - * @returns {Object} - */ -export function param2Obj(url) { - const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') - if (!search) { - return {} - } - const obj = {} - const searchArr = search.split('&') - searchArr.forEach(v => { - const index = v.indexOf('=') - if (index !== -1) { - const name = v.substring(0, index) - const val = v.substring(index + 1, v.length) - obj[name] = val - } - }) - return obj -} - -/** - * @param {string} val - * @returns {string} - */ -export function html2Text(val) { - const div = document.createElement('div') - div.innerHTML = val - return div.textContent || div.innerText -} - -/** - * Merges two objects, giving the last one precedence - * @param {Object} target - * @param {(Object|Array)} source - * @returns {Object} - */ -export function objectMerge(target, source) { - if (typeof target !== 'object') { - target = {} - } - if (Array.isArray(source)) { - return source.slice() - } - Object.keys(source).forEach(property => { - const sourceProperty = source[property] - if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty) - } else { - target[property] = sourceProperty - } - }) - return target -} - -/** - * @param {HTMLElement} element - * @param {string} className - */ -export function toggleClass(element, className) { - if (!element || !className) { - return - } - let classString = element.className - const nameIndex = classString.indexOf(className) - if (nameIndex === -1) { - classString += '' + className - } else { - classString = - classString.substr(0, nameIndex) + - classString.substr(nameIndex + className.length) - } - element.className = classString -} - -/** - * @param {string} type - * @returns {Date} - */ -export function getTime(type) { - if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 - } else { - return new Date(new Date().toDateString()) - } -} - -/** - * @param {Function} func - * @param {number} wait - * @param {boolean} immediate - * @return {*} - */ -export function debounce(func, wait, immediate) { - let timeout, args, context, timestamp, result - - const later = function() { - // 据上一次触发时间间隔 - const last = +new Date() - timestamp - - // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait - if (last < wait && last > 0) { - timeout = setTimeout(later, wait - last) - } else { - timeout = null - // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 - if (!immediate) { - result = func.apply(context, args) - if (!timeout) context = args = null - } - } - } - - return function(...args) { - context = this - timestamp = +new Date() - const callNow = immediate && !timeout - // 如果延时不存在，重新设定延时 - if (!timeout) timeout = setTimeout(later, wait) - if (callNow) { - result = func.apply(context, args) - context = args = null - } - - return result - } -} - -/** - * This is just a simple version of deep copy - * Has a lot of edge cases bug - * If you want to use a perfect deep copy, use lodash's _.cloneDeep - * @param {Object} source - * @returns {Object} - */ -export function deepClone(source) { - if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'deepClone') - } - const targetObj = source.constructor === Array ? [] : {} - Object.keys(source).forEach(keys => { - if (source[keys] && typeof source[keys] === 'object') { - targetObj[keys] = deepClone(source[keys]) - } else { - targetObj[keys] = source[keys] - } - }) - return targetObj -} - -/** - * @param {Array} arr - * @returns {Array} - */ -export function uniqueArr(arr) { - return Array.from(new Set(arr)) -} - -/** - * @returns {string} - */ -export function createUniqueString() { - const timestamp = +new Date() + '' - const randomNum = parseInt((1 + Math.random()) * 65536) + '' - return (+(randomNum + timestamp)).toString(32) -} - -/** - * Check if an element has a class - * @param {HTMLElement} elm - * @param {string} cls - * @returns {boolean} - */ -export function hasClass(ele, cls) { - return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) -} - -/** - * Add class to element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function addClass(ele, cls) { - if (!hasClass(ele, cls)) ele.className += ' ' + cls -} - -/** - * Remove class from element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function removeClass(ele, cls) { - if (hasClass(ele, cls)) { - const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') - ele.className = ele.className.replace(reg, ' ') - } -} - -export function makeMap(str, expectsLowerCase) { - const map = Object.create(null) - const list = str.split(',') - for (let i = 0; i < list.length; i++) { - map[list[i]] = true - } - return expectsLowerCase - ? val => map[val.toLowerCase()] - : val => map[val] -} - -export const exportDefault = 'export default ' - -export const beautifierConf = { - html: { - indent_size: '2', - indent_char: ' ', - max_preserve_newlines: '-1', - preserve_newlines: false, - keep_array_indentation: false, - break_chained_methods: false, - indent_scripts: 'separate', - brace_style: 'end-expand', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: false, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - }, - js: { - indent_size: '2', - indent_char: ' ', - max_preserve_newlines: '-1', - preserve_newlines: false, - keep_array_indentation: false, - break_chained_methods: false, - indent_scripts: 'normal', - brace_style: 'end-expand', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: true, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - } -} - -// 首字母大小 -export function titleCase(str) { - return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) -} - -// 下划转驼峰 -export function camelCase(str) { - return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()) -} - -export function isNumberStr(str) { - return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) -} - +import { parseTime } from './ruoyi' + +/** + * 表格时间格式化 + */ +export function formatDate(cellValue) { + if (cellValue == null || cellValue == "") return ""; + var date = new Date(cellValue) + var year = date.getFullYear() + var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 + var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() + var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() + var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function getQueryObject(url) { + url = url == null ? window.location.href : url + const search = url.substring(url.lastIndexOf('?') + 1) + const obj = {} + const reg = /([^?&=]+)=([^?&=]*)/g + search.replace(reg, (rs, $1, $2) => { + const name = decodeURIComponent($1) + let val = decodeURIComponent($2) + val = String(val) + obj[name] = val + return rs + }) + return obj +} + +/** + * @param {string} input value + * @returns {number} output value + */ +export function byteLength(str) { + // returns the byte length of an utf8 string + let s = str.length + for (var i = str.length - 1; i >= 0; i--) { + const code = str.charCodeAt(i) + if (code > 0x7f && code <= 0x7ff) s++ + else if (code > 0x7ff && code <= 0xffff) s += 2 + if (code >= 0xDC00 && code <= 0xDFFF) i-- + } + return s +} + +/** + * @param {Array} actual + * @returns {Array} + */ +export function cleanArray(actual) { + const newArray = [] + for (let i = 0; i < actual.length; i++) { + if (actual[i]) { + newArray.push(actual[i]) + } + } + return newArray +} + +/** + * @param {Object} json + * @returns {Array} + */ +export function param(json) { + if (!json) return '' + return cleanArray( + Object.keys(json).map(key => { + if (json[key] === undefined) return '' + return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) + }) + ).join('&') +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} + +/** + * @param {string} val + * @returns {string} + */ +export function html2Text(val) { + const div = document.createElement('div') + div.innerHTML = val + return div.textContent || div.innerText +} + +/** + * Merges two objects, giving the last one precedence + * @param {Object} target + * @param {(Object|Array)} source + * @returns {Object} + */ +export function objectMerge(target, source) { + if (typeof target !== 'object') { + target = {} + } + if (Array.isArray(source)) { + return source.slice() + } + Object.keys(source).forEach(property => { + const sourceProperty = source[property] + if (typeof sourceProperty === 'object') { + target[property] = objectMerge(target[property], sourceProperty) + } else { + target[property] = sourceProperty + } + }) + return target +} + +/** + * @param {HTMLElement} element + * @param {string} className + */ +export function toggleClass(element, className) { + if (!element || !className) { + return + } + let classString = element.className + const nameIndex = classString.indexOf(className) + if (nameIndex === -1) { + classString += '' + className + } else { + classString = + classString.substr(0, nameIndex) + + classString.substr(nameIndex + className.length) + } + element.className = classString +} + +/** + * @param {string} type + * @returns {Date} + */ +export function getTime(type) { + if (type === 'start') { + return new Date().getTime() - 3600 * 1000 * 24 * 90 + } else { + return new Date(new Date().toDateString()) + } +} + +/** + * @param {Function} func + * @param {number} wait + * @param {boolean} immediate + * @return {*} + */ +export function debounce(func, wait, immediate) { + let timeout, args, context, timestamp, result + + const later = function() { + // 据上一次触发时间间隔 + const last = +new Date() - timestamp + + // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait + if (last < wait && last > 0) { + timeout = setTimeout(later, wait - last) + } else { + timeout = null + // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 + if (!immediate) { + result = func.apply(context, args) + if (!timeout) context = args = null + } + } + } + + return function(...args) { + context = this + timestamp = +new Date() + const callNow = immediate && !timeout + // 如果延时不存在，重新设定延时 + if (!timeout) timeout = setTimeout(later, wait) + if (callNow) { + result = func.apply(context, args) + context = args = null + } + + return result + } +} + +/** + * This is just a simple version of deep copy + * Has a lot of edge cases bug + * If you want to use a perfect deep copy, use lodash's _.cloneDeep + * @param {Object} source + * @returns {Object} + */ +export function deepClone(source) { + if (!source && typeof source !== 'object') { + throw new Error('error arguments', 'deepClone') + } + const targetObj = source.constructor === Array ? [] : {} + Object.keys(source).forEach(keys => { + if (source[keys] && typeof source[keys] === 'object') { + targetObj[keys] = deepClone(source[keys]) + } else { + targetObj[keys] = source[keys] + } + }) + return targetObj +} + +/** + * @param {Array} arr + * @returns {Array} + */ +export function uniqueArr(arr) { + return Array.from(new Set(arr)) +} + +/** + * @returns {string} + */ +export function createUniqueString() { + const timestamp = +new Date() + '' + const randomNum = parseInt((1 + Math.random()) * 65536) + '' + return (+(randomNum + timestamp)).toString(32) +} + +/** + * Check if an element has a class + * @param {HTMLElement} elm + * @param {string} cls + * @returns {boolean} + */ +export function hasClass(ele, cls) { + return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) +} + +/** + * Add class to element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function addClass(ele, cls) { + if (!hasClass(ele, cls)) ele.className += ' ' + cls +} + +/** + * Remove class from element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function removeClass(ele, cls) { + if (hasClass(ele, cls)) { + const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') + ele.className = ele.className.replace(reg, ' ') + } +} + +export function makeMap(str, expectsLowerCase) { + const map = Object.create(null) + const list = str.split(',') + for (let i = 0; i < list.length; i++) { + map[list[i]] = true + } + return expectsLowerCase + ? val => map[val.toLowerCase()] + : val => map[val] +} + +export const exportDefault = 'export default ' + +export const beautifierConf = { + html: { + indent_size: '2', + indent_char: ' ', + max_preserve_newlines: '-1', + preserve_newlines: false, + keep_array_indentation: false, + break_chained_methods: false, + indent_scripts: 'separate', + brace_style: 'end-expand', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: false, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + }, + js: { + indent_size: '2', + indent_char: ' ', + max_preserve_newlines: '-1', + preserve_newlines: false, + keep_array_indentation: false, + break_chained_methods: false, + indent_scripts: 'normal', + brace_style: 'end-expand', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: true, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + } +} + +// 首字母大小 +export function titleCase(str) { + return str.replace(/( |^)[a-z]/g, L => L.toUpperCase()) +} + +// 下划转驼峰 +export function camelCase(str) { + return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase()) +} + +export function isNumberStr(str) { + return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) +} + diff --git a/ruoyi-ui/src/utils/jsencrypt.js b/yudao-admin-ui/src/utils/jsencrypt.js similarity index 100% rename from ruoyi-ui/src/utils/jsencrypt.js rename to yudao-admin-ui/src/utils/jsencrypt.js diff --git a/ruoyi-ui/src/utils/permission.js b/yudao-admin-ui/src/utils/permission.js similarity index 96% rename from ruoyi-ui/src/utils/permission.js rename to yudao-admin-ui/src/utils/permission.js index 25d1a0293..1730e332c 100644 --- a/ruoyi-ui/src/utils/permission.js +++ b/yudao-admin-ui/src/utils/permission.js @@ -1,51 +1,51 @@ -import store from '@/store' - -/** - * 字符权限校验 - * @param {Array} value 校验值 - * @returns {Boolean} - */ -export function checkPermi(value) { - if (value && value instanceof Array && value.length > 0) { - const permissions = store.getters && store.getters.permissions - const permissionDatas = value - const all_permission = "*:*:*"; - - const hasPermission = permissions.some(permission => { - return all_permission === permission || permissionDatas.includes(permission) - }) - - if (!hasPermission) { - return false - } - return true - } else { - console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`) - return false - } -} - -/** - * 角色权限校验 - * @param {Array} value 校验值 - * @returns {Boolean} - */ -export function checkRole(value) { - if (value && value instanceof Array && value.length > 0) { - const roles = store.getters && store.getters.roles - const permissionRoles = value - const super_admin = "admin"; - - const hasRole = roles.some(role => { - return super_admin === role || permissionRoles.includes(role) - }) - - if (!hasRole) { - return false - } - return true - } else { - console.error(`need roles! Like checkRole="['admin','editor']"`) - return false - } +import store from '@/store' + +/** + * 字符权限校验 + * @param {Array} value 校验值 + * @returns {Boolean} + */ +export function checkPermi(value) { + if (value && value instanceof Array && value.length > 0) { + const permissions = store.getters && store.getters.permissions + const permissionDatas = value + const all_permission = "*:*:*"; + + const hasPermission = permissions.some(permission => { + return all_permission === permission || permissionDatas.includes(permission) + }) + + if (!hasPermission) { + return false + } + return true + } else { + console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`) + return false + } +} + +/** + * 角色权限校验 + * @param {Array} value 校验值 + * @returns {Boolean} + */ +export function checkRole(value) { + if (value && value instanceof Array && value.length > 0) { + const roles = store.getters && store.getters.roles + const permissionRoles = value + const super_admin = "admin"; + + const hasRole = roles.some(role => { + return super_admin === role || permissionRoles.includes(role) + }) + + if (!hasRole) { + return false + } + return true + } else { + console.error(`need roles! Like checkRole="['admin','editor']"`) + return false + } } \ No newline at end of file diff --git a/ruoyi-ui/src/utils/request.js b/yudao-admin-ui/src/utils/request.js similarity index 100% rename from ruoyi-ui/src/utils/request.js rename to yudao-admin-ui/src/utils/request.js diff --git a/ruoyi-ui/src/utils/ruoyi.js b/yudao-admin-ui/src/utils/ruoyi.js similarity index 100% rename from ruoyi-ui/src/utils/ruoyi.js rename to yudao-admin-ui/src/utils/ruoyi.js diff --git a/ruoyi-ui/src/utils/scroll-to.js b/yudao-admin-ui/src/utils/scroll-to.js similarity index 96% rename from ruoyi-ui/src/utils/scroll-to.js rename to yudao-admin-ui/src/utils/scroll-to.js index 709fa5745..c5d8e04e0 100644 --- a/ruoyi-ui/src/utils/scroll-to.js +++ b/yudao-admin-ui/src/utils/scroll-to.js @@ -1,58 +1,58 @@ -Math.easeInOutQuad = function(t, b, c, d) { - t /= d / 2 - if (t < 1) { - return c / 2 * t * t + b - } - t-- - return -c / 2 * (t * (t - 2) - 1) + b -} - -// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts -var requestAnimFrame = (function() { - return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) } -})() - -/** - * Because it's so fucking difficult to detect the scrolling element, just move them all - * @param {number} amount - */ -function move(amount) { - document.documentElement.scrollTop = amount - document.body.parentNode.scrollTop = amount - document.body.scrollTop = amount -} - -function position() { - return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop -} - -/** - * @param {number} to - * @param {number} duration - * @param {Function} callback - */ -export function scrollTo(to, duration, callback) { - const start = position() - const change = to - start - const increment = 20 - let currentTime = 0 - duration = (typeof (duration) === 'undefined') ? 500 : duration - var animateScroll = function() { - // increment the time - currentTime += increment - // find the value with the quadratic in-out easing function - var val = Math.easeInOutQuad(currentTime, start, change, duration) - // move the document.body - move(val) - // do the animation unless its over - if (currentTime < duration) { - requestAnimFrame(animateScroll) - } else { - if (callback && typeof (callback) === 'function') { - // the animation is done so lets callback - callback() - } - } - } - animateScroll() -} +Math.easeInOutQuad = function(t, b, c, d) { + t /= d / 2 + if (t < 1) { + return c / 2 * t * t + b + } + t-- + return -c / 2 * (t * (t - 2) - 1) + b +} + +// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts +var requestAnimFrame = (function() { + return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) } +})() + +/** + * Because it's so fucking difficult to detect the scrolling element, just move them all + * @param {number} amount + */ +function move(amount) { + document.documentElement.scrollTop = amount + document.body.parentNode.scrollTop = amount + document.body.scrollTop = amount +} + +function position() { + return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop +} + +/** + * @param {number} to + * @param {number} duration + * @param {Function} callback + */ +export function scrollTo(to, duration, callback) { + const start = position() + const change = to - start + const increment = 20 + let currentTime = 0 + duration = (typeof (duration) === 'undefined') ? 500 : duration + var animateScroll = function() { + // increment the time + currentTime += increment + // find the value with the quadratic in-out easing function + var val = Math.easeInOutQuad(currentTime, start, change, duration) + // move the document.body + move(val) + // do the animation unless its over + if (currentTime < duration) { + requestAnimFrame(animateScroll) + } else { + if (callback && typeof (callback) === 'function') { + // the animation is done so lets callback + callback() + } + } + } + animateScroll() +} diff --git a/ruoyi-ui/src/utils/validate.js b/yudao-admin-ui/src/utils/validate.js similarity index 95% rename from ruoyi-ui/src/utils/validate.js rename to yudao-admin-ui/src/utils/validate.js index 9c00400ee..adfa25425 100644 --- a/ruoyi-ui/src/utils/validate.js +++ b/yudao-admin-ui/src/utils/validate.js @@ -1,83 +1,83 @@ -/** - * @param {string} path - * @returns {Boolean} - */ -export function isExternal(path) { - return /^(https?:|mailto:|tel:)/.test(path) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validUsername(str) { - const valid_map = ['admin', 'editor'] - return valid_map.indexOf(str.trim()) >= 0 -} - -/** - * @param {string} url - * @returns {Boolean} - */ -export function validURL(url) { - const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ - return reg.test(url) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validLowerCase(str) { - const reg = /^[a-z]+$/ - return reg.test(str) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validUpperCase(str) { - const reg = /^[A-Z]+$/ - return reg.test(str) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function validAlphabets(str) { - const reg = /^[A-Za-z]+$/ - return reg.test(str) -} - -/** - * @param {string} email - * @returns {Boolean} - */ -export function validEmail(email) { - const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ - return reg.test(email) -} - -/** - * @param {string} str - * @returns {Boolean} - */ -export function isString(str) { - if (typeof str === 'string' || str instanceof String) { - return true - } - return false -} - -/** - * @param {Array} arg - * @returns {Boolean} - */ -export function isArray(arg) { - if (typeof Array.isArray === 'undefined') { - return Object.prototype.toString.call(arg) === '[object Array]' - } - return Array.isArray(arg) -} +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} + +/** + * @param {string} url + * @returns {Boolean} + */ +export function validURL(url) { + const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ + return reg.test(url) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validLowerCase(str) { + const reg = /^[a-z]+$/ + return reg.test(str) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUpperCase(str) { + const reg = /^[A-Z]+$/ + return reg.test(str) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validAlphabets(str) { + const reg = /^[A-Za-z]+$/ + return reg.test(str) +} + +/** + * @param {string} email + * @returns {Boolean} + */ +export function validEmail(email) { + const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ + return reg.test(email) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function isString(str) { + if (typeof str === 'string' || str instanceof String) { + return true + } + return false +} + +/** + * @param {Array} arg + * @returns {Boolean} + */ +export function isArray(arg) { + if (typeof Array.isArray === 'undefined') { + return Object.prototype.toString.call(arg) === '[object Array]' + } + return Array.isArray(arg) +} diff --git a/ruoyi-ui/src/views/components/icons/element-icons.js b/yudao-admin-ui/src/views/components/icons/element-icons.js similarity index 99% rename from ruoyi-ui/src/views/components/icons/element-icons.js rename to yudao-admin-ui/src/views/components/icons/element-icons.js index ae33ba0e3..9ea4d63fd 100644 --- a/ruoyi-ui/src/views/components/icons/element-icons.js +++ b/yudao-admin-ui/src/views/components/icons/element-icons.js @@ -1,3 +1,3 @@ -const elementIcons = ['platform-eleme', 'eleme', 'delete-solid', 'delete', 's-tools', 'setting', 'user-solid', 'user', 'phone', 'phone-outline', 'more', 'more-outline', 'star-on', 'star-off', 's-goods', 'goods', 'warning', 'warning-outline', 'question', 'info', 'remove', 'circle-plus', 'success', 'error', 'zoom-in', 'zoom-out', 'remove-outline', 'circle-plus-outline', 'circle-check', 'circle-close', 's-help', 'help', 'minus', 'plus', 'check', 'close', 'picture', 'picture-outline', 'picture-outline-round', 'upload', 'upload2', 'download', 'camera-solid', 'camera', 'video-camera-solid', 'video-camera', 'message-solid', 'bell', 's-cooperation', 's-order', 's-platform', 's-fold', 's-unfold', 's-operation', 's-promotion', 's-home', 's-release', 's-ticket', 's-management', 's-open', 's-shop', 's-marketing', 's-flag', 's-comment', 's-finance', 's-claim', 's-custom', 's-opportunity', 's-data', 's-check', 's-grid', 'menu', 'share', 'd-caret', 'caret-left', 'caret-right', 'caret-bottom', 'caret-top', 'bottom-left', 'bottom-right', 'back', 'right', 'bottom', 'top', 'top-left', 'top-right', 'arrow-left', 'arrow-right', 'arrow-down', 'arrow-up', 'd-arrow-left', 'd-arrow-right', 'video-pause', 'video-play', 'refresh', 'refresh-right', 'refresh-left', 'finished', 'sort', 'sort-up', 'sort-down', 'rank', 'loading', 'view', 'c-scale-to-original', 'date', 'edit', 'edit-outline', 'folder', 'folder-opened', 'folder-add', 'folder-remove', 'folder-delete', 'folder-checked', 'tickets', 'document-remove', 'document-delete', 'document-copy', 'document-checked', 'document', 'document-add', 'printer', 'paperclip', 'takeaway-box', 'search', 'monitor', 'attract', 'mobile', 'scissors', 'umbrella', 'headset', 'brush', 'mouse', 'coordinate', 'magic-stick', 'reading', 'data-line', 'data-board', 'pie-chart', 'data-analysis', 'collection-tag', 'film', 'suitcase', 'suitcase-1', 'receiving', 'collection', 'files', 'notebook-1', 'notebook-2', 'toilet-paper', 'office-building', 'school', 'table-lamp', 'house', 'no-smoking', 'smoking', 'shopping-cart-full', 'shopping-cart-1', 'shopping-cart-2', 'shopping-bag-1', 'shopping-bag-2', 'sold-out', 'sell', 'present', 'box', 'bank-card', 'money', 'coin', 'wallet', 'discount', 'price-tag', 'news', 'guide', 'male', 'female', 'thumb', 'cpu', 'link', 'connection', 'open', 'turn-off', 'set-up', 'chat-round', 'chat-line-round', 'chat-square', 'chat-dot-round', 'chat-dot-square', 'chat-line-square', 'message', 'postcard', 'position', 'turn-off-microphone', 'microphone', 'close-notification', 'bangzhu', 'time', 'odometer', 'crop', 'aim', 'switch-button', 'full-screen', 'copy-document', 'mic', 'stopwatch', 'medal-1', 'medal', 'trophy', 'trophy-1', 'first-aid-kit', 'discover', 'place', 'location', 'location-outline', 'location-information', 'add-location', 'delete-location', 'map-location', 'alarm-clock', 'timer', 'watch-1', 'watch', 'lock', 'unlock', 'key', 'service', 'mobile-phone', 'bicycle', 'truck', 'ship', 'basketball', 'football', 'soccer', 'baseball', 'wind-power', 'light-rain', 'lightning', 'heavy-rain', 'sunrise', 'sunrise-1', 'sunset', 'sunny', 'cloudy', 'partly-cloudy', 'cloudy-and-sunny', 'moon', 'moon-night', 'dish', 'dish-1', 'food', 'chicken', 'fork-spoon', 'knife-fork', 'burger', 'tableware', 'sugar', 'dessert', 'ice-cream', 'hot-water', 'water-cup', 'coffee-cup', 'cold-drink', 'goblet', 'goblet-full', 'goblet-square', 'goblet-square-full', 'refrigerator', 'grape', 'watermelon', 'cherry', 'apple', 'pear', 'orange', 'coffee', 'ice-tea', 'ice-drink', 'milk-tea', 'potato-strips', 'lollipop', 'ice-cream-square', 'ice-cream-round'] - -export default elementIcons +const elementIcons = ['platform-eleme', 'eleme', 'delete-solid', 'delete', 's-tools', 'setting', 'user-solid', 'user', 'phone', 'phone-outline', 'more', 'more-outline', 'star-on', 'star-off', 's-goods', 'goods', 'warning', 'warning-outline', 'question', 'info', 'remove', 'circle-plus', 'success', 'error', 'zoom-in', 'zoom-out', 'remove-outline', 'circle-plus-outline', 'circle-check', 'circle-close', 's-help', 'help', 'minus', 'plus', 'check', 'close', 'picture', 'picture-outline', 'picture-outline-round', 'upload', 'upload2', 'download', 'camera-solid', 'camera', 'video-camera-solid', 'video-camera', 'message-solid', 'bell', 's-cooperation', 's-order', 's-platform', 's-fold', 's-unfold', 's-operation', 's-promotion', 's-home', 's-release', 's-ticket', 's-management', 's-open', 's-shop', 's-marketing', 's-flag', 's-comment', 's-finance', 's-claim', 's-custom', 's-opportunity', 's-data', 's-check', 's-grid', 'menu', 'share', 'd-caret', 'caret-left', 'caret-right', 'caret-bottom', 'caret-top', 'bottom-left', 'bottom-right', 'back', 'right', 'bottom', 'top', 'top-left', 'top-right', 'arrow-left', 'arrow-right', 'arrow-down', 'arrow-up', 'd-arrow-left', 'd-arrow-right', 'video-pause', 'video-play', 'refresh', 'refresh-right', 'refresh-left', 'finished', 'sort', 'sort-up', 'sort-down', 'rank', 'loading', 'view', 'c-scale-to-original', 'date', 'edit', 'edit-outline', 'folder', 'folder-opened', 'folder-add', 'folder-remove', 'folder-delete', 'folder-checked', 'tickets', 'document-remove', 'document-delete', 'document-copy', 'document-checked', 'document', 'document-add', 'printer', 'paperclip', 'takeaway-box', 'search', 'monitor', 'attract', 'mobile', 'scissors', 'umbrella', 'headset', 'brush', 'mouse', 'coordinate', 'magic-stick', 'reading', 'data-line', 'data-board', 'pie-chart', 'data-analysis', 'collection-tag', 'film', 'suitcase', 'suitcase-1', 'receiving', 'collection', 'files', 'notebook-1', 'notebook-2', 'toilet-paper', 'office-building', 'school', 'table-lamp', 'house', 'no-smoking', 'smoking', 'shopping-cart-full', 'shopping-cart-1', 'shopping-cart-2', 'shopping-bag-1', 'shopping-bag-2', 'sold-out', 'sell', 'present', 'box', 'bank-card', 'money', 'coin', 'wallet', 'discount', 'price-tag', 'news', 'guide', 'male', 'female', 'thumb', 'cpu', 'link', 'connection', 'open', 'turn-off', 'set-up', 'chat-round', 'chat-line-round', 'chat-square', 'chat-dot-round', 'chat-dot-square', 'chat-line-square', 'message', 'postcard', 'position', 'turn-off-microphone', 'microphone', 'close-notification', 'bangzhu', 'time', 'odometer', 'crop', 'aim', 'switch-button', 'full-screen', 'copy-document', 'mic', 'stopwatch', 'medal-1', 'medal', 'trophy', 'trophy-1', 'first-aid-kit', 'discover', 'place', 'location', 'location-outline', 'location-information', 'add-location', 'delete-location', 'map-location', 'alarm-clock', 'timer', 'watch-1', 'watch', 'lock', 'unlock', 'key', 'service', 'mobile-phone', 'bicycle', 'truck', 'ship', 'basketball', 'football', 'soccer', 'baseball', 'wind-power', 'light-rain', 'lightning', 'heavy-rain', 'sunrise', 'sunrise-1', 'sunset', 'sunny', 'cloudy', 'partly-cloudy', 'cloudy-and-sunny', 'moon', 'moon-night', 'dish', 'dish-1', 'food', 'chicken', 'fork-spoon', 'knife-fork', 'burger', 'tableware', 'sugar', 'dessert', 'ice-cream', 'hot-water', 'water-cup', 'coffee-cup', 'cold-drink', 'goblet', 'goblet-full', 'goblet-square', 'goblet-square-full', 'refrigerator', 'grape', 'watermelon', 'cherry', 'apple', 'pear', 'orange', 'coffee', 'ice-tea', 'ice-drink', 'milk-tea', 'potato-strips', 'lollipop', 'ice-cream-square', 'ice-cream-round'] + +export default elementIcons diff --git a/ruoyi-ui/src/views/components/icons/index.vue b/yudao-admin-ui/src/views/components/icons/index.vue similarity index 95% rename from ruoyi-ui/src/views/components/icons/index.vue rename to yudao-admin-ui/src/views/components/icons/index.vue index f422eee97..d3c9a7190 100644 --- a/ruoyi-ui/src/views/components/icons/index.vue +++ b/yudao-admin-ui/src/views/components/icons/index.vue @@ -1,87 +1,87 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/components/icons/svg-icons.js b/yudao-admin-ui/src/views/components/icons/svg-icons.js similarity index 96% rename from ruoyi-ui/src/views/components/icons/svg-icons.js rename to yudao-admin-ui/src/views/components/icons/svg-icons.js index 9713fd8d8..724cd8e9d 100644 --- a/ruoyi-ui/src/views/components/icons/svg-icons.js +++ b/yudao-admin-ui/src/views/components/icons/svg-icons.js @@ -1,10 +1,10 @@ -const req = require.context('../../../assets/icons/svg', false, /\.svg$/) -const requireAll = requireContext => requireContext.keys() - -const re = /\.\/(.*)\.svg/ - -const svgIcons = requireAll(req).map(i => { - return i.match(re)[1] -}) - -export default svgIcons +const req = require.context('../../../assets/icons/svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys() + +const re = /\.\/(.*)\.svg/ + +const svgIcons = requireAll(req).map(i => { + return i.match(re)[1] +}) + +export default svgIcons diff --git a/ruoyi-ui/src/views/dashboard/BarChart.vue b/yudao-admin-ui/src/views/dashboard/BarChart.vue similarity index 95% rename from ruoyi-ui/src/views/dashboard/BarChart.vue rename to yudao-admin-ui/src/views/dashboard/BarChart.vue index 6b464e1c4..be0af34f8 100644 --- a/ruoyi-ui/src/views/dashboard/BarChart.vue +++ b/yudao-admin-ui/src/views/dashboard/BarChart.vue @@ -1,102 +1,102 @@ - - - + + + diff --git a/ruoyi-ui/src/views/dashboard/LineChart.vue b/yudao-admin-ui/src/views/dashboard/LineChart.vue similarity index 95% rename from ruoyi-ui/src/views/dashboard/LineChart.vue rename to yudao-admin-ui/src/views/dashboard/LineChart.vue index 4e30a3701..e654168dd 100644 --- a/ruoyi-ui/src/views/dashboard/LineChart.vue +++ b/yudao-admin-ui/src/views/dashboard/LineChart.vue @@ -1,135 +1,135 @@ - - - + + + diff --git a/ruoyi-ui/src/views/dashboard/PanelGroup.vue b/yudao-admin-ui/src/views/dashboard/PanelGroup.vue similarity index 95% rename from ruoyi-ui/src/views/dashboard/PanelGroup.vue rename to yudao-admin-ui/src/views/dashboard/PanelGroup.vue index 8d3a73bca..1a1081fcb 100644 --- a/ruoyi-ui/src/views/dashboard/PanelGroup.vue +++ b/yudao-admin-ui/src/views/dashboard/PanelGroup.vue @@ -1,181 +1,181 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/yudao-admin-ui/src/views/dashboard/PieChart.vue similarity index 95% rename from ruoyi-ui/src/views/dashboard/PieChart.vue rename to yudao-admin-ui/src/views/dashboard/PieChart.vue index d0e4f5016..4d2ef32a5 100644 --- a/ruoyi-ui/src/views/dashboard/PieChart.vue +++ b/yudao-admin-ui/src/views/dashboard/PieChart.vue @@ -1,79 +1,79 @@ - - - + + + diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/yudao-admin-ui/src/views/dashboard/RaddarChart.vue similarity index 95% rename from ruoyi-ui/src/views/dashboard/RaddarChart.vue rename to yudao-admin-ui/src/views/dashboard/RaddarChart.vue index 9831abfec..6823af318 100644 --- a/ruoyi-ui/src/views/dashboard/RaddarChart.vue +++ b/yudao-admin-ui/src/views/dashboard/RaddarChart.vue @@ -1,116 +1,116 @@ - - - + + + diff --git a/ruoyi-ui/src/views/dashboard/mixins/resize.js b/yudao-admin-ui/src/views/dashboard/mixins/resize.js similarity index 96% rename from ruoyi-ui/src/views/dashboard/mixins/resize.js rename to yudao-admin-ui/src/views/dashboard/mixins/resize.js index d26194c6d..b1e76e947 100644 --- a/ruoyi-ui/src/views/dashboard/mixins/resize.js +++ b/yudao-admin-ui/src/views/dashboard/mixins/resize.js @@ -1,56 +1,56 @@ -import { debounce } from '@/utils' - -export default { - data() { - return { - $_sidebarElm: null, - $_resizeHandler: null - } - }, - mounted() { - this.initListener() - }, - activated() { - if (!this.$_resizeHandler) { - // avoid duplication init - this.initListener() - } - - // when keep-alive chart activated, auto resize - this.resize() - }, - beforeDestroy() { - this.destroyListener() - }, - deactivated() { - this.destroyListener() - }, - methods: { - // use $_ for mixins properties - // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential - $_sidebarResizeHandler(e) { - if (e.propertyName === 'width') { - this.$_resizeHandler() - } - }, - initListener() { - this.$_resizeHandler = debounce(() => { - this.resize() - }, 100) - window.addEventListener('resize', this.$_resizeHandler) - - this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0] - this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler) - }, - destroyListener() { - window.removeEventListener('resize', this.$_resizeHandler) - this.$_resizeHandler = null - - this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler) - }, - resize() { - const { chart } = this - chart && chart.resize() - } - } -} +import { debounce } from '@/utils' + +export default { + data() { + return { + $_sidebarElm: null, + $_resizeHandler: null + } + }, + mounted() { + this.initListener() + }, + activated() { + if (!this.$_resizeHandler) { + // avoid duplication init + this.initListener() + } + + // when keep-alive chart activated, auto resize + this.resize() + }, + beforeDestroy() { + this.destroyListener() + }, + deactivated() { + this.destroyListener() + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_sidebarResizeHandler(e) { + if (e.propertyName === 'width') { + this.$_resizeHandler() + } + }, + initListener() { + this.$_resizeHandler = debounce(() => { + this.resize() + }, 100) + window.addEventListener('resize', this.$_resizeHandler) + + this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0] + this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler) + }, + destroyListener() { + window.removeEventListener('resize', this.$_resizeHandler) + this.$_resizeHandler = null + + this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler) + }, + resize() { + const { chart } = this + chart && chart.resize() + } + } +} diff --git a/ruoyi-ui/src/views/error/401.vue b/yudao-admin-ui/src/views/error/401.vue similarity index 95% rename from ruoyi-ui/src/views/error/401.vue rename to yudao-admin-ui/src/views/error/401.vue index 9664fbaf4..448b6ecd6 100644 --- a/ruoyi-ui/src/views/error/401.vue +++ b/yudao-admin-ui/src/views/error/401.vue @@ -1,88 +1,88 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/error/404.vue b/yudao-admin-ui/src/views/error/404.vue similarity index 95% rename from ruoyi-ui/src/views/error/404.vue rename to yudao-admin-ui/src/views/error/404.vue index 666d27c87..96f075c17 100644 --- a/ruoyi-ui/src/views/error/404.vue +++ b/yudao-admin-ui/src/views/error/404.vue @@ -1,233 +1,233 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/index.vue b/yudao-admin-ui/src/views/index.vue similarity index 100% rename from ruoyi-ui/src/views/index.vue rename to yudao-admin-ui/src/views/index.vue diff --git a/ruoyi-ui/src/views/index_old.vue b/yudao-admin-ui/src/views/index_old.vue similarity index 100% rename from ruoyi-ui/src/views/index_old.vue rename to yudao-admin-ui/src/views/index_old.vue diff --git a/ruoyi-ui/src/views/infra/apiAccessLog/index.vue b/yudao-admin-ui/src/views/infra/apiAccessLog/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/apiAccessLog/index.vue rename to yudao-admin-ui/src/views/infra/apiAccessLog/index.vue diff --git a/ruoyi-ui/src/views/infra/apiErrorLog/index.vue b/yudao-admin-ui/src/views/infra/apiErrorLog/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/apiErrorLog/index.vue rename to yudao-admin-ui/src/views/infra/apiErrorLog/index.vue diff --git a/ruoyi-ui/src/views/infra/config/index.vue b/yudao-admin-ui/src/views/infra/config/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/config/index.vue rename to yudao-admin-ui/src/views/infra/config/index.vue diff --git a/ruoyi-ui/src/views/infra/druid/index.vue b/yudao-admin-ui/src/views/infra/druid/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/druid/index.vue rename to yudao-admin-ui/src/views/infra/druid/index.vue diff --git a/ruoyi-ui/src/views/infra/file/index.vue b/yudao-admin-ui/src/views/infra/file/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/file/index.vue rename to yudao-admin-ui/src/views/infra/file/index.vue diff --git a/ruoyi-ui/src/views/infra/job/index.vue b/yudao-admin-ui/src/views/infra/job/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/job/index.vue rename to yudao-admin-ui/src/views/infra/job/index.vue diff --git a/ruoyi-ui/src/views/infra/job/log.vue b/yudao-admin-ui/src/views/infra/job/log.vue similarity index 100% rename from ruoyi-ui/src/views/infra/job/log.vue rename to yudao-admin-ui/src/views/infra/job/log.vue diff --git a/ruoyi-ui/src/views/infra/redis/index.vue b/yudao-admin-ui/src/views/infra/redis/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/redis/index.vue rename to yudao-admin-ui/src/views/infra/redis/index.vue diff --git a/ruoyi-ui/src/views/infra/server/index.vue b/yudao-admin-ui/src/views/infra/server/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/server/index.vue rename to yudao-admin-ui/src/views/infra/server/index.vue diff --git a/ruoyi-ui/src/views/infra/skywalking/index.vue b/yudao-admin-ui/src/views/infra/skywalking/index.vue similarity index 100% rename from ruoyi-ui/src/views/infra/skywalking/index.vue rename to yudao-admin-ui/src/views/infra/skywalking/index.vue diff --git a/ruoyi-ui/src/views/infra/skywalking/log.vue b/yudao-admin-ui/src/views/infra/skywalking/log.vue similarity index 100% rename from ruoyi-ui/src/views/infra/skywalking/log.vue rename to yudao-admin-ui/src/views/infra/skywalking/log.vue diff --git a/ruoyi-ui/src/views/login.vue b/yudao-admin-ui/src/views/login.vue similarity index 96% rename from ruoyi-ui/src/views/login.vue rename to yudao-admin-ui/src/views/login.vue index 1fca6413f..40ef6f799 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/yudao-admin-ui/src/views/login.vue @@ -1,204 +1,204 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/redirect.vue b/yudao-admin-ui/src/views/redirect.vue similarity index 100% rename from ruoyi-ui/src/views/redirect.vue rename to yudao-admin-ui/src/views/redirect.vue diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/yudao-admin-ui/src/views/system/dept/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/dept/index.vue rename to yudao-admin-ui/src/views/system/dept/index.vue index 0fc5a8733..8202d2f99 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/yudao-admin-ui/src/views/system/dept/index.vue @@ -1,283 +1,283 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/yudao-admin-ui/src/views/system/dict/data.vue similarity index 97% rename from ruoyi-ui/src/views/system/dict/data.vue rename to yudao-admin-ui/src/views/system/dict/data.vue index 13d262303..fa01ebce5 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/yudao-admin-ui/src/views/system/dict/data.vue @@ -1,277 +1,277 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/yudao-admin-ui/src/views/system/dict/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/dict/index.vue rename to yudao-admin-ui/src/views/system/dict/index.vue index a730e61bf..b93131764 100644 --- a/ruoyi-ui/src/views/system/dict/index.vue +++ b/yudao-admin-ui/src/views/system/dict/index.vue @@ -1,263 +1,263 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/errorCode/index.vue b/yudao-admin-ui/src/views/system/errorCode/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/errorCode/index.vue rename to yudao-admin-ui/src/views/system/errorCode/index.vue diff --git a/ruoyi-ui/src/views/system/loginlog/index.vue b/yudao-admin-ui/src/views/system/loginlog/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/loginlog/index.vue rename to yudao-admin-ui/src/views/system/loginlog/index.vue diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/yudao-admin-ui/src/views/system/menu/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/menu/index.vue rename to yudao-admin-ui/src/views/system/menu/index.vue index 767878e2e..e46c2664f 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/yudao-admin-ui/src/views/system/menu/index.vue @@ -1,327 +1,327 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/yudao-admin-ui/src/views/system/notice/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/notice/index.vue rename to yudao-admin-ui/src/views/system/notice/index.vue index 30f17bcf2..c50da669a 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/yudao-admin-ui/src/views/system/notice/index.vue @@ -1,251 +1,251 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/operatelog/index.vue b/yudao-admin-ui/src/views/system/operatelog/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/operatelog/index.vue rename to yudao-admin-ui/src/views/system/operatelog/index.vue diff --git a/ruoyi-ui/src/views/system/post/index.vue b/yudao-admin-ui/src/views/system/post/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/post/index.vue rename to yudao-admin-ui/src/views/system/post/index.vue index 80cab5d49..96f955ec4 100644 --- a/ruoyi-ui/src/views/system/post/index.vue +++ b/yudao-admin-ui/src/views/system/post/index.vue @@ -1,249 +1,249 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/role/index.vue b/yudao-admin-ui/src/views/system/role/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/role/index.vue rename to yudao-admin-ui/src/views/system/role/index.vue index 744f5f90d..0ced5d8df 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/yudao-admin-ui/src/views/system/role/index.vue @@ -1,514 +1,514 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/session/index.vue b/yudao-admin-ui/src/views/system/session/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/session/index.vue rename to yudao-admin-ui/src/views/system/session/index.vue diff --git a/ruoyi-ui/src/views/system/sms/smsChannel.vue b/yudao-admin-ui/src/views/system/sms/smsChannel.vue similarity index 100% rename from ruoyi-ui/src/views/system/sms/smsChannel.vue rename to yudao-admin-ui/src/views/system/sms/smsChannel.vue diff --git a/ruoyi-ui/src/views/system/sms/smsLog.vue b/yudao-admin-ui/src/views/system/sms/smsLog.vue similarity index 100% rename from ruoyi-ui/src/views/system/sms/smsLog.vue rename to yudao-admin-ui/src/views/system/sms/smsLog.vue diff --git a/ruoyi-ui/src/views/system/sms/smsTemplate.vue b/yudao-admin-ui/src/views/system/sms/smsTemplate.vue similarity index 100% rename from ruoyi-ui/src/views/system/sms/smsTemplate.vue rename to yudao-admin-ui/src/views/system/sms/smsTemplate.vue diff --git a/ruoyi-ui/src/views/system/user/index.vue b/yudao-admin-ui/src/views/system/user/index.vue similarity index 100% rename from ruoyi-ui/src/views/system/user/index.vue rename to yudao-admin-ui/src/views/system/user/index.vue diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/yudao-admin-ui/src/views/system/user/profile/index.vue similarity index 97% rename from ruoyi-ui/src/views/system/user/profile/index.vue rename to yudao-admin-ui/src/views/system/user/profile/index.vue index cae5e2e4b..bb4192857 100644 --- a/ruoyi-ui/src/views/system/user/profile/index.vue +++ b/yudao-admin-ui/src/views/system/user/profile/index.vue @@ -1,93 +1,93 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/yudao-admin-ui/src/views/system/user/profile/resetPwd.vue similarity index 96% rename from ruoyi-ui/src/views/system/user/profile/resetPwd.vue rename to yudao-admin-ui/src/views/system/user/profile/resetPwd.vue index 135971701..ee6524053 100644 --- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue +++ b/yudao-admin-ui/src/views/system/user/profile/resetPwd.vue @@ -1,72 +1,72 @@ - - - + + + diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/yudao-admin-ui/src/views/system/user/profile/userAvatar.vue similarity index 96% rename from ruoyi-ui/src/views/system/user/profile/userAvatar.vue rename to yudao-admin-ui/src/views/system/user/profile/userAvatar.vue index aca1990d7..edc15e36e 100644 --- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue +++ b/yudao-admin-ui/src/views/system/user/profile/userAvatar.vue @@ -1,167 +1,167 @@ - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/yudao-admin-ui/src/views/system/user/profile/userInfo.vue similarity index 96% rename from ruoyi-ui/src/views/system/user/profile/userInfo.vue rename to yudao-admin-ui/src/views/system/user/profile/userInfo.vue index 3aea8bcd5..058a1130f 100644 --- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue +++ b/yudao-admin-ui/src/views/system/user/profile/userInfo.vue @@ -1,76 +1,76 @@ - - - + + + diff --git a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue b/yudao-admin-ui/src/views/tool/build/CodeTypeDialog.vue similarity index 95% rename from ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue rename to yudao-admin-ui/src/views/tool/build/CodeTypeDialog.vue index 99f9eb2dc..941ec3625 100644 --- a/ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue +++ b/yudao-admin-ui/src/views/tool/build/CodeTypeDialog.vue @@ -1,106 +1,106 @@ - - + + diff --git a/ruoyi-ui/src/views/tool/build/DraggableItem.vue b/yudao-admin-ui/src/views/tool/build/DraggableItem.vue similarity index 96% rename from ruoyi-ui/src/views/tool/build/DraggableItem.vue rename to yudao-admin-ui/src/views/tool/build/DraggableItem.vue index f669ac0e6..e881778f0 100644 --- a/ruoyi-ui/src/views/tool/build/DraggableItem.vue +++ b/yudao-admin-ui/src/views/tool/build/DraggableItem.vue @@ -1,100 +1,100 @@ - + diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/yudao-admin-ui/src/views/tool/build/IconsDialog.vue similarity index 95% rename from ruoyi-ui/src/views/tool/build/IconsDialog.vue rename to yudao-admin-ui/src/views/tool/build/IconsDialog.vue index 0d1277835..958be50c5 100644 --- a/ruoyi-ui/src/views/tool/build/IconsDialog.vue +++ b/yudao-admin-ui/src/views/tool/build/IconsDialog.vue @@ -1,123 +1,123 @@ - - - + + + diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/yudao-admin-ui/src/views/tool/build/RightPanel.vue similarity index 97% rename from ruoyi-ui/src/views/tool/build/RightPanel.vue rename to yudao-admin-ui/src/views/tool/build/RightPanel.vue index 1acdc5794..abaec431e 100644 --- a/ruoyi-ui/src/views/tool/build/RightPanel.vue +++ b/yudao-admin-ui/src/views/tool/build/RightPanel.vue @@ -1,944 +1,944 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue b/yudao-admin-ui/src/views/tool/build/TreeNodeDialog.vue similarity index 95% rename from ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue rename to yudao-admin-ui/src/views/tool/build/TreeNodeDialog.vue index 477c010b9..c225c4cc8 100644 --- a/ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue +++ b/yudao-admin-ui/src/views/tool/build/TreeNodeDialog.vue @@ -1,149 +1,149 @@ - - + + diff --git a/ruoyi-ui/src/views/tool/build/index.vue b/yudao-admin-ui/src/views/tool/build/index.vue similarity index 96% rename from ruoyi-ui/src/views/tool/build/index.vue rename to yudao-admin-ui/src/views/tool/build/index.vue index 4548012de..92291e981 100644 --- a/ruoyi-ui/src/views/tool/build/index.vue +++ b/yudao-admin-ui/src/views/tool/build/index.vue @@ -1,789 +1,789 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/tool/codegen/basicInfoForm.vue b/yudao-admin-ui/src/views/tool/codegen/basicInfoForm.vue similarity index 100% rename from ruoyi-ui/src/views/tool/codegen/basicInfoForm.vue rename to yudao-admin-ui/src/views/tool/codegen/basicInfoForm.vue diff --git a/ruoyi-ui/src/views/tool/codegen/editTable.vue b/yudao-admin-ui/src/views/tool/codegen/editTable.vue similarity index 100% rename from ruoyi-ui/src/views/tool/codegen/editTable.vue rename to yudao-admin-ui/src/views/tool/codegen/editTable.vue diff --git a/ruoyi-ui/src/views/tool/codegen/genInfoForm.vue b/yudao-admin-ui/src/views/tool/codegen/genInfoForm.vue similarity index 100% rename from ruoyi-ui/src/views/tool/codegen/genInfoForm.vue rename to yudao-admin-ui/src/views/tool/codegen/genInfoForm.vue diff --git a/ruoyi-ui/src/views/tool/codegen/importTable.vue b/yudao-admin-ui/src/views/tool/codegen/importTable.vue similarity index 100% rename from ruoyi-ui/src/views/tool/codegen/importTable.vue rename to yudao-admin-ui/src/views/tool/codegen/importTable.vue diff --git a/ruoyi-ui/src/views/tool/codegen/index.vue b/yudao-admin-ui/src/views/tool/codegen/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/codegen/index.vue rename to yudao-admin-ui/src/views/tool/codegen/index.vue diff --git a/ruoyi-ui/src/views/tool/dbDoc/index.vue b/yudao-admin-ui/src/views/tool/dbDoc/index.vue similarity index 100% rename from ruoyi-ui/src/views/tool/dbDoc/index.vue rename to yudao-admin-ui/src/views/tool/dbDoc/index.vue diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/yudao-admin-ui/src/views/tool/swagger/index.vue similarity index 96% rename from ruoyi-ui/src/views/tool/swagger/index.vue rename to yudao-admin-ui/src/views/tool/swagger/index.vue index 13daa0911..8504daf31 100644 --- a/ruoyi-ui/src/views/tool/swagger/index.vue +++ b/yudao-admin-ui/src/views/tool/swagger/index.vue @@ -1,26 +1,26 @@ -