From f99d48a79b58e92bc291fba5166b0cacad8b6b04 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 28 Apr 2021 01:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4=E9=A1=B9?= =?UTF-8?q?=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