From b94549185c9f728a21a30633574f2275fcd086c8 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 27 Jun 2025 10:23:57 +0800 Subject: [PATCH] fys --- LICENSE | 2 +- README.md | 38 +++--- {ruoyi-admin => fys-admin}/Dockerfile | 14 +-- {ruoyi-admin => fys-admin}/pom.xml | 42 +++---- .../com/fuyuanshen}/DromaraApplication.java | 4 +- .../DromaraServletInitializer.java | 2 +- .../web/controller/AuthController.java | 60 +++++----- .../web/controller/CaptchaController.java | 32 +++--- .../web/controller/IndexController.java | 6 +- .../fuyuanshen}/web/domain/vo/CaptchaVo.java | 2 +- .../web/domain/vo/LoginTenantVo.java | 2 +- .../fuyuanshen}/web/domain/vo/LoginVo.java | 2 +- .../web/domain/vo/TenantListVo.java | 4 +- .../web/listener/UserActionListener.java | 26 ++--- .../web/service/IAuthStrategy.java | 11 +- .../web/service/SysLoginService.java | 46 ++++---- .../web/service/SysRegisterService.java | 40 +++---- .../web/service/impl/EmailAuthStrategy.java | 46 ++++---- .../service/impl/PasswordAuthStrategy.java | 50 ++++---- .../web/service/impl/SmsAuthStrategy.java | 46 ++++---- .../web/service/impl/SocialAuthStrategy.java | 46 ++++---- .../web/service/impl/XcxAuthStrategy.java | 26 ++--- .../src/main/resources/application-dev.yml | 6 +- .../src/main/resources/application-prod.yml | 10 +- .../src/main/resources/application.yml | 26 ++--- .../src/main/resources/banner.txt | 0 .../main/resources/i18n/messages.properties | 0 .../resources/i18n/messages_en_US.properties | 0 .../resources/i18n/messages_zh_CN.properties | 0 .../src/main/resources/ip2region.xdb | Bin .../src/main/resources/logback-plus.xml | 0 .../com/fuyuanshen}/test/AssertUnitTest.java | 2 +- .../com/fuyuanshen}/test/DemoUnitTest.java | 4 +- .../com/fuyuanshen}/test/ParamUnitTest.java | 4 +- .../com/fuyuanshen}/test/TagUnitTest.java | 2 +- .../fys-common-bom}/pom.xml | 98 ++++++++-------- .../fys-common-core}/pom.xml | 8 +- .../common/core/config/ApplicationConfig.java | 2 +- .../common/core/config/AsyncConfig.java | 6 +- .../common/core/config/ThreadPoolConfig.java | 8 +- .../common/core/config/ValidatorConfig.java | 2 +- .../properties/ThreadPoolProperties.java | 2 +- .../common/core/constant/CacheConstants.java | 2 +- .../common/core/constant/CacheNames.java | 2 +- .../common/core/constant/Constants.java | 4 +- .../common/core/constant/GlobalConstants.java | 2 +- .../common/core/constant/HttpStatus.java | 2 +- .../common/core/constant/RegexConstants.java | 2 +- .../common/core/constant/SystemConstants.java | 2 +- .../common/core/constant/TenantConstants.java | 2 +- .../com/fuyuanshen}/common/core/domain/R.java | 4 +- .../core/domain/dto/CompleteTaskDTO.java | 2 +- .../common/core/domain/dto/DeptDTO.java | 2 +- .../common/core/domain/dto/DictDataDTO.java | 2 +- .../common/core/domain/dto/DictTypeDTO.java | 2 +- .../common/core/domain/dto/FlowCopyDTO.java | 2 +- .../common/core/domain/dto/OssDTO.java | 2 +- .../common/core/domain/dto/PostDTO.java | 2 +- .../common/core/domain/dto/RoleDTO.java | 2 +- .../core/domain/dto/StartProcessDTO.java | 2 +- .../domain/dto/StartProcessReturnDTO.java | 2 +- .../core/domain/dto/TaskAssigneeDTO.java | 2 +- .../common/core/domain/dto/UserDTO.java | 2 +- .../common/core/domain/dto/UserOnlineDTO.java | 4 +- .../core/domain/event/ProcessDeleteEvent.java | 2 +- .../core/domain/event/ProcessEvent.java | 2 +- .../core/domain/event/ProcessTaskEvent.java | 2 +- .../core/domain/model/EmailLoginBody.java | 2 +- .../common/core/domain/model/LoginBody.java | 2 +- .../common/core/domain/model/LoginUser.java | 6 +- .../core/domain/model/PasswordLoginBody.java | 2 +- .../core/domain/model/RegisterBody.java | 2 +- .../core/domain/model/SmsLoginBody.java | 2 +- .../core/domain/model/SocialLoginBody.java | 2 +- .../core/domain/model/TaskAssigneeBody.java | 2 +- .../core/domain/model/XcxLoginBody.java | 2 +- .../core/domain/model/XcxLoginUser.java | 2 +- .../common/core/enums/BusinessStatusEnum.java | 6 +- .../common/core/enums/DeviceType.java | 2 +- .../common/core/enums/FormatsType.java | 4 +- .../common/core/enums/LoginType.java | 2 +- .../common/core/enums/UserStatus.java | 4 +- .../common/core/enums/UserType.java | 4 +- .../core/exception/ServiceException.java | 4 +- .../common/core/exception/SseException.java | 2 +- .../core/exception/base/BaseException.java | 8 +- .../core/exception/file/FileException.java | 6 +- .../FileNameLengthLimitExceededException.java | 4 +- .../file/FileSizeLimitExceededException.java | 4 +- .../core/exception/user/CaptchaException.java | 4 +- .../user/CaptchaExpireException.java | 4 +- .../core/exception/user/UserException.java | 6 +- .../core/factory/RegexPatternPoolFactory.java | 4 +- .../factory/YmlPropertySourceFactory.java | 4 +- .../common/core/service/ConfigService.java | 2 +- .../common/core/service/DeptService.java | 4 +- .../common/core/service/DictService.java | 6 +- .../common/core/service/OssService.java | 4 +- .../core/service/PermissionService.java | 2 +- .../common/core/service/PostService.java | 2 +- .../common/core/service/RoleService.java | 2 +- .../core/service/TaskAssigneeService.java | 6 +- .../common/core/service/UserService.java | 4 +- .../common/core/service/WorkflowService.java | 8 +- .../common/core/utils/DateUtils.java | 8 +- .../common/core/utils/MapstructUtils.java | 2 +- .../common/core/utils/MessageUtils.java | 2 +- .../common/core/utils/NetUtils.java | 4 +- .../common/core/utils/ObjectUtils.java | 2 +- .../common/core/utils/ServletUtils.java | 4 +- .../common/core/utils/SpringUtils.java | 2 +- .../common/core/utils/StreamUtils.java | 3 +- .../common/core/utils/StringUtils.java | 2 +- .../common/core/utils/Threads.java | 4 +- .../common/core/utils/TreeBuildUtils.java | 4 +- .../common/core/utils/ValidatorUtils.java | 2 +- .../common/core/utils/file/FileUtils.java | 2 +- .../common/core/utils/file/MimeTypeUtils.java | 4 +- .../common/core/utils/ip/AddressUtils.java | 6 +- .../common/core/utils/ip/RegionUtils.java | 6 +- .../core/utils/reflect/ReflectUtils.java | 4 +- .../common/core/utils/regex/RegexUtils.java | 4 +- .../core/utils/regex/RegexValidator.java | 4 +- .../common/core/utils/sql/SqlUtil.java | 6 +- .../common/core/validate/AddGroup.java | 2 +- .../common/core/validate/EditGroup.java | 2 +- .../common/core/validate/QueryGroup.java | 2 +- .../core/validate/dicts/DictPattern.java | 2 +- .../validate/dicts/DictPatternValidator.java | 8 +- .../core/validate/enumd/EnumPattern.java | 2 +- .../validate/enumd/EnumPatternValidator.java | 6 +- .../com/fuyuanshen}/common/core/xss/Xss.java | 2 +- .../common/core/xss/XssValidator.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 5 + .../fys-common-doc}/pom.xml | 12 +- .../common/doc/config/SpringDocConfig.java | 8 +- .../properties/SpringDocProperties.java | 2 +- .../common/doc/handler/OpenApiHandler.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-encrypt}/pom.xml | 12 +- .../common/encrypt/annotation/ApiEncrypt.java | 2 +- .../encrypt/annotation/EncryptField.java | 6 +- .../config/ApiDecryptAutoConfiguration.java | 6 +- .../config/EncryptorAutoConfiguration.java | 10 +- .../common/encrypt/core/EncryptContext.java | 6 +- .../common/encrypt/core/EncryptorManager.java | 8 +- .../common/encrypt/core/IEncryptor.java | 6 +- .../core/encryptor/AbstractEncryptor.java | 6 +- .../encrypt/core/encryptor/AesEncryptor.java | 10 +- .../core/encryptor/Base64Encryptor.java | 10 +- .../encrypt/core/encryptor/RsaEncryptor.java | 12 +- .../encrypt/core/encryptor/Sm2Encryptor.java | 12 +- .../encrypt/core/encryptor/Sm4Encryptor.java | 10 +- .../common/encrypt/enumd/AlgorithmType.java | 4 +- .../common/encrypt/enumd/EncodeType.java | 2 +- .../common/encrypt/filter/CryptoFilter.java | 14 +-- .../filter/DecryptRequestBodyWrapper.java | 6 +- .../filter/EncryptResponseBodyWrapper.java | 4 +- .../MybatisDecryptInterceptor.java | 16 +-- .../MybatisEncryptInterceptor.java | 16 +-- .../properties/ApiDecryptProperties.java | 2 +- .../properties/EncryptorProperties.java | 6 +- .../common/encrypt/utils/EncryptUtils.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 3 + .../fys-common-excel}/pom.xml | 12 +- .../common/excel/annotation/CellMerge.java | 4 +- .../excel/annotation/ExcelDictFormat.java | 4 +- .../excel/annotation/ExcelEnumFormat.java | 2 +- .../excel/annotation/ExcelNotation.java | 2 +- .../excel/annotation/ExcelRequired.java | 2 +- .../excel/convert/ExcelBigNumberConvert.java | 2 +- .../excel/convert/ExcelDictConvert.java | 12 +- .../excel/convert/ExcelEnumConvert.java | 6 +- .../common/excel/core/CellMergeStrategy.java | 6 +- .../excel/core/DefaultExcelListener.java | 8 +- .../common/excel/core/DefaultExcelResult.java | 2 +- .../common/excel/core/DropDownOptions.java | 4 +- .../common/excel/core/ExcelDownHandler.java | 16 +-- .../common/excel/core/ExcelListener.java | 2 +- .../common/excel/core/ExcelResult.java | 2 +- .../excel/handler/DataWriteHandler.java | 8 +- .../common/excel/utils/ExcelUtil.java | 12 +- .../fys-common-idempotent}/pom.xml | 16 +-- .../idempotent/annotation/RepeatSubmit.java | 2 +- .../aspectj/RepeatSubmitAspect.java | 20 ++-- .../idempotent/config/IdempotentConfig.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-job}/pom.xml | 12 +- .../common/job/config/SnailJobConfig.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-json}/pom.xml | 12 +- .../common/json/config/JacksonConfig.java | 6 +- .../json/handler/BigNumberSerializer.java | 2 +- .../json/handler/CustomDateDeserializer.java | 2 +- .../common/json/utils/JsonUtils.java | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-log}/pom.xml | 16 +-- .../common/log/annotation/Log.java | 8 +- .../common/log/aspect/LogAspect.java | 20 ++-- .../common/log/enums/BusinessStatus.java | 4 +- .../common/log/enums/BusinessType.java | 4 +- .../common/log/enums/OperatorType.java | 4 +- .../common/log/event/LogininforEvent.java | 2 +- .../common/log/event/OperLogEvent.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-mail}/pom.xml | 12 +- .../common/mail/config/MailConfig.java | 4 +- .../config/properties/MailProperties.java | 2 +- .../common/mail/utils/MailUtils.java | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-mybatis}/pom.xml | 16 +-- .../common/mybatis/annotation/DataColumn.java | 2 +- .../mybatis/annotation/DataPermission.java | 2 +- .../mybatis/aspect/DataPermissionAspect.java | 6 +- .../mybatis/config/MybatisPlusConfig.java | 16 +-- .../mybatis/core/domain/BaseEntity.java | 2 +- .../mybatis/core/mapper/BaseMapperPlus.java | 6 +- .../common/mybatis/core/page/PageQuery.java | 8 +- .../mybatis/core/page/TableDataInfo.java | 2 +- .../common/mybatis/enums/DataBaseType.java | 4 +- .../common/mybatis/enums/DataScopeType.java | 8 +- .../handler/InjectionMetaObjectHandler.java | 12 +- .../handler/MybatisExceptionHandler.java | 6 +- .../handler/PlusDataPermissionHandler.java | 26 ++--- .../handler/PlusPostInitTableInfoHandler.java | 6 +- .../common/mybatis/helper/DataBaseHelper.java | 8 +- .../mybatis/helper/DataPermissionHelper.java | 6 +- .../PlusDataPermissionInterceptor.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/common-mybatis.yml | 0 .../src/main/resources/spy.properties | 0 .../fys-common-oss}/pom.xml | 16 +-- .../common/oss/constant/OssConstant.java | 4 +- .../common/oss/core/OssClient.java | 20 ++-- .../common/oss/entity/UploadResult.java | 2 +- .../common/oss/enums/AccessPolicyType.java | 2 +- .../common/oss/exception/OssException.java | 2 +- .../common/oss/factory/OssFactory.java | 20 ++-- .../common/oss/properties/OssProperties.java | 2 +- .../fys-common-ratelimiter}/pom.xml | 16 +-- .../ratelimiter/annotation/RateLimiter.java | 4 +- .../aspectj/RateLimiterAspect.java | 20 ++-- .../ratelimiter/config/RateLimiterConfig.java | 4 +- .../common/ratelimiter/enums/LimitType.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/spel-extension.json | 7 ++ .../fys-common-redis}/pom.xml | 14 +-- .../common/redis/config/CacheConfig.java | 4 +- .../common/redis/config/RedisConfig.java | 12 +- .../config/properties/RedissonProperties.java | 2 +- .../redis/handler/KeyPrefixHandler.java | 4 +- .../redis/handler/RedisExceptionHandler.java | 4 +- .../redis/manager/CaffeineCacheDecorator.java | 4 +- .../redis/manager/PlusSpringCacheManager.java | 4 +- .../common/redis/utils/CacheUtils.java | 4 +- .../common/redis/utils/QueueUtils.java | 4 +- .../common/redis/utils/RedisUtils.java | 4 +- .../common/redis/utils/SequenceUtils.java | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../fys-common-satoken}/pom.xml | 16 +-- .../common/satoken/config/SaTokenConfig.java | 10 +- .../satoken/core/dao/PlusSaTokenDao.java | 4 +- .../core/service/SaPermissionImpl.java | 16 +-- .../handler/SaTokenExceptionHandler.java | 4 +- .../common/satoken/utils/LoginHelper.java | 10 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/common-satoken.yml | 0 .../fys-common-security}/pom.xml | 13 ++- .../security/config/SecurityConfig.java | 16 +-- .../config/properties/SecurityProperties.java | 2 +- .../security/handler/AllUrlHandler.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../fys-common-sensitive}/pom.xml | 13 +-- .../sensitive/annotation/Sensitive.java | 6 +- .../sensitive/core/SensitiveService.java | 2 +- .../sensitive/core/SensitiveStrategy.java | 2 +- .../sensitive/handler/SensitiveHandler.java | 10 +- .../fys-common-sms}/pom.xml | 14 +-- .../sms/config/SmsAutoConfiguration.java | 6 +- .../common/sms/core/dao/PlusSmsDao.java | 6 +- .../sms/handler/SmsExceptionHandler.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-social}/pom.xml | 16 +-- .../config/SocialAutoConfiguration.java | 6 +- .../SocialLoginConfigProperties.java | 2 +- .../config/properties/SocialProperties.java | 2 +- .../common/social/gitea/AuthGiteaRequest.java | 6 +- .../common/social/gitea/AuthGiteaSource.java | 2 +- .../social/maxkey/AuthMaxKeyRequest.java | 6 +- .../social/maxkey/AuthMaxKeySource.java | 2 +- .../social/topiam/AuthTopIamRequest.java | 8 +- .../social/topiam/AuthTopIamSource.java | 2 +- .../social/utils/AuthRedisStateCache.java | 6 +- .../common/social/utils/SocialUtils.java | 14 +-- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-sse}/pom.xml | 24 ++-- .../sse/config/SseAutoConfiguration.java | 8 +- .../common/sse/config/SseProperties.java | 2 +- .../common/sse/controller/SseController.java | 10 +- .../common/sse/core/SseEmitterManager.java | 6 +- .../common/sse/dto/SseMessageDto.java | 2 +- .../common/sse/listener/SseTopicListener.java | 4 +- .../common/sse/utils/SseMessageUtils.java | 8 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-tenant}/pom.xml | 16 +-- .../common/tenant/config/TenantConfig.java | 18 +-- .../common/tenant/core/TenantEntity.java | 4 +- .../common/tenant/core/TenantSaTokenDao.java | 8 +- .../tenant/exception/TenantException.java | 4 +- .../tenant/handle/PlusTenantLineHandler.java | 8 +- .../tenant/handle/TenantKeyPrefixHandler.java | 10 +- .../common/tenant/helper/TenantHelper.java | 14 +-- .../manager/TenantSpringCacheManager.java | 10 +- .../tenant/properties/TenantProperties.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../fys-common-translation}/pom.xml | 12 +- .../translation/annotation/Translation.java | 4 +- .../annotation/TranslationType.java | 4 +- .../translation/config/TranslationConfig.java | 10 +- .../translation/constant/TransConstant.java | 2 +- .../core/TranslationInterface.java | 4 +- .../TranslationBeanSerializerModifier.java | 2 +- .../core/handler/TranslationHandler.java | 10 +- .../core/impl/DeptNameTranslationImpl.java | 10 +- .../core/impl/DictTypeTranslationImpl.java | 12 +- .../core/impl/NicknameTranslationImpl.java | 10 +- .../core/impl/OssUrlTranslationImpl.java | 10 +- .../core/impl/UserNameTranslationImpl.java | 10 +- ...ot.autoconfigure.AutoConfiguration.imports | 6 + .../fys-common-web}/pom.xml | 16 +-- .../common/web/config/CaptchaConfig.java | 4 +- .../common/web/config/FilterConfig.java | 8 +- .../common/web/config/I18nConfig.java | 4 +- .../common/web/config/ResourcesConfig.java | 6 +- .../common/web/config/UndertowConfig.java | 4 +- .../config/properties/CaptchaProperties.java | 6 +- .../web/config/properties/XssProperties.java | 2 +- .../common/web/core/BaseController.java | 6 +- .../common/web/core/I18nLocaleResolver.java | 2 +- .../common/web/enums/CaptchaCategory.java | 2 +- .../common/web/enums/CaptchaType.java | 4 +- .../common/web/filter/RepeatableFilter.java | 6 +- .../web/filter/RepeatedlyRequestWrapper.java | 6 +- .../common/web/filter/XssFilter.java | 10 +- .../filter/XssHttpServletRequestWrapper.java | 6 +- .../web/handler/GlobalExceptionHandler.java | 14 +-- .../PlusWebInvokeTimeInterceptor.java | 8 +- .../web/utils/UnsignedMathGenerator.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 5 + .../fys-common-websocket}/pom.xml | 24 ++-- .../websocket/config/WebSocketConfig.java | 10 +- .../properties/WebSocketProperties.java | 2 +- .../constant/WebSocketConstants.java | 2 +- .../websocket/dto/WebSocketMessageDto.java | 2 +- .../handler/PlusWebSocketHandler.java | 12 +- .../holder/WebSocketSessionHolder.java | 2 +- .../interceptor/PlusWebSocketInterceptor.java | 12 +- .../listener/WebSocketTopicListener.java | 6 +- .../websocket/utils/WebSocketUtils.java | 10 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + fys-common/pom.xml | 46 ++++++++ .../fys-monitor-admin}/Dockerfile | 6 +- .../fys-monitor-admin}/pom.xml | 6 +- .../admin/MonitorAdminApplication.java | 2 +- .../admin/config/AdminServerConfig.java | 2 +- .../monitor/admin/config/SecurityConfig.java | 2 +- .../admin/notifier/CustomNotifier.java | 2 +- .../src/main/resources/application.yml | 6 +- .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 2 +- .../fys-snailjob-server}/Dockerfile | 6 +- .../fys-snailjob-server}/pom.xml | 6 +- .../starter/filter/ActuatorAuthFilter.java | 0 .../server/starter/filter/SecurityConfig.java | 0 .../snailjob/SnailJobServerApplication.java | 2 +- .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 0 .../src/main/resources/application.yml | 4 +- .../src/main/resources/banner.txt | 0 .../src/main/resources/logback-plus.xml | 2 +- {ruoyi-extend => fys-extend}/pom.xml | 10 +- fys-modules/fys-demo/pom.xml | 108 ++++++++++++++++++ .../demo/controller/MailController.java | 6 +- .../demo/controller/RedisCacheController.java | 8 +- .../demo/controller/RedisLockController.java | 4 +- .../controller/RedisPubSubController.java | 6 +- .../RedisRateLimiterController.java | 8 +- .../demo/controller/SmsController.java | 4 +- .../controller/Swagger3DemoController.java | 4 +- .../demo/controller/TestBatchController.java | 10 +- .../demo/controller/TestDemoController.java | 40 +++---- .../controller/TestEncryptController.java | 8 +- .../demo/controller/TestExcelController.java | 12 +- .../demo/controller/TestI18nController.java | 6 +- .../controller/TestSensitiveController.java | 12 +- .../demo/controller/TestTreeController.java | 26 ++--- .../demo/controller/WebSocketController.java | 8 +- .../demo/controller/package-info.java | 1 + .../queue/BoundedQueueController.java | 8 +- .../queue/DelayedQueueController.java | 6 +- .../demo/controller/queue/PriorityDemo.java | 2 +- .../queue/PriorityQueueController.java | 6 +- .../com/fuyuanshen}/demo/domain/TestDemo.java | 4 +- .../demo/domain/TestDemoEncrypt.java | 6 +- .../com/fuyuanshen}/demo/domain/TestTree.java | 4 +- .../demo/domain/bo/TestDemoBo.java | 10 +- .../demo/domain/bo/TestDemoImportVo.java | 2 +- .../demo/domain/bo/TestTreeBo.java | 10 +- .../fuyuanshen/demo/domain/package-info.java | 1 + .../demo/domain/vo/ExportDemoVo.java | 16 +-- .../demo/domain/vo/TestDemoVo.java | 12 +- .../demo/domain/vo/TestTreeVo.java | 4 +- .../demo/listener/ExportDemoListener.java | 14 +-- .../demo/mapper/TestDemoEncryptMapper.java | 6 +- .../demo/mapper/TestDemoMapper.java | 12 +- .../demo/mapper/TestTreeMapper.java | 21 ++++ .../fuyuanshen/demo/mapper/package-info.java | 1 + .../demo/service/IExportExcelService.java | 2 +- .../demo/service/ITestDemoService.java | 12 +- .../demo/service/ITestTreeService.java | 6 +- .../service/impl/ExportExcelServiceImpl.java | 14 +-- .../service/impl/TestDemoServiceImpl.java | 22 ++-- .../service/impl/TestTreeServiceImpl.java | 16 +-- .../demo/service/impl/package-info.java | 1 + .../fuyuanshen/demo/service/package-info.java | 1 + .../src/main/resources/excel/单列表.xlsx | Bin .../src/main/resources/excel/多sheet列表.xlsx | Bin .../src/main/resources/excel/多列表.xlsx | Bin .../resources/mapper/demo/TestDemoMapper.xml | 4 +- .../resources/mapper/demo/TestTreeMapper.xml | 2 +- .../src/main/resources/mapper/package-info.md | 0 .../fys-generator}/pom.xml | 26 ++--- .../generator/config/GenConfig.java | 4 +- .../config/MyBatisDataSourceMonitor.java | 2 +- .../generator/constant/GenConstants.java | 4 +- .../generator/controller/GenController.java | 24 ++-- .../generator/domain/GenTable.java | 8 +- .../generator/domain/GenTableColumn.java | 6 +- .../mapper/GenTableColumnMapper.java | 6 +- .../generator/mapper/GenTableMapper.java | 6 +- .../service/GenTableServiceImpl.java | 36 +++--- .../generator/service/IGenTableService.java | 10 +- .../fuyuanshen}/generator/util/GenUtils.java | 14 +-- .../generator/util/VelocityInitializer.java | 6 +- .../generator/util/VelocityUtils.java | 22 ++-- .../src/main/resources/generator.yml | 2 +- .../mapper/generator/GenTableColumnMapper.xml | 4 +- .../mapper/generator/GenTableMapper.xml | 6 +- .../src/main/resources/mapper/package-info.md | 0 .../src/main/resources/vm/java/bo.java.vm | 4 +- .../main/resources/vm/java/controller.java.vm | 20 ++-- .../src/main/resources/vm/java/domain.java.vm | 3 +- .../src/main/resources/vm/java/mapper.java.vm | 2 +- .../main/resources/vm/java/service.java.vm | 4 +- .../resources/vm/java/serviceImpl.java.vm | 9 +- .../src/main/resources/vm/java/vo.java.vm | 4 +- .../src/main/resources/vm/sql/oracle/sql.vm | 0 .../src/main/resources/vm/sql/postgres/sql.vm | 0 .../src/main/resources/vm/sql/sql.vm | 0 .../main/resources/vm/sql/sqlserver/sql.vm | 0 .../src/main/resources/vm/ts/api.ts.vm | 0 .../src/main/resources/vm/ts/types.ts.vm | 0 .../main/resources/vm/vue/index-tree.vue.vm | 0 .../src/main/resources/vm/vue/index.vue.vm | 0 .../src/main/resources/vm/xml/mapper.xml.vm | 0 .../ruoyi-job => fys-modules/fys-job}/pom.xml | 14 +-- .../com/fuyuanshen}/job/entity/BillDto.java | 2 +- .../java/com/fuyuanshen/job/package-info.java | 1 + .../job/snailjob/AlipayBillTask.java | 6 +- .../job/snailjob/SummaryBillTask.java | 6 +- .../job/snailjob/TestAnnoJobExecutor.java | 2 +- .../job/snailjob/TestBroadcastJob.java | 2 +- .../job/snailjob/TestClassJobExecutor.java | 2 +- .../job/snailjob/TestMapJobAnnotation.java | 2 +- .../snailjob/TestMapReduceAnnotation1.java | 2 +- .../job/snailjob/TestStaticShardingJob.java | 2 +- .../job/snailjob/WechatBillTask.java | 6 +- fys-modules/fys-system/pom.xml | 105 +++++++++++++++++ .../controller/monitor/CacheController.java | 6 +- .../monitor/SysLogininforController.java | 26 ++--- .../monitor/SysOperlogController.java | 22 ++-- .../monitor/SysUserOnlineController.java | 24 ++-- .../system/SysClientController.java | 28 ++--- .../system/SysConfigController.java | 22 ++-- .../controller/system/SysDeptController.java | 22 ++-- .../system/SysDictDataController.java | 24 ++-- .../system/SysDictTypeController.java | 22 ++-- .../controller/system/SysMenuController.java | 28 ++--- .../system/SysNoticeController.java | 24 ++-- .../system/SysOssConfigController.java | 28 ++--- .../controller/system/SysOssController.java | 24 ++-- .../controller/system/SysPostController.java | 24 ++-- .../system/SysProfileController.java | 36 +++--- .../controller/system/SysRoleController.java | 34 +++--- .../system/SysSocialController.java | 12 +- .../system/SysTenantController.java | 34 +++--- .../system/SysTenantPackageController.java | 30 ++--- .../controller/system/SysUserController.java | 46 ++++---- .../fuyuanshen}/system/domain/SysCache.java | 4 +- .../fuyuanshen}/system/domain/SysClient.java | 4 +- .../fuyuanshen}/system/domain/SysConfig.java | 4 +- .../fuyuanshen}/system/domain/SysDept.java | 4 +- .../system/domain/SysDictData.java | 6 +- .../system/domain/SysDictType.java | 4 +- .../system/domain/SysLogininfor.java | 2 +- .../fuyuanshen}/system/domain/SysMenu.java | 10 +- .../fuyuanshen}/system/domain/SysNotice.java | 4 +- .../fuyuanshen}/system/domain/SysOperLog.java | 2 +- .../com/fuyuanshen}/system/domain/SysOss.java | 4 +- .../system/domain/SysOssConfig.java | 4 +- .../fuyuanshen}/system/domain/SysPost.java | 4 +- .../fuyuanshen}/system/domain/SysRole.java | 4 +- .../system/domain/SysRoleDept.java | 2 +- .../system/domain/SysRoleMenu.java | 2 +- .../fuyuanshen}/system/domain/SysSocial.java | 4 +- .../fuyuanshen}/system/domain/SysTenant.java | 4 +- .../system/domain/SysTenantPackage.java | 4 +- .../fuyuanshen}/system/domain/SysUser.java | 6 +- .../system/domain/SysUserOnline.java | 2 +- .../system/domain/SysUserPost.java | 2 +- .../system/domain/SysUserRole.java | 2 +- .../system/domain/bo/SysClientBo.java | 10 +- .../system/domain/bo/SysConfigBo.java | 6 +- .../system/domain/bo/SysDeptBo.java | 6 +- .../system/domain/bo/SysDictDataBo.java | 7 +- .../system/domain/bo/SysDictTypeBo.java | 8 +- .../system/domain/bo/SysLogininforBo.java | 4 +- .../system/domain/bo/SysMenuBo.java | 8 +- .../system/domain/bo/SysNoticeBo.java | 8 +- .../system/domain/bo/SysOperLogBo.java | 6 +- .../system/domain/bo/SysOssBo.java | 6 +- .../system/domain/bo/SysOssConfigBo.java | 10 +- .../system/domain/bo/SysPostBo.java | 6 +- .../system/domain/bo/SysRoleBo.java | 8 +- .../system/domain/bo/SysSocialBo.java | 10 +- .../system/domain/bo/SysTenantBo.java | 10 +- .../system/domain/bo/SysTenantPackageBo.java | 12 +- .../system/domain/bo/SysUserBo.java | 10 +- .../system/domain/bo/SysUserPasswordBo.java | 2 +- .../system/domain/bo/SysUserProfileBo.java | 12 +- .../fuyuanshen}/system/domain/vo/MetaVo.java | 6 +- .../system/domain/vo/RouterVo.java | 2 +- .../system/domain/vo/SysClientVo.java | 8 +- .../system/domain/vo/SysConfigVo.java | 8 +- .../system/domain/vo/SysDeptVo.java | 8 +- .../system/domain/vo/SysDictDataVo.java | 8 +- .../system/domain/vo/SysDictTypeVo.java | 6 +- .../system/domain/vo/SysLogininforVo.java | 8 +- .../system/domain/vo/SysMenuVo.java | 4 +- .../system/domain/vo/SysNoticeVo.java | 8 +- .../system/domain/vo/SysOperLogVo.java | 8 +- .../system/domain/vo/SysOssConfigVo.java | 4 +- .../system/domain/vo/SysOssUploadVo.java | 2 +- .../system/domain/vo/SysOssVo.java | 8 +- .../system/domain/vo/SysPostVo.java | 12 +- .../system/domain/vo/SysRoleVo.java | 10 +- .../system/domain/vo/SysSocialVo.java | 4 +- .../system/domain/vo/SysTenantPackageVo.java | 8 +- .../system/domain/vo/SysTenantVo.java | 8 +- .../system/domain/vo/SysUserExportVo.java | 8 +- .../system/domain/vo/SysUserImportVo.java | 6 +- .../system/domain/vo/SysUserInfoVo.java | 2 +- .../system/domain/vo/SysUserVo.java | 12 +- .../system/domain/vo/UserInfoVo.java | 2 +- .../listener/SysUserImportListener.java | 26 ++--- .../system/mapper/SysClientMapper.java | 15 +++ .../system/mapper/SysConfigMapper.java | 14 +++ .../system/mapper/SysDeptMapper.java | 14 +-- .../system/mapper/SysDictDataMapper.java | 8 +- .../system/mapper/SysDictTypeMapper.java | 14 +++ .../system/mapper/SysLogininforMapper.java | 14 +++ .../system/mapper/SysMenuMapper.java | 10 +- .../system/mapper/SysNoticeMapper.java | 14 +++ .../system/mapper/SysOperLogMapper.java | 14 +++ .../system/mapper/SysOssConfigMapper.java | 16 +++ .../system/mapper/SysOssMapper.java | 13 +++ .../system/mapper/SysPostMapper.java | 12 +- .../system/mapper/SysRoleDeptMapper.java | 6 +- .../system/mapper/SysRoleMapper.java | 12 +- .../system/mapper/SysRoleMenuMapper.java | 6 +- .../system/mapper/SysSocialMapper.java | 14 +++ .../system/mapper/SysTenantMapper.java | 14 +++ .../system/mapper/SysTenantPackageMapper.java | 14 +++ .../system/mapper/SysUserMapper.java | 14 +-- .../system/mapper/SysUserPostMapper.java | 6 +- .../system/mapper/SysUserRoleMapper.java | 6 +- .../runner/SystemApplicationRunner.java | 4 +- .../system/service/ISysClientService.java | 11 +- .../system/service/ISysConfigService.java | 10 +- .../system/service/ISysDataScopeService.java | 2 +- .../system/service/ISysDeptService.java | 10 +- .../system/service/ISysDictDataService.java | 10 +- .../system/service/ISysDictTypeService.java | 12 +- .../system/service/ISysLogininforService.java | 10 +- .../system/service/ISysMenuService.java | 10 +- .../system/service/ISysNoticeService.java | 10 +- .../system/service/ISysOperLogService.java | 10 +- .../system/service/ISysOssConfigService.java | 10 +- .../system/service/ISysOssService.java | 10 +- .../system/service/ISysPermissionService.java | 2 +- .../system/service/ISysPostService.java | 10 +- .../system/service/ISysRoleService.java | 12 +- .../system/service/ISysSocialService.java | 6 +- .../service/ISysTenantPackageService.java | 10 +- .../system/service/ISysTenantService.java | 10 +- .../system/service/ISysUserService.java | 12 +- .../service/impl/SysClientServiceImpl.java | 22 ++-- .../service/impl/SysConfigServiceImpl.java | 36 +++--- .../service/impl/SysDataScopeServiceImpl.java | 16 +-- .../service/impl/SysDeptServiceImpl.java | 42 +++---- .../service/impl/SysDictDataServiceImpl.java | 28 ++--- .../service/impl/SysDictTypeServiceImpl.java | 42 +++---- .../impl/SysLogininforServiceImpl.java | 34 +++--- .../service/impl/SysMenuServiceImpl.java | 40 +++---- .../service/impl/SysNoticeServiceImpl.java | 28 ++--- .../service/impl/SysOperLogServiceImpl.java | 24 ++-- .../service/impl/SysOssConfigServiceImpl.java | 34 +++--- .../service/impl/SysOssServiceImpl.java | 42 +++---- .../impl/SysPermissionServiceImpl.java | 16 +-- .../service/impl/SysPostServiceImpl.java | 36 +++--- .../service/impl/SysRoleServiceImpl.java | 48 ++++---- .../service/impl/SysSensitiveServiceImpl.java | 8 +- .../service/impl/SysSocialServiceImpl.java | 16 +-- .../impl/SysTaskAssigneeServiceImpl.java | 36 +++--- .../impl/SysTenantPackageServiceImpl.java | 28 ++--- .../service/impl/SysTenantServiceImpl.java | 42 +++---- .../service/impl/SysUserServiceImpl.java | 36 +++--- .../src/main/resources/mapper/package-info.md | 0 .../mapper/system/SysClientMapper.xml | 2 +- .../mapper/system/SysConfigMapper.xml | 2 +- .../resources/mapper/system/SysDeptMapper.xml | 4 +- .../mapper/system/SysDictDataMapper.xml | 2 +- .../mapper/system/SysDictTypeMapper.xml | 2 +- .../mapper/system/SysLogininforMapper.xml | 2 +- .../resources/mapper/system/SysMenuMapper.xml | 4 +- .../mapper/system/SysNoticeMapper.xml | 2 +- .../mapper/system/SysOperLogMapper.xml | 2 +- .../mapper/system/SysOssConfigMapper.xml | 2 +- .../resources/mapper/system/SysOssMapper.xml | 2 +- .../resources/mapper/system/SysPostMapper.xml | 4 +- .../mapper/system/SysRoleDeptMapper.xml | 2 +- .../resources/mapper/system/SysRoleMapper.xml | 4 +- .../mapper/system/SysRoleMenuMapper.xml | 2 +- .../mapper/system/SysSocialMapper.xml | 2 +- .../mapper/system/SysTenantMapper.xml | 2 +- .../mapper/system/SysTenantPackageMapper.xml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 6 +- .../mapper/system/SysUserPostMapper.xml | 2 +- .../mapper/system/SysUserRoleMapper.xml | 2 +- .../fys-workflow}/pom.xml | 54 ++++----- .../workflow/common/ConditionalOnEnable.java | 2 +- .../common/constant/FlowConstant.java | 2 +- .../common/enums/ButtonPermissionEnum.java | 2 +- .../common/enums/MessageTypeEnum.java | 2 +- .../workflow/common/enums/NodeExtEnum.java | 2 +- .../common/enums/TaskAssigneeEnum.java | 4 +- .../common/enums/TaskAssigneeType.java | 2 +- .../workflow/common/enums/TaskStatusEnum.java | 2 +- .../workflow/config/WarmFlowConfig.java | 4 +- .../controller/FlwCategoryController.java | 28 ++--- .../controller/FlwDefinitionController.java | 22 ++-- .../controller/FlwInstanceController.java | 28 ++--- .../controller/FlwTaskController.java | 32 +++--- .../controller/TestLeaveController.java | 30 ++--- .../workflow/domain/FlowCategory.java | 4 +- .../workflow/domain/TestLeave.java | 4 +- .../workflow/domain/bo/BackProcessBo.java | 5 +- .../workflow/domain/bo/CompleteTaskBo.java | 4 +- .../workflow/domain/bo/FlowCancelBo.java | 4 +- .../workflow/domain/bo/FlowCategoryBo.java | 10 +- .../workflow/domain/bo/FlowCopyBo.java | 2 +- .../workflow/domain/bo/FlowInstanceBo.java | 2 +- .../workflow/domain/bo/FlowInvalidBo.java | 4 +- .../workflow/domain/bo/FlowNextNodeBo.java | 2 +- .../workflow/domain/bo/FlowTaskBo.java | 2 +- .../workflow/domain/bo/FlowTerminationBo.java | 4 +- .../workflow/domain/bo/StartProcessBo.java | 4 +- .../workflow/domain/bo/TaskOperationBo.java | 6 +- .../workflow/domain/bo/TestLeaveBo.java | 10 +- .../domain/vo/ButtonPermissionVo.java | 2 +- .../workflow/domain/vo/FlowCategoryVo.java | 4 +- .../workflow/domain/vo/FlowDefinitionVo.java | 6 +- .../workflow/domain/vo/FlowHisTaskVo.java | 10 +- .../workflow/domain/vo/FlowInstanceVo.java | 8 +- .../workflow/domain/vo/FlowTaskVo.java | 8 +- .../workflow/domain/vo/TestLeaveVo.java | 4 +- .../handler/FlowProcessEventHandler.java | 14 +-- .../handler/WorkflowPermissionHandler.java | 8 +- .../listener/WorkflowGlobalListener.java | 22 ++-- .../workflow/mapper/FlwCategoryMapper.java | 14 +-- .../workflow/mapper/FlwInstanceMapper.java | 6 +- .../workflow/mapper/FlwTaskMapper.java | 8 +- .../workflow/mapper/TestLeaveMapper.java | 15 +++ .../workflow/service/IFlwCategoryService.java | 6 +- .../workflow/service/IFlwCommonService.java | 2 +- .../service/IFlwDefinitionService.java | 8 +- .../workflow/service/IFlwInstanceService.java | 14 +-- .../workflow/service/IFlwNodeExtService.java | 4 +- .../service/IFlwTaskAssigneeService.java | 4 +- .../workflow/service/IFlwTaskService.java | 16 +-- .../workflow/service/ITestLeaveService.java | 10 +- .../impl/CategoryNameTranslationImpl.java | 12 +- .../service/impl/FlwCategoryServiceImpl.java | 26 ++--- .../service/impl/FlwCommonServiceImpl.java | 26 ++--- .../impl/FlwDefinitionServiceImpl.java | 30 ++--- .../service/impl/FlwInstanceServiceImpl.java | 42 +++---- .../service/impl/FlwNodeExtServiceImpl.java | 20 ++-- .../impl/FlwTaskAssigneeServiceImpl.java | 28 ++--- .../service/impl/FlwTaskServiceImpl.java | 56 ++++----- .../service/impl/TestLeaveServiceImpl.java | 34 +++--- .../service/impl/WorkflowServiceImpl.java | 24 ++-- .../src/main/resources/mapper/package-info.md | 0 .../mapper/workflow/FlwCategoryMapper.xml | 2 +- .../mapper/workflow/FlwInstanceMapper.xml | 4 +- .../mapper/workflow/FlwTaskMapper.xml | 6 +- .../mapper/workflow/TestLeaveMapper.xml | 2 +- {ruoyi-modules => fys-modules}/pom.xml | 18 +-- pom.xml | 48 ++++---- ruoyi-common/pom.xml | 46 -------- ...ot.autoconfigure.AutoConfiguration.imports | 5 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 3 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../src/main/resources/spel-extension.json | 7 -- ...ot.autoconfigure.AutoConfiguration.imports | 2 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 2 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...ot.autoconfigure.AutoConfiguration.imports | 6 - ...ot.autoconfigure.AutoConfiguration.imports | 5 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ruoyi-modules/ruoyi-demo/pom.xml | 108 ------------------ .../dromara/demo/controller/package-info.java | 1 - .../org/dromara/demo/domain/package-info.java | 1 - .../dromara/demo/mapper/TestTreeMapper.java | 21 ---- .../org/dromara/demo/mapper/package-info.java | 1 - .../demo/service/impl/package-info.java | 1 - .../dromara/demo/service/package-info.java | 1 - .../java/org/dromara/job/package-info.java | 1 - ruoyi-modules/ruoyi-system/pom.xml | 105 ----------------- .../system/mapper/SysClientMapper.java | 15 --- .../system/mapper/SysConfigMapper.java | 14 --- .../system/mapper/SysDictTypeMapper.java | 14 --- .../system/mapper/SysLogininforMapper.java | 14 --- .../system/mapper/SysNoticeMapper.java | 14 --- .../system/mapper/SysOperLogMapper.java | 14 --- .../system/mapper/SysOssConfigMapper.java | 16 --- .../dromara/system/mapper/SysOssMapper.java | 13 --- .../system/mapper/SysSocialMapper.java | 14 --- .../system/mapper/SysTenantMapper.java | 14 --- .../system/mapper/SysTenantPackageMapper.java | 14 --- .../workflow/mapper/TestLeaveMapper.java | 15 --- script/bin/ry.bat | 2 +- script/bin/ry.sh | 2 +- script/docker/database.yml | 2 +- script/docker/docker-compose.yml | 40 +++---- script/docker/redis/conf/redis.conf | 2 +- script/sql/oracle/oracle_ry_job.sql | 6 +- script/sql/oracle/oracle_ry_vue_5.X.sql | 12 +- script/sql/postgres/postgres_ry_job.sql | 6 +- script/sql/postgres/postgres_ry_vue_5.X.sql | 12 +- script/sql/ry_job.sql | 6 +- script/sql/ry_vue_5.X.sql | 12 +- script/sql/sqlserver/sqlserver_ry_job.sql | 6 +- script/sql/sqlserver/sqlserver_ry_vue_5.X.sql | 12 +- 774 files changed, 3543 insertions(+), 3558 deletions(-) rename {ruoyi-admin => fys-admin}/Dockerfile (74%) rename {ruoyi-admin => fys-admin}/pom.xml (81%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/DromaraApplication.java (82%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/DromaraServletInitializer.java (95%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/controller/AuthController.java (81%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/controller/CaptchaController.java (85%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/controller/IndexController.java (79%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/domain/vo/CaptchaVo.java (88%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/domain/vo/LoginTenantVo.java (88%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/domain/vo/LoginVo.java (95%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/domain/vo/TenantListVo.java (81%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/listener/UserActionListener.java (88%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/IAuthStrategy.java (77%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/SysLoginService.java (87%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/SysRegisterService.java (75%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/impl/EmailAuthStrategy.java (73%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/impl/PasswordAuthStrategy.java (75%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/impl/SmsAuthStrategy.java (74%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/impl/SocialAuthStrategy.java (78%) rename {ruoyi-admin/src/main/java/org/dromara => fys-admin/src/main/java/com/fuyuanshen}/web/service/impl/XcxAuthStrategy.java (86%) rename {ruoyi-admin => fys-admin}/src/main/resources/application-dev.yml (98%) rename {ruoyi-admin => fys-admin}/src/main/resources/application-prod.yml (98%) rename {ruoyi-admin => fys-admin}/src/main/resources/application.yml (92%) rename {ruoyi-admin => fys-admin}/src/main/resources/banner.txt (100%) rename {ruoyi-admin => fys-admin}/src/main/resources/i18n/messages.properties (100%) rename {ruoyi-admin => fys-admin}/src/main/resources/i18n/messages_en_US.properties (100%) rename {ruoyi-admin => fys-admin}/src/main/resources/i18n/messages_zh_CN.properties (100%) rename {ruoyi-admin => fys-admin}/src/main/resources/ip2region.xdb (100%) rename {ruoyi-admin => fys-admin}/src/main/resources/logback-plus.xml (100%) rename {ruoyi-admin/src/test/java/org/dromara => fys-admin/src/test/java/com/fuyuanshen}/test/AssertUnitTest.java (97%) rename {ruoyi-admin/src/test/java/org/dromara => fys-admin/src/test/java/com/fuyuanshen}/test/DemoUnitTest.java (94%) rename {ruoyi-admin/src/test/java/org/dromara => fys-admin/src/test/java/com/fuyuanshen}/test/ParamUnitTest.java (95%) rename {ruoyi-admin/src/test/java/org/dromara => fys-admin/src/test/java/com/fuyuanshen}/test/TagUnitTest.java (97%) rename {ruoyi-common/ruoyi-common-bom => fys-common/fys-common-bom}/pom.xml (57%) rename {ruoyi-common/ruoyi-common-core => fys-common/fys-common-core}/pom.xml (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/config/ApplicationConfig.java (89%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/config/AsyncConfig.java (90%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/config/ThreadPoolConfig.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/config/ValidatorConfig.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/config/properties/ThreadPoolProperties.java (90%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/CacheConstants.java (91%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/CacheNames.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/Constants.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/GlobalConstants.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/HttpStatus.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/RegexConstants.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/SystemConstants.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/constant/TenantConstants.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/R.java (95%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/CompleteTaskDTO.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/DeptDTO.java (91%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/DictDataDTO.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/DictTypeDTO.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/FlowCopyDTO.java (88%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/OssDTO.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/PostDTO.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/RoleDTO.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/StartProcessDTO.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/StartProcessReturnDTO.java (89%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/TaskAssigneeDTO.java (98%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/UserDTO.java (95%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/dto/UserOnlineDTO.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/event/ProcessDeleteEvent.java (90%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/event/ProcessEvent.java (95%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/event/ProcessTaskEvent.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/EmailLoginBody.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/LoginBody.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/LoginUser.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/PasswordLoginBody.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/RegisterBody.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/SmsLoginBody.java (90%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/SocialLoginBody.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/TaskAssigneeBody.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/XcxLoginBody.java (90%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/domain/model/XcxLoginUser.java (89%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/enums/BusinessStatusEnum.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/enums/DeviceType.java (91%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/enums/FormatsType.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/enums/LoginType.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/enums/UserStatus.java (86%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/enums/UserType.java (88%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/ServiceException.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/SseException.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/base/BaseException.java (88%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/file/FileException.java (68%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/file/FileNameLengthLimitExceededException.java (85%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/file/FileSizeLimitExceededException.java (84%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/user/CaptchaException.java (79%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/user/CaptchaExpireException.java (80%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/exception/user/UserException.java (68%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/factory/RegexPatternPoolFactory.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/factory/YmlPropertySourceFactory.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/ConfigService.java (85%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/DeptService.java (86%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/DictService.java (92%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/OssService.java (82%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/PermissionService.java (91%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/PostService.java (67%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/RoleService.java (67%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/TaskAssigneeService.java (85%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/UserService.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/service/WorkflowService.java (89%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/DateUtils.java (98%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/MapstructUtils.java (98%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/MessageUtils.java (95%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/NetUtils.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/ObjectUtils.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/ServletUtils.java (99%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/SpringUtils.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/StreamUtils.java (99%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/StringUtils.java (99%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/Threads.java (97%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/TreeBuildUtils.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/ValidatorUtils.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/file/FileUtils.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/file/MimeTypeUtils.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/ip/AddressUtils.java (89%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/ip/RegionUtils.java (91%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/reflect/ReflectUtils.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/regex/RegexUtils.java (89%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/regex/RegexValidator.java (96%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/utils/sql/SqlUtil.java (93%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/AddGroup.java (64%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/EditGroup.java (64%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/QueryGroup.java (65%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/dicts/DictPattern.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/dicts/DictPatternValidator.java (86%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/enumd/EnumPattern.java (95%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/validate/enumd/EnumPatternValidator.java (85%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/xss/Xss.java (94%) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara => fys-common/fys-common-core/src/main/java/com/fuyuanshen}/common/core/xss/XssValidator.java (92%) create mode 100644 fys-common/fys-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-doc => fys-common/fys-common-doc}/pom.xml (78%) rename {ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara => fys-common/fys-common-doc/src/main/java/com/fuyuanshen}/common/doc/config/SpringDocConfig.java (95%) rename {ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara => fys-common/fys-common-doc/src/main/java/com/fuyuanshen}/common/doc/config/properties/SpringDocProperties.java (97%) rename {ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara => fys-common/fys-common-doc/src/main/java/com/fuyuanshen}/common/doc/handler/OpenApiHandler.java (99%) create mode 100644 fys-common/fys-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-encrypt => fys-common/fys-common-encrypt}/pom.xml (82%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/annotation/ApiEncrypt.java (86%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/annotation/EncryptField.java (80%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/config/ApiDecryptAutoConfiguration.java (87%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/config/EncryptorAutoConfiguration.java (81%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/EncryptContext.java (76%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/EncryptorManager.java (96%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/IEncryptor.java (77%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/encryptor/AbstractEncryptor.java (60%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/encryptor/AesEncryptor.java (79%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/encryptor/Base64Encryptor.java (74%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/encryptor/RsaEncryptor.java (80%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/encryptor/Sm2Encryptor.java (80%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/core/encryptor/Sm4Encryptor.java (79%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/enumd/AlgorithmType.java (85%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/enumd/EncodeType.java (84%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/filter/CryptoFilter.java (91%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/filter/DecryptRequestBodyWrapper.java (94%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/filter/EncryptResponseBodyWrapper.java (97%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/interceptor/MybatisDecryptInterceptor.java (89%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/interceptor/MybatisEncryptInterceptor.java (90%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/properties/ApiDecryptProperties.java (91%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/properties/EncryptorProperties.java (80%) rename {ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara => fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen}/common/encrypt/utils/EncryptUtils.java (99%) create mode 100644 fys-common/fys-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-excel => fys-common/fys-common-excel}/pom.xml (71%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/annotation/CellMerge.java (79%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/annotation/ExcelDictFormat.java (84%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/annotation/ExcelEnumFormat.java (91%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/annotation/ExcelNotation.java (90%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/annotation/ExcelRequired.java (91%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/convert/ExcelBigNumberConvert.java (97%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/convert/ExcelDictConvert.java (88%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/convert/ExcelEnumConvert.java (95%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/CellMergeStrategy.java (97%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/DefaultExcelListener.java (94%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/DefaultExcelResult.java (97%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/DropDownOptions.java (98%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/ExcelDownHandler.java (97%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/ExcelListener.java (82%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/core/ExcelResult.java (87%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/handler/DataWriteHandler.java (95%) rename {ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara => fys-common/fys-common-excel/src/main/java/com/fuyuanshen}/common/excel/utils/ExcelUtil.java (98%) rename {ruoyi-common/ruoyi-common-idempotent => fys-common/fys-common-idempotent}/pom.xml (68%) rename {ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara => fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen}/common/idempotent/annotation/RepeatSubmit.java (91%) rename {ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara => fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen}/common/idempotent/aspectj/RepeatSubmitAspect.java (90%) rename {ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara => fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen}/common/idempotent/config/IdempotentConfig.java (78%) create mode 100644 fys-common/fys-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-job => fys-common/fys-common-job}/pom.xml (80%) rename {ruoyi-common/ruoyi-common-job/src/main/java/org/dromara => fys-common/fys-common-job/src/main/java/com/fuyuanshen}/common/job/config/SnailJobConfig.java (96%) create mode 100644 fys-common/fys-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-json => fys-common/fys-common-json}/pom.xml (75%) rename {ruoyi-common/ruoyi-common-json/src/main/java/org/dromara => fys-common/fys-common-json/src/main/java/com/fuyuanshen}/common/json/config/JacksonConfig.java (92%) rename {ruoyi-common/ruoyi-common-json/src/main/java/org/dromara => fys-common/fys-common-json/src/main/java/com/fuyuanshen}/common/json/handler/BigNumberSerializer.java (96%) rename {ruoyi-common/ruoyi-common-json/src/main/java/org/dromara => fys-common/fys-common-json/src/main/java/com/fuyuanshen}/common/json/handler/CustomDateDeserializer.java (95%) rename {ruoyi-common/ruoyi-common-json/src/main/java/org/dromara => fys-common/fys-common-json/src/main/java/com/fuyuanshen}/common/json/utils/JsonUtils.java (97%) create mode 100644 fys-common/fys-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-log => fys-common/fys-common-log}/pom.xml (59%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/annotation/Log.java (81%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/aspect/LogAspect.java (93%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/enums/BusinessStatus.java (71%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/enums/BusinessType.java (89%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/enums/OperatorType.java (78%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/event/LogininforEvent.java (94%) rename {ruoyi-common/ruoyi-common-log/src/main/java/org/dromara => fys-common/fys-common-log/src/main/java/com/fuyuanshen}/common/log/event/OperLogEvent.java (97%) create mode 100644 fys-common/fys-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-mail => fys-common/fys-common-mail}/pom.xml (74%) rename {ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara => fys-common/fys-common-mail/src/main/java/com/fuyuanshen}/common/mail/config/MailConfig.java (92%) rename {ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara => fys-common/fys-common-mail/src/main/java/com/fuyuanshen}/common/mail/config/properties/MailProperties.java (96%) rename {ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara => fys-common/fys-common-mail/src/main/java/com/fuyuanshen}/common/mail/utils/MailUtils.java (99%) create mode 100644 fys-common/fys-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-mybatis => fys-common/fys-common-mybatis}/pom.xml (76%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/annotation/DataColumn.java (94%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/annotation/DataPermission.java (92%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/aspect/DataPermissionAspect.java (87%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/config/MybatisPlusConfig.java (89%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/core/domain/BaseEntity.java (96%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/core/mapper/BaseMapperPlus.java (98%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/core/page/PageQuery.java (94%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/core/page/TableDataInfo.java (98%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/enums/DataBaseType.java (91%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/enums/DataScopeType.java (90%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/handler/InjectionMetaObjectHandler.java (91%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/handler/MybatisExceptionHandler.java (92%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/handler/PlusDataPermissionHandler.java (95%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/handler/PlusPostInitTableInfoHandler.java (83%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/helper/DataBaseHelper.java (92%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/helper/DataPermissionHelper.java (97%) rename {ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara => fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen}/common/mybatis/interceptor/PlusDataPermissionInterceptor.java (98%) create mode 100644 fys-common/fys-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-mybatis => fys-common/fys-common-mybatis}/src/main/resources/common-mybatis.yml (100%) rename {ruoyi-common/ruoyi-common-mybatis => fys-common/fys-common-mybatis}/src/main/resources/spy.properties (100%) rename {ruoyi-common/ruoyi-common-oss => fys-common/fys-common-oss}/pom.xml (84%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/constant/OssConstant.java (86%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/core/OssClient.java (97%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/entity/UploadResult.java (89%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/enums/AccessPolicyType.java (96%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/exception/OssException.java (85%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/factory/OssFactory.java (79%) rename {ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara => fys-common/fys-common-oss/src/main/java/com/fuyuanshen}/common/oss/properties/OssProperties.java (94%) rename {ruoyi-common/ruoyi-common-ratelimiter => fys-common/fys-common-ratelimiter}/pom.xml (58%) rename {ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara => fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen}/common/ratelimiter/annotation/RateLimiter.java (88%) rename {ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara => fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen}/common/ratelimiter/aspectj/RateLimiterAspect.java (88%) rename {ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara => fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen}/common/ratelimiter/config/RateLimiterConfig.java (78%) rename {ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara => fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen}/common/ratelimiter/enums/LimitType.java (79%) create mode 100644 fys-common/fys-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 fys-common/fys-common-ratelimiter/src/main/resources/spel-extension.json rename {ruoyi-common/ruoyi-common-redis => fys-common/fys-common-redis}/pom.xml (84%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/config/CacheConfig.java (90%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/config/RedisConfig.java (95%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/config/properties/RedissonProperties.java (97%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/handler/KeyPrefixHandler.java (91%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/handler/RedisExceptionHandler.java (90%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/manager/CaffeineCacheDecorator.java (95%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/manager/PlusSpringCacheManager.java (98%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/utils/CacheUtils.java (93%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/utils/QueueUtils.java (98%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/utils/RedisUtils.java (99%) rename {ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara => fys-common/fys-common-redis/src/main/java/com/fuyuanshen}/common/redis/utils/SequenceUtils.java (97%) create mode 100644 fys-common/fys-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-satoken => fys-common/fys-common-satoken}/pom.xml (74%) rename {ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara => fys-common/fys-common-satoken/src/main/java/com/fuyuanshen}/common/satoken/config/SaTokenConfig.java (78%) rename {ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara => fys-common/fys-common-satoken/src/main/java/com/fuyuanshen}/common/satoken/core/dao/PlusSaTokenDao.java (98%) rename {ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara => fys-common/fys-common-satoken/src/main/java/com/fuyuanshen}/common/satoken/core/service/SaPermissionImpl.java (84%) rename {ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara => fys-common/fys-common-satoken/src/main/java/com/fuyuanshen}/common/satoken/handler/SaTokenExceptionHandler.java (95%) rename {ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara => fys-common/fys-common-satoken/src/main/java/com/fuyuanshen}/common/satoken/utils/LoginHelper.java (95%) create mode 100644 fys-common/fys-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-satoken => fys-common/fys-common-satoken}/src/main/resources/common-satoken.yml (100%) rename {ruoyi-common/ruoyi-common-sensitive => fys-common/fys-common-security}/pom.xml (64%) rename {ruoyi-common/ruoyi-common-security/src/main/java/org/dromara => fys-common/fys-common-security/src/main/java/com/fuyuanshen}/common/security/config/SecurityConfig.java (89%) rename {ruoyi-common/ruoyi-common-security/src/main/java/org/dromara => fys-common/fys-common-security/src/main/java/com/fuyuanshen}/common/security/config/properties/SecurityProperties.java (84%) rename {ruoyi-common/ruoyi-common-security/src/main/java/org/dromara => fys-common/fys-common-security/src/main/java/com/fuyuanshen}/common/security/handler/AllUrlHandler.java (92%) create mode 100644 fys-common/fys-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-security => fys-common/fys-common-sensitive}/pom.xml (64%) rename {ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara => fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen}/common/sensitive/annotation/Sensitive.java (80%) rename {ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara => fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen}/common/sensitive/core/SensitiveService.java (85%) rename {ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara => fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen}/common/sensitive/core/SensitiveStrategy.java (97%) rename {ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara => fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen}/common/sensitive/handler/SensitiveHandler.java (87%) rename {ruoyi-common/ruoyi-common-sms => fys-common/fys-common-sms}/pom.xml (68%) rename {ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara => fys-common/fys-common-sms/src/main/java/com/fuyuanshen}/common/sms/config/SmsAutoConfiguration.java (81%) rename {ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara => fys-common/fys-common-sms/src/main/java/com/fuyuanshen}/common/sms/core/dao/PlusSmsDao.java (90%) rename {ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara => fys-common/fys-common-sms/src/main/java/com/fuyuanshen}/common/sms/handler/SmsExceptionHandler.java (90%) create mode 100644 fys-common/fys-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-social => fys-common/fys-common-social}/pom.xml (64%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/config/SocialAutoConfiguration.java (74%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/config/properties/SocialLoginConfigProperties.java (94%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/config/properties/SocialProperties.java (88%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/gitea/AuthGiteaRequest.java (95%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/gitea/AuthGiteaSource.java (96%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/maxkey/AuthMaxKeyRequest.java (94%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/maxkey/AuthMaxKeySource.java (96%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/topiam/AuthTopIamRequest.java (94%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/topiam/AuthTopIamSource.java (96%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/utils/AuthRedisStateCache.java (90%) rename {ruoyi-common/ruoyi-common-social/src/main/java/org/dromara => fys-common/fys-common-social/src/main/java/com/fuyuanshen}/common/social/utils/SocialUtils.java (90%) create mode 100644 fys-common/fys-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-sse => fys-common/fys-common-sse}/pom.xml (52%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/config/SseAutoConfiguration.java (79%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/config/SseProperties.java (87%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/controller/SseController.java (90%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/core/SseEmitterManager.java (97%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/dto/SseMessageDto.java (91%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/listener/SseTopicListener.java (93%) rename {ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara => fys-common/fys-common-sse/src/main/java/com/fuyuanshen}/common/sse/utils/SseMessageUtils.java (89%) create mode 100644 fys-common/fys-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-tenant => fys-common/fys-common-tenant}/pom.xml (60%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/config/TenantConfig.java (83%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/core/TenantEntity.java (71%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/core/TenantSaTokenDao.java (95%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/exception/TenantException.java (73%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/handle/PlusTenantLineHandler.java (87%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/handle/TenantKeyPrefixHandler.java (89%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/helper/TenantHelper.java (94%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/manager/TenantSpringCacheManager.java (78%) rename {ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara => fys-common/fys-common-tenant/src/main/java/com/fuyuanshen}/common/tenant/properties/TenantProperties.java (88%) create mode 100644 fys-common/fys-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-translation => fys-common/fys-common-translation}/pom.xml (63%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/annotation/Translation.java (87%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/annotation/TranslationType.java (72%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/config/TranslationConfig.java (80%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/constant/TransConstant.java (91%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/TranslationInterface.java (75%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/handler/TranslationBeanSerializerModifier.java (94%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/handler/TranslationHandler.java (87%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/impl/DeptNameTranslationImpl.java (66%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/impl/DictTypeTranslationImpl.java (60%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/impl/NicknameTranslationImpl.java (66%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/impl/OssUrlTranslationImpl.java (65%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara => fys-common/fys-common-translation/src/main/java/com/fuyuanshen}/common/translation/core/impl/UserNameTranslationImpl.java (61%) create mode 100644 fys-common/fys-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-web => fys-common/fys-common-web}/pom.xml (81%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/CaptchaConfig.java (93%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/FilterConfig.java (87%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/I18nConfig.java (83%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/ResourcesConfig.java (91%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/UndertowConfig.java (96%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/properties/CaptchaProperties.java (78%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/config/properties/XssProperties.java (89%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/core/BaseController.java (82%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/core/I18nLocaleResolver.java (95%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/enums/CaptchaCategory.java (93%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/enums/CaptchaType.java (81%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/filter/RepeatableFilter.java (90%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/filter/RepeatedlyRequestWrapper.java (94%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/filter/XssFilter.java (88%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/filter/XssHttpServletRequestWrapper.java (97%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/handler/GlobalExceptionHandler.java (95%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/interceptor/PlusWebInvokeTimeInterceptor.java (93%) rename {ruoyi-common/ruoyi-common-web/src/main/java/org/dromara => fys-common/fys-common-web/src/main/java/com/fuyuanshen}/common/web/utils/UnsignedMathGenerator.java (95%) create mode 100644 fys-common/fys-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename {ruoyi-common/ruoyi-common-websocket => fys-common/fys-common-websocket}/pom.xml (64%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/config/WebSocketConfig.java (86%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/config/properties/WebSocketProperties.java (87%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/constant/WebSocketConstants.java (90%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/dto/WebSocketMessageDto.java (90%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/handler/PlusWebSocketHandler.java (91%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/holder/WebSocketSessionHolder.java (97%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/interceptor/PlusWebSocketInterceptor.java (88%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/listener/WebSocketTopicListener.java (90%) rename {ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara => fys-common/fys-common-websocket/src/main/java/com/fuyuanshen}/common/websocket/utils/WebSocketUtils.java (92%) create mode 100644 fys-common/fys-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 fys-common/pom.xml rename {ruoyi-extend/ruoyi-monitor-admin => fys-extend/fys-monitor-admin}/Dockerfile (83%) rename {ruoyi-extend/ruoyi-monitor-admin => fys-extend/fys-monitor-admin}/pom.xml (94%) rename {ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara => fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen}/monitor/admin/MonitorAdminApplication.java (91%) rename {ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara => fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen}/monitor/admin/config/AdminServerConfig.java (95%) rename {ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara => fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen}/monitor/admin/config/SecurityConfig.java (98%) rename {ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara => fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen}/monitor/admin/notifier/CustomNotifier.java (98%) rename {ruoyi-extend/ruoyi-monitor-admin => fys-extend/fys-monitor-admin}/src/main/resources/application.yml (87%) rename {ruoyi-extend/ruoyi-monitor-admin => fys-extend/fys-monitor-admin}/src/main/resources/banner.txt (100%) rename {ruoyi-extend/ruoyi-monitor-admin => fys-extend/fys-monitor-admin}/src/main/resources/logback-plus.xml (94%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/Dockerfile (83%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/pom.xml (93%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java (100%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java (100%) rename {ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara => fys-extend/fys-snailjob-server/src/main/java/com/fuyuanshen}/snailjob/SnailJobServerApplication.java (92%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/resources/application-dev.yml (100%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/resources/application-prod.yml (100%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/resources/application.yml (88%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/resources/banner.txt (100%) rename {ruoyi-extend/ruoyi-snailjob-server => fys-extend/fys-snailjob-server}/src/main/resources/logback-plus.xml (98%) rename {ruoyi-extend => fys-extend}/pom.xml (66%) create mode 100644 fys-modules/fys-demo/pom.xml rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/MailController.java (93%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/RedisCacheController.java (94%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/RedisLockController.java (95%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/RedisPubSubController.java (89%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/RedisRateLimiterController.java (88%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/SmsController.java (96%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/Swagger3DemoController.java (90%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestBatchController.java (92%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestDemoController.java (80%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestEncryptController.java (88%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestExcelController.java (95%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestI18nController.java (92%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestSensitiveController.java (85%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/TestTreeController.java (80%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/WebSocketController.java (77%) create mode 100644 fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/package-info.java rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/queue/BoundedQueueController.java (92%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/queue/DelayedQueueController.java (95%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/queue/PriorityDemo.java (90%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/controller/queue/PriorityQueueController.java (94%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/TestDemo.java (91%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/TestDemoEncrypt.java (93%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/TestTree.java (91%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/bo/TestDemoBo.java (84%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/bo/TestDemoImportVo.java (96%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/bo/TestTreeBo.java (81%) create mode 100644 fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/package-info.java rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/vo/ExportDemoVo.java (87%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/vo/TestDemoVo.java (85%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/domain/vo/TestTreeVo.java (92%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/listener/ExportDemoListener.java (86%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/mapper/TestDemoEncryptMapper.java (50%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/mapper/TestDemoMapper.java (85%) create mode 100644 fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestTreeMapper.java create mode 100644 fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/package-info.java rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/service/IExportExcelService.java (88%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/service/ITestDemoService.java (81%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/service/ITestTreeService.java (87%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/service/impl/ExportExcelServiceImpl.java (95%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/service/impl/TestDemoServiceImpl.java (85%) rename {ruoyi-modules/ruoyi-demo/src/main/java/org/dromara => fys-modules/fys-demo/src/main/java/com/fuyuanshen}/demo/service/impl/TestTreeServiceImpl.java (86%) create mode 100644 fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/package-info.java create mode 100644 fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/package-info.java rename {ruoyi-modules/ruoyi-demo => fys-modules/fys-demo}/src/main/resources/excel/单列表.xlsx (100%) rename {ruoyi-modules/ruoyi-demo => fys-modules/fys-demo}/src/main/resources/excel/多sheet列表.xlsx (100%) rename {ruoyi-modules/ruoyi-demo => fys-modules/fys-demo}/src/main/resources/excel/多列表.xlsx (100%) rename {ruoyi-modules/ruoyi-demo => fys-modules/fys-demo}/src/main/resources/mapper/demo/TestDemoMapper.xml (60%) rename {ruoyi-modules/ruoyi-demo => fys-modules/fys-demo}/src/main/resources/mapper/demo/TestTreeMapper.xml (72%) rename {ruoyi-modules/ruoyi-demo => fys-modules/fys-demo}/src/main/resources/mapper/package-info.md (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/pom.xml (77%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/config/GenConfig.java (96%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/config/MyBatisDataSourceMonitor.java (98%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/constant/GenConstants.java (98%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/controller/GenController.java (91%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/domain/GenTable.java (95%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/domain/GenTableColumn.java (97%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/mapper/GenTableColumnMapper.java (63%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/mapper/GenTableMapper.java (87%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/service/GenTableServiceImpl.java (95%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/service/IGenTableService.java (91%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/util/GenUtils.java (96%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/util/VelocityInitializer.java (88%) rename {ruoyi-modules/ruoyi-generator/src/main/java/org/dromara => fys-modules/fys-generator/src/main/java/com/fuyuanshen}/generator/util/VelocityUtils.java (95%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/generator.yml (89%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/mapper/generator/GenTableColumnMapper.xml (53%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/mapper/generator/GenTableMapper.xml (88%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/mapper/package-info.md (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/bo.java.vm (88%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/controller.java.vm (86%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/domain.java.vm (90%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/mapper.java.vm (82%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/service.java.vm (93%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/serviceImpl.java.vm (95%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/java/vo.java.vm (93%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/sql/oracle/sql.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/sql/postgres/sql.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/sql/sql.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/sql/sqlserver/sql.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/ts/api.ts.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/ts/types.ts.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/vue/index-tree.vue.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/vue/index.vue.vm (100%) rename {ruoyi-modules/ruoyi-generator => fys-modules/fys-generator}/src/main/resources/vm/xml/mapper.xml.vm (100%) rename {ruoyi-modules/ruoyi-job => fys-modules/fys-job}/pom.xml (66%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/entity/BillDto.java (90%) create mode 100644 fys-modules/fys-job/src/main/java/com/fuyuanshen/job/package-info.java rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/AlipayBillTask.java (91%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/SummaryBillTask.java (92%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/TestAnnoJobExecutor.java (95%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/TestBroadcastJob.java (97%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/TestClassJobExecutor.java (93%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/TestMapJobAnnotation.java (98%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/TestMapReduceAnnotation1.java (98%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/TestStaticShardingJob.java (97%) rename {ruoyi-modules/ruoyi-job/src/main/java/org/dromara => fys-modules/fys-job/src/main/java/com/fuyuanshen}/job/snailjob/WechatBillTask.java (92%) create mode 100644 fys-modules/fys-system/pom.xml rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/monitor/CacheController.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/monitor/SysLogininforController.java (77%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/monitor/SysOperlogController.java (76%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/monitor/SysUserOnlineController.java (87%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysClientController.java (80%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysConfigController.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysDeptController.java (88%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysDictDataController.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysDictTypeController.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysMenuController.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysNoticeController.java (78%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysOssConfigController.java (79%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysOssController.java (82%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysPostController.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysProfileController.java (81%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysRoleController.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysSocialController.java (71%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysTenantController.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysTenantPackageController.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/controller/system/SysUserController.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysCache.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysClient.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysConfig.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysDept.java (94%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysDictData.java (87%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysDictType.java (87%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysLogininfor.java (97%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysMenu.java (94%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysNotice.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysOperLog.java (97%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysOss.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysOssConfig.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysPost.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysRole.java (94%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysRoleDept.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysRoleMenu.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysSocial.java (96%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysTenant.java (94%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysTenantPackage.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysUser.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysUserOnline.java (95%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysUserPost.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/SysUserRole.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysClientBo.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysConfigBo.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysDeptBo.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysDictDataBo.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysDictTypeBo.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysLogininforBo.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysMenuBo.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysNoticeBo.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysOperLogBo.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysOssBo.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysOssConfigBo.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysPostBo.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysRoleBo.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysSocialBo.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysTenantBo.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysTenantPackageBo.java (73%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysUserBo.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysUserPasswordBo.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/bo/SysUserProfileBo.java (77%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/MetaVo.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/RouterVo.java (96%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysClientVo.java (88%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysConfigVo.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysDeptVo.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysDictDataVo.java (88%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysDictTypeVo.java (83%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysLogininforVo.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysMenuVo.java (95%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysNoticeVo.java (83%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysOperLogVo.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysOssConfigVo.java (94%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysOssUploadVo.java (88%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysOssVo.java (83%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysPostVo.java (83%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysRoleVo.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysSocialVo.java (96%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysTenantPackageVo.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysTenantVo.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysUserExportVo.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysUserImportVo.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysUserInfoVo.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/SysUserVo.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/domain/vo/UserInfoVo.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/listener/SysUserImportListener.java (86%) create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysClientMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysConfigMapper.java rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysDeptMapper.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysDictDataMapper.java (76%) create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictTypeMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysLogininforMapper.java rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysMenuMapper.java (88%) create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysNoticeMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOperLogMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssConfigMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysPostMapper.java (75%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysRoleDeptMapper.java (51%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysRoleMapper.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysRoleMenuMapper.java (79%) create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysSocialMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantMapper.java create mode 100644 fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantPackageMapper.java rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysUserMapper.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysUserPostMapper.java (51%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/mapper/SysUserRoleMapper.java (72%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/runner/SystemApplicationRunner.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysClientService.java (77%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysConfigService.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysDataScopeService.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysDeptService.java (91%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysDictDataService.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysDictTypeService.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysLogininforService.java (76%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysMenuService.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysNoticeService.java (81%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysOperLogService.java (78%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysOssConfigService.java (81%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysOssService.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysPermissionService.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysPostService.java (90%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysRoleService.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysSocialService.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysTenantPackageService.java (80%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysTenantService.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/ISysUserService.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysClientServiceImpl.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysConfigServiceImpl.java (87%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysDataScopeServiceImpl.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysDeptServiceImpl.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysDictDataServiceImpl.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysDictTypeServiceImpl.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysLogininforServiceImpl.java (87%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysMenuServiceImpl.java (92%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysNoticeServiceImpl.java (81%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysOperLogServiceImpl.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysOssConfigServiceImpl.java (87%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysOssServiceImpl.java (89%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysPermissionServiceImpl.java (77%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysPostServiceImpl.java (88%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysRoleServiceImpl.java (93%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysSensitiveServiceImpl.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysSocialServiceImpl.java (86%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysTaskAssigneeServiceImpl.java (84%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysTenantPackageServiceImpl.java (85%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysTenantServiceImpl.java (94%) rename {ruoyi-modules/ruoyi-system/src/main/java/org/dromara => fys-modules/fys-system/src/main/java/com/fuyuanshen}/system/service/impl/SysUserServiceImpl.java (96%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/package-info.md (100%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysClientMapper.xml (72%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysConfigMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysDeptMapper.xml (90%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysDictDataMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysDictTypeMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysLogininforMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysMenuMapper.xml (95%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysNoticeMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysOperLogMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysOssConfigMapper.xml (71%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysOssMapper.xml (72%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysPostMapper.xml (85%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysRoleDeptMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysRoleMapper.xml (93%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysSocialMapper.xml (71%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysTenantMapper.xml (71%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysTenantPackageMapper.xml (72%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysUserMapper.xml (92%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysUserPostMapper.xml (73%) rename {ruoyi-modules/ruoyi-system => fys-modules/fys-system}/src/main/resources/mapper/system/SysUserRoleMapper.xml (86%) rename {ruoyi-modules/ruoyi-workflow => fys-modules/fys-workflow}/pom.xml (51%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/ConditionalOnEnable.java (95%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/constant/FlowConstant.java (95%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/enums/ButtonPermissionEnum.java (96%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/enums/MessageTypeEnum.java (95%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/enums/NodeExtEnum.java (89%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/enums/TaskAssigneeEnum.java (96%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/enums/TaskAssigneeType.java (96%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/common/enums/TaskStatusEnum.java (97%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/config/WarmFlowConfig.java (64%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/controller/FlwCategoryController.java (84%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/controller/FlwDefinitionController.java (89%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/controller/FlwInstanceController.java (84%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/controller/FlwTaskController.java (87%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/controller/TestLeaveController.java (77%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/FlowCategory.java (92%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/TestLeave.java (90%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/BackProcessBo.java (89%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/CompleteTaskBo.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowCancelBo.java (84%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowCategoryBo.java (79%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowCopyBo.java (89%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowInstanceBo.java (94%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowInvalidBo.java (83%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowNextNodeBo.java (94%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowTaskBo.java (94%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/FlowTerminationBo.java (83%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/StartProcessBo.java (91%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/TaskOperationBo.java (88%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/bo/TestLeaveBo.java (86%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/ButtonPermissionVo.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/FlowCategoryVo.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/FlowDefinitionVo.java (90%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/FlowHisTaskVo.java (94%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/FlowInstanceVo.java (90%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/FlowTaskVo.java (92%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/domain/vo/TestLeaveVo.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/handler/FlowProcessEventHandler.java (90%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/handler/WorkflowPermissionHandler.java (87%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/listener/WorkflowGlobalListener.java (92%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/mapper/FlwCategoryMapper.java (79%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/mapper/FlwInstanceMapper.java (80%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/mapper/FlwTaskMapper.java (87%) create mode 100644 fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/TestLeaveMapper.java rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwCategoryService.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwCommonService.java (95%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwDefinitionService.java (88%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwInstanceService.java (89%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwNodeExtService.java (80%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwTaskAssigneeService.java (87%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/IFlwTaskService.java (91%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/ITestLeaveService.java (72%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/CategoryNameTranslationImpl.java (69%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwCategoryServiceImpl.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwCommonServiceImpl.java (85%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwDefinitionServiceImpl.java (92%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwInstanceServiceImpl.java (93%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwNodeExtServiceImpl.java (94%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwTaskAssigneeServiceImpl.java (92%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/FlwTaskServiceImpl.java (95%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/TestLeaveServiceImpl.java (86%) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara => fys-modules/fys-workflow/src/main/java/com/fuyuanshen}/workflow/service/impl/WorkflowServiceImpl.java (84%) rename {ruoyi-modules/ruoyi-workflow => fys-modules/fys-workflow}/src/main/resources/mapper/package-info.md (100%) rename {ruoyi-modules/ruoyi-workflow => fys-modules/fys-workflow}/src/main/resources/mapper/workflow/FlwCategoryMapper.xml (83%) rename {ruoyi-modules/ruoyi-workflow => fys-modules/fys-workflow}/src/main/resources/mapper/workflow/FlwInstanceMapper.xml (86%) rename {ruoyi-modules/ruoyi-workflow => fys-modules/fys-workflow}/src/main/resources/mapper/workflow/FlwTaskMapper.xml (93%) rename {ruoyi-modules/ruoyi-workflow => fys-modules/fys-workflow}/src/main/resources/mapper/workflow/TestLeaveMapper.xml (72%) rename {ruoyi-modules => fys-modules}/pom.xml (57%) delete mode 100644 ruoyi-common/pom.xml delete mode 100644 ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json delete mode 100644 ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 ruoyi-modules/ruoyi-demo/pom.xml delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java delete mode 100644 ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java delete mode 100644 ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java delete mode 100644 ruoyi-modules/ruoyi-system/pom.xml delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java delete mode 100644 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java diff --git a/LICENSE b/LICENSE index 32b3071..1393e7a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2019 RuoYi-Vue-Plus +Copyright (c) 2019 fys-Vue-Plus Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 5d6dc9c..a9fce2f 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,18 @@ - - - ## 平台简介 -[![码云Gitee](https://gitee.com/dromara/RuoYi-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/dromara/RuoYi-Vue-Plus) -[![GitHub](https://img.shields.io/github/stars/dromara/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/dromara/RuoYi-Vue-Plus) -[![Star](https://gitcode.com/dromara/RuoYi-Vue-Plus/star/badge.svg)](https://gitcode.com/dromara/RuoYi-Vue-Plus) -[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/5.X/LICENSE) -[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus) +[![码云Gitee](https://gitee.com/dromara/fys-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/dromara/fys-Vue-Plus) +[![GitHub](https://img.shields.io/github/stars/dromara/fys-Vue-Plus.svg?style=social&label=Stars)](https://github.com/dromara/fys-Vue-Plus) +[![Star](https://gitcode.com/dromara/fys-Vue-Plus/star/badge.svg)](https://gitcode.com/dromara/fys-Vue-Plus) +[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/fys-Vue-Plus/blob/5.X/LICENSE) +[![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=fys-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.4.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus) +[![fys-Vue-Plus](https://img.shields.io/badge/fys_Vue_Plus-5.4.0-success.svg)](https://gitee.com/dromara/fys-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4-blue.svg)]() [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]() [![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]() -> Dromara RuoYi-Vue-Plus 是重写 RuoYi-Vue 针对 `分布式集群与多租户` 场景全方位升级(不兼容原框架) +> Dromara fys-Vue-Plus 是重写 fys-Vue 针对 `分布式集群与多租户` 场景全方位升级(不兼容原框架) > 项目代码、文档 均开源免费可商用 遵循开源协议在项目中保留开源协议文件即可
活到老写到老 为兴趣而开源 为学习而开源 为让大家真正可以学到技术而开源 @@ -23,25 +23,25 @@ > 系统演示: [传送门](https://plus-doc.dromara.org/#/common/demo_system) > 官方前端项目地址: [gitee](https://gitee.com/JavaLionLi/plus-ui) - [github](https://github.com/JavaLionLi/plus-ui) - [gitcode](https://gitcode.com/dromara/plus-ui)
-> 成员前端项目地址: 基于vben5 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)
-> 成员前端项目地址: 基于soybean [ruoyi-plus-soybean](https://gitee.com/xlsea/ruoyi-plus-soybean)
-> 成员项目地址: 删除多租户与工作流 [RuoYi-Vue-Plus-Single](https://gitee.com/ColorDreams/RuoYi-Vue-Plus-Single)
+> 成员前端项目地址: 基于vben5 [fys-plus-vben5](https://gitee.com/dapppp/fys-plus-vben5)
+> 成员前端项目地址: 基于soybean [fys-plus-soybean](https://gitee.com/xlsea/fys-plus-soybean)
+> 成员项目地址: 删除多租户与工作流 [fys-Vue-Plus-Single](https://gitee.com/ColorDreams/fys-Vue-Plus-Single)
> 文档地址: [plus-doc](https://plus-doc.dromara.org) 文档在华为云上如果打不开大概率是DNS问题 可以尝试切换网络等方式(或者科学上网) ## 赞助商 MaxKey 业界领先单点登录产品 - https://gitee.com/dromara/MaxKey
-CCFlow 驰聘低代码-流程-表单 - https://gitee.com/opencc/RuoYi-JFlow
+CCFlow 驰聘低代码-流程-表单 - https://gitee.com/opencc/fys-JFlow
数舵科技 软件定制开发APP小程序等 - http://www.shuduokeji.com/
引迈信息 软件开发平台 - https://www.jnpfsoft.com/index.html?from=plus-doc
**启山商城系统 多租户商城源码可免费商用可二次开发 - https://www.73app.cn/**
Mall4J 高质量Java商城系统 - https://www.mall4j.com/cn/?statId=11
[如何成为赞助商 加群联系作者详谈](https://plus-doc.dromara.org/#/common/add_group) -# 本框架与RuoYi的功能差异 +# 本框架与fys的功能差异 -| 功能 | 本框架 | RuoYi | +| 功能 | 本框架 | fys | |-------------|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------| | 前端项目 | 采用 Vue3 + TS + ElementPlus 重写 | 基于Vue2/Vue3 + JS | | 后端项目结构 | 采用插件化 + 扩展包形式 结构解耦 易于扩展 | 模块相互注入耦合严重难以扩展 | @@ -91,9 +91,9 @@ Mall4J 高质量Java商城系统 - https://www.mall4j.com/cn/?statId=11
| Demo案例 | 提供框架功能的实际使用案例 单独一个模块提供了很多很全 | 无 | -## 本框架与RuoYi的业务差异 +## 本框架与fys的业务差异 -| 业务 | 功能说明 | 本框架 | RuoYi | +| 业务 | 功能说明 | 本框架 | fys | |--------|----------------------------------------------------------------------|-----|------------------| | 租户管理 | 系统内租户的管理 如:租户套餐、过期时间、用户数量、企业信息等 | 支持 | 无 | | 租户套餐管理 | 系统内租户所能使用的套餐管理 如:套餐内所包含的菜单等 | 支持 | 无 | @@ -122,14 +122,14 @@ Mall4J 高质量Java商城系统 - https://www.mall4j.com/cn/?statId=11
使用框架前请仔细阅读文档重点注意事项
->[初始化项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init) ->>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/init) +>[初始化项目 必看](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/init) +>>[https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/init](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/init) > >[专栏与视频 入门必看](https://plus-doc.dromara.org/#/common/column) >>[https://plus-doc.dromara.org/#/common/column](https://plus-doc.dromara.org/#/common/column) > ->[部署项目 必看](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy) ->>[https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/ruoyi-vue-plus/quickstart/deploy) +>[部署项目 必看](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/deploy) +>>[https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/deploy](https://plus-doc.dromara.org/#/fys-vue-plus/quickstart/deploy) > >[如何加群](https://plus-doc.dromara.org/#/common/add_group) >>[https://plus-doc.dromara.org/#/common/add_group](https://plus-doc.dromara.org/#/common/add_group) diff --git a/ruoyi-admin/Dockerfile b/fys-admin/Dockerfile similarity index 74% rename from ruoyi-admin/Dockerfile rename to fys-admin/Dockerfile index 278d67b..6afba6f 100644 --- a/ruoyi-admin/Dockerfile +++ b/fys-admin/Dockerfile @@ -5,11 +5,11 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/server/logs \ - /ruoyi/server/temp \ - /ruoyi/skywalking/agent +RUN mkdir -p /fys/server/logs \ + /fys/server/temp \ + /fys/skywalking/agent -WORKDIR /ruoyi/server +WORKDIR /fys/server ENV SERVER_PORT=8080 SNAIL_PORT=28080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" @@ -17,15 +17,15 @@ EXPOSE ${SERVER_PORT} # 暴露 snail job 客户端端口 用于定时任务调度中心通信 EXPOSE ${SNAIL_PORT} -ADD ./target/ruoyi-admin.jar ./app.jar +ADD ./target/fys-admin.jar ./app.jar SHELL ["/bin/bash", "-c"] ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ -Dsnail-job.port=${SNAIL_PORT} \ # 应用名称 如果想区分集群节点监控 改成不同的名称即可 - #-Dskywalking.agent.service_name=ruoyi-server \ - #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + #-Dskywalking.agent.service_name=fys-server \ + #-javaagent:/fys/skywalking/agent/skywalking-agent.jar \ -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \ -jar app.jar diff --git a/ruoyi-admin/pom.xml b/fys-admin/pom.xml similarity index 81% rename from ruoyi-admin/pom.xml rename to fys-admin/pom.xml index 9e97804..50d10af 100644 --- a/ruoyi-admin/pom.xml +++ b/fys-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - org.dromara + fys-vue-plus + com.fuyuanshen ${revision} 4.0.0 jar - ruoyi-admin + fys-admin web服务入口 @@ -46,51 +46,51 @@ - org.dromara - ruoyi-common-doc + com.fuyuanshen + fys-common-doc - org.dromara - ruoyi-common-social + com.fuyuanshen + fys-common-social - org.dromara - ruoyi-common-ratelimiter + com.fuyuanshen + fys-common-ratelimiter - org.dromara - ruoyi-common-mail + com.fuyuanshen + fys-common-mail - org.dromara - ruoyi-system + com.fuyuanshen + fys-system - org.dromara - ruoyi-job + com.fuyuanshen + fys-job - org.dromara - ruoyi-generator + com.fuyuanshen + fys-generator - org.dromara - ruoyi-demo + com.fuyuanshen + fys-demo - org.dromara - ruoyi-workflow + com.fuyuanshen + fys-workflow diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/fys-admin/src/main/java/com/fuyuanshen/DromaraApplication.java similarity index 82% rename from ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java rename to fys-admin/src/main/java/com/fuyuanshen/DromaraApplication.java index 8ef33fe..fe7c806 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/fys-admin/src/main/java/com/fuyuanshen/DromaraApplication.java @@ -1,4 +1,4 @@ -package org.dromara; +package com.fuyuanshen; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,7 +17,7 @@ public class DromaraApplication { SpringApplication application = new SpringApplication(DromaraApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ノ゙ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)゙"); + System.out.println("(♥◠‿◠)ノ゙ fys-Vue-Plus启动成功 ლ(´ڡ`ლ)゙"); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/fys-admin/src/main/java/com/fuyuanshen/DromaraServletInitializer.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java rename to fys-admin/src/main/java/com/fuyuanshen/DromaraServletInitializer.java index 066a683..b1dae01 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java +++ b/fys-admin/src/main/java/com/fuyuanshen/DromaraServletInitializer.java @@ -1,4 +1,4 @@ -package org.dromara; +package com.fuyuanshen; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/AuthController.java similarity index 81% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java rename to fys-admin/src/main/java/com/fuyuanshen/web/controller/AuthController.java index 7fbc57f..382a20c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/AuthController.java @@ -1,4 +1,4 @@ -package org.dromara.web.controller; +package com.fuyuanshen.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.exception.NotLoginException; @@ -13,34 +13,34 @@ import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.utils.AuthStateUtils; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginBody; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.domain.model.SocialLoginBody; -import org.dromara.common.core.utils.*; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.social.config.properties.SocialLoginConfigProperties; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.SocialUtils; -import org.dromara.common.sse.dto.SseMessageDto; -import org.dromara.common.sse.utils.SseMessageUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysSocialService; -import org.dromara.system.service.ISysTenantService; -import org.dromara.web.domain.vo.LoginTenantVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.domain.vo.TenantListVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.dromara.web.service.SysRegisterService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.domain.model.LoginBody; +import com.fuyuanshen.common.core.domain.model.RegisterBody; +import com.fuyuanshen.common.core.domain.model.SocialLoginBody; +import com.fuyuanshen.common.core.utils.*; +import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.social.config.properties.SocialLoginConfigProperties; +import com.fuyuanshen.common.social.config.properties.SocialProperties; +import com.fuyuanshen.common.social.utils.SocialUtils; +import com.fuyuanshen.common.sse.dto.SseMessageDto; +import com.fuyuanshen.common.sse.utils.SseMessageUtils; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.bo.SysTenantBo; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysTenantVo; +import com.fuyuanshen.system.service.ISysClientService; +import com.fuyuanshen.system.service.ISysConfigService; +import com.fuyuanshen.system.service.ISysSocialService; +import com.fuyuanshen.system.service.ISysTenantService; +import com.fuyuanshen.web.domain.vo.LoginTenantVo; +import com.fuyuanshen.web.domain.vo.LoginVo; +import com.fuyuanshen.web.domain.vo.TenantListVo; +import com.fuyuanshen.web.service.IAuthStrategy; +import com.fuyuanshen.web.service.SysLoginService; +import com.fuyuanshen.web.service.SysRegisterService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -104,7 +104,7 @@ public class AuthController { Long userId = LoginHelper.getUserId(); scheduledExecutorService.schedule(() -> { SseMessageDto dto = new SseMessageDto(); - dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统"); + dto.setMessage("欢迎登录fys-Vue-Plus后台管理系统"); dto.setUserIds(List.of(userId)); SseMessageUtils.publishMessage(dto); }, 5, TimeUnit.SECONDS); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java similarity index 85% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java index 0848170..8090ee3 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java @@ -1,4 +1,4 @@ -package org.dromara.web.controller; +package com.fuyuanshen.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; @@ -8,24 +8,24 @@ import cn.hutool.core.util.RandomUtil; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.mail.config.properties.MailProperties; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.common.web.enums.CaptchaType; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.mail.config.properties.MailProperties; +import com.fuyuanshen.common.mail.utils.MailUtils; +import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter; +import com.fuyuanshen.common.ratelimiter.enums.LimitType; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.web.config.properties.CaptchaProperties; +import com.fuyuanshen.common.web.enums.CaptchaType; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; -import org.dromara.web.domain.vo.CaptchaVo; +import com.fuyuanshen.web.domain.vo.CaptchaVo; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/IndexController.java similarity index 79% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java rename to fys-admin/src/main/java/com/fuyuanshen/web/controller/IndexController.java index cdcfed6..30d8774 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/IndexController.java @@ -1,9 +1,9 @@ -package org.dromara.web.controller; +package com.fuyuanshen.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/CaptchaVo.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/CaptchaVo.java index 664df1e..f4c51c4 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/CaptchaVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.fuyuanshen.web.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/LoginTenantVo.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/LoginTenantVo.java index 0a83ace..5cc8bcc 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/LoginTenantVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.fuyuanshen.web.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/LoginVo.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/LoginVo.java index 834afe5..63223ab 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package com.fuyuanshen.web.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/TenantListVo.java similarity index 81% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/TenantListVo.java index db9c271..c90c26c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/TenantListVo.java @@ -1,6 +1,6 @@ -package org.dromara.web.domain.vo; +package com.fuyuanshen.web.domain.vo; -import org.dromara.system.domain.vo.SysTenantVo; +import com.fuyuanshen.system.domain.vo.SysTenantVo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/fys-admin/src/main/java/com/fuyuanshen/web/listener/UserActionListener.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java rename to fys-admin/src/main/java/com/fuyuanshen/web/listener/UserActionListener.java index 554c64b..9105a5d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/listener/UserActionListener.java @@ -1,4 +1,4 @@ -package org.dromara.web.listener; +package com.fuyuanshen.web.listener; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.StpUtil; @@ -8,18 +8,18 @@ import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.web.service.SysLoginService; +import com.fuyuanshen.common.core.constant.CacheConstants; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.ip.AddressUtils; +import com.fuyuanshen.common.log.event.LogininforEvent; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.web.service.SysLoginService; import org.springframework.stereotype.Component; import java.time.Duration; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/IAuthStrategy.java similarity index 77% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/IAuthStrategy.java index a75b913..27889f6 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/IAuthStrategy.java @@ -1,11 +1,10 @@ -package org.dromara.web.service; +package com.fuyuanshen.web.service; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.web.domain.vo.LoginVo; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.web.domain.vo.LoginVo; /** * 授权策略 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/SysLoginService.java similarity index 87% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/SysLoginService.java index 41a802b..81472b5 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package com.fuyuanshen.web.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -10,28 +10,28 @@ import com.baomidou.lock.annotation.Lock4j; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthUser; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.dto.PostDTO; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.*; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.exception.TenantException; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.*; +import com.fuyuanshen.common.core.constant.CacheConstants; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.domain.dto.PostDTO; +import com.fuyuanshen.common.core.domain.dto.RoleDTO; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.enums.LoginType; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.exception.user.UserException; +import com.fuyuanshen.common.core.utils.*; +import com.fuyuanshen.common.log.event.LogininforEvent; +import com.fuyuanshen.common.mybatis.helper.DataPermissionHelper; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.tenant.exception.TenantException; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.bo.SysSocialBo; +import com.fuyuanshen.system.domain.vo.*; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.system.service.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/SysRegisterService.java similarity index 75% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/SysRegisterService.java index 567906e..e424114 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/SysRegisterService.java @@ -1,27 +1,27 @@ -package org.dromara.web.service; +package com.fuyuanshen.web.service; import cn.hutool.crypto.digest.BCrypt; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.core.exception.user.CaptchaException; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysUserService; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.domain.model.RegisterBody; +import com.fuyuanshen.common.core.enums.UserType; +import com.fuyuanshen.common.core.exception.user.CaptchaException; +import com.fuyuanshen.common.core.exception.user.CaptchaExpireException; +import com.fuyuanshen.common.core.exception.user.UserException; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.log.event.LogininforEvent; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.web.config.properties.CaptchaProperties; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.system.service.ISysUserService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/EmailAuthStrategy.java similarity index 73% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/impl/EmailAuthStrategy.java index e4315dc..612d6ca 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/EmailAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package com.fuyuanshen.web.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; @@ -6,28 +6,28 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.model.EmailLoginBody; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.model.EmailLoginBody; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.enums.LoginType; +import com.fuyuanshen.common.core.exception.user.CaptchaExpireException; +import com.fuyuanshen.common.core.exception.user.UserException; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.web.domain.vo.LoginVo; +import com.fuyuanshen.web.service.IAuthStrategy; +import com.fuyuanshen.web.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/PasswordAuthStrategy.java similarity index 75% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/impl/PasswordAuthStrategy.java index e579f99..dee3300 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/PasswordAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package com.fuyuanshen.web.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; @@ -7,30 +7,30 @@ import cn.hutool.crypto.digest.BCrypt; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.PasswordLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.exception.user.CaptchaException; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.config.properties.CaptchaProperties; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.domain.model.PasswordLoginBody; +import com.fuyuanshen.common.core.enums.LoginType; +import com.fuyuanshen.common.core.exception.user.CaptchaException; +import com.fuyuanshen.common.core.exception.user.CaptchaExpireException; +import com.fuyuanshen.common.core.exception.user.UserException; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.web.config.properties.CaptchaProperties; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.web.domain.vo.LoginVo; +import com.fuyuanshen.web.service.IAuthStrategy; +import com.fuyuanshen.web.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SmsAuthStrategy.java similarity index 74% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SmsAuthStrategy.java index 597a601..6d49d72 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SmsAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package com.fuyuanshen.web.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; @@ -6,28 +6,28 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.SmsLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.exception.user.CaptchaExpireException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.domain.model.SmsLoginBody; +import com.fuyuanshen.common.core.enums.LoginType; +import com.fuyuanshen.common.core.exception.user.CaptchaExpireException; +import com.fuyuanshen.common.core.exception.user.UserException; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.web.domain.vo.LoginVo; +import com.fuyuanshen.web.service.IAuthStrategy; +import com.fuyuanshen.web.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SocialAuthStrategy.java similarity index 78% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SocialAuthStrategy.java index ffe95e0..857a185 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/SocialAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package com.fuyuanshen.web.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; @@ -11,26 +11,26 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.SocialLoginBody; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.SocialUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysSocialService; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.domain.model.SocialLoginBody; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.exception.user.UserException; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.social.config.properties.SocialProperties; +import com.fuyuanshen.common.social.utils.SocialUtils; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysSocialVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.system.service.ISysSocialService; +import com.fuyuanshen.web.domain.vo.LoginVo; +import com.fuyuanshen.web.service.IAuthStrategy; +import com.fuyuanshen.web.service.SysLoginService; import org.springframework.stereotype.Service; import java.util.List; @@ -70,10 +70,10 @@ public class SocialAuthStrategy implements IAuthStrategy { AuthUser authUserData = response.getData(); if ("GITEE".equals(authUserData.getSource())) { // 如用户使用 gitee 登录顺手 star 给作者一点支持 拒绝白嫖 - HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus") + HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/fys-Vue-Plus") .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken())) .executeAsync(); - HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Cloud-Plus") + HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/fys-Cloud-Plus") .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken())) .executeAsync(); } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/XcxAuthStrategy.java similarity index 86% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to fys-admin/src/main/java/com/fuyuanshen/web/service/impl/XcxAuthStrategy.java index f223dd8..82d907b 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/XcxAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package com.fuyuanshen.web.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; @@ -12,18 +12,18 @@ import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.request.AuthWechatMiniProgramRequest; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.model.XcxLoginBody; -import org.dromara.common.core.domain.model.XcxLoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.model.XcxLoginBody; +import com.fuyuanshen.common.core.domain.model.XcxLoginUser; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.web.domain.vo.LoginVo; +import com.fuyuanshen.web.service.IAuthStrategy; +import com.fuyuanshen.web.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/fys-admin/src/main/resources/application-dev.yml similarity index 98% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to fys-admin/src/main/resources/application-dev.yml index 8c85baf..8f699b3 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/fys-admin/src/main/resources/application-dev.yml @@ -15,7 +15,7 @@ spring.boot.admin.client: snail-job: enabled: false # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" + group: "fys_group" # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表 token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" server: @@ -121,7 +121,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus + clientName: fys-Vue-Plus # 最小空闲连接数 connectionMinimumIdleSize: 8 # 连接池大小 @@ -166,7 +166,7 @@ sms: minute-max: 1 # 短信拦截限制单手机号每日最大发送量,只对开启了拦截的配置有效 account-max: 30 - # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 + # 以下配置来自于 com.fuyuanshen.sms4j.provider.config.BaseConfig类中 blends: # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/fys-admin/src/main/resources/application-prod.yml similarity index 98% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to fys-admin/src/main/resources/application-prod.yml index 435a9e8..5fd5908 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/fys-admin/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ --- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp +spring.servlet.multipart.location: /fys/server/temp --- # 监控中心配置 spring.boot.admin.client: @@ -18,7 +18,7 @@ spring.boot.admin.client: snail-job: enabled: true # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" + group: "fys_group" # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表 token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" server: @@ -107,7 +107,7 @@ spring.data: # 数据库索引 database: 0 # redis 密码必须配置 - password: ruoyi123 + password: fys123 # 连接超时时间 timeout: 10s # 是否开启ssl @@ -124,7 +124,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus + clientName: fys-Vue-Plus # 最小空闲连接数 connectionMinimumIdleSize: 32 # 连接池大小 @@ -169,7 +169,7 @@ sms: minute-max: 1 # 短信拦截限制单手机号每日最大发送量,只对开启了拦截的配置有效 account-max: 30 - # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 + # 以下配置来自于 com.fuyuanshen.sms4j.provider.config.BaseConfig类中 blends: # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 diff --git a/ruoyi-admin/src/main/resources/application.yml b/fys-admin/src/main/resources/application.yml similarity index 92% rename from ruoyi-admin/src/main/resources/application.yml rename to fys-admin/src/main/resources/application.yml index b150262..5a1f0ff 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/fys-admin/src/main/resources/application.yml @@ -35,7 +35,7 @@ captcha: # 日志配置 logging: level: - org.dromara: @logging.level@ + com.fuyuanshen: @logging.level@ org.springframework: warn org.mybatis.spring.mapper: error org.apache.fury: warn @@ -52,7 +52,7 @@ user: # Spring配置 spring: application: - name: RuoYi-Vue-Plus + name: fys-Vue-Plus threads: # 开启虚拟线程 仅jdk21可用 virtual: @@ -133,12 +133,12 @@ tenant: mybatis-plus: # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效 enableLogicDelete: true - # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper - mapperPackage: org.dromara.**.mapper + # 多包名使用 例如 com.fuyuanshen.**.mapper,org.xxx.**.mapper + mapperPackage: com.fuyuanshen.**.mapper # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描,多个package用逗号或者分号分隔 - typeAliasesPackage: org.dromara.**.domain + typeAliasesPackage: com.fuyuanshen.**.domain global-config: dbConfig: # 主键类型 @@ -179,16 +179,16 @@ springdoc: enabled: true info: # 标题 - title: '标题:RuoYi-Vue-Plus多租户管理系统_接口文档' + title: '标题:fys-Vue-Plus多租户管理系统_接口文档' # 描述 description: '描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' # 版本 - version: '版本号: ${ruoyi.version}' + version: '版本号: ${fys.version}' # 作者信息 contact: name: Lion Li email: crazylionli@163.com - url: https://gitee.com/dromara/RuoYi-Vue-Plus + url: https://gitee.com/dromara/fys-Vue-Plus components: # 鉴权方式配置 security-schemes: @@ -199,15 +199,15 @@ springdoc: #这里定义了两个分组,可定义多个,也可以不定义 group-configs: - group: 1.演示模块 - packages-to-scan: org.dromara.demo + packages-to-scan: com.fuyuanshen.demo - group: 2.通用模块 - packages-to-scan: org.dromara.web + packages-to-scan: com.fuyuanshen.web - group: 3.系统模块 - packages-to-scan: org.dromara.system + packages-to-scan: com.fuyuanshen.system - group: 4.代码生成模块 - packages-to-scan: org.dromara.generator + packages-to-scan: com.fuyuanshen.generator - group: 5.工作流模块 - packages-to-scan: org.dromara.workflow + packages-to-scan: com.fuyuanshen.workflow # 防止XSS攻击 xss: diff --git a/ruoyi-admin/src/main/resources/banner.txt b/fys-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-admin/src/main/resources/banner.txt rename to fys-admin/src/main/resources/banner.txt diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/fys-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to fys-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/fys-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to fys-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/fys-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to fys-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/fys-admin/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-admin/src/main/resources/ip2region.xdb rename to fys-admin/src/main/resources/ip2region.xdb diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/fys-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback-plus.xml rename to fys-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/fys-admin/src/test/java/com/fuyuanshen/test/AssertUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java rename to fys-admin/src/test/java/com/fuyuanshen/test/AssertUnitTest.java index dba2323..47248ee 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java +++ b/fys-admin/src/test/java/com/fuyuanshen/test/AssertUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package com.fuyuanshen.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/fys-admin/src/test/java/com/fuyuanshen/test/DemoUnitTest.java similarity index 94% rename from ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java rename to fys-admin/src/test/java/com/fuyuanshen/test/DemoUnitTest.java index 2d11a10..33177e1 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java +++ b/fys-admin/src/test/java/com/fuyuanshen/test/DemoUnitTest.java @@ -1,6 +1,6 @@ -package org.dromara.test; +package com.fuyuanshen.test; -import org.dromara.common.web.config.properties.CaptchaProperties; +import com.fuyuanshen.common.web.config.properties.CaptchaProperties; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/fys-admin/src/test/java/com/fuyuanshen/test/ParamUnitTest.java similarity index 95% rename from ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java rename to fys-admin/src/test/java/com/fuyuanshen/test/ParamUnitTest.java index 1db51df..cd5f0c8 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java +++ b/fys-admin/src/test/java/com/fuyuanshen/test/ParamUnitTest.java @@ -1,6 +1,6 @@ -package org.dromara.test; +package com.fuyuanshen.test; -import org.dromara.common.core.enums.UserType; +import com.fuyuanshen.common.core.enums.UserType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/fys-admin/src/test/java/com/fuyuanshen/test/TagUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java rename to fys-admin/src/test/java/com/fuyuanshen/test/TagUnitTest.java index b50afa6..b4b0e50 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java +++ b/fys-admin/src/test/java/com/fuyuanshen/test/TagUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package com.fuyuanshen.test; import org.junit.jupiter.api.*; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/fys-common/fys-common-bom/pom.xml similarity index 57% rename from ruoyi-common/ruoyi-common-bom/pom.xml rename to fys-common/fys-common-bom/pom.xml index e4f9d30..d9eea50 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/fys-common/fys-common-bom/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara - ruoyi-common-bom + com.fuyuanshen + fys-common-bom ${revision} pom - ruoyi-common-bom common依赖项 + fys-common-bom common依赖项 @@ -21,161 +21,161 @@ - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core ${revision} - org.dromara - ruoyi-common-doc + com.fuyuanshen + fys-common-doc ${revision} - org.dromara - ruoyi-common-excel + com.fuyuanshen + fys-common-excel ${revision} - org.dromara - ruoyi-common-idempotent + com.fuyuanshen + fys-common-idempotent ${revision} - org.dromara - ruoyi-common-job + com.fuyuanshen + fys-common-job ${revision} - org.dromara - ruoyi-common-log + com.fuyuanshen + fys-common-log ${revision} - org.dromara - ruoyi-common-mail + com.fuyuanshen + fys-common-mail ${revision} - org.dromara - ruoyi-common-mybatis + com.fuyuanshen + fys-common-mybatis ${revision} - org.dromara - ruoyi-common-oss + com.fuyuanshen + fys-common-oss ${revision} - org.dromara - ruoyi-common-ratelimiter + com.fuyuanshen + fys-common-ratelimiter ${revision} - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis ${revision} - org.dromara - ruoyi-common-satoken + com.fuyuanshen + fys-common-satoken ${revision} - org.dromara - ruoyi-common-security + com.fuyuanshen + fys-common-security ${revision} - org.dromara - ruoyi-common-sms + com.fuyuanshen + fys-common-sms ${revision} - org.dromara - ruoyi-common-social + com.fuyuanshen + fys-common-social ${revision} - org.dromara - ruoyi-common-web + com.fuyuanshen + fys-common-web ${revision} - org.dromara - ruoyi-common-translation + com.fuyuanshen + fys-common-translation ${revision} - org.dromara - ruoyi-common-sensitive + com.fuyuanshen + fys-common-sensitive ${revision} - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json ${revision} - org.dromara - ruoyi-common-encrypt + com.fuyuanshen + fys-common-encrypt ${revision} - org.dromara - ruoyi-common-tenant + com.fuyuanshen + fys-common-tenant ${revision} - org.dromara - ruoyi-common-websocket + com.fuyuanshen + fys-common-websocket ${revision} - org.dromara - ruoyi-common-sse + com.fuyuanshen + fys-common-sse ${revision} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/fys-common/fys-common-core/pom.xml similarity index 94% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to fys-common/fys-common-core/pom.xml index ad37e90..f8fd1ef 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/fys-common/fys-common-core/pom.xml @@ -3,16 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-core + fys-common-core - ruoyi-common-core 核心模块 + fys-common-core 核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ApplicationConfig.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ApplicationConfig.java index d9f70e4..caea7ec 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package com.fuyuanshen.common.core.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/AsyncConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/AsyncConfig.java index cd01e33..bda1b42 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/AsyncConfig.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.config; +package com.fuyuanshen.common.core.config; import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.core.task.VirtualThreadTaskExecutor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ThreadPoolConfig.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ThreadPoolConfig.java index 2630485..f80c1eb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ThreadPoolConfig.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.config; +package com.fuyuanshen.common.core.config; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.dromara.common.core.config.properties.ThreadPoolProperties; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.Threads; +import com.fuyuanshen.common.core.config.properties.ThreadPoolProperties; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.Threads; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ValidatorConfig.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ValidatorConfig.java index ddcd836..7369a77 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package com.fuyuanshen.common.core.config; import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidator; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/properties/ThreadPoolProperties.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/properties/ThreadPoolProperties.java index 820564f..c2532e6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config.properties; +package com.fuyuanshen.common.core.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheConstants.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheConstants.java index ceb8370..9d73f2a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 缓存的key 常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheNames.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheNames.java index c38f39b..2519212 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/CacheNames.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 缓存组名称常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/Constants.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/Constants.java index 273c734..fe50dc5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/Constants.java @@ -1,9 +1,9 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 通用常量信息 * - * @author ruoyi + * @author fys */ public interface Constants { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java index 5352b11..18257d9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 全局的key常量 (业务无关的key) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/HttpStatus.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/HttpStatus.java index 85566e8..f7ba342 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 返回状态码 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/RegexConstants.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/RegexConstants.java index f1e04f7..b4716e0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/RegexConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; import cn.hutool.core.lang.RegexPool; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java index 8a37a51..51b8df7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 系统常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java index 33ce0cf..c51e256 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package com.fuyuanshen.common.core.constant; /** * 租户常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/R.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/R.java index be85805..9eb8074 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/R.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.domain; +package com.fuyuanshen.common.core.domain; -import org.dromara.common.core.constant.HttpStatus; +import com.fuyuanshen.common.core.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/CompleteTaskDTO.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/CompleteTaskDTO.java index 2e63f8a..42e2444 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/CompleteTaskDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DeptDTO.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DeptDTO.java index 7b748b0..e6c8d4b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DeptDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictDataDTO.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictDataDTO.java index dff1a75..d9d7a2b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictDataDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictTypeDTO.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictTypeDTO.java index 43ab142..ccbc20d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/DictTypeDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/FlowCopyDTO.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/FlowCopyDTO.java index 2f20b21..caef884 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/FlowCopyDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/OssDTO.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/OssDTO.java index 463821c..616d4bb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/OssDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/PostDTO.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/PostDTO.java index 7536ee3..51946ad 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/PostDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/RoleDTO.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/RoleDTO.java index d14ffbb..8a82964 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessDTO.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessDTO.java index 3934ada..6d872f6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessReturnDTO.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessReturnDTO.java index 9bcbd12..ae87462 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/StartProcessReturnDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/TaskAssigneeDTO.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/TaskAssigneeDTO.java index 85893e1..85de311 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/TaskAssigneeDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserDTO.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserDTO.java index cb5def9..a5a30d1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserOnlineDTO.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserOnlineDTO.java index 43d8c3c..08500f1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/dto/UserOnlineDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package com.fuyuanshen.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,7 +9,7 @@ import java.io.Serializable; /** * 当前在线会话 * - * @author ruoyi + * @author fys */ @Data diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessDeleteEvent.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessDeleteEvent.java index d570c31..4f746ca 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessDeleteEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.fuyuanshen.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessEvent.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessEvent.java index 7b15b85..94f197f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.fuyuanshen.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessTaskEvent.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessTaskEvent.java index a9bcf7e..76b0bb5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/event/ProcessTaskEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.event; +package com.fuyuanshen.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/EmailLoginBody.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/EmailLoginBody.java index ffde8c6..f9bf216 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/EmailLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginBody.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginBody.java index 63bee0d..bc567cc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginUser.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginUser.java index 338d4d7..f24e9f2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/LoginUser.java @@ -1,9 +1,9 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.domain.dto.PostDTO; -import org.dromara.common.core.domain.dto.RoleDTO; +import com.fuyuanshen.common.core.domain.dto.PostDTO; +import com.fuyuanshen.common.core.domain.dto.RoleDTO; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java index 36e33b2..1ba0e32 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/RegisterBody.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/RegisterBody.java index cced26b..f111926 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/RegisterBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SmsLoginBody.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SmsLoginBody.java index a878348..82a3312 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SmsLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SocialLoginBody.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SocialLoginBody.java index 0d1b121..e165eb5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/SocialLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/TaskAssigneeBody.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/TaskAssigneeBody.java index 0cbed2f..8c3ab81 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/TaskAssigneeBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginBody.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginBody.java index 518fe2e..06a1245 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginUser.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginUser.java index e5f3d6c..96eed6f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/XcxLoginUser.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package com.fuyuanshen.common.core.domain.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/BusinessStatusEnum.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/BusinessStatusEnum.java index c1660ee..f92197d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/BusinessStatusEnum.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.enums; +package com.fuyuanshen.common.core.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.StringUtils; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/DeviceType.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/DeviceType.java index 1667ac7..4bf21c5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/DeviceType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.fuyuanshen.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/FormatsType.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/FormatsType.java index 8d4b6d9..f880140 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/FormatsType.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.enums; +package com.fuyuanshen.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; /* * 日期格式 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/LoginType.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/LoginType.java index f9cac66..84f99b1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/LoginType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.fuyuanshen.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserStatus.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserStatus.java index be7e44d..6ddd8d7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package com.fuyuanshen.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; @@ -6,7 +6,7 @@ import lombok.Getter; /** * 用户状态 * - * @author ruoyi + * @author fys */ @Getter @AllArgsConstructor diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserType.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserType.java index 636988f..bb93e36 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserType.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.enums; +package com.fuyuanshen.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; /** * 用户类型 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/ServiceException.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/ServiceException.java index e9dc6ec..2219a93 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception; +package com.fuyuanshen.common.core.exception; import lombok.*; @@ -7,7 +7,7 @@ import java.io.Serial; /** * 业务异常 * - * @author ruoyi + * @author fys */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/SseException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/SseException.java index a76e16d..0e42bab 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/SseException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception; +package com.fuyuanshen.common.core.exception; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/base/BaseException.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/base/BaseException.java index 40ce01b..a5116b0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/base/BaseException.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.exception.base; +package com.fuyuanshen.common.core.exception.base; import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -12,7 +12,7 @@ import java.io.Serial; /** * 基础异常 * - * @author ruoyi + * @author fys */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileException.java similarity index 68% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileException.java index d374fc0..ff1afc3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileException.java @@ -1,13 +1,13 @@ -package org.dromara.common.core.exception.file; +package com.fuyuanshen.common.core.exception.file; -import org.dromara.common.core.exception.base.BaseException; +import com.fuyuanshen.common.core.exception.base.BaseException; import java.io.Serial; /** * 文件信息异常类 * - * @author ruoyi + * @author fys */ public class FileException extends BaseException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileNameLengthLimitExceededException.java index af98124..d851eda 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.exception.file; +package com.fuyuanshen.common.core.exception.file; import java.io.Serial; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author fys */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileSizeLimitExceededException.java similarity index 84% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileSizeLimitExceededException.java index 1eb8d40..360b642 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.exception.file; +package com.fuyuanshen.common.core.exception.file; import java.io.Serial; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author fys */ public class FileSizeLimitExceededException extends FileException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaException.java similarity index 79% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaException.java index 43824e0..653dc48 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaException.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.exception.user; +package com.fuyuanshen.common.core.exception.user; import java.io.Serial; /** * 验证码错误异常类 * - * @author ruoyi + * @author fys */ public class CaptchaException extends UserException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaExpireException.java similarity index 80% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaExpireException.java index f4b8cac..8bc0fda 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/CaptchaExpireException.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.exception.user; +package com.fuyuanshen.common.core.exception.user; import java.io.Serial; /** * 验证码失效异常类 * - * @author ruoyi + * @author fys */ public class CaptchaExpireException extends UserException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/UserException.java similarity index 68% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/UserException.java index 024fed6..b94a076 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/exception/user/UserException.java @@ -1,13 +1,13 @@ -package org.dromara.common.core.exception.user; +package com.fuyuanshen.common.core.exception.user; -import org.dromara.common.core.exception.base.BaseException; +import com.fuyuanshen.common.core.exception.base.BaseException; import java.io.Serial; /** * 用户信息异常类 * - * @author ruoyi + * @author fys */ public class UserException extends BaseException { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/RegexPatternPoolFactory.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/RegexPatternPoolFactory.java index fd907d2..98efcea 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/RegexPatternPoolFactory.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.factory; +package com.fuyuanshen.common.core.factory; import cn.hutool.core.lang.PatternPool; -import org.dromara.common.core.constant.RegexConstants; +import com.fuyuanshen.common.core.constant.RegexConstants; import java.util.regex.Pattern; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/YmlPropertySourceFactory.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/YmlPropertySourceFactory.java index af61b90..83c1f10 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/factory/YmlPropertySourceFactory.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.factory; +package com.fuyuanshen.common.core.factory; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/ConfigService.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/ConfigService.java index 7328c69..8aaf7f5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; /** * 通用 参数配置服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DeptService.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DeptService.java index f93d177..b1b6b41 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DeptService.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; -import org.dromara.common.core.domain.dto.DeptDTO; +import com.fuyuanshen.common.core.domain.dto.DeptDTO; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DictService.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DictService.java index d80395c..cfc2f53 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/DictService.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; -import org.dromara.common.core.domain.dto.DictDataDTO; -import org.dromara.common.core.domain.dto.DictTypeDTO; +import com.fuyuanshen.common.core.domain.dto.DictDataDTO; +import com.fuyuanshen.common.core.domain.dto.DictTypeDTO; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/OssService.java similarity index 82% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/OssService.java index 1a52de0..6170629 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/OssService.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; -import org.dromara.common.core.domain.dto.OssDTO; +import com.fuyuanshen.common.core.domain.dto.OssDTO; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PermissionService.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PermissionService.java index d7db79a..85fe060 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; import java.util.Set; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PostService.java similarity index 67% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PostService.java index 41d4e83..df7a947 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/PostService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; /** * 通用 岗位服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/RoleService.java similarity index 67% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/RoleService.java index ba62c82..2142179 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/RoleService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; /** * 通用 角色服务 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/TaskAssigneeService.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/TaskAssigneeService.java index 9af6691..55ddb02 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/TaskAssigneeService.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; +import com.fuyuanshen.common.core.domain.dto.TaskAssigneeDTO; +import com.fuyuanshen.common.core.domain.model.TaskAssigneeBody; /** * 工作流设计器获取任务执行人 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/UserService.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/UserService.java index 4903c38..7f1bf48 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/UserService.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; -import org.dromara.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.domain.dto.UserDTO; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/WorkflowService.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/WorkflowService.java index 9d1a901..37705ff 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/service/WorkflowService.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.service; +package com.fuyuanshen.common.core.service; -import org.dromara.common.core.domain.dto.CompleteTaskDTO; -import org.dromara.common.core.domain.dto.StartProcessDTO; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; +import com.fuyuanshen.common.core.domain.dto.CompleteTaskDTO; +import com.fuyuanshen.common.core.domain.dto.StartProcessDTO; +import com.fuyuanshen.common.core.domain.dto.StartProcessReturnDTO; import java.util.List; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/DateUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/DateUtils.java index b52d95e..91aacb6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/DateUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import org.apache.commons.lang3.time.DateFormatUtils; -import org.dromara.common.core.enums.FormatsType; -import org.dromara.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.enums.FormatsType; +import com.fuyuanshen.common.core.exception.ServiceException; import java.lang.management.ManagementFactory; import java.text.ParseException; @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; /** * 时间工具类 * - * @author ruoyi + * @author fys */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { private static final String[] PARSE_PATTERNS = { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/MapstructUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/MapstructUtils.java index b6acff7..2adbe0f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/MapstructUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/MessageUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/MessageUtils.java index 48dfc08..0b3b98c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/NetUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/NetUtils.java index 72fdf40..a6fd5e1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/NetUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.lang.PatternPool; import cn.hutool.core.net.NetUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.regex.RegexUtils; +import com.fuyuanshen.common.core.utils.regex.RegexUtils; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ObjectUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ObjectUtils.java index 199fd82..36c4e4f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ObjectUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.util.ObjectUtil; import lombok.AccessLevel; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ServletUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ServletUtils.java index bd1aab8..d6d890d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.JakartaServletUtil; @@ -27,7 +27,7 @@ import java.util.Map; /** * 客户端工具类,提供获取请求参数、响应处理、头部信息等常用操作 * - * @author ruoyi + * @author fys */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ServletUtils extends JakartaServletUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/SpringUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/SpringUtils.java index 169c6e2..ef1f73a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.extra.spring.SpringUtil; import org.springframework.beans.factory.NoSuchBeanDefinitionException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/StreamUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/StreamUtils.java index 1342deb..94f5eda 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; @@ -7,7 +7,6 @@ import lombok.NoArgsConstructor; import java.util.*; import java.util.function.BiFunction; -import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/StringUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/StringUtils.java index 7165734..1ecc122 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/Threads.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/Threads.java index 82ea5ca..db2952e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/Threads.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -9,7 +9,7 @@ import java.util.concurrent.*; /** * 线程相关工具类. * - * @author ruoyi + * @author fys */ @Slf4j @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/TreeBuildUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/TreeBuildUtils.java index 2ab42cb..462c849 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/TreeBuildUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -7,7 +7,7 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ValidatorUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ValidatorUtils.java index 06b8fd6..37cdc70 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ValidatorUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package com.fuyuanshen.common.core.utils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/FileUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/FileUtils.java index 573b207..b75c186 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package com.fuyuanshen.common.core.utils.file; import cn.hutool.core.io.FileUtil; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/MimeTypeUtils.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/MimeTypeUtils.java index 23fa2cf..7824bef 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package org.dromara.common.core.utils.file; +package com.fuyuanshen.common.core.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author fys */ public class MimeTypeUtils { public static final String IMAGE_PNG = "image/png"; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ip/AddressUtils.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ip/AddressUtils.java index 1047344..bf2aed1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ip/AddressUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.utils.ip; +package com.fuyuanshen.common.core.utils.ip; import cn.hutool.http.HtmlUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.NetUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.NetUtils; +import com.fuyuanshen.common.core.utils.StringUtils; /** * 获取地址类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ip/RegionUtils.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ip/RegionUtils.java index c9e8678..55f6025 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ip/RegionUtils.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.utils.ip; +package com.fuyuanshen.common.core.utils.ip; import cn.hutool.core.io.resource.NoResourceException; import cn.hutool.core.io.resource.ResourceUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.StringUtils; import org.lionsoul.ip2region.xdb.Searcher; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/reflect/ReflectUtils.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/reflect/ReflectUtils.java index 367e8c9..3eba416 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.utils.reflect; +package com.fuyuanshen.common.core.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/regex/RegexUtils.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/regex/RegexUtils.java index 6dde129..3bbfb20 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/regex/RegexUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.regex; +package com.fuyuanshen.common.core.utils.regex; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.constant.RegexConstants; +import com.fuyuanshen.common.core.constant.RegexConstants; /** * 正则相关工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/regex/RegexValidator.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/regex/RegexValidator.java index c0dda20..ed353c0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/regex/RegexValidator.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.regex; +package com.fuyuanshen.common.core.utils.regex; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.lang.Validator; -import org.dromara.common.core.factory.RegexPatternPoolFactory; +import com.fuyuanshen.common.core.factory.RegexPatternPoolFactory; import java.util.regex.Pattern; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/sql/SqlUtil.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/sql/SqlUtil.java index 1020c81..17a5d27 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/sql/SqlUtil.java @@ -1,13 +1,13 @@ -package org.dromara.common.core.utils.sql; +package com.fuyuanshen.common.core.utils.sql; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author fys */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class SqlUtil { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/AddGroup.java similarity index 64% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/AddGroup.java index 0275899..fd19bf6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.fuyuanshen.common.core.validate; /** * 校验分组 add diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/EditGroup.java similarity index 64% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/EditGroup.java index 77c5040..a90f19b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.fuyuanshen.common.core.validate; /** * 校验分组 edit diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/QueryGroup.java similarity index 65% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/QueryGroup.java index 02a0ac2..f6ade55 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package com.fuyuanshen.common.core.validate; /** * 校验分组 query diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/dicts/DictPattern.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/dicts/DictPattern.java index 73fc4c4..581f63c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/dicts/DictPattern.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate.dicts; +package com.fuyuanshen.common.core.validate.dicts; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/dicts/DictPatternValidator.java similarity index 86% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/dicts/DictPatternValidator.java index 558a343..c9ca6c9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/dicts/DictPatternValidator.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.validate.dicts; +package com.fuyuanshen.common.core.validate.dicts; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; /** * 自定义字典值校验器 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/enumd/EnumPattern.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/enumd/EnumPattern.java index 3d4adb9..12321cc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/enumd/EnumPattern.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate.enumd; +package com.fuyuanshen.common.core.validate.enumd; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/enumd/EnumPatternValidator.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/enumd/EnumPatternValidator.java index e63f44a..579ae8d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/validate/enumd/EnumPatternValidator.java @@ -1,9 +1,9 @@ -package org.dromara.common.core.validate.enumd; +package com.fuyuanshen.common.core.validate.enumd; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; /** * 自定义枚举校验注解实现 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/xss/Xss.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/xss/Xss.java index eed495f..431a3c0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package com.fuyuanshen.common.core.xss; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/xss/XssValidator.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java rename to fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/xss/XssValidator.java index 9c32563..e397234 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/xss/XssValidator.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package com.fuyuanshen.common.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/fys-common/fys-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..7949877 --- /dev/null +++ b/fys-common/fys-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.fuyuanshen.common.core.config.ApplicationConfig +com.fuyuanshen.common.core.config.AsyncConfig +com.fuyuanshen.common.core.config.ThreadPoolConfig +com.fuyuanshen.common.core.config.ValidatorConfig +com.fuyuanshen.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/fys-common/fys-common-doc/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-doc/pom.xml rename to fys-common/fys-common-doc/pom.xml index c6199a1..3cb1b65 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/fys-common/fys-common-doc/pom.xml @@ -3,22 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-doc + fys-common-doc - ruoyi-common-doc 系统接口 + fys-common-doc 系统接口 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/config/SpringDocConfig.java similarity index 95% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java rename to fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/config/SpringDocConfig.java index c199015..8aa3f1e 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ b/fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/config/SpringDocConfig.java @@ -1,13 +1,13 @@ -package org.dromara.common.doc.config; +package com.fuyuanshen.common.doc.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.doc.config.properties.SpringDocProperties; -import org.dromara.common.doc.handler.OpenApiHandler; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.doc.config.properties.SpringDocProperties; +import com.fuyuanshen.common.doc.handler.OpenApiHandler; import org.springdoc.core.configuration.SpringDocConfiguration; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.OpenApiCustomizer; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/config/properties/SpringDocProperties.java similarity index 97% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java rename to fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/config/properties/SpringDocProperties.java index eae3b4c..b0bc09c 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java +++ b/fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/config/properties/SpringDocProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.config.properties; +package com.fuyuanshen.common.doc.config.properties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/handler/OpenApiHandler.java similarity index 99% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java rename to fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/handler/OpenApiHandler.java index 56b7369..6b37cda 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ b/fys-common/fys-common-doc/src/main/java/com/fuyuanshen/common/doc/handler/OpenApiHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.handler; +package com.fuyuanshen.common.doc.handler; import cn.hutool.core.io.IoUtil; import io.swagger.v3.core.jackson.TypeNameResolver; @@ -11,7 +11,7 @@ import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.dromara.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.ServerBaseUrlCustomizer; import org.springdoc.core.properties.SpringDocConfigProperties; diff --git a/fys-common/fys-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ef76629 --- /dev/null +++ b/fys-common/fys-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.doc.config.SpringDocConfig diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/fys-common/fys-common-encrypt/pom.xml similarity index 82% rename from ruoyi-common/ruoyi-common-encrypt/pom.xml rename to fys-common/fys-common-encrypt/pom.xml index ed4910e..2797815 100644 --- a/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ b/fys-common/fys-common-encrypt/pom.xml @@ -3,23 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-encrypt + fys-common-encrypt - ruoyi-common-encrypt 数据加解密模块 + fys-common-encrypt 数据加解密模块 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/annotation/ApiEncrypt.java similarity index 86% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/annotation/ApiEncrypt.java index 7f52de8..f743e65 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/annotation/ApiEncrypt.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.annotation; +package com.fuyuanshen.common.encrypt.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/annotation/EncryptField.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/annotation/EncryptField.java index d357d72..43d15cb 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/annotation/EncryptField.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.annotation; +package com.fuyuanshen.common.encrypt.annotation; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/config/ApiDecryptAutoConfiguration.java similarity index 87% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/config/ApiDecryptAutoConfiguration.java index 098f6bc..08238ce 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/config/ApiDecryptAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.encrypt.config; +package com.fuyuanshen.common.encrypt.config; import jakarta.servlet.DispatcherType; -import org.dromara.common.encrypt.filter.CryptoFilter; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import com.fuyuanshen.common.encrypt.filter.CryptoFilter; +import com.fuyuanshen.common.encrypt.properties.ApiDecryptProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/config/EncryptorAutoConfiguration.java similarity index 81% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/config/EncryptorAutoConfiguration.java index fbc4e52..ae79a3e 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/config/EncryptorAutoConfiguration.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.config; +package com.fuyuanshen.common.encrypt.config; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; -import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.fuyuanshen.common.encrypt.core.EncryptorManager; +import com.fuyuanshen.common.encrypt.interceptor.MybatisDecryptInterceptor; +import com.fuyuanshen.common.encrypt.interceptor.MybatisEncryptInterceptor; +import com.fuyuanshen.common.encrypt.properties.EncryptorProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/EncryptContext.java similarity index 76% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/EncryptContext.java index 2f02eaf..669a215 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/EncryptContext.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package com.fuyuanshen.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; import lombok.Data; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/EncryptorManager.java similarity index 96% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/EncryptorManager.java index b5f194d..e48c80d 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/EncryptorManager.java @@ -1,13 +1,13 @@ -package org.dromara.common.encrypt.core; +package com.fuyuanshen.common.encrypt.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.io.Resources; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; +import com.fuyuanshen.common.core.utils.ObjectUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.annotation.EncryptField; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/IEncryptor.java similarity index 77% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/IEncryptor.java index dbc4420..f772ff4 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/IEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package com.fuyuanshen.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; /** * 加解者 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/AbstractEncryptor.java similarity index 60% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/AbstractEncryptor.java index 858d229..673d51b 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/AbstractEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.fuyuanshen.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.IEncryptor; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.core.IEncryptor; /** * 所有加密执行者的基类 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/AesEncryptor.java similarity index 79% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/AesEncryptor.java index e4dc597..659f3af 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/AesEncryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.fuyuanshen.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; /** * AES算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Base64Encryptor.java similarity index 74% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Base64Encryptor.java index 0028548..c5dca59 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Base64Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.fuyuanshen.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; /** * Base64算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/RsaEncryptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/RsaEncryptor.java index 5f03a4b..84f82a5 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/RsaEncryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.fuyuanshen.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Sm2Encryptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Sm2Encryptor.java index aec5d82..cad8af9 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Sm2Encryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.fuyuanshen.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; /** * sm2算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Sm4Encryptor.java similarity index 79% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Sm4Encryptor.java index adaf674..809de0a 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/core/encryptor/Sm4Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package com.fuyuanshen.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; /** * sm4算法实现 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/enumd/AlgorithmType.java similarity index 85% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/enumd/AlgorithmType.java index 26ee1ee..cfa78d4 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/enumd/AlgorithmType.java @@ -1,8 +1,8 @@ -package org.dromara.common.encrypt.enumd; +package com.fuyuanshen.common.encrypt.enumd; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.encrypt.core.encryptor.*; +import com.fuyuanshen.common.encrypt.core.encryptor.*; /** * 算法名称 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/enumd/EncodeType.java similarity index 84% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/enumd/EncodeType.java index f471221..af31208 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/enumd/EncodeType.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.enumd; +package com.fuyuanshen.common.encrypt.enumd; /** * 编码类型 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/CryptoFilter.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/CryptoFilter.java index 79d58da..43dc423 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/CryptoFilter.java @@ -1,15 +1,15 @@ -package org.dromara.common.encrypt.filter; +package com.fuyuanshen.common.encrypt.filter; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.core.constant.HttpStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import com.fuyuanshen.common.core.constant.HttpStatus; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt; +import com.fuyuanshen.common.encrypt.properties.ApiDecryptProperties; import org.springframework.http.HttpMethod; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerExceptionResolver; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java similarity index 94% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java index 98f4bc7..78ab242 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.filter; +package com.fuyuanshen.common.encrypt.filter; import cn.hutool.core.io.IoUtil; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; import org.springframework.http.MediaType; import java.io.BufferedReader; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/EncryptResponseBodyWrapper.java similarity index 97% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/EncryptResponseBodyWrapper.java index 78e06ff..a46b04e 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/filter/EncryptResponseBodyWrapper.java @@ -1,11 +1,11 @@ -package org.dromara.common.encrypt.filter; +package com.fuyuanshen.common.encrypt.filter; import cn.hutool.core.util.RandomUtil; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; -import org.dromara.common.encrypt.utils.EncryptUtils; +import com.fuyuanshen.common.encrypt.utils.EncryptUtils; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 89% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/interceptor/MybatisDecryptInterceptor.java index 460aa36..01fbce1 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.interceptor; +package com.fuyuanshen.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -7,13 +7,13 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.resultset.ResultSetHandler; import org.apache.ibatis.plugin.*; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.annotation.EncryptField; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.core.EncryptorManager; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.properties.EncryptorProperties; import java.lang.reflect.Field; import java.sql.Statement; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 90% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/interceptor/MybatisEncryptInterceptor.java index bcc2f4c..e7d3c5a 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.interceptor; +package com.fuyuanshen.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -10,13 +10,13 @@ import org.apache.ibatis.plugin.Interceptor; import org.apache.ibatis.plugin.Intercepts; import org.apache.ibatis.plugin.Invocation; import org.apache.ibatis.plugin.Signature; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.annotation.EncryptField; +import com.fuyuanshen.common.encrypt.core.EncryptContext; +import com.fuyuanshen.common.encrypt.core.EncryptorManager; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.properties.EncryptorProperties; import java.lang.reflect.Field; import java.sql.PreparedStatement; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/properties/ApiDecryptProperties.java similarity index 91% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/properties/ApiDecryptProperties.java index 6aadb3e..5d7d852 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/properties/ApiDecryptProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.properties; +package com.fuyuanshen.common.encrypt.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/properties/EncryptorProperties.java similarity index 80% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/properties/EncryptorProperties.java index ba445c1..1651805 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/properties/EncryptorProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.properties; +package com.fuyuanshen.common.encrypt.properties; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.enumd.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java rename to fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtils.java index ff0fbc8..2611800 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.utils; +package com.fuyuanshen.common.encrypt.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; diff --git a/fys-common/fys-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6a4dca5 --- /dev/null +++ b/fys-common/fys-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.fuyuanshen.common.encrypt.config.EncryptorAutoConfiguration +com.fuyuanshen.common.encrypt.config.ApiDecryptAutoConfiguration + diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/fys-common/fys-common-excel/pom.xml similarity index 71% rename from ruoyi-common/ruoyi-common-excel/pom.xml rename to fys-common/fys-common-excel/pom.xml index 47ba528..154fd0c 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/fys-common/fys-common-excel/pom.xml @@ -3,22 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-excel + fys-common-excel - ruoyi-common-excel + fys-common-excel - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/CellMerge.java similarity index 79% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/CellMerge.java index 6b9211b..709f25a 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package com.fuyuanshen.common.excel.annotation; -import org.dromara.common.excel.core.CellMergeStrategy; +import com.fuyuanshen.common.excel.core.CellMergeStrategy; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelDictFormat.java similarity index 84% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelDictFormat.java index 5c51842..b18f8ba 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelDictFormat.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package com.fuyuanshen.common.excel.annotation; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelEnumFormat.java similarity index 91% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelEnumFormat.java index 290379d..2f09c78 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelEnumFormat.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.fuyuanshen.common.excel.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelNotation.java similarity index 90% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelNotation.java index f358afc..f362af3 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelNotation.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.fuyuanshen.common.excel.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelRequired.java similarity index 91% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelRequired.java index 15784e1..4d7ee4c 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/annotation/ExcelRequired.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package com.fuyuanshen.common.excel.annotation; import org.apache.poi.ss.usermodel.IndexedColors; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelBigNumberConvert.java index c6beb55..820dc72 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.fuyuanshen.common.excel.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelDictConvert.java similarity index 88% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelDictConvert.java index c54816f..c43747d 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.fuyuanshen.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,11 +9,11 @@ import cn.idev.excel.metadata.GlobalConfiguration; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.metadata.data.WriteCellData; import cn.idev.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.excel.utils.ExcelUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelEnumConvert.java similarity index 95% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelEnumConvert.java index 5723e61..df27189 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/convert/ExcelEnumConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package com.fuyuanshen.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,8 +9,8 @@ import cn.idev.excel.metadata.GlobalConfiguration; import cn.idev.excel.metadata.data.ReadCellData; import cn.idev.excel.metadata.data.WriteCellData; import cn.idev.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/CellMergeStrategy.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/CellMergeStrategy.java index 515f68e..837e051 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/CellMergeStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; @@ -15,8 +15,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.util.CellRangeAddress; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.CellMerge; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.excel.annotation.CellMerge; import java.lang.reflect.Field; import java.util.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DefaultExcelListener.java similarity index 94% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DefaultExcelListener.java index e715c5f..7d3440b 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import cn.hutool.core.util.StrUtil; import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.event.AnalysisEventListener; import cn.idev.excel.exception.ExcelAnalysisException; import cn.idev.excel.exception.ExcelDataConvertException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DefaultExcelResult.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DefaultExcelResult.java index 7373e12..9e403fe 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DefaultExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DropDownOptions.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DropDownOptions.java index 8b53a0c..09545cd 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/DropDownOptions.java @@ -1,10 +1,10 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.exception.ServiceException; import java.util.ArrayList; import java.util.HashMap; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelDownHandler.java similarity index 97% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelDownHandler.java index f3b6415..6791558 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelDownHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; @@ -16,13 +16,13 @@ import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.WorkbookUtil; import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.annotation.ExcelEnumFormat; import java.lang.reflect.Field; import java.util.*; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelListener.java similarity index 82% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelListener.java index 957b307..0222b1f 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelListener.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import cn.idev.excel.read.listener.ReadListener; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelResult.java similarity index 87% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelResult.java index 0c2a418..fb67765 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/core/ExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package com.fuyuanshen.common.excel.core; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/handler/DataWriteHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/handler/DataWriteHandler.java index 259f822..cb7b341 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/handler/DataWriteHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.handler; +package com.fuyuanshen.common.excel.handler; import cn.hutool.core.collection.CollUtil; import cn.idev.excel.metadata.data.DataFormatData; @@ -13,9 +13,9 @@ import cn.idev.excel.write.metadata.style.WriteFont; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.ExcelNotation; -import org.dromara.common.excel.annotation.ExcelRequired; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.excel.annotation.ExcelNotation; +import com.fuyuanshen.common.excel.annotation.ExcelRequired; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java similarity index 98% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java rename to fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java index 1b35e55..5fd28e1 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java +++ b/fys-common/fys-common-excel/src/main/java/com/fuyuanshen/common/excel/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.utils; +package com.fuyuanshen.common.excel.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -14,11 +14,11 @@ import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.excel.convert.ExcelBigNumberConvert; -import org.dromara.common.excel.core.*; -import org.dromara.common.excel.handler.DataWriteHandler; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.file.FileUtils; +import com.fuyuanshen.common.excel.convert.ExcelBigNumberConvert; +import com.fuyuanshen.common.excel.core.*; +import com.fuyuanshen.common.excel.handler.DataWriteHandler; import java.io.IOException; import java.io.InputStream; diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/fys-common/fys-common-idempotent/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-idempotent/pom.xml rename to fys-common/fys-common-idempotent/pom.xml index 64418b4..0ce3dd0 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/fys-common/fys-common-idempotent/pom.xml @@ -3,27 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-idempotent + fys-common-idempotent - ruoyi-common-idempotent 幂等功能 + fys-common-idempotent 幂等功能 - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/annotation/RepeatSubmit.java similarity index 91% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/annotation/RepeatSubmit.java index 42ae802..f66eca5 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java +++ b/fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.annotation; +package com.fuyuanshen.common.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 90% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/aspectj/RepeatSubmitAspect.java index 5a27e91..852c736 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ b/fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.aspectj; +package com.fuyuanshen.common.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ArrayUtil; @@ -11,15 +11,15 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/config/IdempotentConfig.java similarity index 78% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java rename to fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/config/IdempotentConfig.java index fcb9d03..995aaf1 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java +++ b/fys-common/fys-common-idempotent/src/main/java/com/fuyuanshen/common/idempotent/config/IdempotentConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.idempotent.config; +package com.fuyuanshen.common.idempotent.config; -import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; +import com.fuyuanshen.common.idempotent.aspectj.RepeatSubmitAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/fys-common/fys-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..e1489ff --- /dev/null +++ b/fys-common/fys-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/fys-common/fys-common-job/pom.xml similarity index 80% rename from ruoyi-common/ruoyi-common-job/pom.xml rename to fys-common/fys-common-job/pom.xml index 3a4a0cb..1df68b6 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/fys-common/fys-common-job/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-job + fys-common-job - ruoyi-common-job 定时任务 + fys-common-job 定时任务 @@ -38,8 +38,8 @@ - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/fys-common/fys-common-job/src/main/java/com/fuyuanshen/common/job/config/SnailJobConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java rename to fys-common/fys-common-job/src/main/java/com/fuyuanshen/common/job/config/SnailJobConfig.java index cba3753..718902b 100644 --- a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java +++ b/fys-common/fys-common-job/src/main/java/com/fuyuanshen/common/job/config/SnailJobConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.job.config; +package com.fuyuanshen.common.job.config; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; diff --git a/fys-common/fys-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d318fba --- /dev/null +++ b/fys-common/fys-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.job.config.SnailJobConfig diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/fys-common/fys-common-json/pom.xml similarity index 75% rename from ruoyi-common/ruoyi-common-json/pom.xml rename to fys-common/fys-common-json/pom.xml index 870df5c..1c11546 100644 --- a/ruoyi-common/ruoyi-common-json/pom.xml +++ b/fys-common/fys-common-json/pom.xml @@ -3,22 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-json + fys-common-json - ruoyi-common-json 序列化模块 + fys-common-json 序列化模块 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/config/JacksonConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java rename to fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/config/JacksonConfig.java index 77cf833..a97ed1c 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java +++ b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/config/JacksonConfig.java @@ -1,12 +1,12 @@ -package org.dromara.common.json.config; +package com.fuyuanshen.common.json.config; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.json.handler.BigNumberSerializer; -import org.dromara.common.json.handler.CustomDateDeserializer; +import com.fuyuanshen.common.json.handler.BigNumberSerializer; +import com.fuyuanshen.common.json.handler.CustomDateDeserializer; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/handler/BigNumberSerializer.java similarity index 96% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java rename to fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/handler/BigNumberSerializer.java index 8752353..1e7f35e 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java +++ b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/handler/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.handler; +package com.fuyuanshen.common.json.handler; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/handler/CustomDateDeserializer.java similarity index 95% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java rename to fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/handler/CustomDateDeserializer.java index 069b924..94e9369 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java +++ b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/handler/CustomDateDeserializer.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.handler; +package com.fuyuanshen.common.json.handler; import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.core.JsonParser; diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/utils/JsonUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java rename to fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/utils/JsonUtils.java index 65c2faa..eb30a88 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java +++ b/fys-common/fys-common-json/src/main/java/com/fuyuanshen/common/json/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.utils; +package com.fuyuanshen.common.json.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/fys-common/fys-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b8ba5d6 --- /dev/null +++ b/fys-common/fys-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.json.config.JacksonConfig diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/fys-common/fys-common-log/pom.xml similarity index 59% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to fys-common/fys-common-log/pom.xml index 1e2b33b..7afadf6 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/fys-common/fys-common-log/pom.xml @@ -3,28 +3,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-log + fys-common-log - ruoyi-common-log 日志记录 + fys-common-log 日志记录 - org.dromara - ruoyi-common-satoken + com.fuyuanshen + fys-common-satoken - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/annotation/Log.java similarity index 81% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/annotation/Log.java index 2dced97..170218c 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/annotation/Log.java @@ -1,14 +1,14 @@ -package org.dromara.common.log.annotation; +package com.fuyuanshen.common.log.annotation; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.log.enums.OperatorType; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.log.enums.OperatorType; import java.lang.annotation.*; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author fys */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/aspect/LogAspect.java similarity index 93% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/aspect/LogAspect.java index 8ab2719..0772e93 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/aspect/LogAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.aspect; +package com.fuyuanshen.common.log.aspect; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; @@ -13,15 +13,15 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessStatus; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessStatus; +import com.fuyuanshen.common.log.event.OperLogEvent; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.http.HttpMethod; import org.springframework.validation.BindingResult; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessStatus.java similarity index 71% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessStatus.java index d303dc3..bbc01f5 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package org.dromara.common.log.enums; +package com.fuyuanshen.common.log.enums; /** * 操作状态 * - * @author ruoyi + * @author fys */ public enum BusinessStatus { /** diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessType.java similarity index 89% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessType.java index 2d25ebb..bcd0100 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessType.java @@ -1,9 +1,9 @@ -package org.dromara.common.log.enums; +package com.fuyuanshen.common.log.enums; /** * 业务操作类型 * - * @author ruoyi + * @author fys */ public enum BusinessType { /** diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/OperatorType.java similarity index 78% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/OperatorType.java index de9328b..459666d 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/OperatorType.java @@ -1,9 +1,9 @@ -package org.dromara.common.log.enums; +package com.fuyuanshen.common.log.enums; /** * 操作人类别 * - * @author ruoyi + * @author fys */ public enum OperatorType { /** diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/event/LogininforEvent.java similarity index 94% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/event/LogininforEvent.java index 938eaad..b5e96ba 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package com.fuyuanshen.common.log.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/event/OperLogEvent.java similarity index 97% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java rename to fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/event/OperLogEvent.java index 0386192..7280f07 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ b/fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/event/OperLogEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package com.fuyuanshen.common.log.event; import lombok.Data; diff --git a/fys-common/fys-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b4a5ec7 --- /dev/null +++ b/fys-common/fys-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/fys-common/fys-common-mail/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-mail/pom.xml rename to fys-common/fys-common-mail/pom.xml index c0e1b2e..e18a3e8 100644 --- a/ruoyi-common/ruoyi-common-mail/pom.xml +++ b/fys-common/fys-common-mail/pom.xml @@ -3,22 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-mail + fys-common-mail - ruoyi-common-mail 邮件模块 + fys-common-mail 邮件模块 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/config/MailConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java rename to fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/config/MailConfig.java index 0ea3007..ae34427 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java +++ b/fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/config/MailConfig.java @@ -1,7 +1,7 @@ -package org.dromara.common.mail.config; +package com.fuyuanshen.common.mail.config; import cn.hutool.extra.mail.MailAccount; -import org.dromara.common.mail.config.properties.MailProperties; +import com.fuyuanshen.common.mail.config.properties.MailProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/config/properties/MailProperties.java similarity index 96% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java rename to fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/config/properties/MailProperties.java index e44aa3d..c3e560b 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java +++ b/fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/config/properties/MailProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.config.properties; +package com.fuyuanshen.common.mail.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/utils/MailUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java rename to fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/utils/MailUtils.java index a28701f..090afb9 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java +++ b/fys-common/fys-common-mail/src/main/java/com/fuyuanshen/common/mail/utils/MailUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.mail.utils; +package com.fuyuanshen.common.mail.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -12,8 +12,8 @@ import jakarta.mail.Authenticator; import jakarta.mail.Session; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import java.io.File; import java.io.InputStream; diff --git a/fys-common/fys-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..fa09121 --- /dev/null +++ b/fys-common/fys-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/fys-common/fys-common-mybatis/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-mybatis/pom.xml rename to fys-common/fys-common-mybatis/pom.xml index d79ba28..3a64002 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/fys-common/fys-common-mybatis/pom.xml @@ -3,27 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-mybatis + fys-common-mybatis - ruoyi-common-mybatis 数据库服务 + fys-common-mybatis 数据库服务 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core - org.dromara - ruoyi-common-satoken + com.fuyuanshen + fys-common-satoken diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/annotation/DataColumn.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/annotation/DataColumn.java index 2879b9d..6c55c1b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package com.fuyuanshen.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/annotation/DataPermission.java similarity index 92% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/annotation/DataPermission.java index f5f22d5..60ac5bf 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package com.fuyuanshen.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/aspect/DataPermissionAspect.java similarity index 87% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/aspect/DataPermissionAspect.java index 1c83cc3..a1667f7 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/aspect/DataPermissionAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.aspect; +package com.fuyuanshen.common.mybatis.aspect; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -6,8 +6,8 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.helper.DataPermissionHelper; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.helper.DataPermissionHelper; /** * 数据权限处理 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/config/MybatisPlusConfig.java similarity index 89% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/config/MybatisPlusConfig.java index 00c2691..dc54c41 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.config; +package com.fuyuanshen.common.mybatis.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; @@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.aspect.DataPermissionAspect; -import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler; -import org.dromara.common.mybatis.handler.MybatisExceptionHandler; -import org.dromara.common.mybatis.handler.PlusPostInitTableInfoHandler; -import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor; +import com.fuyuanshen.common.core.factory.YmlPropertySourceFactory; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.mybatis.aspect.DataPermissionAspect; +import com.fuyuanshen.common.mybatis.handler.InjectionMetaObjectHandler; +import com.fuyuanshen.common.mybatis.handler.MybatisExceptionHandler; +import com.fuyuanshen.common.mybatis.handler.PlusPostInitTableInfoHandler; +import com.fuyuanshen.common.mybatis.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.BeansException; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/domain/BaseEntity.java similarity index 96% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/domain/BaseEntity.java index 13a7941..ee29d74 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.domain; +package com.fuyuanshen.common.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/mapper/BaseMapperPlus.java index 24557ed..28d3d0c 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.mapper; +package com.fuyuanshen.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; import java.io.Serializable; import java.util.Collection; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/page/PageQuery.java similarity index 94% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/page/PageQuery.java index 1d5c3c9..64fba03 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/page/PageQuery.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.page; +package com.fuyuanshen.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.sql.SqlUtil; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.sql.SqlUtil; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/page/TableDataInfo.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/page/TableDataInfo.java index 1fe2b3e..8d58251 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.page; +package com.fuyuanshen.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.http.HttpStatus; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/enums/DataBaseType.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/enums/DataBaseType.java index 5084424..84d3cea 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/enums/DataBaseType.java @@ -1,8 +1,8 @@ -package org.dromara.common.mybatis.enums; +package com.fuyuanshen.common.mybatis.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; /** * 数据库类型 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/enums/DataScopeType.java similarity index 90% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/enums/DataScopeType.java index 02a5f48..a471d86 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/enums/DataScopeType.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.enums; +package com.fuyuanshen.common.mybatis.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.helper.DataPermissionHelper; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.helper.DataPermissionHelper; /** * 数据权限类型枚举 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/InjectionMetaObjectHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/InjectionMetaObjectHandler.java index fec2579..f6cf699 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -1,15 +1,15 @@ -package org.dromara.common.mybatis.handler; +package com.fuyuanshen.common.mybatis.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.ObjectUtils; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import java.util.Date; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/MybatisExceptionHandler.java similarity index 92% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/MybatisExceptionHandler.java index 9a572b5..4fcc1a3 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/MybatisExceptionHandler.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.handler; +package com.fuyuanshen.common.mybatis.handler; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.StringUtils; import org.mybatis.spring.MyBatisSystemException; import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/PlusDataPermissionHandler.java index 6dee121..8c42de6 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/PlusDataPermissionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.handler; +package com.fuyuanshen.common.mybatis.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; @@ -11,17 +11,17 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import org.apache.ibatis.io.Resources; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.enums.DataScopeType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.dto.RoleDTO; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.enums.DataScopeType; +import com.fuyuanshen.common.mybatis.helper.DataPermissionHelper; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.core.io.Resource; @@ -172,7 +172,7 @@ public class PlusDataPermissionHandler { for (DataColumn dataColumn : dataPermission.value()) { // 包含权限标识符 这直接跳过 if (ignoreMap.containsKey(dataColumn)) { - // 修复多角色与权限标识符共用问题 https://gitee.com/dromara/RuoYi-Vue-Plus/issues/IB4CS4 + // 修复多角色与权限标识符共用问题 https://gitee.com/dromara/fys-Vue-Plus/issues/IB4CS4 conditions.add(joinStr + " 1 = 1 "); isSuccess = true; continue; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/PlusPostInitTableInfoHandler.java similarity index 83% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/PlusPostInitTableInfoHandler.java index 60ca20b..337dd61 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/handler/PlusPostInitTableInfoHandler.java @@ -1,11 +1,11 @@ -package org.dromara.common.mybatis.handler; +package com.fuyuanshen.common.mybatis.handler; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler; import com.baomidou.mybatisplus.core.metadata.TableInfo; import org.apache.ibatis.session.Configuration; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; /** * 修改表信息初始化方式 diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/helper/DataBaseHelper.java similarity index 92% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/helper/DataBaseHelper.java index cd43c68..d6e1a8a 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/helper/DataBaseHelper.java @@ -1,12 +1,12 @@ -package org.dromara.common.mybatis.helper; +package com.fuyuanshen.common.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.enums.DataBaseType; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.mybatis.enums.DataBaseType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/helper/DataPermissionHelper.java similarity index 97% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/helper/DataPermissionHelper.java index f03d74e..23d919c 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.helper; +package com.fuyuanshen.common.mybatis.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; import java.util.HashMap; import java.util.Map; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 98% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java rename to fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index 85a4d0a..1dcf863 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/fys-common/fys-common-mybatis/src/main/java/com/fuyuanshen/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.interceptor; +package com.fuyuanshen.common.mybatis.interceptor; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; @@ -20,7 +20,7 @@ import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlCommandType; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.RowBounds; -import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; +import com.fuyuanshen.common.mybatis.handler.PlusDataPermissionHandler; import java.sql.Connection; import java.sql.SQLException; diff --git a/fys-common/fys-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..dee05b5 --- /dev/null +++ b/fys-common/fys-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/fys-common/fys-common-mybatis/src/main/resources/common-mybatis.yml similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml rename to fys-common/fys-common-mybatis/src/main/resources/common-mybatis.yml diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties b/fys-common/fys-common-mybatis/src/main/resources/spy.properties similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties rename to fys-common/fys-common-mybatis/src/main/resources/spy.properties diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/fys-common/fys-common-oss/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-oss/pom.xml rename to fys-common/fys-common-oss/pom.xml index 190dc5d..d5796f2 100644 --- a/ruoyi-common/ruoyi-common-oss/pom.xml +++ b/fys-common/fys-common-oss/pom.xml @@ -3,27 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-oss + fys-common-oss - ruoyi-common-oss oss服务 + fys-common-oss oss服务 - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/constant/OssConstant.java similarity index 86% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/constant/OssConstant.java index 9d8db93..32d7c0b 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/constant/OssConstant.java @@ -1,6 +1,6 @@ -package org.dromara.common.oss.constant; +package com.fuyuanshen.common.oss.constant; -import org.dromara.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.constant.GlobalConstants; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/core/OssClient.java similarity index 97% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/core/OssClient.java index de5119e..dcd67c0 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/core/OssClient.java @@ -1,16 +1,16 @@ -package org.dromara.common.oss.core; +package com.fuyuanshen.common.oss.core; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enums.AccessPolicyType; -import org.dromara.common.oss.exception.OssException; -import org.dromara.common.oss.properties.OssProperties; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.utils.DateUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.file.FileUtils; +import com.fuyuanshen.common.oss.constant.OssConstant; +import com.fuyuanshen.common.oss.entity.UploadResult; +import com.fuyuanshen.common.oss.enums.AccessPolicyType; +import com.fuyuanshen.common.oss.exception.OssException; +import com.fuyuanshen.common.oss.properties.OssProperties; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.ResponseInputStream; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/entity/UploadResult.java similarity index 89% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/entity/UploadResult.java index 81a18e6..b6254e5 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/entity/UploadResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.entity; +package com.fuyuanshen.common.oss.entity; import lombok.Builder; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/enums/AccessPolicyType.java similarity index 96% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/enums/AccessPolicyType.java index 45b13be..7b267b3 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/enums/AccessPolicyType.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.enums; +package com.fuyuanshen.common.oss.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/exception/OssException.java similarity index 85% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/exception/OssException.java index 52e9623..4441af2 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/exception/OssException.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.exception; +package com.fuyuanshen.common.oss.exception; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/factory/OssFactory.java similarity index 79% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/factory/OssFactory.java index 3da1ba5..bbd6d52 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/factory/OssFactory.java @@ -1,15 +1,15 @@ -package org.dromara.common.oss.factory; +package com.fuyuanshen.common.oss.factory; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.exception.OssException; -import org.dromara.common.oss.properties.OssProperties; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.oss.constant.OssConstant; +import com.fuyuanshen.common.oss.core.OssClient; +import com.fuyuanshen.common.oss.exception.OssException; +import com.fuyuanshen.common.oss.properties.OssProperties; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/properties/OssProperties.java similarity index 94% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java rename to fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/properties/OssProperties.java index cb37206..ed147d5 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java +++ b/fys-common/fys-common-oss/src/main/java/com/fuyuanshen/common/oss/properties/OssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.oss.properties; +package com.fuyuanshen.common.oss.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/fys-common/fys-common-ratelimiter/pom.xml similarity index 58% rename from ruoyi-common/ruoyi-common-ratelimiter/pom.xml rename to fys-common/fys-common-ratelimiter/pom.xml index bbde940..36bf5f4 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml +++ b/fys-common/fys-common-ratelimiter/pom.xml @@ -3,27 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-ratelimiter + fys-common-ratelimiter - ruoyi-common-ratelimiter 限流功能 + fys-common-ratelimiter 限流功能 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/annotation/RateLimiter.java similarity index 88% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/annotation/RateLimiter.java index 79272d4..b9b939a 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java +++ b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/annotation/RateLimiter.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.annotation; +package com.fuyuanshen.common.ratelimiter.annotation; -import org.dromara.common.ratelimiter.enums.LimitType; +import com.fuyuanshen.common.ratelimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 88% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/RateLimiterAspect.java index 2d6d82e..b05f37d 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java +++ b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,19 +1,19 @@ -package org.dromara.common.ratelimiter.aspectj; +package com.fuyuanshen.common.ratelimiter.aspectj; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter; +import com.fuyuanshen.common.ratelimiter.enums.LimitType; +import com.fuyuanshen.common.redis.utils.RedisUtils; import org.redisson.api.RateType; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.context.expression.MethodBasedEvaluationContext; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/config/RateLimiterConfig.java similarity index 78% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/config/RateLimiterConfig.java index 4b7e5b7..8dfda68 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java +++ b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/config/RateLimiterConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.config; +package com.fuyuanshen.common.ratelimiter.config; -import org.dromara.common.ratelimiter.aspectj.RateLimiterAspect; +import com.fuyuanshen.common.ratelimiter.aspectj.RateLimiterAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/enums/LimitType.java similarity index 79% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/enums/LimitType.java index b7f059f..9eb7c44 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java +++ b/fys-common/fys-common-ratelimiter/src/main/java/com/fuyuanshen/common/ratelimiter/enums/LimitType.java @@ -1,9 +1,9 @@ -package org.dromara.common.ratelimiter.enums; +package com.fuyuanshen.common.ratelimiter.enums; /** * 限流类型 * - * @author ruoyi + * @author fys */ public enum LimitType { diff --git a/fys-common/fys-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..7a4e8f2 --- /dev/null +++ b/fys-common/fys-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.ratelimiter.config.RateLimiterConfig diff --git a/fys-common/fys-common-ratelimiter/src/main/resources/spel-extension.json b/fys-common/fys-common-ratelimiter/src/main/resources/spel-extension.json new file mode 100644 index 0000000..25b6d22 --- /dev/null +++ b/fys-common/fys-common-ratelimiter/src/main/resources/spel-extension.json @@ -0,0 +1,7 @@ +{ + "com.fuyuanshen.common.ratelimiter.annotation.RateLimiter@key": { + "method": { + "parameters": true + } + } +} diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/fys-common/fys-common-redis/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to fys-common/fys-common-redis/pom.xml index d7d99ca..d00dbff 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/fys-common/fys-common-redis/pom.xml @@ -3,23 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-redis + fys-common-redis - ruoyi-common-redis 缓存服务 + fys-common-redis 缓存服务 - + - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/CacheConfig.java similarity index 90% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/CacheConfig.java index d57ba4e..1deccbc 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/CacheConfig.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.config; +package com.fuyuanshen.common.redis.config; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.dromara.common.redis.manager.PlusSpringCacheManager; +import com.fuyuanshen.common.redis.manager.PlusSpringCacheManager; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/RedisConfig.java similarity index 95% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/RedisConfig.java index 7ba9475..e5cdf78 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/RedisConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config; +package com.fuyuanshen.common.redis.config; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -9,10 +9,10 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.redis.handler.RedisExceptionHandler; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.redis.config.properties.RedissonProperties; +import com.fuyuanshen.common.redis.handler.KeyPrefixHandler; +import com.fuyuanshen.common.redis.handler.RedisExceptionHandler; import org.redisson.client.codec.StringCodec; import org.redisson.codec.CompositeCodec; import org.redisson.codec.TypedJsonJacksonCodec; @@ -135,7 +135,7 @@ public class RedisConfig { * # 集群配置 * clusterServersConfig: * # 客户端名称 - * clientName: ${ruoyi.name} + * clientName: ${fys.name} * # master最小空闲连接数 * masterConnectionMinimumIdleSize: 32 * # master连接池大小 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/properties/RedissonProperties.java similarity index 97% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/properties/RedissonProperties.java index ebec786..f1237d1 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config.properties; +package com.fuyuanshen.common.redis.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/handler/KeyPrefixHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/handler/KeyPrefixHandler.java index 3bf3e34..45d8142 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.handler; +package com.fuyuanshen.common.redis.handler; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/handler/RedisExceptionHandler.java similarity index 90% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/handler/RedisExceptionHandler.java index 5e904f3..066723a 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/handler/RedisExceptionHandler.java @@ -1,10 +1,10 @@ -package org.dromara.common.redis.handler; +package com.fuyuanshen.common.redis.handler; import cn.hutool.http.HttpStatus; import com.baomidou.lock.exception.LockFailureException; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.fuyuanshen.common.core.domain.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/manager/CaffeineCacheDecorator.java similarity index 95% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/manager/CaffeineCacheDecorator.java index 8662c53..7204c5f 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/manager/CaffeineCacheDecorator.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.manager; +package com.fuyuanshen.common.redis.manager; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; import org.springframework.cache.Cache; import java.util.concurrent.Callable; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/manager/PlusSpringCacheManager.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/manager/PlusSpringCacheManager.java index 8428ef7..617b461 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.common.redis.manager; +package com.fuyuanshen.common.redis.manager; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/CacheUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/CacheUtils.java index 865ffa5..eb6bf29 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/CacheUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.fuyuanshen.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/QueueUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/QueueUtils.java index 7c09e31..e0c6018 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/QueueUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.fuyuanshen.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; import org.redisson.api.*; import java.util.concurrent.CompletionStage; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/RedisUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/RedisUtils.java index 355cd29..bb7ba81 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/RedisUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package com.fuyuanshen.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; import org.redisson.api.*; import org.redisson.api.options.KeysScanOptions; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/SequenceUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java rename to fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/SequenceUtils.java index 657dbbc..3c49a10 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java +++ b/fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/SequenceUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.redis.utils; +package com.fuyuanshen.common.redis.utils; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import org.redisson.api.RIdGenerator; import org.redisson.api.RedissonClient; diff --git a/fys-common/fys-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8bea8d5 --- /dev/null +++ b/fys-common/fys-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.fuyuanshen.common.redis.config.RedisConfig +com.fuyuanshen.common.redis.config.CacheConfig diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/fys-common/fys-common-satoken/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-satoken/pom.xml rename to fys-common/fys-common-satoken/pom.xml index 4df7d4d..b962e34 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/fys-common/fys-common-satoken/pom.xml @@ -3,25 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-satoken + fys-common-satoken - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core - + - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/config/SaTokenConfig.java similarity index 78% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java rename to fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/config/SaTokenConfig.java index 61c6b9a..7b29c94 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java +++ b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/config/SaTokenConfig.java @@ -1,13 +1,13 @@ -package org.dromara.common.satoken.config; +package com.fuyuanshen.common.satoken.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; -import org.dromara.common.satoken.core.service.SaPermissionImpl; -import org.dromara.common.satoken.handler.SaTokenExceptionHandler; +import com.fuyuanshen.common.core.factory.YmlPropertySourceFactory; +import com.fuyuanshen.common.satoken.core.dao.PlusSaTokenDao; +import com.fuyuanshen.common.satoken.core.service.SaPermissionImpl; +import com.fuyuanshen.common.satoken.handler.SaTokenExceptionHandler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/core/dao/PlusSaTokenDao.java similarity index 98% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java rename to fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/core/dao/PlusSaTokenDao.java index 46c61c4..d8d33d2 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java +++ b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/core/dao/PlusSaTokenDao.java @@ -1,10 +1,10 @@ -package org.dromara.common.satoken.core.dao; +package com.fuyuanshen.common.satoken.core.dao; import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject; import cn.dev33.satoken.util.SaFoxUtil; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/core/service/SaPermissionImpl.java similarity index 84% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java rename to fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/core/service/SaPermissionImpl.java index e57d1fb..fc1b051 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/core/service/SaPermissionImpl.java @@ -1,14 +1,14 @@ -package org.dromara.common.satoken.core.service; +package com.fuyuanshen.common.satoken.core.service; import cn.dev33.satoken.stp.StpInterface; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.PermissionService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.enums.UserType; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.PermissionService; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/handler/SaTokenExceptionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java rename to fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/handler/SaTokenExceptionHandler.java index a45af89..e874085 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java +++ b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/handler/SaTokenExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.handler; +package com.fuyuanshen.common.satoken.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -6,7 +6,7 @@ import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.fuyuanshen.common.core.domain.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/utils/LoginHelper.java similarity index 95% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java rename to fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/utils/LoginHelper.java index 7a2b9fc..e11ee81 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/fys-common/fys-common-satoken/src/main/java/com/fuyuanshen/common/satoken/utils/LoginHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.utils; +package com.fuyuanshen.common.satoken.utils; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; @@ -8,10 +8,10 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.enums.UserType; import java.util.Set; diff --git a/fys-common/fys-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..24418ce --- /dev/null +++ b/fys-common/fys-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.satoken.config.SaTokenConfig diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml b/fys-common/fys-common-satoken/src/main/resources/common-satoken.yml similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml rename to fys-common/fys-common-satoken/src/main/resources/common-satoken.yml diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/fys-common/fys-common-security/pom.xml similarity index 64% rename from ruoyi-common/ruoyi-common-sensitive/pom.xml rename to fys-common/fys-common-security/pom.xml index fecdf09..cd36c4a 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/fys-common/fys-common-security/pom.xml @@ -3,23 +3,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-sensitive + fys-common-security - ruoyi-common-sensitive 脱敏模块 + fys-common-security 安全模块 - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-satoken + diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/config/SecurityConfig.java similarity index 89% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java rename to fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/config/SecurityConfig.java index 21f2c11..6cf3bdd 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.config; +package com.fuyuanshen.common.security.config; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.filter.SaServletFilter; @@ -10,13 +10,13 @@ import cn.dev33.satoken.util.SaResult; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.HttpStatus; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.security.config.properties.SecurityProperties; -import org.dromara.common.security.handler.AllUrlHandler; +import com.fuyuanshen.common.core.constant.HttpStatus; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.security.config.properties.SecurityProperties; +import com.fuyuanshen.common.security.handler.AllUrlHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java b/fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/config/properties/SecurityProperties.java similarity index 84% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java rename to fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/config/properties/SecurityProperties.java index be1cc6e..9990dfe 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java +++ b/fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.config.properties; +package com.fuyuanshen.common.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/handler/AllUrlHandler.java similarity index 92% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java rename to fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/handler/AllUrlHandler.java index a0c6ada..8267c90 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java +++ b/fys-common/fys-common-security/src/main/java/com/fuyuanshen/common/security/handler/AllUrlHandler.java @@ -1,7 +1,7 @@ -package org.dromara.common.security.handler; +package com.fuyuanshen.common.security.handler; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.method.HandlerMethod; diff --git a/fys-common/fys-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..5af51de --- /dev/null +++ b/fys-common/fys-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.fuyuanshen.common.security.handler.AllUrlHandler +com.fuyuanshen.common.security.config.SecurityConfig diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/fys-common/fys-common-sensitive/pom.xml similarity index 64% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to fys-common/fys-common-sensitive/pom.xml index 5b39df2..d350b98 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/fys-common/fys-common-sensitive/pom.xml @@ -3,24 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-security + fys-common-sensitive - ruoyi-common-security 安全模块 + fys-common-sensitive 脱敏模块 - org.dromara - ruoyi-common-satoken + com.fuyuanshen + fys-common-json - diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/annotation/Sensitive.java similarity index 80% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java rename to fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/annotation/Sensitive.java index e75dc5b..89b89f7 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java +++ b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package org.dromara.common.sensitive.annotation; +package com.fuyuanshen.common.sensitive.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.sensitive.handler.SensitiveHandler; +import com.fuyuanshen.common.sensitive.core.SensitiveStrategy; +import com.fuyuanshen.common.sensitive.handler.SensitiveHandler; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/core/SensitiveService.java similarity index 85% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java rename to fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/core/SensitiveService.java index 03a7f9c..5f7998a 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java +++ b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/core/SensitiveService.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package com.fuyuanshen.common.sensitive.core; /** * 脱敏服务 diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/core/SensitiveStrategy.java similarity index 97% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java rename to fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/core/SensitiveStrategy.java index 7af5cee..92c5342 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java +++ b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/core/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package com.fuyuanshen.common.sensitive.core; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/handler/SensitiveHandler.java similarity index 87% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java rename to fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/handler/SensitiveHandler.java index d454724..bedae7e 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java +++ b/fys-common/fys-common-sensitive/src/main/java/com/fuyuanshen/common/sensitive/handler/SensitiveHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.handler; +package com.fuyuanshen.common.sensitive.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.sensitive.annotation.Sensitive; +import com.fuyuanshen.common.sensitive.core.SensitiveService; +import com.fuyuanshen.common.sensitive.core.SensitiveStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/fys-common/fys-common-sms/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-sms/pom.xml rename to fys-common/fys-common-sms/pom.xml index 932cb9d..475d811 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/fys-common/fys-common-sms/pom.xml @@ -3,16 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-sms + fys-common-sms - ruoyi-common-sms 短信模块 + fys-common-sms 短信模块 @@ -22,10 +22,10 @@ sms4j-spring-boot-starter - + - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/config/SmsAutoConfiguration.java similarity index 81% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java rename to fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/config/SmsAutoConfiguration.java index 3a39cc2..4c40421 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java +++ b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/config/SmsAutoConfiguration.java @@ -1,7 +1,7 @@ -package org.dromara.common.sms.config; +package com.fuyuanshen.common.sms.config; -import org.dromara.common.sms.core.dao.PlusSmsDao; -import org.dromara.common.sms.handler.SmsExceptionHandler; +import com.fuyuanshen.common.sms.core.dao.PlusSmsDao; +import com.fuyuanshen.common.sms.handler.SmsExceptionHandler; import org.dromara.sms4j.api.dao.SmsDao; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/core/dao/PlusSmsDao.java similarity index 90% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java rename to fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/core/dao/PlusSmsDao.java index a757655..5817e5b 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java +++ b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/core/dao/PlusSmsDao.java @@ -1,7 +1,7 @@ -package org.dromara.common.sms.core.dao; +package com.fuyuanshen.common.sms.core.dao; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.redis.utils.RedisUtils; import org.dromara.sms4j.api.dao.SmsDao; import java.time.Duration; diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/handler/SmsExceptionHandler.java similarity index 90% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java rename to fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/handler/SmsExceptionHandler.java index 2c619a3..bedb1c5 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java +++ b/fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/handler/SmsExceptionHandler.java @@ -1,9 +1,9 @@ -package org.dromara.common.sms.handler; +package com.fuyuanshen.common.sms.handler; import cn.hutool.http.HttpStatus; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; +import com.fuyuanshen.common.core.domain.R; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/fys-common/fys-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3ef8270 --- /dev/null +++ b/fys-common/fys-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.sms.config.SmsAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/fys-common/fys-common-social/pom.xml similarity index 64% rename from ruoyi-common/ruoyi-common-social/pom.xml rename to fys-common/fys-common-social/pom.xml index 9f9a965..a355095 100644 --- a/ruoyi-common/ruoyi-common-social/pom.xml +++ b/fys-common/fys-common-social/pom.xml @@ -3,16 +3,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-social + fys-common-social - ruoyi-common-social 授权认证 + fys-common-social 授权认证 @@ -22,13 +22,13 @@ - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/SocialAutoConfiguration.java similarity index 74% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/SocialAutoConfiguration.java index 19b39d8..fdf5ae9 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/SocialAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.social.config; +package com.fuyuanshen.common.social.config; import me.zhyd.oauth.cache.AuthStateCache; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.utils.AuthRedisStateCache; +import com.fuyuanshen.common.social.config.properties.SocialProperties; +import com.fuyuanshen.common.social.utils.AuthRedisStateCache; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/properties/SocialLoginConfigProperties.java similarity index 94% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/properties/SocialLoginConfigProperties.java index 5f49d9c..38ea9f5 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/properties/SocialLoginConfigProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.config.properties; +package com.fuyuanshen.common.social.config.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/properties/SocialProperties.java similarity index 88% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/properties/SocialProperties.java index 1487a6a..e9eb58e 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/config/properties/SocialProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.config.properties; +package com.fuyuanshen.common.social.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/gitea/AuthGiteaRequest.java similarity index 95% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/gitea/AuthGiteaRequest.java index d3fc751..93f5b4c 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/gitea/AuthGiteaRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.gitea; +package com.fuyuanshen.common.social.gitea; import cn.hutool.core.lang.Dict; import cn.hutool.http.HttpRequest; @@ -11,8 +11,8 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; /** * @author lcry diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/gitea/AuthGiteaSource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/gitea/AuthGiteaSource.java index 201b223..9528374 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/gitea/AuthGiteaSource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.gitea; +package com.fuyuanshen.common.social.gitea; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/maxkey/AuthMaxKeyRequest.java similarity index 94% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/maxkey/AuthMaxKeyRequest.java index 97774ac..685b48c 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/maxkey/AuthMaxKeyRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.maxkey; +package com.fuyuanshen.common.social.maxkey; import cn.hutool.core.lang.Dict; import me.zhyd.oauth.cache.AuthStateCache; @@ -8,8 +8,8 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; /** * @author 长春叭哥 2023年03月26日 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/maxkey/AuthMaxKeySource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/maxkey/AuthMaxKeySource.java index 1ff57f7..2f36f94 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/maxkey/AuthMaxKeySource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.maxkey; +package com.fuyuanshen.common.social.maxkey; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/topiam/AuthTopIamRequest.java similarity index 94% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/topiam/AuthTopIamRequest.java index 080c97a..b7d70d6 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/topiam/AuthTopIamRequest.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.topiam; +package com.fuyuanshen.common.social.topiam; import cn.hutool.core.codec.Base64; import cn.hutool.core.lang.Dict; @@ -16,10 +16,10 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthDefaultRequest; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; -import static org.dromara.common.social.topiam.AuthTopIamSource.TOPIAM; +import static com.fuyuanshen.common.social.topiam.AuthTopIamSource.TOPIAM; /** * TopIAM 认证请求 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/topiam/AuthTopIamSource.java similarity index 96% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/topiam/AuthTopIamSource.java index 852d7f5..b681ef2 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/topiam/AuthTopIamSource.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.topiam; +package com.fuyuanshen.common.social.topiam; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.request.AuthDefaultRequest; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/utils/AuthRedisStateCache.java similarity index 90% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/utils/AuthRedisStateCache.java index 0b6ec20..293c753 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/utils/AuthRedisStateCache.java @@ -1,9 +1,9 @@ -package org.dromara.common.social.utils; +package com.fuyuanshen.common.social.utils; import lombok.AllArgsConstructor; import me.zhyd.oauth.cache.AuthStateCache; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.redis.utils.RedisUtils; import java.time.Duration; diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/utils/SocialUtils.java similarity index 90% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java rename to fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/utils/SocialUtils.java index 3f7924d..4c53626 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java +++ b/fys-common/fys-common-social/src/main/java/com/fuyuanshen/common/social/utils/SocialUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.social.utils; +package com.fuyuanshen.common.social.utils; import cn.hutool.core.util.ObjectUtil; import me.zhyd.oauth.config.AuthConfig; @@ -7,12 +7,12 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.*; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.social.config.properties.SocialLoginConfigProperties; -import org.dromara.common.social.config.properties.SocialProperties; -import org.dromara.common.social.gitea.AuthGiteaRequest; -import org.dromara.common.social.maxkey.AuthMaxKeyRequest; -import org.dromara.common.social.topiam.AuthTopIamRequest; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.social.config.properties.SocialLoginConfigProperties; +import com.fuyuanshen.common.social.config.properties.SocialProperties; +import com.fuyuanshen.common.social.gitea.AuthGiteaRequest; +import com.fuyuanshen.common.social.maxkey.AuthMaxKeyRequest; +import com.fuyuanshen.common.social.topiam.AuthTopIamRequest; /** * 认证授权工具类 diff --git a/fys-common/fys-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..bc37c77 --- /dev/null +++ b/fys-common/fys-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.social.config.SocialAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-sse/pom.xml b/fys-common/fys-common-sse/pom.xml similarity index 52% rename from ruoyi-common/ruoyi-common-sse/pom.xml rename to fys-common/fys-common-sse/pom.xml index ae44c98..26d9fdf 100644 --- a/ruoyi-common/ruoyi-common-sse/pom.xml +++ b/fys-common/fys-common-sse/pom.xml @@ -3,34 +3,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-sse + fys-common-sse - ruoyi-common-sse 模块 + fys-common-sse 模块 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis - org.dromara - ruoyi-common-satoken + com.fuyuanshen + fys-common-satoken - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/config/SseAutoConfiguration.java similarity index 79% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/config/SseAutoConfiguration.java index 0cf8054..bb77e70 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/config/SseAutoConfiguration.java @@ -1,8 +1,8 @@ -package org.dromara.common.sse.config; +package com.fuyuanshen.common.sse.config; -import org.dromara.common.sse.controller.SseController; -import org.dromara.common.sse.core.SseEmitterManager; -import org.dromara.common.sse.listener.SseTopicListener; +import com.fuyuanshen.common.sse.controller.SseController; +import com.fuyuanshen.common.sse.core.SseEmitterManager; +import com.fuyuanshen.common.sse.listener.SseTopicListener; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/config/SseProperties.java similarity index 87% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/config/SseProperties.java index ce4e173..2c126dd 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/config/SseProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.sse.config; +package com.fuyuanshen.common.sse.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/controller/SseController.java similarity index 90% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/controller/SseController.java index 412834c..b7df6da 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/controller/SseController.java @@ -1,12 +1,12 @@ -package org.dromara.common.sse.controller; +package com.fuyuanshen.common.sse.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sse.core.SseEmitterManager; -import org.dromara.common.sse.dto.SseMessageDto; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.sse.core.SseEmitterManager; +import com.fuyuanshen.common.sse.dto.SseMessageDto; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.MediaType; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/core/SseEmitterManager.java similarity index 97% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/core/SseEmitterManager.java index cb94428..6145f16 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/core/SseEmitterManager.java @@ -1,9 +1,9 @@ -package org.dromara.common.sse.core; +package com.fuyuanshen.common.sse.core; import cn.hutool.core.map.MapUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.sse.dto.SseMessageDto; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.sse.dto.SseMessageDto; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import java.io.IOException; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/dto/SseMessageDto.java similarity index 91% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/dto/SseMessageDto.java index a2e1210..70943ba 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/dto/SseMessageDto.java @@ -1,4 +1,4 @@ -package org.dromara.common.sse.dto; +package com.fuyuanshen.common.sse.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/listener/SseTopicListener.java similarity index 93% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/listener/SseTopicListener.java index 7a4dff1..c8aa24f 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/listener/SseTopicListener.java @@ -1,8 +1,8 @@ -package org.dromara.common.sse.listener; +package com.fuyuanshen.common.sse.listener; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.sse.core.SseEmitterManager; +import com.fuyuanshen.common.sse.core.SseEmitterManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/utils/SseMessageUtils.java similarity index 89% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java rename to fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/utils/SseMessageUtils.java index ce3aad4..f315085 100644 --- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java +++ b/fys-common/fys-common-sse/src/main/java/com/fuyuanshen/common/sse/utils/SseMessageUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.sse.utils; +package com.fuyuanshen.common.sse.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.sse.core.SseEmitterManager; -import org.dromara.common.sse.dto.SseMessageDto; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.sse.core.SseEmitterManager; +import com.fuyuanshen.common.sse.dto.SseMessageDto; /** * SSE工具类 diff --git a/fys-common/fys-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d7342af --- /dev/null +++ b/fys-common/fys-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.sse.config.SseAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-tenant/pom.xml b/fys-common/fys-common-tenant/pom.xml similarity index 60% rename from ruoyi-common/ruoyi-common-tenant/pom.xml rename to fys-common/fys-common-tenant/pom.xml index 8e1a6ab..eaa9029 100644 --- a/ruoyi-common/ruoyi-common-tenant/pom.xml +++ b/fys-common/fys-common-tenant/pom.xml @@ -3,28 +3,28 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-tenant + fys-common-tenant - ruoyi-common-tenant 租户模块 + fys-common-tenant 租户模块 - org.dromara - ruoyi-common-mybatis + com.fuyuanshen + fys-common-mybatis true - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/config/TenantConfig.java similarity index 83% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/config/TenantConfig.java index 3767fa2..422753e 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/config/TenantConfig.java @@ -1,16 +1,16 @@ -package org.dromara.common.tenant.config; +package com.fuyuanshen.common.tenant.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.redis.config.RedisConfig; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.tenant.core.TenantSaTokenDao; -import org.dromara.common.tenant.handle.PlusTenantLineHandler; -import org.dromara.common.tenant.handle.TenantKeyPrefixHandler; -import org.dromara.common.tenant.manager.TenantSpringCacheManager; -import org.dromara.common.tenant.properties.TenantProperties; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.redis.config.RedisConfig; +import com.fuyuanshen.common.redis.config.properties.RedissonProperties; +import com.fuyuanshen.common.tenant.core.TenantSaTokenDao; +import com.fuyuanshen.common.tenant.handle.PlusTenantLineHandler; +import com.fuyuanshen.common.tenant.handle.TenantKeyPrefixHandler; +import com.fuyuanshen.common.tenant.manager.TenantSpringCacheManager; +import com.fuyuanshen.common.tenant.properties.TenantProperties; import org.redisson.config.ClusterServersConfig; import org.redisson.config.SingleServerConfig; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/core/TenantEntity.java similarity index 71% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/core/TenantEntity.java index 8ad0d2c..7d9a48d 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/core/TenantEntity.java @@ -1,6 +1,6 @@ -package org.dromara.common.tenant.core; +package com.fuyuanshen.common.tenant.core; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/core/TenantSaTokenDao.java similarity index 95% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/core/TenantSaTokenDao.java index 9aaa753..526425f 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/core/TenantSaTokenDao.java @@ -1,8 +1,8 @@ -package org.dromara.common.tenant.core; +package com.fuyuanshen.common.tenant.core; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.core.dao.PlusSaTokenDao; import java.time.Duration; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/exception/TenantException.java similarity index 73% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/exception/TenantException.java index ee2bc97..b7c68a3 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/exception/TenantException.java @@ -1,6 +1,6 @@ -package org.dromara.common.tenant.exception; +package com.fuyuanshen.common.tenant.exception; -import org.dromara.common.core.exception.base.BaseException; +import com.fuyuanshen.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/handle/PlusTenantLineHandler.java similarity index 87% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/handle/PlusTenantLineHandler.java index d518bec..5d410a3 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/handle/PlusTenantLineHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.handle; +package com.fuyuanshen.common.tenant.handle; import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; @@ -7,9 +7,9 @@ import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.NullValue; import net.sf.jsqlparser.expression.StringValue; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.tenant.properties.TenantProperties; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.tenant.properties.TenantProperties; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/handle/TenantKeyPrefixHandler.java similarity index 89% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/handle/TenantKeyPrefixHandler.java index dcdef6e..295ae9d 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/handle/TenantKeyPrefixHandler.java @@ -1,11 +1,11 @@ -package org.dromara.common.tenant.handle; +package com.fuyuanshen.common.tenant.handle; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.redis.handler.KeyPrefixHandler; +import com.fuyuanshen.common.tenant.helper.TenantHelper; /** * 多租户redis缓存key前缀处理 diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/helper/TenantHelper.java similarity index 94% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/helper/TenantHelper.java index 4b6981a..5d49291 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/helper/TenantHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.helper; +package com.fuyuanshen.common.tenant.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import java.util.Stack; import java.util.function.Supplier; diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/manager/TenantSpringCacheManager.java similarity index 78% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/manager/TenantSpringCacheManager.java index 346e36f..f0f9183 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/manager/TenantSpringCacheManager.java @@ -1,11 +1,11 @@ -package org.dromara.common.tenant.manager; +package com.fuyuanshen.common.tenant.manager; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.manager.PlusSpringCacheManager; -import org.dromara.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.core.constant.GlobalConstants; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.redis.manager.PlusSpringCacheManager; +import com.fuyuanshen.common.tenant.helper.TenantHelper; import org.springframework.cache.Cache; /** diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/properties/TenantProperties.java similarity index 88% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java rename to fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/properties/TenantProperties.java index 1675ccf..2427899 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java +++ b/fys-common/fys-common-tenant/src/main/java/com/fuyuanshen/common/tenant/properties/TenantProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.tenant.properties; +package com.fuyuanshen.common.tenant.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/fys-common/fys-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..998a027 --- /dev/null +++ b/fys-common/fys-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.tenant.config.TenantConfig diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/fys-common/fys-common-translation/pom.xml similarity index 63% rename from ruoyi-common/ruoyi-common-translation/pom.xml rename to fys-common/fys-common-translation/pom.xml index e77b868..aa0c53e 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/fys-common/fys-common-translation/pom.xml @@ -3,23 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-translation + fys-common-translation - ruoyi-common-translation 通用翻译功能 + fys-common-translation 通用翻译功能 - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/annotation/Translation.java similarity index 87% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/annotation/Translation.java index c24aa6f..e294a66 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/annotation/Translation.java @@ -1,8 +1,8 @@ -package org.dromara.common.translation.annotation; +package com.fuyuanshen.common.translation.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.translation.core.handler.TranslationHandler; +import com.fuyuanshen.common.translation.core.handler.TranslationHandler; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/annotation/TranslationType.java similarity index 72% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/annotation/TranslationType.java index 43bfab0..a0772e9 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/annotation/TranslationType.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.annotation; +package com.fuyuanshen.common.translation.annotation; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.translation.core.TranslationInterface; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/config/TranslationConfig.java similarity index 80% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/config/TranslationConfig.java index 5dcd0c1..043ec5a 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/config/TranslationConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.config; +package com.fuyuanshen.common.translation.config; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.core.TranslationInterface; -import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier; -import org.dromara.common.translation.core.handler.TranslationHandler; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.translation.core.handler.TranslationBeanSerializerModifier; +import com.fuyuanshen.common.translation.core.handler.TranslationHandler; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/constant/TransConstant.java similarity index 91% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/constant/TransConstant.java index c084ea1..7645294 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/constant/TransConstant.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.constant; +package com.fuyuanshen.common.translation.constant; /** * 翻译常量 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/TranslationInterface.java similarity index 75% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/TranslationInterface.java index e4d6dd3..4c55db7 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/TranslationInterface.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.core; +package com.fuyuanshen.common.translation.core; -import org.dromara.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.annotation.TranslationType; /** * 翻译接口 (实现类需标注 {@link TranslationType} 注解标明翻译类型) diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 94% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/handler/TranslationBeanSerializerModifier.java index 727672f..501f506 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/handler/TranslationBeanSerializerModifier.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package com.fuyuanshen.common.translation.core.handler; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/handler/TranslationHandler.java similarity index 87% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/handler/TranslationHandler.java index a90f1e1..efc68af 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/handler/TranslationHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package com.fuyuanshen.common.translation.core.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.reflect.ReflectUtils; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.core.TranslationInterface; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/DeptNameTranslationImpl.java similarity index 66% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/DeptNameTranslationImpl.java index c391437..966002a 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/DeptNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.fuyuanshen.common.translation.core.impl; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.core.service.DeptService; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/DictTypeTranslationImpl.java similarity index 60% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/DictTypeTranslationImpl.java index 859a93e..04b6bd9 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/DictTypeTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package com.fuyuanshen.common.translation.core.impl; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/NicknameTranslationImpl.java similarity index 66% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/NicknameTranslationImpl.java index b92c7f0..17b49d0 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/NicknameTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package com.fuyuanshen.common.translation.core.impl; import lombok.AllArgsConstructor; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.core.service.UserService; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.common.translation.core.TranslationInterface; /** * 用户名称翻译实现 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/OssUrlTranslationImpl.java similarity index 65% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/OssUrlTranslationImpl.java index fc6f6df..48ebcc1 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/OssUrlTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.fuyuanshen.common.translation.core.impl; -import org.dromara.common.core.service.OssService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.core.service.OssService; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/UserNameTranslationImpl.java similarity index 61% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java rename to fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/UserNameTranslationImpl.java index 96f1cd3..c6dbfa7 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java +++ b/fys-common/fys-common-translation/src/main/java/com/fuyuanshen/common/translation/core/impl/UserNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package com.fuyuanshen.common.translation.core.impl; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import com.fuyuanshen.common.core.service.UserService; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.common.translation.core.TranslationInterface; import lombok.AllArgsConstructor; /** diff --git a/fys-common/fys-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f5b08b6 --- /dev/null +++ b/fys-common/fys-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.fuyuanshen.common.translation.config.TranslationConfig +com.fuyuanshen.common.translation.core.impl.DeptNameTranslationImpl +com.fuyuanshen.common.translation.core.impl.DictTypeTranslationImpl +com.fuyuanshen.common.translation.core.impl.OssUrlTranslationImpl +com.fuyuanshen.common.translation.core.impl.UserNameTranslationImpl +com.fuyuanshen.common.translation.core.impl.NicknameTranslationImpl diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/fys-common/fys-common-web/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-web/pom.xml rename to fys-common/fys-common-web/pom.xml index b250fa9..2348e8d 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/fys-common/fys-common-web/pom.xml @@ -3,27 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-web + fys-common-web - ruoyi-common-web web服务 + fys-common-web web服务 - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/CaptchaConfig.java similarity index 93% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/CaptchaConfig.java index 650517e..69c1e49 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/CaptchaConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.config; +package com.fuyuanshen.common.web.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.LineCaptcha; import cn.hutool.captcha.ShearCaptcha; -import org.dromara.common.web.config.properties.CaptchaProperties; +import com.fuyuanshen.common.web.config.properties.CaptchaProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/FilterConfig.java similarity index 87% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/FilterConfig.java index 32d61df..529d840 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/FilterConfig.java @@ -1,9 +1,9 @@ -package org.dromara.common.web.config; +package com.fuyuanshen.common.web.config; import jakarta.servlet.DispatcherType; -import org.dromara.common.web.config.properties.XssProperties; -import org.dromara.common.web.filter.RepeatableFilter; -import org.dromara.common.web.filter.XssFilter; +import com.fuyuanshen.common.web.config.properties.XssProperties; +import com.fuyuanshen.common.web.filter.RepeatableFilter; +import com.fuyuanshen.common.web.filter.XssFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/I18nConfig.java similarity index 83% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/I18nConfig.java index 4e212cb..b8e3c6f 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/I18nConfig.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.config; +package com.fuyuanshen.common.web.config; -import org.dromara.common.web.core.I18nLocaleResolver; +import com.fuyuanshen.common.web.core.I18nLocaleResolver; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java similarity index 91% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java index 1371913..0a0ae28 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/ResourcesConfig.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.config; +package com.fuyuanshen.common.web.config; -import org.dromara.common.web.handler.GlobalExceptionHandler; -import org.dromara.common.web.interceptor.PlusWebInvokeTimeInterceptor; +import com.fuyuanshen.common.web.handler.GlobalExceptionHandler; +import com.fuyuanshen.common.web.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.web.cors.CorsConfiguration; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/UndertowConfig.java similarity index 96% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/UndertowConfig.java index 84f88ff..3826598 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/UndertowConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.config; +package com.fuyuanshen.common.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.server.handlers.DisallowedMethodsHandler; import io.undertow.util.HttpString; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; -import org.dromara.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/properties/CaptchaProperties.java similarity index 78% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/properties/CaptchaProperties.java index bfc52f4..064d2d1 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.config.properties; +package com.fuyuanshen.common.web.config.properties; -import org.dromara.common.web.enums.CaptchaCategory; -import org.dromara.common.web.enums.CaptchaType; +import com.fuyuanshen.common.web.enums.CaptchaCategory; +import com.fuyuanshen.common.web.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/properties/XssProperties.java similarity index 89% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/properties/XssProperties.java index bd3e59b..c01228b 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.config.properties; +package com.fuyuanshen.common.web.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/core/BaseController.java similarity index 82% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/core/BaseController.java index fd01dda..d861e14 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/core/BaseController.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.core; +package com.fuyuanshen.common.web.core; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.StringUtils; /** * web层通用数据处理 diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/core/I18nLocaleResolver.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/core/I18nLocaleResolver.java index 98ddd06..49cf679 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/core/I18nLocaleResolver.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.core; +package com.fuyuanshen.common.web.core; import org.springframework.web.servlet.LocaleResolver; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/enums/CaptchaCategory.java similarity index 93% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/enums/CaptchaCategory.java index ecf2658..2edcfe0 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.enums; +package com.fuyuanshen.common.web.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/enums/CaptchaType.java similarity index 81% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/enums/CaptchaType.java index d0b7334..8729666 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package org.dromara.common.web.enums; +package com.fuyuanshen.common.web.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import org.dromara.common.web.utils.UnsignedMathGenerator; +import com.fuyuanshen.common.web.utils.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/RepeatableFilter.java similarity index 90% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/RepeatableFilter.java index e0a3bf2..5acaf29 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.filter; +package com.fuyuanshen.common.web.filter; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import org.springframework.http.MediaType; import jakarta.servlet.*; @@ -10,7 +10,7 @@ import java.io.IOException; /** * Repeatable 过滤器 * - * @author ruoyi + * @author fys */ public class RepeatableFilter implements Filter { @Override diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/RepeatedlyRequestWrapper.java similarity index 94% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/RepeatedlyRequestWrapper.java index 8933225..b3ddf42 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.filter; +package com.fuyuanshen.common.web.filter; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.Constants; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; @@ -17,7 +17,7 @@ import java.io.InputStreamReader; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author fys */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { private final byte[] body; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/XssFilter.java similarity index 88% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/XssFilter.java index 95bcdd9..93d0bb1 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/XssFilter.java @@ -1,8 +1,8 @@ -package org.dromara.common.web.filter; +package com.fuyuanshen.common.web.filter; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.web.config.properties.XssProperties; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.web.config.properties.XssProperties; import org.springframework.http.HttpMethod; import jakarta.servlet.*; @@ -15,7 +15,7 @@ import java.util.List; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author fys */ public class XssFilter implements Filter { /** diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/XssHttpServletRequestWrapper.java similarity index 97% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/XssHttpServletRequestWrapper.java index 914e549..c65156f 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.filter; +package com.fuyuanshen.common.web.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; @@ -9,7 +9,7 @@ import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -22,7 +22,7 @@ import java.util.Map; /** * XSS过滤处理 * - * @author ruoyi + * @author fys */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { /** diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/handler/GlobalExceptionHandler.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/handler/GlobalExceptionHandler.java index 28aacbc..c69599a 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.handler; +package com.fuyuanshen.common.web.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; @@ -8,12 +8,12 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.SseException; -import org.dromara.common.core.exception.base.BaseException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.exception.SseException; +import com.fuyuanshen.common.core.exception.base.BaseException; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 93% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/interceptor/PlusWebInvokeTimeInterceptor.java index f256015..f2b02c1 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.interceptor; +package com.fuyuanshen.common.web.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; @@ -7,9 +7,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.web.filter.RepeatedlyRequestWrapper; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.web.filter.RepeatedlyRequestWrapper; import org.springframework.http.MediaType; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/utils/UnsignedMathGenerator.java similarity index 95% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java rename to fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/utils/UnsignedMathGenerator.java index a400cff..5193ae3 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java +++ b/fys-common/fys-common-web/src/main/java/com/fuyuanshen/common/web/utils/UnsignedMathGenerator.java @@ -1,10 +1,10 @@ -package org.dromara.common.web.utils; +package com.fuyuanshen.common.web.utils; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.math.Calculator; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import java.io.Serial; diff --git a/fys-common/fys-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ed21b59 --- /dev/null +++ b/fys-common/fys-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.fuyuanshen.common.web.config.CaptchaConfig +com.fuyuanshen.common.web.config.FilterConfig +com.fuyuanshen.common.web.config.I18nConfig +com.fuyuanshen.common.web.config.ResourcesConfig +com.fuyuanshen.common.web.config.UndertowConfig diff --git a/ruoyi-common/ruoyi-common-websocket/pom.xml b/fys-common/fys-common-websocket/pom.xml similarity index 64% rename from ruoyi-common/ruoyi-common-websocket/pom.xml rename to fys-common/fys-common-websocket/pom.xml index 0587cd7..c910a3c 100644 --- a/ruoyi-common/ruoyi-common-websocket/pom.xml +++ b/fys-common/fys-common-websocket/pom.xml @@ -3,34 +3,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-common + com.fuyuanshen + fys-common ${revision} 4.0.0 - ruoyi-common-websocket + fys-common-websocket - ruoyi-common-websocket 模块 + fys-common-websocket 模块 - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core - org.dromara - ruoyi-common-redis + com.fuyuanshen + fys-common-redis - org.dromara - ruoyi-common-satoken + com.fuyuanshen + fys-common-satoken - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json org.springframework.boot diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/config/WebSocketConfig.java similarity index 86% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/config/WebSocketConfig.java index ef5cfc9..c0b25a3 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/config/WebSocketConfig.java @@ -1,10 +1,10 @@ -package org.dromara.common.websocket.config; +package com.fuyuanshen.common.websocket.config; import cn.hutool.core.util.StrUtil; -import org.dromara.common.websocket.config.properties.WebSocketProperties; -import org.dromara.common.websocket.handler.PlusWebSocketHandler; -import org.dromara.common.websocket.interceptor.PlusWebSocketInterceptor; -import org.dromara.common.websocket.listener.WebSocketTopicListener; +import com.fuyuanshen.common.websocket.config.properties.WebSocketProperties; +import com.fuyuanshen.common.websocket.handler.PlusWebSocketHandler; +import com.fuyuanshen.common.websocket.interceptor.PlusWebSocketInterceptor; +import com.fuyuanshen.common.websocket.listener.WebSocketTopicListener; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/config/properties/WebSocketProperties.java similarity index 87% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/config/properties/WebSocketProperties.java index d629fe5..94daf46 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/config/properties/WebSocketProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.config.properties; +package com.fuyuanshen.common.websocket.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/constant/WebSocketConstants.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/constant/WebSocketConstants.java index e243279..dcbca55 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/constant/WebSocketConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.constant; +package com.fuyuanshen.common.websocket.constant; /** * websocket的常量配置 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/dto/WebSocketMessageDto.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/dto/WebSocketMessageDto.java index e2d4456..e49c394 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/dto/WebSocketMessageDto.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.dto; +package com.fuyuanshen.common.websocket.dto; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/handler/PlusWebSocketHandler.java similarity index 91% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/handler/PlusWebSocketHandler.java index 8b1cc5d..cd75d51 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/handler/PlusWebSocketHandler.java @@ -1,18 +1,18 @@ -package org.dromara.common.websocket.handler; +package com.fuyuanshen.common.websocket.handler; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.websocket.dto.WebSocketMessageDto; +import com.fuyuanshen.common.websocket.holder.WebSocketSessionHolder; +import com.fuyuanshen.common.websocket.utils.WebSocketUtils; import org.springframework.web.socket.*; import org.springframework.web.socket.handler.AbstractWebSocketHandler; import java.io.IOException; import java.util.List; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; +import static com.fuyuanshen.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; /** * WebSocketHandler 实现类 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/holder/WebSocketSessionHolder.java similarity index 97% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/holder/WebSocketSessionHolder.java index 9c2372b..1e496f7 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/holder/WebSocketSessionHolder.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.holder; +package com.fuyuanshen.common.websocket.holder; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/interceptor/PlusWebSocketInterceptor.java similarity index 88% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/interceptor/PlusWebSocketInterceptor.java index c70e377..745dcb9 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/interceptor/PlusWebSocketInterceptor.java @@ -1,12 +1,12 @@ -package org.dromara.common.websocket.interceptor; +package com.fuyuanshen.common.websocket.interceptor; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.WebSocketHandler; @@ -14,7 +14,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import java.util.Map; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; +import static com.fuyuanshen.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; /** * WebSocket握手请求的拦截器 diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/listener/WebSocketTopicListener.java similarity index 90% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/listener/WebSocketTopicListener.java index 0ad39af..8e6b1ea 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/listener/WebSocketTopicListener.java @@ -1,9 +1,9 @@ -package org.dromara.common.websocket.listener; +package com.fuyuanshen.common.websocket.listener; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.fuyuanshen.common.websocket.holder.WebSocketSessionHolder; +import com.fuyuanshen.common.websocket.utils.WebSocketUtils; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.Ordered; diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/utils/WebSocketUtils.java similarity index 92% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java rename to fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/utils/WebSocketUtils.java index 8c4170a..ad95ecc 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java +++ b/fys-common/fys-common-websocket/src/main/java/com/fuyuanshen/common/websocket/utils/WebSocketUtils.java @@ -1,12 +1,12 @@ -package org.dromara.common.websocket.utils; +package com.fuyuanshen.common.websocket.utils; import cn.hutool.core.collection.CollUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.websocket.dto.WebSocketMessageDto; +import com.fuyuanshen.common.websocket.holder.WebSocketSessionHolder; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketMessage; @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; +import static com.fuyuanshen.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; /** * 工具类 diff --git a/fys-common/fys-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/fys-common/fys-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..fc89236 --- /dev/null +++ b/fys-common/fys-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.fuyuanshen.common.websocket.config.WebSocketConfig diff --git a/fys-common/pom.xml b/fys-common/pom.xml new file mode 100644 index 0000000..3937152 --- /dev/null +++ b/fys-common/pom.xml @@ -0,0 +1,46 @@ + + + + fys-vue-plus + com.fuyuanshen + ${revision} + + 4.0.0 + + + fys-common-bom + fys-common-social + fys-common-core + fys-common-doc + fys-common-excel + fys-common-idempotent + fys-common-job + fys-common-log + fys-common-mail + fys-common-mybatis + fys-common-oss + fys-common-ratelimiter + fys-common-redis + fys-common-satoken + fys-common-security + fys-common-sms + fys-common-web + fys-common-translation + fys-common-sensitive + fys-common-json + fys-common-encrypt + fys-common-tenant + fys-common-websocket + fys-common-sse + + + fys-common + pom + + + common 通用模块 + + + diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/fys-extend/fys-monitor-admin/Dockerfile similarity index 83% rename from ruoyi-extend/ruoyi-monitor-admin/Dockerfile rename to fys-extend/fys-monitor-admin/Dockerfile index d55b956..f23943a 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile +++ b/fys-extend/fys-monitor-admin/Dockerfile @@ -5,15 +5,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/monitor/logs +RUN mkdir -p /fys/monitor/logs -WORKDIR /ruoyi/monitor +WORKDIR /fys/monitor ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE 9090 -ADD ./target/ruoyi-monitor-admin.jar ./app.jar +ADD ./target/fys-monitor-admin.jar ./app.jar SHELL ["/bin/bash", "-c"] diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/fys-extend/fys-monitor-admin/pom.xml similarity index 94% rename from ruoyi-extend/ruoyi-monitor-admin/pom.xml rename to fys-extend/fys-monitor-admin/pom.xml index 538ffbd..9597950 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/fys-extend/fys-monitor-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-extend - org.dromara + fys-extend + com.fuyuanshen ${revision} 4.0.0 jar - ruoyi-monitor-admin + fys-monitor-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/MonitorAdminApplication.java similarity index 91% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java rename to fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/MonitorAdminApplication.java index 0339ebb..eb64687 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java +++ b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/MonitorAdminApplication.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin; +package com.fuyuanshen.monitor.admin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/config/AdminServerConfig.java similarity index 95% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java rename to fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/config/AdminServerConfig.java index 53d248e..f6d8703 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java +++ b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/config/AdminServerConfig.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.config; +package com.fuyuanshen.monitor.admin.config; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/config/SecurityConfig.java similarity index 98% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java rename to fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/config/SecurityConfig.java index 3458cc9..0fd7ff1 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java +++ b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.config; +package com.fuyuanshen.monitor.admin.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/notifier/CustomNotifier.java similarity index 98% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java rename to fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/notifier/CustomNotifier.java index 838eefc..9f0dd02 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java +++ b/fys-extend/fys-monitor-admin/src/main/java/com/fuyuanshen/monitor/admin/notifier/CustomNotifier.java @@ -1,4 +1,4 @@ -package org.dromara.monitor.admin.notifier; +package com.fuyuanshen.monitor.admin.notifier; import de.codecentric.boot.admin.server.domain.entities.Instance; import de.codecentric.boot.admin.server.domain.entities.InstanceRepository; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/fys-extend/fys-monitor-admin/src/main/resources/application.yml similarity index 87% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml rename to fys-extend/fys-monitor-admin/src/main/resources/application.yml index 622c93d..8b09672 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/fys-extend/fys-monitor-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 9090 spring: application: - name: ruoyi-monitor-admin + name: fys-monitor-admin profiles: active: @profiles.active@ @@ -18,7 +18,7 @@ spring: boot: admin: ui: - title: RuoYi-Vue-Plus服务监控中心 + title: fys-Vue-Plus服务监控中心 context-path: /admin --- # Actuator 监控端点的配置项 @@ -31,7 +31,7 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/ruoyi-monitor-admin.log + external-file: ./logs/fys-monitor-admin.log --- # 监控配置 spring.boot.admin.client: diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/fys-extend/fys-monitor-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt rename to fys-extend/fys-monitor-admin/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml b/fys-extend/fys-monitor-admin/src/main/resources/logback-plus.xml similarity index 94% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml rename to fys-extend/fys-monitor-admin/src/main/resources/logback-plus.xml index 45cbbba..f9c97b8 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml +++ b/fys-extend/fys-monitor-admin/src/main/resources/logback-plus.xml @@ -2,7 +2,7 @@ logback - + diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/fys-extend/fys-snailjob-server/Dockerfile similarity index 83% rename from ruoyi-extend/ruoyi-snailjob-server/Dockerfile rename to fys-extend/fys-snailjob-server/Dockerfile index 6f4484d..ece289b 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile +++ b/fys-extend/fys-snailjob-server/Dockerfile @@ -5,16 +5,16 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/snailjob/logs +RUN mkdir -p /fys/snailjob/logs -WORKDIR /ruoyi/snailjob +WORKDIR /fys/snailjob ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" EXPOSE 8800 EXPOSE 17888 -ADD ./target/ruoyi-snailjob-server.jar ./app.jar +ADD ./target/fys-snailjob-server.jar ./app.jar SHELL ["/bin/bash", "-c"] diff --git a/ruoyi-extend/ruoyi-snailjob-server/pom.xml b/fys-extend/fys-snailjob-server/pom.xml similarity index 93% rename from ruoyi-extend/ruoyi-snailjob-server/pom.xml rename to fys-extend/fys-snailjob-server/pom.xml index 0b3afd3..d9b5577 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/pom.xml +++ b/fys-extend/fys-snailjob-server/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-extend + com.fuyuanshen + fys-extend ${revision} 4.0.0 jar - ruoyi-snailjob-server + fys-snailjob-server diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java b/fys-extend/fys-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java rename to fys-extend/fys-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java b/fys-extend/fys-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java rename to fys-extend/fys-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java b/fys-extend/fys-snailjob-server/src/main/java/com/fuyuanshen/snailjob/SnailJobServerApplication.java similarity index 92% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java rename to fys-extend/fys-snailjob-server/src/main/java/com/fuyuanshen/snailjob/SnailJobServerApplication.java index dfab068..df279e3 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java +++ b/fys-extend/fys-snailjob-server/src/main/java/com/fuyuanshen/snailjob/SnailJobServerApplication.java @@ -1,4 +1,4 @@ -package org.dromara.snailjob; +package com.fuyuanshen.snailjob; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/fys-extend/fys-snailjob-server/src/main/resources/application-dev.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml rename to fys-extend/fys-snailjob-server/src/main/resources/application-dev.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/fys-extend/fys-snailjob-server/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml rename to fys-extend/fys-snailjob-server/src/main/resources/application-prod.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/fys-extend/fys-snailjob-server/src/main/resources/application.yml similarity index 88% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml rename to fys-extend/fys-snailjob-server/src/main/resources/application.yml index ba6df45..bf49e10 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml +++ b/fys-extend/fys-snailjob-server/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: spring: application: - name: ruoyi-snailjob-server + name: fys-snailjob-server profiles: active: @profiles.active@ web: @@ -36,4 +36,4 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/ruoyi-snailjob-server/console.log + external-file: ./logs/fys-snailjob-server/console.log diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt b/fys-extend/fys-snailjob-server/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt rename to fys-extend/fys-snailjob-server/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml b/fys-extend/fys-snailjob-server/src/main/resources/logback-plus.xml similarity index 98% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml rename to fys-extend/fys-snailjob-server/src/main/resources/logback-plus.xml index be58811..8e5d0c8 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml +++ b/fys-extend/fys-snailjob-server/src/main/resources/logback-plus.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-extend/pom.xml b/fys-extend/pom.xml similarity index 66% rename from ruoyi-extend/pom.xml rename to fys-extend/pom.xml index d7280ce..84940db 100644 --- a/ruoyi-extend/pom.xml +++ b/fys-extend/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - org.dromara + fys-vue-plus + com.fuyuanshen ${revision} 4.0.0 - ruoyi-extend + fys-extend pom - ruoyi-monitor-admin - ruoyi-snailjob-server + fys-monitor-admin + fys-snailjob-server diff --git a/fys-modules/fys-demo/pom.xml b/fys-modules/fys-demo/pom.xml new file mode 100644 index 0000000..d53f11b --- /dev/null +++ b/fys-modules/fys-demo/pom.xml @@ -0,0 +1,108 @@ + + + + com.fuyuanshen + fys-modules + ${revision} + + 4.0.0 + + fys-demo + + + demo模块 + + + + + + + com.fuyuanshen + fys-common-core + + + + com.fuyuanshen + fys-common-doc + + + + com.fuyuanshen + fys-common-sms + + + + com.fuyuanshen + fys-common-mail + + + + com.fuyuanshen + fys-common-redis + + + + com.fuyuanshen + fys-common-idempotent + + + + com.fuyuanshen + fys-common-mybatis + + + + com.fuyuanshen + fys-common-log + + + + com.fuyuanshen + fys-common-excel + + + + com.fuyuanshen + fys-common-security + + + + com.fuyuanshen + fys-common-web + + + + com.fuyuanshen + fys-common-ratelimiter + + + + com.fuyuanshen + fys-common-translation + + + + com.fuyuanshen + fys-common-sensitive + + + + com.fuyuanshen + fys-common-encrypt + + + + com.fuyuanshen + fys-common-tenant + + + + com.fuyuanshen + fys-common-websocket + + + + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/MailController.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/MailController.java index 01f5044..9d6d587 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/MailController.java @@ -1,9 +1,9 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.mail.utils.MailUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.mail.utils.MailUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisCacheController.java similarity index 94% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisCacheController.java index 2335da4..2c8a4ba 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisCacheController.java @@ -1,9 +1,9 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import cn.hutool.core.thread.ThreadUtil; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisLockController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisLockController.java index 237b6ee..a22f4df 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisLockController.java @@ -1,11 +1,11 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import cn.hutool.core.thread.ThreadUtil; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import org.dromara.common.core.domain.R; +import com.fuyuanshen.common.core.domain.R; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisPubSubController.java similarity index 89% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisPubSubController.java index bdbf033..5a84575 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisRateLimiterController.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisRateLimiterController.java index f8adf7d..f19f2e6 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter; +import com.fuyuanshen.common.ratelimiter.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/SmsController.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/SmsController.java index b993f60..44d3fbe 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/SmsController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; +import com.fuyuanshen.common.core.domain.R; import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/Swagger3DemoController.java similarity index 90% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/Swagger3DemoController.java index bb02f98..9d4822a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/Swagger3DemoController.java @@ -1,6 +1,6 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; +import com.fuyuanshen.common.core.domain.R; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestBatchController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestBatchController.java index af8c77b..78a20f5 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestBatchController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.mapper.TestDemoMapper; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.demo.domain.TestDemo; +import com.fuyuanshen.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestDemoController.java similarity index 80% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestDemoController.java index f31c540..3ab2f76 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestDemoController.java @@ -1,25 +1,25 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.bo.TestDemoImportVo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.service.ITestDemoService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.core.validate.QueryGroup; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.excel.core.ExcelResult; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.demo.domain.TestDemo; +import com.fuyuanshen.demo.domain.bo.TestDemoBo; +import com.fuyuanshen.demo.domain.bo.TestDemoImportVo; +import com.fuyuanshen.demo.domain.vo.TestDemoVo; +import com.fuyuanshen.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestEncryptController.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestEncryptController.java index 2b6886d..98586a6 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestEncryptController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.demo.domain.TestDemoEncrypt; -import org.dromara.demo.mapper.TestDemoEncryptMapper; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.demo.domain.TestDemoEncrypt; +import com.fuyuanshen.demo.mapper.TestDemoEncryptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestExcelController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestExcelController.java index 3fd124c..03bfdd0 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestExcelController.java @@ -1,15 +1,15 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import cn.hutool.core.collection.CollUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.listener.ExportDemoListener; -import org.dromara.demo.service.IExportExcelService; +import com.fuyuanshen.common.excel.core.ExcelResult; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.demo.domain.vo.ExportDemoVo; +import com.fuyuanshen.demo.listener.ExportDemoListener; +import com.fuyuanshen.demo.service.IExportExcelService; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestI18nController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestI18nController.java index 40393c5..548c974 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MessageUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.MessageUtils; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestSensitiveController.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestSensitiveController.java index eba0552..398c6a3 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestSensitiveController.java @@ -1,11 +1,11 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.sensitive.annotation.Sensitive; +import com.fuyuanshen.common.sensitive.core.SensitiveStrategy; import lombok.Data; -import org.dromara.common.sensitive.core.SensitiveService; +import com.fuyuanshen.common.sensitive.core.SensitiveService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestTreeController.java similarity index 80% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestTreeController.java index 5c55205..f9ed78a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/TestTreeController.java @@ -1,18 +1,18 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.service.ITestTreeService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.core.validate.QueryGroup; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.demo.domain.bo.TestTreeBo; +import com.fuyuanshen.demo.domain.vo.TestTreeVo; +import com.fuyuanshen.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/WebSocketController.java similarity index 77% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/WebSocketController.java index 65bf68e..41ee45f 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/WebSocketController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package com.fuyuanshen.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.websocket.dto.WebSocketMessageDto; +import com.fuyuanshen.common.websocket.utils.WebSocketUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/package-info.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/package-info.java new file mode 100644 index 0000000..43ddfa6 --- /dev/null +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.fuyuanshen.demo.controller; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/BoundedQueueController.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/BoundedQueueController.java index 30ec27f..de73464 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/BoundedQueueController.java @@ -1,11 +1,9 @@ -package org.dromara.demo.controller.queue; +package com.fuyuanshen.demo.controller.queue; -import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RBoundedBlockingQueue; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/DelayedQueueController.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/DelayedQueueController.java index b6e51d3..d1e0d0d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/DelayedQueueController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller.queue; +package com.fuyuanshen.demo.controller.queue; import cn.dev33.satoken.annotation.SaIgnore; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.redis.utils.QueueUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/PriorityDemo.java similarity index 90% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/PriorityDemo.java index e2449b5..fe54399 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/PriorityDemo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.controller.queue; +package com.fuyuanshen.demo.controller.queue; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/PriorityQueueController.java similarity index 94% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/PriorityQueueController.java index 02c7396..ac36e9c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/queue/PriorityQueueController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller.queue; +package com.fuyuanshen.demo.controller.queue; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestDemo.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestDemo.java index d3af0c9..a88187e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestDemo.java @@ -1,7 +1,7 @@ -package org.dromara.demo.domain; +package com.fuyuanshen.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestDemoEncrypt.java similarity index 93% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestDemoEncrypt.java index bdcd596..9c984e1 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestDemoEncrypt.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain; +package com.fuyuanshen.demo.domain; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.enumd.AlgorithmType; +import com.fuyuanshen.common.encrypt.annotation.EncryptField; +import com.fuyuanshen.common.encrypt.enumd.AlgorithmType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestTree.java similarity index 91% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestTree.java index fd68253..d08585e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/TestTree.java @@ -1,10 +1,10 @@ -package org.dromara.demo.domain; +package com.fuyuanshen.demo.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestDemoBo.java similarity index 84% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestDemoBo.java index 8134677..4f91d81 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestDemoBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package com.fuyuanshen.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestDemo; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestDemoImportVo.java similarity index 96% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestDemoImportVo.java index dc8b35f..7779700 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestDemoImportVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.bo; +package com.fuyuanshen.demo.domain.bo; import cn.idev.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestTreeBo.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestTreeBo.java index 1bbac0e..6c9e4bb 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/bo/TestTreeBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package com.fuyuanshen.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestTree; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/package-info.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/package-info.java new file mode 100644 index 0000000..2a95519 --- /dev/null +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.fuyuanshen.demo.domain; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/ExportDemoVo.java similarity index 87% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/ExportDemoVo.java index b42ce76..89ffcea 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/ExportDemoVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.vo; +package com.fuyuanshen.demo.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -7,13 +7,13 @@ import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.excel.convert.ExcelEnumConvert; +import com.fuyuanshen.common.core.enums.UserStatus; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.annotation.ExcelEnumFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.common.excel.convert.ExcelEnumConvert; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/TestDemoVo.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/TestDemoVo.java index c6595b0..eb2d23e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/TestDemoVo.java @@ -1,12 +1,12 @@ -package org.dromara.demo.domain.vo; +package com.fuyuanshen.demo.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelNotation; -import org.dromara.common.excel.annotation.ExcelRequired; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.demo.domain.TestDemo; +import com.fuyuanshen.common.excel.annotation.ExcelNotation; +import com.fuyuanshen.common.excel.annotation.ExcelRequired; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/TestTreeVo.java similarity index 92% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/TestTreeVo.java index ee2336a..6f8a65b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/domain/vo/TestTreeVo.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain.vo; +package com.fuyuanshen.demo.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.demo.domain.TestTree; +import com.fuyuanshen.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/listener/ExportDemoListener.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/listener/ExportDemoListener.java index de92760..593441d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/listener/ExportDemoListener.java @@ -1,13 +1,13 @@ -package org.dromara.demo.listener; +package com.fuyuanshen.demo.listener; import cn.hutool.core.util.NumberUtil; import cn.idev.excel.context.AnalysisContext; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.core.DefaultExcelListener; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.demo.domain.vo.ExportDemoVo; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.excel.core.DefaultExcelListener; +import com.fuyuanshen.common.excel.core.DropDownOptions; +import com.fuyuanshen.demo.domain.vo.ExportDemoVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestDemoEncryptMapper.java similarity index 50% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestDemoEncryptMapper.java index 601f97a..1a52eb0 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestDemoEncryptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.demo.mapper; +package com.fuyuanshen.demo.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemoEncrypt; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.demo.domain.TestDemoEncrypt; /** * 测试加密功能 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestDemoMapper.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestDemoMapper.java index 19b2d52..bdbed54 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestDemoMapper.java @@ -1,15 +1,15 @@ -package org.dromara.demo.mapper; +package com.fuyuanshen.demo.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.vo.TestDemoVo; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.demo.domain.TestDemo; +import com.fuyuanshen.demo.domain.vo.TestDemoVo; import java.io.Serializable; import java.util.Collection; diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestTreeMapper.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestTreeMapper.java new file mode 100644 index 0000000..444c7cc --- /dev/null +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/TestTreeMapper.java @@ -0,0 +1,21 @@ +package com.fuyuanshen.demo.mapper; + +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.demo.domain.TestTree; +import com.fuyuanshen.demo.domain.vo.TestTreeVo; + +/** + * 测试树表Mapper接口 + * + * @author Lion Li + * @date 2021-07-26 + */ +@DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") +}) +public interface TestTreeMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/package-info.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/package-info.java new file mode 100644 index 0000000..268c0fc --- /dev/null +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.fuyuanshen.demo.mapper; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/IExportExcelService.java similarity index 88% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/IExportExcelService.java index 4dfa5ef..7254a84 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/IExportExcelService.java @@ -1,4 +1,4 @@ -package org.dromara.demo.service; +package com.fuyuanshen.demo.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/ITestDemoService.java similarity index 81% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/ITestDemoService.java index bca4192..8b0e71c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/ITestDemoService.java @@ -1,10 +1,10 @@ -package org.dromara.demo.service; +package com.fuyuanshen.demo.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.demo.domain.TestDemo; +import com.fuyuanshen.demo.domain.bo.TestDemoBo; +import com.fuyuanshen.demo.domain.vo.TestDemoVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/ITestTreeService.java similarity index 87% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/ITestTreeService.java index 9155201..00c02ba 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/ITestTreeService.java @@ -1,7 +1,7 @@ -package org.dromara.demo.service; +package com.fuyuanshen.demo.service; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; +import com.fuyuanshen.demo.domain.bo.TestTreeBo; +import com.fuyuanshen.demo.domain.vo.TestTreeVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/ExportExcelServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/ExportExcelServiceImpl.java index 69cf0a8..28faa99 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/ExportExcelServiceImpl.java @@ -1,16 +1,16 @@ -package org.dromara.demo.service.impl; +package com.fuyuanshen.demo.service.impl; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.service.IExportExcelService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.excel.core.DropDownOptions; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.demo.domain.vo.ExportDemoVo; +import com.fuyuanshen.demo.service.IExportExcelService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/TestDemoServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/TestDemoServiceImpl.java index ced141e..ad9cf14 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/TestDemoServiceImpl.java @@ -1,19 +1,19 @@ -package org.dromara.demo.service.impl; +package com.fuyuanshen.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.mapper.TestDemoMapper; -import org.dromara.demo.service.ITestDemoService; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.demo.domain.TestDemo; +import com.fuyuanshen.demo.domain.bo.TestDemoBo; +import com.fuyuanshen.demo.domain.vo.TestDemoVo; +import com.fuyuanshen.demo.mapper.TestDemoMapper; +import com.fuyuanshen.demo.service.ITestDemoService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/TestTreeServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java rename to fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/TestTreeServiceImpl.java index e4e548b..c8a410d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/TestTreeServiceImpl.java @@ -1,14 +1,14 @@ -package org.dromara.demo.service.impl; +package com.fuyuanshen.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.mapper.TestTreeMapper; -import org.dromara.demo.service.ITestTreeService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.demo.domain.TestTree; +import com.fuyuanshen.demo.domain.bo.TestTreeBo; +import com.fuyuanshen.demo.domain.vo.TestTreeVo; +import com.fuyuanshen.demo.mapper.TestTreeMapper; +import com.fuyuanshen.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/package-info.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/package-info.java new file mode 100644 index 0000000..434bcd2 --- /dev/null +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.fuyuanshen.demo.service.impl; diff --git a/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/package-info.java b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/package-info.java new file mode 100644 index 0000000..06d5b65 --- /dev/null +++ b/fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/service/package-info.java @@ -0,0 +1 @@ +package com.fuyuanshen.demo.service; diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/fys-modules/fys-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to fys-modules/fys-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx b/fys-modules/fys-demo/src/main/resources/excel/多sheet列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx rename to fys-modules/fys-demo/src/main/resources/excel/多sheet列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/fys-modules/fys-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to fys-modules/fys-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/fys-modules/fys-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 60% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to fys-modules/fys-demo/src/main/resources/mapper/demo/TestDemoMapper.xml index dbf89a3..45a9b5a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml +++ b/fys-modules/fys-demo/src/main/resources/mapper/demo/TestDemoMapper.xml @@ -2,9 +2,9 @@ - + - SELECT * FROM test_demo ${ew.customSqlSegment} diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/fys-modules/fys-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to fys-modules/fys-demo/src/main/resources/mapper/demo/TestTreeMapper.xml index d7975ec..a6e4747 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/fys-modules/fys-demo/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md b/fys-modules/fys-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md rename to fys-modules/fys-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/fys-modules/fys-generator/pom.xml similarity index 77% rename from ruoyi-modules/ruoyi-generator/pom.xml rename to fys-modules/fys-generator/pom.xml index 4906029..be9d9c2 100644 --- a/ruoyi-modules/ruoyi-generator/pom.xml +++ b/fys-modules/fys-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-modules + com.fuyuanshen + fys-modules ${revision} 4.0.0 - ruoyi-generator + fys-generator generator 代码生成 @@ -18,28 +18,28 @@ - org.dromara - ruoyi-common-core + com.fuyuanshen + fys-common-core - org.dromara - ruoyi-common-doc + com.fuyuanshen + fys-common-doc - org.dromara - ruoyi-common-mybatis + com.fuyuanshen + fys-common-mybatis - org.dromara - ruoyi-common-web + com.fuyuanshen + fys-common-web - org.dromara - ruoyi-common-log + com.fuyuanshen + fys-common-log diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/config/GenConfig.java similarity index 96% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/config/GenConfig.java index b29f8c9..972f2b0 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config; +package com.fuyuanshen.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author fys */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/config/MyBatisDataSourceMonitor.java similarity index 98% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/config/MyBatisDataSourceMonitor.java index 8c0f352..ffdb3e1 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/config/MyBatisDataSourceMonitor.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config; +package com.fuyuanshen.generator.config; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/constant/GenConstants.java similarity index 98% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/constant/GenConstants.java index b9888fb..7b60274 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/constant/GenConstants.java @@ -1,9 +1,9 @@ -package org.dromara.generator.constant; +package com.fuyuanshen.generator.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author fys */ public interface GenConstants { /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/controller/GenController.java similarity index 91% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/controller/GenController.java index e3d4c08..e2c1eb2 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/controller/GenController.java @@ -1,18 +1,18 @@ -package org.dromara.generator.controller; +package com.fuyuanshen.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.service.IGenTableService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.mybatis.helper.DataBaseHelper; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.generator.domain.GenTable; +import com.fuyuanshen.generator.domain.GenTableColumn; +import com.fuyuanshen.generator.service.IGenTableService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -200,7 +200,7 @@ public class GenController extends BaseController { response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"fys.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IoUtil.write(response.getOutputStream(), false, data); diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/domain/GenTable.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/domain/GenTable.java index f2d7257..85787ab 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/domain/GenTable.java @@ -1,12 +1,12 @@ -package org.dromara.generator.domain; +package com.fuyuanshen.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.generator.constant.GenConstants; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.generator.constant.GenConstants; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/domain/GenTableColumn.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/domain/GenTableColumn.java index 6b2e429..55effd6 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/domain/GenTableColumn.java @@ -1,11 +1,11 @@ -package org.dromara.generator.domain; +package com.fuyuanshen.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/mapper/GenTableColumnMapper.java similarity index 63% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/mapper/GenTableColumnMapper.java index ed8ed20..a467907 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/mapper/GenTableColumnMapper.java @@ -1,8 +1,8 @@ -package org.dromara.generator.mapper; +package com.fuyuanshen.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTableColumn; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.generator.domain.GenTableColumn; /** * 业务字段 数据层 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/mapper/GenTableMapper.java similarity index 87% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/mapper/GenTableMapper.java index 1798b4b..1036632 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package org.dromara.generator.mapper; +package com.fuyuanshen.generator.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTable; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.generator.domain.GenTable; import java.util.List; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/service/GenTableServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/service/GenTableServiceImpl.java index b397f37..007370e 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.generator.service; +package com.fuyuanshen.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -19,23 +19,23 @@ import org.anyline.proxy.ServiceProxy; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.mapper.GenTableColumnMapper; -import org.dromara.generator.mapper.GenTableMapper; -import org.dromara.generator.util.GenUtils; -import org.dromara.generator.util.VelocityInitializer; -import org.dromara.generator.util.VelocityUtils; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.file.FileUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.generator.constant.GenConstants; +import com.fuyuanshen.generator.domain.GenTable; +import com.fuyuanshen.generator.domain.GenTableColumn; +import com.fuyuanshen.generator.mapper.GenTableColumnMapper; +import com.fuyuanshen.generator.mapper.GenTableMapper; +import com.fuyuanshen.generator.util.GenUtils; +import com.fuyuanshen.generator.util.VelocityInitializer; +import com.fuyuanshen.generator.util.VelocityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/service/IGenTableService.java similarity index 91% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/service/IGenTableService.java index b2c20c5..2bf58ec 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/service/IGenTableService.java @@ -1,9 +1,9 @@ -package org.dromara.generator.service; +package com.fuyuanshen.generator.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.generator.domain.GenTable; +import com.fuyuanshen.generator.domain.GenTableColumn; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/GenUtils.java similarity index 96% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/GenUtils.java index 996cf9b..9685c79 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/GenUtils.java @@ -1,20 +1,20 @@ -package org.dromara.generator.util; +package com.fuyuanshen.generator.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.generator.config.GenConfig; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.generator.config.GenConfig; +import com.fuyuanshen.generator.constant.GenConstants; +import com.fuyuanshen.generator.domain.GenTable; +import com.fuyuanshen.generator.domain.GenTableColumn; import java.util.Arrays; /** * 代码生成器 工具类 * - * @author ruoyi + * @author fys */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class GenUtils { diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/VelocityInitializer.java similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/VelocityInitializer.java index 09e0121..e9ee7f6 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package org.dromara.generator.util; +package com.fuyuanshen.generator.util; -import org.dromara.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.app.Velocity; @@ -10,7 +10,7 @@ import java.util.Properties; /** * VelocityEngine工厂 * - * @author ruoyi + * @author fys */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class VelocityInitializer { diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/VelocityUtils.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java rename to fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/VelocityUtils.java index 6e111e3..0daa046 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java +++ b/fys-modules/fys-generator/src/main/java/com/fuyuanshen/generator/util/VelocityUtils.java @@ -1,15 +1,15 @@ -package org.dromara.generator.util; +package com.fuyuanshen.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; -import org.dromara.generator.constant.GenConstants; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import com.fuyuanshen.generator.constant.GenConstants; +import com.fuyuanshen.common.core.utils.DateUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.mybatis.helper.DataBaseHelper; +import com.fuyuanshen.generator.domain.GenTable; +import com.fuyuanshen.generator.domain.GenTableColumn; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.VelocityContext; @@ -19,7 +19,7 @@ import java.util.*; /** * 模板处理工具类 * - * @author ruoyi + * @author fys */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class VelocityUtils { @@ -216,8 +216,8 @@ public class VelocityUtils { } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) { importList.add("java.math.BigDecimal"); } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { - importList.add("org.dromara.common.translation.annotation.Translation"); - importList.add("org.dromara.common.translation.constant.TransConstant"); + importList.add("com.fuyuanshen.common.translation.annotation.Translation"); + importList.add("com.fuyuanshen.common.translation.constant.TransConstant"); } } return importList; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/fys-modules/fys-generator/src/main/resources/generator.yml similarity index 89% rename from ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml rename to fys-modules/fys-generator/src/main/resources/generator.yml index d779d97..05d8e09 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml +++ b/fys-modules/fys-generator/src/main/resources/generator.yml @@ -3,7 +3,7 @@ gen: # 作者 author: Lion Li # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: org.dromara.system + packageName: com.fuyuanshen.system # 自动去除表前缀,默认是false autoRemovePre: false # 表前缀(生成类名不会包含表前缀,多个用逗号分隔) diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/fys-modules/fys-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 53% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to fys-modules/fys-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index fc1c610..af3d9cf 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/fys-modules/fys-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/fys-modules/fys-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to fys-modules/fys-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 78aa852..63a0200 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/fys-modules/fys-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,15 +2,15 @@ - + - + - + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/fys-modules/fys-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md rename to fys-modules/fys-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/bo.java.vm similarity index 88% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/bo.java.vm index 511d37c..7a712b9 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/bo.java.vm @@ -1,9 +1,7 @@ package ${packageName}.domain.bo; import ${packageName}.domain.${ClassName}; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/controller.java.vm similarity index 86% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/controller.java.vm index 6438971..9f9c818 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/controller.java.vm @@ -8,20 +8,20 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/domain.java.vm similarity index 90% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/domain.java.vm index 205fb73..24dbd1c 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/domain.java.vm @@ -6,9 +6,8 @@ package ${packageName}.domain; #end #end #if($IsTenant==1) -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; #else -import org.dromara.common.mybatis.core.domain.BaseEntity; #end import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/mapper.java.vm similarity index 82% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/mapper.java.vm index 0922401..6e29693 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/mapper.java.vm @@ -2,7 +2,7 @@ package ${packageName}.mapper; import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; /** * ${functionName}Mapper接口 diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/service.java.vm similarity index 93% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/service.java.vm index 4db9030..5c8d309 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/service.java.vm @@ -3,8 +3,8 @@ package ${packageName}.service; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; #end import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/serviceImpl.java.vm index be6c3bf..66be075 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,10 +1,9 @@ package ${packageName}.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.utils.MapstructUtils; + #if($table.crud) +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; #end import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/fys-modules/fys-generator/src/main/resources/vm/java/vo.java.vm similarity index 93% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to fys-modules/fys-generator/src/main/resources/vm/java/vo.java.vm index 480394c..62f95a7 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/fys-modules/fys-generator/src/main/resources/vm/java/vo.java.vm @@ -6,8 +6,8 @@ import ${import}; import ${packageName}.domain.${ClassName}; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/fys-modules/fys-generator/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm rename to fys-modules/fys-generator/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/fys-modules/fys-generator/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm rename to fys-modules/fys-generator/src/main/resources/vm/sql/postgres/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/fys-modules/fys-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to fys-modules/fys-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/fys-modules/fys-generator/src/main/resources/vm/sql/sqlserver/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm rename to fys-modules/fys-generator/src/main/resources/vm/sql/sqlserver/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/fys-modules/fys-generator/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm rename to fys-modules/fys-generator/src/main/resources/vm/ts/api.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/fys-modules/fys-generator/src/main/resources/vm/ts/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm rename to fys-modules/fys-generator/src/main/resources/vm/ts/types.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/fys-modules/fys-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to fys-modules/fys-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/fys-modules/fys-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to fys-modules/fys-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/fys-modules/fys-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to fys-modules/fys-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/fys-modules/fys-job/pom.xml similarity index 66% rename from ruoyi-modules/ruoyi-job/pom.xml rename to fys-modules/fys-job/pom.xml index 2431a1c..9c01560 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/fys-modules/fys-job/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-modules + com.fuyuanshen + fys-modules ${revision} 4.0.0 jar - ruoyi-job + fys-job 任务调度 @@ -19,13 +19,13 @@ - org.dromara - ruoyi-common-json + com.fuyuanshen + fys-common-json - org.dromara - ruoyi-common-job + com.fuyuanshen + fys-common-job diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/entity/BillDto.java similarity index 90% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/entity/BillDto.java index 2661e34..a2b8a90 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/entity/BillDto.java @@ -1,4 +1,4 @@ -package org.dromara.job.entity; +package com.fuyuanshen.job.entity; import lombok.Data; diff --git a/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/package-info.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/package-info.java new file mode 100644 index 0000000..38cc859 --- /dev/null +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/package-info.java @@ -0,0 +1 @@ +package com.fuyuanshen.job; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/AlipayBillTask.java similarity index 91% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/AlipayBillTask.java index b8ad8cc..c50f5ca 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/AlipayBillTask.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -6,8 +6,8 @@ import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.common.log.SnailJobLog; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.job.entity.BillDto; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.job.entity.BillDto; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/SummaryBillTask.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/SummaryBillTask.java index bff15f9..fe9cafa 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/SummaryBillTask.java @@ -1,12 +1,12 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.common.log.SnailJobLog; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.job.entity.BillDto; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.job.entity.BillDto; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestAnnoJobExecutor.java similarity index 95% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestAnnoJobExecutor.java index e5339f5..49a847b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestAnnoJobExecutor.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestBroadcastJob.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestBroadcastJob.java index d77e72e..3788f16 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestBroadcastJob.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import cn.hutool.core.util.RandomUtil; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestClassJobExecutor.java similarity index 93% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestClassJobExecutor.java index 6f7c21f..6c8ea56 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestClassJobExecutor.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestMapJobAnnotation.java similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestMapJobAnnotation.java index 6589ed1..fd528a1 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestMapJobAnnotation.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.extra.spring.SpringUtil; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestMapReduceAnnotation1.java similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestMapReduceAnnotation1.java index 4ae2fa8..471fe8f 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestMapReduceAnnotation1.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.extra.spring.SpringUtil; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestStaticShardingJob.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestStaticShardingJob.java index 07a1bc5..1c915c7 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/TestStaticShardingJob.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/WechatBillTask.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java rename to fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/WechatBillTask.java index d8caf1a..3d56119 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java +++ b/fys-modules/fys-job/src/main/java/com/fuyuanshen/job/snailjob/WechatBillTask.java @@ -1,4 +1,4 @@ -package org.dromara.job.snailjob; +package com.fuyuanshen.job.snailjob; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; @@ -6,8 +6,8 @@ import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.common.log.SnailJobLog; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.job.entity.BillDto; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.job.entity.BillDto; import org.springframework.stereotype.Component; import java.math.BigDecimal; diff --git a/fys-modules/fys-system/pom.xml b/fys-modules/fys-system/pom.xml new file mode 100644 index 0000000..1a26ea2 --- /dev/null +++ b/fys-modules/fys-system/pom.xml @@ -0,0 +1,105 @@ + + + + com.fuyuanshen + fys-modules + ${revision} + + 4.0.0 + + fys-system + + + system系统模块 + + + + + + com.fuyuanshen + fys-common-core + + + + com.fuyuanshen + fys-common-doc + + + + com.fuyuanshen + fys-common-mybatis + + + + com.fuyuanshen + fys-common-translation + + + + + com.fuyuanshen + fys-common-oss + + + + com.fuyuanshen + fys-common-log + + + + + com.fuyuanshen + fys-common-excel + + + + + com.fuyuanshen + fys-common-sms + + + + com.fuyuanshen + fys-common-tenant + + + + com.fuyuanshen + fys-common-security + + + + com.fuyuanshen + fys-common-web + + + + com.fuyuanshen + fys-common-idempotent + + + + com.fuyuanshen + fys-common-sensitive + + + + com.fuyuanshen + fys-common-encrypt + + + + com.fuyuanshen + fys-common-websocket + + + + com.fuyuanshen + fys-common-sse + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/CacheController.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/CacheController.java index 1e9c655..d22ac0e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/CacheController.java @@ -1,9 +1,9 @@ -package org.dromara.system.controller.monitor; +package com.fuyuanshen.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.StringUtils; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysLogininforController.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysLogininforController.java index 98ac2d5..ee1babf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysLogininforController.java @@ -1,20 +1,20 @@ -package org.dromara.system.controller.monitor; +package com.fuyuanshen.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.service.ISysLogininforService; +import com.fuyuanshen.common.core.constant.CacheConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysLogininforBo; +import com.fuyuanshen.system.domain.vo.SysLogininforVo; +import com.fuyuanshen.system.service.ISysLogininforService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysOperlogController.java similarity index 76% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysOperlogController.java index 575aba6..e6cb153 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysOperlogController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.monitor; +package com.fuyuanshen.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.service.ISysOperLogService; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.system.domain.bo.SysOperLogBo; +import com.fuyuanshen.system.domain.vo.SysOperLogVo; +import com.fuyuanshen.system.service.ISysOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysUserOnlineController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysUserOnlineController.java index 1cab232..99e6438 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/monitor/SysUserOnlineController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.monitor; +package com.fuyuanshen.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserOnline; +import com.fuyuanshen.common.core.constant.CacheConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.SysUserOnline; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysClientController.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysClientController.java index eaed068..8d01b76 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysClientController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import java.util.List; @@ -8,19 +8,19 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.service.ISysClientService; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.bo.SysClientBo; +import com.fuyuanshen.system.service.ISysClientService; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; /** * 客户端管理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysConfigController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysConfigController.java index c73c386..0cb543b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysConfigController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.service.ISysConfigService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysConfigBo; +import com.fuyuanshen.system.domain.vo.SysConfigVo; +import com.fuyuanshen.system.service.ISysConfigService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDeptController.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDeptController.java index 45b8418..3b10b56 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDeptController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysPostService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysDeptBo; +import com.fuyuanshen.system.domain.vo.SysDeptVo; +import com.fuyuanshen.system.service.ISysDeptService; +import com.fuyuanshen.system.service.ISysPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictDataController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictDataController.java index 5752751..ff3b6dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictDataController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.service.ISysDictDataService; -import org.dromara.system.service.ISysDictTypeService; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.system.domain.bo.SysDictDataBo; +import com.fuyuanshen.system.domain.vo.SysDictDataVo; +import com.fuyuanshen.system.service.ISysDictDataService; +import com.fuyuanshen.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictTypeController.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictTypeController.java index 67c1f51..cd951bd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictTypeController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.service.ISysDictTypeService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysDictTypeBo; +import com.fuyuanshen.system.domain.vo.SysDictTypeVo; +import com.fuyuanshen.system.service.ISysDictTypeService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java index 3171ec3..3b705f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java @@ -1,23 +1,23 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.tree.Tree; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.service.ISysMenuService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.SysMenu; +import com.fuyuanshen.system.domain.bo.SysMenuBo; +import com.fuyuanshen.system.domain.vo.RouterVo; +import com.fuyuanshen.system.domain.vo.SysMenuVo; +import com.fuyuanshen.system.service.ISysMenuService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysNoticeController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysNoticeController.java index 5d65137..001f0c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysNoticeController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.service.DictService; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.sse.utils.SseMessageUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.service.ISysNoticeService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.sse.utils.SseMessageUtils; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysNoticeBo; +import com.fuyuanshen.system.domain.vo.SysNoticeVo; +import com.fuyuanshen.system.service.ISysNoticeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysOssConfigController.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysOssConfigController.java index 24ddaff..0a79bc6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysOssConfigController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.service.ISysOssConfigService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.core.validate.QueryGroup; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysOssConfigBo; +import com.fuyuanshen.system.domain.vo.SysOssConfigVo; +import com.fuyuanshen.system.service.ISysOssConfigService; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysOssController.java similarity index 82% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysOssController.java index 81200c1..aebb507 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysOssController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssUploadVo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.service.ISysOssService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.QueryGroup; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysOssBo; +import com.fuyuanshen.system.domain.vo.SysOssUploadVo; +import com.fuyuanshen.system.domain.vo.SysOssVo; +import com.fuyuanshen.system.service.ISysOssService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysPostController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysPostController.java index 5333a4a..d71cd01 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysPostController.java @@ -1,20 +1,20 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.service.ISysPostService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysPostBo; +import com.fuyuanshen.system.domain.vo.SysPostVo; +import com.fuyuanshen.system.service.ISysPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysProfileController.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysProfileController.java index 8903a74..c897594 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysProfileController.java @@ -1,26 +1,26 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.crypto.digest.BCrypt; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.MimeTypeUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.bo.SysUserPasswordBo; -import org.dromara.system.domain.bo.SysUserProfileBo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysOssService; -import org.dromara.system.service.ISysUserService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.file.MimeTypeUtils; +import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.helper.DataPermissionHelper; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.bo.SysUserPasswordBo; +import com.fuyuanshen.system.domain.bo.SysUserProfileBo; +import com.fuyuanshen.system.domain.vo.SysOssVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.service.ISysOssService; +import com.fuyuanshen.system.service.ISysUserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysRoleController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysRoleController.java index e6afa3c..edf8334 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysRoleController.java @@ -1,25 +1,25 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.SysUserRole; +import com.fuyuanshen.system.domain.bo.SysDeptBo; +import com.fuyuanshen.system.domain.bo.SysRoleBo; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.vo.SysRoleVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.service.ISysDeptService; +import com.fuyuanshen.system.service.ISysRoleService; +import com.fuyuanshen.system.service.ISysUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysSocialController.java similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysSocialController.java index b0281cf..7f53b1f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysSocialController.java @@ -1,11 +1,11 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.service.ISysSocialService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.vo.SysSocialVo; +import com.fuyuanshen.system.service.ISysSocialService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysTenantController.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysTenantController.java index 66c1b7d..c405bde 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysTenantController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -8,22 +8,22 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.service.ISysTenantService; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysTenantBo; +import com.fuyuanshen.system.domain.vo.SysTenantVo; +import com.fuyuanshen.system.service.ISysTenantService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysTenantPackageController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysTenantPackageController.java index 4bfe597..ce45b33 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysTenantPackageController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.service.ISysTenantPackageService; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysTenantPackageBo; +import com.fuyuanshen.system.domain.vo.SysTenantPackageVo; +import com.fuyuanshen.system.service.ISysTenantPackageService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysUserController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysUserController.java index 774f26a..3001e3c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package org.dromara.system.controller.system; +package com.fuyuanshen.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; @@ -8,28 +8,28 @@ import cn.hutool.crypto.digest.BCrypt; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.listener.SysUserImportListener; -import org.dromara.system.service.*; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt; +import com.fuyuanshen.common.excel.core.ExcelResult; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.system.domain.bo.SysDeptBo; +import com.fuyuanshen.system.domain.bo.SysPostBo; +import com.fuyuanshen.system.domain.bo.SysRoleBo; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.vo.*; +import com.fuyuanshen.system.listener.SysUserImportListener; +import com.fuyuanshen.system.service.*; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysCache.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysCache.java index e398a20..dcf092b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysCache.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysClient.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysClient.java index ee2475d..b5cbde2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysClient.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysConfig.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysConfig.java index 6fcb88f..63274e5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysConfig.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDept.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDept.java index d436a1c..8d3a269 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDept.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import java.io.Serial; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDictData.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDictData.java index 9d83736..db58dfb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDictData.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.tenant.core.TenantEntity; /** * 字典数据表 sys_dict_data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDictType.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDictType.java index 955af85..a35f2c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysDictType.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysLogininfor.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysLogininfor.java index c57dc0a..aca3123 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysLogininfor.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysMenu.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysMenu.java index 2df5596..d80f234 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysMenu.java @@ -1,14 +1,14 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysNotice.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysNotice.java index bfcc2bc..d366a6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysNotice.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOperLog.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOperLog.java index 41a8c59..a7c227d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOperLog.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java index 2285a5d..b360436 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOss.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOssConfig.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOssConfig.java index 4b67d63..036f4af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysOssConfig.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; /** * 对象存储配置对象 sys_oss_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysPost.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysPost.java index 2c985da..00a8469 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysPost.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRole.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRole.java index aa1b19a..5a7ae14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRole.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRoleDept.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRoleDept.java index ba77694..b13e6ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRoleMenu.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRoleMenu.java index ba28f17..1a73bc0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysSocial.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysSocial.java index 10f2936..3e94f13 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysSocial.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import java.io.Serial; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysTenant.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysTenant.java index 9800c30..55c51a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysTenant.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysTenantPackage.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysTenantPackage.java index 5f58e3e..e9cc7e1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysTenantPackage.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; /** * 租户套餐对象 sys_tenant_package diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUser.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUser.java index 3712f80..a365906 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUser.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.tenant.core.TenantEntity; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserOnline.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserOnline.java index ba30eb6..12363be 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserPost.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserPost.java index 119c117..144df8a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserRole.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserRole.java index 0a50e80..b070639 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package com.fuyuanshen.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysClientBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysClientBo.java index e5f5ffa..c4eb9e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysClientBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.system.domain.SysClient; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.fuyuanshen.system.domain.SysClient; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysConfigBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysConfigBo.java index 257935d..643865d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysConfigBo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysConfig; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysConfig; /** * 参数配置业务对象 sys_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDeptBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDeptBo.java index 0d8ac84..8f4e958 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDeptBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,8 +7,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDept; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysDept; /** * 部门业务对象 sys_dept diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDictDataBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDictDataBo.java index 042946c..a73b2fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDictDataBo.java @@ -1,13 +1,12 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictData; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysDictData; /** * 字典数据业务对象 sys_dict_data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDictTypeBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDictTypeBo.java index fcc1ac1..52bd835 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysDictTypeBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,9 +6,9 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictType; +import com.fuyuanshen.common.core.constant.RegexConstants; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysDictType; /** * 字典类型业务对象 sys_dict_type diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysLogininforBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysLogininforBo.java index 4646162..a9a932f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysLogininforBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.system.domain.SysLogininfor; +import com.fuyuanshen.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysMenuBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysMenuBo.java index fbaafaa..c33861f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysMenuBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import com.fasterxml.jackson.annotation.JsonInclude; import io.github.linpeilie.annotations.AutoMapper; @@ -8,9 +8,9 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysMenu; +import com.fuyuanshen.common.core.constant.RegexConstants; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysMenu; /** * 菜单权限业务对象 sys_menu diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysNoticeBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysNoticeBo.java index cdcc575..765d5ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysNoticeBo.java @@ -1,13 +1,13 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysNotice; +import com.fuyuanshen.common.core.xss.Xss; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysNotice; /** * 通知公告业务对象 sys_notice diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOperLogBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOperLogBo.java index f16400a..e54dbb3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOperLogBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.domain.SysOperLog; +import com.fuyuanshen.common.log.event.OperLogEvent; +import com.fuyuanshen.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOssBo.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOssBo.java index ff624c9..5ca51ba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOssBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOss; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOssConfigBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOssConfigBo.java index 3dc4328..8c77d04 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysOssConfigBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysOssConfig; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysPostBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysPostBo.java index 09805cd..4e18a90 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysPostBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysPost; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysPost; /** * 岗位信息业务对象 sys_post diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysRoleBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysRoleBo.java index 5e3e602..e48bab7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysRoleBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -7,9 +7,9 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysRole; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysRole; /** * 角色信息业务对象 sys_role diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysSocialBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysSocialBo.java index cede1e9..2551252 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysSocialBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.system.domain.SysSocial; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.tenant.core.TenantEntity; +import com.fuyuanshen.system.domain.SysSocial; /** * 社会化关系业务对象 sys_social diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysTenantBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysTenantBo.java index e3ac642..a62c58d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysTenantBo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenant; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.system.domain.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import jakarta.validation.constraints.*; import java.util.Date; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; /** * 租户业务对象 sys_tenant diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysTenantPackageBo.java similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysTenantPackageBo.java index eecbc9f..a32c06c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysTenantPackageBo.java @@ -1,15 +1,15 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.domain.SysTenantPackage; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.system.domain.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; /** * 租户套餐业务对象 sys_tenant_package @@ -37,7 +37,7 @@ public class SysTenantPackageBo extends BaseEntity { /** * 关联菜单id */ - @AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") + @AutoMapping(target = "menuIds", expression = "java(com.fuyuanshen.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") private Long[] menuIds; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserBo.java index 1472d24..60fbdb1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysUser; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.xss.Xss; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.system.domain.SysUser; /** * 用户信息业务对象 sys_user diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserPasswordBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserPasswordBo.java index 8615fcd..99f9000 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserPasswordBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserProfileBo.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserProfileBo.java index 846dd79..517dc0e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/bo/SysUserProfileBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package com.fuyuanshen.system.domain.bo; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Pattern; @@ -6,11 +6,11 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.RegexConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import com.fuyuanshen.common.core.constant.RegexConstants; +import com.fuyuanshen.common.core.xss.Xss; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.sensitive.annotation.Sensitive; +import com.fuyuanshen.common.sensitive.core.SensitiveStrategy; /** * 个人信息业务处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/MetaVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/MetaVo.java index b2c1148..ae7818c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/MetaVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; import lombok.Data; /** * 路由显示信息 * - * @author ruoyi + * @author fys */ @Data diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/RouterVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/RouterVo.java index d56e09d..812f9ae 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysClientVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysClientVo.java index 82b0f46..44241d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysClientVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; -import org.dromara.system.domain.SysClient; +import com.fuyuanshen.system.domain.SysClient; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysConfigVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysConfigVo.java index a35e132..6285c83 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysConfigVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysConfig; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDeptVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDeptVo.java index c9f5a1f..e69f872 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDeptVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDept; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysDept; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDictDataVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDictDataVo.java index d97c00d..071f409 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDictDataVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictData; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysDictData; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDictTypeVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDictTypeVo.java index 4b62226..696b933 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysDictTypeVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictType; +import com.fuyuanshen.system.domain.SysDictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysLogininforVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysLogininforVo.java index 3086aa7..6b3121a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysLogininforVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import java.util.Date; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysLogininfor; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysMenuVo.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysMenuVo.java index 5214a33..8244553 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysMenuVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; -import org.dromara.system.domain.SysMenu; +import com.fuyuanshen.system.domain.SysMenu; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysNoticeVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysNoticeVo.java index afe7367..38a3509 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysNoticeVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysNotice; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.system.domain.SysNotice; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOperLogVo.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOperLogVo.java index 00b3344..04201ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOperLogVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysOperLog; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysOperLog; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssConfigVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssConfigVo.java index a030722..42f3627 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssConfigVo.java @@ -1,7 +1,7 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.domain.SysOssConfig; +import com.fuyuanshen.system.domain.SysOssConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssUploadVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssUploadVo.java index 11e0ff8..235c9ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssUploadVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssVo.java index fe05651..2e612a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysOssVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysOss; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.system.domain.SysOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysPostVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysPostVo.java index 50140b6..5d4e17c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysPostVo.java @@ -1,14 +1,14 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysPost; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.system.domain.SysPost; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysRoleVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysRoleVo.java index 1a205cc..8149ce8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysRoleVo.java @@ -1,13 +1,13 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysRole; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysRole; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysSocialVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysSocialVo.java index 948dbcc..a9108b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysSocialVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.system.domain.SysSocial; +import com.fuyuanshen.system.domain.SysSocial; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysTenantPackageVo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysTenantPackageVo.java index ead9229..897ed67 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysTenantPackageVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenantPackage; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysTenantVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysTenantVo.java index 021c664..ce167ce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysTenantVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import java.util.Date; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysTenant; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.system.domain.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserExportVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserExportVo.java index 913ab20..44517ae 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserExportVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.ReverseAutoMapping; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserImportVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserImportVo.java index d4e575c..c30a11d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import com.fuyuanshen.common.excel.annotation.ExcelDictFormat; +import com.fuyuanshen.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserInfoVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserInfoVo.java index e41355d..7e104f5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserVo.java index 86249d2..d7f91c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/SysUserVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysUser; +import com.fuyuanshen.common.sensitive.annotation.Sensitive; +import com.fuyuanshen.common.sensitive.core.SensitiveStrategy; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.system.domain.SysUser; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/UserInfoVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/UserInfoVo.java index 48fa92a..5559f5a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/domain/vo/UserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package com.fuyuanshen.system.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/listener/SysUserImportListener.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/listener/SysUserImportListener.java index 66db5f5..b3fe43b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/listener/SysUserImportListener.java @@ -1,4 +1,4 @@ -package org.dromara.system.listener; +package com.fuyuanshen.system.listener; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,18 +8,18 @@ import cn.idev.excel.context.AnalysisContext; import cn.idev.excel.event.AnalysisEventListener; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.excel.core.ExcelListener; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserImportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysUserService; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.excel.core.ExcelListener; +import com.fuyuanshen.common.excel.core.ExcelResult; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.vo.SysUserImportVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.service.ISysConfigService; +import com.fuyuanshen.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysClientMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysClientMapper.java new file mode 100644 index 0000000..2f4898b --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysClientMapper.java @@ -0,0 +1,15 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.system.domain.SysClient; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 授权管理Mapper接口 + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +public interface SysClientMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysConfigMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..472f8e3 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysConfigMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysConfig; +import com.fuyuanshen.system.domain.vo.SysConfigVo; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +public interface SysConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDeptMapper.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDeptMapper.java index b69624c..e33995b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDeptMapper.java @@ -1,16 +1,16 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.vo.SysDeptVo; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.common.mybatis.helper.DataBaseHelper; +import com.fuyuanshen.system.domain.SysDept; +import com.fuyuanshen.system.domain.vo.SysDeptVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictDataMapper.java similarity index 76% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictDataMapper.java index 7298db3..23c41ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictDataMapper.java @@ -1,9 +1,9 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.vo.SysDictDataVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysDictData; +import com.fuyuanshen.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictTypeMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..2dcc044 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.system.domain.SysDictType; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.vo.SysDictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictTypeMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysLogininforMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..ac0e21c --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysLogininforMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysLogininfor; +import com.fuyuanshen.system.domain.vo.SysLogininforVo; + +/** + * 系统访问日志情况信息 数据层 + * + * @author Lion Li + */ +public interface SysLogininforMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysMenuMapper.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysMenuMapper.java index 205413b..32083c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysMenuMapper.java @@ -1,13 +1,13 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.vo.SysMenuVo; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysMenu; +import com.fuyuanshen.system.domain.vo.SysMenuVo; import java.util.List; diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysNoticeMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..7945410 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysNoticeMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysNotice; +import com.fuyuanshen.system.domain.vo.SysNoticeVo; + +/** + * 通知公告表 数据层 + * + * @author Lion Li + */ +public interface SysNoticeMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOperLogMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..b936dd2 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOperLogMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysOperLog; +import com.fuyuanshen.system.domain.vo.SysOperLogVo; + +/** + * 操作日志 数据层 + * + * @author Lion Li + */ +public interface SysOperLogMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssConfigMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssConfigMapper.java new file mode 100644 index 0000000..3d68426 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssConfigMapper.java @@ -0,0 +1,16 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysOssConfig; +import com.fuyuanshen.system.domain.vo.SysOssConfigVo; + +/** + * 对象存储配置Mapper接口 + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +public interface SysOssConfigMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java new file mode 100644 index 0000000..748d696 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysOssMapper.java @@ -0,0 +1,13 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysOss; +import com.fuyuanshen.system.domain.vo.SysOssVo; + +/** + * 文件上传 数据层 + * + * @author Lion Li + */ +public interface SysOssMapper extends BaseMapperPlus { +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysPostMapper.java similarity index 75% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysPostMapper.java index 60da074..94677c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysPostMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.vo.SysPostVo; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysPost; +import com.fuyuanshen.system.domain.vo.SysPostVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleDeptMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleDeptMapper.java index 3de0bb6..ccc40e5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleDept; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleMapper.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleMapper.java index 9cb1ea5..4e613aa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.vo.SysRoleVo; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysRole; +import com.fuyuanshen.system.domain.vo.SysRoleVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleMenuMapper.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleMenuMapper.java index d754303..e4a87af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysRoleMenuMapper.java @@ -1,8 +1,8 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleMenu; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysRoleMenu; import java.util.List; diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysSocialMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysSocialMapper.java new file mode 100644 index 0000000..98230ca --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysSocialMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysSocial; +import com.fuyuanshen.system.domain.vo.SysSocialVo; + +/** + * 社会化关系Mapper接口 + * + * @author thiszhc + */ +public interface SysSocialMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantMapper.java new file mode 100644 index 0000000..95fa503 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.system.domain.SysTenant; +import com.fuyuanshen.system.domain.vo.SysTenantVo; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 租户Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantMapper extends BaseMapperPlus { + +} diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantPackageMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantPackageMapper.java new file mode 100644 index 0000000..dfc0644 --- /dev/null +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysTenantPackageMapper.java @@ -0,0 +1,14 @@ +package com.fuyuanshen.system.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysTenantPackage; +import com.fuyuanshen.system.domain.vo.SysTenantPackageVo; + +/** + * 租户套餐Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantPackageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserMapper.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserMapper.java index 46695aa..9970a6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserMapper.java @@ -1,15 +1,15 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.vo.SysUserExportVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserPostMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserPostMapper.java index 07c1371..9dc4a18 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserPost; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserRoleMapper.java similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserRoleMapper.java index 8340348..a55e969 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package com.fuyuanshen.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserRole; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.system.domain.SysUserRole; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/runner/SystemApplicationRunner.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/runner/SystemApplicationRunner.java index 27dad7d..ba3ebf9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/runner/SystemApplicationRunner.java @@ -1,6 +1,6 @@ -package org.dromara.system.runner; +package com.fuyuanshen.system.runner; -import org.dromara.system.service.ISysOssConfigService; +import com.fuyuanshen.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysClientService.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysClientService.java index 546c3f3..6a5e897 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysClientService.java @@ -1,10 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.bo.SysClientBo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysConfigService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysConfigService.java index f7efda7..e0f6ff8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysConfigBo; +import com.fuyuanshen.system.domain.vo.SysConfigVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDataScopeService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDataScopeService.java index 3f252f7..48d8b0c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDataScopeService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; /** * 通用 数据权限 服务 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDeptService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDeptService.java index 1397443..40b6ffd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDeptService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysDeptBo; +import com.fuyuanshen.system.domain.vo.SysDeptVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictDataService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictDataService.java index 0e697db..1f8fc32 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictDataService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysDictDataBo; +import com.fuyuanshen.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictTypeService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictTypeService.java index 3b32d6c..004b6e5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictTypeService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysDictTypeBo; +import com.fuyuanshen.system.domain.vo.SysDictDataVo; +import com.fuyuanshen.system.domain.vo.SysDictTypeVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysLogininforService.java similarity index 76% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysLogininforService.java index 6b3b7a6..7809d7b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysLogininforService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysLogininforBo; +import com.fuyuanshen.system.domain.vo.SysLogininforVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysMenuService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysMenuService.java index f972691..4da8a90 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; +import com.fuyuanshen.system.domain.SysMenu; +import com.fuyuanshen.system.domain.bo.SysMenuBo; +import com.fuyuanshen.system.domain.vo.RouterVo; +import com.fuyuanshen.system.domain.vo.SysMenuVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysNoticeService.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysNoticeService.java index 8ec999d..332ca3f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysNoticeService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysNoticeBo; +import com.fuyuanshen.system.domain.vo.SysNoticeVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOperLogService.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOperLogService.java index 9573510..1327dfb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOperLogService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysOperLogBo; +import com.fuyuanshen.system.domain.vo.SysOperLogVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOssConfigService.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOssConfigService.java index 2f6dfc9..bb63d81 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOssConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysOssConfigBo; +import com.fuyuanshen.system.domain.vo.SysOssConfigVo; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOssService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOssService.java index 057c068..4f261ec 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysOssService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysOssBo; +import com.fuyuanshen.system.domain.vo.SysOssVo; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysPermissionService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysPermissionService.java index 0116df5..25f77c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysPermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysPostService.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysPostService.java index a760d49..68b0074 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysPostService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysPostBo; +import com.fuyuanshen.system.domain.vo.SysPostVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysRoleService.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysRoleService.java index cec4bf7..e15f2c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysRoleService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.SysUserRole; +import com.fuyuanshen.system.domain.bo.SysRoleBo; +import com.fuyuanshen.system.domain.vo.SysRoleVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysSocialService.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysSocialService.java index cc7016e..ab01af9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysSocialService.java @@ -1,7 +1,7 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; +import com.fuyuanshen.system.domain.bo.SysSocialBo; +import com.fuyuanshen.system.domain.vo.SysSocialVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysTenantPackageService.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysTenantPackageService.java index d060b68..0ed20ba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysTenantPackageService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysTenantPackageBo; +import com.fuyuanshen.system.domain.vo.SysTenantPackageVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysTenantService.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysTenantService.java index f697829..903dbf5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysTenantService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.system.domain.vo.SysTenantVo; +import com.fuyuanshen.system.domain.bo.SysTenantBo; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysUserService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysUserService.java index 1fe5545..7682640 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysUserService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package com.fuyuanshen.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.vo.SysUserExportVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysClientServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysClientServiceImpl.java index 4f6e676..56c2a95 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,16 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.mapper.SysClientMapper; -import org.dromara.system.service.ISysClientService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.SysClient; +import com.fuyuanshen.system.domain.bo.SysClientBo; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.mapper.SysClientMapper; +import com.fuyuanshen.system.service.ISysClientService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysConfigServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysConfigServiceImpl.java index d92647c..37fcd0c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; @@ -6,23 +6,23 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.ConfigService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.mapper.SysConfigMapper; -import org.dromara.system.service.ISysConfigService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.ConfigService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.ObjectUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.SysConfig; +import com.fuyuanshen.system.domain.bo.SysConfigBo; +import com.fuyuanshen.system.domain.vo.SysConfigVo; +import com.fuyuanshen.system.mapper.SysConfigMapper; +import com.fuyuanshen.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDataScopeServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDataScopeServiceImpl.java index 12a5072..0ebca1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDataScopeServiceImpl.java @@ -1,17 +1,17 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.service.ISysDataScopeService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.system.domain.SysDept; +import com.fuyuanshen.system.domain.SysRoleDept; +import com.fuyuanshen.system.mapper.SysDeptMapper; +import com.fuyuanshen.system.mapper.SysRoleDeptMapper; +import com.fuyuanshen.system.service.ISysDataScopeService; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDeptServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDeptServiceImpl.java index 5e4904d..58b30b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,26 +10,26 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.dto.DeptDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.utils.*; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysDeptService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.dto.DeptDTO; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.DeptService; +import com.fuyuanshen.common.core.utils.*; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.helper.DataBaseHelper; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.SysDept; +import com.fuyuanshen.system.domain.SysRole; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.bo.SysDeptBo; +import com.fuyuanshen.system.domain.vo.SysDeptVo; +import com.fuyuanshen.system.mapper.SysDeptMapper; +import com.fuyuanshen.system.mapper.SysRoleMapper; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.system.service.ISysDeptService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Caching; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictDataServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictDataServiceImpl.java index da43947..adcf47d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictDataServiceImpl.java @@ -1,22 +1,22 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.domain.SysDictData; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.service.ISysDictDataService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.ObjectUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.system.domain.SysDictData; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.system.domain.bo.SysDictDataBo; +import com.fuyuanshen.system.domain.vo.SysDictDataVo; +import com.fuyuanshen.system.mapper.SysDictDataMapper; +import com.fuyuanshen.system.service.ISysDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictTypeServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictTypeServiceImpl.java index c417b42..822a2b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -8,26 +8,26 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.dto.DictDataDTO; -import org.dromara.common.core.domain.dto.DictTypeDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.SysDictType; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.mapper.SysDictTypeMapper; -import org.dromara.system.service.ISysDictTypeService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.domain.dto.DictDataDTO; +import com.fuyuanshen.common.core.domain.dto.DictTypeDTO; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.system.domain.SysDictData; +import com.fuyuanshen.system.domain.SysDictType; +import com.fuyuanshen.system.domain.bo.SysDictTypeBo; +import com.fuyuanshen.system.domain.vo.SysDictDataVo; +import com.fuyuanshen.system.domain.vo.SysDictTypeVo; +import com.fuyuanshen.system.mapper.SysDictDataMapper; +import com.fuyuanshen.system.mapper.SysDictTypeMapper; +import com.fuyuanshen.system.service.ISysDictTypeService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysLogininforServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysLogininforServiceImpl.java index 72b497e..23b18ad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysLogininforServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgent; @@ -8,22 +8,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.mapper.SysLogininforMapper; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysLogininforService; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.ServletUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.ip.AddressUtils; +import com.fuyuanshen.common.log.event.LogininforEvent; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.SysLogininfor; +import com.fuyuanshen.system.domain.bo.SysLogininforBo; +import com.fuyuanshen.system.domain.vo.SysClientVo; +import com.fuyuanshen.system.domain.vo.SysLogininforVo; +import com.fuyuanshen.system.mapper.SysLogininforMapper; +import com.fuyuanshen.system.service.ISysClientService; +import com.fuyuanshen.system.service.ISysLogininforService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysMenuServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysMenuServiceImpl.java index 692b3ce..3fb894a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,25 +8,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MetaVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.mapper.SysMenuMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysMenuService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.TreeBuildUtils; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.SysMenu; +import com.fuyuanshen.system.domain.SysRole; +import com.fuyuanshen.system.domain.SysRoleMenu; +import com.fuyuanshen.system.domain.SysTenantPackage; +import com.fuyuanshen.system.domain.bo.SysMenuBo; +import com.fuyuanshen.system.domain.vo.MetaVo; +import com.fuyuanshen.system.domain.vo.RouterVo; +import com.fuyuanshen.system.domain.vo.SysMenuVo; +import com.fuyuanshen.system.mapper.SysMenuMapper; +import com.fuyuanshen.system.mapper.SysRoleMapper; +import com.fuyuanshen.system.mapper.SysRoleMenuMapper; +import com.fuyuanshen.system.mapper.SysTenantPackageMapper; +import com.fuyuanshen.system.service.ISysMenuService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysNoticeServiceImpl.java similarity index 81% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysNoticeServiceImpl.java index 19a3ff5..f62d513 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysNoticeServiceImpl.java @@ -1,21 +1,21 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysNotice; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysNoticeBo; -import org.dromara.system.domain.vo.SysNoticeVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysNoticeMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysNoticeService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.ObjectUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.SysNotice; +import com.fuyuanshen.system.domain.SysUser; +import com.fuyuanshen.system.domain.bo.SysNoticeBo; +import com.fuyuanshen.system.domain.vo.SysNoticeVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.mapper.SysNoticeMapper; +import com.fuyuanshen.system.mapper.SysUserMapper; +import com.fuyuanshen.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOperLogServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOperLogServiceImpl.java index 27c2f32..ea6805f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOperLogServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysOperLog; -import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.vo.SysOperLogVo; -import org.dromara.system.mapper.SysOperLogMapper; -import org.dromara.system.service.ISysOperLogService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.ip.AddressUtils; +import com.fuyuanshen.common.log.event.OperLogEvent; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.SysOperLog; +import com.fuyuanshen.system.domain.bo.SysOperLogBo; +import com.fuyuanshen.system.domain.vo.SysOperLogVo; +import com.fuyuanshen.system.mapper.SysOperLogMapper; +import com.fuyuanshen.system.service.ISysOperLogService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssConfigServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssConfigServiceImpl.java index a67b04e..e676445 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,22 +8,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ObjectUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.system.domain.SysOssConfig; -import org.dromara.system.domain.bo.SysOssConfigBo; -import org.dromara.system.domain.vo.SysOssConfigVo; -import org.dromara.system.mapper.SysOssConfigMapper; -import org.dromara.system.service.ISysOssConfigService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.ObjectUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.oss.constant.OssConstant; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.common.redis.utils.RedisUtils; +import com.fuyuanshen.system.domain.SysOssConfig; +import com.fuyuanshen.system.domain.bo.SysOssConfigBo; +import com.fuyuanshen.system.domain.vo.SysOssConfigVo; +import com.fuyuanshen.system.mapper.SysOssConfigMapper; +import com.fuyuanshen.system.service.ISysOssConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssServiceImpl.java index 1f2bf80..9d3d8cf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; @@ -8,26 +8,26 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.dto.OssDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.core.OssClient; -import org.dromara.common.oss.entity.UploadResult; -import org.dromara.common.oss.enums.AccessPolicyType; -import org.dromara.common.oss.factory.OssFactory; -import org.dromara.system.domain.SysOss; -import org.dromara.system.domain.bo.SysOssBo; -import org.dromara.system.domain.vo.SysOssVo; -import org.dromara.system.mapper.SysOssMapper; -import org.dromara.system.service.ISysOssService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.domain.dto.OssDTO; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.OssService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.file.FileUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.oss.core.OssClient; +import com.fuyuanshen.common.oss.entity.UploadResult; +import com.fuyuanshen.common.oss.enums.AccessPolicyType; +import com.fuyuanshen.common.oss.factory.OssFactory; +import com.fuyuanshen.system.domain.SysOss; +import com.fuyuanshen.system.domain.bo.SysOssBo; +import com.fuyuanshen.system.domain.vo.SysOssVo; +import com.fuyuanshen.system.mapper.SysOssMapper; +import com.fuyuanshen.system.service.ISysOssService; import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysPermissionServiceImpl.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysPermissionServiceImpl.java index 4bf6974..9d81bed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysPermissionServiceImpl.java @@ -1,12 +1,12 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.service.PermissionService; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.service.ISysMenuService; -import org.dromara.system.service.ISysPermissionService; -import org.dromara.system.service.ISysRoleService; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.service.PermissionService; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.service.ISysMenuService; +import com.fuyuanshen.system.service.ISysPermissionService; +import com.fuyuanshen.system.service.ISysRoleService; import org.springframework.stereotype.Service; import java.util.HashSet; @@ -15,7 +15,7 @@ import java.util.Set; /** * 用户权限处理 * - * @author ruoyi + * @author fys */ @RequiredArgsConstructor @Service diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysPostServiceImpl.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysPostServiceImpl.java index 122492e..5be6b39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysPostServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,23 +6,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.PostService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysDept; -import org.dromara.system.domain.SysPost; -import org.dromara.system.domain.SysUserPost; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.mapper.SysDeptMapper; -import org.dromara.system.mapper.SysPostMapper; -import org.dromara.system.mapper.SysUserPostMapper; -import org.dromara.system.service.ISysPostService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.PostService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.SysDept; +import com.fuyuanshen.system.domain.SysPost; +import com.fuyuanshen.system.domain.SysUserPost; +import com.fuyuanshen.system.domain.bo.SysPostBo; +import com.fuyuanshen.system.domain.vo.SysPostVo; +import com.fuyuanshen.system.mapper.SysDeptMapper; +import com.fuyuanshen.system.mapper.SysPostMapper; +import com.fuyuanshen.system.mapper.SysUserPostMapper; +import com.fuyuanshen.system.service.ISysPostService; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysRoleServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysRoleServiceImpl.java index 0a2e485..a67a1b3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -12,29 +12,29 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.RoleService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.mapper.SysRoleDeptMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.service.ISysRoleService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.domain.model.LoginUser; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.RoleService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.SysRole; +import com.fuyuanshen.system.domain.SysRoleDept; +import com.fuyuanshen.system.domain.SysRoleMenu; +import com.fuyuanshen.system.domain.SysUserRole; +import com.fuyuanshen.system.domain.bo.SysRoleBo; +import com.fuyuanshen.system.domain.vo.SysRoleVo; +import com.fuyuanshen.system.mapper.SysRoleDeptMapper; +import com.fuyuanshen.system.mapper.SysRoleMapper; +import com.fuyuanshen.system.mapper.SysRoleMenuMapper; +import com.fuyuanshen.system.mapper.SysUserRoleMapper; +import com.fuyuanshen.system.service.ISysRoleService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysSensitiveServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysSensitiveServiceImpl.java index 8a0d45e..7ed0707 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysSensitiveServiceImpl.java @@ -1,10 +1,10 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.sensitive.core.SensitiveService; +import com.fuyuanshen.common.tenant.helper.TenantHelper; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysSocialServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysSocialServiceImpl.java index 9c54cbc..5b4e0a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysSocialServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.SysSocial; -import org.dromara.system.domain.bo.SysSocialBo; -import org.dromara.system.domain.vo.SysSocialVo; -import org.dromara.system.mapper.SysSocialMapper; -import org.dromara.system.service.ISysSocialService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.system.domain.SysSocial; +import com.fuyuanshen.system.domain.bo.SysSocialBo; +import com.fuyuanshen.system.domain.vo.SysSocialVo; +import com.fuyuanshen.system.mapper.SysSocialMapper; +import com.fuyuanshen.system.service.ISysSocialService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTaskAssigneeServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTaskAssigneeServiceImpl.java index 31e9be9..9605bc0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTaskAssigneeServiceImpl.java @@ -1,24 +1,24 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.core.service.TaskAssigneeService; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDeptBo; -import org.dromara.system.domain.bo.SysPostBo; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysDeptVo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysDeptService; -import org.dromara.system.service.ISysPostService; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import com.fuyuanshen.common.core.domain.dto.TaskAssigneeDTO; +import com.fuyuanshen.common.core.domain.model.TaskAssigneeBody; +import com.fuyuanshen.common.core.service.TaskAssigneeService; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.bo.SysDeptBo; +import com.fuyuanshen.system.domain.bo.SysPostBo; +import com.fuyuanshen.system.domain.bo.SysRoleBo; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.vo.SysDeptVo; +import com.fuyuanshen.system.domain.vo.SysPostVo; +import com.fuyuanshen.system.domain.vo.SysRoleVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.service.ISysDeptService; +import com.fuyuanshen.system.service.ISysPostService; +import com.fuyuanshen.system.service.ISysRoleService; +import com.fuyuanshen.system.service.ISysUserService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTenantPackageServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTenantPackageServiceImpl.java index 8d69e96..6168841 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTenantPackageServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,19 +6,19 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysTenant; -import org.dromara.system.domain.SysTenantPackage; -import org.dromara.system.domain.bo.SysTenantPackageBo; -import org.dromara.system.domain.vo.SysTenantPackageVo; -import org.dromara.system.mapper.SysTenantMapper; -import org.dromara.system.mapper.SysTenantPackageMapper; -import org.dromara.system.service.ISysTenantPackageService; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.system.domain.SysTenant; +import com.fuyuanshen.system.domain.SysTenantPackage; +import com.fuyuanshen.system.domain.bo.SysTenantPackageBo; +import com.fuyuanshen.system.domain.vo.SysTenantPackageVo; +import com.fuyuanshen.system.mapper.SysTenantMapper; +import com.fuyuanshen.system.mapper.SysTenantPackageMapper; +import com.fuyuanshen.system.service.ISysTenantPackageService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTenantServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTenantServiceImpl.java index ca08860..663b83a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysTenantServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,26 +10,26 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.domain.*; -import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.vo.SysTenantVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysTenantService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.constant.Constants; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.constant.TenantConstants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.WorkflowService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.redis.utils.CacheUtils; +import com.fuyuanshen.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.helper.TenantHelper; +import com.fuyuanshen.system.domain.*; +import com.fuyuanshen.system.domain.bo.SysTenantBo; +import com.fuyuanshen.system.domain.vo.SysTenantVo; +import com.fuyuanshen.system.mapper.*; +import com.fuyuanshen.system.service.ISysTenantService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysUserServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysUserServiceImpl.java index cc2cc88..a0b9aa8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package com.fuyuanshen.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -13,23 +13,23 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.*; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.*; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserExportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysUserService; +import com.fuyuanshen.common.core.constant.CacheNames; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.UserService; +import com.fuyuanshen.common.core.utils.*; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.system.domain.*; +import com.fuyuanshen.system.domain.bo.SysUserBo; +import com.fuyuanshen.system.domain.vo.SysPostVo; +import com.fuyuanshen.system.domain.vo.SysRoleVo; +import com.fuyuanshen.system.domain.vo.SysUserExportVo; +import com.fuyuanshen.system.domain.vo.SysUserVo; +import com.fuyuanshen.system.mapper.*; +import com.fuyuanshen.system.service.ISysUserService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/fys-modules/fys-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md rename to fys-modules/fys-system/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysClientMapper.xml index fd150ad..d7a8ff8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysClientMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysConfigMapper.xml index e542a10..720a4e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysDeptMapper.xml index 9057a0e..5a743b7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 43f494d..04134af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 5ef14ee..2924fea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysOssConfigMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysOssConfigMapper.xml index 8c2c080..0207e03 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysOssConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysOssMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysOssMapper.xml index d9b25bd..62b6ae7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysOssMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/fys-modules/fys-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to fys-modules/fys-system/src/main/resources/mapper/system/SysPostMapper.xml index 322403f..bafbc1e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/fys-modules/fys-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,9 +2,9 @@ - + - + select u.user_id from sys_user u diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/fys-modules/fys-workflow/pom.xml similarity index 51% rename from ruoyi-modules/ruoyi-workflow/pom.xml rename to fys-modules/fys-workflow/pom.xml index d195faf..059e41b 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/fys-modules/fys-workflow/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.dromara - ruoyi-modules + com.fuyuanshen + fys-modules ${revision} ../pom.xml 4.0.0 jar - ruoyi-workflow + fys-workflow 工作流模块 @@ -19,56 +19,56 @@ - org.dromara - ruoyi-common-sse + com.fuyuanshen + fys-common-sse - org.dromara - ruoyi-common-doc + com.fuyuanshen + fys-common-doc - org.dromara - ruoyi-common-mail + com.fuyuanshen + fys-common-mail - org.dromara - ruoyi-common-sms + com.fuyuanshen + fys-common-sms - org.dromara - ruoyi-common-mybatis + com.fuyuanshen + fys-common-mybatis - org.dromara - ruoyi-common-web + com.fuyuanshen + fys-common-web - org.dromara - ruoyi-common-log + com.fuyuanshen + fys-common-log - org.dromara - ruoyi-common-idempotent + com.fuyuanshen + fys-common-idempotent - org.dromara - ruoyi-common-excel + com.fuyuanshen + fys-common-excel - org.dromara - ruoyi-common-translation + com.fuyuanshen + fys-common-translation - org.dromara - ruoyi-common-tenant + com.fuyuanshen + fys-common-tenant - org.dromara - ruoyi-common-security + com.fuyuanshen + fys-common-security org.dromara.warm diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/ConditionalOnEnable.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/ConditionalOnEnable.java index e844398..b0d4288 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/ConditionalOnEnable.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common; +package com.fuyuanshen.workflow.common; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/constant/FlowConstant.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/constant/FlowConstant.java index f3290b8..2f20ad7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/constant/FlowConstant.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.constant; +package com.fuyuanshen.workflow.common.constant; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/ButtonPermissionEnum.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/ButtonPermissionEnum.java index 598cd05..d1bc64d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/ButtonPermissionEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.fuyuanshen.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/MessageTypeEnum.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/MessageTypeEnum.java index 0fe5cfe..5339d46 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/MessageTypeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.fuyuanshen.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/NodeExtEnum.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/NodeExtEnum.java index 9926a8e..599a15f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/NodeExtEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.fuyuanshen.workflow.common.enums; /** * 节点扩展属性枚举 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskAssigneeEnum.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskAssigneeEnum.java index 60be92f..3160471 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskAssigneeEnum.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.common.enums; +package com.fuyuanshen.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.exception.ServiceException; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskAssigneeType.java similarity index 96% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskAssigneeType.java index eed1b91..6e84e68 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskAssigneeType.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.fuyuanshen.workflow.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskStatusEnum.java similarity index 97% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskStatusEnum.java index d18ebb0..a97d4d8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/common/enums/TaskStatusEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package com.fuyuanshen.workflow.common.enums; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/config/WarmFlowConfig.java similarity index 64% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/config/WarmFlowConfig.java index 08f1808..580f5c2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/config/WarmFlowConfig.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.config; +package com.fuyuanshen.workflow.config; -import org.dromara.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; import org.springframework.context.annotation.Configuration; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwCategoryController.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwCategoryController.java index 3018b08..51336ab 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwCategoryController.java @@ -1,23 +1,23 @@ -package org.dromara.workflow.controller; +package com.fuyuanshen.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.bo.FlowCategoryBo; -import org.dromara.workflow.domain.vo.FlowCategoryVo; -import org.dromara.workflow.service.IFlwCategoryService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.constant.FlowConstant; +import com.fuyuanshen.workflow.domain.bo.FlowCategoryBo; +import com.fuyuanshen.workflow.domain.vo.FlowCategoryVo; +import com.fuyuanshen.workflow.service.IFlwCategoryService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwDefinitionController.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwDefinitionController.java index 10d9de8..f5bc64d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwDefinitionController.java @@ -1,20 +1,20 @@ -package org.dromara.workflow.controller; +package com.fuyuanshen.workflow.controller; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.domain.vo.FlowDefinitionVo; +import com.fuyuanshen.workflow.service.IFlwDefinitionService; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; -import org.dromara.workflow.service.IFlwDefinitionService; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwInstanceController.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwInstanceController.java index e7ea5e4..4070543 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwInstanceController.java @@ -1,20 +1,20 @@ -package org.dromara.workflow.controller; +package com.fuyuanshen.workflow.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.domain.bo.FlowCancelBo; +import com.fuyuanshen.workflow.domain.bo.FlowInstanceBo; +import com.fuyuanshen.workflow.domain.bo.FlowInvalidBo; +import com.fuyuanshen.workflow.domain.vo.FlowInstanceVo; +import com.fuyuanshen.workflow.service.IFlwInstanceService; import org.dromara.warm.flow.core.service.InsService; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.FlowCancelBo; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.bo.FlowInvalidBo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; -import org.dromara.workflow.service.IFlwInstanceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwTaskController.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwTaskController.java index 5534b67..0237dd0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/FlwTaskController.java @@ -1,23 +1,23 @@ -package org.dromara.workflow.controller; +package com.fuyuanshen.workflow.controller; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.domain.dto.StartProcessReturnDTO; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.orm.entity.FlowNode; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; -import org.dromara.workflow.service.IFlwTaskService; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.domain.bo.*; +import com.fuyuanshen.workflow.domain.vo.FlowHisTaskVo; +import com.fuyuanshen.workflow.domain.vo.FlowTaskVo; +import com.fuyuanshen.workflow.service.IFlwTaskService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/TestLeaveController.java similarity index 77% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/TestLeaveController.java index 98825d9..5817e5e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/controller/TestLeaveController.java @@ -1,24 +1,24 @@ -package org.dromara.workflow.controller; +package com.fuyuanshen.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; -import org.dromara.workflow.service.ITestLeaveService; +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.excel.utils.ExcelUtil; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.domain.bo.TestLeaveBo; +import com.fuyuanshen.workflow.domain.vo.TestLeaveVo; +import com.fuyuanshen.workflow.service.ITestLeaveService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/FlowCategory.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/FlowCategory.java index 28918f1..0349ae7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/FlowCategory.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain; +package com.fuyuanshen.workflow.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import com.fuyuanshen.common.tenant.core.TenantEntity; import java.io.Serial; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/TestLeave.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/TestLeave.java index 7d42a9b..9101057 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/TestLeave.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain; +package com.fuyuanshen.workflow.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/BackProcessBo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/BackProcessBo.java index 654bf08..f5aec91 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/BackProcessBo.java @@ -1,9 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/CompleteTaskBo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/CompleteTaskBo.java index e5befff..a8897db 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/CompleteTaskBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCancelBo.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCancelBo.java index 31742ea..64ef9ca 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCancelBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCategoryBo.java similarity index 79% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCategoryBo.java index fd626eb..fa5bf66 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCategoryBo.java @@ -1,14 +1,14 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.FlowCategory; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.workflow.domain.FlowCategory; /** * 流程分类业务对象 wf_category diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCopyBo.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCopyBo.java index a45e521..e2e2bd9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowCopyBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowInstanceBo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowInstanceBo.java index fb1fe61..d966845 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowInstanceBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowInvalidBo.java similarity index 83% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowInvalidBo.java index 297bd00..0625605 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowInvalidBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowNextNodeBo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowNextNodeBo.java index 12f0653..9212470 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowNextNodeBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowTaskBo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowTaskBo.java index 64dd082..9b099ba 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowTaskBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowTerminationBo.java similarity index 83% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowTerminationBo.java index 897fc21..b8ff7ba 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/FlowTerminationBo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/StartProcessBo.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/StartProcessBo.java index ea21a81..fe76d29 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/StartProcessBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.AddGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/TaskOperationBo.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/TaskOperationBo.java index 4348e31..0fb4ccf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/TaskOperationBo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/TestLeaveBo.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/TestLeaveBo.java index 395f71d..10a2174 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/bo/TestLeaveBo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.bo; +package com.fuyuanshen.workflow.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.workflow.domain.TestLeave; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.workflow.domain.TestLeave; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/ButtonPermissionVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/ButtonPermissionVo.java index 7175e5e..6877a94 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/ButtonPermissionVo.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowCategoryVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowCategoryVo.java index db236c2..4e82ffb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowCategoryVo.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.workflow.domain.FlowCategory; +import com.fuyuanshen.workflow.domain.FlowCategory; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowDefinitionVo.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowDefinitionVo.java index aef7573..ee8a5dc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowDefinitionVo.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.workflow.common.constant.FlowConstant; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowHisTaskVo.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowHisTaskVo.java index 8776a76..60c5fc1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowHisTaskVo.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import lombok.Data; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.fuyuanshen.common.core.utils.DateUtils; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.workflow.common.constant.FlowConstant; import org.dromara.warm.flow.core.enums.CooperateType; -import org.dromara.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowInstanceVo.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowInstanceVo.java index 75543f4..76c1377 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowInstanceVo.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.workflow.common.constant.FlowConstant; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.workflow.common.constant.FlowConstant; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowTaskVo.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowTaskVo.java index 07a22c4..e347ee4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/FlowTaskVo.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import com.fuyuanshen.common.translation.annotation.Translation; +import com.fuyuanshen.common.translation.constant.TransConstant; +import com.fuyuanshen.workflow.common.constant.FlowConstant; import org.dromara.warm.flow.core.entity.User; -import org.dromara.workflow.common.constant.FlowConstant; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/TestLeaveVo.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/TestLeaveVo.java index 57777ed..c7d5940 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/domain/vo/TestLeaveVo.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.domain.vo; +package com.fuyuanshen.workflow.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.workflow.domain.TestLeave; +import com.fuyuanshen.workflow.domain.TestLeave; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/handler/FlowProcessEventHandler.java similarity index 90% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/handler/FlowProcessEventHandler.java index c465271..6aedcf6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/handler/FlowProcessEventHandler.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.handler; +package com.fuyuanshen.workflow.handler; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.domain.event.ProcessDeleteEvent; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.tenant.helper.TenantHelper; +import com.fuyuanshen.common.core.domain.event.ProcessTaskEvent; +import com.fuyuanshen.common.core.domain.event.ProcessDeleteEvent; +import com.fuyuanshen.common.core.domain.event.ProcessEvent; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.tenant.helper.TenantHelper; import org.dromara.warm.flow.core.entity.Instance; -import org.dromara.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/handler/WorkflowPermissionHandler.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/handler/WorkflowPermissionHandler.java index f9ede15..b92fbba 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/handler/WorkflowPermissionHandler.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.handler; +package com.fuyuanshen.workflow.handler; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.handler.PermissionHandler; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.service.IFlwCommonService; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.service.IFlwCommonService; import org.springframework.stereotype.Component; import java.util.Collections; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/listener/WorkflowGlobalListener.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/listener/WorkflowGlobalListener.java index c1ef262..39e99d9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/listener/WorkflowGlobalListener.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.listener; +package com.fuyuanshen.workflow.listener; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.enums.BusinessStatusEnum; +import com.fuyuanshen.common.core.utils.StringUtils; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.Definition; @@ -17,14 +17,14 @@ import org.dromara.warm.flow.core.listener.ListenerVariable; import org.dromara.warm.flow.core.service.InsService; import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.warm.flow.orm.entity.FlowTask; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.bo.FlowCopyBo; -import org.dromara.workflow.handler.FlowProcessEventHandler; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwInstanceService; -import org.dromara.workflow.service.IFlwTaskService; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.constant.FlowConstant; +import com.fuyuanshen.workflow.common.enums.TaskStatusEnum; +import com.fuyuanshen.workflow.domain.bo.FlowCopyBo; +import com.fuyuanshen.workflow.handler.FlowProcessEventHandler; +import com.fuyuanshen.workflow.service.IFlwCommonService; +import com.fuyuanshen.workflow.service.IFlwInstanceService; +import com.fuyuanshen.workflow.service.IFlwTaskService; import org.springframework.stereotype.Component; import java.util.HashMap; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwCategoryMapper.java similarity index 79% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwCategoryMapper.java index d2c0b3a..e55aa16 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwCategoryMapper.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.mapper; +package com.fuyuanshen.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.vo.FlowCategoryVo; +import com.fuyuanshen.common.mybatis.annotation.DataColumn; +import com.fuyuanshen.common.mybatis.annotation.DataPermission; +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.common.mybatis.helper.DataBaseHelper; +import com.fuyuanshen.workflow.domain.FlowCategory; +import com.fuyuanshen.workflow.domain.vo.FlowCategoryVo; import java.util.List; import java.util.stream.Collectors; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwInstanceMapper.java similarity index 80% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwInstanceMapper.java index 92809c8..7849304 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwInstanceMapper.java @@ -1,11 +1,11 @@ -package org.dromara.workflow.mapper; +package com.fuyuanshen.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; +import com.fuyuanshen.workflow.domain.bo.FlowInstanceBo; +import com.fuyuanshen.workflow.domain.vo.FlowInstanceVo; /** * 实例信息Mapper接口 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwTaskMapper.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwTaskMapper.java index fd86c82..a9c0507 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/FlwTaskMapper.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.mapper; +package com.fuyuanshen.workflow.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.workflow.domain.bo.FlowTaskBo; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; +import com.fuyuanshen.workflow.domain.bo.FlowTaskBo; +import com.fuyuanshen.workflow.domain.vo.FlowHisTaskVo; +import com.fuyuanshen.workflow.domain.vo.FlowTaskVo; import java.util.List; diff --git a/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/TestLeaveMapper.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/TestLeaveMapper.java new file mode 100644 index 0000000..3fe500c --- /dev/null +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/mapper/TestLeaveMapper.java @@ -0,0 +1,15 @@ +package com.fuyuanshen.workflow.mapper; + +import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus; +import com.fuyuanshen.workflow.domain.TestLeave; +import com.fuyuanshen.workflow.domain.vo.TestLeaveVo; + +/** + * 请假Mapper接口 + * + * @author may + * @date 2023-07-21 + */ +public interface TestLeaveMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwCategoryService.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwCategoryService.java index 91f173d..c4fd272 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwCategoryService.java @@ -1,8 +1,8 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.workflow.domain.bo.FlowCategoryBo; -import org.dromara.workflow.domain.vo.FlowCategoryVo; +import com.fuyuanshen.workflow.domain.bo.FlowCategoryBo; +import com.fuyuanshen.workflow.domain.vo.FlowCategoryVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwCommonService.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwCommonService.java index 662d599..8bb3ba7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwCommonService.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwDefinitionService.java similarity index 88% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwDefinitionService.java index 1a2d29f..2ca3219 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwDefinitionService.java @@ -1,10 +1,10 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.workflow.domain.vo.FlowDefinitionVo; import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwInstanceService.java similarity index 89% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwInstanceService.java index 01e5124..af5fa32 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwInstanceService.java @@ -1,12 +1,12 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.workflow.domain.bo.FlowCancelBo; +import com.fuyuanshen.workflow.domain.bo.FlowInstanceBo; +import com.fuyuanshen.workflow.domain.bo.FlowInvalidBo; +import com.fuyuanshen.workflow.domain.vo.FlowInstanceVo; import org.dromara.warm.flow.orm.entity.FlowInstance; -import org.dromara.workflow.domain.bo.FlowCancelBo; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.bo.FlowInvalidBo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwNodeExtService.java similarity index 80% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwNodeExtService.java index 9595165..77a1134 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwNodeExtService.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; -import org.dromara.workflow.domain.vo.ButtonPermissionVo; +import com.fuyuanshen.workflow.domain.vo.ButtonPermissionVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwTaskAssigneeService.java similarity index 87% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwTaskAssigneeService.java index 830abaf..c5337bc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwTaskAssigneeService.java @@ -1,6 +1,6 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; -import org.dromara.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.domain.dto.UserDTO; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwTaskService.java similarity index 91% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwTaskService.java index e172c00..5347ef2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/IFlwTaskService.java @@ -1,17 +1,17 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.core.domain.dto.StartProcessReturnDTO; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.workflow.domain.bo.*; +import com.fuyuanshen.workflow.domain.vo.FlowHisTaskVo; +import com.fuyuanshen.workflow.domain.vo.FlowTaskVo; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.orm.entity.FlowHisTask; import org.dromara.warm.flow.orm.entity.FlowNode; import org.dromara.warm.flow.orm.entity.FlowTask; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/ITestLeaveService.java similarity index 72% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/ITestLeaveService.java index 67b50ba..44fa20a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/ITestLeaveService.java @@ -1,9 +1,9 @@ -package org.dromara.workflow.service; +package com.fuyuanshen.workflow.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.workflow.domain.bo.TestLeaveBo; +import com.fuyuanshen.workflow.domain.vo.TestLeaveVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/CategoryNameTranslationImpl.java similarity index 69% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/CategoryNameTranslationImpl.java index 8c73b59..42c3518 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/CategoryNameTranslationImpl.java @@ -1,13 +1,13 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.core.TranslationInterface; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.service.IFlwCategoryService; +import com.fuyuanshen.common.translation.annotation.TranslationType; +import com.fuyuanshen.common.translation.core.TranslationInterface; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.constant.FlowConstant; +import com.fuyuanshen.workflow.service.IFlwCategoryService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwCategoryServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwCategoryServiceImpl.java index db1b7b7..a97c422 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -6,20 +6,20 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.*; -import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.constant.SystemConstants; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.*; +import com.fuyuanshen.common.mybatis.helper.DataBaseHelper; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.constant.FlowConstant; +import com.fuyuanshen.workflow.domain.FlowCategory; +import com.fuyuanshen.workflow.domain.bo.FlowCategoryBo; +import com.fuyuanshen.workflow.domain.vo.FlowCategoryVo; +import com.fuyuanshen.workflow.mapper.FlwCategoryMapper; +import com.fuyuanshen.workflow.service.IFlwCategoryService; import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.bo.FlowCategoryBo; -import org.dromara.workflow.domain.vo.FlowCategoryVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.service.IFlwCategoryService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwCommonServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwCommonServiceImpl.java index e6dc815..83963c4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwCommonServiceImpl.java @@ -1,26 +1,26 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mail.utils.MailUtils; -import org.dromara.common.sse.dto.SseMessageDto; -import org.dromara.common.sse.utils.SseMessageUtils; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.utils.SpringUtils; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mail.utils.MailUtils; +import com.fuyuanshen.common.sse.dto.SseMessageDto; +import com.fuyuanshen.common.sse.utils.SseMessageUtils; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.enums.MessageTypeEnum; +import com.fuyuanshen.workflow.service.IFlwCommonService; +import com.fuyuanshen.workflow.service.IFlwTaskAssigneeService; +import com.fuyuanshen.workflow.service.IFlwTaskService; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.core.enums.SkipType; import org.dromara.warm.flow.core.service.NodeService; import org.dromara.warm.flow.orm.entity.FlowTask; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.MessageTypeEnum; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwTaskAssigneeService; -import org.dromara.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwDefinitionServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwDefinitionServiceImpl.java index 7936210..5ae6528 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -10,12 +10,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.constant.FlowConstant; +import com.fuyuanshen.workflow.domain.FlowCategory; +import com.fuyuanshen.workflow.domain.vo.FlowDefinitionVo; +import com.fuyuanshen.workflow.mapper.FlwCategoryMapper; +import com.fuyuanshen.workflow.service.IFlwCommonService; +import com.fuyuanshen.workflow.service.IFlwDefinitionService; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; import org.dromara.warm.flow.core.enums.PublishStatus; @@ -28,13 +35,6 @@ import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; import org.dromara.warm.flow.orm.mapper.FlowSkipMapper; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.domain.FlowCategory; -import org.dromara.workflow.domain.vo.FlowDefinitionVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwDefinitionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.dromara.common.core.constant.TenantConstants.DEFAULT_TENANT_ID; +import static com.fuyuanshen.common.core.constant.TenantConstants.DEFAULT_TENANT_ID; /** * 流程定义 服务层实现 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwInstanceServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwInstanceServiceImpl.java index 848bec4..d2530ca 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwInstanceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -11,14 +11,26 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.enums.BusinessStatusEnum; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.enums.TaskStatusEnum; +import com.fuyuanshen.workflow.domain.bo.FlowCancelBo; +import com.fuyuanshen.workflow.domain.bo.FlowInstanceBo; +import com.fuyuanshen.workflow.domain.bo.FlowInvalidBo; +import com.fuyuanshen.workflow.domain.vo.FlowHisTaskVo; +import com.fuyuanshen.workflow.domain.vo.FlowInstanceVo; +import com.fuyuanshen.workflow.handler.FlowProcessEventHandler; +import com.fuyuanshen.workflow.mapper.FlwCategoryMapper; +import com.fuyuanshen.workflow.mapper.FlwInstanceMapper; +import com.fuyuanshen.workflow.service.IFlwInstanceService; +import com.fuyuanshen.workflow.service.IFlwTaskService; import org.dromara.warm.flow.core.constant.ExceptionCons; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.Definition; @@ -33,18 +45,6 @@ import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.warm.flow.orm.entity.FlowTask; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.bo.FlowCancelBo; -import org.dromara.workflow.domain.bo.FlowInstanceBo; -import org.dromara.workflow.domain.bo.FlowInvalidBo; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowInstanceVo; -import org.dromara.workflow.handler.FlowProcessEventHandler; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.mapper.FlwInstanceMapper; -import org.dromara.workflow.service.IFlwInstanceService; -import org.dromara.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwNodeExtServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwNodeExtServiceImpl.java index fca21a3..f7e5e27 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwNodeExtServiceImpl.java @@ -1,21 +1,21 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.DictTypeDTO; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; +import com.fuyuanshen.common.core.domain.dto.DictTypeDTO; +import com.fuyuanshen.common.core.service.DictService; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.json.utils.JsonUtils; import org.dromara.warm.flow.ui.service.NodeExtService; import org.dromara.warm.flow.ui.vo.NodeExt; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.ButtonPermissionEnum; -import org.dromara.workflow.common.enums.NodeExtEnum; -import org.dromara.workflow.domain.vo.ButtonPermissionVo; -import org.dromara.workflow.service.IFlwNodeExtService; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.enums.ButtonPermissionEnum; +import com.fuyuanshen.workflow.common.enums.NodeExtEnum; +import com.fuyuanshen.workflow.domain.vo.ButtonPermissionVo; +import com.fuyuanshen.workflow.service.IFlwNodeExtService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwTaskAssigneeServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwTaskAssigneeServiceImpl.java index 3009e0a..025cf0d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,25 +6,25 @@ import cn.hutool.core.lang.Pair; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.DeptDTO; -import org.dromara.common.core.domain.dto.TaskAssigneeDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.domain.model.TaskAssigneeBody; -import org.dromara.common.core.enums.FormatsType; -import org.dromara.common.core.service.DeptService; -import org.dromara.common.core.service.TaskAssigneeService; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.domain.dto.DeptDTO; +import com.fuyuanshen.common.core.domain.dto.TaskAssigneeDTO; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.domain.model.TaskAssigneeBody; +import com.fuyuanshen.common.core.enums.FormatsType; +import com.fuyuanshen.common.core.service.DeptService; +import com.fuyuanshen.common.core.service.TaskAssigneeService; +import com.fuyuanshen.common.core.service.UserService; +import com.fuyuanshen.common.core.utils.DateUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.enums.TaskAssigneeEnum; +import com.fuyuanshen.workflow.service.IFlwTaskAssigneeService; import org.dromara.warm.flow.ui.dto.HandlerFunDto; import org.dromara.warm.flow.ui.dto.HandlerQuery; import org.dromara.warm.flow.ui.dto.TreeFunDto; import org.dromara.warm.flow.ui.service.HandlerSelectService; import org.dromara.warm.flow.ui.vo.HandlerFeedBackVo; import org.dromara.warm.flow.ui.vo.HandlerSelectVo; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.enums.TaskAssigneeEnum; -import org.dromara.workflow.service.IFlwTaskAssigneeService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwTaskServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwTaskServiceImpl.java index 8a2f723..adf423d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/FlwTaskServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -11,19 +11,32 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.domain.dto.UserDTO; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; +import com.fuyuanshen.common.core.domain.dto.StartProcessReturnDTO; +import com.fuyuanshen.common.core.domain.dto.UserDTO; +import com.fuyuanshen.common.core.enums.BusinessStatusEnum; +import com.fuyuanshen.common.core.exception.ServiceException; +import com.fuyuanshen.common.core.service.UserService; +import com.fuyuanshen.common.core.utils.StreamUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.utils.ValidatorUtils; +import com.fuyuanshen.common.core.validate.AddGroup; +import com.fuyuanshen.common.core.validate.EditGroup; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.satoken.utils.LoginHelper; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.common.constant.FlowConstant; +import com.fuyuanshen.workflow.common.enums.TaskAssigneeType; +import com.fuyuanshen.workflow.common.enums.TaskStatusEnum; +import com.fuyuanshen.workflow.domain.bo.*; +import com.fuyuanshen.workflow.domain.vo.FlowHisTaskVo; +import com.fuyuanshen.workflow.domain.vo.FlowTaskVo; +import com.fuyuanshen.workflow.mapper.FlwCategoryMapper; +import com.fuyuanshen.workflow.mapper.FlwTaskMapper; +import com.fuyuanshen.workflow.service.IFlwCommonService; +import com.fuyuanshen.workflow.service.IFlwNodeExtService; +import com.fuyuanshen.workflow.service.IFlwTaskAssigneeService; +import com.fuyuanshen.workflow.service.IFlwTaskService; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.*; @@ -37,19 +50,6 @@ import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; -import org.dromara.workflow.common.enums.TaskAssigneeType; -import org.dromara.workflow.common.enums.TaskStatusEnum; -import org.dromara.workflow.domain.bo.*; -import org.dromara.workflow.domain.vo.FlowHisTaskVo; -import org.dromara.workflow.domain.vo.FlowTaskVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.mapper.FlwTaskMapper; -import org.dromara.workflow.service.IFlwCommonService; -import org.dromara.workflow.service.IFlwNodeExtService; -import org.dromara.workflow.service.IFlwTaskAssigneeService; -import org.dromara.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -57,7 +57,7 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import static org.dromara.workflow.common.constant.FlowConstant.*; +import static com.fuyuanshen.workflow.common.constant.FlowConstant.*; /** * 任务 服务层实现 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/TestLeaveServiceImpl.java similarity index 86% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/TestLeaveServiceImpl.java index 3a77334..5d44952 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/TestLeaveServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -9,22 +9,22 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.event.ProcessTaskEvent; -import org.dromara.common.core.domain.event.ProcessDeleteEvent; -import org.dromara.common.core.domain.event.ProcessEvent; -import org.dromara.common.core.enums.BusinessStatusEnum; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.TestLeave; -import org.dromara.workflow.domain.bo.TestLeaveBo; -import org.dromara.workflow.domain.vo.TestLeaveVo; -import org.dromara.workflow.mapper.TestLeaveMapper; -import org.dromara.workflow.service.ITestLeaveService; +import com.fuyuanshen.common.core.domain.event.ProcessTaskEvent; +import com.fuyuanshen.common.core.domain.event.ProcessDeleteEvent; +import com.fuyuanshen.common.core.domain.event.ProcessEvent; +import com.fuyuanshen.common.core.enums.BusinessStatusEnum; +import com.fuyuanshen.common.core.service.WorkflowService; +import com.fuyuanshen.common.core.utils.MapstructUtils; +import com.fuyuanshen.common.core.utils.StringUtils; +import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.domain.TestLeave; +import com.fuyuanshen.workflow.domain.bo.TestLeaveBo; +import com.fuyuanshen.workflow.domain.vo.TestLeaveVo; +import com.fuyuanshen.workflow.mapper.TestLeaveMapper; +import com.fuyuanshen.workflow.service.ITestLeaveService; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/WorkflowServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java rename to fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/WorkflowServiceImpl.java index 0c02240..77ac667 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ b/fys-modules/fys-workflow/src/main/java/com/fuyuanshen/workflow/service/impl/WorkflowServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.workflow.service.impl; +package com.fuyuanshen.workflow.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.dto.CompleteTaskDTO; -import org.dromara.common.core.domain.dto.StartProcessDTO; -import org.dromara.common.core.domain.dto.StartProcessReturnDTO; -import org.dromara.common.core.service.WorkflowService; -import org.dromara.common.core.utils.StringUtils; +import com.fuyuanshen.common.core.domain.dto.CompleteTaskDTO; +import com.fuyuanshen.common.core.domain.dto.StartProcessDTO; +import com.fuyuanshen.common.core.domain.dto.StartProcessReturnDTO; +import com.fuyuanshen.common.core.service.WorkflowService; +import com.fuyuanshen.common.core.utils.StringUtils; import org.dromara.warm.flow.orm.entity.FlowInstance; -import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.domain.bo.CompleteTaskBo; -import org.dromara.workflow.domain.bo.StartProcessBo; -import org.dromara.workflow.service.IFlwDefinitionService; -import org.dromara.workflow.service.IFlwInstanceService; -import org.dromara.workflow.service.IFlwTaskService; +import com.fuyuanshen.workflow.common.ConditionalOnEnable; +import com.fuyuanshen.workflow.domain.bo.CompleteTaskBo; +import com.fuyuanshen.workflow.domain.bo.StartProcessBo; +import com.fuyuanshen.workflow.service.IFlwDefinitionService; +import com.fuyuanshen.workflow.service.IFlwInstanceService; +import com.fuyuanshen.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/fys-modules/fys-workflow/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md rename to fys-modules/fys-workflow/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml b/fys-modules/fys-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml similarity index 83% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml rename to fys-modules/fys-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml index e9918f1..1c07eaf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml +++ b/fys-modules/fys-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/fys-modules/fys-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml similarity index 93% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml rename to fys-modules/fys-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml index f539030..356a8cb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml +++ b/fys-modules/fys-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml @@ -2,10 +2,10 @@ - - + + - +