From 377e343ee704c428c264f2de2ba17d50a118fb93 Mon Sep 17 00:00:00 2001 From: duteliang <383200134@qq.com> Date: Wed, 31 Jan 2024 00:07:11 +0800 Subject: [PATCH] init --- pom.xml | 2 +- .../cai}/admin/AccountCashController.java | 2 +- .../cai}/admin/AccountChangeLogController.java | 2 +- .../controller/cai}/admin/AccountController.java | 2 +- .../cai}/admin/AgreementSettingController.java | 2 +- .../cai}/admin/AnchorApplyController.java | 2 +- .../web/controller/cai}/admin/AnchorController.java | 2 +- .../web/controller/cai}/admin/BannerController.java | 2 +- .../controller/cai}/admin/ConsumeLogController.java | 2 +- .../cai}/admin/DayIncomeStatisticsController.java | 2 +- .../controller/cai}/admin/DynamicController.java | 2 +- .../cai}/admin/ForbidFilterController.java | 2 +- .../web/controller/cai}/admin/GiftController.java | 2 +- .../web/controller/cai}/admin/GoodsController.java | 2 +- .../controller/cai}/admin/GuardLogController.java | 2 +- .../controller/cai}/admin/GuardTotalController.java | 2 +- .../cai}/admin/LowHeightRiskController.java | 2 +- .../controller/cai}/admin/PayConfigController.java | 2 +- .../controller/cai}/admin/PayTotalController.java | 2 +- .../web/controller/cai}/admin/RankController.java | 2 +- .../cai}/admin/RechargeOrderController.java | 2 +- .../web/controller/cai}/admin/ReportController.java | 2 +- .../controller/cai}/admin/SmsVerifyController.java | 2 +- .../controller/cai}/admin/SysPushController.java | 2 +- .../controller/cai}/admin/SysPushLogController.java | 2 +- .../cai}/admin/SystemConfigController.java | 2 +- .../web/controller/cai}/admin/UnionController.java | 2 +- .../controller/cai}/admin/UnionUserController.java | 2 +- .../web/controller/cai}/admin/UnreadController.java | 2 +- .../controller/cai}/admin/UserAlbumController.java | 2 +- .../controller/cai}/admin/UserCallController.java | 2 +- .../cai}/admin/UserCameraAuditController.java | 2 +- .../cai}/admin/UserChatRecordController.java | 2 +- .../web/controller/cai}/admin/UserController.java | 2 +- .../controller/cai}/admin/UserCountController.java | 2 +- .../cai}/admin/UserErrorLogController.java | 2 +- .../controller/cai}/admin/UserForbidController.java | 2 +- .../cai}/admin/UserForbidLogController.java | 2 +- .../controller/cai}/admin/UserGiftController.java | 2 +- .../controller/cai}/admin/UserGreetController.java | 2 +- .../controller/cai}/admin/UserInfoController.java | 2 +- .../controller/cai}/admin/UserInviteController.java | 2 +- .../controller/cai}/admin/UserMemberController.java | 2 +- .../controller/cai}/admin/VipOrderController.java | 2 +- .../cai}/admin/WithdrawExchangeController.java | 2 +- .../cai}/admin/back/AccountBankcardController.java | 2 +- .../cai}/admin/back/GiveLogController.java | 2 +- .../cai}/admin/back/MemberPriceController.java | 2 +- .../cai}/admin/back/ReportCateController.java | 2 +- .../cai}/admin/back/UserChatFilterController.java | 2 +- .../cai}/admin/back/UserRiskLogController.java | 2 +- .../cai}/admin/back/UserVisitorController.java | 2 +- .../controller/cai}/admin/init/CityController.java | 2 +- .../controller/cai}/admin/init/ImController.java | 2 +- .../cai}/admin/init/MqControllerTest.java | 2 +- .../cai}/app/AdolescentAppController.java | 2 +- .../controller/cai}/app/AnchorAppController.java | 2 +- .../web/controller/cai}/app/AuthAppController.java | 2 +- .../web/controller/cai}/app/ConsumeController.java | 2 +- .../web/controller/cai}/app/FileController.java | 2 +- .../web/controller/cai}/app/ImAppController.java | 2 +- .../web/controller/cai}/app/IndexController.java | 2 +- .../controller/cai}/app/InviteAppController.java | 2 +- .../web/controller/cai}/app/OtherController.java | 2 +- .../web/controller/cai}/app/PayController.java | 2 +- .../web/controller/cai}/app/RankAppController.java | 2 +- .../web/controller/cai}/app/RoomController.java | 2 +- .../controller/cai}/app/SettingAppController.java | 2 +- .../web/controller/cai}/app/UserAppController.java | 2 +- .../controller/cai}/app/UserBlackAppController.java | 2 +- .../cai}/app/UserDynamicAppController.java | 2 +- .../controller/cai}/app/UserGreetAppController.java | 2 +- .../controller/cai}/app/UserStartAppController.java | 2 +- .../cai}/app/UserVisitorAppController.java | 2 +- .../web/controller/cai}/app/WalletController.java | 2 +- .../web/controller/cai}/test/TestPayController.java | 2 +- .../main/java/com/ruoyi/cai/chat/ChatManager.java | 2 +- .../java/com/ruoyi/cai/manager/ForbidCache.java | 2 +- .../java/com/ruoyi/cai/ws/service/RoomService.java | 2 +- .../java/com/ruoyi/common/utils}/MapGetUtil.java | 2 +- .../pom.xml | 2 +- .../java/com/ruoyi/RuoYiWebSocketApplication.java | 0 .../com/ruoyi/RuoYiWebSocketServletInitializer.java | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/i18n/messages.properties | 0 .../main/resources/i18n/messages_en_US.properties | 0 .../main/resources/i18n/messages_zh_CN.properties | 0 .../src/main/resources/ip2region.xdb | Bin .../src/main/resources/logback-plus.xml | 0 .../src/main/resources/spy.properties | 0 93 files changed, 81 insertions(+), 81 deletions(-) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/AccountCashController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/AccountChangeLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/AccountController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/AgreementSettingController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/AnchorApplyController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/AnchorController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/BannerController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/ConsumeLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/DayIncomeStatisticsController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/DynamicController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/ForbidFilterController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/GiftController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/GoodsController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/GuardLogController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/GuardTotalController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/LowHeightRiskController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/PayConfigController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/PayTotalController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/RankController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/RechargeOrderController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/ReportController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/SmsVerifyController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/SysPushController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/SysPushLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/SystemConfigController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UnionController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UnionUserController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UnreadController.java (95%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserAlbumController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserCallController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserCameraAuditController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserChatRecordController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserCountController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserErrorLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserForbidController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserForbidLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserGiftController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserGreetController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserInfoController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserInviteController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/UserMemberController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/VipOrderController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/WithdrawExchangeController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/AccountBankcardController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/GiveLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/MemberPriceController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/ReportCateController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/UserChatFilterController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/UserRiskLogController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/back/UserVisitorController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/init/CityController.java (93%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/init/ImController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/admin/init/MqControllerTest.java (94%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/AdolescentAppController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/AnchorAppController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/AuthAppController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/ConsumeController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/FileController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/ImAppController.java (96%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/IndexController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/InviteAppController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/OtherController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/PayController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/RankAppController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/RoomController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/SettingAppController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/UserAppController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/UserBlackAppController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/UserDynamicAppController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/UserGreetAppController.java (98%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/UserStartAppController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/UserVisitorAppController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/app/WalletController.java (99%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai}/test/TestPayController.java (97%) rename {ruoyi-cai/src/main/java/com/ruoyi/cai/ws/util => ruoyi-common/src/main/java/com/ruoyi/common/utils}/MapGetUtil.java (97%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/pom.xml (98%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/java/com/ruoyi/RuoYiWebSocketApplication.java (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/java/com/ruoyi/RuoYiWebSocketServletInitializer.java (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/application-dev.yml (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/application-prod.yml (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/application.yml (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/banner.txt (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/i18n/messages.properties (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/i18n/messages_en_US.properties (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/i18n/messages_zh_CN.properties (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/ip2region.xdb (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/logback-plus.xml (100%) rename {ruoyi-ad-websocket => ruoyi-websocket-boot}/src/main/resources/spy.properties (100%) diff --git a/pom.xml b/pom.xml index 077f25f8..852a65cf 100644 --- a/pom.xml +++ b/pom.xml @@ -336,7 +336,7 @@ ruoyi-sms ruoyi-cai ruoyi-yunxin - ruoyi-ad-websocket + ruoyi-websocket-boot pom diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java index 41a81423..c8980185 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountCashController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountChangeLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountChangeLogController.java index 0ee9adb2..df809f84 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountChangeLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountChangeLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java index f922e505..2f524179 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AccountController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AgreementSettingController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AgreementSettingController.java index 76190fc7..ee0121ae 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AgreementSettingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AgreementSettingController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.cai.domain.AgreementSetting; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java index 5686faa2..eb5adc6a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorApplyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java index ca39dadf..e43d9fbe 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/BannerController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/BannerController.java index dd75b8ff..832db47c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/BannerController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ConsumeLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ConsumeLogController.java index 5f88e7df..9030db05 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ConsumeLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DayIncomeStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DayIncomeStatisticsController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DayIncomeStatisticsController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DayIncomeStatisticsController.java index 206df5ac..350526b5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DayIncomeStatisticsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DayIncomeStatisticsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java index 70f336ce..15fac64a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/DynamicController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ForbidFilterController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ForbidFilterController.java index 8e54e2b6..86577a01 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ForbidFilterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ForbidFilterController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java index 817fc2db..0dfb7c7a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GoodsController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GoodsController.java index d68dc88a..64033d8f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GoodsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GuardLogController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GuardLogController.java index 0a9d5d5b..1918936c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GuardLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GuardTotalController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GuardTotalController.java index ac95e013..1e9840e1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GuardTotalController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/LowHeightRiskController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/LowHeightRiskController.java index a4fb2bfa..11e21a3f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/LowHeightRiskController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/PayConfigController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayConfigController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/PayConfigController.java index f4eab050..783df4b1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/PayConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayTotalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/PayTotalController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayTotalController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/PayTotalController.java index e899dd9f..a8870db8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/PayTotalController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/PayTotalController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RankController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RankController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RankController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RankController.java index 9ebd26ad..c61b66cb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RankController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RankController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RechargeOrderController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RechargeOrderController.java index 1f107001..f2d3ea28 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RechargeOrderController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java index 107513f5..d6492f31 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/ReportController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SmsVerifyController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SmsVerifyController.java index fc4237f4..bb9ae1ad 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SmsVerifyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java index 853c6e67..e971100d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushLogController.java index 0d6b52d9..71b9bb93 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SysPushLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SysPushLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java index fca77543..b96d0544 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/SystemConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.cai.dto.admin.SystemConfigResponse; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnionController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnionController.java index 239bf685..52d1590a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnionController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnionUserController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnionUserController.java index 8abcea61..17ff3dd0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnionUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnreadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnreadController.java similarity index 95% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnreadController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnreadController.java index 3b842390..4f469c45 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnreadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnreadController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import com.ruoyi.cai.dto.admin.vo.unread.UnreadData; import com.ruoyi.cai.manager.UnreadManager; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java index 912fd8ea..32325ec0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserAlbumController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java index 661357c0..c9fe981b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCallController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCameraAuditController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCameraAuditController.java index 78d165a3..80fb4105 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCameraAuditController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserChatRecordController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserChatRecordController.java index f6c4b8a2..6ce9fedd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserChatRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserChatRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java index dc356217..fc61e405 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCountController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCountController.java index 7db03208..a359372e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserCountController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserErrorLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserErrorLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserErrorLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserErrorLogController.java index 60b6fc22..56ee3d22 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserErrorLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserErrorLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java index 6718365b..dbc8078c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.net.Ipv4Util; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidLogController.java index 146bc18c..c9cbffc3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGiftController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGiftController.java index 99c99533..a82725d7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGiftController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java index bf5f6aea..f9c6eebd 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGreetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserGreetController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserInfoController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInfoController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserInfoController.java index c1229c0b..c9bdf047 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserInfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserInviteController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserInviteController.java index d8547b51..c52eeaf4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserInviteController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserMemberController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserMemberController.java index 19e89da9..95f3471b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserMemberController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/VipOrderController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/VipOrderController.java index 50194e5d..e1c3ec48 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/VipOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/VipOrderController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/WithdrawExchangeController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/WithdrawExchangeController.java index b029923d..6b244f9f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/WithdrawExchangeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin; +package com.ruoyi.web.controller.cai.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/AccountBankcardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/AccountBankcardController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/AccountBankcardController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/AccountBankcardController.java index 7605295b..1c2b98fa 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/AccountBankcardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/AccountBankcardController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiveLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/GiveLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiveLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/GiveLogController.java index 3bab92ca..148ac946 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/GiveLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/GiveLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/MemberPriceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/MemberPriceController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java index 694e7e12..4addb99a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/MemberPriceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/ReportCateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/ReportCateController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/ReportCateController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/ReportCateController.java index 2f1df678..ac6a9832 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/ReportCateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/ReportCateController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserChatFilterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserChatFilterController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserChatFilterController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserChatFilterController.java index fd54124e..335344f1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserChatFilterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserChatFilterController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserRiskLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserRiskLogController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserRiskLogController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserRiskLogController.java index 0d54a552..1cb82e6e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserRiskLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserRiskLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserVisitorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserVisitorController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserVisitorController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserVisitorController.java index acee45f3..3b67a8b1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/back/UserVisitorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/UserVisitorController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.back; +package com.ruoyi.web.controller.cai.admin.back; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/CityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/CityController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java index 3283bac6..735b36a9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/CityController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.init; +package com.ruoyi.web.controller.cai.admin.init; import com.ruoyi.cai.service.CitysService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/ImController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/ImController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java index 49611553..77122e4b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/ImController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/ImController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.init; +package com.ruoyi.web.controller.cai.admin.init; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/MqControllerTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/MqControllerTest.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java index 28fa06ac..707fc6f5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/init/MqControllerTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/MqControllerTest.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.admin.init; +package com.ruoyi.web.controller.cai.admin.init; import com.ruoyi.cai.mq.AmqpProducer; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AdolescentAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AdolescentAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java index 880c38d4..75a3759a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AdolescentAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AdolescentAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import cn.hutool.core.util.PhoneUtil; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AnchorAppController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AnchorAppController.java index 0ec965a5..b9fdac04 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AnchorAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.dto.app.query.AnchorUpdateReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AuthAppController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AuthAppController.java index 1954a9b7..73424e67 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/AuthAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.PhoneUtil; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java index f6b35ec5..b652b5f0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ConsumeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.domain.RechargeOrder; import com.ruoyi.cai.domain.VipOrder; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/FileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/FileController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/FileController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/FileController.java index c1802184..444dc9f8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/FileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/FileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.cai.dto.FileResp; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ImAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ImAppController.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ImAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ImAppController.java index 9a667960..45a52183 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ImAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/ImAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.dto.app.dto.ImMessageDTO; import com.ruoyi.cai.dto.app.vo.ImResp; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java index 6e11d687..adbf226a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java index 8aa25479..f5cbf7eb 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/InviteAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java index ca75bca1..52c5ea01 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.dto.app.query.UserReportReq; import com.ruoyi.cai.dto.app.query.push.PushErrorReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java index ed8a8355..98b57b1e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/PayController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.alibaba.fastjson2.JSON; import com.alipay.api.AlipayApiException; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RankAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RankAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java index 2404cc0f..220ccb22 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RankAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.app.RankIdReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java index 04b22c15..3786862b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/RoomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RoomController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.chat.ChatManager; import com.ruoyi.cai.dto.app.query.CallReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java index f2e6a3e4..12e41c58 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cai.domain.Gift; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java index cc1bc175..8b75d427 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.dto.app.query.AlbumAddReq; import com.ruoyi.cai.dto.app.query.AlbumResetReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java index d8a59b9e..a4870381 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserBlackAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.BlackQuery; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java index e4db4110..7cd7d1de 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserDynamicAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.DynamicAddReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java index 0fa6a164..584ec211 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserGreetAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserGreet; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java index 51435979..571996db 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserStartAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java index 4f03c1ac..e4b71312 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserVisitorAppController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java similarity index 99% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java index 28553137..1b40885f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/WalletController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.app; +package com.ruoyi.web.controller.cai.app; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/test/TestPayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/test/TestPayController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java index 797ebe69..8ae21ed8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/test/TestPayController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/test/TestPayController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller.test; +package com.ruoyi.web.controller.cai.test; import com.ruoyi.cai.domain.RechargeOrder; import com.ruoyi.cai.domain.VipOrder; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java index a60c347a..3d96a499 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java @@ -16,7 +16,7 @@ import com.ruoyi.cai.ws.bean.Room; import com.ruoyi.cai.ws.constant.RedisConstant; import com.ruoyi.cai.ws.dto.WsToken; import com.ruoyi.cai.ws.manager.WebSocketManager; -import com.ruoyi.cai.ws.util.MapGetUtil; +import com.ruoyi.common.utils.MapGetUtil; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import org.redisson.api.RMap; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ForbidCache.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ForbidCache.java index d1205983..34530241 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ForbidCache.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ForbidCache.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.manager; import com.ruoyi.cai.constant.RedisHttpConstant; import com.ruoyi.cai.domain.UserForbid; import com.ruoyi.cai.enums.ForbidTypeEnum; -import com.ruoyi.cai.ws.util.MapGetUtil; +import com.ruoyi.common.utils.MapGetUtil; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java index 697fb16b..9af3f199 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/RoomService.java @@ -13,7 +13,7 @@ import com.ruoyi.cai.ws.bean.UserData; import com.ruoyi.cai.ws.cache.*; import com.ruoyi.cai.ws.constant.HangUpEnums; import com.ruoyi.cai.ws.constant.RoomStatusEnums; -import com.ruoyi.cai.ws.util.MapGetUtil; +import com.ruoyi.common.utils.MapGetUtil; import com.ruoyi.cai.ws.util.WebSocketUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/util/MapGetUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapGetUtil.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/ws/util/MapGetUtil.java rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/MapGetUtil.java index 630c8ab9..86c59f7a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/util/MapGetUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MapGetUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.ws.util; +package com.ruoyi.common.utils; import java.math.BigDecimal; diff --git a/ruoyi-ad-websocket/pom.xml b/ruoyi-websocket-boot/pom.xml similarity index 98% rename from ruoyi-ad-websocket/pom.xml rename to ruoyi-websocket-boot/pom.xml index 0c5dc533..8782227c 100644 --- a/ruoyi-ad-websocket/pom.xml +++ b/ruoyi-websocket-boot/pom.xml @@ -9,7 +9,7 @@ 4.8.2 - ruoyi-ad-websocket + ruoyi-websocket-boot 8 diff --git a/ruoyi-ad-websocket/src/main/java/com/ruoyi/RuoYiWebSocketApplication.java b/ruoyi-websocket-boot/src/main/java/com/ruoyi/RuoYiWebSocketApplication.java similarity index 100% rename from ruoyi-ad-websocket/src/main/java/com/ruoyi/RuoYiWebSocketApplication.java rename to ruoyi-websocket-boot/src/main/java/com/ruoyi/RuoYiWebSocketApplication.java diff --git a/ruoyi-ad-websocket/src/main/java/com/ruoyi/RuoYiWebSocketServletInitializer.java b/ruoyi-websocket-boot/src/main/java/com/ruoyi/RuoYiWebSocketServletInitializer.java similarity index 100% rename from ruoyi-ad-websocket/src/main/java/com/ruoyi/RuoYiWebSocketServletInitializer.java rename to ruoyi-websocket-boot/src/main/java/com/ruoyi/RuoYiWebSocketServletInitializer.java diff --git a/ruoyi-ad-websocket/src/main/resources/application-dev.yml b/ruoyi-websocket-boot/src/main/resources/application-dev.yml similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/application-dev.yml rename to ruoyi-websocket-boot/src/main/resources/application-dev.yml diff --git a/ruoyi-ad-websocket/src/main/resources/application-prod.yml b/ruoyi-websocket-boot/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/application-prod.yml rename to ruoyi-websocket-boot/src/main/resources/application-prod.yml diff --git a/ruoyi-ad-websocket/src/main/resources/application.yml b/ruoyi-websocket-boot/src/main/resources/application.yml similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/application.yml rename to ruoyi-websocket-boot/src/main/resources/application.yml diff --git a/ruoyi-ad-websocket/src/main/resources/banner.txt b/ruoyi-websocket-boot/src/main/resources/banner.txt similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/banner.txt rename to ruoyi-websocket-boot/src/main/resources/banner.txt diff --git a/ruoyi-ad-websocket/src/main/resources/i18n/messages.properties b/ruoyi-websocket-boot/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/i18n/messages.properties rename to ruoyi-websocket-boot/src/main/resources/i18n/messages.properties diff --git a/ruoyi-ad-websocket/src/main/resources/i18n/messages_en_US.properties b/ruoyi-websocket-boot/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/i18n/messages_en_US.properties rename to ruoyi-websocket-boot/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-ad-websocket/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-websocket-boot/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/i18n/messages_zh_CN.properties rename to ruoyi-websocket-boot/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-ad-websocket/src/main/resources/ip2region.xdb b/ruoyi-websocket-boot/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/ip2region.xdb rename to ruoyi-websocket-boot/src/main/resources/ip2region.xdb diff --git a/ruoyi-ad-websocket/src/main/resources/logback-plus.xml b/ruoyi-websocket-boot/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/logback-plus.xml rename to ruoyi-websocket-boot/src/main/resources/logback-plus.xml diff --git a/ruoyi-ad-websocket/src/main/resources/spy.properties b/ruoyi-websocket-boot/src/main/resources/spy.properties similarity index 100% rename from ruoyi-ad-websocket/src/main/resources/spy.properties rename to ruoyi-websocket-boot/src/main/resources/spy.properties