From 936ac913c50ac35ed6dc3d78011a8c90f76c801a Mon Sep 17 00:00:00 2001 From: lijun Date: Fri, 30 Jan 2026 22:57:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/collection/CollectionUtilsTest.java | 0 ...taPermissionAnnotationInterceptorTest.java | 0 .../aop/DataPermissionContextHolderTest.java | 0 .../db/DataPermissionRuleHandlerTest.java | 0 .../DataPermissionRuleFactoryImplTest.java | 0 .../rule/dept/DeptDataPermissionRuleTest.java | 0 .../core/util/DataPermissionUtilsTest.java | 0 .../ip/core/utils/AreaUtilsTest.java | 0 .../framework/ip/core/utils/IPUtilsTest.java | 0 ...ava => YanzhuTenantAutoConfiguration.java} | 7 +-- .../yanzhu/framework/tenant/package-info.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ....java => YanzhuDictAutoConfiguration.java} | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../core/util/DictFrameworkUtilsTest.java | 0 ...java => YanzhuAsyncAutoConfiguration.java} | 2 +- ...ava => YanzhuQuartzAutoConfiguration.java} | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- ...va => YanzhuMetricsAutoConfiguration.java} | 2 +- ...ava => YanzhuTracerAutoConfiguration.java} | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- ...a => YanzhuRabbitMQAutoConfiguration.java} | 2 +- ...nzhuRedisMQConsumerAutoConfiguration.java} | 6 +-- ...nzhuRedisMQProducerAutoConfiguration.java} | 6 +-- ...ot.autoconfigure.AutoConfiguration.imports | 6 +-- ...ava => YanzhuIdempotentConfiguration.java} | 6 +-- ...on.java => YanzhuLock4jConfiguration.java} | 2 +- ...va => YanzhuRateLimiterConfiguration.java} | 25 ++++----- .../YanzhuApiSignatureAutoConfiguration.java | 26 ++++++++++ .../YudaoApiSignatureAutoConfiguration.java | 28 ---------- ...ot.autoconfigure.AutoConfiguration.imports | 8 +-- .../signature/core/ApiSignatureTest.java | 0 ...java => YanzhuCacheAutoConfiguration.java} | 8 +-- ...erties.java => YanzhuCacheProperties.java} | 2 +- ...java => YanzhuRedisAutoConfiguration.java} | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 +- .../YanzhuSecurityAutoConfiguration.java | 2 +- .../test/core/ut/BaseDbAndRedisUnitTest.java | 12 ++--- .../test/core/ut/BaseDbUnitTest.java | 8 +-- .../test/core/ut/BaseRedisUnitTest.java | 4 +- .../YanzhuApiEncryptAutoConfiguration.java | 2 +- .../framework/web/config/WebProperties.java | 2 +- .../config/YanzhuXssAutoConfiguration.java | 2 +- .../desensitize/core/DesensitizeTest.java | 0 .../desensitize/core/annotation/Address.java | 0 .../core/handler/AddressHandler.java | 0 .../framework/encrypt/ApiEncryptTest.java | 0 ... => YanzhuWebSocketAutoConfiguration.java} | 6 +-- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../ai/config/AiAutoConfiguration.java | 52 +++++++++---------- ...roperties.java => YanzhuAiProperties.java} | 2 +- .../ai/core/model/AiModelFactoryImpl.java | 4 +- .../web/config/AiWebConfiguration.java | 4 +- .../model/chat/AnthropicChatModelTest.java | 0 .../model/chat/AzureOpenAIChatModelTests.java | 0 .../model/chat/BaiChuanChatModelTests.java | 0 .../core/model/chat/CozeChatModelTests.java | 0 .../model/chat/DeepSeekChatModelTests.java | 0 .../core/model/chat/DifyChatModelTests.java | 0 .../core/model/chat/DouBaoChatModelTests.java | 0 .../model/chat/FastGPTChatModelTests.java | 0 .../core/model/chat/GeminiChatModelTests.java | 0 .../model/chat/HunYuanChatModelTests.java | 0 .../core/model/chat/LlamaChatModelTests.java | 0 .../model/chat/MiniMaxChatModelTests.java | 0 .../model/chat/MoonshotChatModelTests.java | 0 .../core/model/chat/OllamaChatModelTests.java | 0 .../core/model/chat/OpenAIChatModelTests.java | 0 .../model/chat/SiliconFlowChatModelTests.java | 0 .../core/model/chat/TongYiChatModelTests.java | 0 .../model/chat/XingHuoChatModelTests.java | 0 .../core/model/chat/YiYanChatModelTests.java | 0 .../model/chat/ZhiPuAiChatModelTests.java | 0 .../core/model/image/MidjourneyApiTests.java | 0 .../model/image/OpenAiImageModelTests.java | 0 .../core/model/image/QianFanImageTests.java | 0 .../image/SiliconFlowImageModelTests.java | 0 .../image/StabilityAiImageModelTests.java | 0 .../model/image/TongYiImagesModelTest.java | 0 .../model/image/ZhiPuAiImageModelTests.java | 0 .../ai/core/model/mcp/DouBaoMcpTests.java | 0 .../ai/core/model/music/SunoApiTests.java | 0 .../model/ppt/xunfei/XunFeiPptApiTests.java | 0 .../websearch/AiBoChaWebSearchClientTest.java | 0 .../web/config/BpmWebConfiguration.java | 4 +- .../BpmTaskCandidateInvokerTest.java | 0 .../BpmTaskAssignLeaderExpressionTest.java | 0 ...kCandidateDeptLeaderMultiStrategyTest.java | 0 ...pmTaskCandidateDeptLeaderStrategyTest.java | 0 ...pmTaskCandidateDeptMemberStrategyTest.java | 0 ...eStartUserDeptLeaderMultiStrategyTest.java | 0 ...didateStartUserDeptLeaderStrategyTest.java | 0 ...kCandidateStartUserSelectStrategyTest.java | 0 ...mTaskCandidateAssignEmptyStrategyTest.java | 0 ...pmTaskCandidateExpressionStrategyTest.java | 0 .../BpmTaskCandidateGroupStrategyTest.java | 0 .../BpmTaskCandidatePostStrategyTest.java | 0 .../BpmTaskCandidateRoleStrategyTest.java | 0 ...BpmTaskCandidateStartUserStrategyTest.java | 0 .../BpmTaskCandidateUserStrategyTest.java | 0 .../category/BpmCategoryServiceImplTest.java | 0 .../definition/BpmFormServiceTest.java | 0 .../definition/BpmUserGroupServiceTest.java | 0 .../web/config/CrmWebConfiguration.java | 4 +- .../web/config/ErpWebConfiguration.java | 4 +- .../config/AdminServerConfiguration.java | 2 +- .../web/config/InfraWebConfiguration.java | 4 +- .../file/core/ftp/FtpFileClientTest.java | 0 .../file/core/local/LocalFileClientTest.java | 0 .../file/core/s3/S3FileClientTest.java | 0 .../file/core/sftp/SftpFileClientTest.java | 0 .../service/DefaultDatabaseQueryTest.java | 0 .../codegen/CodegenServiceImplTest.java | 0 .../codegen/inner/CodegenBuilderTest.java | 0 .../inner/CodegenEngineAbstractTest.java | 0 .../codegen/inner/CodegenEngineVue2Test.java | 0 .../codegen/inner/CodegenEngineVue3Test.java | 0 .../service/config/ConfigServiceImplTest.java | 0 .../db/DataSourceConfigServiceImplTest.java | 0 .../db/DatabaseTableServiceImplTest.java | 0 .../file/FileConfigServiceImplTest.java | 0 .../service/file/FileServiceImplTest.java | 0 .../service/job/JobLogServiceImplTest.java | 0 .../infra/service/job/JobServiceImplTest.java | 0 .../logger/ApiAccessLogServiceImplTest.java | 0 .../logger/ApiErrorLogServiceImplTest.java | 0 ...operties.java => YanzhuIotProperties.java} | 2 +- .../web/config/IotWebConfiguration.java | 4 +- .../job/device/IotDeviceOfflineCheckJob.java | 4 +- .../databridge/IotDataBridgeExecuteTest.java | 0 .../data/action/IotTcpDataRuleActionTest.java | 0 .../scene/IotSceneRuleServiceSimpleTest.java | 0 .../matcher/IotBaseConditionMatcherTest.java | 0 .../IotCurrentTimeConditionMatcherTest.java | 0 ...IotDevicePropertyConditionMatcherTest.java | 0 .../IotDeviceStateConditionMatcherTest.java | 0 .../IotDeviceEventPostTriggerMatcherTest.java | 0 ...tDevicePropertyPostTriggerMatcherTest.java | 0 ...DeviceServiceInvokeTriggerMatcherTest.java | 0 ...otDeviceStateUpdateTriggerMatcherTest.java | 0 .../trigger/IotTimerTriggerMatcherTest.java | 0 .../timer/IotSceneRuleTimerHandlerTest.java | 0 .../IotMessageBusAutoConfiguration.java | 4 +- .../core/redis/IotRedisMessageBus.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../iot/core/messagebus/core/TestMessage.java | 0 .../LocalIotMessageBusIntegrationTest.java | 0 .../rocketmq/RocketMQIotMessageBusTest.java | 0 .../core/util/IotDeviceMessageUtilsTest.java | 0 .../web/config/ProductWebConfiguration.java | 4 +- .../brand/ProductBrandServiceImplTest.java | 0 .../ProductCategoryServiceImplTest.java | 0 .../ProductCommentServiceImplTest.java | 0 .../service/sku/ProductSkuServiceTest.java | 0 .../spu/ProductSpuServiceImplTest.java | 0 .../web/config/PromotionWebConfiguration.java | 4 +- .../ArticleCategoryServiceImplTest.java | 0 .../article/ArticleServiceImplTest.java | 0 .../CombinationActivityServiceImplTest.java | 0 .../coupon/CouponTemplateServiceImplTest.java | 0 .../DiscountActivityServiceImplTest.java | 0 .../service/diy/DiyPageServiceImplTest.java | 0 .../diy/DiyTemplateServiceImplTest.java | 0 .../reward/RewardActivityServiceImplTest.java | 0 .../SeckillActivityServiceImplTest.java | 0 .../SeckillConfigServiceImplTest.java | 0 .../web/config/TradeWebConfiguration.java | 4 +- .../Kd100ExpressClientIntegrationTest.java | 0 .../KdNiaoExpressClientIntegrationTest.java | 0 .../aftersale/AfterSaleServiceTest.java | 0 .../BrokerageRecordServiceImplTest.java | 0 .../BrokerageUserServiceImplTest.java | 0 .../BrokerageWithdrawServiceImplTest.java | 0 .../order/TradeOrderUpdateServiceTest.java | 0 .../price/TradePriceServiceImplTest.java | 0 .../TradeCouponPriceCalculatorTest.java | 0 .../TradeDeliveryPriceCalculatorTest.java | 0 ...deDiscountActivityPriceCalculatorTest.java | 0 .../TradePointGiveCalculatorTest.java | 0 .../TradePointUsePriceCalculatorTest.java | 0 ...radeRewardActivityPriceCalculatorTest.java | 0 .../web/config/MemberWebConfiguration.java | 4 +- .../address/MemberAddressServiceImplTest.java | 0 .../service/auth/MemberAuthServiceTest.java | 4 +- .../group/MemberGroupServiceImplTest.java | 0 .../level/MemberLevelServiceImplTest.java | 0 .../service/tag/MemberTagServiceImplTest.java | 0 .../user/MemberUserServiceImplTest.java | 4 +- .../web/config/MpWebConfiguration.java | 4 +- .../web/config/PayWebConfiguration.java | 4 +- .../PayClientFactoryImplIntegrationTest.java | 0 .../impl/alipay/AbstractAlipayClientTest.java | 0 .../impl/alipay/AlipayBarPayClientTest.java | 0 .../impl/alipay/AlipayPcPayClientTest.java | 0 .../impl/alipay/AlipayQrPayClientTest.java | 0 .../impl/alipay/AlipayWapPayClientTest.java | 0 .../weixin/WxBarPayClientIntegrationTest.java | 0 .../WxNativePayClientIntegrationTest.java | 0 .../pay/service/app/PayAppServiceTest.java | 0 .../channel/PayChannelServiceTest.java | 0 .../service/notify/PayNotifyServiceTest.java | 0 .../service/order/PayOrderServiceTest.java | 0 .../service/refund/PayRefundServiceTest.java | 0 .../goview/GoViewDataServiceImplTest.java | 0 .../goview/GoViewProjectServiceImplTest.java | 0 .../web/config/SystemWebConfiguration.java | 4 +- ...m.anji.captcha.service.CaptchaCacheService | 2 +- .../com.anji.captcha.service.CaptchaService | 2 +- .../oauth2/OAuth2OpenControllerTest.java | 0 .../core/client/impl/AliyunSmsClientTest.java | 0 .../core/client/impl/HuaweiSmsClientTest.java | 0 .../core/client/impl/QiniuSmsClientTest.java | 0 .../sms/core/client/impl/SmsClientTests.java | 0 .../client/impl/TencentSmsClientTest.java | 0 .../auth/AdminAuthServiceImplTest.java | 0 .../service/dept/DeptServiceImplTest.java | 0 .../service/dept/PostServiceImplTest.java | 0 .../service/dict/DictDataServiceImplTest.java | 0 .../service/dict/DictTypeServiceImplTest.java | 0 .../logger/LoginLogServiceImplTest.java | 0 .../logger/OperateLogServiceImplTest.java | 0 .../mail/MailAccountServiceImplTest.java | 0 .../service/mail/MailLogServiceImplTest.java | 0 .../service/mail/MailSendServiceImplTest.java | 0 .../mail/MailTemplateServiceImplTest.java | 0 .../service/notice/NoticeServiceImplTest.java | 0 .../notify/NotifyMessageServiceImplTest.java | 0 .../notify/NotifySendServiceImplTest.java | 0 .../notify/NotifyTemplateServiceImplTest.java | 0 .../oauth2/OAuth2ApproveServiceImplTest.java | 0 .../oauth2/OAuth2ClientServiceImplTest.java | 0 .../oauth2/OAuth2CodeServiceImplTest.java | 0 .../oauth2/OAuth2GrantServiceImplTest.java | 0 .../oauth2/OAuth2TokenServiceImplTest.java | 0 .../permission/MenuServiceImplTest.java | 0 .../permission/PermissionServiceTest.java | 0 .../permission/RoleServiceImplTest.java | 0 .../service/sms/SmsChannelServiceTest.java | 0 .../service/sms/SmsCodeServiceImplTest.java | 0 .../service/sms/SmsLogServiceImplTest.java | 0 .../service/sms/SmsSendServiceImplTest.java | 0 .../sms/SmsTemplateServiceImplTest.java | 0 .../social/SocialClientServiceImplTest.java | 0 .../social/SocialUserServiceImplTest.java | 0 .../tenant/TenantPackageServiceImplTest.java | 0 .../service/tenant/TenantServiceImplTest.java | 0 .../user/AdminUserServiceImplTest.java | 0 yanzhu-server/pom.xml | 12 ----- .../server/YanzhuServerApplication.java | 4 +- 249 files changed, 172 insertions(+), 188 deletions(-) rename yanzhu-framework/yanzhu-common/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/common/util/collection/CollectionUtilsTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/datapermission/core/aop/DataPermissionContextHolderTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/datapermission/core/util/DataPermissionUtilsTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/ip/core/utils/AreaUtilsTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/ip/core/utils/IPUtilsTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/{YudaoTenantAutoConfiguration.java => YanzhuTenantAutoConfiguration.java} (97%) rename yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/{YudaoDictAutoConfiguration.java => YanzhuDictAutoConfiguration.java} (92%) rename yanzhu-framework/yanzhu-spring-boot-starter-excel/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/dict/core/util/DictFrameworkUtilsTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/{YudaoAsyncAutoConfiguration.java => YanzhuAsyncAutoConfiguration.java} (97%) rename yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/{YudaoQuartzAutoConfiguration.java => YanzhuQuartzAutoConfiguration.java} (94%) rename yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/{YudaoMetricsAutoConfiguration.java => YanzhuMetricsAutoConfiguration.java} (95%) rename yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/{YudaoTracerAutoConfiguration.java => YanzhuTracerAutoConfiguration.java} (97%) rename yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/{YudaoRabbitMQAutoConfiguration.java => YanzhuRabbitMQAutoConfiguration.java} (94%) rename yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/{YudaoRedisMQConsumerAutoConfiguration.java => YanzhuRedisMQConsumerAutoConfiguration.java} (97%) rename yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/{YudaoRedisMQProducerAutoConfiguration.java => YanzhuRedisMQProducerAutoConfiguration.java} (82%) rename yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/{YudaoIdempotentConfiguration.java => YanzhuIdempotentConfiguration.java} (90%) rename yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/{YudaoLock4jConfiguration.java => YanzhuLock4jConfiguration.java} (93%) rename yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/{YudaoRateLimiterConfiguration.java => YanzhuRateLimiterConfiguration.java} (61%) create mode 100644 yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YanzhuApiSignatureAutoConfiguration.java delete mode 100644 yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YudaoApiSignatureAutoConfiguration.java rename yanzhu-framework/yanzhu-spring-boot-starter-protection/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/signature/core/ApiSignatureTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/{YudaoCacheAutoConfiguration.java => YanzhuCacheAutoConfiguration.java} (91%) rename yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/{YudaoCacheProperties.java => YanzhuCacheProperties.java} (93%) rename yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/{YudaoRedisAutoConfiguration.java => YanzhuRedisAutoConfiguration.java} (97%) rename yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/desensitize/core/DesensitizeTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/desensitize/core/annotation/Address.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/desensitize/core/handler/AddressHandler.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/{cn/iocoder/yudao => com/yanzhu}/framework/encrypt/ApiEncryptTest.java (100%) rename yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/{YudaoWebSocketAutoConfiguration.java => YanzhuWebSocketAutoConfiguration.java} (95%) rename yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/{YudaoAiProperties.java => YanzhuAiProperties.java} (98%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/AnthropicChatModelTest.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/AzureOpenAIChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/BaiChuanChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/CozeChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/DeepSeekChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/DifyChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/DouBaoChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/FastGPTChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/GeminiChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/HunYuanChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/LlamaChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/MiniMaxChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/MoonshotChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/OllamaChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/OpenAIChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/SiliconFlowChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/TongYiChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/XingHuoChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/YiYanChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/chat/ZhiPuAiChatModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/MidjourneyApiTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/OpenAiImageModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/QianFanImageTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/SiliconFlowImageModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/StabilityAiImageModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/TongYiImagesModelTest.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/image/ZhiPuAiImageModelTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/mcp/DouBaoMcpTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/music/SunoApiTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/model/ppt/xunfei/XunFeiPptApiTests.java (100%) rename yanzhu-module-ai/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/ai/framework/ai/core/websearch/AiBoChaWebSearchClientTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignLeaderExpressionTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateExpressionStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateGroupStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidatePostStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategyTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/service/category/BpmCategoryServiceImplTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/service/definition/BpmFormServiceTest.java (100%) rename yanzhu-module-bpm/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/bpm/service/definition/BpmUserGroupServiceTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/framework/file/core/ftp/FtpFileClientTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/framework/file/core/local/LocalFileClientTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/framework/file/core/s3/S3FileClientTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/framework/file/core/sftp/SftpFileClientTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/DefaultDatabaseQueryTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/codegen/CodegenServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/codegen/inner/CodegenBuilderTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/codegen/inner/CodegenEngineVue2Test.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/codegen/inner/CodegenEngineVue3Test.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/config/ConfigServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/db/DataSourceConfigServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/db/DatabaseTableServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/file/FileConfigServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/file/FileServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/job/JobLogServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/job/JobServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/logger/ApiAccessLogServiceImplTest.java (100%) rename yanzhu-module-infra/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/infra/service/logger/ApiErrorLogServiceImplTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/{YudaoIotProperties.java => YanzhuIotProperties.java} (93%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/action/databridge/IotDataBridgeExecuteTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/data/action/IotTcpDataRuleActionTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/IotSceneRuleServiceSimpleTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/IotBaseConditionMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandlerTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/core/messagebus/core/TestMessage.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/core/messagebus/core/local/LocalIotMessageBusIntegrationTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java (100%) rename yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/iot/core/util/IotDeviceMessageUtilsTest.java (100%) rename yanzhu-module-mall/yanzhu-module-product/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/product/service/brand/ProductBrandServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-product/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/product/service/category/ProductCategoryServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-product/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/product/service/comment/ProductCommentServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-product/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/product/service/sku/ProductSkuServiceTest.java (100%) rename yanzhu-module-mall/yanzhu-module-product/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/product/service/spu/ProductSpuServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/article/ArticleCategoryServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/article/ArticleServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/combination/CombinationActivityServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/coupon/CouponTemplateServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/discount/DiscountActivityServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/diy/DiyPageServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/diy/DiyTemplateServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/reward/RewardActivityServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-promotion/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/promotion/service/seckillconfig/SeckillConfigServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/framework/delivery/core/client/impl/Kd100ExpressClientIntegrationTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/framework/delivery/core/client/impl/KdNiaoExpressClientIntegrationTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/aftersale/AfterSaleServiceTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/brokerage/BrokerageUserServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/order/TradeOrderUpdateServiceTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/TradePriceServiceImplTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/calculator/TradePointGiveCalculatorTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/calculator/TradePointUsePriceCalculatorTest.java (100%) rename yanzhu-module-mall/yanzhu-module-trade/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java (100%) rename yanzhu-module-member/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/member/service/address/MemberAddressServiceImplTest.java (100%) rename yanzhu-module-member/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/member/service/auth/MemberAuthServiceTest.java (96%) rename yanzhu-module-member/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/member/service/group/MemberGroupServiceImplTest.java (100%) rename yanzhu-module-member/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/member/service/level/MemberLevelServiceImplTest.java (100%) rename yanzhu-module-member/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/member/service/tag/MemberTagServiceImplTest.java (100%) rename yanzhu-module-member/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/member/service/user/MemberUserServiceImplTest.java (96%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/service/app/PayAppServiceTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/service/channel/PayChannelServiceTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/service/notify/PayNotifyServiceTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/service/order/PayOrderServiceTest.java (100%) rename yanzhu-module-pay/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/pay/service/refund/PayRefundServiceTest.java (100%) rename yanzhu-module-report/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/report/service/goview/GoViewDataServiceImplTest.java (100%) rename yanzhu-module-report/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/report/service/goview/GoViewProjectServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/framework/sms/core/client/impl/SmsClientTests.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/auth/AdminAuthServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/dept/DeptServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/dept/PostServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/dict/DictDataServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/dict/DictTypeServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/logger/LoginLogServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/logger/OperateLogServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/mail/MailAccountServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/mail/MailLogServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/mail/MailSendServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/mail/MailTemplateServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/notice/NoticeServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/notify/NotifyMessageServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/notify/NotifySendServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/notify/NotifyTemplateServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/oauth2/OAuth2ClientServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/oauth2/OAuth2CodeServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/oauth2/OAuth2GrantServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/oauth2/OAuth2TokenServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/permission/MenuServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/permission/PermissionServiceTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/permission/RoleServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/sms/SmsChannelServiceTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/sms/SmsCodeServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/sms/SmsLogServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/sms/SmsSendServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/sms/SmsTemplateServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/social/SocialClientServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/social/SocialUserServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/tenant/TenantPackageServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/tenant/TenantServiceImplTest.java (100%) rename yanzhu-module-system/src/test/java/{cn/iocoder/yudao => com/yanzhu}/module/system/service/user/AdminUserServiceImplTest.java (100%) diff --git a/yanzhu-framework/yanzhu-common/src/test/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtilsTest.java b/yanzhu-framework/yanzhu-common/src/test/java/com/yanzhu/framework/common/util/collection/CollectionUtilsTest.java similarity index 100% rename from yanzhu-framework/yanzhu-common/src/test/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtilsTest.java rename to yanzhu-framework/yanzhu-common/src/test/java/com/yanzhu/framework/common/util/collection/CollectionUtilsTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/aop/DataPermissionAnnotationInterceptorTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/aop/DataPermissionContextHolderTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/aop/DataPermissionContextHolderTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/aop/DataPermissionContextHolderTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/db/DataPermissionRuleHandlerTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/rule/DataPermissionRuleFactoryImplTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/util/DataPermissionUtilsTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/util/DataPermissionUtilsTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/util/DataPermissionUtilsTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-data-permission/src/test/java/com/yanzhu/framework/datapermission/core/util/DataPermissionUtilsTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/com/yanzhu/framework/ip/core/utils/AreaUtilsTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/AreaUtilsTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/com/yanzhu/framework/ip/core/utils/AreaUtilsTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtilsTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/com/yanzhu/framework/ip/core/utils/IPUtilsTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/cn/iocoder/yudao/framework/ip/core/utils/IPUtilsTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-ip/src/test/java/com/yanzhu/framework/ip/core/utils/IPUtilsTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/YanzhuTenantAutoConfiguration.java similarity index 97% rename from yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/YudaoTenantAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/YanzhuTenantAutoConfiguration.java index 730000d..c07fb4b 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/YudaoTenantAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/config/YanzhuTenantAutoConfiguration.java @@ -3,7 +3,8 @@ package com.yanzhu.framework.tenant.config; import com.yanzhu.framework.common.biz.system.tenant.TenantCommonApi; import com.yanzhu.framework.common.enums.WebFilterOrderEnum; import com.yanzhu.framework.mybatis.core.util.MyBatisUtils; -import com.yanzhu.framework.redis.config.YudaoCacheProperties; +import com.yanzhu.framework.redis.config.YanzhuCacheProperties; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import com.yanzhu.framework.security.core.service.SecurityFrameworkService; import com.yanzhu.framework.tenant.core.aop.TenantIgnore; import com.yanzhu.framework.tenant.core.aop.TenantIgnoreAspect; @@ -54,7 +55,7 @@ import static com.yanzhu.framework.common.util.collection.CollectionUtils.conver @AutoConfiguration @ConditionalOnProperty(prefix = "yanzhu.tenant", value = "enable", matchIfMissing = true) // 允许使用 yanzhu.tenant.enable=false 禁用多租户 @EnableConfigurationProperties(TenantProperties.class) -public class YudaoTenantAutoConfiguration { +public class YanzhuTenantAutoConfiguration { @Resource private ApplicationContext applicationContext; @@ -188,7 +189,7 @@ public class YudaoTenantAutoConfiguration { @Primary // 引入租户时，tenantRedisCacheManager 为主 Bean public RedisCacheManager tenantRedisCacheManager(RedisTemplate redisTemplate, RedisCacheConfiguration redisCacheConfiguration, - YudaoCacheProperties yanzhuCacheProperties, + YanzhuCacheProperties yanzhuCacheProperties, TenantProperties tenantProperties) { // 创建 RedisCacheWriter 对象 RedisConnectionFactory connectionFactory = Objects.requireNonNull(redisTemplate.getConnectionFactory()); diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/package-info.java b/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/package-info.java index ab69a51..f331c7b 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/package-info.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/java/com/yanzhu/framework/tenant/package-info.java @@ -8,10 +8,10 @@ * 6. MQ：在 Producer 发送消息时，Header 带上 tenant-id 租户编号；在 Consumer 消费消息时，将 Header 的 tenant-id 租户编号，添加到租户上下文。 * 7. Async：异步需要保证 ThreadLocal 的传递性，通过使用阿里开源的 TransmittableThreadLocal 实现。相关的改造点，可见： * 1）Spring Async： - * {@link com.yanzhu.framework.quartz.config.YudaoAsyncAutoConfiguration#threadPoolTaskExecutorBeanPostProcessor()} + * {@link com.yanzhu.framework.quartz.config.Yanzhu#threadPoolTaskExecutorBeanPostProcessor()} * 2）Spring Security： * TransmittableThreadLocalSecurityContextHolderStrategy - * 和 YudaoSecurityAutoConfiguration#securityContextHolderMethodInvokingFactoryBean() 方法 + * 和 Yanzhu#securityContextHolderMethodInvokingFactoryBean() 方法 * */ package com.yanzhu.framework.tenant; diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 603831e..0fc06ea 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration \ No newline at end of file +com.yanzhu.framework.tenant.config.YanzhuTenantAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/YudaoDictAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/YanzhuDictAutoConfiguration.java similarity index 92% rename from yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/YudaoDictAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/YanzhuDictAutoConfiguration.java index 283972e..c6f64f2 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/YudaoDictAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/java/com/yanzhu/framework/dict/config/YanzhuDictAutoConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @AutoConfiguration -public class YudaoDictAutoConfiguration { +public class YanzhuDictAutoConfiguration { @Bean @SuppressWarnings("InstantiationOfUtilityClass") diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2125cee..34a4088 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration \ No newline at end of file +com.yanzhu.framework.dict.config.YanzhuDictAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-excel/src/test/java/com/yanzhu/framework/dict/core/util/DictFrameworkUtilsTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-excel/src/test/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtilsTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-excel/src/test/java/com/yanzhu/framework/dict/core/util/DictFrameworkUtilsTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YudaoAsyncAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YanzhuAsyncAutoConfiguration.java similarity index 97% rename from yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YudaoAsyncAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YanzhuAsyncAutoConfiguration.java index 4bd06ec..87361fa 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YudaoAsyncAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YanzhuAsyncAutoConfiguration.java @@ -14,7 +14,7 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor; */ @AutoConfiguration @EnableAsync -public class YudaoAsyncAutoConfiguration { +public class YanzhuAsyncAutoConfiguration { @Bean public BeanPostProcessor threadPoolTaskExecutorBeanPostProcessor() { diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YudaoQuartzAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YanzhuQuartzAutoConfiguration.java similarity index 94% rename from yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YudaoQuartzAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YanzhuQuartzAutoConfiguration.java index d715bd2..2447d58 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YudaoQuartzAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/java/com/yanzhu/framework/quartz/config/YanzhuQuartzAutoConfiguration.java @@ -15,7 +15,7 @@ import java.util.Optional; @AutoConfiguration @EnableScheduling // 开启 Spring 自带的定时任务 @Slf4j -public class YudaoQuartzAutoConfiguration { +public class YanzhuQuartzAutoConfiguration { @Bean public SchedulerManager schedulerManager(Optional scheduler) { diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4086f7a..97b5503 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration -cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration \ No newline at end of file +com.yanzhu.framework.quartz.config.YanzhuQuartzAutoConfiguration +com.yanzhu.framework.quartz.config.YanzhuAsyncAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YudaoMetricsAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YanzhuMetricsAutoConfiguration.java similarity index 95% rename from yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YudaoMetricsAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YanzhuMetricsAutoConfiguration.java index 40fd01b..7b85612 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YudaoMetricsAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YanzhuMetricsAutoConfiguration.java @@ -16,7 +16,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration @ConditionalOnClass({MeterRegistryCustomizer.class}) @ConditionalOnProperty(prefix = "yanzhu.metrics", value = "enable", matchIfMissing = true) // 允许使用 yanzhu.metrics.enable=false 禁用 Metrics -public class YudaoMetricsAutoConfiguration { +public class YanzhuMetricsAutoConfiguration { @Bean public MeterRegistryCustomizer metricsCommonTags( diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YudaoTracerAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YanzhuTracerAutoConfiguration.java similarity index 97% rename from yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YudaoTracerAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YanzhuTracerAutoConfiguration.java index 5423725..ff68d15 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YudaoTracerAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/java/com/yanzhu/framework/tracer/config/YanzhuTracerAutoConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean; }) @EnableConfigurationProperties(TracerProperties.class) @ConditionalOnProperty(prefix = "yanzhu.tracer", value = "enable", matchIfMissing = true) -public class YudaoTracerAutoConfiguration { +public class YanzhuTracerAutoConfiguration { // TODO @芋艿：skywalking 不兼容最新的 opentracing 版本。同时，opentracing 也停止了维护，尬住了！后续换 opentelemetry 即可！ // @Bean diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 218ee31..b308fa9 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration -cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration \ No newline at end of file +com.yanzhu.framework.tracer.config.YanzhuTracerAutoConfiguration +com.yanzhu.framework.tracer.config.YanzhuMetricsAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/YudaoRabbitMQAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/YanzhuRabbitMQAutoConfiguration.java similarity index 94% rename from yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/YudaoRabbitMQAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/YanzhuRabbitMQAutoConfiguration.java index 123d657..5a0b1ac 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/YudaoRabbitMQAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/rabbitmq/config/YanzhuRabbitMQAutoConfiguration.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration @Slf4j @ConditionalOnClass(name = "org.springframework.amqp.rabbit.core.RabbitTemplate") -public class YudaoRabbitMQAutoConfiguration { +public class YanzhuRabbitMQAutoConfiguration { /** * Jackson2JsonMessageConverter Bean：使用 jackson 序列化消息 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YudaoRedisMQConsumerAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YanzhuRedisMQConsumerAutoConfiguration.java similarity index 97% rename from yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YudaoRedisMQConsumerAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YanzhuRedisMQConsumerAutoConfiguration.java index b188364..e7c6c91 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YudaoRedisMQConsumerAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YanzhuRedisMQConsumerAutoConfiguration.java @@ -9,7 +9,7 @@ import com.yanzhu.framework.mq.redis.core.job.RedisPendingMessageResendJob; import com.yanzhu.framework.mq.redis.core.job.RedisStreamMessageCleanupJob; import com.yanzhu.framework.mq.redis.core.pubsub.AbstractRedisChannelMessageListener; import com.yanzhu.framework.mq.redis.core.stream.AbstractRedisStreamMessageListener; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Value; @@ -38,8 +38,8 @@ import java.util.Properties; */ @Slf4j @EnableScheduling // 启用定时任务，用于 RedisPendingMessageResendJob 重发消息 -@AutoConfiguration(after = YudaoRedisAutoConfiguration.class) -public class YudaoRedisMQConsumerAutoConfiguration { +@AutoConfiguration(after = YanzhuRedisAutoConfiguration.class) +public class YanzhuRedisMQConsumerAutoConfiguration { /** * 创建 Redis Pub/Sub 广播消费的容器 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YudaoRedisMQProducerAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YanzhuRedisMQProducerAutoConfiguration.java similarity index 82% rename from yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YudaoRedisMQProducerAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YanzhuRedisMQProducerAutoConfiguration.java index 25c0b9e..8c633d3 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YudaoRedisMQProducerAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/java/com/yanzhu/framework/mq/redis/config/YanzhuRedisMQProducerAutoConfiguration.java @@ -2,7 +2,7 @@ package com.yanzhu.framework.mq.redis.config; import com.yanzhu.framework.mq.redis.core.RedisMQTemplate; import com.yanzhu.framework.mq.redis.core.interceptor.RedisMessageInterceptor; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; @@ -16,8 +16,8 @@ import java.util.List; * @author 研筑科技 */ @Slf4j -@AutoConfiguration(after = YudaoRedisAutoConfiguration.class) -public class YudaoRedisMQProducerAutoConfiguration { +@AutoConfiguration(after = YanzhuRedisAutoConfiguration.class) +public class YanzhuRedisMQProducerAutoConfiguration { @Bean public RedisMQTemplate redisMQTemplate(StringRedisTemplate redisTemplate, diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 213850b..5928318 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -cn.iocoder.yudao.framework.mq.redis.config.YudaoRedisMQProducerAutoConfiguration -cn.iocoder.yudao.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration -cn.iocoder.yudao.framework.mq.rabbitmq.config.YudaoRabbitMQAutoConfiguration \ No newline at end of file +com.yanzhu.framework.mq.redis.config.YanzhuRedisMQProducerAutoConfiguration +com.yanzhu.framework.mq.redis.config.YanzhuRedisMQConsumerAutoConfiguration +com.yanzhu.framework.mq.rabbitmq.config.YanzhuRabbitMQAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/YudaoIdempotentConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/YanzhuIdempotentConfiguration.java similarity index 90% rename from yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/YudaoIdempotentConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/YanzhuIdempotentConfiguration.java index 64b4a36..c78fb72 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/YudaoIdempotentConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/idempotent/config/YanzhuIdempotentConfiguration.java @@ -7,14 +7,14 @@ import com.yanzhu.framework.idempotent.core.keyresolver.IdempotentKeyResolver; import com.yanzhu.framework.idempotent.core.keyresolver.impl.UserIdempotentKeyResolver; import com.yanzhu.framework.idempotent.core.redis.IdempotentRedisDAO; import org.springframework.boot.autoconfigure.AutoConfiguration; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.core.StringRedisTemplate; import java.util.List; -@AutoConfiguration(after = YudaoRedisAutoConfiguration.class) -public class YudaoIdempotentConfiguration { +@AutoConfiguration(after = YanzhuRedisAutoConfiguration.class) +public class YanzhuIdempotentConfiguration { @Bean public IdempotentAspect idempotentAspect(List keyResolvers, IdempotentRedisDAO idempotentRedisDAO) { diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/YudaoLock4jConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/YanzhuLock4jConfiguration.java similarity index 93% rename from yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/YudaoLock4jConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/YanzhuLock4jConfiguration.java index 4561151..5c6599b 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/YudaoLock4jConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/lock4j/config/YanzhuLock4jConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration(before = LockAutoConfiguration.class) @ConditionalOnClass(name = "com.baomidou.lock.annotation.Lock4j") -public class YudaoLock4jConfiguration { +public class YanzhuLock4jConfiguration { @Bean public DefaultLockFailureStrategy lockFailureStrategy() { diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/YudaoRateLimiterConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/YanzhuRateLimiterConfiguration.java similarity index 61% rename from yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/YudaoRateLimiterConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/YanzhuRateLimiterConfiguration.java index d046b77..2b91541 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/YudaoRateLimiterConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/ratelimiter/config/YanzhuRateLimiterConfiguration.java @@ -2,31 +2,28 @@ package com.yanzhu.framework.ratelimiter.config; import com.yanzhu.framework.ratelimiter.core.aop.RateLimiterAspect; import com.yanzhu.framework.ratelimiter.core.keyresolver.RateLimiterKeyResolver; -import com.yanzhu.framework.ratelimiter.core.keyresolver.impl.*; +import com.yanzhu.framework.ratelimiter.core.keyresolver.impl.ClientIpRateLimiterKeyResolver; +import com.yanzhu.framework.ratelimiter.core.keyresolver.impl.DefaultRateLimiterKeyResolver; +import com.yanzhu.framework.ratelimiter.core.keyresolver.impl.ExpressionRateLimiterKeyResolver; +import com.yanzhu.framework.ratelimiter.core.keyresolver.impl.ServerNodeRateLimiterKeyResolver; +import com.yanzhu.framework.ratelimiter.core.keyresolver.impl.UserRateLimiterKeyResolver; import com.yanzhu.framework.ratelimiter.core.redis.RateLimiterRedisDAO; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; import org.redisson.api.RedissonClient; import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; import java.util.List; -@AutoConfiguration(after = YudaoRedisAutoConfiguration.class) -public class YudaoRateLimiterConfiguration { +@AutoConfiguration +public class YanzhuRateLimiterConfiguration { @Bean - public RateLimiterAspect rateLimiterAspect(List keyResolvers, RateLimiterRedisDAO rateLimiterRedisDAO) { - return new RateLimiterAspect(keyResolvers, rateLimiterRedisDAO); + @ConditionalOnBean(RedissonClient.class) + public RateLimiterAspect rateLimiterAspect(List keyResolvers, RedissonClient redissonClient) { + return new RateLimiterAspect(keyResolvers, new RateLimiterRedisDAO(redissonClient)); } - @Bean - @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") - public RateLimiterRedisDAO rateLimiterRedisDAO(RedissonClient redissonClient) { - return new RateLimiterRedisDAO(redissonClient); - } - - // ========== 各种 RateLimiterRedisDAO Bean ========== - @Bean public DefaultRateLimiterKeyResolver defaultRateLimiterKeyResolver() { return new DefaultRateLimiterKeyResolver(); diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YanzhuApiSignatureAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YanzhuApiSignatureAutoConfiguration.java new file mode 100644 index 0000000..388a3a1 --- /dev/null +++ b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YanzhuApiSignatureAutoConfiguration.java @@ -0,0 +1,26 @@ +package com.yanzhu.framework.signature.config; + +import com.yanzhu.framework.signature.core.aop.ApiSignatureAspect; +import com.yanzhu.framework.signature.core.redis.ApiSignatureRedisDAO; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.core.StringRedisTemplate; + +@AutoConfiguration(after = YanzhuRedisAutoConfiguration.class) +public class YanzhuApiSignatureAutoConfiguration { + + @Bean + @ConditionalOnBean(StringRedisTemplate.class) + public ApiSignatureAspect apiSignatureAspect(ApiSignatureRedisDAO signatureRedisDAO) { + return new ApiSignatureAspect(signatureRedisDAO); + } + + @Bean + @ConditionalOnBean(StringRedisTemplate.class) + public ApiSignatureRedisDAO apiSignatureRedisDAO(StringRedisTemplate stringRedisTemplate) { + return new ApiSignatureRedisDAO(stringRedisTemplate); + } + +} diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YudaoApiSignatureAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YudaoApiSignatureAutoConfiguration.java deleted file mode 100644 index c7ec665..0000000 --- a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/java/com/yanzhu/framework/signature/config/YudaoApiSignatureAutoConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yanzhu.framework.signature.config; - -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; -import com.yanzhu.framework.signature.core.aop.ApiSignatureAspect; -import com.yanzhu.framework.signature.core.redis.ApiSignatureRedisDAO; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.data.redis.core.StringRedisTemplate; - -/** - * HTTP API 签名的自动配置类 - * - * @author Zhougang - */ -@AutoConfiguration(after = YudaoRedisAutoConfiguration.class) -public class YudaoApiSignatureAutoConfiguration { - - @Bean - public ApiSignatureAspect signatureAspect(ApiSignatureRedisDAO signatureRedisDAO) { - return new ApiSignatureAspect(signatureRedisDAO); - } - - @Bean - public ApiSignatureRedisDAO signatureRedisDAO(StringRedisTemplate stringRedisTemplate) { - return new ApiSignatureRedisDAO(stringRedisTemplate); - } - -} diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index abca513..29a768b 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,4 @@ -cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration -cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration -cn.iocoder.yudao.framework.ratelimiter.config.YudaoRateLimiterConfiguration -cn.iocoder.yudao.framework.signature.config.YudaoApiSignatureAutoConfiguration \ No newline at end of file +com.yanzhu.framework.idempotent.config.YanzhuIdempotentConfiguration +com.yanzhu.framework.lock4j.config.YanzhuLock4jConfiguration +com.yanzhu.framework.ratelimiter.config.YanzhuRateLimiterConfiguration +com.yanzhu.framework.signature.config.YanzhuApiSignatureAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/test/java/cn/iocoder/yudao/framework/signature/core/ApiSignatureTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-protection/src/test/java/com/yanzhu/framework/signature/core/ApiSignatureTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-protection/src/test/java/cn/iocoder/yudao/framework/signature/core/ApiSignatureTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-protection/src/test/java/com/yanzhu/framework/signature/core/ApiSignatureTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoCacheAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuCacheAutoConfiguration.java similarity index 91% rename from yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoCacheAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuCacheAutoConfiguration.java index 2a1c777..daeef32 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoCacheAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuCacheAutoConfiguration.java @@ -19,15 +19,15 @@ import org.springframework.util.StringUtils; import java.util.Objects; -import static com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration.buildRedisSerializer; +import static com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration.buildRedisSerializer; /** * Cache 配置类，基于 Redis 实现 */ @AutoConfiguration -@EnableConfigurationProperties({CacheProperties.class, YudaoCacheProperties.class}) +@EnableConfigurationProperties({CacheProperties.class, YanzhuCacheProperties.class}) @EnableCaching -public class YudaoCacheAutoConfiguration { +public class YanzhuCacheAutoConfiguration { /** * RedisCacheConfiguration Bean @@ -70,7 +70,7 @@ public class YudaoCacheAutoConfiguration { @Bean public RedisCacheManager redisCacheManager(RedisTemplate redisTemplate, RedisCacheConfiguration redisCacheConfiguration, - YudaoCacheProperties yanzhuCacheProperties) { + YanzhuCacheProperties yanzhuCacheProperties) { // 创建 RedisCacheWriter 对象 RedisConnectionFactory connectionFactory = Objects.requireNonNull(redisTemplate.getConnectionFactory()); RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory, diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoCacheProperties.java b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuCacheProperties.java similarity index 93% rename from yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoCacheProperties.java rename to yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuCacheProperties.java index 64704a7..a707ffe 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoCacheProperties.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuCacheProperties.java @@ -12,7 +12,7 @@ import org.springframework.validation.annotation.Validated; @ConfigurationProperties("yanzhu.cache") @Data @Validated -public class YudaoCacheProperties { +public class YanzhuCacheProperties { /** * {@link #redisScanBatchSize} 默认值 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoRedisAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java similarity index 97% rename from yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoRedisAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java index 941042b..d524901 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YudaoRedisAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/java/com/yanzhu/framework/redis/config/YanzhuRedisAutoConfiguration.java @@ -14,7 +14,7 @@ import org.springframework.data.redis.serializer.RedisSerializer; * Redis 配置类 */ @AutoConfiguration(before = RedissonAutoConfiguration.class) // 目的：使用自己定义的 RedisTemplate Bean -public class YudaoRedisAutoConfiguration { +public class YanzhuRedisAutoConfiguration { /** * 创建 RedisTemplate Bean，使用 JSON 序列化方式 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 02d4a68..55e302e 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration -cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration \ No newline at end of file +com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration +com.yanzhu.framework.redis.config.YanzhuCacheAutoConfiguration \ No newline at end of file diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-security/src/main/java/com/yanzhu/framework/security/config/YanzhuSecurityAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-security/src/main/java/com/yanzhu/framework/security/config/YanzhuSecurityAutoConfiguration.java index c506ae4..4c5fb81 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-security/src/main/java/com/yanzhu/framework/security/config/YanzhuSecurityAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-security/src/main/java/com/yanzhu/framework/security/config/YanzhuSecurityAutoConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.security.web.access.AccessDeniedHandler; /** * Spring Security 自动配置类，主要用于相关组件的配置 * - * 注意，不能和 {@link YudaoWebSecurityConfigurerAdapter} 用一个，原因是会导致初始化报错。 + * 注意，不能和 {@link Yanzhu} 用一个，原因是会导致初始化报错。 * 参见 https://stackoverflow.com/questions/53847050/spring-boot-delegatebuilder-cannot-be-null-on-autowiring-authenticationmanager 文档。 * * @author 研筑科技 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbAndRedisUnitTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbAndRedisUnitTest.java index 84d679a..ff0a08f 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbAndRedisUnitTest.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbAndRedisUnitTest.java @@ -1,9 +1,9 @@ package com.yanzhu.framework.test.core.ut; import cn.hutool.extra.spring.SpringUtil; -import com.yanzhu.framework.datasource.config.YudaoDataSourceAutoConfiguration; -import com.yanzhu.framework.mybatis.config.YudaoMybatisAutoConfiguration; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.datasource.config.YanzhuDataSourceAutoConfiguration; +import com.yanzhu.framework.mybatis.config.YanzhuMybatisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import com.yanzhu.framework.test.config.RedisTestConfiguration; import com.yanzhu.framework.test.config.SqlInitializationTestConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; @@ -31,18 +31,18 @@ public class BaseDbAndRedisUnitTest { @Import({ // DB 配置类 - YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 + YanzhuDataSourceAutoConfiguration.class, // 自己的 DB 配置类 DataSourceAutoConfiguration.class, // Spring DB 自动配置类 DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 DruidDataSourceAutoConfigure.class, // Druid 自动配置类 SqlInitializationTestConfiguration.class, // SQL 初始化 // MyBatis 配置类 - YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 + YanzhuMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 // Redis 配置类 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer - YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类 + YanzhuRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedisAutoConfiguration.class, // Spring Redis 自动配置类 RedissonAutoConfiguration.class, // Redisson 自动配置类 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbUnitTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbUnitTest.java index 39ce0b8..5ce5382 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbUnitTest.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseDbUnitTest.java @@ -1,8 +1,8 @@ package com.yanzhu.framework.test.core.ut; import cn.hutool.extra.spring.SpringUtil; -import com.yanzhu.framework.datasource.config.YudaoDataSourceAutoConfiguration; -import com.yanzhu.framework.mybatis.config.YudaoMybatisAutoConfiguration; +import com.yanzhu.framework.datasource.config.YanzhuDataSourceAutoConfiguration; +import com.yanzhu.framework.mybatis.config.YanzhuMybatisAutoConfiguration; import com.yanzhu.framework.test.config.SqlInitializationTestConfiguration; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; @@ -28,13 +28,13 @@ public class BaseDbUnitTest { @Import({ // DB 配置类 - YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类 + YanzhuDataSourceAutoConfiguration.class, // 自己的 DB 配置类 DataSourceAutoConfiguration.class, // Spring DB 自动配置类 DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类 DruidDataSourceAutoConfigure.class, // Druid 自动配置类 SqlInitializationTestConfiguration.class, // SQL 初始化 // MyBatis 配置类 - YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 + YanzhuMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类 MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类 MybatisPlusJoinAutoConfiguration.class, // MyBatis 的Join配置类 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseRedisUnitTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseRedisUnitTest.java index a7c7aa5..5ed249a 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseRedisUnitTest.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-test/src/main/java/com/yanzhu/framework/test/core/ut/BaseRedisUnitTest.java @@ -1,7 +1,7 @@ package com.yanzhu.framework.test.core.ut; import cn.hutool.extra.spring.SpringUtil; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import com.yanzhu.framework.test.config.RedisTestConfiguration; import org.redisson.spring.starter.RedissonAutoConfiguration; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; @@ -23,8 +23,8 @@ public class BaseRedisUnitTest { @Import({ // Redis 配置类 RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer + YanzhuRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedisAutoConfiguration.class, // Spring Redis 自动配置类 - YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类 RedissonAutoConfiguration.class, // Redisson 自动配置类 // 其它配置类 diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/encrypt/config/YanzhuApiEncryptAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/encrypt/config/YanzhuApiEncryptAutoConfiguration.java index 729b726..72c1692 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/encrypt/config/YanzhuApiEncryptAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/encrypt/config/YanzhuApiEncryptAutoConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import static com.yanzhu.framework.web.config.YudaoWebAutoConfiguration.createFilterBean; +import static com.yanzhu.framework.web.config.YanzhuWebAutoConfiguration.createFilterBean; @AutoConfiguration @Slf4j diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/web/config/WebProperties.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/web/config/WebProperties.java index 316212d..9bbee91 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/web/config/WebProperties.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/web/config/WebProperties.java @@ -37,7 +37,7 @@ public class WebProperties { * 意义：通过该前缀，避免 Swagger、Actuator 意外通过 Nginx 暴露出来给外部，带来安全性问题 * 这样，Nginx 只需要配置转发到 /api/* 的所有接口即可。 * - * @see YudaoWebAutoConfiguration#configurePathMatch(PathMatchConfigurer) + * @see Yanzhu#configurePathMatch(PathMatchConfigurer) */ @NotEmpty(message = "API 前缀不能为空") private String prefix; diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/xss/config/YanzhuXssAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/xss/config/YanzhuXssAutoConfiguration.java index 50b7f0f..e10e9c0 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/xss/config/YanzhuXssAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/main/java/com/yanzhu/framework/xss/config/YanzhuXssAutoConfiguration.java @@ -16,7 +16,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.util.PathMatcher; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import static com.yanzhu.framework.web.config.YudaoWebAutoConfiguration.createFilterBean; +import static com.yanzhu.framework.web.config.YanzhuWebAutoConfiguration.createFilterBean; @AutoConfiguration @EnableConfigurationProperties(XssProperties.class) diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/desensitize/core/DesensitizeTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/desensitize/core/DesensitizeTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/desensitize/core/annotation/Address.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java rename to yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/desensitize/core/annotation/Address.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/desensitize/core/handler/AddressHandler.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java rename to yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/desensitize/core/handler/AddressHandler.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/encrypt/ApiEncryptTest.java b/yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/encrypt/ApiEncryptTest.java similarity index 100% rename from yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/encrypt/ApiEncryptTest.java rename to yanzhu-framework/yanzhu-spring-boot-starter-web/src/test/java/com/yanzhu/framework/encrypt/ApiEncryptTest.java diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/YudaoWebSocketAutoConfiguration.java b/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/YanzhuWebSocketAutoConfiguration.java similarity index 95% rename from yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/YudaoWebSocketAutoConfiguration.java rename to yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/YanzhuWebSocketAutoConfiguration.java index 315b64f..4e1a8d7 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/YudaoWebSocketAutoConfiguration.java +++ b/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/java/com/yanzhu/framework/websocket/config/YanzhuWebSocketAutoConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.framework.websocket.config; -import com.yanzhu.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration; +import com.yanzhu.framework.mq.redis.config.YanzhuRedisMQConsumerAutoConfiguration; import com.yanzhu.framework.mq.redis.core.RedisMQTemplate; import com.yanzhu.framework.websocket.core.handler.JsonWebSocketMessageHandler; import com.yanzhu.framework.websocket.core.listener.WebSocketMessageListener; @@ -40,11 +40,11 @@ import java.util.List; * * @author xingyu4j */ -@AutoConfiguration(before = YudaoRedisMQConsumerAutoConfiguration.class) // before YudaoRedisMQConsumerAutoConfiguration 的原因是，需要保证 RedisWebSocketMessageConsumer 先创建，才能创建 RedisMessageListenerContainer +@AutoConfiguration(before = YanzhuRedisMQConsumerAutoConfiguration.class) // before YanzhuRedisMQConsumerAutoConfiguration 的原因是，需要保证 RedisWebSocketMessageConsumer 先创建，才能创建 RedisMessageListenerContainer @EnableWebSocket // 开启 websocket @ConditionalOnProperty(prefix = "yanzhu.websocket", value = "enable", matchIfMissing = true) // 允许使用 yanzhu.websocket.enable=false 禁用 websocket @EnableConfigurationProperties(WebSocketProperties.class) -public class YudaoWebSocketAutoConfiguration { +public class YanzhuWebSocketAutoConfiguration { @Bean public WebSocketConfigurer webSocketConfigurer(HandshakeInterceptor[] handshakeInterceptors, diff --git a/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6260e40..b483ec2 100644 --- a/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-framework/yanzhu-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.framework.websocket.config.YudaoWebSocketAutoConfiguration \ No newline at end of file +com.yanzhu.framework.websocket.config.YanzhuWebSocketAutoConfiguration \ No newline at end of file diff --git a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java index 4303fad..21896db 100644 --- a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java +++ b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java @@ -42,7 +42,7 @@ import java.util.Optional; * @author fansili */ @Configuration -@EnableConfigurationProperties({ YudaoAiProperties.class }) +@EnableConfigurationProperties({ YanzhuAiProperties.class }) @Slf4j public class AiAutoConfiguration { @@ -56,12 +56,12 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.gemini.enable", havingValue = "true") - public GeminiChatModel geminiChatModel(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.Gemini properties = yanzhuAiProperties.getGemini(); + public GeminiChatModel geminiChatModel(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.Gemini properties = yanzhuAiProperties.getGemini(); return buildGeminiChatClient(properties); } - public GeminiChatModel buildGeminiChatClient(YudaoAiProperties.Gemini properties) { + public GeminiChatModel buildGeminiChatClient(YanzhuAiProperties.Gemini properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(GeminiChatModel.MODEL_DEFAULT); } @@ -79,12 +79,12 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.doubao.enable", havingValue = "true") - public DouBaoChatModel douBaoChatClient(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.DouBao properties = yanzhuAiProperties.getDoubao(); + public DouBaoChatModel douBaoChatClient(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.DouBao properties = yanzhuAiProperties.getDoubao(); return buildDouBaoChatClient(properties); } - public DouBaoChatModel buildDouBaoChatClient(YudaoAiProperties.DouBao properties) { + public DouBaoChatModel buildDouBaoChatClient(YanzhuAiProperties.DouBao properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(DouBaoChatModel.MODEL_DEFAULT); } @@ -102,12 +102,12 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.siliconflow.enable", havingValue = "true") - public SiliconFlowChatModel siliconFlowChatClient(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.SiliconFlow properties = yanzhuAiProperties.getSiliconflow(); + public SiliconFlowChatModel siliconFlowChatClient(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.SiliconFlow properties = yanzhuAiProperties.getSiliconflow(); return buildSiliconFlowChatClient(properties); } - public SiliconFlowChatModel buildSiliconFlowChatClient(YudaoAiProperties.SiliconFlow properties) { + public SiliconFlowChatModel buildSiliconFlowChatClient(YanzhuAiProperties.SiliconFlow properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(SiliconFlowApiConstants.MODEL_DEFAULT); } @@ -125,12 +125,12 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.hunyuan.enable", havingValue = "true") - public HunYuanChatModel hunYuanChatClient(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.HunYuan properties = yanzhuAiProperties.getHunyuan(); + public HunYuanChatModel hunYuanChatClient(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.HunYuan properties = yanzhuAiProperties.getHunyuan(); return buildHunYuanChatClient(properties); } - public HunYuanChatModel buildHunYuanChatClient(YudaoAiProperties.HunYuan properties) { + public HunYuanChatModel buildHunYuanChatClient(YanzhuAiProperties.HunYuan properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(HunYuanChatModel.MODEL_DEFAULT); } @@ -154,12 +154,12 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.xinghuo.enable", havingValue = "true") - public XingHuoChatModel xingHuoChatClient(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.XingHuo properties = yanzhuAiProperties.getXinghuo(); + public XingHuoChatModel xingHuoChatClient(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.XingHuo properties = yanzhuAiProperties.getXinghuo(); return buildXingHuoChatClient(properties); } - public XingHuoChatModel buildXingHuoChatClient(YudaoAiProperties.XingHuo properties) { + public XingHuoChatModel buildXingHuoChatClient(YanzhuAiProperties.XingHuo properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(XingHuoChatModel.MODEL_DEFAULT); } @@ -179,12 +179,12 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.baichuan.enable", havingValue = "true") - public BaiChuanChatModel baiChuanChatClient(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.BaiChuan properties = yanzhuAiProperties.getBaichuan(); + public BaiChuanChatModel baiChuanChatClient(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.BaiChuan properties = yanzhuAiProperties.getBaichuan(); return buildBaiChuanChatClient(properties); } - public BaiChuanChatModel buildBaiChuanChatClient(YudaoAiProperties.BaiChuan properties) { + public BaiChuanChatModel buildBaiChuanChatClient(YanzhuAiProperties.BaiChuan properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(BaiChuanChatModel.MODEL_DEFAULT); } @@ -202,25 +202,25 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.midjourney.enable", havingValue = "true") - public MidjourneyApi midjourneyApi(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.Midjourney config = yanzhuAiProperties.getMidjourney(); + public MidjourneyApi midjourneyApi(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.Midjourney config = yanzhuAiProperties.getMidjourney(); return new MidjourneyApi(config.getBaseUrl(), config.getApiKey(), config.getNotifyUrl()); } @Bean @ConditionalOnProperty(value = "yanzhu.ai.suno.enable", havingValue = "true") - public SunoApi sunoApi(YudaoAiProperties yanzhuAiProperties) { + public SunoApi sunoApi(YanzhuAiProperties yanzhuAiProperties) { return new SunoApi(yanzhuAiProperties.getSuno().getBaseUrl()); } @Bean @ConditionalOnProperty(value = "yanzhu.ai.grok.enable", havingValue = "true") - public GrokChatModel grokChatClient(YudaoAiProperties yanzhuAiProperties) { - YudaoAiProperties.Grok properties = yanzhuAiProperties.getGrok(); + public GrokChatModel grokChatClient(YanzhuAiProperties yanzhuAiProperties) { + YanzhuAiProperties.Grok properties = yanzhuAiProperties.getGrok(); return buildGrokChatClient(properties); } - public GrokChatModel buildGrokChatClient(YudaoAiProperties.Grok properties) { + public GrokChatModel buildGrokChatClient(YanzhuAiProperties.Grok properties) { if (StrUtil.isEmpty(properties.getModel())) { properties.setModel(GrokChatModel.MODEL_DEFAULT); } @@ -241,7 +241,7 @@ public class AiAutoConfiguration { @Bean @ConditionalOnProperty(value = "yanzhu.ai.web-search.enable", havingValue = "true") - public AiWebSearchClient webSearchClient(YudaoAiProperties yanzhuAiProperties) { + public AiWebSearchClient webSearchClient(YanzhuAiProperties yanzhuAiProperties) { return new AiBoChaWebSearchClient(yanzhuAiProperties.getWebSearch().getApiKey()); } diff --git a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YanzhuAiProperties.java similarity index 98% rename from yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java rename to yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YanzhuAiProperties.java index b59000f..2c56507 100644 --- a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java +++ b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YanzhuAiProperties.java @@ -11,7 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; */ @ConfigurationProperties(prefix = "yanzhu.ai") @Data -public class YudaoAiProperties { +public class YanzhuAiProperties { /** * 谷歌 Gemini diff --git a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java index d64485d..2d617bf 100644 --- a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java +++ b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.lang.Singleton; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.util.StrUtil; import com.yanzhu.module.ai.enums.model.AiPlatformEnum; -import com.yanzhu.module.ai.framework.ai.config.YudaoAiProperties; +import com.yanzhu.module.ai.framework.ai.config.YanzhuAiProperties; import com.yanzhu.module.ai.framework.ai.core.model.baichuan.BaiChuanChatModel; import com.yanzhu.module.ai.framework.ai.core.model.doubao.DouBaoChatModel; import com.yanzhu.module.ai.framework.ai.core.model.gemini.GeminiChatModel; @@ -84,7 +84,7 @@ public class AiModelFactoryImpl implements AiModelFactory { public MidjourneyApi getOrCreateMidjourneyApi(String apiKey, String url) { String cacheKey = buildClientCacheKey(MidjourneyApi.class, AiPlatformEnum.MIDJOURNEY.getPlatform(), apiKey, url); return Singleton.get(cacheKey, (Func0) () -> { - YudaoAiProperties.Midjourney properties = new YudaoAiProperties.Midjourney() + YanzhuAiProperties.Midjourney properties = new YanzhuAiProperties.Midjourney() .setBaseUrl(url).setApiKey(apiKey); return new MidjourneyApi(url, apiKey, properties.getNotifyUrl()); }); diff --git a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java index 41199ab..9debc6b 100644 --- a/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java +++ b/yanzhu-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/web/config/AiWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.ai.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class AiWebConfiguration { */ @Bean public GroupedOpenApi aiGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("ai"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("ai"); } } diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/AnthropicChatModelTest.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/AnthropicChatModelTest.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/AnthropicChatModelTest.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/AnthropicChatModelTest.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/AzureOpenAIChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/AzureOpenAIChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/AzureOpenAIChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/AzureOpenAIChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/BaiChuanChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/BaiChuanChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/BaiChuanChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/BaiChuanChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/CozeChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/CozeChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/CozeChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/CozeChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DeepSeekChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/DeepSeekChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DeepSeekChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/DeepSeekChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DifyChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/DifyChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DifyChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/DifyChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DouBaoChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/DouBaoChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/DouBaoChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/DouBaoChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/FastGPTChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/FastGPTChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/FastGPTChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/FastGPTChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/GeminiChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/GeminiChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/GeminiChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/GeminiChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/HunYuanChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/HunYuanChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/HunYuanChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/HunYuanChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/LlamaChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/LlamaChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/LlamaChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/LlamaChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/MiniMaxChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/MiniMaxChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/MiniMaxChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/MiniMaxChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/MoonshotChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/MoonshotChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/MoonshotChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/MoonshotChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/OllamaChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/OllamaChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/OllamaChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/OllamaChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/OpenAIChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/OpenAIChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/OpenAIChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/OpenAIChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/SiliconFlowChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/SiliconFlowChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/SiliconFlowChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/SiliconFlowChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/TongYiChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/TongYiChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/TongYiChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/TongYiChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/XingHuoChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/XingHuoChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/XingHuoChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/XingHuoChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/YiYanChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/YiYanChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/YiYanChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/YiYanChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/ZhiPuAiChatModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/ZhiPuAiChatModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/ZhiPuAiChatModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/chat/ZhiPuAiChatModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/MidjourneyApiTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/MidjourneyApiTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/MidjourneyApiTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/MidjourneyApiTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/OpenAiImageModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/OpenAiImageModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/OpenAiImageModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/OpenAiImageModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/QianFanImageTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/QianFanImageTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/QianFanImageTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/QianFanImageTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/SiliconFlowImageModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/SiliconFlowImageModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/SiliconFlowImageModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/SiliconFlowImageModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/StabilityAiImageModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/StabilityAiImageModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/StabilityAiImageModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/StabilityAiImageModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/TongYiImagesModelTest.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/TongYiImagesModelTest.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/TongYiImagesModelTest.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/TongYiImagesModelTest.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/ZhiPuAiImageModelTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/ZhiPuAiImageModelTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/image/ZhiPuAiImageModelTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/image/ZhiPuAiImageModelTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/mcp/DouBaoMcpTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/mcp/DouBaoMcpTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/mcp/DouBaoMcpTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/mcp/DouBaoMcpTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/music/SunoApiTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/music/SunoApiTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/music/SunoApiTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/music/SunoApiTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/ppt/xunfei/XunFeiPptApiTests.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/ppt/xunfei/XunFeiPptApiTests.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/ppt/xunfei/XunFeiPptApiTests.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/model/ppt/xunfei/XunFeiPptApiTests.java diff --git a/yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/websearch/AiBoChaWebSearchClientTest.java b/yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/websearch/AiBoChaWebSearchClientTest.java similarity index 100% rename from yanzhu-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/websearch/AiBoChaWebSearchClientTest.java rename to yanzhu-module-ai/src/test/java/com/yanzhu/module/ai/framework/ai/core/websearch/AiBoChaWebSearchClientTest.java diff --git a/yanzhu-module-bpm/src/main/java/com/yanzhu/module/bpm/framework/web/config/BpmWebConfiguration.java b/yanzhu-module-bpm/src/main/java/com/yanzhu/module/bpm/framework/web/config/BpmWebConfiguration.java index 416c13b..46e8403 100644 --- a/yanzhu-module-bpm/src/main/java/com/yanzhu/module/bpm/framework/web/config/BpmWebConfiguration.java +++ b/yanzhu-module-bpm/src/main/java/com/yanzhu/module/bpm/framework/web/config/BpmWebConfiguration.java @@ -1,7 +1,7 @@ package com.yanzhu.module.bpm.framework.web.config; import com.yanzhu.framework.common.enums.WebFilterOrderEnum; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import com.yanzhu.module.bpm.framework.web.core.FlowableWebFilter; import org.springdoc.core.GroupedOpenApi; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -21,7 +21,7 @@ public class BpmWebConfiguration { */ @Bean public GroupedOpenApi bpmGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("bpm"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("bpm"); } /** diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignLeaderExpressionTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignLeaderExpressionTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignLeaderExpressionTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/expression/BpmTaskAssignLeaderExpressionTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderMultiStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateExpressionStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateExpressionStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateExpressionStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateExpressionStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateGroupStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateGroupStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateGroupStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateGroupStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidatePostStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidatePostStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidatePostStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidatePostStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategyTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategyTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategyTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategyTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/service/category/BpmCategoryServiceImplTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/category/BpmCategoryServiceImplTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/service/category/BpmCategoryServiceImplTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/service/definition/BpmFormServiceTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/service/definition/BpmFormServiceTest.java diff --git a/yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java b/yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/service/definition/BpmUserGroupServiceTest.java similarity index 100% rename from yanzhu-module-bpm/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java rename to yanzhu-module-bpm/src/test/java/com/yanzhu/module/bpm/service/definition/BpmUserGroupServiceTest.java diff --git a/yanzhu-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java b/yanzhu-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java index a46cfbf..05d2318 100644 --- a/yanzhu-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java +++ b/yanzhu-module-crm/src/main/java/cn/iocoder/yudao/module/crm/framework/web/config/CrmWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.crm.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class CrmWebConfiguration { */ @Bean public GroupedOpenApi crmGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("crm"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("crm"); } } diff --git a/yanzhu-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java b/yanzhu-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java index 5807138..873a7c3 100644 --- a/yanzhu-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java +++ b/yanzhu-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.erp.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class ErpWebConfiguration { */ @Bean public GroupedOpenApi erpGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("erp"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("erp"); } } diff --git a/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/monitor/config/AdminServerConfiguration.java b/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/monitor/config/AdminServerConfiguration.java index eaa3eaf..c62f899 100644 --- a/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/monitor/config/AdminServerConfiguration.java +++ b/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/monitor/config/AdminServerConfiguration.java @@ -22,7 +22,7 @@ import javax.servlet.DispatcherType; * Spring Boot Admin Server 配置 * * 包含 Admin Server 的启用配置和安全配置 - * 安全配置独立于 {@link com.yanzhu.framework.security.config.YudaoWebSecurityConfigurerAdapter}， + * 安全配置独立于 {@link com.yanzhu.framework.security.config.Yanzhu}， * 使用 HTTP Basic 认证保护 Admin Server 端点，不影响现有的 Token 认证机制 * * @author 研筑科技 diff --git a/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/web/config/InfraWebConfiguration.java b/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/web/config/InfraWebConfiguration.java index 85e6888..fed792a 100644 --- a/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/web/config/InfraWebConfiguration.java +++ b/yanzhu-module-infra/src/main/java/com/yanzhu/module/infra/framework/web/config/InfraWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.infra.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class InfraWebConfiguration { */ @Bean public GroupedOpenApi infraGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("infra"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("infra"); } } diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/ftp/FtpFileClientTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/ftp/FtpFileClientTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/ftp/FtpFileClientTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/ftp/FtpFileClientTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/local/LocalFileClientTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/local/LocalFileClientTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/local/LocalFileClientTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/local/LocalFileClientTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/s3/S3FileClientTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/s3/S3FileClientTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/sftp/SftpFileClientTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/sftp/SftpFileClientTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/sftp/SftpFileClientTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/framework/file/core/sftp/SftpFileClientTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/DefaultDatabaseQueryTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/DefaultDatabaseQueryTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/CodegenServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/CodegenServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenBuilderTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenBuilderTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenEngineVue2Test.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenEngineVue2Test.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenEngineVue3Test.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/codegen/inner/CodegenEngineVue3Test.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/config/ConfigServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/config/ConfigServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/db/DataSourceConfigServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/db/DataSourceConfigServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/db/DatabaseTableServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/db/DatabaseTableServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/file/FileConfigServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/file/FileConfigServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/file/FileServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/file/FileServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/job/JobLogServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/job/JobLogServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/job/JobServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/job/JobServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/logger/ApiAccessLogServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/logger/ApiAccessLogServiceImplTest.java diff --git a/yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java b/yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/logger/ApiErrorLogServiceImplTest.java similarity index 100% rename from yanzhu-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java rename to yanzhu-module-infra/src/test/java/com/yanzhu/module/infra/service/logger/ApiErrorLogServiceImplTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/YudaoIotProperties.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/YanzhuIotProperties.java similarity index 93% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/YudaoIotProperties.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/YanzhuIotProperties.java index 3760cb7..2ff0431 100644 --- a/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/YudaoIotProperties.java +++ b/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/iot/config/YanzhuIotProperties.java @@ -12,7 +12,7 @@ import java.time.Duration; */ @Component @Data -public class YudaoIotProperties { +public class YanzhuIotProperties { /** * 设备连接超时时间 diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/config/IotWebConfiguration.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/config/IotWebConfiguration.java index dab3d8e..71d5b30 100644 --- a/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/config/IotWebConfiguration.java +++ b/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/web/config/IotWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.iot.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class IotWebConfiguration { */ @Bean public GroupedOpenApi iotGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("iot"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("iot"); } } diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java index 2803a30..35e9320 100644 --- a/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java +++ b/yanzhu-module-iot/yanzhu-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java @@ -7,7 +7,7 @@ import com.yanzhu.framework.tenant.core.job.TenantJob; import com.yanzhu.module.iot.core.enums.IotDeviceStateEnum; import com.yanzhu.module.iot.core.mq.message.IotDeviceMessage; import com.yanzhu.module.iot.dal.dataobject.device.IotDeviceDO; -import com.yanzhu.module.iot.framework.iot.config.YudaoIotProperties; +import com.yanzhu.module.iot.framework.iot.config.YanzhuIotProperties; import com.yanzhu.module.iot.service.device.IotDeviceService; import com.yanzhu.module.iot.service.device.message.IotDeviceMessageService; import com.yanzhu.module.iot.service.device.property.IotDevicePropertyService; @@ -32,7 +32,7 @@ import java.util.Set; public class IotDeviceOfflineCheckJob implements JobHandler { @Resource - private YudaoIotProperties iotProperties; + private YanzhuIotProperties iotProperties; @Resource private IotDeviceService deviceService; diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotDataBridgeExecuteTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/action/databridge/IotDataBridgeExecuteTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/action/databridge/IotDataBridgeExecuteTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/action/databridge/IotDataBridgeExecuteTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotTcpDataRuleActionTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/data/action/IotTcpDataRuleActionTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotTcpDataRuleActionTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/data/action/IotTcpDataRuleActionTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceSimpleTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/IotSceneRuleServiceSimpleTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceSimpleTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/IotSceneRuleServiceSimpleTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotBaseConditionMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/IotBaseConditionMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotBaseConditionMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/IotBaseConditionMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandlerTest.java b/yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandlerTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandlerTest.java rename to yanzhu-module-iot/yanzhu-module-iot-biz/src/test/java/com/yanzhu/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandlerTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusAutoConfiguration.java b/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusAutoConfiguration.java index 3d317e0..d4b1471 100644 --- a/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusAutoConfiguration.java +++ b/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusAutoConfiguration.java @@ -76,9 +76,9 @@ public class IotMessageBusAutoConfiguration { // ==================== Redis 实现 ==================== /** - * 特殊：由于 YudaoRedisMQConsumerAutoConfiguration 关于 Redis stream 的消费是动态注册，所以这里只能拷贝相关的逻辑！！！ + * 特殊：由于 Yanzhu 关于 Redis stream 的消费是动态注册，所以这里只能拷贝相关的逻辑！！！ * - * @see com.yanzhu.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration + * @see com.yanzhu.framework.mq.redis.config.Yanzhu */ @Configuration @ConditionalOnProperty(prefix = "yanzhu.iot.message-bus", name = "type", havingValue = "redis") diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/redis/IotRedisMessageBus.java b/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/redis/IotRedisMessageBus.java index 2c4c79c..c6997ca 100644 --- a/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/redis/IotRedisMessageBus.java +++ b/yanzhu-module-iot/yanzhu-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/redis/IotRedisMessageBus.java @@ -16,8 +16,8 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import static com.yanzhu.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration.buildConsumerName; -import static com.yanzhu.framework.mq.redis.config.YudaoRedisMQConsumerAutoConfiguration.checkRedisVersion; +import static com.yanzhu.framework.mq.redis.config.YanzhuRedisMQConsumerAutoConfiguration.buildConsumerName; +import static com.yanzhu.framework.mq.redis.config.YanzhuRedisMQConsumerAutoConfiguration.checkRedisVersion; /** * Redis 的 {@link IotMessageBus} 实现类 diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yanzhu-module-iot/yanzhu-module-iot-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4c183f8..9b0e55e 100644 --- a/yanzhu-module-iot/yanzhu-module-iot-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/yanzhu-module-iot/yanzhu-module-iot-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -cn.iocoder.yudao.module.iot.core.messagebus.config.IotMessageBusAutoConfiguration \ No newline at end of file +com.yanzhu.module.iot.core.messagebus.config.IotMessageBusAutoConfiguration \ No newline at end of file diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/TestMessage.java b/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/messagebus/core/TestMessage.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/TestMessage.java rename to yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/messagebus/core/TestMessage.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/local/LocalIotMessageBusIntegrationTest.java b/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/messagebus/core/local/LocalIotMessageBusIntegrationTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/local/LocalIotMessageBusIntegrationTest.java rename to yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/messagebus/core/local/LocalIotMessageBusIntegrationTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java b/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java rename to yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java diff --git a/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java b/yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/util/IotDeviceMessageUtilsTest.java similarity index 100% rename from yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java rename to yanzhu-module-iot/yanzhu-module-iot-core/src/test/java/com/yanzhu/module/iot/core/util/IotDeviceMessageUtilsTest.java diff --git a/yanzhu-module-mall/yanzhu-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java b/yanzhu-module-mall/yanzhu-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java index d921c61..423df04 100644 --- a/yanzhu-module-mall/yanzhu-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java +++ b/yanzhu-module-mall/yanzhu-module-product/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.product.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class ProductWebConfiguration { */ @Bean public GroupedOpenApi productGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("product"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("product"); } } diff --git a/yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/brand/ProductBrandServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/brand/ProductBrandServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/brand/ProductBrandServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/category/ProductCategoryServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/category/ProductCategoryServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/comment/ProductCommentServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/comment/ProductCommentServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java b/yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/sku/ProductSkuServiceTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java rename to yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/sku/ProductSkuServiceTest.java diff --git a/yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/spu/ProductSpuServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-product/src/test/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-product/src/test/java/com/yanzhu/module/product/service/spu/ProductSpuServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java b/yanzhu-module-mall/yanzhu-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java index 4c5f5a7..74776e7 100644 --- a/yanzhu-module-mall/yanzhu-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java +++ b/yanzhu-module-mall/yanzhu-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/framework/web/config/PromotionWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.promotion.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class PromotionWebConfiguration { */ @Bean public GroupedOpenApi promotionGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("promotion"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("promotion"); } } diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleCategoryServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/article/ArticleCategoryServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleCategoryServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/article/ArticleCategoryServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/article/ArticleServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/article/ArticleServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/article/ArticleServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/combination/CombinationActivityServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/combination/CombinationActivityServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/coupon/CouponTemplateServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/coupon/CouponTemplateServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/discount/DiscountActivityServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/discount/DiscountActivityServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/diy/DiyPageServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/diy/DiyPageServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/diy/DiyPageServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/diy/DiyPageServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/diy/DiyTemplateServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/diy/DiyTemplateServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/reward/RewardActivityServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/reward/RewardActivityServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/seckillactivity/SeckillActivityServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillconfig/SeckillConfigServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/seckillconfig/SeckillConfigServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-promotion/src/test/java/cn/iocoder/yudao/module/promotion/service/seckillconfig/SeckillConfigServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-promotion/src/test/java/com/yanzhu/module/promotion/service/seckillconfig/SeckillConfigServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java b/yanzhu-module-mall/yanzhu-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java index 8cf6fb1..ba3cc8d 100644 --- a/yanzhu-module-mall/yanzhu-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java +++ b/yanzhu-module-mall/yanzhu-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/web/config/TradeWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.trade.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class TradeWebConfiguration { */ @Bean public GroupedOpenApi tradeGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("trade"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("trade"); } } diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/impl/Kd100ExpressClientIntegrationTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/framework/delivery/core/client/impl/Kd100ExpressClientIntegrationTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/impl/Kd100ExpressClientIntegrationTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/framework/delivery/core/client/impl/Kd100ExpressClientIntegrationTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/impl/KdNiaoExpressClientIntegrationTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/framework/delivery/core/client/impl/KdNiaoExpressClientIntegrationTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/impl/KdNiaoExpressClientIntegrationTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/framework/delivery/core/client/impl/KdNiaoExpressClientIntegrationTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/aftersale/AfterSaleServiceTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/aftersale/AfterSaleServiceTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/brokerage/BrokerageUserServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/brokerage/BrokerageUserServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/order/TradeOrderUpdateServiceTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/order/TradeOrderUpdateServiceTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImplTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/TradePriceServiceImplTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImplTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/TradePriceServiceImplTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointGiveCalculatorTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradePointGiveCalculatorTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointGiveCalculatorTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradePointGiveCalculatorTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculatorTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradePointUsePriceCalculatorTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculatorTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradePointUsePriceCalculatorTest.java diff --git a/yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java b/yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java similarity index 100% rename from yanzhu-module-mall/yanzhu-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java rename to yanzhu-module-mall/yanzhu-module-trade/src/test/java/com/yanzhu/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java diff --git a/yanzhu-module-member/src/main/java/com/yanzhu/module/member/framework/web/config/MemberWebConfiguration.java b/yanzhu-module-member/src/main/java/com/yanzhu/module/member/framework/web/config/MemberWebConfiguration.java index 74d7873..2e01097 100644 --- a/yanzhu-module-member/src/main/java/com/yanzhu/module/member/framework/web/config/MemberWebConfiguration.java +++ b/yanzhu-module-member/src/main/java/com/yanzhu/module/member/framework/web/config/MemberWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.member.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class MemberWebConfiguration { */ @Bean public GroupedOpenApi memberGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("member"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("member"); } } diff --git a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/address/MemberAddressServiceImplTest.java b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/address/MemberAddressServiceImplTest.java similarity index 100% rename from yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/address/MemberAddressServiceImplTest.java rename to yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/address/MemberAddressServiceImplTest.java diff --git a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/auth/MemberAuthServiceTest.java similarity index 96% rename from yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java rename to yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/auth/MemberAuthServiceTest.java index 8dc037f..3d9dcbc 100644 --- a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java +++ b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/auth/MemberAuthServiceTest.java @@ -3,7 +3,7 @@ package com.yanzhu.module.member.service.auth; import com.yanzhu.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; import com.yanzhu.framework.common.enums.CommonStatusEnum; import com.yanzhu.framework.common.util.collection.ArrayUtils; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import com.yanzhu.framework.test.core.ut.BaseDbAndRedisUnitTest; import com.yanzhu.module.member.dal.dataobject.user.MemberUserDO; import com.yanzhu.module.member.dal.mysql.user.MemberUserMapper; @@ -28,7 +28,7 @@ import static com.yanzhu.framework.test.core.util.RandomUtils.randomString; * * @author 宋天 */ -@Import({MemberAuthServiceImpl.class, YudaoRedisAutoConfiguration.class}) +@Import({MemberAuthServiceImpl.class, YanzhuRedisAutoConfiguration.class}) public class MemberAuthServiceTest extends BaseDbAndRedisUnitTest { // TODO @芋艿：登录相关的单测，待补全 diff --git a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/group/MemberGroupServiceImplTest.java similarity index 100% rename from yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java rename to yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/group/MemberGroupServiceImplTest.java diff --git a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/level/MemberLevelServiceImplTest.java similarity index 100% rename from yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java rename to yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/level/MemberLevelServiceImplTest.java diff --git a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/tag/MemberTagServiceImplTest.java similarity index 100% rename from yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java rename to yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/tag/MemberTagServiceImplTest.java diff --git a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/user/MemberUserServiceImplTest.java similarity index 96% rename from yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java rename to yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/user/MemberUserServiceImplTest.java index dbfa8dc..f09d96e 100644 --- a/yanzhu-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java +++ b/yanzhu-module-member/src/test/java/com/yanzhu/module/member/service/user/MemberUserServiceImplTest.java @@ -3,7 +3,7 @@ package com.yanzhu.module.member.service.user; import cn.hutool.core.util.RandomUtil; import com.yanzhu.framework.common.enums.CommonStatusEnum; import com.yanzhu.framework.common.util.collection.ArrayUtils; -import com.yanzhu.framework.redis.config.YudaoRedisAutoConfiguration; +import com.yanzhu.framework.redis.config.YanzhuRedisAutoConfiguration; import com.yanzhu.framework.test.core.ut.BaseDbAndRedisUnitTest; import com.yanzhu.module.member.controller.app.user.vo.AppMemberUserUpdateMobileReqVO; import com.yanzhu.module.member.dal.dataobject.user.MemberUserDO; @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * @author 宋天 */ @Disabled -@Import({MemberUserServiceImpl.class, YudaoRedisAutoConfiguration.class}) +@Import({MemberUserServiceImpl.class, YanzhuRedisAutoConfiguration.class}) public class MemberUserServiceImplTest extends BaseDbAndRedisUnitTest { @Resource diff --git a/yanzhu-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java b/yanzhu-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java index 5f05a95..1a0e494 100644 --- a/yanzhu-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java +++ b/yanzhu-module-mp/src/main/java/cn/iocoder/yudao/module/mp/framework/web/config/MpWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.mp.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class MpWebConfiguration { */ @Bean public GroupedOpenApi mpGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("mp"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("mp"); } } diff --git a/yanzhu-module-pay/src/main/java/com/yanzhu/module/pay/framework/web/config/PayWebConfiguration.java b/yanzhu-module-pay/src/main/java/com/yanzhu/module/pay/framework/web/config/PayWebConfiguration.java index 7cd7360..704d5e3 100644 --- a/yanzhu-module-pay/src/main/java/com/yanzhu/module/pay/framework/web/config/PayWebConfiguration.java +++ b/yanzhu-module-pay/src/main/java/com/yanzhu/module/pay/framework/web/config/PayWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.pay.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class PayWebConfiguration { */ @Bean public GroupedOpenApi payGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("pay"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("pay"); } } diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/app/PayAppServiceTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/app/PayAppServiceTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/channel/PayChannelServiceTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/channel/PayChannelServiceTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/notify/PayNotifyServiceTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/notify/PayNotifyServiceTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/order/PayOrderServiceTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/order/PayOrderServiceTest.java diff --git a/yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java b/yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/refund/PayRefundServiceTest.java similarity index 100% rename from yanzhu-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java rename to yanzhu-module-pay/src/test/java/com/yanzhu/module/pay/service/refund/PayRefundServiceTest.java diff --git a/yanzhu-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java b/yanzhu-module-report/src/test/java/com/yanzhu/module/report/service/goview/GoViewDataServiceImplTest.java similarity index 100% rename from yanzhu-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java rename to yanzhu-module-report/src/test/java/com/yanzhu/module/report/service/goview/GoViewDataServiceImplTest.java diff --git a/yanzhu-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java b/yanzhu-module-report/src/test/java/com/yanzhu/module/report/service/goview/GoViewProjectServiceImplTest.java similarity index 100% rename from yanzhu-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewProjectServiceImplTest.java rename to yanzhu-module-report/src/test/java/com/yanzhu/module/report/service/goview/GoViewProjectServiceImplTest.java diff --git a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/framework/web/config/SystemWebConfiguration.java b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/framework/web/config/SystemWebConfiguration.java index 706eddf..ae94700 100644 --- a/yanzhu-module-system/src/main/java/com/yanzhu/module/system/framework/web/config/SystemWebConfiguration.java +++ b/yanzhu-module-system/src/main/java/com/yanzhu/module/system/framework/web/config/SystemWebConfiguration.java @@ -1,6 +1,6 @@ package com.yanzhu.module.system.framework.web.config; -import com.yanzhu.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import com.yanzhu.framework.swagger.config.YanzhuSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,7 @@ public class SystemWebConfiguration { */ @Bean public GroupedOpenApi systemGroupedOpenApi() { - return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("system"); + return YanzhuSwaggerAutoConfiguration.buildGroupedOpenApi("system"); } } diff --git a/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService b/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService index fa9d5b2..c782bf5 100644 --- a/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService +++ b/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService @@ -1 +1 @@ -cn.iocoder.yudao.module.system.framework.captcha.core.RedisCaptchaServiceImpl \ No newline at end of file +com.yanzhu.module.system.framework.captcha.core.RedisCaptchaServiceImpl \ No newline at end of file diff --git a/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaService b/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaService index 80adf6d..f911b63 100644 --- a/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaService +++ b/yanzhu-module-system/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaService @@ -1 +1 @@ -cn.iocoder.yudao.module.system.framework.captcha.core.PictureWordCaptchaServiceImpl \ No newline at end of file +com.yanzhu.module.system.framework.captcha.core.PictureWordCaptchaServiceImpl \ No newline at end of file diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/HuaweiSmsClientTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/QiniuSmsClientTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/SmsClientTests.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/SmsClientTests.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/auth/AdminAuthServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/auth/AdminAuthServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dept/DeptServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dept/DeptServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dept/PostServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dept/PostServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dict/DictDataServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dict/DictDataServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dict/DictTypeServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/dict/DictTypeServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/logger/LoginLogServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/logger/LoginLogServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/logger/LoginLogServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/logger/OperateLogServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/logger/OperateLogServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailAccountServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailAccountServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailLogServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailLogServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailLogServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailSendServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailSendServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailTemplateServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/mail/MailTemplateServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notice/NoticeServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notice/NoticeServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notify/NotifyMessageServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notify/NotifyMessageServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notify/NotifySendServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notify/NotifySendServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notify/NotifyTemplateServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/notify/NotifyTemplateServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2ClientServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2ClientServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2CodeServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2CodeServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2GrantServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2GrantServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2GrantServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2TokenServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/oauth2/OAuth2TokenServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/permission/MenuServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/permission/MenuServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/permission/PermissionServiceTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/permission/PermissionServiceTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/permission/RoleServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/permission/RoleServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsChannelServiceTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsChannelServiceTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsCodeServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsCodeServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsLogServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsLogServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsLogServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsSendServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsSendServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsTemplateServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/sms/SmsTemplateServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/social/SocialClientServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/social/SocialClientServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/social/SocialUserServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/social/SocialUserServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/tenant/TenantPackageServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/tenant/TenantPackageServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/tenant/TenantServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/tenant/TenantServiceImplTest.java diff --git a/yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java b/yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/user/AdminUserServiceImplTest.java similarity index 100% rename from yanzhu-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java rename to yanzhu-module-system/src/test/java/com/yanzhu/module/system/service/user/AdminUserServiceImplTest.java diff --git a/yanzhu-server/pom.xml b/yanzhu-server/pom.xml index 038fcfe..2371533 100644 --- a/yanzhu-server/pom.xml +++ b/yanzhu-server/pom.xml @@ -53,13 +53,11 @@ - @@ -69,7 +67,6 @@ - - - - - diff --git a/yanzhu-server/src/main/java/com/yanzhu/server/YanzhuServerApplication.java b/yanzhu-server/src/main/java/com/yanzhu/server/YanzhuServerApplication.java index b745081..5d7d672 100644 --- a/yanzhu-server/src/main/java/com/yanzhu/server/YanzhuServerApplication.java +++ b/yanzhu-server/src/main/java/com/yanzhu/server/YanzhuServerApplication.java @@ -21,8 +21,8 @@ public class YanzhuServerApplication { // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章 // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章 - SpringApplication.run(YudaoServerApplication.class, args); -// new SpringApplicationBuilder(YudaoServerApplication.class) + SpringApplication.run(YanzhuServerApplication.class, args); +// new SpringApplicationBuilder(YanzhuServerApplication.class) // .applicationStartup(new BufferingApplicationStartup(20480)) // .run(args);