From 0c1fc3cadacd9e88a41671a8e688a350a0963d6b Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Sun, 31 Dec 2023 16:09:56 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/cai/auth/CaiLoginManager.java   | 14 +++----
 .../java/com/ruoyi/cai/chat/ChatManager.java  | 16 ++++----
 .../cai/controller/CaiGuardLogController.java | 14 +++----
 .../admin/AccountBankcardController.java      |  4 +-
 .../admin/AccountBusinessController.java      | 14 +++----
 .../admin/AccountCashController.java          |  4 +-
 .../controller/admin/AccountController.java   |  4 +-
 .../admin/AccountDetailController.java        |  4 +-
 .../admin/AccountRechargeController.java      | 14 +++----
 .../admin/AnchorApplyController.java          |  4 +-
 .../controller/admin/AnchorController.java    |  4 +-
 .../controller/admin/BannerController.java    |  4 +-
 .../admin/ConsumeLogController.java           | 14 +++----
 .../controller/admin/DynamicController.java   |  4 +-
 .../cai/controller/admin/GiftController.java  | 14 +++----
 .../controller/admin/GiveLogController.java   | 14 +++----
 .../cai/controller/admin/GoodsController.java | 14 +++----
 .../admin/LowHeightRiskController.java        |  4 +-
 .../admin/ReportCateController.java           | 14 +++----
 .../controller/admin/ReportController.java    | 14 +++----
 .../cai/controller/admin/UnionController.java | 14 +++----
 .../controller/admin/UnionUserController.java | 15 ++++----
 .../controller/admin/UserAlbumController.java |  4 +-
 .../controller/admin/UserCallController.java  | 14 +++----
 .../admin/UserCameraAuditController.java      | 14 +++----
 .../cai/controller/admin/UserController.java  | 21 ++++++----
 .../controller/admin/UserCountController.java | 16 ++++----
 .../admin/UserForbidController.java           |  4 +-
 .../admin/UserInviteController.java           | 14 +++----
 .../admin/UserMemberController.java           |  4 +-
 .../admin/UserRiskLogController.java          |  4 +-
 .../admin/UserVisitorController.java          | 14 +++----
 .../admin/WithdrawExchangeController.java     | 14 +++----
 .../controller/app/AnchorAppController.java   | 16 ++++----
 .../cai/controller/app/AuthAppController.java |  6 +--
 .../cai/controller/app/ConsumeController.java |  8 ++--
 .../cai/controller/app/IndexController.java   | 14 +++----
 .../controller/app/InviteAppController.java   |  6 +--
 .../cai/controller/app/OtherController.java   |  4 +-
 .../controller/app/SettingAppController.java  | 10 ++---
 .../cai/controller/app/UserAppController.java |  4 +-
 .../app/UserBlackAppController.java           |  4 +-
 .../app/UserDynamicAppController.java         |  8 ++--
 .../app/UserStartAppController.java           |  4 +-
 .../app/UserVisitorAppController.java         |  4 +-
 .../cai/controller/app/WalletController.java  |  8 ++--
 .../main/java/com/ruoyi/cai/domain/User.java  |  3 +-
 .../cai/dto/admin/vo/UserFullAdminVo.java     | 19 ++++++++++
 .../ruoyi/cai/manager/CurrentUserManager.java | 12 +++---
 .../ruoyi/cai/manager/UserAdminManager.java   | 38 ++++++++++++++++++-
 ...Mapper.java => AccountBankcardMapper.java} |  2 +-
 ...Mapper.java => AccountBusinessMapper.java} |  2 +-
 ...CashMapper.java => AccountCashMapper.java} |  2 +-
 ...ilMapper.java => AccountDetailMapper.java} |  2 +-
 ...iAccountMapper.java => AccountMapper.java} |  2 +-
 ...Mapper.java => AccountRechargeMapper.java} |  2 +-
 ...pplyMapper.java => AnchorApplyMapper.java} |  2 +-
 ...CaiAnchorMapper.java => AnchorMapper.java} |  2 +-
 .../{CaiAreaMapper.java => AreaMapper.java}   |  2 +-
 ...CaiBannerMapper.java => BannerMapper.java} |  2 +-
 .../{CaiCitysMapper.java => CitysMapper.java} |  2 +-
 ...meLogMapper.java => ConsumeLogMapper.java} |  2 +-
 ...esMapper.java => DynamicImagesMapper.java} |  2 +-
 ...iDynamicMapper.java => DynamicMapper.java} |  2 +-
 .../{CaiGiftMapper.java => GiftMapper.java}   |  2 +-
 ...iGiveLogMapper.java => GiveLogMapper.java} |  2 +-
 .../{CaiGoodsMapper.java => GoodsMapper.java} |  2 +-
 ...uardLogMapper.java => GuardLogMapper.java} |  2 +-
 ...TotalMapper.java => GuardTotalMapper.java} |  2 +-
 ...skMapper.java => LowHeightRiskMapper.java} |  2 +-
 ...killMapper.java => MemberSkillMapper.java} |  2 +-
 ...tCateMapper.java => ReportCateMapper.java} |  2 +-
 ...CaiReportMapper.java => ReportMapper.java} |  2 +-
 .../{CaiUnionMapper.java => UnionMapper.java} |  2 +-
 ...onUserMapper.java => UnionUserMapper.java} |  2 +-
 ...rAlbumMapper.java => UserAlbumMapper.java} |  2 +-
 ...stMapper.java => UserBlacklistMapper.java} |  2 +-
 ...serCallMapper.java => UserCallMapper.java} |  2 +-
 ...Mapper.java => UserCameraAuditMapper.java} |  2 +-
 ...eGenMapper.java => UserCodeGenMapper.java} |  2 +-
 ...rCountMapper.java => UserCountMapper.java} |  2 +-
 ...pper.java => UserFollowDynamicMapper.java} |  2 +-
 ...ollowMapper.java => UserFollowMapper.java} |  2 +-
 ...orbidMapper.java => UserForbidMapper.java} |  2 +-
 ...serGiftMapper.java => UserGiftMapper.java} |  2 +-
 ...serInfoMapper.java => UserInfoMapper.java} |  2 +-
 ...nviteMapper.java => UserInviteMapper.java} |  2 +-
 .../{CaiUserMapper.java => UserMapper.java}   |  2 +-
 ...emberMapper.java => UserMemberMapper.java} |  2 +-
 ...nlineMapper.java => UserOnlineMapper.java} |  2 +-
 ...kLogMapper.java => UserRiskLogMapper.java} |  2 +-
 ...itorMapper.java => UserVisitorMapper.java} |  2 +-
 ...apper.java => WithdrawExchangeMapper.java} |  2 +-
 ...rvice.java => AccountBankcardService.java} |  2 +-
 ...rvice.java => AccountBusinessService.java} |  2 +-
 ...shService.java => AccountCashService.java} |  2 +-
 ...Service.java => AccountDetailService.java} |  2 +-
 ...rvice.java => AccountRechargeService.java} |  2 +-
 ...ccountService.java => AccountService.java} |  2 +-
 ...lyService.java => AnchorApplyService.java} |  2 +-
 ...iAnchorService.java => AnchorService.java} |  2 +-
 .../{CaiAreaService.java => AreaService.java} |  2 +-
 ...iBannerService.java => BannerService.java} |  2 +-
 ...CaiCitysService.java => CitysService.java} |  2 +-
 ...LogService.java => ConsumeLogService.java} |  2 +-
 ...Service.java => DynamicImagesService.java} |  2 +-
 ...ynamicService.java => DynamicService.java} |  2 +-
 .../{CaiGiftService.java => GiftService.java} |  2 +-
 ...iveLogService.java => GiveLogService.java} |  2 +-
 ...CaiGoodsService.java => GoodsService.java} |  2 +-
 ...rdLogService.java => GuardLogService.java} |  2 +-
 ...talService.java => GuardTotalService.java} |  2 +-
 ...Service.java => LowHeightRiskService.java} |  2 +-
 ...llService.java => MemberSkillService.java} |  2 +-
 ...ateService.java => ReportCateService.java} |  2 +-
 ...iReportService.java => ReportService.java} |  2 +-
 ...CaiUnionService.java => UnionService.java} |  4 +-
 ...UserService.java => UnionUserService.java} |  2 +-
 ...lbumService.java => UserAlbumService.java} |  2 +-
 ...Service.java => UserBlacklistService.java} |  2 +-
 ...rCallService.java => UserCallService.java} |  2 +-
 ...rvice.java => UserCameraAuditService.java} |  2 +-
 ...enService.java => UserCodeGenService.java} |  2 +-
 ...ountService.java => UserCountService.java} |  2 +-
 ...ice.java => UserFollowDynamicService.java} |  2 +-
 ...lowService.java => UserFollowService.java} |  2 +-
 ...bidService.java => UserForbidService.java} |  2 +-
 ...rGiftService.java => UserGiftService.java} |  2 +-
 ...rInfoService.java => UserInfoService.java} |  4 +-
 ...iteService.java => UserInviteService.java} |  2 +-
 ...berService.java => UserMemberService.java} |  4 +-
 ...ineService.java => UserOnlineService.java} |  2 +-
 ...ogService.java => UserRiskLogService.java} |  2 +-
 .../{CaiUserService.java => UserService.java} |  2 +-
 ...orService.java => UserVisitorService.java} |  2 +-
 ...vice.java => WithdrawExchangeService.java} |  2 +-
 ...l.java => AccountBankcardServiceImpl.java} |  6 +--
 ...l.java => AccountBusinessServiceImpl.java} |  6 +--
 ...eImpl.java => AccountCashServiceImpl.java} | 18 ++++-----
 ...mpl.java => AccountDetailServiceImpl.java} |  6 +--
 ...l.java => AccountRechargeServiceImpl.java} |  6 +--
 ...rviceImpl.java => AccountServiceImpl.java} | 14 +++----
 ...eImpl.java => AnchorApplyServiceImpl.java} | 10 ++---
 ...erviceImpl.java => AnchorServiceImpl.java} |  6 +--
 ...aServiceImpl.java => AreaServiceImpl.java} |  6 +--
 ...erviceImpl.java => BannerServiceImpl.java} |  6 +--
 .../service/impl/CaiUserInfoServiceImpl.java  | 12 ------
 ...ServiceImpl.java => CitysServiceImpl.java} |  6 +--
 ...ceImpl.java => ConsumeLogServiceImpl.java} |  6 +--
 ...mpl.java => DynamicImagesServiceImpl.java} |  6 +--
 ...rviceImpl.java => DynamicServiceImpl.java} | 14 +++----
 ...tServiceImpl.java => GiftServiceImpl.java} |  6 +--
 ...rviceImpl.java => GiveLogServiceImpl.java} |  6 +--
 ...ServiceImpl.java => GoodsServiceImpl.java} |  6 +--
 ...viceImpl.java => GuardLogServiceImpl.java} |  6 +--
 ...ceImpl.java => GuardTotalServiceImpl.java} | 12 +++---
 ...mpl.java => LowHeightRiskServiceImpl.java} |  6 +--
 ...eImpl.java => MemberSkillServiceImpl.java} |  6 +--
 ...ceImpl.java => ReportCateServiceImpl.java} |  6 +--
 ...erviceImpl.java => ReportServiceImpl.java} | 10 ++---
 ...ServiceImpl.java => UnionServiceImpl.java} | 12 ++++--
 ...iceImpl.java => UnionUserServiceImpl.java} |  6 +--
 ...iceImpl.java => UserAlbumServiceImpl.java} | 10 ++---
 ...mpl.java => UserBlacklistServiceImpl.java} |  6 +--
 ...viceImpl.java => UserCallServiceImpl.java} | 18 ++++-----
 ...l.java => UserCameraAuditServiceImpl.java} | 10 ++---
 ...eImpl.java => UserCodeGenServiceImpl.java} |  6 +--
 ...iceImpl.java => UserCountServiceImpl.java} | 18 ++++-----
 ...java => UserFollowDynamicServiceImpl.java} | 10 ++---
 ...ceImpl.java => UserFollowServiceImpl.java} | 10 ++---
 ...ceImpl.java => UserForbidServiceImpl.java} |  6 +--
 ...viceImpl.java => UserGiftServiceImpl.java} | 12 +++---
 .../cai/service/impl/UserInfoServiceImpl.java | 18 +++++++++
 ...ceImpl.java => UserInviteServiceImpl.java} | 10 ++---
 ...ceImpl.java => UserMemberServiceImpl.java} | 12 ++++--
 ...ceImpl.java => UserOnlineServiceImpl.java} |  6 +--
 ...eImpl.java => UserRiskLogServiceImpl.java} |  6 +--
 ...rServiceImpl.java => UserServiceImpl.java} | 20 +++++-----
 ...eImpl.java => UserVisitorServiceImpl.java} | 10 ++---
 ....java => WithdrawExchangeServiceImpl.java} |  6 +--
 .../handler/message/AgreeMessageHandle.java   |  4 +-
 .../handler/message/CancelMessageHandler.java |  4 +-
 .../handler/message/GiftMessageHandler.java   | 12 +++---
 .../handler/message/RefuseMessageHandler.java |  4 +-
 .../cai/ws/manager/WebSocketManager.java      | 16 ++++----
 .../com/ruoyi/cai/ws/processon/OpenLogic.java |  8 ++--
 .../com/ruoyi/cai/ws/service/RoomService.java | 12 +++---
 .../ruoyi/cai/ws/service/SettleService.java   |  4 +-
 ...rdMapper.xml => AccountBankcardMapper.xml} |  2 +-
 ...ssMapper.xml => AccountBusinessMapper.xml} |  2 +-
 ...ntCashMapper.xml => AccountCashMapper.xml} |  2 +-
 ...tailMapper.xml => AccountDetailMapper.xml} |  2 +-
 ...CaiAccountMapper.xml => AccountMapper.xml} |  2 +-
 ...geMapper.xml => AccountRechargeMapper.xml} |  2 +-
 ...rApplyMapper.xml => AnchorApplyMapper.xml} |  2 +-
 .../{CaiAnchorMapper.xml => AnchorMapper.xml} |  2 +-
 .../cai/{CaiAreaMapper.xml => AreaMapper.xml} |  2 +-
 .../{CaiBannerMapper.xml => BannerMapper.xml} |  2 +-
 .../{CaiCitysMapper.xml => CitysMapper.xml}   |  2 +-
 ...sumeLogMapper.xml => ConsumeLogMapper.xml} |  2 +-
 ...agesMapper.xml => DynamicImagesMapper.xml} |  2 +-
 ...CaiDynamicMapper.xml => DynamicMapper.xml} |  2 +-
 .../cai/{CaiGiftMapper.xml => GiftMapper.xml} |  2 +-
 ...CaiGiveLogMapper.xml => GiveLogMapper.xml} |  2 +-
 .../{CaiGoodsMapper.xml => GoodsMapper.xml}   |  2 +-
 ...iGuardLogMapper.xml => GuardLogMapper.xml} |  2 +-
 ...rdTotalMapper.xml => GuardTotalMapper.xml} |  2 +-
 ...RiskMapper.xml => LowHeightRiskMapper.xml} |  2 +-
 ...rSkillMapper.xml => MemberSkillMapper.xml} |  2 +-
 ...ortCateMapper.xml => ReportCateMapper.xml} |  2 +-
 .../{CaiReportMapper.xml => ReportMapper.xml} |  2 +-
 .../{CaiUnionMapper.xml => UnionMapper.xml}   |  2 +-
 ...nionUserMapper.xml => UnionUserMapper.xml} |  2 +-
 ...serAlbumMapper.xml => UserAlbumMapper.xml} |  2 +-
 ...listMapper.xml => UserBlacklistMapper.xml} |  2 +-
 ...iUserCallMapper.xml => UserCallMapper.xml} |  2 +-
 ...itMapper.xml => UserCameraAuditMapper.xml} |  2 +-
 ...odeGenMapper.xml => UserCodeGenMapper.xml} |  2 +-
 ...serCountMapper.xml => UserCountMapper.xml} |  2 +-
 ...Mapper.xml => UserFollowDynamicMapper.xml} |  2 +-
 ...rFollowMapper.xml => UserFollowMapper.xml} |  2 +-
 ...rForbidMapper.xml => UserForbidMapper.xml} |  2 +-
 ...iUserGiftMapper.xml => UserGiftMapper.xml} |  2 +-
 ...rInviteMapper.xml => UserInviteMapper.xml} |  2 +-
 .../cai/{CaiUserMapper.xml => UserMapper.xml} |  2 +-
 ...rMemberMapper.xml => UserMemberMapper.xml} |  2 +-
 ...rOnlineMapper.xml => UserOnlineMapper.xml} |  2 +-
 ...iskLogMapper.xml => UserRiskLogMapper.xml} |  2 +-
 ...isitorMapper.xml => UserVisitorMapper.xml} |  2 +-
 ...eMapper.xml => WithdrawExchangeMapper.xml} |  2 +-
 230 files changed, 662 insertions(+), 580 deletions(-)
 create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAccountBankcardMapper.java => AccountBankcardMapper.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAccountBusinessMapper.java => AccountBusinessMapper.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAccountCashMapper.java => AccountCashMapper.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAccountDetailMapper.java => AccountDetailMapper.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAccountMapper.java => AccountMapper.java} (92%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAccountRechargeMapper.java => AccountRechargeMapper.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAnchorApplyMapper.java => AnchorApplyMapper.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAnchorMapper.java => AnchorMapper.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiAreaMapper.java => AreaMapper.java} (76%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiBannerMapper.java => BannerMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiCitysMapper.java => CitysMapper.java} (76%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiConsumeLogMapper.java => ConsumeLogMapper.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiDynamicImagesMapper.java => DynamicImagesMapper.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiDynamicMapper.java => DynamicMapper.java} (90%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiGiftMapper.java => GiftMapper.java} (76%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiGiveLogMapper.java => GiveLogMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiGoodsMapper.java => GoodsMapper.java} (76%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiGuardLogMapper.java => GuardLogMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiGuardTotalMapper.java => GuardTotalMapper.java} (93%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiLowHeightRiskMapper.java => LowHeightRiskMapper.java} (86%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiMemberSkillMapper.java => MemberSkillMapper.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiReportCateMapper.java => ReportCateMapper.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiReportMapper.java => ReportMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUnionMapper.java => UnionMapper.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUnionUserMapper.java => UnionUserMapper.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserAlbumMapper.java => UserAlbumMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserBlacklistMapper.java => UserBlacklistMapper.java} (85%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserCallMapper.java => UserCallMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserCameraAuditMapper.java => UserCameraAuditMapper.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserCodeGenMapper.java => UserCodeGenMapper.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserCountMapper.java => UserCountMapper.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserFollowDynamicMapper.java => UserFollowDynamicMapper.java} (71%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserFollowMapper.java => UserFollowMapper.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserForbidMapper.java => UserForbidMapper.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserGiftMapper.java => UserGiftMapper.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserInfoMapper.java => UserInfoMapper.java} (65%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserInviteMapper.java => UserInviteMapper.java} (89%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserMapper.java => UserMapper.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserMemberMapper.java => UserMemberMapper.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserOnlineMapper.java => UserOnlineMapper.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserRiskLogMapper.java => UserRiskLogMapper.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiUserVisitorMapper.java => UserVisitorMapper.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/{CaiWithdrawExchangeMapper.java => WithdrawExchangeMapper.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAccountBankcardService.java => AccountBankcardService.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAccountBusinessService.java => AccountBusinessService.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAccountCashService.java => AccountCashService.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAccountDetailService.java => AccountDetailService.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAccountRechargeService.java => AccountRechargeService.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAccountService.java => AccountService.java} (90%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAnchorApplyService.java => AnchorApplyService.java} (90%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAnchorService.java => AnchorService.java} (92%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiAreaService.java => AreaService.java} (77%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiBannerService.java => BannerService.java} (80%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiCitysService.java => CitysService.java} (80%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiConsumeLogService.java => ConsumeLogService.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiDynamicImagesService.java => DynamicImagesService.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiDynamicService.java => DynamicService.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiGiftService.java => GiftService.java} (81%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiGiveLogService.java => GiveLogService.java} (76%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiGoodsService.java => GoodsService.java} (77%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiGuardLogService.java => GuardLogService.java} (76%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiGuardTotalService.java => GuardTotalService.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiLowHeightRiskService.java => LowHeightRiskService.java} (86%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiMemberSkillService.java => MemberSkillService.java} (74%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiReportCateService.java => ReportCateService.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiReportService.java => ReportService.java} (82%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUnionService.java => UnionService.java} (82%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUnionUserService.java => UnionUserService.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserAlbumService.java => UserAlbumService.java} (90%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserBlacklistService.java => UserBlacklistService.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserCallService.java => UserCallService.java} (84%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserCameraAuditService.java => UserCameraAuditService.java} (83%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserCodeGenService.java => UserCodeGenService.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserCountService.java => UserCountService.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserFollowDynamicService.java => UserFollowDynamicService.java} (80%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserFollowService.java => UserFollowService.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserForbidService.java => UserForbidService.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserGiftService.java => UserGiftService.java} (86%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserInfoService.java => UserInfoService.java} (57%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserInviteService.java => UserInviteService.java} (89%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserMemberService.java => UserMemberService.java} (80%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserOnlineService.java => UserOnlineService.java} (85%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserRiskLogService.java => UserRiskLogService.java} (75%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserService.java => UserService.java} (94%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiUserVisitorService.java => UserVisitorService.java} (89%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/{CaiWithdrawExchangeService.java => WithdrawExchangeService.java} (73%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAccountBankcardServiceImpl.java => AccountBankcardServiceImpl.java} (53%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAccountBusinessServiceImpl.java => AccountBusinessServiceImpl.java} (53%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAccountCashServiceImpl.java => AccountCashServiceImpl.java} (79%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAccountDetailServiceImpl.java => AccountDetailServiceImpl.java} (54%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAccountRechargeServiceImpl.java => AccountRechargeServiceImpl.java} (53%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAccountServiceImpl.java => AccountServiceImpl.java} (94%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAnchorApplyServiceImpl.java => AnchorApplyServiceImpl.java} (90%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAnchorServiceImpl.java => AnchorServiceImpl.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiAreaServiceImpl.java => AreaServiceImpl.java} (59%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiBannerServiceImpl.java => BannerServiceImpl.java} (71%)
 delete mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInfoServiceImpl.java
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiCitysServiceImpl.java => CitysServiceImpl.java} (86%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiConsumeLogServiceImpl.java => ConsumeLogServiceImpl.java} (56%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiDynamicImagesServiceImpl.java => DynamicImagesServiceImpl.java} (53%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiDynamicServiceImpl.java => DynamicServiceImpl.java} (91%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiGiftServiceImpl.java => GiftServiceImpl.java} (78%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiGiveLogServiceImpl.java => GiveLogServiceImpl.java} (57%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiGoodsServiceImpl.java => GoodsServiceImpl.java} (64%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiGuardLogServiceImpl.java => GuardLogServiceImpl.java} (62%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiGuardTotalServiceImpl.java => GuardTotalServiceImpl.java} (94%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiLowHeightRiskServiceImpl.java => LowHeightRiskServiceImpl.java} (72%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiMemberSkillServiceImpl.java => MemberSkillServiceImpl.java} (55%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiReportCateServiceImpl.java => ReportCateServiceImpl.java} (61%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiReportServiceImpl.java => ReportServiceImpl.java} (77%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUnionServiceImpl.java => UnionServiceImpl.java} (59%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUnionUserServiceImpl.java => UnionUserServiceImpl.java} (80%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserAlbumServiceImpl.java => UserAlbumServiceImpl.java} (89%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserBlacklistServiceImpl.java => UserBlacklistServiceImpl.java} (84%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserCallServiceImpl.java => UserCallServiceImpl.java} (81%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserCameraAuditServiceImpl.java => UserCameraAuditServiceImpl.java} (89%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserCodeGenServiceImpl.java => UserCodeGenServiceImpl.java} (54%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserCountServiceImpl.java => UserCountServiceImpl.java} (87%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserFollowDynamicServiceImpl.java => UserFollowDynamicServiceImpl.java} (81%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserFollowServiceImpl.java => UserFollowServiceImpl.java} (89%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserForbidServiceImpl.java => UserForbidServiceImpl.java} (56%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserGiftServiceImpl.java => UserGiftServiceImpl.java} (86%)
 create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInfoServiceImpl.java
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserInviteServiceImpl.java => UserInviteServiceImpl.java} (85%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserMemberServiceImpl.java => UserMemberServiceImpl.java} (57%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserOnlineServiceImpl.java => UserOnlineServiceImpl.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserRiskLogServiceImpl.java => UserRiskLogServiceImpl.java} (56%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserServiceImpl.java => UserServiceImpl.java} (88%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiUserVisitorServiceImpl.java => UserVisitorServiceImpl.java} (84%)
 rename ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/{CaiWithdrawExchangeServiceImpl.java => WithdrawExchangeServiceImpl.java} (53%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAccountBankcardMapper.xml => AccountBankcardMapper.xml} (91%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAccountBusinessMapper.xml => AccountBusinessMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAccountCashMapper.xml => AccountCashMapper.xml} (97%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAccountDetailMapper.xml => AccountDetailMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAccountMapper.xml => AccountMapper.xml} (97%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAccountRechargeMapper.xml => AccountRechargeMapper.xml} (95%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAnchorApplyMapper.xml => AnchorApplyMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAnchorMapper.xml => AnchorMapper.xml} (97%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiAreaMapper.xml => AreaMapper.xml} (93%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiBannerMapper.xml => BannerMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiCitysMapper.xml => CitysMapper.xml} (88%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiConsumeLogMapper.xml => ConsumeLogMapper.xml} (97%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiDynamicImagesMapper.xml => DynamicImagesMapper.xml} (91%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiDynamicMapper.xml => DynamicMapper.xml} (96%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiGiftMapper.xml => GiftMapper.xml} (93%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiGiveLogMapper.xml => GiveLogMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiGoodsMapper.xml => GoodsMapper.xml} (90%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiGuardLogMapper.xml => GuardLogMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiGuardTotalMapper.xml => GuardTotalMapper.xml} (97%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiLowHeightRiskMapper.xml => LowHeightRiskMapper.xml} (93%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiMemberSkillMapper.xml => MemberSkillMapper.xml} (89%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiReportCateMapper.xml => ReportCateMapper.xml} (84%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiReportMapper.xml => ReportMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUnionMapper.xml => UnionMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUnionUserMapper.xml => UnionUserMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserAlbumMapper.xml => UserAlbumMapper.xml} (91%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserBlacklistMapper.xml => UserBlacklistMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserCallMapper.xml => UserCallMapper.xml} (96%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserCameraAuditMapper.xml => UserCameraAuditMapper.xml} (93%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserCodeGenMapper.xml => UserCodeGenMapper.xml} (82%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserCountMapper.xml => UserCountMapper.xml} (96%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserFollowDynamicMapper.xml => UserFollowDynamicMapper.xml} (87%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserFollowMapper.xml => UserFollowMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserForbidMapper.xml => UserForbidMapper.xml} (92%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserGiftMapper.xml => UserGiftMapper.xml} (96%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserInviteMapper.xml => UserInviteMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserMapper.xml => UserMapper.xml} (96%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserMemberMapper.xml => UserMemberMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserOnlineMapper.xml => UserOnlineMapper.xml} (89%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserRiskLogMapper.xml => UserRiskLogMapper.xml} (88%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiUserVisitorMapper.xml => UserVisitorMapper.xml} (94%)
 rename ruoyi-cai/src/main/resources/mapper/cai/{CaiWithdrawExchangeMapper.xml => WithdrawExchangeMapper.xml} (86%)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
index a257746b..04a71346 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
@@ -5,8 +5,8 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserInfo;
 import com.ruoyi.cai.executor.ExecutorConstant;
-import com.ruoyi.cai.service.CaiUserInfoService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.UserInfoService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.UserType;
@@ -28,13 +28,13 @@ import java.util.Collections;
 public class CaiLoginManager {
 
     @Autowired
-    private CaiUserService caiUserService;
+    private UserService userService;
     @Autowired
     private SysLoginService sysLoginService;
 
 
     public String login(String username,String password){
-        User user = caiUserService.getByUsername(username);
+        User user = userService.getByUsername(username);
         if(user == null){
             throw new ServiceException("用户不存在或密码错误");
         }
@@ -69,18 +69,18 @@ public class CaiLoginManager {
     }
 
     @Autowired
-    private CaiUserInfoService caiUserInfoService;
+    private UserInfoService userInfoService;
 
     public void recordLoginInfo(User user, String ip) {
         String address = AddressUtils.getRealAddressByIP(ip);
-        UserInfo userInfo = caiUserInfoService.getById(user.getId());
+        UserInfo userInfo = userInfoService.getById(user.getId());
         UserInfo update = new UserInfo();
         update.setUserId(user.getId());
         update.setLoginCount(userInfo.getLoginCount()+1);
         update.setLastLoginIp(ip);
         update.setLastLoginTime(LocalDateTime.now());
         update.setLastLocation(address);
-        caiUserInfoService.updateById(update);
+        userInfoService.updateById(update);
     }
 
 
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 9102db49..66571110 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
@@ -10,10 +10,10 @@ import com.ruoyi.cai.dto.app.vo.chat.CallResp;
 import com.ruoyi.cai.dto.app.vo.chat.GetRoomResp;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
-import com.ruoyi.cai.service.CaiAnchorService;
-import com.ruoyi.cai.service.CaiGuardTotalService;
-import com.ruoyi.cai.service.CaiUserCallService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.AnchorService;
+import com.ruoyi.cai.service.GuardTotalService;
+import com.ruoyi.cai.service.UserCallService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.manager.WebSocketManager;
 import com.ruoyi.common.exception.ServiceException;
@@ -30,19 +30,19 @@ import java.util.stream.Collectors;
 @Component
 public class ChatManager {
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
     private WebSocketManager webSocketManager;
     @Autowired
-    private CaiUserCallService userCallService;
+    private UserCallService userCallService;
     @Autowired
     private SystemConfigManager systemConfigManager;
     @Autowired
     private CaiProperties properties;
     @Autowired
-    private CaiGuardTotalService guardTotalService;
+    private GuardTotalService guardTotalService;
 
     public CallResp call(CallReq callReq){
         Long userId = LoginHelper.getUserId();
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java
index 66b79a7d..7747bfb5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.GuardLog;
-import com.ruoyi.cai.service.CaiGuardLogService;
+import com.ruoyi.cai.service.GuardLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/guardLog")
 public class CaiGuardLogController extends BaseController {
 
-    private final CaiGuardLogService iCaiGuardLogService;
+    private final GuardLogService iGuardLogService;
 
     /**
      * 查询守护赠送流水列表
@@ -42,7 +42,7 @@ public class CaiGuardLogController extends BaseController {
     @SaCheckPermission("cai:guardLog:list")
     @GetMapping("/list")
     public TableDataInfo<GuardLog> list(GuardLog bo, PageQuery pageQuery) {
-        Page<GuardLog> page = iCaiGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<GuardLog> page = iGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class CaiGuardLogController extends BaseController {
     @GetMapping("/{id}")
     public R<GuardLog> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(iCaiGuardLogService.getById(id));
+        return R.ok(iGuardLogService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class CaiGuardLogController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody GuardLog bo) {
-        return toAjax(iCaiGuardLogService.save(bo));
+        return toAjax(iGuardLogService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class CaiGuardLogController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody GuardLog bo) {
-        return toAjax(iCaiGuardLogService.updateById(bo));
+        return toAjax(iGuardLogService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class CaiGuardLogController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(iCaiGuardLogService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(iGuardLogService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java
index 361dbaa4..5d1a9043 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBankcardController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountBankcard;
-import com.ruoyi.cai.service.CaiAccountBankcardService;
+import com.ruoyi.cai.service.AccountBankcardService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/accountBankcard")
 public class AccountBankcardController extends BaseController {
 
-    private final CaiAccountBankcardService accountBankcardService;
+    private final AccountBankcardService accountBankcardService;
 
     /**
      * 查询用户银行卡列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBusinessController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBusinessController.java
index fcf74318..8053bcfe 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBusinessController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountBusinessController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountBusiness;
-import com.ruoyi.cai.service.CaiAccountBusinessService;
+import com.ruoyi.cai.service.AccountBusinessService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/accountBusiness")
 public class AccountBusinessController extends BaseController {
 
-    private final CaiAccountBusinessService caiAccountBusinessService;
+    private final AccountBusinessService accountBusinessService;
 
     /**
      * 查询账户业务列表
@@ -42,7 +42,7 @@ public class AccountBusinessController extends BaseController {
     @SaCheckPermission("cai:accountBusiness:list")
     @GetMapping("/list")
     public TableDataInfo<AccountBusiness> list(AccountBusiness bo, PageQuery pageQuery) {
-        Page<AccountBusiness> page = caiAccountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountBusiness> page = accountBusinessService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class AccountBusinessController extends BaseController {
     @GetMapping("/{id}")
     public R<AccountBusiness> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiAccountBusinessService.getById(id));
+        return R.ok(accountBusinessService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class AccountBusinessController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountBusiness bo) {
-        return toAjax(caiAccountBusinessService.save(bo));
+        return toAjax(accountBusinessService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class AccountBusinessController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountBusiness bo) {
-        return toAjax(caiAccountBusinessService.updateById(bo));
+        return toAjax(accountBusinessService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class AccountBusinessController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiAccountBusinessService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(accountBusinessService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
index d3790a1e..09e0b976 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountCashController.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountCash;
 import com.ruoyi.cai.dto.admin.vo.AccountCashAdminVo;
-import com.ruoyi.cai.service.CaiAccountCashService;
+import com.ruoyi.cai.service.AccountCashService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -38,7 +38,7 @@ import java.util.List;
 @RequestMapping("/cai/accountCash")
 public class AccountCashController extends BaseController {
 
-    private final CaiAccountCashService accountCashService;
+    private final AccountCashService accountCashService;
 
     /**
      * 查询用户提现记录列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java
index 1c76f5b5..702ae0e4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Account;
 import com.ruoyi.cai.dto.admin.vo.AccountAdminVo;
-import com.ruoyi.cai.service.CaiAccountService;
+import com.ruoyi.cai.service.AccountService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/account")
 public class AccountController extends BaseController {
 
-    private final CaiAccountService accountService;
+    private final AccountService accountService;
 
     /**
      * 查询用户账户列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java
index 68db8eec..69402883 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountDetailController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountDetail;
-import com.ruoyi.cai.service.CaiAccountDetailService;
+import com.ruoyi.cai.service.AccountDetailService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/accountDetail")
 public class AccountDetailController extends BaseController {
 
-    private final CaiAccountDetailService caiAccountDetailService;
+    private final AccountDetailService caiAccountDetailService;
 
     /**
      * 查询账户明细列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java
index 5e88fb69..f683ff8f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AccountRechargeController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountRecharge;
-import com.ruoyi.cai.service.CaiAccountRechargeService;
+import com.ruoyi.cai.service.AccountRechargeService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/accountRecharge")
 public class AccountRechargeController extends BaseController {
 
-    private final CaiAccountRechargeService caiAccountRechargeService;
+    private final AccountRechargeService accountRechargeService;
 
     /**
      * 查询充值记录列表
@@ -42,7 +42,7 @@ public class AccountRechargeController extends BaseController {
     @SaCheckPermission("cai:accountRecharge:list")
     @GetMapping("/list")
     public TableDataInfo<AccountRecharge> list(AccountRecharge bo, PageQuery pageQuery) {
-        Page<AccountRecharge> page = caiAccountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<AccountRecharge> page = accountRechargeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class AccountRechargeController extends BaseController {
     @GetMapping("/{id}")
     public R<AccountRecharge> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiAccountRechargeService.getById(id));
+        return R.ok(accountRechargeService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class AccountRechargeController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody AccountRecharge bo) {
-        return toAjax(caiAccountRechargeService.save(bo));
+        return toAjax(accountRechargeService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class AccountRechargeController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody AccountRecharge bo) {
-        return toAjax(caiAccountRechargeService.updateById(bo));
+        return toAjax(accountRechargeService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class AccountRechargeController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiAccountRechargeService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(accountRechargeService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java
index 6bb811b4..a2c260a7 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorApplyController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AnchorApply;
 import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo;
-import com.ruoyi.cai.service.CaiAnchorApplyService;
+import com.ruoyi.cai.service.AnchorApplyService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/anchorApply")
 public class AnchorApplyController extends BaseController {
 
-    private final CaiAnchorApplyService anchorApplyService;
+    private final AnchorApplyService anchorApplyService;
 
     /**
      * 查询播主申请管理列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java
index aac867eb..ea38db04 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/AnchorController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.cai.domain.Anchor;
 import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
-import com.ruoyi.cai.service.CaiAnchorService;
+import com.ruoyi.cai.service.AnchorService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/anchor")
 public class AnchorController extends BaseController {
 
-    private final CaiAnchorService caiAnchorService;
+    private final AnchorService caiAnchorService;
 
     /**
      * 查询女神列表列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java
index fbcdda49..25a2aff7 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/BannerController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Banner;
-import com.ruoyi.cai.service.CaiBannerService;
+import com.ruoyi.cai.service.BannerService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/banner")
 public class BannerController extends BaseController {
 
-    private final CaiBannerService bannerService;
+    private final BannerService bannerService;
 
     /**
      * 查询轮播列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java
index e4fd5280..a269b69e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.CaiConsumeLog;
-import com.ruoyi.cai.service.CaiConsumeLogService;
+import com.ruoyi.cai.service.ConsumeLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/consumeLog")
 public class ConsumeLogController extends BaseController {
 
-    private final CaiConsumeLogService caiConsumeLogService;
+    private final ConsumeLogService consumeLogService;
 
     /**
      * 查询消费记录列表
@@ -42,7 +42,7 @@ public class ConsumeLogController extends BaseController {
     @SaCheckPermission("cai:consumeLog:list")
     @GetMapping("/list")
     public TableDataInfo<CaiConsumeLog> list(CaiConsumeLog bo, PageQuery pageQuery) {
-        Page<CaiConsumeLog> page = caiConsumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<CaiConsumeLog> page = consumeLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class ConsumeLogController extends BaseController {
     @GetMapping("/{id}")
     public R<CaiConsumeLog> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiConsumeLogService.getById(id));
+        return R.ok(consumeLogService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class ConsumeLogController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody CaiConsumeLog bo) {
-        return toAjax(caiConsumeLogService.save(bo));
+        return toAjax(consumeLogService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class ConsumeLogController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody CaiConsumeLog bo) {
-        return toAjax(caiConsumeLogService.updateById(bo));
+        return toAjax(consumeLogService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class ConsumeLogController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiConsumeLogService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(consumeLogService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java
index 7d0a9174..5b4d7027 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/DynamicController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Dynamic;
-import com.ruoyi.cai.service.CaiDynamicService;
+import com.ruoyi.cai.service.DynamicService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/dynamic")
 public class DynamicController extends BaseController {
 
-    private final CaiDynamicService caiDynamicService;
+    private final DynamicService caiDynamicService;
 
     /**
      * 查询主播动态列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java
index f6df2a11..10fafab5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Gift;
-import com.ruoyi.cai.service.CaiGiftService;
+import com.ruoyi.cai.service.GiftService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/gift")
 public class GiftController extends BaseController {
 
-    private final CaiGiftService caiGiftService;
+    private final GiftService giftService;
 
     /**
      * 查询礼物列表
@@ -42,7 +42,7 @@ public class GiftController extends BaseController {
     @SaCheckPermission("cai:gift:list")
     @GetMapping("/list")
     public TableDataInfo<Gift> list(Gift bo, PageQuery pageQuery) {
-        Page<Gift> page = caiGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Gift> page = giftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class GiftController extends BaseController {
     @GetMapping("/{id}")
     public R<Gift> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
-        return R.ok(caiGiftService.getById(id));
+        return R.ok(giftService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class GiftController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody Gift bo) {
-        return toAjax(caiGiftService.save(bo));
+        return toAjax(giftService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class GiftController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody Gift bo) {
-        return toAjax(caiGiftService.updateById(bo));
+        return toAjax(giftService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class GiftController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Integer[] ids) {
-        return toAjax(caiGiftService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(giftService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java
index 7a52ad0a..c97c0d63 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiveLogController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.GiveLog;
-import com.ruoyi.cai.service.CaiGiveLogService;
+import com.ruoyi.cai.service.GiveLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/giveLog")
 public class GiveLogController extends BaseController {
 
-    private final CaiGiveLogService caiGiveLogService;
+    private final GiveLogService giveLogService;
 
     /**
      * 查询赠送记录列表
@@ -42,7 +42,7 @@ public class GiveLogController extends BaseController {
     @SaCheckPermission("cai:giveLog:list")
     @GetMapping("/list")
     public TableDataInfo<GiveLog> list(GiveLog bo, PageQuery pageQuery) {
-        Page<GiveLog> page = caiGiveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<GiveLog> page = giveLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class GiveLogController extends BaseController {
     @GetMapping("/{id}")
     public R<GiveLog> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiGiveLogService.getById(id));
+        return R.ok(giveLogService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class GiveLogController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody GiveLog bo) {
-        return toAjax(caiGiveLogService.save(bo));
+        return toAjax(giveLogService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class GiveLogController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody GiveLog bo) {
-        return toAjax(caiGiveLogService.updateById(bo));
+        return toAjax(giveLogService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class GiveLogController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiGiveLogService.removeBatchByIds(Arrays.asList(ids)));
+        return toAjax(giveLogService.removeBatchByIds(Arrays.asList(ids)));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java
index d3ab0316..b625f98f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Goods;
-import com.ruoyi.cai.service.CaiGoodsService;
+import com.ruoyi.cai.service.GoodsService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/goods")
 public class GoodsController extends BaseController {
 
-    private final CaiGoodsService caiGoodsService;
+    private final GoodsService goodsService;
 
     /**
      * 查询充值配置列表
@@ -42,7 +42,7 @@ public class GoodsController extends BaseController {
     @SaCheckPermission("cai:goods:list")
     @GetMapping("/list")
     public TableDataInfo<Goods> list(Goods bo, PageQuery pageQuery) {
-        Page<Goods> page = caiGoodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Goods> page = goodsService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class GoodsController extends BaseController {
     @GetMapping("/{id}")
     public R<Goods> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiGoodsService.getById(id));
+        return R.ok(goodsService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class GoodsController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody Goods bo) {
-        return toAjax(caiGoodsService.save(bo));
+        return toAjax(goodsService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class GoodsController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody Goods bo) {
-        return toAjax(caiGoodsService.updateById(bo));
+        return toAjax(goodsService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class GoodsController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiGoodsService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(goodsService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java
index 88a9ff1a..16e109d3 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/LowHeightRiskController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.LowHeightRisk;
 import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo;
-import com.ruoyi.cai.service.CaiLowHeightRiskService;
+import com.ruoyi.cai.service.LowHeightRiskService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/lowHeightRisk")
 public class LowHeightRiskController extends BaseController {
 
-    private final CaiLowHeightRiskService lowHeightRiskService;
+    private final LowHeightRiskService lowHeightRiskService;
 
     /**
      * 查询高风险用户记录列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportCateController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportCateController.java
index 3f4cd938..1ee89ba8 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportCateController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportCateController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.ReportCate;
-import com.ruoyi.cai.service.CaiReportCateService;
+import com.ruoyi.cai.service.ReportCateService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/reportCate")
 public class ReportCateController extends BaseController {
 
-    private final CaiReportCateService caiReportCateService;
+    private final ReportCateService reportCateService;
 
     /**
      * 查询举报分类列表
@@ -42,7 +42,7 @@ public class ReportCateController extends BaseController {
     @SaCheckPermission("cai:reportCate:list")
     @GetMapping("/list")
     public TableDataInfo<ReportCate> list(ReportCate bo, PageQuery pageQuery) {
-        Page<ReportCate> page = caiReportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<ReportCate> page = reportCateService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -56,7 +56,7 @@ public class ReportCateController extends BaseController {
     @GetMapping("/{id}")
     public R<ReportCate> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
-        return R.ok(caiReportCateService.getById(id));
+        return R.ok(reportCateService.getById(id));
     }
 
     /**
@@ -67,7 +67,7 @@ public class ReportCateController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ReportCate bo) {
-        return toAjax(caiReportCateService.save(bo));
+        return toAjax(reportCateService.save(bo));
     }
 
     /**
@@ -78,7 +78,7 @@ public class ReportCateController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ReportCate bo) {
-        return toAjax(caiReportCateService.updateById(bo));
+        return toAjax(reportCateService.updateById(bo));
     }
 
     /**
@@ -91,6 +91,6 @@ public class ReportCateController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Integer[] ids) {
-        return toAjax(caiReportCateService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(reportCateService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
index 184b4ade..4b6c528a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ReportController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Report;
-import com.ruoyi.cai.service.CaiReportService;
+import com.ruoyi.cai.service.ReportService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/report")
 public class ReportController extends BaseController {
 
-    private final CaiReportService caiReportService;
+    private final ReportService reportService;
 
     /**
      * 查询举报列表
@@ -42,7 +42,7 @@ public class ReportController extends BaseController {
     @SaCheckPermission("cai:report:list")
     @GetMapping("/list")
     public TableDataInfo<Report> list(Report bo, PageQuery pageQuery) {
-        Page<Report> page = caiReportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<Report> page = reportService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class ReportController extends BaseController {
     @GetMapping("/{id}")
     public R<Report> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiReportService.getById(id));
+        return R.ok(reportService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class ReportController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody Report bo) {
-        return toAjax(caiReportService.save(bo));
+        return toAjax(reportService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class ReportController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody Report bo) {
-        return toAjax(caiReportService.updateById(bo));
+        return toAjax(reportService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class ReportController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiReportService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(reportService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java
index ae2abfe1..1c996ac9 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Union;
 import com.ruoyi.cai.dto.admin.vo.UnionAdminVo;
-import com.ruoyi.cai.service.CaiUnionService;
+import com.ruoyi.cai.service.UnionService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userUnion")
 public class UnionController extends BaseController {
 
-    private final CaiUnionService caiUnionService;
+    private final UnionService unionService;
 
     /**
      * 查询工会列表列表
@@ -42,7 +42,7 @@ public class UnionController extends BaseController {
     @SaCheckPermission("cai:userUnion:list")
     @GetMapping("/list")
     public TableDataInfo<UnionAdminVo> list(UnionAdminVo bo, PageQuery pageQuery) {
-        Page<UnionAdminVo> page = caiUnionService.pageAdmin(pageQuery, bo);
+        Page<UnionAdminVo> page = unionService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -56,7 +56,7 @@ public class UnionController extends BaseController {
     @GetMapping("/{id}")
     public R<Union> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiUnionService.getById(id));
+        return R.ok(unionService.getById(id));
     }
 
     /**
@@ -67,7 +67,7 @@ public class UnionController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody Union bo) {
-        return toAjax(caiUnionService.save(bo));
+        return toAjax(unionService.save(bo));
     }
 
     /**
@@ -78,7 +78,7 @@ public class UnionController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody Union bo) {
-        return toAjax(caiUnionService.updateById(bo));
+        return toAjax(unionService.updateById(bo));
     }
 
     /**
@@ -91,6 +91,6 @@ public class UnionController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiUnionService.removeBatchByIds(Arrays.asList(ids)));
+        return toAjax(unionService.removeBatchByIds(Arrays.asList(ids)));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java
index 751085e4..389adfc7 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionUserController.java
@@ -1,11 +1,10 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UnionUser;
 import com.ruoyi.cai.dto.admin.vo.UnionUserAdminVo;
-import com.ruoyi.cai.service.CaiUnionUserService;
+import com.ruoyi.cai.service.UnionUserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -35,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/unionUser")
 public class UnionUserController extends BaseController {
 
-    private final CaiUnionUserService caiUnionUserService;
+    private final UnionUserService unionUserService;
 
     /**
      * 查询123列表
@@ -43,7 +42,7 @@ public class UnionUserController extends BaseController {
     @SaCheckPermission("cai:unionUser:list")
     @GetMapping("/list")
     public TableDataInfo<UnionUserAdminVo> list(UnionUserAdminVo bo, PageQuery pageQuery) {
-        Page<UnionUserAdminVo> page = caiUnionUserService.pageAdmin(pageQuery, bo);
+        Page<UnionUserAdminVo> page = unionUserService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -56,7 +55,7 @@ public class UnionUserController extends BaseController {
     @GetMapping("/{id}")
     public R<UnionUser> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiUnionUserService.getById(id));
+        return R.ok(unionUserService.getById(id));
     }
 
     /**
@@ -67,7 +66,7 @@ public class UnionUserController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UnionUser bo) {
-        return toAjax(caiUnionUserService.save(bo));
+        return toAjax(unionUserService.save(bo));
     }
 
     /**
@@ -78,7 +77,7 @@ public class UnionUserController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UnionUser bo) {
-        return toAjax(caiUnionUserService.updateById(bo));
+        return toAjax(unionUserService.updateById(bo));
     }
 
     /**
@@ -91,6 +90,6 @@ public class UnionUserController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiUnionUserService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(unionUserService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java
index 81de742a..efdc483f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserAlbumController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserAlbum;
-import com.ruoyi.cai.service.CaiUserAlbumService;
+import com.ruoyi.cai.service.UserAlbumService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userAlbum")
 public class UserAlbumController extends BaseController {
 
-    private final CaiUserAlbumService userAlbumService;
+    private final UserAlbumService userAlbumService;
 
     /**
      * 查询主播集锦列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java
index 6b8c448f..ee9816f9 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCallController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserCall;
-import com.ruoyi.cai.service.CaiUserCallService;
+import com.ruoyi.cai.service.UserCallService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userCall")
 public class UserCallController extends BaseController {
 
-    private final CaiUserCallService caiUserCallService;
+    private final UserCallService userCallService;
 
     /**
      * 查询通话记录列表
@@ -42,7 +42,7 @@ public class UserCallController extends BaseController {
     @SaCheckPermission("cai:userCall:list")
     @GetMapping("/list")
     public TableDataInfo<UserCall> list(UserCall bo, PageQuery pageQuery) {
-        Page<UserCall> page = caiUserCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserCall> page = userCallService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class UserCallController extends BaseController {
     @GetMapping("/{id}")
     public R<UserCall> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiUserCallService.getById(id));
+        return R.ok(userCallService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class UserCallController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCall bo) {
-        return toAjax(caiUserCallService.save(bo));
+        return toAjax(userCallService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class UserCallController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCall bo) {
-        return toAjax(caiUserCallService.updateById(bo));
+        return toAjax(userCallService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class UserCallController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiUserCallService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(userCallService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java
index bacbb7dc..dc0960f4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCameraAuditController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserCameraAudit;
-import com.ruoyi.cai.service.CaiUserCameraAuditService;
+import com.ruoyi.cai.service.UserCameraAuditService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userCameraAudit")
 public class UserCameraAuditController extends BaseController {
 
-    private final CaiUserCameraAuditService caiUserCameraAuditService;
+    private final UserCameraAuditService userCameraAuditService;
 
     /**
      * 查询自拍认证列表
@@ -42,7 +42,7 @@ public class UserCameraAuditController extends BaseController {
     @SaCheckPermission("cai:userCameraAudit:list")
     @GetMapping("/list")
     public TableDataInfo<UserCameraAudit> list(UserCameraAudit bo, PageQuery pageQuery) {
-        Page<UserCameraAudit> page = caiUserCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserCameraAudit> page = userCameraAuditService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class UserCameraAuditController extends BaseController {
     @GetMapping("/{id}")
     public R<UserCameraAudit> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
-        return R.ok(caiUserCameraAuditService.getById(id));
+        return R.ok(userCameraAuditService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class UserCameraAuditController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCameraAudit bo) {
-        return toAjax(caiUserCameraAuditService.save(bo));
+        return toAjax(userCameraAuditService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class UserCameraAuditController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCameraAudit bo) {
-        return toAjax(caiUserCameraAuditService.updateById(bo));
+        return toAjax(userCameraAuditService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class UserCameraAuditController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Integer[] ids) {
-        return toAjax(caiUserCameraAuditService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(userCameraAuditService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java
index 93b5324d..c144defb 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java
@@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
 import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
+import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
 import com.ruoyi.cai.manager.UserAdminManager;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -36,7 +37,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/user")
 public class UserController extends BaseController {
 
-    private final CaiUserService caiUserService;
+    private final UserService userService;
     private final UserAdminManager userAdminManager;
 
     /**
@@ -45,7 +46,7 @@ public class UserController extends BaseController {
     @SaCheckPermission("cai:user:list")
     @GetMapping("/list")
     public TableDataInfo<UserAdminVo> list(User query, PageQuery pageQuery) {
-        Page<UserAdminVo> result = caiUserService.pageAdmin(pageQuery, query);
+        Page<UserAdminVo> result = userService.pageAdmin(pageQuery, query);
         return TableDataInfo.build(result);
     }
 
@@ -56,8 +57,14 @@ public class UserController extends BaseController {
      */
     @SaCheckPermission("cai:user:query")
     @GetMapping("/{id}")
-    public R<User> getInfo(@NotNull(message = "主键不能为空") @PathVariable Integer id) {
-        return R.ok(caiUserService.getById(id));
+    public R<User> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(userService.getById(id));
+    }
+
+    @SaCheckPermission("cai:user:query")
+    @GetMapping("/full/{id}")
+    public R<UserFullAdminVo> getFullUser(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(userAdminManager.getUser(id));
     }
 
     /**
@@ -68,7 +75,7 @@ public class UserController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody User bo) {
-        return toAjax(caiUserService.save(bo));
+        return toAjax(userService.save(bo));
     }
 
     /**
@@ -92,6 +99,6 @@ public class UserController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Integer[] ids) {
-        return toAjax(caiUserService.removeBatchByIds(Arrays.asList(ids)));
+        return toAjax(userService.removeBatchByIds(Arrays.asList(ids)));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java
index cacd30ac..62d13826 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserCountController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserCount;
 import com.ruoyi.cai.dto.admin.vo.UserCountAdminVo;
-import com.ruoyi.cai.service.CaiUserCountService;
+import com.ruoyi.cai.service.UserCountService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userCount")
 public class UserCountController extends BaseController {
 
-    private final CaiUserCountService caiUserCountService;
+    private final UserCountService userCountService;
 
     /**
      * 查询用户信息数量统计列表
@@ -42,13 +42,13 @@ public class UserCountController extends BaseController {
     @SaCheckPermission("cai:userCount:list")
     @GetMapping("/list")
     public TableDataInfo<UserCountAdminVo> list(UserCountAdminVo bo, PageQuery pageQuery) {
-        Page<UserCountAdminVo> page = caiUserCountService.pageAdmin(pageQuery, bo);
+        Page<UserCountAdminVo> page = userCountService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
     @GetMapping("/reset")
     public R<Void> reset(Long userId) {
-        caiUserCountService.reset(userId);
+        userCountService.reset(userId);
         return R.ok();
     }
 
@@ -62,7 +62,7 @@ public class UserCountController extends BaseController {
     @GetMapping("/{userId}")
     public R<UserCount> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer userId) {
-        return R.ok(caiUserCountService.getById(userId));
+        return R.ok(userCountService.getById(userId));
     }
 
     /**
@@ -73,7 +73,7 @@ public class UserCountController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCount bo) {
-        return toAjax(caiUserCountService.save(bo));
+        return toAjax(userCountService.save(bo));
     }
 
     /**
@@ -84,7 +84,7 @@ public class UserCountController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCount bo) {
-        return toAjax(caiUserCountService.updateById(bo));
+        return toAjax(userCountService.updateById(bo));
     }
 
     /**
@@ -97,6 +97,6 @@ public class UserCountController extends BaseController {
     @DeleteMapping("/{userIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Integer[] userIds) {
-        return toAjax(caiUserCountService.removeBatchByIds(Arrays.asList(userIds), true));
+        return toAjax(userCountService.removeBatchByIds(Arrays.asList(userIds), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java
index f4981121..e7bd93aa 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserForbid;
-import com.ruoyi.cai.service.CaiUserForbidService;
+import com.ruoyi.cai.service.UserForbidService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userForbid")
 public class UserForbidController extends BaseController {
 
-    private final CaiUserForbidService userForbidService;
+    private final UserForbidService userForbidService;
 
     /**
      * 查询封号列表列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java
index 5da65eb5..9deae17b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserInviteController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserInvite;
-import com.ruoyi.cai.service.CaiUserInviteService;
+import com.ruoyi.cai.service.UserInviteService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userInvite")
 public class UserInviteController extends BaseController {
 
-    private final CaiUserInviteService caiUserInviteService;
+    private final UserInviteService userInviteService;
 
     /**
      * 查询用户邀请列表
@@ -42,7 +42,7 @@ public class UserInviteController extends BaseController {
     @SaCheckPermission("cai:userInvite:list")
     @GetMapping("/list")
     public TableDataInfo<UserInvite> list(UserInvite bo, PageQuery pageQuery) {
-        Page<UserInvite> page = caiUserInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserInvite> page = userInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class UserInviteController extends BaseController {
     @GetMapping("/{id}")
     public R<UserInvite> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiUserInviteService.getById(id));
+        return R.ok(userInviteService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class UserInviteController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserInvite bo) {
-        return toAjax(caiUserInviteService.save(bo));
+        return toAjax(userInviteService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class UserInviteController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserInvite bo) {
-        return toAjax(caiUserInviteService.updateById(bo));
+        return toAjax(userInviteService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class UserInviteController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiUserInviteService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(userInviteService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java
index 61d7e675..a40bcc41 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserMemberController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserMember;
 import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
-import com.ruoyi.cai.service.CaiUserMemberService;
+import com.ruoyi.cai.service.UserMemberService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userMember")
 public class UserMemberController extends BaseController {
 
-    private final CaiUserMemberService userMemberService;
+    private final UserMemberService userMemberService;
 
     /**
      * 查询会员管理列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java
index 1530c343..4564a902 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserRiskLogController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserRiskLog;
-import com.ruoyi.cai.service.CaiUserRiskLogService;
+import com.ruoyi.cai.service.UserRiskLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userRiskLog")
 public class UserRiskLogController extends BaseController {
 
-    private final CaiUserRiskLogService userRiskLogService;
+    private final UserRiskLogService userRiskLogService;
 
     /**
      * 查询高风险操作日志列表
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java
index ff3bfe34..2c4fa59c 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserVisitorController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserVisitor;
-import com.ruoyi.cai.service.CaiUserVisitorService;
+import com.ruoyi.cai.service.UserVisitorService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/userVisitor")
 public class UserVisitorController extends BaseController {
 
-    private final CaiUserVisitorService caiUserVisitorService;
+    private final UserVisitorService userVisitorService;
 
     /**
      * 查询用户来访记录列表
@@ -42,7 +42,7 @@ public class UserVisitorController extends BaseController {
     @SaCheckPermission("cai:userVisitor:list")
     @GetMapping("/list")
     public TableDataInfo<UserVisitor> list(UserVisitor bo, PageQuery pageQuery) {
-        Page<UserVisitor> page = caiUserVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UserVisitor> page = userVisitorService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class UserVisitorController extends BaseController {
     @GetMapping("/{id}")
     public R<UserVisitor> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiUserVisitorService.getById(id));
+        return R.ok(userVisitorService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class UserVisitorController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserVisitor bo) {
-        return toAjax(caiUserVisitorService.save(bo));
+        return toAjax(userVisitorService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class UserVisitorController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserVisitor bo) {
-        return toAjax(caiUserVisitorService.updateById(bo));
+        return toAjax(userVisitorService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class UserVisitorController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiUserVisitorService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(userVisitorService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java
index 6099eaf9..f51d08d5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java
@@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.WithdrawExchange;
-import com.ruoyi.cai.service.CaiWithdrawExchangeService;
+import com.ruoyi.cai.service.WithdrawExchangeService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 @RequestMapping("/cai/withdrawExchange")
 public class WithdrawExchangeController extends BaseController {
 
-    private final CaiWithdrawExchangeService caiWithdrawExchangeService;
+    private final WithdrawExchangeService withdrawExchangeService;
 
     /**
      * 查询提现 - 兑换配置列表
@@ -42,7 +42,7 @@ public class WithdrawExchangeController extends BaseController {
     @SaCheckPermission("cai:withdrawExchange:list")
     @GetMapping("/list")
     public TableDataInfo<WithdrawExchange> list(WithdrawExchange bo, PageQuery pageQuery) {
-        Page<WithdrawExchange> page = caiWithdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<WithdrawExchange> page = withdrawExchangeService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
         return TableDataInfo.build(page);
     }
 
@@ -55,7 +55,7 @@ public class WithdrawExchangeController extends BaseController {
     @GetMapping("/{id}")
     public R<WithdrawExchange> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
-        return R.ok(caiWithdrawExchangeService.getById(id));
+        return R.ok(withdrawExchangeService.getById(id));
     }
 
     /**
@@ -66,7 +66,7 @@ public class WithdrawExchangeController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody WithdrawExchange bo) {
-        return toAjax(caiWithdrawExchangeService.save(bo));
+        return toAjax(withdrawExchangeService.save(bo));
     }
 
     /**
@@ -77,7 +77,7 @@ public class WithdrawExchangeController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody WithdrawExchange bo) {
-        return toAjax(caiWithdrawExchangeService.updateById(bo));
+        return toAjax(withdrawExchangeService.updateById(bo));
     }
 
     /**
@@ -90,6 +90,6 @@ public class WithdrawExchangeController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
-        return toAjax(caiWithdrawExchangeService.removeBatchByIds(Arrays.asList(ids), true));
+        return toAjax(withdrawExchangeService.removeBatchByIds(Arrays.asList(ids), true));
     }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java
index 479c61a9..9cc487e4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java
@@ -6,10 +6,10 @@ import com.ruoyi.cai.dto.app.vo.AnchorJoinHomeVo;
 import com.ruoyi.cai.dto.app.vo.AnchorVo;
 import com.ruoyi.cai.dto.app.vo.CameraAuditVo;
 import com.ruoyi.cai.manager.CurrentUserManager;
-import com.ruoyi.cai.service.CaiAnchorApplyService;
-import com.ruoyi.cai.service.CaiAnchorService;
-import com.ruoyi.cai.service.CaiUserCameraAuditService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.AnchorApplyService;
+import com.ruoyi.cai.service.AnchorService;
+import com.ruoyi.cai.service.UserCameraAuditService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.helper.LoginHelper;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,13 +26,13 @@ public class AnchorAppController {
     @Autowired
     private CurrentUserManager currentUserManager;
     @Autowired
-    private CaiUserCameraAuditService userCameraAuditService;
+    private UserCameraAuditService userCameraAuditService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorApplyService anchorApplyService;
+    private AnchorApplyService anchorApplyService;
 
     @GetMapping("/info")
     @Operation(summary = "当前用户的主播信息")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java
index de46fc4e..ba603f8a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java
@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.ruoyi.cai.auth.CaiLoginManager;
 import com.ruoyi.cai.auth.LoginCaiUser;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,12 +25,12 @@ public class AuthAppController {
     @Autowired
     private CaiLoginManager caiLoginManager;
     @Autowired
-    private CaiUserService caiUserService;
+    private UserService userService;
 
     @PostMapping("/register")
     @Operation(summary = "注册")
     public R<Void> register(@RequestBody LoginCaiUser caiUser){
-        caiUserService.register(caiUser);
+        userService.register(caiUser);
         return R.ok();
     }
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java
index cc9c9e1b..a493ea7e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.controller.app;
 
 import com.ruoyi.cai.dto.app.query.GiveGiftRes;
 import com.ruoyi.cai.dto.app.query.GiveGuardReq;
-import com.ruoyi.cai.service.CaiGuardTotalService;
-import com.ruoyi.cai.service.CaiUserGiftService;
+import com.ruoyi.cai.service.GuardTotalService;
+import com.ruoyi.cai.service.UserGiftService;
 import com.ruoyi.common.core.domain.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RestController;
 public class ConsumeController {
 
     @Autowired
-    private CaiGuardTotalService guardTotalService;
+    private GuardTotalService guardTotalService;
     @Autowired
-    private CaiUserGiftService userGiftService;
+    private UserGiftService userGiftService;
 
     @PostMapping("/give/guard")
     @Operation(summary = "赠送主播守护")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java
index d6f33834..651d6504 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java
@@ -31,15 +31,15 @@ import java.util.List;
 public class IndexController {
 
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
-    private CaiUserService caiUserService;
+    private UserService userService;
     @Autowired
-    private CaiBannerService bannerService;
+    private BannerService bannerService;
     @Autowired
-    private CaiGuardTotalService guardTotalService;
+    private GuardTotalService guardTotalService;
     @Autowired
-    private CaiUserGiftService userGiftService;
+    private UserGiftService userGiftService;
 
     @GetMapping("/banner")
     @Operation(summary = "获取首页banner图")
@@ -58,14 +58,14 @@ public class IndexController {
     @GetMapping("/user/page")
     @Operation(summary = "用户全局查询-分页")
     public TableDataInfo<UserListVo> page(PageQuery page, UserQuery query){
-        Page<UserListVo> res = caiUserService.pageApp(page,query);
+        Page<UserListVo> res = userService.pageApp(page,query);
         return TableDataInfo.build(res);
     }
 
     @GetMapping("/home/info")
     @Operation(summary = "获取指定用户主页信息")
     public R<UserInfoVo> info(Long userId){
-        UserInfoVo res = caiUserService.info(userId);
+        UserInfoVo res = userService.info(userId);
         return R.ok(res);
     }
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java
index 61a96821..d9bbc9f0 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java
@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo;
 import com.ruoyi.cai.dto.app.vo.user.UserListVo;
-import com.ruoyi.cai.service.CaiUserInviteService;
+import com.ruoyi.cai.service.UserInviteService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -15,15 +15,13 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/api/invite")
 @Tag(name = "邀请相关接口")
 public class InviteAppController {
 
     @Autowired
-    private CaiUserInviteService userInviteService;
+    private UserInviteService userInviteService;
 
     @GetMapping("/home")
     @Operation(summary = "邀请有奖页面")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
index 3c178d0d..d06dd880 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.cai.controller.app;
 
 import com.ruoyi.cai.dto.app.query.UserReportReq;
-import com.ruoyi.cai.service.CaiReportService;
+import com.ruoyi.cai.service.ReportService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.helper.LoginHelper;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class OtherController {
 
     @Autowired
-    private CaiReportService reportService;
+    private ReportService reportService;
 
     @PostMapping("/report")
     @Operation(summary = "举报")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
index 93ec6044..218d2714 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
@@ -22,15 +22,15 @@ import java.util.Map;
 public class SettingAppController {
 
     @Autowired
-    private CaiGoodsService goodsService;
+    private GoodsService goodsService;
     @Autowired
-    private CaiWithdrawExchangeService withdrawExchangeService;
+    private WithdrawExchangeService withdrawExchangeService;
     @Autowired
-    private CaiReportCateService reportCateService;
+    private ReportCateService reportCateService;
     @Autowired
-    private CaiCitysService citysService;
+    private CitysService citysService;
     @Autowired
-    private CaiGiftService giftService;
+    private GiftService giftService;
 
     @GetMapping("/goods")
     @Operation(summary = "充值配置")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
index 2618c61b..74b27359 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
@@ -6,7 +6,7 @@ import com.ruoyi.cai.dto.app.query.IdRes;
 import com.ruoyi.cai.dto.app.query.UserUpdateReq;
 import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
 import com.ruoyi.cai.manager.CurrentUserManager;
-import com.ruoyi.cai.service.CaiUserAlbumService;
+import com.ruoyi.cai.service.UserAlbumService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.helper.LoginHelper;
 import io.swagger.v3.oas.annotations.Operation;
@@ -23,7 +23,7 @@ public class UserAppController {
     @Autowired
     private CurrentUserManager currentUserManager;
     @Autowired
-    private CaiUserAlbumService userAlbumService;
+    private UserAlbumService userAlbumService;
 
     @GetMapping("/info")
     @Operation(summary = "当前用户信息")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java
index cdc04f35..d7cc59a4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java
@@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.dto.app.query.BlackQuery;
 import com.ruoyi.cai.dto.app.vo.user.UserListVo;
-import com.ruoyi.cai.service.CaiUserBlacklistService;
+import com.ruoyi.cai.service.UserBlacklistService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public class UserBlackAppController {
 
     @Autowired
-    private CaiUserBlacklistService userBlacklistService;
+    private UserBlacklistService userBlacklistService;
 
     @GetMapping("page")
     @Operation(summary = "用户黑名单查询")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java
index 72a3af30..828c65d3 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java
@@ -5,8 +5,8 @@ import com.ruoyi.cai.dto.app.query.DynamicAddReq;
 import com.ruoyi.cai.dto.app.query.DynamicQuery;
 import com.ruoyi.cai.dto.app.query.DynamicStarReq;
 import com.ruoyi.cai.dto.app.vo.DynamicListVo;
-import com.ruoyi.cai.service.CaiDynamicService;
-import com.ruoyi.cai.service.CaiUserFollowDynamicService;
+import com.ruoyi.cai.service.DynamicService;
+import com.ruoyi.cai.service.UserFollowDynamicService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -22,9 +22,9 @@ import org.springframework.web.bind.annotation.*;
 public class UserDynamicAppController {
 
     @Autowired
-    private CaiDynamicService dynamicService;
+    private DynamicService dynamicService;
     @Autowired
-    private CaiUserFollowDynamicService userFollowDynamicService;
+    private UserFollowDynamicService userFollowDynamicService;
 
     @GetMapping("/page")
     @Operation(summary = "动态查询动态")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java
index a5105f03..886b8856 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
 import com.ruoyi.cai.dto.app.query.StarQuery;
 import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
-import com.ruoyi.cai.service.CaiUserFollowService;
+import com.ruoyi.cai.service.UserFollowService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 public class UserStartAppController {
 
     @Autowired
-    private CaiUserFollowService userFollowService;
+    private UserFollowService userFollowService;
 
     @PostMapping("/star")
     @Operation(summary = "关注用户")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java
index 3dc5f199..e98cf6bf 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
 import com.ruoyi.cai.dto.app.query.VisitorQuery;
 import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
-import com.ruoyi.cai.service.CaiUserVisitorService;
+import com.ruoyi.cai.service.UserVisitorService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 public class UserVisitorAppController {
 
     @Autowired
-    private CaiUserVisitorService userVisitorService;
+    private UserVisitorService userVisitorService;
 
     // 除网络问题不返回异常。避免影响业务
     @PostMapping("/visitor")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
index 73606ccf..49b2e662 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
@@ -11,8 +11,8 @@ import com.ruoyi.cai.dto.app.vo.AccountCashVo;
 import com.ruoyi.cai.dto.app.vo.AccountRechargeVo;
 import com.ruoyi.cai.dto.app.vo.user.UserAccountVo;
 import com.ruoyi.cai.manager.CurrentUserManager;
-import com.ruoyi.cai.service.CaiAccountCashService;
-import com.ruoyi.cai.service.CaiAccountRechargeService;
+import com.ruoyi.cai.service.AccountCashService;
+import com.ruoyi.cai.service.AccountRechargeService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -30,9 +30,9 @@ public class WalletController {
     @Autowired
     private CurrentUserManager currentUserManager;
     @Autowired
-    private CaiAccountCashService accountCashService;
+    private AccountCashService accountCashService;
     @Autowired
-    private CaiAccountRechargeService accountRechargeService;
+    private AccountRechargeService accountRechargeService;
 
     @GetMapping("/account")
     @Operation(summary = "快速获取当前用户账号余额信息")
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java
index d61be6e1..f2b62727 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -79,7 +80,7 @@ public class User implements Serializable {
     /**
      *
      */
-    private LocalDateTime birthday;
+    private LocalDate birthday;
     /**
      * 城市
      */
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java
new file mode 100644
index 00000000..f528630e
--- /dev/null
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java
@@ -0,0 +1,19 @@
+package com.ruoyi.cai.dto.admin.vo;
+
+import com.ruoyi.cai.domain.*;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UserFullAdminVo {
+    private User user;
+    private UserInfo userInfo;
+    private Account account;
+    private Anchor anchor;
+    private Union union;
+    private UserOnline userOnline;
+    private UserCount userCount;
+    private List<UserAlbum> userAlbums;
+    private UserMember userMember;
+}
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java
index c587b5af..5a459042 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java
@@ -22,17 +22,17 @@ import java.util.List;
 @Component
 public class CurrentUserManager {
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
-    private CaiUserCountService userCountService;
+    private UserCountService userCountService;
     @Autowired
-    private CaiUserAlbumService userAlbumService;
+    private UserAlbumService userAlbumService;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
-    private CaiAccountBankcardService accountBankcardService;
+    private AccountBankcardService accountBankcardService;
 
     public CurrentUserInfoVo currentInfo() {
         Long userId = LoginHelper.getUserId();
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java
index 6fe8b23f..852a79b4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java
@@ -2,8 +2,11 @@ package com.ruoyi.cai.manager;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cai.domain.User;
+import com.ruoyi.cai.domain.UserCount;
+import com.ruoyi.cai.domain.UserOnline;
 import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
+import com.ruoyi.cai.service.*;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +15,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class UserAdminManager {
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
 
     public boolean updateUser(UserUpdateAdminReq userUpdateAdmin){
         User user = userService.getById(userUpdateAdmin.getId());
@@ -38,4 +41,35 @@ public class UserAdminManager {
         userService.updateById(update);
         return true;
     }
+
+    @Autowired
+    private UserInfoService userInfoService;
+    @Autowired
+    private AccountService accountService;
+    @Autowired
+    private AnchorService anchorService;
+    @Autowired
+    private UnionService unionService;
+    @Autowired
+    private UserOnlineService userOnlineService;
+    @Autowired
+    private UserCountService userCountService;
+    @Autowired
+    private UserAlbumService userAlbumService;
+    @Autowired
+    private UserMemberService userMemberService;
+
+    public UserFullAdminVo getUser(Long id) {
+        UserFullAdminVo vo = new UserFullAdminVo();
+        vo.setUser(userService.getById(id));
+        vo.setUserInfo(userInfoService.getByUserId(id));
+        vo.setAccount(accountService.getByUserId(id));
+        vo.setAnchor(anchorService.getByUserId(id));
+        vo.setUnion(unionService.getByUserId(id));
+        vo.setUserOnline(userOnlineService.getByUserId(id));
+        vo.setUserCount(userCountService.getByUserId(id));
+        vo.setUserAlbums(userAlbumService.listByUserId(id));
+        vo.setUserMember(userMemberService.getByUserId(id));
+        return vo;
+    }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountBankcardMapper.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountBankcardMapper.java
index 7277344c..26566825 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBankcardMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountBankcardMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBankcard;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiAccountBankcardMapper extends BaseMapper<AccountBankcard> {
+public interface AccountBankcardMapper extends BaseMapper<AccountBankcard> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountBusinessMapper.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountBusinessMapper.java
index a3c2965d..d224f6ad 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountBusinessMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountBusinessMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBusiness;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountBusinessMapper extends BaseMapper<AccountBusiness> {
+public interface AccountBusinessMapper extends BaseMapper<AccountBusiness> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountCashMapper.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountCashMapper.java
index 135f017a..2ab12763 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountCashMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountCashMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiAccountCashMapper extends BaseMapper<AccountCash> {
+public interface AccountCashMapper extends BaseMapper<AccountCash> {
 
     Page<AccountCashAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AccountCashAdminVo bo);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountDetailMapper.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountDetailMapper.java
index 45bcddd6..c56ca2cd 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountDetailMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountDetailMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountDetail;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountDetailMapper extends BaseMapper<AccountDetail> {
+public interface AccountDetailMapper extends BaseMapper<AccountDetail> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java
similarity index 92%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java
index 94919603..ba638003 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiAccountMapper extends BaseMapper<Account> {
+public interface AccountMapper extends BaseMapper<Account> {
 
     long decrCoin(@Param("userId") Long userId, @Param("coin") Long coin);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountRechargeMapper.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountRechargeMapper.java
index d473a07e..fee386cc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAccountRechargeMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountRechargeMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountRecharge;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountRechargeMapper extends BaseMapper<AccountRecharge> {
+public interface AccountRechargeMapper extends BaseMapper<AccountRecharge> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorApplyMapper.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorApplyMapper.java
index b9abc191..8679d13e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorApplyMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorApplyMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAnchorApplyMapper extends BaseMapper<AnchorApply> {
+public interface AnchorApplyMapper extends BaseMapper<AnchorApply> {
 
     Page<AnchorApplyAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AnchorApplyAdminVo bo);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java
index b7d943f1..1e9fdf0f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAnchorMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AnchorMapper.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAnchorMapper extends BaseMapper<Anchor> {
+public interface AnchorMapper extends BaseMapper<Anchor> {
 
     Page<AnchorAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") AnchorAdminVo bo);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AreaMapper.java
similarity index 76%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AreaMapper.java
index 42360fab..dfdc5602 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiAreaMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AreaMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Area;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiAreaMapper extends BaseMapper<Area> {
+public interface AreaMapper extends BaseMapper<Area> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BannerMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BannerMapper.java
index 6c5d2be6..974ce230 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiBannerMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/BannerMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Banner;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiBannerMapper extends BaseMapper<Banner> {
+public interface BannerMapper extends BaseMapper<Banner> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CitysMapper.java
similarity index 76%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CitysMapper.java
index c586d868..7f89ea22 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiCitysMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CitysMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Citys;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiCitysMapper extends BaseMapper<Citys> {
+public interface CitysMapper extends BaseMapper<Citys> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiConsumeLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiConsumeLogMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java
index 6ec7f0d6..500da2f6 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiConsumeLogMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ConsumeLogMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiConsumeLog;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiConsumeLogMapper extends BaseMapper<CaiConsumeLog> {
+public interface ConsumeLogMapper extends BaseMapper<CaiConsumeLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/DynamicImagesMapper.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/DynamicImagesMapper.java
index e4c8eafe..2e7634ee 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicImagesMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/DynamicImagesMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.DynamicImages;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiDynamicImagesMapper extends BaseMapper<DynamicImages> {
+public interface DynamicImagesMapper extends BaseMapper<DynamicImages> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/DynamicMapper.java
similarity index 90%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/DynamicMapper.java
index f8f54a97..c0b2b9fa 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiDynamicMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/DynamicMapper.java
@@ -15,7 +15,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiDynamicMapper extends BaseMapper<Dynamic> {
+public interface DynamicMapper extends BaseMapper<Dynamic> {
 
     Page<DynamicListVo> pageApp(@Param("build") Page<Object> build, @Param("query") DynamicQuery query);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GiftMapper.java
similarity index 76%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GiftMapper.java
index 7bbab791..c4e28dd9 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiftMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GiftMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Gift;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiGiftMapper extends BaseMapper<Gift> {
+public interface GiftMapper extends BaseMapper<Gift> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GiveLogMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GiveLogMapper.java
index 7119c1ee..10ffb117 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGiveLogMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GiveLogMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.GiveLog;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiGiveLogMapper extends BaseMapper<GiveLog> {
+public interface GiveLogMapper extends BaseMapper<GiveLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GoodsMapper.java
similarity index 76%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GoodsMapper.java
index 487c05a2..9f7dbc70 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGoodsMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GoodsMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Goods;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiGoodsMapper extends BaseMapper<Goods> {
+public interface GoodsMapper extends BaseMapper<Goods> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardLogMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardLogMapper.java
index 52acb66b..9a1f925f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardLogMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardLogMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.GuardLog;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiGuardLogMapper extends BaseMapper<GuardLog> {
+public interface GuardLogMapper extends BaseMapper<GuardLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java
similarity index 93%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java
index c79c953c..c6ad0765 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiGuardTotalMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java
@@ -15,7 +15,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiGuardTotalMapper extends BaseMapper<GuardTotal> {
+public interface GuardTotalMapper extends BaseMapper<GuardTotal> {
 
     List<GuardTotalDTO> selectGuardTotal(@Param("fromUserId") Long fromUserId, @Param("limit") Integer limit);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LowHeightRiskMapper.java
similarity index 86%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LowHeightRiskMapper.java
index 1a4f8c84..efb528aa 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiLowHeightRiskMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LowHeightRiskMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiLowHeightRiskMapper extends BaseMapper<LowHeightRisk> {
+public interface LowHeightRiskMapper extends BaseMapper<LowHeightRisk> {
 
     Page<LowHeightRiskAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") LowHeightRiskAdminVo bo);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/MemberSkillMapper.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/MemberSkillMapper.java
index 70933d06..217b4fe3 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiMemberSkillMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/MemberSkillMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.MemberSkill;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiMemberSkillMapper extends BaseMapper<MemberSkill> {
+public interface MemberSkillMapper extends BaseMapper<MemberSkill> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ReportCateMapper.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ReportCateMapper.java
index 720089f5..de4c77d7 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportCateMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ReportCateMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.ReportCate;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiReportCateMapper extends BaseMapper<ReportCate> {
+public interface ReportCateMapper extends BaseMapper<ReportCate> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ReportMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ReportMapper.java
index ab70b37c..5acbf7c2 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiReportMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/ReportMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Report;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiReportMapper extends BaseMapper<Report> {
+public interface ReportMapper extends BaseMapper<Report> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UnionMapper.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UnionMapper.java
index 966fc33c..b00e6081 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UnionMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiUnionMapper extends BaseMapper<Union> {
+public interface UnionMapper extends BaseMapper<Union> {
 
     Page<UnionAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UnionAdminVo bo);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UnionUserMapper.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UnionUserMapper.java
index 24dc9daf..614c83f8 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UnionUserMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2023-12-22
  */
-public interface CaiUnionUserMapper extends BaseMapper<UnionUser> {
+public interface UnionUserMapper extends BaseMapper<UnionUser> {
 
     Page<UnionUserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UnionUserAdminVo bo);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserAlbumMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserAlbumMapper.java
index 2269febb..087ba00b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserAlbumMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserAlbumMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserAlbum;
  * @author ruoyi
  * @date 2023-12-23
  */
-public interface CaiUserAlbumMapper extends BaseMapper<UserAlbum> {
+public interface UserAlbumMapper extends BaseMapper<UserAlbum> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserBlacklistMapper.java
similarity index 85%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserBlacklistMapper.java
index 0b284491..013593d2 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserBlacklistMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserBlacklistMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiUserBlacklistMapper extends BaseMapper<UserBlacklist> {
+public interface UserBlacklistMapper extends BaseMapper<UserBlacklist> {
 
     Page<UserListVo> pageApp(@Param("build") Page<Object> build, @Param("userId") Long userId);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCallMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCallMapper.java
index 4e6517ee..06ac06b3 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCallMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCallMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCall;
  * @author 77
  * @date 2023-12-27
  */
-public interface CaiUserCallMapper extends BaseMapper<UserCall> {
+public interface UserCallMapper extends BaseMapper<UserCall> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCameraAuditMapper.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCameraAuditMapper.java
index 191542f3..5e1f4041 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCameraAuditMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCameraAuditMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCameraAudit;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiUserCameraAuditMapper extends BaseMapper<UserCameraAudit> {
+public interface UserCameraAuditMapper extends BaseMapper<UserCameraAudit> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCodeGenMapper.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCodeGenMapper.java
index 93b77da8..49362c1d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCodeGenMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCodeGenMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCodeGen;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiUserCodeGenMapper extends BaseMapper<UserCodeGen> {
+public interface UserCodeGenMapper extends BaseMapper<UserCodeGen> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCountMapper.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCountMapper.java
index 86fad838..22a176dc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserCountMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserCountMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiUserCountMapper extends BaseMapper<UserCount> {
+public interface UserCountMapper extends BaseMapper<UserCount> {
 
     void starIncs(@Param("userId") Long userId, @Param("fansIncs") int fansIncs, @Param("followIncs") int followIncs);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserFollowDynamicMapper.java
similarity index 71%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserFollowDynamicMapper.java
index ca625401..9a466027 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowDynamicMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserFollowDynamicMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserFollowDynamic;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserFollowDynamicMapper extends BaseMapper<UserFollowDynamic> {
+public interface UserFollowDynamicMapper extends BaseMapper<UserFollowDynamic> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserFollowMapper.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserFollowMapper.java
index bae07ac4..5789b76f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserFollowMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserFollowMapper extends BaseMapper<UserFollow> {
+public interface UserFollowMapper extends BaseMapper<UserFollow> {
 
     Page<UserStarOrVisitorList> pageApp(@Param("build") Page<Object> build, @Param("query") StarQuery query);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserForbidMapper.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserForbidMapper.java
index a447b296..1ee71946 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserForbidMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserForbidMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserForbid;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiUserForbidMapper extends BaseMapper<UserForbid> {
+public interface UserForbidMapper extends BaseMapper<UserForbid> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java
index 3fa26d68..a3e3a1da 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserGiftMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserGiftMapper extends BaseMapper<UserGift> {
+public interface UserGiftMapper extends BaseMapper<UserGift> {
 
     List<UserGiftIndexVo> selectGiftList(@Param("userId") Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInfoMapper.java
similarity index 65%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInfoMapper.java
index e9c972d7..ed117d9f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInfoMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInfoMapper.java
@@ -3,5 +3,5 @@ package com.ruoyi.cai.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.cai.domain.UserInfo;
 
-public interface CaiUserInfoMapper extends BaseMapper<UserInfo> {
+public interface UserInfoMapper extends BaseMapper<UserInfo> {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java
similarity index 89%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java
index 2c2f93bc..d5951a5e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-28
  */
-public interface CaiUserInviteMapper extends BaseMapper<UserInvite> {
+public interface UserInviteMapper extends BaseMapper<UserInvite> {
 
     InviteCountDTO countInviteAndReward(@Param("userId") Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
index 991008ed..2cf57e1b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-19
  */
-public interface CaiUserMapper extends BaseMapper<User> {
+public interface UserMapper extends BaseMapper<User> {
 
     Page<UserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("query") User query);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMemberMapper.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMemberMapper.java
index a573b444..b94534f5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMemberMapper.java
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiUserMemberMapper extends BaseMapper<UserMember> {
+public interface UserMemberMapper extends BaseMapper<UserMember> {
 
     Page<UserMemberAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserMemberAdminVo bo);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserOnlineMapper.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserOnlineMapper.java
index b7ef6b4c..09e46c7d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserOnlineMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserOnlineMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserOnline;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserOnlineMapper extends BaseMapper<UserOnline> {
+public interface UserOnlineMapper extends BaseMapper<UserOnline> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserRiskLogMapper.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserRiskLogMapper.java
index 645fb1df..3ddb0363 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserRiskLogMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserRiskLogMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserRiskLog;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiUserRiskLogMapper extends BaseMapper<UserRiskLog> {
+public interface UserRiskLogMapper extends BaseMapper<UserRiskLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserVisitorMapper.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserVisitorMapper.java
index ec3558cb..3f42f1c6 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserVisitorMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiUserVisitorMapper extends BaseMapper<UserVisitor> {
+public interface UserVisitorMapper extends BaseMapper<UserVisitor> {
 
     Page<UserStarOrVisitorList> pageApp(@Param("build") Page<Object> build, @Param("query") VisitorQuery query);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/WithdrawExchangeMapper.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/WithdrawExchangeMapper.java
index ea9c6769..01565db8 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiWithdrawExchangeMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/WithdrawExchangeMapper.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.WithdrawExchange;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiWithdrawExchangeMapper extends BaseMapper<WithdrawExchange> {
+public interface WithdrawExchangeMapper extends BaseMapper<WithdrawExchange> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountBankcardService.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountBankcardService.java
index a447a3d0..b47e55c3 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBankcardService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountBankcardService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBankcard;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiAccountBankcardService extends IService<AccountBankcard> {
+public interface AccountBankcardService extends IService<AccountBankcard> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountBusinessService.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountBusinessService.java
index 30d2d52c..29a758ba 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountBusinessService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountBusinessService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountBusiness;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountBusinessService extends IService<AccountBusiness> {
+public interface AccountBusinessService extends IService<AccountBusiness> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java
index 4848177a..52cc14b2 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountCashService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountCashService.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiAccountCashService extends IService<AccountCash> {
+public interface AccountCashService extends IService<AccountCash> {
 
     void withdraw(WithdrawReq res);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountDetailService.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountDetailService.java
index a045e152..1d5d664a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountDetailService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountDetailService.java
@@ -9,7 +9,7 @@ import com.ruoyi.cai.domain.AccountDetail;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountDetailService extends IService<AccountDetail> {
+public interface AccountDetailService extends IService<AccountDetail> {
 
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountRechargeService.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountRechargeService.java
index e6eaf094..ab34e7dc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountRechargeService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountRechargeService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.AccountRecharge;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAccountRechargeService extends IService<AccountRecharge> {
+public interface AccountRechargeService extends IService<AccountRecharge> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java
similarity index 90%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java
index 70b33bb3..314f57eb 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAccountService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AccountService.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiAccountService extends IService<Account> {
+public interface AccountService extends IService<Account> {
 
     Account getByUserId(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorApplyService.java
similarity index 90%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorApplyService.java
index 30621cb2..7c5e6ee2 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorApplyService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorApplyService.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAnchorApplyService extends IService<AnchorApply> {
+public interface AnchorApplyService extends IService<AnchorApply> {
 
     AnchorApply getByUserId(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java
similarity index 92%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java
index 1a8c07e2..7de05222 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAnchorService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AnchorService.java
@@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiAnchorService extends IService<Anchor> {
+public interface AnchorService extends IService<Anchor> {
 
     Page<AnchorAdminVo> pageAdmin(PageQuery pageQuery, AnchorAdminVo bo);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AreaService.java
similarity index 77%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/AreaService.java
index 59bd91d1..1a840313 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiAreaService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/AreaService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Area;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiAreaService extends IService<Area> {
+public interface AreaService extends IService<Area> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/BannerService.java
similarity index 80%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/BannerService.java
index 6e3da46f..35e585cc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiBannerService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/BannerService.java
@@ -11,6 +11,6 @@ import java.util.List;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiBannerService extends IService<Banner> {
+public interface BannerService extends IService<Banner> {
     List<Banner> index();
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java
similarity index 80%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java
index 91b650d8..929ddd96 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiCitysService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CitysService.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiCitysService extends IService<Citys> {
+public interface CitysService extends IService<Citys> {
 
     Map<Long,String> all();
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiConsumeLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiConsumeLogService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java
index 701d4035..1306ee81 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiConsumeLogService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ConsumeLogService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.CaiConsumeLog;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiConsumeLogService extends IService<CaiConsumeLog> {
+public interface ConsumeLogService extends IService<CaiConsumeLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicImagesService.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicImagesService.java
index 284353e0..cce252da 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicImagesService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicImagesService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.DynamicImages;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiDynamicImagesService extends IService<DynamicImages> {
+public interface DynamicImagesService extends IService<DynamicImages> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java
index ea01d9d3..3c256a48 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiDynamicService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java
@@ -16,7 +16,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiDynamicService extends IService<Dynamic> {
+public interface DynamicService extends IService<Dynamic> {
 
     List<String> selectDynamicImageList(Long userId, Integer limit);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GiftService.java
similarity index 81%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/GiftService.java
index 311648a5..7d87b664 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiftService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GiftService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiGiftService extends IService<Gift> {
+public interface GiftService extends IService<Gift> {
 
     List<Gift> all();
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GiveLogService.java
similarity index 76%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/GiveLogService.java
index c15d37e3..19944880 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGiveLogService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GiveLogService.java
@@ -9,5 +9,5 @@ import com.ruoyi.cai.domain.GiveLog;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiGiveLogService extends IService<GiveLog> {
+public interface GiveLogService extends IService<GiveLog> {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GoodsService.java
similarity index 77%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/GoodsService.java
index 82a32afe..6693d304 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGoodsService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GoodsService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.Goods;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiGoodsService extends IService<Goods> {
+public interface GoodsService extends IService<Goods> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardLogService.java
similarity index 76%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardLogService.java
index 8929547d..1696ce3f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardLogService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardLogService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.GuardLog;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiGuardLogService extends IService<GuardLog> {
+public interface GuardLogService extends IService<GuardLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java
index 481206fc..0800016b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiGuardTotalService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java
@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiGuardTotalService extends IService<GuardTotal> {
+public interface GuardTotalService extends IService<GuardTotal> {
 
     GuardIndexVo guardInfoVo(Long fromUserId,Long toUserId, Integer limit);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/LowHeightRiskService.java
similarity index 86%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/LowHeightRiskService.java
index a6c0db14..3cc31451 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiLowHeightRiskService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/LowHeightRiskService.java
@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiLowHeightRiskService extends IService<LowHeightRisk> {
+public interface LowHeightRiskService extends IService<LowHeightRisk> {
 
     Page<LowHeightRiskAdminVo> pageAdmin(PageQuery pageQuery, LowHeightRiskAdminVo bo);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/MemberSkillService.java
similarity index 74%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/MemberSkillService.java
index 0d515fbd..1218f162 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiMemberSkillService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/MemberSkillService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.MemberSkill;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiMemberSkillService extends IService<MemberSkill> {
+public interface MemberSkillService extends IService<MemberSkill> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ReportCateService.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/ReportCateService.java
index 301af91c..0db62d9a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportCateService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ReportCateService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.ReportCate;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiReportCateService extends IService<ReportCate> {
+public interface ReportCateService extends IService<ReportCate> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ReportService.java
similarity index 82%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/ReportService.java
index 6cd93d45..5fc75360 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiReportService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/ReportService.java
@@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.query.UserReportReq;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiReportService extends IService<Report> {
+public interface ReportService extends IService<Report> {
 
     void report(UserReportReq reportRes);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionService.java
similarity index 82%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionService.java
index d4d47ac5..1768e2cc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionService.java
@@ -12,7 +12,9 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiUnionService extends IService<Union> {
+public interface UnionService extends IService<Union> {
 
     Page<UnionAdminVo> pageAdmin(PageQuery pageQuery, UnionAdminVo bo);
+
+    Union getByUserId(Long userId);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java
index 5060ebee..0e2c6164 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UnionUserService.java
@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author ruoyi
  * @date 2023-12-22
  */
-public interface CaiUnionUserService extends IService<UnionUser> {
+public interface UnionUserService extends IService<UnionUser> {
 
     UnionUser getByUserId(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java
similarity index 90%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java
index 1e035a54..755c98ca 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserAlbumService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserAlbumService extends IService<UserAlbum> {
+public interface UserAlbumService extends IService<UserAlbum> {
 
 
     List<String> getUserAlbum(Long userId, Integer anchor);
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserBlacklistService.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserBlacklistService.java
index f9c9da3c..7a77f84f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserBlacklistService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserBlacklistService.java
@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiUserBlacklistService extends IService<UserBlacklist> {
+public interface UserBlacklistService extends IService<UserBlacklist> {
 
     /**
      *
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCallService.java
similarity index 84%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCallService.java
index f3ce74d5..028cf3fc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCallService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCallService.java
@@ -11,7 +11,7 @@ import com.ruoyi.cai.domain.UserCall;
  * @author 77
  * @date 2023-12-27
  */
-public interface CaiUserCallService extends IService<UserCall> {
+public interface UserCallService extends IService<UserCall> {
 
     UserCall createCall(User fromUser, User toUser, Anchor anchor);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCameraAuditService.java
similarity index 83%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCameraAuditService.java
index c8f8839b..b0b959e5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCameraAuditService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCameraAuditService.java
@@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.vo.CameraAuditVo;
  * @author 77
  * @date 2023-12-30
  */
-public interface CaiUserCameraAuditService extends IService<UserCameraAudit> {
+public interface UserCameraAuditService extends IService<UserCameraAudit> {
 
     UserCameraAudit getByUserId(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCodeGenService.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCodeGenService.java
index 22b60fa7..3f9014ee 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCodeGenService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCodeGenService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserCodeGen;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiUserCodeGenService extends IService<UserCodeGen> {
+public interface UserCodeGenService extends IService<UserCodeGen> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCountService.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCountService.java
index 60c5b63d..d7d0b9f9 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserCountService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserCountService.java
@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiUserCountService extends IService<UserCount> {
+public interface UserCountService extends IService<UserCount> {
     void star(Long fromUserId,Long toUserId);
     void unStar(Long fromUserId,Long toUserId);
     void visitor(Long fromUserId,Long toUserId);
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserFollowDynamicService.java
similarity index 80%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserFollowDynamicService.java
index db14aa78..f7d96610 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowDynamicService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserFollowDynamicService.java
@@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.query.DynamicStarReq;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserFollowDynamicService extends IService<UserFollowDynamic> {
+public interface UserFollowDynamicService extends IService<UserFollowDynamic> {
 
     void star(DynamicStarReq query);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserFollowService.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserFollowService.java
index 0cb854ff..b716a02d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserFollowService.java
@@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserFollowService extends IService<UserFollow> {
+public interface UserFollowService extends IService<UserFollow> {
 
     Long getFansNumByUserId(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java
index 059bdffe..6a12bdd9 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserForbidService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserForbid;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiUserForbidService extends IService<UserForbid> {
+public interface UserForbidService extends IService<UserForbid> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java
similarity index 86%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java
index 41a7da58..3ef5e013 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserGiftService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserGiftService extends IService<UserGift>  {
+public interface UserGiftService extends IService<UserGift>  {
 
     List<UserGiftIndexVo> selectGiftList(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInfoService.java
similarity index 57%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInfoService.java
index 94c853e3..04bbedfa 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInfoService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInfoService.java
@@ -3,5 +3,7 @@ package com.ruoyi.cai.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.cai.domain.UserInfo;
 
-public interface CaiUserInfoService extends IService<UserInfo> {
+public interface UserInfoService extends IService<UserInfo> {
+
+    UserInfo getByUserId(Long userId);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java
similarity index 89%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java
index 6996e3af..a419bee6 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-28
  */
-public interface CaiUserInviteService extends IService<UserInvite> {
+public interface UserInviteService extends IService<UserInvite> {
 
     UserInvite getByUserId(Long id);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java
similarity index 80%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java
index a980d005..eb2a3847 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java
@@ -12,7 +12,9 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-21
  */
-public interface CaiUserMemberService extends IService<UserMember> {
+public interface UserMemberService extends IService<UserMember> {
 
     Page<UserMemberAdminVo> pageAdmin(PageQuery pageQuery, UserMemberAdminVo bo);
+
+    UserMember getByUserId(Long userId);
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserOnlineService.java
similarity index 85%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserOnlineService.java
index f8f8dab7..73b7e1ed 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserOnlineService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserOnlineService.java
@@ -10,7 +10,7 @@ import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo;
  * @author 77
  * @date 2023-12-23
  */
-public interface CaiUserOnlineService extends IService<UserOnline> {
+public interface UserOnlineService extends IService<UserOnline> {
 
     UserOnline getByUserId(Long userId);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserRiskLogService.java
similarity index 75%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserRiskLogService.java
index 5394a5a7..e7afa5b3 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserRiskLogService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserRiskLogService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.UserRiskLog;
  * @author 77
  * @date 2023-12-22
  */
-public interface CaiUserRiskLogService extends IService<UserRiskLog> {
+public interface UserRiskLogService extends IService<UserRiskLog> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
similarity index 94%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
index b79a01b8..2ca78e92 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-19
  */
-public interface CaiUserService extends IService<User> {
+public interface UserService extends IService<User> {
 
     User getByUsername(String username);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserVisitorService.java
similarity index 89%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserVisitorService.java
index cb813cf3..2d46e760 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserVisitorService.java
@@ -14,7 +14,7 @@ import com.ruoyi.common.core.domain.PageQuery;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiUserVisitorService extends IService<UserVisitor> {
+public interface UserVisitorService extends IService<UserVisitor> {
 
     boolean visitor(StarOrVisitorReq starOrVisitorReq);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/WithdrawExchangeService.java
similarity index 73%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/WithdrawExchangeService.java
index cf347d4f..6218fe4a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiWithdrawExchangeService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/WithdrawExchangeService.java
@@ -9,6 +9,6 @@ import com.ruoyi.cai.domain.WithdrawExchange;
  * @author 77
  * @date 2023-12-24
  */
-public interface CaiWithdrawExchangeService extends IService<WithdrawExchange> {
+public interface WithdrawExchangeService extends IService<WithdrawExchange> {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountBankcardServiceImpl.java
similarity index 53%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountBankcardServiceImpl.java
index 8d5b684b..63b0d717 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBankcardServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountBankcardServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.AccountBankcard;
-import com.ruoyi.cai.mapper.CaiAccountBankcardMapper;
-import com.ruoyi.cai.service.CaiAccountBankcardService;
+import com.ruoyi.cai.mapper.AccountBankcardMapper;
+import com.ruoyi.cai.service.AccountBankcardService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-21
  */
 @Service
-public class CaiAccountBankcardServiceImpl extends ServiceImpl<CaiAccountBankcardMapper, AccountBankcard> implements CaiAccountBankcardService {
+public class AccountBankcardServiceImpl extends ServiceImpl<AccountBankcardMapper, AccountBankcard> implements AccountBankcardService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountBusinessServiceImpl.java
similarity index 53%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountBusinessServiceImpl.java
index 061c379e..c54d9435 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountBusinessServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountBusinessServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.AccountBusiness;
-import com.ruoyi.cai.mapper.CaiAccountBusinessMapper;
-import com.ruoyi.cai.service.CaiAccountBusinessService;
+import com.ruoyi.cai.mapper.AccountBusinessMapper;
+import com.ruoyi.cai.service.AccountBusinessService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiAccountBusinessServiceImpl extends ServiceImpl<CaiAccountBusinessMapper, AccountBusiness> implements CaiAccountBusinessService {
+public class AccountBusinessServiceImpl extends ServiceImpl<AccountBusinessMapper, AccountBusiness> implements AccountBusinessService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java
similarity index 79%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java
index 1969177c..6039e9df 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountCashServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountCashServiceImpl.java
@@ -8,11 +8,11 @@ import com.ruoyi.cai.domain.AccountCash;
 import com.ruoyi.cai.domain.WithdrawExchange;
 import com.ruoyi.cai.dto.admin.vo.AccountCashAdminVo;
 import com.ruoyi.cai.dto.app.query.WithdrawReq;
-import com.ruoyi.cai.mapper.CaiAccountCashMapper;
-import com.ruoyi.cai.service.CaiAccountBankcardService;
-import com.ruoyi.cai.service.CaiAccountCashService;
-import com.ruoyi.cai.service.CaiAccountService;
-import com.ruoyi.cai.service.CaiWithdrawExchangeService;
+import com.ruoyi.cai.mapper.AccountCashMapper;
+import com.ruoyi.cai.service.AccountCashService;
+import com.ruoyi.cai.service.AccountBankcardService;
+import com.ruoyi.cai.service.AccountService;
+import com.ruoyi.cai.service.WithdrawExchangeService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,13 +21,13 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 
 @Service
-public class CaiAccountCashServiceImpl extends ServiceImpl<CaiAccountCashMapper, AccountCash> implements CaiAccountCashService {
+public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, AccountCash> implements AccountCashService {
     @Autowired
-    private CaiAccountBankcardService accountBankcardService;
+    private AccountBankcardService accountBankcardService;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
-    private CaiWithdrawExchangeService withdrawExchangeService;
+    private WithdrawExchangeService withdrawExchangeService;
     @Override
     public void withdraw(WithdrawReq res) {
         AccountBankcard one = accountBankcardService.getOne(Wrappers.lambdaQuery(AccountBankcard.class)
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountDetailServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountDetailServiceImpl.java
similarity index 54%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountDetailServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountDetailServiceImpl.java
index 31fb1ab3..f7bda65e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountDetailServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountDetailServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.AccountDetail;
-import com.ruoyi.cai.mapper.CaiAccountDetailMapper;
-import com.ruoyi.cai.service.CaiAccountDetailService;
+import com.ruoyi.cai.mapper.AccountDetailMapper;
+import com.ruoyi.cai.service.AccountDetailService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiAccountDetailServiceImpl extends ServiceImpl<CaiAccountDetailMapper, AccountDetail> implements CaiAccountDetailService {
+public class AccountDetailServiceImpl extends ServiceImpl<AccountDetailMapper, AccountDetail> implements AccountDetailService {
 
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountRechargeServiceImpl.java
similarity index 53%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountRechargeServiceImpl.java
index 881f72bb..705ca59a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountRechargeServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountRechargeServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.AccountRecharge;
-import com.ruoyi.cai.mapper.CaiAccountRechargeMapper;
-import com.ruoyi.cai.service.CaiAccountRechargeService;
+import com.ruoyi.cai.mapper.AccountRechargeMapper;
+import com.ruoyi.cai.service.AccountRechargeService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiAccountRechargeServiceImpl extends ServiceImpl<CaiAccountRechargeMapper, AccountRecharge> implements CaiAccountRechargeService {
+public class AccountRechargeServiceImpl extends ServiceImpl<AccountRechargeMapper, AccountRecharge> implements AccountRechargeService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
similarity index 94%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
index d1d56505..1b2d2c4f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAccountServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.*;
 import com.ruoyi.cai.dto.admin.vo.AccountAdminVo;
 import com.ruoyi.cai.enums.ConsumeLogType;
-import com.ruoyi.cai.mapper.CaiAccountMapper;
+import com.ruoyi.cai.mapper.AccountMapper;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.cai.util.NumCaUtil;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -25,10 +25,10 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 @Slf4j
-public class CaiAccountServiceImpl extends ServiceImpl<CaiAccountMapper, Account> implements CaiAccountService {
+public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements AccountService {
 
     @Autowired
-    private CaiConsumeLogService consumeLogService;
+    private ConsumeLogService consumeLogService;
 
 
     @Override
@@ -78,13 +78,13 @@ public class CaiAccountServiceImpl extends ServiceImpl<CaiAccountMapper, Account
         return consumeLog;
     }
     @Autowired
-    private CaiUserInviteService userInviteService;
+    private UserInviteService userInviteService;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiUnionUserService unionUserService;
+    private UnionUserService unionUserService;
     @Autowired
-    private CaiUnionService unionService;
+    private UnionService unionService;
 
 
     private void fenxiao(CaiConsumeLog consumeLog){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAnchorApplyServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java
similarity index 90%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAnchorApplyServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java
index 16978e9f..bea0aa43 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAnchorApplyServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java
@@ -7,9 +7,9 @@ import com.ruoyi.cai.domain.AnchorApply;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.dto.admin.vo.AnchorApplyAdminVo;
 import com.ruoyi.cai.dto.app.vo.AnchorJoinHomeVo;
-import com.ruoyi.cai.mapper.CaiAnchorApplyMapper;
-import com.ruoyi.cai.service.CaiAnchorApplyService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.mapper.AnchorApplyMapper;
+import com.ruoyi.cai.service.AnchorApplyService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +24,10 @@ import java.time.LocalDateTime;
  * @date 2023-12-22
  */
 @Service
-public class CaiAnchorApplyServiceImpl extends ServiceImpl<CaiAnchorApplyMapper, AnchorApply> implements CaiAnchorApplyService {
+public class AnchorApplyServiceImpl extends ServiceImpl<AnchorApplyMapper, AnchorApply> implements AnchorApplyService {
 
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
 
     @Override
     public AnchorApply getByUserId(Long userId){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAnchorServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAnchorServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java
index 43210084..266757d6 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAnchorServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorServiceImpl.java
@@ -7,8 +7,8 @@ import com.ruoyi.cai.domain.Anchor;
 import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
 import com.ruoyi.cai.dto.app.query.AnchorListQuery;
 import com.ruoyi.cai.dto.app.vo.AnchorListVo;
-import com.ruoyi.cai.mapper.CaiAnchorMapper;
-import com.ruoyi.cai.service.CaiAnchorService;
+import com.ruoyi.cai.mapper.AnchorMapper;
+import com.ruoyi.cai.service.AnchorService;
 import com.ruoyi.common.core.domain.PageQuery;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiAnchorServiceImpl extends ServiceImpl<CaiAnchorMapper, Anchor> implements CaiAnchorService {
+public class AnchorServiceImpl extends ServiceImpl<AnchorMapper, Anchor> implements AnchorService {
 
     @Override
     public Page<AnchorAdminVo> pageAdmin(PageQuery pageQuery, AnchorAdminVo bo) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AreaServiceImpl.java
similarity index 59%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AreaServiceImpl.java
index 13ef3d96..a9e0d77d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiAreaServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AreaServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Area;
-import com.ruoyi.cai.mapper.CaiAreaMapper;
-import com.ruoyi.cai.service.CaiAreaService;
+import com.ruoyi.cai.mapper.AreaMapper;
+import com.ruoyi.cai.service.AreaService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-23
  */
 @Service
-public class CaiAreaServiceImpl extends ServiceImpl<CaiAreaMapper, Area> implements CaiAreaService {
+public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements AreaService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BannerServiceImpl.java
similarity index 71%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BannerServiceImpl.java
index 9ff838bf..e694cccf 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiBannerServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/BannerServiceImpl.java
@@ -3,8 +3,8 @@ package com.ruoyi.cai.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Banner;
-import com.ruoyi.cai.mapper.CaiBannerMapper;
-import com.ruoyi.cai.service.CaiBannerService;
+import com.ruoyi.cai.mapper.BannerMapper;
+import com.ruoyi.cai.service.BannerService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -16,7 +16,7 @@ import java.util.List;
  * @date 2023-12-21
  */
 @Service
-public class CaiBannerServiceImpl extends ServiceImpl<CaiBannerMapper, Banner> implements CaiBannerService {
+public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> implements BannerService {
 
     @Override
     public List<Banner> index() {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInfoServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInfoServiceImpl.java
deleted file mode 100644
index efecafbf..00000000
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInfoServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.cai.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.cai.domain.UserInfo;
-import com.ruoyi.cai.mapper.CaiUserInfoMapper;
-import com.ruoyi.cai.service.CaiUserInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CaiUserInfoServiceImpl extends ServiceImpl<CaiUserInfoMapper, UserInfo> implements CaiUserInfoService {
-
-}
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java
similarity index 86%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java
index 26e1e6ad..2cc3f659 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiCitysServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CitysServiceImpl.java
@@ -5,8 +5,8 @@ import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.constant.RedisConstant;
 import com.ruoyi.cai.domain.Citys;
-import com.ruoyi.cai.mapper.CaiCitysMapper;
-import com.ruoyi.cai.service.CaiCitysService;
+import com.ruoyi.cai.mapper.CitysMapper;
+import com.ruoyi.cai.service.CitysService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  * @date 2023-12-30
  */
 @Service
-public class CaiCitysServiceImpl extends ServiceImpl<CaiCitysMapper, Citys> implements CaiCitysService {
+public class CitysServiceImpl extends ServiceImpl<CitysMapper, Citys> implements CitysService {
 
     @Autowired
     private StringRedisTemplate redisTemplate;
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiConsumeLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java
similarity index 56%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiConsumeLogServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java
index 3446dae0..a1985807 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiConsumeLogServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.CaiConsumeLog;
-import com.ruoyi.cai.mapper.CaiConsumeLogMapper;
-import com.ruoyi.cai.service.CaiConsumeLogService;
+import com.ruoyi.cai.mapper.ConsumeLogMapper;
+import com.ruoyi.cai.service.ConsumeLogService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-24
  */
 @Service
-public class CaiConsumeLogServiceImpl extends ServiceImpl<CaiConsumeLogMapper,CaiConsumeLog> implements CaiConsumeLogService {
+public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper,CaiConsumeLog> implements ConsumeLogService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicImagesServiceImpl.java
similarity index 53%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicImagesServiceImpl.java
index 6f19a20f..1c2a74c1 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicImagesServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicImagesServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.DynamicImages;
-import com.ruoyi.cai.mapper.CaiDynamicImagesMapper;
-import com.ruoyi.cai.service.CaiDynamicImagesService;
+import com.ruoyi.cai.mapper.DynamicImagesMapper;
+import com.ruoyi.cai.service.DynamicImagesService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-23
  */
 @Service
-public class CaiDynamicImagesServiceImpl extends ServiceImpl<CaiDynamicImagesMapper, DynamicImages> implements CaiDynamicImagesService {
+public class DynamicImagesServiceImpl extends ServiceImpl<DynamicImagesMapper, DynamicImages> implements DynamicImagesService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
similarity index 91%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
index 6a1cd0a9..a14db4d8 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiDynamicServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java
@@ -15,10 +15,10 @@ import com.ruoyi.cai.dto.app.vo.DynamicListVo;
 import com.ruoyi.cai.dto.app.vo.DynamicVo;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
-import com.ruoyi.cai.mapper.CaiDynamicMapper;
-import com.ruoyi.cai.service.CaiDynamicImagesService;
-import com.ruoyi.cai.service.CaiDynamicService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.mapper.DynamicMapper;
+import com.ruoyi.cai.service.DynamicImagesService;
+import com.ruoyi.cai.service.DynamicService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanConvertUtil;
@@ -38,14 +38,14 @@ import java.util.stream.Collectors;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiDynamicServiceImpl extends ServiceImpl<CaiDynamicMapper, Dynamic> implements CaiDynamicService {
+public class DynamicServiceImpl extends ServiceImpl<DynamicMapper, Dynamic> implements DynamicService {
 
     @Autowired
-    private CaiDynamicImagesService dynamicImagesService;
+    private DynamicImagesService dynamicImagesService;
     @Autowired
     private DynamicTotalCache dynamicTotalCache;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
     private SystemConfigManager systemConfigManager;
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GiftServiceImpl.java
similarity index 78%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GiftServiceImpl.java
index 59422be1..ca4f400e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiftServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GiftServiceImpl.java
@@ -3,8 +3,8 @@ package com.ruoyi.cai.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Gift;
-import com.ruoyi.cai.mapper.CaiGiftMapper;
-import com.ruoyi.cai.service.CaiGiftService;
+import com.ruoyi.cai.mapper.GiftMapper;
+import com.ruoyi.cai.service.GiftService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +18,7 @@ import java.util.List;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiGiftServiceImpl extends ServiceImpl<CaiGiftMapper, Gift> implements CaiGiftService {
+public class GiftServiceImpl extends ServiceImpl<GiftMapper, Gift> implements GiftService {
 
     @Override
     public List<Gift> all() {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GiveLogServiceImpl.java
similarity index 57%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GiveLogServiceImpl.java
index d830991e..e8b8fef4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGiveLogServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GiveLogServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.GiveLog;
-import com.ruoyi.cai.mapper.CaiGiveLogMapper;
-import com.ruoyi.cai.service.CaiGiveLogService;
+import com.ruoyi.cai.mapper.GiveLogMapper;
+import com.ruoyi.cai.service.GiveLogService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-24
  */
 @Service
-public class CaiGiveLogServiceImpl extends ServiceImpl<CaiGiveLogMapper, GiveLog> implements CaiGiveLogService {
+public class GiveLogServiceImpl extends ServiceImpl<GiveLogMapper, GiveLog> implements GiveLogService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GoodsServiceImpl.java
similarity index 64%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GoodsServiceImpl.java
index 1ec3aff7..a0f5342a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGoodsServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GoodsServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Goods;
-import com.ruoyi.cai.mapper.CaiGoodsMapper;
-import com.ruoyi.cai.service.CaiGoodsService;
+import com.ruoyi.cai.mapper.GoodsMapper;
+import com.ruoyi.cai.service.GoodsService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiGoodsServiceImpl extends ServiceImpl<CaiGoodsMapper, Goods> implements CaiGoodsService {
+public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardLogServiceImpl.java
similarity index 62%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardLogServiceImpl.java
index 08fcdd24..2513d11e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardLogServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardLogServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.GuardLog;
-import com.ruoyi.cai.mapper.CaiGuardLogMapper;
-import com.ruoyi.cai.service.CaiGuardLogService;
+import com.ruoyi.cai.mapper.GuardLogMapper;
+import com.ruoyi.cai.service.GuardLogService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiGuardLogServiceImpl extends ServiceImpl<CaiGuardLogMapper, GuardLog> implements CaiGuardLogService {
+public class GuardLogServiceImpl extends ServiceImpl<GuardLogMapper, GuardLog> implements GuardLogService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java
similarity index 94%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java
index 306c1207..ae30989b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiGuardTotalServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java
@@ -12,7 +12,7 @@ import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo;
 import com.ruoyi.cai.enums.ConsumeLogType;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
-import com.ruoyi.cai.mapper.CaiGuardTotalMapper;
+import com.ruoyi.cai.mapper.GuardTotalMapper;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
@@ -31,16 +31,16 @@ import java.util.stream.Collectors;
  * @date 2023-12-23
  */
 @Service
-public class CaiGuardTotalServiceImpl extends ServiceImpl<CaiGuardTotalMapper, GuardTotal> implements CaiGuardTotalService {
+public class GuardTotalServiceImpl extends ServiceImpl<GuardTotalMapper, GuardTotal> implements GuardTotalService {
 
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
-    private CaiGuardLogService guardLogService;
+    private GuardLogService guardLogService;
     @Autowired
     private SystemConfigManager systemConfigManager;
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LowHeightRiskServiceImpl.java
similarity index 72%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LowHeightRiskServiceImpl.java
index 11993ffa..2a505614 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiLowHeightRiskServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LowHeightRiskServiceImpl.java
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.LowHeightRisk;
 import com.ruoyi.cai.dto.admin.vo.LowHeightRiskAdminVo;
-import com.ruoyi.cai.mapper.CaiLowHeightRiskMapper;
-import com.ruoyi.cai.service.CaiLowHeightRiskService;
+import com.ruoyi.cai.mapper.LowHeightRiskMapper;
+import com.ruoyi.cai.service.LowHeightRiskService;
 import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiLowHeightRiskServiceImpl extends ServiceImpl<CaiLowHeightRiskMapper, LowHeightRisk> implements CaiLowHeightRiskService {
+public class LowHeightRiskServiceImpl extends ServiceImpl<LowHeightRiskMapper, LowHeightRisk> implements LowHeightRiskService {
 
     @Override
     public Page<LowHeightRiskAdminVo> pageAdmin(PageQuery pageQuery, LowHeightRiskAdminVo bo) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/MemberSkillServiceImpl.java
similarity index 55%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/MemberSkillServiceImpl.java
index 732a9854..09619e3d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiMemberSkillServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/MemberSkillServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.MemberSkill;
-import com.ruoyi.cai.mapper.CaiMemberSkillMapper;
-import com.ruoyi.cai.service.CaiMemberSkillService;
+import com.ruoyi.cai.mapper.MemberSkillMapper;
+import com.ruoyi.cai.service.MemberSkillService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-30
  */
 @Service
-public class CaiMemberSkillServiceImpl extends ServiceImpl<CaiMemberSkillMapper, MemberSkill> implements CaiMemberSkillService {
+public class MemberSkillServiceImpl extends ServiceImpl<MemberSkillMapper, MemberSkill> implements MemberSkillService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ReportCateServiceImpl.java
similarity index 61%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ReportCateServiceImpl.java
index 75a4d7a9..d87a038c 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportCateServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ReportCateServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.ReportCate;
-import com.ruoyi.cai.mapper.CaiReportCateMapper;
-import com.ruoyi.cai.service.CaiReportCateService;
+import com.ruoyi.cai.mapper.ReportCateMapper;
+import com.ruoyi.cai.service.ReportCateService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiReportCateServiceImpl extends ServiceImpl<CaiReportCateMapper, ReportCate> implements CaiReportCateService {
+public class ReportCateServiceImpl extends ServiceImpl<ReportCateMapper, ReportCate> implements ReportCateService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ReportServiceImpl.java
similarity index 77%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ReportServiceImpl.java
index 241d19eb..ab6ab178 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiReportServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ReportServiceImpl.java
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Report;
 import com.ruoyi.cai.domain.ReportCate;
 import com.ruoyi.cai.dto.app.query.UserReportReq;
-import com.ruoyi.cai.mapper.CaiReportMapper;
-import com.ruoyi.cai.service.CaiReportCateService;
-import com.ruoyi.cai.service.CaiReportService;
+import com.ruoyi.cai.mapper.ReportMapper;
+import com.ruoyi.cai.service.ReportCateService;
+import com.ruoyi.cai.service.ReportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,9 +19,9 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiReportServiceImpl extends ServiceImpl<CaiReportMapper, Report> implements CaiReportService {
+public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
     @Autowired
-    private CaiReportCateService reportCateService;
+    private ReportCateService reportCateService;
     @Override
     public void report(UserReportReq reportRes) {
         ReportCate reportCate = reportCateService.getById(reportRes.getCateId());
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionServiceImpl.java
similarity index 59%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionServiceImpl.java
index d61a53b0..f9b46dec 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionServiceImpl.java
@@ -1,11 +1,12 @@
 package com.ruoyi.cai.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Union;
 import com.ruoyi.cai.dto.admin.vo.UnionAdminVo;
-import com.ruoyi.cai.mapper.CaiUnionMapper;
-import com.ruoyi.cai.service.CaiUnionService;
+import com.ruoyi.cai.mapper.UnionMapper;
+import com.ruoyi.cai.service.UnionService;
 import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.stereotype.Service;
 
@@ -16,10 +17,15 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiUnionServiceImpl extends ServiceImpl<CaiUnionMapper, Union> implements CaiUnionService {
+public class UnionServiceImpl extends ServiceImpl<UnionMapper, Union> implements UnionService {
 
     @Override
     public Page<UnionAdminVo> pageAdmin(PageQuery pageQuery, UnionAdminVo bo) {
         return baseMapper.pageAdmin(pageQuery.build(),bo);
     }
+
+    @Override
+    public Union getByUserId(Long userId) {
+        return this.getOne(Wrappers.lambdaQuery(Union.class).eq(Union::getUserId,userId).last("limit 1"));
+    }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java
similarity index 80%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java
index cf12a583..d9bfc63b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionUserServiceImpl.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UnionUser;
 import com.ruoyi.cai.dto.admin.vo.UnionUserAdminVo;
-import com.ruoyi.cai.mapper.CaiUnionUserMapper;
-import com.ruoyi.cai.service.CaiUnionUserService;
+import com.ruoyi.cai.mapper.UnionUserMapper;
+import com.ruoyi.cai.service.UnionUserService;
 import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiUnionUserServiceImpl extends ServiceImpl<CaiUnionUserMapper, UnionUser> implements CaiUnionUserService {
+public class UnionUserServiceImpl extends ServiceImpl<UnionUserMapper, UnionUser> implements UnionUserService {
 
     @Override
     public UnionUser getByUserId(Long userId){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java
similarity index 89%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java
index e8b89d75..13c7b5da 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserAlbumServiceImpl.java
@@ -7,9 +7,9 @@ import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserAlbum;
 import com.ruoyi.cai.dto.app.query.AlbumAddReq;
 import com.ruoyi.cai.dto.app.query.AlbumResetReq;
-import com.ruoyi.cai.mapper.CaiUserAlbumMapper;
-import com.ruoyi.cai.service.CaiUserAlbumService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.mapper.UserAlbumMapper;
+import com.ruoyi.cai.service.UserAlbumService;
+import com.ruoyi.cai.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserAlbumServiceImpl extends ServiceImpl<CaiUserAlbumMapper, UserAlbum> implements CaiUserAlbumService {
+public class UserAlbumServiceImpl extends ServiceImpl<UserAlbumMapper, UserAlbum> implements UserAlbumService {
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Override
     public List<String> getUserAlbum(Long userId,Integer anchor){
         LambdaQueryWrapper<UserAlbum> eq = Wrappers.lambdaQuery(UserAlbum.class)
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java
similarity index 84%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java
index c15b6ef0..c54a4981 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserBlacklistServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserBlacklistServiceImpl.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserBlacklist;
 import com.ruoyi.cai.dto.app.vo.user.UserListVo;
-import com.ruoyi.cai.mapper.CaiUserBlacklistMapper;
-import com.ruoyi.cai.service.CaiUserBlacklistService;
+import com.ruoyi.cai.mapper.UserBlacklistMapper;
+import com.ruoyi.cai.service.UserBlacklistService;
 import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-30
  */
 @Service
-public class CaiUserBlacklistServiceImpl extends ServiceImpl<CaiUserBlacklistMapper, UserBlacklist> implements CaiUserBlacklistService {
+public class UserBlacklistServiceImpl extends ServiceImpl<UserBlacklistMapper, UserBlacklist> implements UserBlacklistService {
     @Override
     public boolean black(Long userId, Long blackUserId,Integer actionType) {
         if(userId.equals(blackUserId)){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java
similarity index 81%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java
index 0b027f30..467ae520 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCallServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java
@@ -2,11 +2,11 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.*;
-import com.ruoyi.cai.mapper.CaiUserCallMapper;
-import com.ruoyi.cai.service.CaiAccountService;
-import com.ruoyi.cai.service.CaiUnionUserService;
-import com.ruoyi.cai.service.CaiUserCallService;
-import com.ruoyi.cai.service.CaiUserInviteService;
+import com.ruoyi.cai.mapper.UserCallMapper;
+import com.ruoyi.cai.service.AccountService;
+import com.ruoyi.cai.service.UnionUserService;
+import com.ruoyi.cai.service.UserCallService;
+import com.ruoyi.cai.service.UserInviteService;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,14 +20,14 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserCallServiceImpl extends ServiceImpl<CaiUserCallMapper, UserCall> implements CaiUserCallService {
+public class UserCallServiceImpl extends ServiceImpl<UserCallMapper, UserCall> implements UserCallService {
 
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
-    private CaiUserInviteService inviteService;
+    private UserInviteService inviteService;
     @Autowired
-    private CaiUnionUserService unionUserService;
+    private UnionUserService unionUserService;
     @Override
     public UserCall createCall(User fromUser, User toUser, Anchor anchor) {
         Long fromUid = fromUser.getId();
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCameraAuditServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCameraAuditServiceImpl.java
similarity index 89%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCameraAuditServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCameraAuditServiceImpl.java
index e98cadd5..f8a1f595 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCameraAuditServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCameraAuditServiceImpl.java
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserCameraAudit;
 import com.ruoyi.cai.dto.app.vo.CameraAuditVo;
-import com.ruoyi.cai.mapper.CaiUserCameraAuditMapper;
-import com.ruoyi.cai.service.CaiUserCameraAuditService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.mapper.UserCameraAuditMapper;
+import com.ruoyi.cai.service.UserCameraAuditService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,7 @@ import java.util.Map;
  * @date 2023-12-30
  */
 @Service
-public class CaiUserCameraAuditServiceImpl extends ServiceImpl<CaiUserCameraAuditMapper, UserCameraAudit> implements CaiUserCameraAuditService {
+public class UserCameraAuditServiceImpl extends ServiceImpl<UserCameraAuditMapper, UserCameraAudit> implements UserCameraAuditService {
 
     public static final Map<Integer,String> ACTION_TYPES = new HashMap<>();
 
@@ -36,7 +36,7 @@ public class CaiUserCameraAuditServiceImpl extends ServiceImpl<CaiUserCameraAudi
     }
 
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
 
     @Override
     public UserCameraAudit getByUserId(Long userId){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCodeGenServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCodeGenServiceImpl.java
similarity index 54%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCodeGenServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCodeGenServiceImpl.java
index 20f6161d..f1ab0f75 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCodeGenServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCodeGenServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserCodeGen;
-import com.ruoyi.cai.mapper.CaiUserCodeGenMapper;
-import com.ruoyi.cai.service.CaiUserCodeGenService;
+import com.ruoyi.cai.mapper.UserCodeGenMapper;
+import com.ruoyi.cai.service.UserCodeGenService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-21
  */
 @Service
-public class CaiUserCodeGenServiceImpl extends ServiceImpl<CaiUserCodeGenMapper, UserCodeGen> implements CaiUserCodeGenService {
+public class UserCodeGenServiceImpl extends ServiceImpl<UserCodeGenMapper, UserCodeGen> implements UserCodeGenService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCountServiceImpl.java
similarity index 87%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCountServiceImpl.java
index 4f587cfd..40d2dd6f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserCountServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCountServiceImpl.java
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.*;
 import com.ruoyi.cai.dto.admin.vo.UserCountAdminVo;
 import com.ruoyi.cai.executor.ExecutorConstant;
-import com.ruoyi.cai.mapper.CaiUserCountMapper;
-import com.ruoyi.cai.mapper.CaiUserGiftMapper;
+import com.ruoyi.cai.mapper.UserCountMapper;
+import com.ruoyi.cai.mapper.UserGiftMapper;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.core.domain.PageQuery;
 import lombok.RequiredArgsConstructor;
@@ -24,20 +24,20 @@ import javax.annotation.Resource;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserCountServiceImpl extends ServiceImpl<CaiUserCountMapper, UserCount> implements CaiUserCountService {
+public class UserCountServiceImpl extends ServiceImpl<UserCountMapper, UserCount> implements UserCountService {
 
     @Autowired
-    private CaiUserVisitorService userVisitorService;
+    private UserVisitorService userVisitorService;
     @Autowired
-    private CaiUserFollowService userFollowService;
+    private UserFollowService userFollowService;
     @Autowired
-    private CaiUserGiftService userGiftService;
+    private UserGiftService userGiftService;
     @Resource
-    private CaiUserGiftMapper userGiftMapper;
+    private UserGiftMapper userGiftMapper;
     @Autowired
-    private CaiUserAlbumService userAlbumService;
+    private UserAlbumService userAlbumService;
     @Autowired
-    private CaiDynamicService dynamicService;
+    private DynamicService dynamicService;
 
     @Override
     public void star(Long fromUserId, Long toUserId) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowDynamicServiceImpl.java
similarity index 81%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowDynamicServiceImpl.java
index 34e5cde1..e51543cf 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowDynamicServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowDynamicServiceImpl.java
@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.Dynamic;
 import com.ruoyi.cai.domain.UserFollowDynamic;
 import com.ruoyi.cai.dto.app.query.DynamicStarReq;
-import com.ruoyi.cai.mapper.CaiUserFollowDynamicMapper;
-import com.ruoyi.cai.service.CaiDynamicService;
-import com.ruoyi.cai.service.CaiUserFollowDynamicService;
+import com.ruoyi.cai.mapper.UserFollowDynamicMapper;
+import com.ruoyi.cai.service.DynamicService;
+import com.ruoyi.cai.service.UserFollowDynamicService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,10 +20,10 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserFollowDynamicServiceImpl extends ServiceImpl<CaiUserFollowDynamicMapper, UserFollowDynamic> implements CaiUserFollowDynamicService {
+public class UserFollowDynamicServiceImpl extends ServiceImpl<UserFollowDynamicMapper, UserFollowDynamic> implements UserFollowDynamicService {
 
     @Autowired
-    private CaiDynamicService dynamicService;
+    private DynamicService dynamicService;
 
     @Override
     public void star(DynamicStarReq query) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
similarity index 89%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
index d2d4a1a4..e9edb95f 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
@@ -8,9 +8,9 @@ import com.ruoyi.cai.domain.UserFollow;
 import com.ruoyi.cai.dto.app.query.StarQuery;
 import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
 import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
-import com.ruoyi.cai.mapper.CaiUserFollowMapper;
-import com.ruoyi.cai.service.CaiUserCountService;
-import com.ruoyi.cai.service.CaiUserFollowService;
+import com.ruoyi.cai.mapper.UserFollowMapper;
+import com.ruoyi.cai.service.UserCountService;
+import com.ruoyi.cai.service.UserFollowService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.helper.LoginHelper;
 import lombok.RequiredArgsConstructor;
@@ -26,10 +26,10 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserFollowServiceImpl extends ServiceImpl<CaiUserFollowMapper, UserFollow> implements CaiUserFollowService {
+public class UserFollowServiceImpl extends ServiceImpl<UserFollowMapper, UserFollow> implements UserFollowService {
 
     @Autowired
-    private CaiUserCountService userCountService;
+    private UserCountService userCountService;
 
     @Override
     public Long getFansNumByUserId(Long userId){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserForbidServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java
similarity index 56%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserForbidServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java
index 28f78c43..5fea0bbe 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserForbidServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserForbid;
-import com.ruoyi.cai.mapper.CaiUserForbidMapper;
-import com.ruoyi.cai.service.CaiUserForbidService;
+import com.ruoyi.cai.mapper.UserForbidMapper;
+import com.ruoyi.cai.service.UserForbidService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-21
  */
 @Service
-public class CaiUserForbidServiceImpl extends ServiceImpl<CaiUserForbidMapper, UserForbid> implements CaiUserForbidService {
+public class UserForbidServiceImpl extends ServiceImpl<UserForbidMapper, UserForbid> implements UserForbidService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java
similarity index 86%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java
index 14019f85..43c83209 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserGiftServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java
@@ -5,7 +5,7 @@ import com.ruoyi.cai.domain.*;
 import com.ruoyi.cai.dto.app.query.GiveGiftRes;
 import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo;
 import com.ruoyi.cai.enums.ConsumeLogType;
-import com.ruoyi.cai.mapper.CaiUserGiftMapper;
+import com.ruoyi.cai.mapper.UserGiftMapper;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.LoginHelper;
@@ -23,16 +23,16 @@ import java.util.List;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserGiftServiceImpl extends ServiceImpl<CaiUserGiftMapper, UserGift> implements CaiUserGiftService {
+public class UserGiftServiceImpl extends ServiceImpl<UserGiftMapper, UserGift> implements UserGiftService {
 
     @Autowired
-    private CaiGiftService giftService;
+    private GiftService giftService;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
 
 
     @Override
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInfoServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInfoServiceImpl.java
new file mode 100644
index 00000000..bb14b40e
--- /dev/null
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInfoServiceImpl.java
@@ -0,0 +1,18 @@
+package com.ruoyi.cai.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cai.domain.UserInfo;
+import com.ruoyi.cai.mapper.UserInfoMapper;
+import com.ruoyi.cai.service.UserInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService {
+
+    @Override
+    public UserInfo getByUserId(Long userId) {
+        return this.getOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserId,userId)
+                .last("limit 1"));
+    }
+}
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java
similarity index 85%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java
index a30a9b08..40cb8286 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java
@@ -7,9 +7,9 @@ import com.ruoyi.cai.domain.UserInvite;
 import com.ruoyi.cai.dto.app.dto.InviteCountDTO;
 import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo;
 import com.ruoyi.cai.dto.app.vo.user.UserListVo;
-import com.ruoyi.cai.mapper.CaiUserInviteMapper;
-import com.ruoyi.cai.service.CaiUserInviteService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.mapper.UserInviteMapper;
+import com.ruoyi.cai.service.UserInviteService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import java.util.List;
  * @date 2023-12-28
  */
 @Service
-public class CaiUserInviteServiceImpl extends ServiceImpl<CaiUserInviteMapper, UserInvite> implements CaiUserInviteService {
+public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInvite> implements UserInviteService {
 
     @Override
     public UserInvite getByUserId(Long id) {
@@ -32,7 +32,7 @@ public class CaiUserInviteServiceImpl extends ServiceImpl<CaiUserInviteMapper, U
     }
 
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
 
     @Override
     public InviteHomeVo inviteHome(Long userId) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java
similarity index 57%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java
index 512232e4..ddecd9d5 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java
@@ -1,11 +1,12 @@
 package com.ruoyi.cai.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserMember;
 import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
-import com.ruoyi.cai.mapper.CaiUserMemberMapper;
-import com.ruoyi.cai.service.CaiUserMemberService;
+import com.ruoyi.cai.mapper.UserMemberMapper;
+import com.ruoyi.cai.service.UserMemberService;
 import com.ruoyi.common.core.domain.PageQuery;
 import org.springframework.stereotype.Service;
 
@@ -16,10 +17,15 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-21
  */
 @Service
-public class CaiUserMemberServiceImpl extends ServiceImpl<CaiUserMemberMapper, UserMember> implements CaiUserMemberService {
+public class UserMemberServiceImpl extends ServiceImpl<UserMemberMapper, UserMember> implements UserMemberService {
 
     @Override
     public Page<UserMemberAdminVo> pageAdmin(PageQuery pageQuery, UserMemberAdminVo bo) {
         return baseMapper.pageAdmin(pageQuery.build(),bo);
     }
+
+    @Override
+    public UserMember getByUserId(Long userId) {
+        return this.getOne(Wrappers.lambdaQuery(UserMember.class).eq(UserMember::getUserId,userId).last("limit 1"));
+    }
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserOnlineServiceImpl.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserOnlineServiceImpl.java
index c8e61fbb..8bfed88e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserOnlineServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserOnlineServiceImpl.java
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserOnline;
 import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo;
-import com.ruoyi.cai.mapper.CaiUserOnlineMapper;
-import com.ruoyi.cai.service.CaiUserOnlineService;
+import com.ruoyi.cai.mapper.UserOnlineMapper;
+import com.ruoyi.cai.service.UserOnlineService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserOnlineServiceImpl extends ServiceImpl<CaiUserOnlineMapper, UserOnline> implements CaiUserOnlineService {
+public class UserOnlineServiceImpl extends ServiceImpl<UserOnlineMapper, UserOnline> implements UserOnlineService {
 
     @Override
     public UserOnline getByUserId(Long userId){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserRiskLogServiceImpl.java
similarity index 56%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserRiskLogServiceImpl.java
index ac6a69f4..bd06b82b 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserRiskLogServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserRiskLogServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.UserRiskLog;
-import com.ruoyi.cai.mapper.CaiUserRiskLogMapper;
-import com.ruoyi.cai.service.CaiUserRiskLogService;
+import com.ruoyi.cai.mapper.UserRiskLogMapper;
+import com.ruoyi.cai.service.UserRiskLogService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-22
  */
 @Service
-public class CaiUserRiskLogServiceImpl extends ServiceImpl<CaiUserRiskLogMapper, UserRiskLog> implements CaiUserRiskLogService {
+public class UserRiskLogServiceImpl extends ServiceImpl<UserRiskLogMapper, UserRiskLog> implements UserRiskLogService {
 
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
similarity index 88%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
index 29cd709d..c7e9628a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
@@ -11,7 +11,7 @@ import com.ruoyi.cai.dto.app.query.UserQuery;
 import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
 import com.ruoyi.cai.dto.app.vo.user.UserListVo;
 import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo;
-import com.ruoyi.cai.mapper.CaiUserMapper;
+import com.ruoyi.cai.mapper.UserMapper;
 import com.ruoyi.cai.service.*;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.helper.LoginHelper;
@@ -26,21 +26,21 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-19
  */
 @Service
-public class CaiUserServiceImpl extends ServiceImpl<CaiUserMapper, User> implements CaiUserService {
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
-    private CaiUserFollowService userFollowService;
+    private UserFollowService userFollowService;
     @Autowired
-    private CaiUserAlbumService caiUserAlbumService;
+    private UserAlbumService userAlbumService;
     @Autowired
-    private CaiGuardTotalService guardTotalService;
+    private GuardTotalService guardTotalService;
     @Autowired
-    private CaiDynamicService dynamicService;
+    private DynamicService dynamicService;
     @Autowired
-    private CaiUserGiftService userGiftService;
+    private UserGiftService userGiftService;
     @Autowired
-    private CaiUserOnlineService userOnlineService;
+    private UserOnlineService userOnlineService;
 
     @Override
     public User getByUsername(String username) {
@@ -86,7 +86,7 @@ public class CaiUserServiceImpl extends ServiceImpl<CaiUserMapper, User> impleme
         }
         vo.setFansNum(userFollowService.getFansNumByUserId(userId));
         vo.setStar(userFollowService.checkStar(currentUserId, userId));
-        vo.setAlbumList(caiUserAlbumService.getUserAlbum(userId, user.getIsAnchor()));
+        vo.setAlbumList(userAlbumService.getUserAlbum(userId, user.getIsAnchor()));
         // 在线状态
         OnlineStatusVo onlineStatusVo;
         if(user.getIsAnchor() == 1 && anchor != null){
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserVisitorServiceImpl.java
similarity index 84%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserVisitorServiceImpl.java
index 6bd54393..60ceafe8 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserVisitorServiceImpl.java
@@ -7,9 +7,9 @@ import com.ruoyi.cai.domain.UserVisitor;
 import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
 import com.ruoyi.cai.dto.app.query.VisitorQuery;
 import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
-import com.ruoyi.cai.mapper.CaiUserVisitorMapper;
-import com.ruoyi.cai.service.CaiUserCountService;
-import com.ruoyi.cai.service.CaiUserVisitorService;
+import com.ruoyi.cai.mapper.UserVisitorMapper;
+import com.ruoyi.cai.service.UserCountService;
+import com.ruoyi.cai.service.UserVisitorService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.helper.LoginHelper;
 import lombok.RequiredArgsConstructor;
@@ -26,9 +26,9 @@ import java.time.LocalDateTime;
  */
 @RequiredArgsConstructor
 @Service
-public class CaiUserVisitorServiceImpl extends ServiceImpl<CaiUserVisitorMapper, UserVisitor> implements CaiUserVisitorService {
+public class UserVisitorServiceImpl extends ServiceImpl<UserVisitorMapper, UserVisitor> implements UserVisitorService {
     @Autowired
-    private CaiUserCountService userCountService;
+    private UserCountService userCountService;
     @Override
     public boolean visitor(StarOrVisitorReq starOrVisitorReq) {
         Long fromUserId = LoginHelper.getUserId();
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/WithdrawExchangeServiceImpl.java
similarity index 53%
rename from ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java
rename to ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/WithdrawExchangeServiceImpl.java
index 48b3e707..ce00c23d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiWithdrawExchangeServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/WithdrawExchangeServiceImpl.java
@@ -2,8 +2,8 @@ package com.ruoyi.cai.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.WithdrawExchange;
-import com.ruoyi.cai.mapper.CaiWithdrawExchangeMapper;
-import com.ruoyi.cai.service.CaiWithdrawExchangeService;
+import com.ruoyi.cai.mapper.WithdrawExchangeMapper;
+import com.ruoyi.cai.service.WithdrawExchangeService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,5 +13,5 @@ import org.springframework.stereotype.Service;
  * @date 2023-12-24
  */
 @Service
-public class CaiWithdrawExchangeServiceImpl extends ServiceImpl<CaiWithdrawExchangeMapper, WithdrawExchange> implements CaiWithdrawExchangeService {
+public class WithdrawExchangeServiceImpl extends ServiceImpl<WithdrawExchangeMapper, WithdrawExchange> implements WithdrawExchangeService {
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java
index 0a3ce780..8f9e5efa 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/AgreeMessageHandle.java
@@ -3,7 +3,7 @@ package com.ruoyi.cai.ws.handler.message;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cai.domain.UserCall;
-import com.ruoyi.cai.service.CaiUserCallService;
+import com.ruoyi.cai.service.UserCallService;
 import com.ruoyi.cai.ws.bean.FdCtxData;
 import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.cache.RoomDataCache;
@@ -25,7 +25,7 @@ public class AgreeMessageHandle extends AbstractMessageHandle implements IMessag
     @Autowired
     private RoomDataCache roomDataCache;
     @Autowired
-    private CaiUserCallService userCallService;
+    private UserCallService userCallService;
 
     @Override
     public void processOn(Room room, FdCtxData fdCtxData, JSONObject map) {
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java
index 05d6bdda..7975dad4 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/CancelMessageHandler.java
@@ -3,7 +3,7 @@ package com.ruoyi.cai.ws.handler.message;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cai.domain.UserCall;
-import com.ruoyi.cai.service.CaiUserCallService;
+import com.ruoyi.cai.service.UserCallService;
 import com.ruoyi.cai.trd.ImDataRes;
 import com.ruoyi.cai.trd.ImMsgGen;
 import com.ruoyi.cai.trd.Yunxin;
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
 @Component("cancel")
 public class CancelMessageHandler extends AbstractMessageHandle implements IMessageHandler {
     @Autowired
-    private CaiUserCallService userCallService;
+    private UserCallService userCallService;
     @Autowired
     private RoomService roomService;
     @Autowired
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java
index 5a48aa22..b6e8ce4d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/GiftMessageHandler.java
@@ -4,9 +4,9 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.cai.domain.Account;
 import com.ruoyi.cai.domain.Gift;
 import com.ruoyi.cai.dto.app.query.GiveGiftRes;
-import com.ruoyi.cai.service.CaiAccountService;
-import com.ruoyi.cai.service.CaiGiftService;
-import com.ruoyi.cai.service.CaiUserGiftService;
+import com.ruoyi.cai.service.AccountService;
+import com.ruoyi.cai.service.GiftService;
+import com.ruoyi.cai.service.UserGiftService;
 import com.ruoyi.cai.ws.bean.FdCtxData;
 import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.dto.WsRMsgGen;
@@ -18,11 +18,11 @@ import org.springframework.stereotype.Component;
 @Component("gift")
 public class GiftMessageHandler extends AbstractMessageHandle implements IMessageHandler {
     @Autowired
-    private CaiGiftService giftService;
+    private GiftService giftService;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
-    private CaiUserGiftService userGiftService;
+    private UserGiftService userGiftService;
     @Override
     public void processOn(Room room, FdCtxData fdCtxData, JSONObject map) {
         Long giftId = map.getLong("giftId");
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java
index 12ee2cca..4a6ac4d7 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/handler/message/RefuseMessageHandler.java
@@ -3,7 +3,7 @@ package com.ruoyi.cai.ws.handler.message;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cai.domain.UserCall;
-import com.ruoyi.cai.service.CaiUserCallService;
+import com.ruoyi.cai.service.UserCallService;
 import com.ruoyi.cai.trd.ImDataRes;
 import com.ruoyi.cai.trd.ImMsgGen;
 import com.ruoyi.cai.trd.Yunxin;
@@ -29,7 +29,7 @@ public class RefuseMessageHandler extends AbstractMessageHandle implements IMess
     @Autowired
     private RoomService roomService;
     @Autowired
-    private CaiUserCallService userCallService;
+    private UserCallService userCallService;
     @Autowired
     private Yunxin yunxin;
     @Override
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java
index 2d40151f..3fcf363a 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java
@@ -3,10 +3,10 @@ package com.ruoyi.cai.ws.manager;
 import com.ruoyi.cai.domain.Anchor;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserCall;
-import com.ruoyi.cai.service.CaiAnchorService;
-import com.ruoyi.cai.service.CaiUserCallService;
-import com.ruoyi.cai.service.CaiUserInviteService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.AnchorService;
+import com.ruoyi.cai.service.UserCallService;
+import com.ruoyi.cai.service.UserInviteService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.bean.RoomData;
 import com.ruoyi.cai.ws.bean.UserData;
@@ -28,13 +28,13 @@ public class WebSocketManager {
     @Autowired
     private RoomService roomService;
     @Autowired
-    private CaiUserCallService userCallService;
+    private UserCallService userCallService;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
-    private CaiUserInviteService userInviteService;
+    private UserInviteService userInviteService;
     @Autowired
     private RoomDataCache roomDataCache;
     @Autowired
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java
index 50f8eef3..4ebd0b6d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/processon/OpenLogic.java
@@ -3,8 +3,8 @@ package com.ruoyi.cai.ws.processon;
 import cn.hutool.core.date.DateUtil;
 import com.ruoyi.cai.trd.Agora;
 import com.ruoyi.cai.executor.ExecutorConstant;
-import com.ruoyi.cai.service.CaiAnchorService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.AnchorService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.cai.ws.bean.FdCtxData;
 import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.cache.*;
@@ -41,9 +41,9 @@ public class OpenLogic {
     @Autowired
     private OnlineDataCache onlineDataCache;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
     private Agora agora;
 
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 0b4427b4..7c00b184 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
@@ -3,9 +3,9 @@ package com.ruoyi.cai.ws.service;
 import cn.hutool.core.date.DateUtil;
 import com.ruoyi.cai.domain.Account;
 import com.ruoyi.cai.executor.ExecutorConstant;
-import com.ruoyi.cai.service.CaiAccountService;
-import com.ruoyi.cai.service.CaiAnchorService;
-import com.ruoyi.cai.service.CaiUserService;
+import com.ruoyi.cai.service.AccountService;
+import com.ruoyi.cai.service.AnchorService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.cai.trd.Agora;
 import com.ruoyi.cai.ws.bean.Room;
 import com.ruoyi.cai.ws.bean.RoomData;
@@ -33,15 +33,15 @@ public class RoomService {
     @Autowired
     private CallerRoomCache callerRoomCache;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
     private FdCtxDataCache fdCtxDataCache;
     @Autowired
     private RoomCtxCache roomCtxCache;
     @Autowired
-    private CaiUserService userService;
+    private UserService userService;
     @Autowired
-    private CaiAnchorService anchorService;
+    private AnchorService anchorService;
     @Autowired
     private Agora agora;
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java
index 8433a9c6..2cede9fb 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/service/SettleService.java
@@ -2,7 +2,7 @@ package com.ruoyi.cai.ws.service;
 
 import cn.hutool.core.date.DateUtil;
 import com.ruoyi.cai.domain.Account;
-import com.ruoyi.cai.service.CaiAccountService;
+import com.ruoyi.cai.service.AccountService;
 import com.ruoyi.cai.trd.ImDataRes;
 import com.ruoyi.cai.trd.ImMsgGen;
 import com.ruoyi.cai.trd.Yunxin;
@@ -27,7 +27,7 @@ public class SettleService {
     @Autowired
     private RoomDataCache roomDataCache;
     @Autowired
-    private CaiAccountService accountService;
+    private AccountService accountService;
     @Autowired
     private OnlineDataCache onlineDataCache;
     @Autowired
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountBankcardMapper.xml
similarity index 91%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AccountBankcardMapper.xml
index ab971c76..083d9b7d 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBankcardMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountBankcardMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAccountBankcardMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AccountBankcardMapper">
 
     <resultMap type="com.ruoyi.cai.domain.AccountBankcard" id="CaiAccountBankcardResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountBusinessMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AccountBusinessMapper.xml
index 02ab04c6..2cbafa76 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountBusinessMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountBusinessMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAccountBusinessMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AccountBusinessMapper">
 
     <resultMap type="com.ruoyi.cai.domain.AccountBusiness" id="CaiAccountBusinessResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountCashMapper.xml
similarity index 97%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AccountCashMapper.xml
index ea0293f4..a12de73a 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountCashMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountCashMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAccountCashMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AccountCashMapper">
 
     <resultMap type="com.ruoyi.cai.domain.AccountCash" id="CaiAccountCashResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountDetailMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AccountDetailMapper.xml
index 12ab0a1e..8775e8aa 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountDetailMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountDetailMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAccountDetailMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AccountDetailMapper">
 
     <resultMap type="com.ruoyi.cai.domain.AccountDetail" id="CaiAccountDetailResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml
similarity index 97%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml
index 258b2234..a8c3fd47 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAccountMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AccountMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Account" id="CaiAccountResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountRechargeMapper.xml
similarity index 95%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AccountRechargeMapper.xml
index 9d5e25c1..dfc09fbe 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAccountRechargeMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountRechargeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAccountRechargeMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AccountRechargeMapper">
 
     <resultMap type="com.ruoyi.cai.domain.AccountRecharge" id="CaiAccountRechargeResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml
index f021ccc9..85677f67 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorApplyMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AnchorApplyMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAnchorApplyMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AnchorApplyMapper">
 
     <resultMap type="com.ruoyi.cai.domain.AnchorApply" id="CaiAnchorApplyResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
similarity index 97%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
index 25aaa927..c8dff1f5 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAnchorMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAnchorMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AnchorMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Anchor" id="CaiAnchorResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AreaMapper.xml
similarity index 93%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/AreaMapper.xml
index 10c2eb45..ed1dc39f 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiAreaMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AreaMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiAreaMapper">
+<mapper namespace="com.ruoyi.cai.mapper.AreaMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Area" id="CaiAreaResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/BannerMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/BannerMapper.xml
index 5bc015a4..0735d49e 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiBannerMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/BannerMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiBannerMapper">
+<mapper namespace="com.ruoyi.cai.mapper.BannerMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Banner" id="CaiBannerResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CitysMapper.xml
similarity index 88%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/CitysMapper.xml
index 6212fcf7..f2fd38ec 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiCitysMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/CitysMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiCitysMapper">
+<mapper namespace="com.ruoyi.cai.mapper.CitysMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Citys" id="CaiCitysResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiConsumeLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml
similarity index 97%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiConsumeLogMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml
index ce1aef62..3bff6efa 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiConsumeLogMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/ConsumeLogMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiConsumeLogMapper">
+<mapper namespace="com.ruoyi.cai.mapper.ConsumeLogMapper">
 
     <resultMap type="com.ruoyi.cai.domain.CaiConsumeLog" id="CaiConsumeLogResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/DynamicImagesMapper.xml
similarity index 91%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/DynamicImagesMapper.xml
index 3cf8cf40..bde187ae 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicImagesMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/DynamicImagesMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiDynamicImagesMapper">
+<mapper namespace="com.ruoyi.cai.mapper.DynamicImagesMapper">
 
     <resultMap type="com.ruoyi.cai.domain.DynamicImages" id="CaiDynamicImagesResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
similarity index 96%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
index 29ec42fd..0b70adc5 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiDynamicMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/DynamicMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiDynamicMapper">
+<mapper namespace="com.ruoyi.cai.mapper.DynamicMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Dynamic" id="CaiDynamicResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/GiftMapper.xml
similarity index 93%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/GiftMapper.xml
index 852b8487..12038b13 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiftMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/GiftMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiGiftMapper">
+<mapper namespace="com.ruoyi.cai.mapper.GiftMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Gift" id="CaiGiftResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/GiveLogMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/GiveLogMapper.xml
index fa1b31f1..e98945a2 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGiveLogMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/GiveLogMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiGiveLogMapper">
+<mapper namespace="com.ruoyi.cai.mapper.GiveLogMapper">
 
     <resultMap type="com.ruoyi.cai.domain.GiveLog" id="CaiGiveLogResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/GoodsMapper.xml
similarity index 90%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/GoodsMapper.xml
index e2fc3a94..b4add8c0 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGoodsMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/GoodsMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiGoodsMapper">
+<mapper namespace="com.ruoyi.cai.mapper.GoodsMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Goods" id="CaiGoodsResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/GuardLogMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/GuardLogMapper.xml
index 2f3b0186..286a7010 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardLogMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/GuardLogMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiGuardLogMapper">
+<mapper namespace="com.ruoyi.cai.mapper.GuardLogMapper">
 
     <resultMap type="com.ruoyi.cai.domain.GuardLog" id="CaiGuardLogResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml
similarity index 97%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml
index 3c86470a..9aa740b7 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiGuardTotalMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiGuardTotalMapper">
+<mapper namespace="com.ruoyi.cai.mapper.GuardTotalMapper">
 
     <resultMap type="com.ruoyi.cai.domain.GuardTotal" id="CaiGuardTotalResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/LowHeightRiskMapper.xml
similarity index 93%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/LowHeightRiskMapper.xml
index 7ef75300..05417c95 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiLowHeightRiskMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/LowHeightRiskMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiLowHeightRiskMapper">
+<mapper namespace="com.ruoyi.cai.mapper.LowHeightRiskMapper">
 
     <resultMap type="com.ruoyi.cai.domain.LowHeightRisk" id="CaiLowHeightRiskResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/MemberSkillMapper.xml
similarity index 89%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/MemberSkillMapper.xml
index be58a5b1..63b3e64b 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiMemberSkillMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/MemberSkillMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiMemberSkillMapper">
+<mapper namespace="com.ruoyi.cai.mapper.MemberSkillMapper">
 
     <resultMap type="com.ruoyi.cai.domain.MemberSkill" id="CaiMemberSkillResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/ReportCateMapper.xml
similarity index 84%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/ReportCateMapper.xml
index 5c106962..3e624fe2 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportCateMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/ReportCateMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiReportCateMapper">
+<mapper namespace="com.ruoyi.cai.mapper.ReportCateMapper">
 
     <resultMap type="com.ruoyi.cai.domain.ReportCate" id="CaiReportCateResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml
index 4d60c32f..06cc4587 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiReportMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/ReportMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiReportMapper">
+<mapper namespace="com.ruoyi.cai.mapper.ReportMapper">
 
     <resultMap type="com.ruoyi.cai.domain.Report" id="CaiReportResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UnionMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UnionMapper.xml
index 2ad179c7..342c8338 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UnionMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUnionMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UnionMapper">
 
     <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.UnionAdminVo">
         select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender,t2.union_time,t2.status
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UnionUserMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UnionUserMapper.xml
index e976a321..ece55c6e 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UnionUserMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUnionUserMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UnionUserMapper">
     <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.UnionUserAdminVo">
         select t1.*,t3.name as union_name,
                t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender,t2.status,t2.is_anchor
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserAlbumMapper.xml
similarity index 91%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserAlbumMapper.xml
index 9aa98b99..b2ced405 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserAlbumMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserAlbumMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserAlbumMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserAlbumMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserAlbum" id="CaiUserAlbumResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml
index f83abb6f..9a047664 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserBlacklistMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserBlacklistMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserBlacklistMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserBlacklistMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserBlacklist" id="CaiUserBlacklistResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserCallMapper.xml
similarity index 96%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserCallMapper.xml
index 03ca4398..8153a01f 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCallMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserCallMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserCallMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserCallMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserCall" id="CaiUserCallResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserCameraAuditMapper.xml
similarity index 93%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserCameraAuditMapper.xml
index 45185651..46a780c2 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCameraAuditMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserCameraAuditMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserCameraAuditMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserCameraAuditMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserCameraAudit" id="CaiUserCameraAuditResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserCodeGenMapper.xml
similarity index 82%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserCodeGenMapper.xml
index e8d83480..95b3301f 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCodeGenMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserCodeGenMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserCodeGenMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserCodeGenMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserCodeGen" id="CaiUserCodeGenResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserCountMapper.xml
similarity index 96%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserCountMapper.xml
index b9ea96eb..a1893588 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserCountMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserCountMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserCountMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserCountMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserCount" id="CaiUserCountResult">
         <result property="userId" column="user_id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserFollowDynamicMapper.xml
similarity index 87%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserFollowDynamicMapper.xml
index 5d3d0ab9..26788729 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowDynamicMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserFollowDynamicMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserFollowDynamicMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserFollowDynamicMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserFollowDynamic" id="CaiUserFollowDynamicResult">
         <result property="userId" column="user_id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserFollowMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserFollowMapper.xml
index 7bd01eb8..662b702f 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserFollowMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserFollowMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserFollowMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserFollow" id="CaiUserFollowResult">
         <result property="userId" column="user_id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserForbidMapper.xml
similarity index 92%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserForbidMapper.xml
index 52d24bf2..1beafb0f 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserForbidMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserForbidMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserForbidMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserForbidMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserForbid" id="CaiUserForbidResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml
similarity index 96%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml
index b8050525..a9c390fc 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserGiftMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserGiftMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserGiftMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserGift" id="CaiUserGiftResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
index 3670a883..0d279ffb 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserInviteMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserInviteMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserInvite" id="CaiUserInviteResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
similarity index 96%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
index 5ef5032c..02f27182 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserMapper">
 
     <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.UserAdminVo">
         select t1.*,t2.last_login_ip,t2.last_login_time,t2.reg_ip,t2.reg_time
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMemberMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserMemberMapper.xml
index 8eac4de7..09162f02 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMemberMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserMemberMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserMemberMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserMember" id="CaiUserMemberResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserOnlineMapper.xml
similarity index 89%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserOnlineMapper.xml
index a9804f29..4d6a1148 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserOnlineMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserOnlineMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserOnlineMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserOnlineMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserOnline" id="CaiUserOnlineResult">
         <result property="userId" column="user_id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserRiskLogMapper.xml
similarity index 88%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserRiskLogMapper.xml
index 975cbd2e..82a25838 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserRiskLogMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserRiskLogMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserRiskLogMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserRiskLogMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserRiskLog" id="CaiUserRiskLogResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserVisitorMapper.xml
similarity index 94%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/UserVisitorMapper.xml
index 63b2a420..e8e231a0 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserVisitorMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiUserVisitorMapper">
+<mapper namespace="com.ruoyi.cai.mapper.UserVisitorMapper">
 
     <resultMap type="com.ruoyi.cai.domain.UserVisitor" id="CaiUserVisitorResult">
         <result property="id" column="id"/>
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/WithdrawExchangeMapper.xml
similarity index 86%
rename from ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml
rename to ruoyi-cai/src/main/resources/mapper/cai/WithdrawExchangeMapper.xml
index 6ed08bdc..6188d50a 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/CaiWithdrawExchangeMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/WithdrawExchangeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.cai.mapper.CaiWithdrawExchangeMapper">
+<mapper namespace="com.ruoyi.cai.mapper.WithdrawExchangeMapper">
 
     <resultMap type="com.ruoyi.cai.domain.WithdrawExchange" id="CaiWithdrawExchangeResult">
         <result property="id" column="id"/>