From 357f46697818a6f76b11f7ae748736dcf4f5454a Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Wed, 1 Jan 2025 16:19:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReadMe.md | 327 +++++++++++------- .../generator/generator/WebGeneratorCode.java | 2 +- .../exception/AuthCustomerException.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 +- .../bunny/common/service/utils/JwtHelper.java | 2 +- .../common/service/utils/ResponseUtil.java | 2 +- .../service/utils/mail/MailSenderUtil.java | 4 +- .../common/service/utils/minio/MinioUtil.java | 6 +- .../constant/LocalDateTimeConstant.java | 2 +- .../{pojo => }/constant/MinioConstant.java | 2 +- .../constant/RedisUserConstant.java | 2 +- .../dao/{pojo => }/constant/UserConstant.java | 2 +- .../dao/dto/system/user/AdminUserAddDto.java | 2 +- .../user/AdminUserUpdateByLocalUserDto.java | 2 +- .../dao/{common => }/entity/BaseEntity.java | 2 +- .../{common => }/entity/BaseUserEntity.java | 2 +- .../ScheduleExecuteLog.java | 2 +- .../entity/{log => mongo}/UserRequestLog.java | 2 +- .../entity/{ => mysql}/financial/Bill.java | 4 +- .../{ => mysql}/financial/BudgetCategory.java | 4 +- .../{ => mysql}/financial/Category.java | 4 +- .../financial/DebtRepaymentPlan.java | 4 +- .../{ => mysql}/financial/DebtTracking.java | 4 +- .../{ => mysql}/financial/SavingGoal.java | 4 +- .../dao/entity/{ => mysql}/i18n/I18n.java | 4 +- .../dao/entity/{ => mysql}/i18n/I18nType.java | 4 +- .../entity/{ => mysql}/log/UserLoginLog.java | 4 +- .../entity/{ => mysql}/quartz/Schedulers.java | 2 +- .../{ => mysql}/quartz/SchedulersGroup.java | 4 +- .../entity/{ => mysql}/system/AdminUser.java | 4 +- .../dao/entity/{ => mysql}/system/Dept.java | 4 +- .../{ => mysql}/system/EmailTemplate.java | 4 +- .../entity/{ => mysql}/system/EmailUsers.java | 4 +- .../dao/entity/{ => mysql}/system/Files.java | 4 +- .../entity/{ => mysql}/system/MenuIcon.java | 4 +- .../entity/{ => mysql}/system/Message.java | 4 +- .../{ => mysql}/system/MessageReceived.java | 6 +- .../{ => mysql}/system/MessageType.java | 4 +- .../dao/entity/{ => mysql}/system/Power.java | 4 +- .../dao/entity/{ => mysql}/system/Role.java | 4 +- .../entity/{ => mysql}/system/RolePower.java | 4 +- .../dao/entity/{ => mysql}/system/Router.java | 4 +- .../entity/{ => mysql}/system/RouterRole.java | 4 +- .../entity/{ => mysql}/system/UserDept.java | 4 +- .../entity/{ => mysql}/system/UserRole.java | 4 +- .../{pojo => }/enums/EmailTemplateEnums.java | 2 +- .../bunny/dao/{pojo => }/enums/JobEnums.java | 2 +- .../configuration/WebConfiguration.java | 2 +- .../common => model/email}/EmailSend.java | 2 +- .../common => model/email}/EmailSendInit.java | 2 +- .../excel/BillExportExcelByUser.java | 4 +- .../common => model/file}/MinioFilePath.java | 2 +- .../quartz}/ScheduleExecuteLogJson.java | 2 +- .../dao/{view => views}/ViewRolePower.java | 2 +- .../dao/{view => views}/ViewRouterRole.java | 2 +- .../dao/{view => views}/ViewUserDept.java | 4 +- .../bunny/dao/{common => }/vo/BaseUserVo.java | 2 +- .../cn/bunny/dao/{common => }/vo/BaseVo.java | 2 +- .../dao/{common => }/vo/TreeSelectVo.java | 2 +- .../bunny/dao/vo/financial/admin/BillVo.java | 2 +- .../vo/financial/admin/BudgetCategoryVo.java | 2 +- .../dao/vo/financial/admin/CategoryVo.java | 2 +- .../financial/admin/DebtRepaymentPlanVo.java | 2 +- .../vo/financial/admin/DebtTrackingVo.java | 2 +- .../dao/vo/financial/admin/SavingGoalVo.java | 2 +- .../dao/vo/financial/user/BillUserVo.java | 2 +- .../financial/user/BudgetCategoryUserVo.java | 2 +- .../dao/vo/financial/user/CategoryUserVo.java | 2 +- .../user/DebtRepaymentPlanUserVo.java | 2 +- .../vo/financial/user/DebtTrackingUserVo.java | 2 +- .../vo/financial/user/SavingGoalUserVo.java | 2 +- .../expendAndIncome/ExpendWithIncome.java | 2 +- .../java/cn/bunny/dao/vo/i18n/I18nTypeVo.java | 2 +- .../java/cn/bunny/dao/vo/i18n/I18nVo.java | 2 +- .../bunny/dao/vo/log/UserLoginLogLocalVo.java | 2 +- .../cn/bunny/dao/vo/log/UserLoginLogVo.java | 2 +- .../dao/vo/quartz/SchedulersGroupVo.java | 2 +- .../dao/{pojo => vo}/result/PageResult.java | 2 +- .../bunny/dao/{pojo => vo}/result/Result.java | 2 +- .../{pojo => vo}/result/ResultCodeEnum.java | 2 +- .../java/cn/bunny/dao/vo/system/DeptVo.java | 2 +- .../cn/bunny/dao/vo/system/MenuIconVo.java | 2 +- .../dao/vo/system/email/EmailTemplateVo.java | 2 +- .../dao/vo/system/email/EmailUsersVo.java | 2 +- .../bunny/dao/vo/system/files/FileInfoVo.java | 2 +- .../cn/bunny/dao/vo/system/files/FilesVo.java | 2 +- .../vo/system/message/MessageDetailVo.java | 2 +- .../message/MessageReceivedWithMessageVo.java | 2 +- .../dao/vo/system/message/MessageTypeVo.java | 2 +- .../dao/vo/system/message/MessageUserVo.java | 2 +- .../dao/vo/system/message/MessageVo.java | 2 +- .../dao/vo/system/rolePower/PowerVo.java | 2 +- .../bunny/dao/vo/system/rolePower/RoleVo.java | 2 +- .../dao/vo/system/router/RouterManageVo.java | 2 +- .../bunny/dao/vo/system/user/AdminUserVo.java | 2 +- .../cn/bunny/dao/vo/system/user/LoginVo.java | 2 +- .../cn/bunny/dao/vo/system/user/UserVo.java | 2 +- .../bunny/services/aop/AnnotationScanner.java | 2 +- .../cn/bunny/services/aop/JobExecuteAop.java | 8 +- .../bunny/services/aop/UserRequestLogAop.java | 4 +- .../ConfigurationController.java | 6 +- .../configuration/MenuIconController.java | 8 +- .../email/EmailTemplateController.java | 8 +- .../email/EmailUsersController.java | 8 +- .../controller/financial/BillController.java | 8 +- .../financial/BudgetCategoryController.java | 8 +- .../financial/CategoryController.java | 8 +- .../DebtRepaymentPlanController.java | 8 +- .../financial/DebtTrackingController.java | 8 +- .../financial/SavingGoalController.java | 8 +- .../controller/i18n/I18nController.java | 8 +- .../controller/i18n/I18nTypeController.java | 4 +- .../log/ScheduleExecuteLogController.java | 6 +- .../log/UserLoginLogController.java | 8 +- .../log/UserRequestLogController.java | 4 +- .../controller/message/MessageController.java | 8 +- .../message/MessageReceivedController.java | 8 +- .../message/MessageTypeController.java | 8 +- .../schedule/SchedulersController.java | 8 +- .../schedule/SchedulersGroupController.java | 8 +- .../controller/system/DeptController.java | 8 +- .../controller/system/FilesController.java | 10 +- .../controller/system/IndexController.java | 2 +- .../controller/system/PowerController.java | 8 +- .../controller/system/RoleController.java | 8 +- .../system/RolePowerController.java | 2 +- .../controller/system/RouterController.java | 8 +- .../system/RouterRoleController.java | 2 +- .../controller/system/UserController.java | 8 +- .../controller/system/UserRoleController.java | 2 +- .../bunny/services/excel/BillAddUserDAO.java | 4 +- .../services/excel/BillAddUserListener.java | 4 +- .../bunny/services/factory/BillFactory.java | 10 +- .../bunny/services/factory/EmailFactory.java | 10 +- .../bunny/services/factory/RoleFactory.java | 4 +- .../bunny/services/factory/UserFactory.java | 14 +- .../mapper/configuration/MenuIconMapper.java | 2 +- .../mapper/email/EmailTemplateMapper.java | 2 +- .../mapper/email/EmailUsersMapper.java | 2 +- .../services/mapper/financial/BillMapper.java | 2 +- .../financial/BudgetCategoryMapper.java | 2 +- .../mapper/financial/CategoryMapper.java | 2 +- .../financial/DebtRepaymentPlanMapper.java | 2 +- .../mapper/financial/DebtTrackingMapper.java | 2 +- .../mapper/financial/SavingGoalMapper.java | 2 +- .../services/mapper/i18n/I18nMapper.java | 2 +- .../services/mapper/i18n/I18nTypeMapper.java | 2 +- .../mapper/message/MessageMapper.java | 2 +- .../mapper/message/MessageReceivedMapper.java | 4 +- .../mapper/message/MessageTypeMapper.java | 2 +- .../schedule/SchedulersGroupMapper.java | 2 +- .../mapper/schedule/SchedulersMapper.java | 2 +- .../services/mapper/system/DeptMapper.java | 2 +- .../services/mapper/system/FilesMapper.java | 2 +- .../services/mapper/system/PowerMapper.java | 2 +- .../services/mapper/system/RoleMapper.java | 2 +- .../mapper/system/RolePowerMapper.java | 4 +- .../services/mapper/system/RouterMapper.java | 2 +- .../mapper/system/RouterRoleMapper.java | 4 +- .../mapper/system/UserDeptMapper.java | 2 +- .../mapper/system/UserLoginLogMapper.java | 2 +- .../services/mapper/system/UserMapper.java | 4 +- .../mapper/system/UserRoleMapper.java | 2 +- .../ScheduleExecuteLogRepository.java | 2 +- .../repository/UserRequestLogRepository.java | 2 +- .../custom/CustomAuthenticationException.java | 2 +- .../security/custom/CustomCheckIsAdmin.java | 2 +- .../services/security/custom/CustomUser.java | 2 +- .../filter/TokenLoginFilterService.java | 6 +- .../handelr/SecurityAccessDeniedHandler.java | 4 +- .../SecurityAuthenticationEntryPoint.java | 4 +- .../SecurityAuthenticationFailureHandler.java | 2 +- .../SecurityAuthenticationSuccessHandler.java | 2 +- ...CustomAuthorizationManagerServiceImpl.java | 8 +- .../impl/CustomUserDetailsServiceImpl.java | 6 +- .../configuration/ConfigurationService.java | 2 +- .../configuration/MenuIconService.java | 4 +- .../impl/ConfigurationServiceImpl.java | 4 +- .../impl/MenuIconServiceImpl.java | 6 +- .../service/email/EmailTemplateService.java | 4 +- .../service/email/EmailUsersService.java | 4 +- .../email/impl/EmailTemplateServiceImpl.java | 8 +- .../email/impl/EmailUsersServiceImpl.java | 6 +- .../service/financial/BillService.java | 4 +- .../financial/BudgetCategoryService.java | 4 +- .../service/financial/CategoryService.java | 4 +- .../financial/DebtRepaymentPlanService.java | 4 +- .../financial/DebtTrackingService.java | 4 +- .../service/financial/SavingGoalService.java | 4 +- .../financial/impl/BillServiceImpl.java | 12 +- .../impl/BudgetCategoryServiceImpl.java | 6 +- .../financial/impl/CategoryServiceImpl.java | 8 +- .../impl/DebtRepaymentPlanServiceImpl.java | 6 +- .../impl/DebtTrackingServiceImpl.java | 6 +- .../financial/impl/SavingGoalServiceImpl.java | 6 +- .../services/service/i18n/I18nService.java | 4 +- .../service/i18n/I18nTypeService.java | 2 +- .../service/i18n/impl/I18nServiceImpl.java | 8 +- .../i18n/impl/I18nTypeServiceImpl.java | 4 +- .../log/ScheduleExecuteLogService.java | 2 +- .../service/log/UserLoginLogService.java | 4 +- .../service/log/UserRequestLogService.java | 2 +- .../impl/ScheduleExecuteLogServiceImpl.java | 4 +- .../log/impl/UserLoginLogServiceImpl.java | 4 +- .../log/impl/UserRequestLogServiceImpl.java | 4 +- .../message/MessageReceivedService.java | 6 +- .../service/message/MessageService.java | 4 +- .../service/message/MessageTypeService.java | 4 +- .../impl/MessageReceivedServiceImpl.java | 8 +- .../message/impl/MessageServiceImpl.java | 10 +- .../message/impl/MessageTypeServiceImpl.java | 4 +- .../schedule/SchedulersGroupService.java | 4 +- .../service/schedule/SchedulersService.java | 4 +- .../impl/SchedulersGroupServiceImpl.java | 4 +- .../schedule/impl/SchedulersServiceImpl.java | 6 +- .../services/service/system/DeptService.java | 4 +- .../services/service/system/FilesService.java | 4 +- .../services/service/system/PowerService.java | 4 +- .../service/system/RolePowerService.java | 2 +- .../services/service/system/RoleService.java | 4 +- .../service/system/RouterRoleService.java | 2 +- .../service/system/RouterService.java | 4 +- .../service/system/UserDeptService.java | 2 +- .../service/system/UserRoleService.java | 2 +- .../services/service/system/UserService.java | 4 +- .../service/system/impl/DeptServiceImpl.java | 6 +- .../service/system/impl/FilesServiceImpl.java | 10 +- .../service/system/impl/PowerServiceImpl.java | 6 +- .../system/impl/RolePowerServiceImpl.java | 6 +- .../service/system/impl/RoleServiceImpl.java | 8 +- .../system/impl/RouterRoleServiceImpl.java | 4 +- .../system/impl/RouterServiceImpl.java | 12 +- .../system/impl/UserDeptServiceImpl.java | 2 +- .../system/impl/UserRoleServiceImpl.java | 8 +- .../service/system/impl/UserServiceImpl.java | 22 +- .../mapper/configuration/MenuIconMapper.xml | 2 +- .../mapper/email/EmailTemplateMapper.xml | 2 +- .../mapper/email/EmailUsersMapper.xml | 2 +- .../resources/mapper/financial/BillMapper.xml | 2 +- .../mapper/financial/BudgetCategoryMapper.xml | 2 +- .../mapper/financial/CategoryMapper.xml | 2 +- .../financial/DebtRepaymentPlanMapper.xml | 2 +- .../mapper/financial/DebtTrackingMapper.xml | 2 +- .../mapper/financial/SavingGoalMapper.xml | 2 +- .../main/resources/mapper/i18n/I18nMapper.xml | 2 +- .../resources/mapper/i18n/I18nTypeMapper.xml | 4 +- .../mapper/message/MessageMapper.xml | 2 +- .../mapper/message/MessageReceivedMapper.xml | 2 +- .../mapper/message/MessageTypeMapper.xml | 2 +- .../mapper/schedule/SchedulersGroupMapper.xml | 2 +- .../mapper/schedule/SchedulersMapper.xml | 4 +- .../resources/mapper/system/DeptMapper.xml | 2 +- .../resources/mapper/system/FilesMapper.xml | 2 +- .../resources/mapper/system/PowerMapper.xml | 4 +- .../resources/mapper/system/RoleMapper.xml | 6 +- .../mapper/system/RolePowerMapper.xml | 6 +- .../resources/mapper/system/RouterMapper.xml | 4 +- .../mapper/system/RouterRoleMapper.xml | 4 +- .../mapper/system/UserDeptMapper.xml | 2 +- .../mapper/system/UserLoginLogMapper.xml | 4 +- .../resources/mapper/system/UserMapper.xml | 6 +- .../mapper/system/UserRoleMapper.xml | 2 +- .../java/cn/bunny/services/EnumsTest.java | 2 +- .../quartz/MailBillReportByWeekTest.java | 8 +- .../financial/impl/BillServiceImplTest.java | 10 +- .../impl/UserRequestLogServiceImplTest.java | 2 +- 266 files changed, 726 insertions(+), 643 deletions(-) rename dao/src/main/java/cn/bunny/dao/{pojo => }/constant/LocalDateTimeConstant.java (91%) rename dao/src/main/java/cn/bunny/dao/{pojo => }/constant/MinioConstant.java (96%) rename dao/src/main/java/cn/bunny/dao/{pojo => }/constant/RedisUserConstant.java (96%) rename dao/src/main/java/cn/bunny/dao/{pojo => }/constant/UserConstant.java (91%) rename dao/src/main/java/cn/bunny/dao/{common => }/entity/BaseEntity.java (97%) rename dao/src/main/java/cn/bunny/dao/{common => }/entity/BaseUserEntity.java (93%) rename dao/src/main/java/cn/bunny/dao/entity/{log/schedule => mongo}/ScheduleExecuteLog.java (97%) rename dao/src/main/java/cn/bunny/dao/entity/{log => mongo}/UserRequestLog.java (97%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/financial/Bill.java (92%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/financial/BudgetCategory.java (94%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/financial/Category.java (89%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/financial/DebtRepaymentPlan.java (93%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/financial/DebtTracking.java (92%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/financial/SavingGoal.java (93%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/i18n/I18n.java (90%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/i18n/I18nType.java (90%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/log/UserLoginLog.java (93%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/quartz/Schedulers.java (96%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/quartz/SchedulersGroup.java (89%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/AdminUser.java (95%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/Dept.java (90%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/EmailTemplate.java (92%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/EmailUsers.java (92%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/Files.java (92%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/MenuIcon.java (88%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/Message.java (93%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/MessageReceived.java (89%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/MessageType.java (91%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/Power.java (88%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/Role.java (86%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/RolePower.java (88%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/Router.java (94%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/RouterRole.java (87%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/UserDept.java (88%) rename dao/src/main/java/cn/bunny/dao/entity/{ => mysql}/system/UserRole.java (86%) rename dao/src/main/java/cn/bunny/dao/{pojo => }/enums/EmailTemplateEnums.java (94%) rename dao/src/main/java/cn/bunny/dao/{pojo => }/enums/JobEnums.java (92%) rename dao/src/main/java/cn/bunny/dao/{entity => model}/configuration/WebConfiguration.java (99%) rename dao/src/main/java/cn/bunny/dao/{pojo/common => model/email}/EmailSend.java (97%) rename dao/src/main/java/cn/bunny/dao/{pojo/common => model/email}/EmailSendInit.java (97%) rename dao/src/main/java/cn/bunny/dao/{ => model}/excel/BillExportExcelByUser.java (96%) rename dao/src/main/java/cn/bunny/dao/{pojo/common => model/file}/MinioFilePath.java (91%) rename dao/src/main/java/cn/bunny/dao/{entity/log/schedule => model/quartz}/ScheduleExecuteLogJson.java (95%) rename dao/src/main/java/cn/bunny/dao/{view => views}/ViewRolePower.java (97%) rename dao/src/main/java/cn/bunny/dao/{view => views}/ViewRouterRole.java (98%) rename dao/src/main/java/cn/bunny/dao/{view => views}/ViewUserDept.java (95%) rename dao/src/main/java/cn/bunny/dao/{common => }/vo/BaseUserVo.java (94%) rename dao/src/main/java/cn/bunny/dao/{common => }/vo/BaseVo.java (98%) rename dao/src/main/java/cn/bunny/dao/{common => }/vo/TreeSelectVo.java (97%) rename dao/src/main/java/cn/bunny/dao/{pojo => vo}/result/PageResult.java (95%) rename dao/src/main/java/cn/bunny/dao/{pojo => vo}/result/Result.java (99%) rename dao/src/main/java/cn/bunny/dao/{pojo => vo}/result/ResultCodeEnum.java (99%) diff --git a/ReadMe.md b/ReadMe.md index 6819f37..d432f5c 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,181 +1,264 @@ -# 项目预览 +# 环境搭建 -不知道为什么，图床用的使自己的，Gitee就是不显示其它GitHub和Gitea都能显示就Gitee显示不出来 - -或者把项目clone下来看也可以 - -**线上地址** - -- 正式线上预览地址：http://111.229.137.235/#/welcome - -- 测试预览地址：http://106.15.251.123/#/welcome - - 服务器到期时间：12月30日 - -**Github地址** - -- [前端地址](https://github.com/BunnyMaster/bunny-admin-web.git) -- [后端地址](https://github.com/BunnyMaster/bunny-admin-server) - -**Gitee地址** - -- [前端地址](https://gitee.com/BunnyBoss/bunny-admin-web) -- [后端地址](https://gitee.com/BunnyBoss/bunny-admin-server) - -## 环境搭建 - -### 安装docker内容 - -如果使用是centos或者是rocky +## Ubuntu环境搭建 ```shell -# 更新yum 和 dnf -yum update -y -dnf update -y - -# 安装必要依赖 -yum install -y yum-utils device-mapper-persistent-data lvm2 - -# 设置镜像源 -sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo -yum list docker-ce --showduplicates | sort -r - +sudo apt-get remove docker docker-engine docker.io containerd runc +sudo apt update +sudo apt upgrade +sudo apt-get install ca-certificates curl gnupg lsb-release +# 添加Docker官方GPG密钥 +sudo curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository "deb [arch=amd64] http://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable" # 安装docker -yum -y install docker-ce.x86_64 - -# 开机启动docker -systemctl enable docker -systemctl start docker +sudo apt-get install docker-ce docker-ce-cli containerd.io +# 默认情况下，只有root用户和docker组的用户才能运行Docker命令。我们可以将当前用户添加到docker组，以避免每次使用Docker时都需要使用sudo，设置完成后退出当前用户之后再进入既可 +sudo usermod -aG docker $USER +# 运行docker +sudo systemctl start docker +# 安装工具 +sudo apt-get -y install apt-transport-https ca-certificates curl software-properties-common +# 重启docker +sudo service docker restart ``` -### 安装Redis +> 避免每次操作都要输入`sudo` +> +> ```bash +> # 创建分组一般 +> sudo groupadd docker +> # 将当前用户添加到分组 +> sudo usermod -aG docker $USER +> # 重启终端生效 +> exit +> ``` -#### 编写配置文件 +### 配置Ubuntu静态IP地址 -```sh -mkdir /bunny/docker_data/my_redis/ -p -vim /bunny/docker_data/my_redis/redis.conf +打开配置文件 + +```bash +sudo vim /etc/netplan/00-installer-config.yaml ``` -**添加以下内容** +修改配置文件 -有注释大概率启动不了 - -``` -# bind 127.0.0.1 #注释掉这部分，使redis可以外部访问 -daemonize no #用守护线程的方式启动 -requirepass 123456 -appendonly yes #redis持久化　　默认是no -tcp-keepalive 300 #防止出现远程主机强迫关闭了一个现有的连接的错误 默认是300 +```yaml +network: + ethernets: + ens33: + dhcp4: false + addresses: [192.168.3.130/24] + optional: true + routes: + - to: default + via: 192.168.3.1 + nameservers: + addresses: [8.8.8.8] + version: 2 ``` -**删除注释** +应用配置 +```bash +sudo netplan apply +sudo reboot ``` -daemonize no + +## 安装docker内容 + +```bash +sudo mkdir /etc/docker +sudo touch /etc/docker/daemon.json +sudo chmod 777 /etc/docker/daemon.json +sudo vim /etc/docker/daemon.json +``` + +**必要的 deaemon.json** + +```json +{ + "registry-mirrors": [ + "https:\/\/jockerhub.com", + "https://dockerhub.icu", + "https://docker.1panel.live", + "https://gwsg6nw9.mirror.aliyuncs.com", + "https://registry.docker-cn.com", + "http://hub-mirror.c.163.com", + "http://f1361db2.m.daocloud.io", + "https://mirror.ccs.tencentyun.com", + "https://phtv51hj.mirror.aliyuncs.com", + "https://gwsg6nw9.mirror.aliyuncs.com" + ] +} +``` + +重启docker + +```bash +sudo systemctl restart docker.socket +``` + +## 安装Redis + +配置文件创建 + +```bash +mkdir ~/docker/docker_data/redis_master/ -p +vim ~/docker/docker_data/redis_master/redis.conf +``` + +Redis配置文件 + +```properties +daemonize no requirepass 123456 appendonly yes tcp-keepalive 300 ``` -#### 启动Redis +安装Redis镜像 -```sh -docker pull redis:7.0.10 +```bash docker run -p 6379:6379 --name redis_master \ --v /bunny/docker_data/redis_master/redis.conf:/etc/redis/redis.conf \ --v/bunny/docker_data/redis_master/data:/data \ +-v ~/docker/docker_data/redis_master/redis.conf:/etc/redis/redis.conf \ +-v ~/docker/docker_data/redis_master/data:/data \ --restart=always -d redis:7.0.10 --appendonly yes ``` -### 安装Minio +## 安装Minio -```sh +```bash docker run -d \ -p 9000:9000 \ -p 9090:9090 \ --name minio_master --restart=always \ - -v /bunny/docker/minio/data:/data \ + -v ~/docker/docker_data/minio/data:/data \ -e "MINIO_ROOT_USER=bunny" \ -e "MINIO_ROOT_PASSWORD=02120212" \ minio/minio server /data --console-address ":9090" ``` -### 安装MySQL +## 安装MySQL -**设置开机启动** +```bash +# 创建3306配置文件 +sudo mkdir -p ~/docker/docker_data/mysql/mysql_master/etc +sudo vim ~/docker/docker_data/mysql/mysql_master/etc/my.cnf +``` -**执行启动3306：** +**my.cnf 配置** -```sh -docker stop master -docker rm master +```mysql +[mysqld] +skip-host-cache +skip-name-resolve +secure-file-priv=/var/lib/mysql-files +user=mysql -docker run --name master -p 3306:3306 \ --v /bunny/docker_data/mysql/master/etc/my.cnf:/etc/my.cnf \ --v /bunny/docker_data/mysql/master/data:/var/lib/mysql \ +# 设置字符集 +character-set-server=utf8mb4 +collation-server=utf8mb4_unicode_ci + +# 设置服务器ID（如果是复制集群，确保每个节点的ID唯一） +server-id=1 + +# 启用二进制日志 +log-bin=mysql-bin + +# 设置表名不区分大小写 +lower_case_table_names = 1 +``` + +**启动MySQL** + +```bash +docker stop mysql_master +docker rm mysql_master + +docker run --name mysql_master -p 3306:3306 \ +-v ~/docker/docker_data/mysql/mysql_master/etc/my.cnf:/etc/my.cnf \ +-v ~/docker/docker_data/mysql/mysql_master/data:/var/lib/mysql \ +-v ~/docker/docker_data/mysql/mysql_master/backup:/backup \ --restart=always --privileged=true \ - -e MYSQL_ROOT_PASSWORD=02120212 \ + -e MYSQL_ROOT_PASSWORD=123456 \ -e TZ=Asia/Shanghai \ mysql:8.0.33 --lower-case-table-names=1 ``` -**执行启动3304：** +## 安装MongoDB -其中有创建备份目录 - -```shell -docker stop slave_3304 -docker rm slave_3304 - -docker run --name slave_3304 -p 3304:3306 \ - -v /bunny/docker_data/mysql/slave_3304/etc/my.cnf:/etc/my.cnf \ - -v /bunny/docker_data/mysql/slave_3304/data:/var/lib/mysql \ - -v /bunny/docker_data/mysql/slave_3304/backup:\ - --restart=always --privileged=true \ - -e MYSQL_ROOT_PASSWORD=02120212 \ - -e TZ=Asia/Shanghai \ - mysql:8.0.33 --lower-case-table-names=1 -``` - -**修改密码：** +### 创建数据库 ```sh -docker exec -it mysql_master /bin/bash -mysql -uroot -p02120212 -use mysql -ALTER USER 'root'@'%' IDENTIFIED BY "02120212"; -FLUSH PRIVILEGES; +docker stop mongodb +docker rm mongodb + +docker run -it \ + --name mongodb \ + --restart=always \ + --privileged \ + -p 27017:27017 \ + -v ~/docker/docker_data/mongo/data:/data/db \ + -v ~/docker/docker_data/mongo/conf:/data/configdb \ + -v ~/docker/docker_data/mongo/logs:/data/log/ \ + -d mongo:latest \ + -f /data/configdb/mongod.conf ``` -> my.cnf 配置 +> 需要设置权限 > -> ```sql -> [mysqld] -> skip-host-cache -> skip-name-resolve -> secure-file-priv=/var/lib/mysql-files -> user=mysql +> ``` +> mkdir -p ~/docker/docker_data/mongo/conf +> mkdir -p ~/docker/docker_data/mongo/logs +> chmod 777 ~/docker/docker_data/mongo/logs +> chmod 777 ~/docker/docker_data/mongo/conf > -> # 设置字符集 -> character-set-server=utf8mb4 -> collation-server=utf8mb4_unicode_ci -> -> # 设置服务器ID（如果是复制集群，确保每个节点的ID唯一） -> server-id=1 -> -> # 启用二进制日志 -> log-bin=mysql-bin -> -> # 设置表名不区分大小写 -> lower_case_table_names = 1 +> cd ~/docker/docker_data/mongo/logs +> touch mongod.log +> chmod 777 mongod.log > +> cd ~/docker/docker_data/mongo/conf +> vim mongod.conf > ``` -### 数据库文件 +### 配置文件 -在后端文件的根目录中 +```properties +# 数据库文件存储位置 +dbpath = /data/db +# log文件存储位置 +logpath = /data/log/mongod.log +# 使用追加的方式写日志 +logappend = true +# 是否以守护进程方式运行 +# fork = true +# 全部ip可以访问 +bind_ip = 0.0.0.0 +# 端口号 +port = 27017 +# 是否启用认证 +auth = true +# 设置oplog的大小(MB) +oplogSize=2048 +``` -![image-20241107133345299](http://116.196.101.14:9000/docs/image-20241107133345299.png) +### 设置账户密码 + +```sh +#进入容器 +docker exec -it mongodb /bin/bash + +#进入mongodb shell +mongosh --port 27017 + +#切换到admin库 +use admin + +#创建账号/密码 +db.createUser({ user: 'admin', pwd: '02120212', roles: [ { role: "root", db: "admin" } ] }); +# db.createUser({ user: 'admin', pwd: '123456', roles: [ { role: "userAdminAnyDatabase", db: "admin" } ] }); +``` # 项目特点 diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java index 55a66e4..e85710e 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java @@ -6,7 +6,7 @@ import cn.bunny.common.generator.utils.GeneratorCodeUtils; import cn.bunny.dao.dto.financial.bill.BillDto; import cn.bunny.dao.dto.financial.bill.admin.BillAddDto; import cn.bunny.dao.dto.financial.bill.admin.BillUpdateDto; -import cn.bunny.dao.entity.financial.Bill; +import cn.bunny.dao.entity.mysql.financial.Bill; import cn.bunny.dao.vo.financial.admin.BillVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java b/common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java index 2d9f719..691360c 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/exception/AuthCustomerException.java @@ -1,6 +1,6 @@ package cn.bunny.common.service.exception; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java index 293b605..b3cd0bf 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/exception/GlobalExceptionHandler.java @@ -2,8 +2,8 @@ package cn.bunny.common.service.exception; import cn.bunny.common.service.context.BaseContext; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java index f331bdf..e6160b5 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/JwtHelper.java @@ -1,7 +1,7 @@ package cn.bunny.common.service.utils; import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.ResultCodeEnum; import io.jsonwebtoken.*; import io.micrometer.common.lang.Nullable; import org.springframework.util.StringUtils; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java index 99a8d2e..58048b9 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/ResponseUtil.java @@ -1,6 +1,6 @@ package cn.bunny.common.service.utils; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.servlet.http.HttpServletResponse; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java index 9aed3d4..2ef8a03 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/mail/MailSenderUtil.java @@ -1,7 +1,7 @@ package cn.bunny.common.service.utils.mail; -import cn.bunny.dao.pojo.common.EmailSend; -import cn.bunny.dao.pojo.common.EmailSendInit; +import cn.bunny.dao.model.email.EmailSend; +import cn.bunny.dao.model.email.EmailSendInit; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.jetbrains.annotations.NotNull; diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java b/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java index 3293eee..9644517 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/utils/minio/MinioUtil.java @@ -1,9 +1,9 @@ package cn.bunny.common.service.utils.minio; import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.dao.pojo.common.MinioFilePath; -import cn.bunny.dao.pojo.constant.MinioConstant; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.constant.MinioConstant; +import cn.bunny.dao.model.file.MinioFilePath; +import cn.bunny.dao.vo.result.ResultCodeEnum; import io.minio.*; import io.minio.messages.DeleteError; import io.minio.messages.DeleteObject; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/constant/LocalDateTimeConstant.java b/dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/pojo/constant/LocalDateTimeConstant.java rename to dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java index 5ce334d..158a036 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/constant/LocalDateTimeConstant.java +++ b/dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.constant; +package cn.bunny.dao.constant; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/constant/MinioConstant.java b/dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/pojo/constant/MinioConstant.java rename to dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java index 4fff73a..21dd2c5 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/constant/MinioConstant.java +++ b/dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.constant; +package cn.bunny.dao.constant; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java b/dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java rename to dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java index 5451ead..a0f8e4d 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/constant/RedisUserConstant.java +++ b/dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.constant; +package cn.bunny.dao.constant; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/constant/UserConstant.java b/dao/src/main/java/cn/bunny/dao/constant/UserConstant.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/pojo/constant/UserConstant.java rename to dao/src/main/java/cn/bunny/dao/constant/UserConstant.java index 2fe60d0..343fb14 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/constant/UserConstant.java +++ b/dao/src/main/java/cn/bunny/dao/constant/UserConstant.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.constant; +package cn.bunny.dao.constant; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserAddDto.java index baf15f1..024f679 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserAddDto.java @@ -1,6 +1,6 @@ package cn.bunny.dao.dto.system.user; -import cn.bunny.dao.pojo.constant.UserConstant; +import cn.bunny.dao.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserUpdateByLocalUserDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserUpdateByLocalUserDto.java index 09349bc..cf56894 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserUpdateByLocalUserDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/user/AdminUserUpdateByLocalUserDto.java @@ -1,6 +1,6 @@ package cn.bunny.dao.dto.system.user; -import cn.bunny.dao.pojo.constant.UserConstant; +import cn.bunny.dao.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/dao/src/main/java/cn/bunny/dao/common/entity/BaseEntity.java b/dao/src/main/java/cn/bunny/dao/entity/BaseEntity.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/common/entity/BaseEntity.java rename to dao/src/main/java/cn/bunny/dao/entity/BaseEntity.java index b557de8..fb1f0ed 100644 --- a/dao/src/main/java/cn/bunny/dao/common/entity/BaseEntity.java +++ b/dao/src/main/java/cn/bunny/dao/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.common.entity; +package cn.bunny.dao.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/dao/src/main/java/cn/bunny/dao/common/entity/BaseUserEntity.java b/dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/common/entity/BaseUserEntity.java rename to dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java index 4adf13f..da9de85 100644 --- a/dao/src/main/java/cn/bunny/dao/common/entity/BaseUserEntity.java +++ b/dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.common.entity; +package cn.bunny.dao.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/entity/log/schedule/ScheduleExecuteLog.java b/dao/src/main/java/cn/bunny/dao/entity/mongo/ScheduleExecuteLog.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/entity/log/schedule/ScheduleExecuteLog.java rename to dao/src/main/java/cn/bunny/dao/entity/mongo/ScheduleExecuteLog.java index c359f01..5837849 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/schedule/ScheduleExecuteLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mongo/ScheduleExecuteLog.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.log.schedule; +package cn.bunny.dao.entity.mongo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/log/UserRequestLog.java b/dao/src/main/java/cn/bunny/dao/entity/mongo/UserRequestLog.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/entity/log/UserRequestLog.java rename to dao/src/main/java/cn/bunny/dao/entity/mongo/UserRequestLog.java index 0f3c81b..ec73f16 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/UserRequestLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mongo/UserRequestLog.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.log; +package cn.bunny.dao.entity.mongo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/Bill.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/Bill.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/entity/financial/Bill.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/financial/Bill.java index b608363..855af5f 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/Bill.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/Bill.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.financial; +package cn.bunny.dao.entity.mysql.financial; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/BudgetCategory.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/financial/BudgetCategory.java index 6fcef93..9069958 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/BudgetCategory.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/BudgetCategory.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.financial; +package cn.bunny.dao.entity.mysql.financial; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/Category.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/Category.java similarity index 89% rename from dao/src/main/java/cn/bunny/dao/entity/financial/Category.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/financial/Category.java index 495df45..094821a 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/Category.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/Category.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.financial; +package cn.bunny.dao.entity.mysql.financial; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/DebtRepaymentPlan.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/financial/DebtRepaymentPlan.java index fe28fbe..d74150f 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtRepaymentPlan.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/DebtRepaymentPlan.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.financial; +package cn.bunny.dao.entity.mysql.financial; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/DebtTracking.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/financial/DebtTracking.java index 6aad05a..be93dc5 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/DebtTracking.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/DebtTracking.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.financial; +package cn.bunny.dao.entity.mysql.financial; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/SavingGoal.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/financial/SavingGoal.java index ad9e0e4..60c1e7f 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/financial/SavingGoal.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/financial/SavingGoal.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.financial; +package cn.bunny.dao.entity.mysql.financial; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/i18n/I18n.java similarity index 90% rename from dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/i18n/I18n.java index 8e2618d..bb01230 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/i18n/I18n.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.i18n; +package cn.bunny.dao.entity.mysql.i18n; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/i18n/I18nType.java similarity index 90% rename from dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/i18n/I18nType.java index ae799a8..e8ee2c9 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/i18n/I18nType.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.i18n; +package cn.bunny.dao.entity.mysql.i18n; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/log/UserLoginLog.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/log/UserLoginLog.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/entity/log/UserLoginLog.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/log/UserLoginLog.java index 72ec509..d46705c 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/UserLoginLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/log/UserLoginLog.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.log; +package cn.bunny.dao.entity.mysql.log; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/quartz/Schedulers.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/quartz/Schedulers.java index 994d4e2..ec9bdef 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/quartz/Schedulers.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/quartz/Schedulers.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.quartz; +package cn.bunny.dao.entity.mysql.quartz; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/quartz/SchedulersGroup.java similarity index 89% rename from dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/quartz/SchedulersGroup.java index b5a078d..04fce29 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/quartz/SchedulersGroup.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.quartz; +package cn.bunny.dao.entity.mysql.quartz; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/AdminUser.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/AdminUser.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/entity/system/AdminUser.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/AdminUser.java index e7fe948..2e1884e 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/AdminUser.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/AdminUser.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Dept.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Dept.java similarity index 90% rename from dao/src/main/java/cn/bunny/dao/entity/system/Dept.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/Dept.java index 903fde5..4657a6b 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Dept.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Dept.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/EmailTemplate.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/EmailTemplate.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/entity/system/EmailTemplate.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/EmailTemplate.java index 6cb103c..8e1f5ba 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/EmailTemplate.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/EmailTemplate.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/EmailUsers.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/EmailUsers.java index c3820aa..0319078 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/EmailUsers.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Files.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Files.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/entity/system/Files.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/Files.java index f242ee7..69f0ceb 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Files.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Files.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/MenuIcon.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/MenuIcon.java similarity index 88% rename from dao/src/main/java/cn/bunny/dao/entity/system/MenuIcon.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/MenuIcon.java index f742dbf..72e4bdf 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/MenuIcon.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/MenuIcon.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Message.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Message.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/entity/system/Message.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/Message.java index 6164a69..8503783 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Message.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Message.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/MessageReceived.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/MessageReceived.java similarity index 89% rename from dao/src/main/java/cn/bunny/dao/entity/system/MessageReceived.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/MessageReceived.java index 5e830bc..902a115 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/MessageReceived.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/MessageReceived.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @@ -30,5 +30,5 @@ public class MessageReceived extends BaseEntity { @Schema(name = "status", title = "0:未读 1:已读") private Boolean status; - + } diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/MessageType.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/MessageType.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/entity/system/MessageType.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/MessageType.java index 056116a..9bbbfa8 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/MessageType.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/MessageType.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Power.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Power.java similarity index 88% rename from dao/src/main/java/cn/bunny/dao/entity/system/Power.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/Power.java index 7bdf3eb..b7b4965 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Power.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Power.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Role.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Role.java similarity index 86% rename from dao/src/main/java/cn/bunny/dao/entity/system/Role.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/Role.java index 0da330a..9aa396e 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Role.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Role.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/RolePower.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/RolePower.java similarity index 88% rename from dao/src/main/java/cn/bunny/dao/entity/system/RolePower.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/RolePower.java index 05e9005..6074438 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/RolePower.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/RolePower.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Router.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Router.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/entity/system/Router.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/Router.java index c0525ef..202038f 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Router.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/Router.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/RouterRole.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/RouterRole.java similarity index 87% rename from dao/src/main/java/cn/bunny/dao/entity/system/RouterRole.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/RouterRole.java index 53fb062..c05911b 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/RouterRole.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/RouterRole.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/UserDept.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/UserDept.java similarity index 88% rename from dao/src/main/java/cn/bunny/dao/entity/system/UserDept.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/UserDept.java index a1d4c62..9ac2351 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/UserDept.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/UserDept.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/UserRole.java b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/UserRole.java similarity index 86% rename from dao/src/main/java/cn/bunny/dao/entity/system/UserRole.java rename to dao/src/main/java/cn/bunny/dao/entity/mysql/system/UserRole.java index 08f7150..4f5eec3 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/UserRole.java +++ b/dao/src/main/java/cn/bunny/dao/entity/mysql/system/UserRole.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.entity.system; +package cn.bunny.dao.entity.mysql.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/enums/EmailTemplateEnums.java b/dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/pojo/enums/EmailTemplateEnums.java rename to dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java index 622ec64..2d4d27c 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/enums/EmailTemplateEnums.java +++ b/dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.enums; +package cn.bunny.dao.enums; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/enums/JobEnums.java b/dao/src/main/java/cn/bunny/dao/enums/JobEnums.java similarity index 92% rename from dao/src/main/java/cn/bunny/dao/pojo/enums/JobEnums.java rename to dao/src/main/java/cn/bunny/dao/enums/JobEnums.java index 94c3259..370c704 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/enums/JobEnums.java +++ b/dao/src/main/java/cn/bunny/dao/enums/JobEnums.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.enums; +package cn.bunny.dao.enums; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/entity/configuration/WebConfiguration.java b/dao/src/main/java/cn/bunny/dao/model/configuration/WebConfiguration.java similarity index 99% rename from dao/src/main/java/cn/bunny/dao/entity/configuration/WebConfiguration.java rename to dao/src/main/java/cn/bunny/dao/model/configuration/WebConfiguration.java index 95db1de..3be0a35 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/configuration/WebConfiguration.java +++ b/dao/src/main/java/cn/bunny/dao/model/configuration/WebConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.configuration; +package cn.bunny.dao.model.configuration; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java b/dao/src/main/java/cn/bunny/dao/model/email/EmailSend.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java rename to dao/src/main/java/cn/bunny/dao/model/email/EmailSend.java index 8fd3da5..5e23885 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSend.java +++ b/dao/src/main/java/cn/bunny/dao/model/email/EmailSend.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.common; +package cn.bunny.dao.model.email; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java b/dao/src/main/java/cn/bunny/dao/model/email/EmailSendInit.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java rename to dao/src/main/java/cn/bunny/dao/model/email/EmailSendInit.java index d18b7fb..5bdaee7 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/common/EmailSendInit.java +++ b/dao/src/main/java/cn/bunny/dao/model/email/EmailSendInit.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.common; +package cn.bunny.dao.model.email; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/excel/BillExportExcelByUser.java b/dao/src/main/java/cn/bunny/dao/model/excel/BillExportExcelByUser.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/excel/BillExportExcelByUser.java rename to dao/src/main/java/cn/bunny/dao/model/excel/BillExportExcelByUser.java index 23094b1..2ea2bbd 100644 --- a/dao/src/main/java/cn/bunny/dao/excel/BillExportExcelByUser.java +++ b/dao/src/main/java/cn/bunny/dao/model/excel/BillExportExcelByUser.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.excel; +package cn.bunny.dao.model.excel; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/common/MinioFilePath.java b/dao/src/main/java/cn/bunny/dao/model/file/MinioFilePath.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/pojo/common/MinioFilePath.java rename to dao/src/main/java/cn/bunny/dao/model/file/MinioFilePath.java index 87e7d0b..3f73b72 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/common/MinioFilePath.java +++ b/dao/src/main/java/cn/bunny/dao/model/file/MinioFilePath.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.common; +package cn.bunny.dao.model.file; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/dao/src/main/java/cn/bunny/dao/entity/log/schedule/ScheduleExecuteLogJson.java b/dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/entity/log/schedule/ScheduleExecuteLogJson.java rename to dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java index 2e3468f..dab7c55 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/schedule/ScheduleExecuteLogJson.java +++ b/dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.log.schedule; +package cn.bunny.dao.model.quartz; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/view/ViewRolePower.java b/dao/src/main/java/cn/bunny/dao/views/ViewRolePower.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/view/ViewRolePower.java rename to dao/src/main/java/cn/bunny/dao/views/ViewRolePower.java index c599277..2c82eaa 100644 --- a/dao/src/main/java/cn/bunny/dao/view/ViewRolePower.java +++ b/dao/src/main/java/cn/bunny/dao/views/ViewRolePower.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.view; +package cn.bunny.dao.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/dao/view/ViewRouterRole.java b/dao/src/main/java/cn/bunny/dao/views/ViewRouterRole.java similarity index 98% rename from dao/src/main/java/cn/bunny/dao/view/ViewRouterRole.java rename to dao/src/main/java/cn/bunny/dao/views/ViewRouterRole.java index 62ea93e..e7e1e4f 100644 --- a/dao/src/main/java/cn/bunny/dao/view/ViewRouterRole.java +++ b/dao/src/main/java/cn/bunny/dao/views/ViewRouterRole.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.view; +package cn.bunny.dao.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/dao/view/ViewUserDept.java b/dao/src/main/java/cn/bunny/dao/views/ViewUserDept.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/view/ViewUserDept.java rename to dao/src/main/java/cn/bunny/dao/views/ViewUserDept.java index 244546f..ea40109 100644 --- a/dao/src/main/java/cn/bunny/dao/view/ViewUserDept.java +++ b/dao/src/main/java/cn/bunny/dao/views/ViewUserDept.java @@ -1,6 +1,6 @@ -package cn.bunny.dao.view; +package cn.bunny.dao.views; -import cn.bunny.dao.common.entity.BaseUserEntity; +import cn.bunny.dao.entity.BaseUserEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java rename to dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java index 1a91a44..37d6cdd 100644 --- a/dao/src/main/java/cn/bunny/dao/common/vo/BaseUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.common.vo; +package cn.bunny.dao.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/common/vo/BaseVo.java b/dao/src/main/java/cn/bunny/dao/vo/BaseVo.java similarity index 98% rename from dao/src/main/java/cn/bunny/dao/common/vo/BaseVo.java rename to dao/src/main/java/cn/bunny/dao/vo/BaseVo.java index 7214f16..0ba9a58 100644 --- a/dao/src/main/java/cn/bunny/dao/common/vo/BaseVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/BaseVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.common.vo; +package cn.bunny.dao.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/dao/src/main/java/cn/bunny/dao/common/vo/TreeSelectVo.java b/dao/src/main/java/cn/bunny/dao/vo/TreeSelectVo.java similarity index 97% rename from dao/src/main/java/cn/bunny/dao/common/vo/TreeSelectVo.java rename to dao/src/main/java/cn/bunny/dao/vo/TreeSelectVo.java index e41029e..7efec9a 100644 --- a/dao/src/main/java/cn/bunny/dao/common/vo/TreeSelectVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/TreeSelectVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.common.vo; +package cn.bunny.dao.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BillVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BillVo.java index c12ff88..6dfbbc9 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BillVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BillVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java index df540b0..2f7d87b 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/BudgetCategoryVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java index c8611eb..ae6c769 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/CategoryVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java index c95023b..ee6d90c 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtRepaymentPlanVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java index ee4b9d5..0c997c5 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/DebtTrackingVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java index 5ac489f..0e557b4 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/admin/SavingGoalVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.admin; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java index b95c516..f9a6020 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BillUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java index 75635e6..649473f 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/BudgetCategoryUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java index ee5b01a..660f615 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/CategoryUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtRepaymentPlanUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtRepaymentPlanUserVo.java index cb24244..822b707 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtRepaymentPlanUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtRepaymentPlanUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtTrackingUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtTrackingUserVo.java index 9916f65..78947b4 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtTrackingUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/DebtTrackingUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java index 5b2c96b..0730fac 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/SavingGoalUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/financial/user/expendAndIncome/ExpendWithIncome.java b/dao/src/main/java/cn/bunny/dao/vo/financial/user/expendAndIncome/ExpendWithIncome.java index 995294f..2e14525 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/financial/user/expendAndIncome/ExpendWithIncome.java +++ b/dao/src/main/java/cn/bunny/dao/vo/financial/user/expendAndIncome/ExpendWithIncome.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.financial.user.expendAndIncome; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java index 872f9b8..38c2c7f 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nTypeVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.i18n; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java index 4d102bd..9cca432 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/i18n/I18nVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.i18n; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java index 2afde05..6218317 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.log; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java index 02171ee..6fce7bd 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.log; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java b/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java index e07f4cc..4abe997 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.quartz; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/result/PageResult.java b/dao/src/main/java/cn/bunny/dao/vo/result/PageResult.java similarity index 95% rename from dao/src/main/java/cn/bunny/dao/pojo/result/PageResult.java rename to dao/src/main/java/cn/bunny/dao/vo/result/PageResult.java index aed48e4..aeb883c 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/result/PageResult.java +++ b/dao/src/main/java/cn/bunny/dao/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.result; +package cn.bunny.dao.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/result/Result.java b/dao/src/main/java/cn/bunny/dao/vo/result/Result.java similarity index 99% rename from dao/src/main/java/cn/bunny/dao/pojo/result/Result.java rename to dao/src/main/java/cn/bunny/dao/vo/result/Result.java index d941e7c..cb74d9f 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/result/Result.java +++ b/dao/src/main/java/cn/bunny/dao/vo/result/Result.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.result; +package cn.bunny.dao.vo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java b/dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java similarity index 99% rename from dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java rename to dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java index e78cad3..e4f9fdc 100644 --- a/dao/src/main/java/cn/bunny/dao/pojo/result/ResultCodeEnum.java +++ b/dao/src/main/java/cn/bunny/dao/vo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.pojo.result; +package cn.bunny.dao.vo.result; import lombok.Getter; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java index deb00f6..fb6efe7 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java index 0c7994c..d596315 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java index e5327d5..4de7813 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.email; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java index bd647dc..e777c70 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.email; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java index 4a31b19..4794bde 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/files/FileInfoVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.files; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java index 449d05c..3ee509e 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.files; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageDetailVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageDetailVo.java index 4a97c9e..9df11fa 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageDetailVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageDetailVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.message; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageReceivedWithMessageVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageReceivedWithMessageVo.java index 5a3b9f6..86244f0 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageReceivedWithMessageVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageReceivedWithMessageVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.message; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageTypeVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageTypeVo.java index bcd697b..7b041ff 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageTypeVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageTypeVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.message; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageUserVo.java index b7a2f9c..805f633 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.message; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageVo.java index 98aa8ea..9684939 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/message/MessageVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.message; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java index 663df35..8eb4498 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.rolePower; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java index dfbeb09..040ab7b 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.rolePower; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java index ee47ee9..ab901c8 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.router; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java index d6c294e..982f543 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.user; -import cn.bunny.dao.common.vo.BaseUserVo; +import cn.bunny.dao.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java index 4bfa9e3..d713b98 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/LoginVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java index fd7d2d8..05532da 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/user/UserVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.user; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java b/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java index 346336c..85273a2 100644 --- a/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java +++ b/service/src/main/java/cn/bunny/services/aop/AnnotationScanner.java @@ -1,7 +1,7 @@ package cn.bunny.services.aop; import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.ResultCodeEnum; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.type.filter.AnnotationTypeFilter; diff --git a/service/src/main/java/cn/bunny/services/aop/JobExecuteAop.java b/service/src/main/java/cn/bunny/services/aop/JobExecuteAop.java index b4002cd..ce9a4f8 100644 --- a/service/src/main/java/cn/bunny/services/aop/JobExecuteAop.java +++ b/service/src/main/java/cn/bunny/services/aop/JobExecuteAop.java @@ -1,9 +1,9 @@ package cn.bunny.services.aop; -import cn.bunny.dao.entity.log.schedule.ScheduleExecuteLog; -import cn.bunny.dao.entity.log.schedule.ScheduleExecuteLogJson; -import cn.bunny.dao.pojo.constant.LocalDateTimeConstant; -import cn.bunny.dao.pojo.enums.JobEnums; +import cn.bunny.dao.entity.mongo.ScheduleExecuteLog; +import cn.bunny.dao.constant.LocalDateTimeConstant; +import cn.bunny.dao.enums.JobEnums; +import cn.bunny.dao.model.quartz.ScheduleExecuteLogJson; import cn.bunny.services.repository.ScheduleExecuteLogRepository; import com.alibaba.fastjson2.JSON; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/service/src/main/java/cn/bunny/services/aop/UserRequestLogAop.java b/service/src/main/java/cn/bunny/services/aop/UserRequestLogAop.java index 0ba88c3..0e2cd42 100644 --- a/service/src/main/java/cn/bunny/services/aop/UserRequestLogAop.java +++ b/service/src/main/java/cn/bunny/services/aop/UserRequestLogAop.java @@ -2,8 +2,8 @@ package cn.bunny.services.aop; import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.utils.ip.IpUtil; -import cn.bunny.dao.entity.log.UserRequestLog; -import cn.bunny.dao.pojo.constant.LocalDateTimeConstant; +import cn.bunny.dao.entity.mongo.UserRequestLog; +import cn.bunny.dao.constant.LocalDateTimeConstant; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.repository.UserRequestLogRepository; import com.alibaba.fastjson2.JSON; diff --git a/service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index fe4e8e1..0ac68bd 100644 --- a/service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -1,10 +1,10 @@ package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; -import cn.bunny.dao.entity.configuration.WebConfiguration; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.model.configuration.WebConfiguration; import cn.bunny.dao.vo.configuration.WebConfigurationVo; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index 7de14a6..8d1fb6d 100644 --- a/service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/service/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.configuration; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto; -import cn.bunny.dao.entity.system.MenuIcon; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.MenuIcon; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.MenuIconVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.configuration.MenuIconService; diff --git a/service/src/main/java/cn/bunny/services/controller/email/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/email/EmailTemplateController.java index d8c9148..9de3bd7 100644 --- a/service/src/main/java/cn/bunny/services/controller/email/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/email/EmailTemplateController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.email; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailTemplateVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.email.EmailTemplateService; diff --git a/service/src/main/java/cn/bunny/services/controller/email/EmailUsersController.java b/service/src/main/java/cn/bunny/services/controller/email/EmailUsersController.java index a67466a..f6b0095 100644 --- a/service/src/main/java/cn/bunny/services/controller/email/EmailUsersController.java +++ b/service/src/main/java/cn/bunny/services/controller/email/EmailUsersController.java @@ -4,10 +4,10 @@ import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; import cn.bunny.dao.dto.system.email.user.EmailUsersDto; import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto; -import cn.bunny.dao.entity.system.EmailUsers; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.EmailUsers; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailUsersVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.email.EmailUsersService; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/BillController.java b/service/src/main/java/cn/bunny/services/controller/financial/BillController.java index 3524c9d..cdfa5d2 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/BillController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/BillController.java @@ -7,10 +7,10 @@ import cn.bunny.dao.dto.financial.bill.admin.BillUpdateDto; import cn.bunny.dao.dto.financial.bill.excel.BillExportDto; import cn.bunny.dao.dto.financial.bill.user.BillAddByUserDto; import cn.bunny.dao.dto.financial.bill.user.BillUpdateByUserDto; -import cn.bunny.dao.entity.financial.Bill; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.Bill; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.BillVo; import cn.bunny.dao.vo.financial.user.BillUserVo; import cn.bunny.dao.vo.financial.user.expendAndIncome.ExpendWithIncomeListVo; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java b/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java index 2dc8fa1..f97d41b 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/BudgetCategoryController.java @@ -5,10 +5,10 @@ import cn.bunny.dao.dto.financial.budgetCategory.admin.BudgetCategoryAddDto; import cn.bunny.dao.dto.financial.budgetCategory.admin.BudgetCategoryUpdateDto; import cn.bunny.dao.dto.financial.budgetCategory.user.BudgetCategoryAddByUserDto; import cn.bunny.dao.dto.financial.budgetCategory.user.BudgetCategoryUpdateByUserDto; -import cn.bunny.dao.entity.financial.BudgetCategory; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.BudgetCategory; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.BudgetCategoryParentVo; import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import cn.bunny.dao.vo.financial.user.BudgetCategoryUserVo; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java b/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java index 69553c9..159465d 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/CategoryController.java @@ -4,10 +4,10 @@ import cn.bunny.dao.dto.financial.category.CategoryDto; import cn.bunny.dao.dto.financial.category.admin.CategoryAddDto; import cn.bunny.dao.dto.financial.category.user.CategoryAddByUserDto; import cn.bunny.dao.dto.financial.category.user.CategoryUpdateByUserDto; -import cn.bunny.dao.entity.financial.Category; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.Category; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.CategoryVo; import cn.bunny.dao.vo.financial.user.CategoryUserVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java index 40d30a0..61381e2 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtRepaymentPlanController.java @@ -5,10 +5,10 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDt import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.user.DebtRepaymentPlanAddByUserDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.user.DebtRepaymentPlanUpdateByUserDto; -import cn.bunny.dao.entity.financial.DebtRepaymentPlan; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.DebtRepaymentPlan; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import cn.bunny.dao.vo.financial.user.DebtRepaymentPlanUserVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java b/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java index 0f89e26..0b12dab 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/DebtTrackingController.java @@ -5,10 +5,10 @@ import cn.bunny.dao.dto.financial.debtTracking.admin.DebtTrackingAddDto; import cn.bunny.dao.dto.financial.debtTracking.admin.DebtTrackingUpdateDto; import cn.bunny.dao.dto.financial.debtTracking.user.DebtTrackingAddByUserDto; import cn.bunny.dao.dto.financial.debtTracking.user.DebtTrackingUpdateByUserDto; -import cn.bunny.dao.entity.financial.DebtTracking; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.DebtTracking; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import cn.bunny.dao.vo.financial.user.DebtTrackingUserVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java index 1b53260..8178941 100644 --- a/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java +++ b/service/src/main/java/cn/bunny/services/controller/financial/SavingGoalController.java @@ -5,10 +5,10 @@ import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalAddByUserDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalUpdateByUserDto; -import cn.bunny.dao.entity.financial.SavingGoal; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.SavingGoal; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import cn.bunny.dao.vo.financial.user.SavingGoalUserVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/i18n/I18nController.java b/service/src/main/java/cn/bunny/services/controller/i18n/I18nController.java index 6cf3b73..b4648de 100644 --- a/service/src/main/java/cn/bunny/services/controller/i18n/I18nController.java +++ b/service/src/main/java/cn/bunny/services/controller/i18n/I18nController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.i18n; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; import cn.bunny.dao.dto.i18n.I18nUpdateDto; -import cn.bunny.dao.entity.i18n.I18n; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.i18n.I18n; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.i18n.I18nVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.i18n.I18nService; diff --git a/service/src/main/java/cn/bunny/services/controller/i18n/I18nTypeController.java b/service/src/main/java/cn/bunny/services/controller/i18n/I18nTypeController.java index 7840528..a49bb55 100644 --- a/service/src/main/java/cn/bunny/services/controller/i18n/I18nTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/i18n/I18nTypeController.java @@ -3,8 +3,8 @@ package cn.bunny.services.controller.i18n; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.i18n.I18nTypeVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.i18n.I18nTypeService; diff --git a/service/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/service/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java index 509f9d5..200c9fc 100644 --- a/service/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java @@ -1,9 +1,9 @@ package cn.bunny.services.controller.log; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.log.ScheduleExecuteLogVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.log.ScheduleExecuteLogService; diff --git a/service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index b97e39a..020af57 100644 --- a/service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -1,10 +1,10 @@ package cn.bunny.services.controller.log; import cn.bunny.dao.dto.log.UserLoginLogDto; -import cn.bunny.dao.entity.log.UserLoginLog; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.log.UserLoginLog; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/log/UserRequestLogController.java b/service/src/main/java/cn/bunny/services/controller/log/UserRequestLogController.java index dbc20b0..ec308c0 100644 --- a/service/src/main/java/cn/bunny/services/controller/log/UserRequestLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/log/UserRequestLogController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller.log; import cn.bunny.dao.dto.log.UserRequestLogDto; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.log.UserRequestLogVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.log.UserRequestLogService; diff --git a/service/src/main/java/cn/bunny/services/controller/message/MessageController.java b/service/src/main/java/cn/bunny/services/controller/message/MessageController.java index 16b9424..4b14fbe 100644 --- a/service/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/service/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.message; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; import cn.bunny.dao.dto.system.message.MessageUpdateDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageDetailVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo; import cn.bunny.dao.vo.system.message.MessageVo; diff --git a/service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 96d0e92..08486de 100644 --- a/service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/service/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.message; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; import cn.bunny.dao.dto.system.message.MessageUserDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageUserVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index 4726087..42513ae 100644 --- a/service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.message; import cn.bunny.dao.dto.system.message.MessageTypeAddDto; import cn.bunny.dao.dto.system.message.MessageTypeDto; import cn.bunny.dao.dto.system.message.MessageTypeUpdateDto; -import cn.bunny.dao.entity.system.MessageType; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.MessageType; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageTypeVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.message.MessageTypeService; diff --git a/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index cbe560d..a9f1a5a 100644 --- a/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -4,10 +4,10 @@ import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersUpdateDto; -import cn.bunny.dao.entity.quartz.Schedulers; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.quartz.Schedulers; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.quartz.SchedulersVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.schedule.SchedulersService; diff --git a/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index 4d57632..66794b6 100644 --- a/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/service/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.schedule; import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto; -import cn.bunny.dao.entity.quartz.SchedulersGroup; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.quartz.SchedulersGroup; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.schedule.SchedulersGroupService; diff --git a/service/src/main/java/cn/bunny/services/controller/system/DeptController.java b/service/src/main/java/cn/bunny/services/controller/system/DeptController.java index 41900b2..4f3b6a7 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/DeptController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; import cn.bunny.dao.dto.system.dept.DeptUpdateDto; -import cn.bunny.dao.entity.system.Dept; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Dept; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.DeptVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.DeptService; diff --git a/service/src/main/java/cn/bunny/services/controller/system/FilesController.java b/service/src/main/java/cn/bunny/services/controller/system/FilesController.java index 265e2da..3939127 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/FilesController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/FilesController.java @@ -4,11 +4,11 @@ import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.files.FilesAddDto; import cn.bunny.dao.dto.system.files.FilesDto; import cn.bunny.dao.dto.system.files.FilesUpdateDto; -import cn.bunny.dao.entity.system.Files; -import cn.bunny.dao.pojo.constant.MinioConstant; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Files; +import cn.bunny.dao.constant.MinioConstant; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.files.FilesVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/system/IndexController.java b/service/src/main/java/cn/bunny/services/controller/system/IndexController.java index f59220b..c04f31b 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/IndexController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/IndexController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.financial.HomeDto; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import cn.bunny.dao.vo.financial.user.home.HomeVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.index.IndexService; diff --git a/service/src/main/java/cn/bunny/services/controller/system/PowerController.java b/service/src/main/java/cn/bunny/services/controller/system/PowerController.java index 344c2aa..2735eb9 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/PowerController.java @@ -4,10 +4,10 @@ import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto; -import cn.bunny.dao.entity.system.Power; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Power; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.PowerVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.PowerService; diff --git a/service/src/main/java/cn/bunny/services/controller/system/RoleController.java b/service/src/main/java/cn/bunny/services/controller/system/RoleController.java index 0dd67c8..6659e02 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/RoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.RoleVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.RoleService; diff --git a/service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java b/service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java index f0af4a9..308d36e 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RolePowerController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.RolePowerService; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/system/RouterController.java b/service/src/main/java/cn/bunny/services/controller/system/RouterController.java index 13609b1..53e7639 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/RouterController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -4,10 +4,10 @@ import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto; import cn.bunny.dao.dto.system.router.RouterUpdateDto; -import cn.bunny.dao.entity.system.Router; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Router; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.router.RouterManageVo; import cn.bunny.dao.vo.system.router.UserRouterVo; import cn.bunny.services.aop.annotation.ExcludeRequestLog; diff --git a/service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java b/service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java index 8316fa3..f25c96c 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.RouterRoleService; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/system/UserController.java b/service/src/main/java/cn/bunny/services/controller/system/UserController.java index f8cce27..f62679b 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -1,10 +1,10 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.user.*; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.*; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.UserService; diff --git a/service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index 5165571..1b8247f 100644 --- a/service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import cn.bunny.services.aop.annotation.ExcludeRequestLog; import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/excel/BillAddUserDAO.java b/service/src/main/java/cn/bunny/services/excel/BillAddUserDAO.java index 2aabfb4..e359507 100644 --- a/service/src/main/java/cn/bunny/services/excel/BillAddUserDAO.java +++ b/service/src/main/java/cn/bunny/services/excel/BillAddUserDAO.java @@ -2,8 +2,8 @@ package cn.bunny.services.excel; import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.dto.financial.bill.excel.BillImportByUserDto; -import cn.bunny.dao.entity.financial.Bill; -import cn.bunny.dao.entity.financial.Category; +import cn.bunny.dao.entity.mysql.financial.Bill; +import cn.bunny.dao.entity.mysql.financial.Category; import cn.bunny.services.mapper.financial.CategoryMapper; import cn.bunny.services.service.financial.BillService; import cn.hutool.core.text.StrBuilder; diff --git a/service/src/main/java/cn/bunny/services/excel/BillAddUserListener.java b/service/src/main/java/cn/bunny/services/excel/BillAddUserListener.java index 6a51f9b..5a2afe4 100644 --- a/service/src/main/java/cn/bunny/services/excel/BillAddUserListener.java +++ b/service/src/main/java/cn/bunny/services/excel/BillAddUserListener.java @@ -2,8 +2,8 @@ package cn.bunny.services.excel; import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.dto.financial.bill.excel.BillImportByUserDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.entity.system.MessageReceived; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.entity.mysql.system.MessageReceived; import cn.bunny.services.mapper.financial.CategoryMapper; import cn.bunny.services.mapper.message.MessageMapper; import cn.bunny.services.mapper.message.MessageReceivedMapper; diff --git a/service/src/main/java/cn/bunny/services/factory/BillFactory.java b/service/src/main/java/cn/bunny/services/factory/BillFactory.java index 0664cce..ac9dba9 100644 --- a/service/src/main/java/cn/bunny/services/factory/BillFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/BillFactory.java @@ -3,11 +3,11 @@ package cn.bunny.services.factory; import cn.bunny.dao.dto.financial.bill.BillDto; import cn.bunny.dao.dto.financial.bill.IncomeExpenseQueryDto; import cn.bunny.dao.dto.financial.bill.excel.BillExportDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.excel.BillExportExcelByUser; -import cn.bunny.dao.pojo.constant.LocalDateTimeConstant; -import cn.bunny.dao.pojo.enums.EmailTemplateEnums; +import cn.bunny.dao.constant.LocalDateTimeConstant; +import cn.bunny.dao.enums.EmailTemplateEnums; +import cn.bunny.dao.model.excel.BillExportExcelByUser; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; import cn.bunny.dao.vo.financial.admin.BillVo; import cn.bunny.dao.vo.financial.user.expendAndIncome.ExpendWithIncome; import cn.bunny.services.mapper.email.EmailTemplateMapper; diff --git a/service/src/main/java/cn/bunny/services/factory/EmailFactory.java b/service/src/main/java/cn/bunny/services/factory/EmailFactory.java index 5d8b4ea..229feba 100644 --- a/service/src/main/java/cn/bunny/services/factory/EmailFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/EmailFactory.java @@ -2,11 +2,11 @@ package cn.bunny.services.factory; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.common.service.utils.mail.MailSenderUtil; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.entity.system.EmailUsers; -import cn.bunny.dao.pojo.common.EmailSend; -import cn.bunny.dao.pojo.common.EmailSendInit; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.dao.model.email.EmailSend; +import cn.bunny.dao.model.email.EmailSendInit; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.entity.mysql.system.EmailUsers; import cn.bunny.services.mapper.email.EmailTemplateMapper; import cn.bunny.services.mapper.email.EmailUsersMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/factory/RoleFactory.java b/service/src/main/java/cn/bunny/services/factory/RoleFactory.java index 96cf6fa..c469ff6 100644 --- a/service/src/main/java/cn/bunny/services/factory/RoleFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/RoleFactory.java @@ -1,7 +1,7 @@ package cn.bunny.services.factory; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.pojo.constant.RedisUserConstant; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/cn/bunny/services/factory/UserFactory.java b/service/src/main/java/cn/bunny/services/factory/UserFactory.java index cead780..eaeef0b 100644 --- a/service/src/main/java/cn/bunny/services/factory/UserFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/UserFactory.java @@ -3,13 +3,13 @@ package cn.bunny.services.factory; import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.ip.IpUtil; import cn.bunny.common.service.utils.minio.MinioUtil; -import cn.bunny.dao.entity.log.UserLoginLog; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.Power; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.pojo.constant.LocalDateTimeConstant; -import cn.bunny.dao.pojo.constant.RedisUserConstant; -import cn.bunny.dao.pojo.constant.UserConstant; +import cn.bunny.dao.entity.mysql.log.UserLoginLog; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.Power; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.constant.LocalDateTimeConstant; +import cn.bunny.dao.constant.RedisUserConstant; +import cn.bunny.dao.constant.UserConstant; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.mapper.system.PowerMapper; import cn.bunny.services.mapper.system.RoleMapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java b/service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java index 6cf5c50..efba927 100644 --- a/service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.configuration; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; -import cn.bunny.dao.entity.system.MenuIcon; +import cn.bunny.dao.entity.mysql.system.MenuIcon; import cn.bunny.dao.vo.system.MenuIconVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/email/EmailTemplateMapper.java b/service/src/main/java/cn/bunny/services/mapper/email/EmailTemplateMapper.java index 0e6b477..7dd85f0 100644 --- a/service/src/main/java/cn/bunny/services/mapper/email/EmailTemplateMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/email/EmailTemplateMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.email; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; -import cn.bunny.dao.entity.system.EmailTemplate; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; import cn.bunny.dao.vo.system.email.EmailTemplateVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/email/EmailUsersMapper.java b/service/src/main/java/cn/bunny/services/mapper/email/EmailUsersMapper.java index 7aa92a9..6799556 100644 --- a/service/src/main/java/cn/bunny/services/mapper/email/EmailUsersMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/email/EmailUsersMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.email; import cn.bunny.dao.dto.system.email.user.EmailUsersDto; -import cn.bunny.dao.entity.system.EmailUsers; +import cn.bunny.dao.entity.mysql.system.EmailUsers; import cn.bunny.dao.vo.system.email.EmailUsersVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java index d58743b..6159ff8 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/BillMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.bill.BillDto; import cn.bunny.dao.dto.financial.bill.IncomeExpenseQueryDto; -import cn.bunny.dao.entity.financial.Bill; +import cn.bunny.dao.entity.mysql.financial.Bill; import cn.bunny.dao.vo.financial.admin.BillVo; import cn.bunny.dao.vo.financial.user.expendAndIncome.ExpendWithIncome; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java index 5a89c8e..78fa577 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/BudgetCategoryMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.budgetCategory.BudgetCategoryDto; -import cn.bunny.dao.entity.financial.BudgetCategory; +import cn.bunny.dao.entity.mysql.financial.BudgetCategory; import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java index ac88298..58f3b85 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/CategoryMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.category.CategoryDto; -import cn.bunny.dao.entity.financial.Category; +import cn.bunny.dao.entity.mysql.financial.Category; import cn.bunny.dao.vo.financial.admin.CategoryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java index 251c5df..14c576f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/DebtRepaymentPlanMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.debtRepaymentPlan.DebtRepaymentPlanDto; -import cn.bunny.dao.entity.financial.DebtRepaymentPlan; +import cn.bunny.dao.entity.mysql.financial.DebtRepaymentPlan; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java index d692bdb..1ad226f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/DebtTrackingMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.debtTracking.DebtTrackingDto; -import cn.bunny.dao.entity.financial.DebtTracking; +import cn.bunny.dao.entity.mysql.financial.DebtTracking; import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java b/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java index e8ee7da..6731a92 100644 --- a/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/financial/SavingGoalMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.financial; import cn.bunny.dao.dto.financial.savingGoal.SavingGoalDto; -import cn.bunny.dao.entity.financial.SavingGoal; +import cn.bunny.dao.entity.mysql.financial.SavingGoal; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/i18n/I18nMapper.java b/service/src/main/java/cn/bunny/services/mapper/i18n/I18nMapper.java index 1b19e71..74f4f89 100644 --- a/service/src/main/java/cn/bunny/services/mapper/i18n/I18nMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/i18n/I18nMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.i18n; import cn.bunny.dao.dto.i18n.I18nDto; -import cn.bunny.dao.entity.i18n.I18n; +import cn.bunny.dao.entity.mysql.i18n.I18n; import cn.bunny.dao.vo.i18n.I18nVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/i18n/I18nTypeMapper.java b/service/src/main/java/cn/bunny/services/mapper/i18n/I18nTypeMapper.java index 7fa10f3..0304948 100644 --- a/service/src/main/java/cn/bunny/services/mapper/i18n/I18nTypeMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/i18n/I18nTypeMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.i18n; import cn.bunny.dao.dto.i18n.I18nTypeDto; -import cn.bunny.dao.entity.i18n.I18nType; +import cn.bunny.dao.entity.mysql.i18n.I18nType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java b/service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java index 837b592..4659979 100644 --- a/service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.message; import cn.bunny.dao.dto.system.message.MessageDto; -import cn.bunny.dao.entity.system.Message; +import cn.bunny.dao.entity.mysql.system.Message; import cn.bunny.dao.vo.system.message.MessageDetailVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo; diff --git a/service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java b/service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java index 1c752af..460b6f0 100644 --- a/service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java @@ -2,8 +2,8 @@ package cn.bunny.services.mapper.message; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageUserDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.entity.system.MessageReceived; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.entity.mysql.system.MessageReceived; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java b/service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java index 4e7b752..175842f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.message; import cn.bunny.dao.dto.system.message.MessageTypeDto; -import cn.bunny.dao.entity.system.MessageType; +import cn.bunny.dao.entity.mysql.system.MessageType; import cn.bunny.dao.vo.system.message.MessageTypeVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java b/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java index 31017e6..e561f43 100644 --- a/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.schedule; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; -import cn.bunny.dao.entity.quartz.SchedulersGroup; +import cn.bunny.dao.entity.mysql.quartz.SchedulersGroup; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java b/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java index 2346778..acb9c78 100644 --- a/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.schedule; import cn.bunny.dao.dto.quartz.schedule.SchedulersDto; -import cn.bunny.dao.entity.quartz.Schedulers; +import cn.bunny.dao.entity.mysql.quartz.Schedulers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java index 04d4ae5..46c3b0f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.system.dept.DeptDto; -import cn.bunny.dao.entity.system.Dept; +import cn.bunny.dao.entity.mysql.system.Dept; import cn.bunny.dao.vo.system.DeptVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java index 316d2c3..a72a196 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.system.files.FilesDto; -import cn.bunny.dao.entity.system.Files; +import cn.bunny.dao.entity.mysql.system.Files; import cn.bunny.dao.vo.system.files.FilesVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java index 8caaa06..1cab011 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; -import cn.bunny.dao.entity.system.Power; +import cn.bunny.dao.entity.mysql.system.Power; import cn.bunny.dao.vo.system.rolePower.PowerVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java index 7af905f..b051b7f 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; -import cn.bunny.dao.entity.system.Role; +import cn.bunny.dao.entity.mysql.system.Role; import cn.bunny.dao.vo.system.rolePower.RoleVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java index 31f7342..cfd0dd0 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.dao.entity.system.RolePower; -import cn.bunny.dao.view.ViewRolePower; +import cn.bunny.dao.entity.mysql.system.RolePower; +import cn.bunny.dao.views.ViewRolePower; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java index 3c07bbb..767fa1a 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.system.router.RouterManageDto; -import cn.bunny.dao.entity.system.Router; +import cn.bunny.dao.entity.mysql.system.Router; import cn.bunny.dao.vo.system.router.RouterManageVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java index 0079ccc..3f499c2 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.dao.entity.system.RouterRole; -import cn.bunny.dao.view.ViewRouterRole; +import cn.bunny.dao.entity.mysql.system.RouterRole; +import cn.bunny.dao.views.ViewRouterRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java index dab9d3f..b0f68d8 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.dao.entity.system.UserDept; +import cn.bunny.dao.entity.mysql.system.UserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/UserLoginLogMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserLoginLogMapper.java index 45fb616..fb95679 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/UserLoginLogMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/UserLoginLogMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.log.UserLoginLogDto; -import cn.bunny.dao.entity.log.UserLoginLog; +import cn.bunny.dao.entity.mysql.log.UserLoginLog; import cn.bunny.dao.vo.log.UserLoginLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java index 4cfb0dd..0f55f68 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/UserMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; import cn.bunny.dao.dto.system.user.AdminUserDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.view.ViewUserDept; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.views.ViewUserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java index 6424b70..3952515 100644 --- a/service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.dao.entity.system.UserRole; +import cn.bunny.dao.entity.mysql.system.UserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/service/src/main/java/cn/bunny/services/repository/ScheduleExecuteLogRepository.java b/service/src/main/java/cn/bunny/services/repository/ScheduleExecuteLogRepository.java index ae1d814..e41d72a 100644 --- a/service/src/main/java/cn/bunny/services/repository/ScheduleExecuteLogRepository.java +++ b/service/src/main/java/cn/bunny/services/repository/ScheduleExecuteLogRepository.java @@ -1,6 +1,6 @@ package cn.bunny.services.repository; -import cn.bunny.dao.entity.log.schedule.ScheduleExecuteLog; +import cn.bunny.dao.entity.mongo.ScheduleExecuteLog; import org.bson.types.ObjectId; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/service/src/main/java/cn/bunny/services/repository/UserRequestLogRepository.java b/service/src/main/java/cn/bunny/services/repository/UserRequestLogRepository.java index 0cd22fa..7ae80eb 100644 --- a/service/src/main/java/cn/bunny/services/repository/UserRequestLogRepository.java +++ b/service/src/main/java/cn/bunny/services/repository/UserRequestLogRepository.java @@ -1,6 +1,6 @@ package cn.bunny.services.repository; -import cn.bunny.dao.entity.log.UserRequestLog; +import cn.bunny.dao.entity.mongo.UserRequestLog; import org.bson.types.ObjectId; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java index f2f4c9f..c4d0033 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java +++ b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.custom; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.ResultCodeEnum; import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomCheckIsAdmin.java b/service/src/main/java/cn/bunny/services/security/custom/CustomCheckIsAdmin.java index 4650302..8a5ac77 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomCheckIsAdmin.java +++ b/service/src/main/java/cn/bunny/services/security/custom/CustomCheckIsAdmin.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.custom; import cn.bunny.common.service.context.BaseContext; -import cn.bunny.dao.entity.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.AdminUser; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomUser.java b/service/src/main/java/cn/bunny/services/security/custom/CustomUser.java index 5ac7e96..25f7166 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomUser.java +++ b/service/src/main/java/cn/bunny/services/security/custom/CustomUser.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.custom; -import cn.bunny.dao.entity.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.AdminUser; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.GrantedAuthority; diff --git a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 82812eb..092a710 100644 --- a/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java @@ -2,9 +2,9 @@ package cn.bunny.services.security.filter; import cn.bunny.dao.dto.system.user.LoginDto; -import cn.bunny.dao.pojo.constant.RedisUserConstant; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.constant.RedisUserConstant; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler; import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java index 10ab63c..d8707ff 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.handelr; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java index c983cd3..2b05731 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java @@ -1,8 +1,8 @@ package cn.bunny.services.security.handelr; import cn.bunny.common.service.utils.ResponseUtil; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.security.custom.CustomAuthenticationException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java index 98ad1cc..75f8942 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.handelr; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java index f40dfac..ae8f849 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.handelr; -import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.vo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/service/impl/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/service/impl/CustomAuthorizationManagerServiceImpl.java index 2fffe65..6fe863b 100644 --- a/service/src/main/java/cn/bunny/services/security/service/impl/CustomAuthorizationManagerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/security/service/impl/CustomAuthorizationManagerServiceImpl.java @@ -2,10 +2,10 @@ package cn.bunny.services.security.service.impl; import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.utils.JwtHelper; -import cn.bunny.dao.entity.system.Power; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.pojo.constant.RedisUserConstant; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Power; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.constant.RedisUserConstant; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.mapper.system.PowerMapper; import cn.bunny.services.mapper.system.RoleMapper; diff --git a/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java b/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java index 607cf19..3ff8a5b 100644 --- a/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/security/service/impl/CustomUserDetailsServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.security.service.impl; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.user.LoginDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.factory.UserFactory; import cn.bunny.services.mapper.system.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java b/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java index d53feac..f94b1c4 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; -import cn.bunny.dao.entity.configuration.WebConfiguration; +import cn.bunny.dao.model.configuration.WebConfiguration; import cn.bunny.dao.vo.configuration.WebConfigurationVo; public interface ConfigurationService { diff --git a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index 3aec565..8acc8da 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.configuration; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto; -import cn.bunny.dao.entity.system.MenuIcon; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.MenuIcon; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.MenuIconVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index bd153bf..6ef327e 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -2,9 +2,9 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.configuration.WebConfigurationDto; -import cn.bunny.dao.entity.configuration.WebConfiguration; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.model.configuration.WebConfiguration; import cn.bunny.dao.vo.configuration.WebConfigurationVo; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.ConfigurationService; import com.alibaba.fastjson2.JSON; import org.jetbrains.annotations.NotNull; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index fcf5a2a..c944189 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java @@ -4,9 +4,9 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.menuIcon.MenuIconAddDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconDto; import cn.bunny.dao.dto.system.menuIcon.MenuIconUpdateDto; -import cn.bunny.dao.entity.system.MenuIcon; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.MenuIcon; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.MenuIconVo; import cn.bunny.services.mapper.configuration.MenuIconMapper; import cn.bunny.services.service.configuration.MenuIconService; diff --git a/service/src/main/java/cn/bunny/services/service/email/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/email/EmailTemplateService.java index 425dd0b..291ca89 100644 --- a/service/src/main/java/cn/bunny/services/service/email/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/email/EmailTemplateService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.email; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.email.EmailTemplateVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/email/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/email/EmailUsersService.java index 87a1e01..a81e7c9 100644 --- a/service/src/main/java/cn/bunny/services/service/email/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/email/EmailUsersService.java @@ -4,8 +4,8 @@ import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; import cn.bunny.dao.dto.system.email.user.EmailUsersDto; import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto; -import cn.bunny.dao.entity.system.EmailUsers; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.EmailUsers; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.email.EmailUsersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/email/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/email/impl/EmailTemplateServiceImpl.java index 61b62f9..0a1f7fc 100644 --- a/service/src/main/java/cn/bunny/services/service/email/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/email/impl/EmailTemplateServiceImpl.java @@ -4,10 +4,10 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.email.template.EmailTemplateAddDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateDto; import cn.bunny.dao.dto.system.email.template.EmailTemplateUpdateDto; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.pojo.enums.EmailTemplateEnums; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.enums.EmailTemplateEnums; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailTemplateVo; import cn.bunny.services.mapper.email.EmailTemplateMapper; import cn.bunny.services.service.email.EmailTemplateService; diff --git a/service/src/main/java/cn/bunny/services/service/email/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/email/impl/EmailUsersServiceImpl.java index 3062d90..0fcb095 100644 --- a/service/src/main/java/cn/bunny/services/service/email/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/email/impl/EmailUsersServiceImpl.java @@ -5,9 +5,9 @@ import cn.bunny.dao.dto.system.email.user.EmailUserUpdateStatusDto; import cn.bunny.dao.dto.system.email.user.EmailUsersAddDto; import cn.bunny.dao.dto.system.email.user.EmailUsersDto; import cn.bunny.dao.dto.system.email.user.EmailUsersUpdateDto; -import cn.bunny.dao.entity.system.EmailUsers; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.EmailUsers; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.email.EmailUsersVo; import cn.bunny.services.factory.EmailFactory; import cn.bunny.services.mapper.email.EmailUsersMapper; diff --git a/service/src/main/java/cn/bunny/services/service/financial/BillService.java b/service/src/main/java/cn/bunny/services/service/financial/BillService.java index c03dbe0..a5a77bb 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/BillService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/BillService.java @@ -7,8 +7,8 @@ import cn.bunny.dao.dto.financial.bill.admin.BillUpdateDto; import cn.bunny.dao.dto.financial.bill.excel.BillExportDto; import cn.bunny.dao.dto.financial.bill.user.BillAddByUserDto; import cn.bunny.dao.dto.financial.bill.user.BillUpdateByUserDto; -import cn.bunny.dao.entity.financial.Bill; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.financial.Bill; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.financial.admin.BillVo; import cn.bunny.dao.vo.financial.user.BillUserVo; import cn.bunny.dao.vo.financial.user.expendAndIncome.ExpendWithIncomeListVo; diff --git a/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java b/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java index 09626ad..64ddaab 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/BudgetCategoryService.java @@ -5,8 +5,8 @@ import cn.bunny.dao.dto.financial.budgetCategory.admin.BudgetCategoryAddDto; import cn.bunny.dao.dto.financial.budgetCategory.admin.BudgetCategoryUpdateDto; import cn.bunny.dao.dto.financial.budgetCategory.user.BudgetCategoryAddByUserDto; import cn.bunny.dao.dto.financial.budgetCategory.user.BudgetCategoryUpdateByUserDto; -import cn.bunny.dao.entity.financial.BudgetCategory; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.financial.BudgetCategory; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.financial.BudgetCategoryParentVo; import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import cn.bunny.dao.vo.financial.user.BudgetCategoryUserVo; diff --git a/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java b/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java index d01b577..3afc87d 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/CategoryService.java @@ -4,8 +4,8 @@ import cn.bunny.dao.dto.financial.category.CategoryDto; import cn.bunny.dao.dto.financial.category.admin.CategoryAddDto; import cn.bunny.dao.dto.financial.category.user.CategoryAddByUserDto; import cn.bunny.dao.dto.financial.category.user.CategoryUpdateByUserDto; -import cn.bunny.dao.entity.financial.Category; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.financial.Category; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.financial.admin.CategoryVo; import cn.bunny.dao.vo.financial.user.CategoryUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java b/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java index 7a89eca..b121144 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/DebtRepaymentPlanService.java @@ -5,8 +5,8 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDt import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.user.DebtRepaymentPlanAddByUserDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.user.DebtRepaymentPlanUpdateByUserDto; -import cn.bunny.dao.entity.financial.DebtRepaymentPlan; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.financial.DebtRepaymentPlan; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import cn.bunny.dao.vo.financial.user.DebtRepaymentPlanUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java b/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java index e4669f0..24d5785 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/DebtTrackingService.java @@ -5,8 +5,8 @@ import cn.bunny.dao.dto.financial.debtTracking.admin.DebtTrackingAddDto; import cn.bunny.dao.dto.financial.debtTracking.admin.DebtTrackingUpdateDto; import cn.bunny.dao.dto.financial.debtTracking.user.DebtTrackingAddByUserDto; import cn.bunny.dao.dto.financial.debtTracking.user.DebtTrackingUpdateByUserDto; -import cn.bunny.dao.entity.financial.DebtTracking; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.financial.DebtTracking; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import cn.bunny.dao.vo.financial.user.DebtTrackingUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java index 89ba999..37d7610 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java +++ b/service/src/main/java/cn/bunny/services/service/financial/SavingGoalService.java @@ -5,8 +5,8 @@ import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalAddByUserDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalUpdateByUserDto; -import cn.bunny.dao.entity.financial.SavingGoal; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.financial.SavingGoal; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import cn.bunny.dao.vo.financial.user.SavingGoalUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java index fc66e67..eb119d6 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/BillServiceImpl.java @@ -10,12 +10,12 @@ import cn.bunny.dao.dto.financial.bill.excel.BillExportDto; import cn.bunny.dao.dto.financial.bill.excel.BillImportByUserDto; import cn.bunny.dao.dto.financial.bill.user.BillAddByUserDto; import cn.bunny.dao.dto.financial.bill.user.BillUpdateByUserDto; -import cn.bunny.dao.entity.financial.Bill; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.pojo.enums.EmailTemplateEnums; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.Bill; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.enums.EmailTemplateEnums; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.BillVo; import cn.bunny.dao.vo.financial.user.BillUserVo; import cn.bunny.dao.vo.financial.user.expendAndIncome.CategoryAmount; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java index de6f487..eb9ae8a 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/BudgetCategoryServiceImpl.java @@ -7,9 +7,9 @@ import cn.bunny.dao.dto.financial.budgetCategory.admin.BudgetCategoryAddDto; import cn.bunny.dao.dto.financial.budgetCategory.admin.BudgetCategoryUpdateDto; import cn.bunny.dao.dto.financial.budgetCategory.user.BudgetCategoryAddByUserDto; import cn.bunny.dao.dto.financial.budgetCategory.user.BudgetCategoryUpdateByUserDto; -import cn.bunny.dao.entity.financial.BudgetCategory; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.BudgetCategory; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.BudgetCategoryParentVo; import cn.bunny.dao.vo.financial.admin.BudgetCategoryVo; import cn.bunny.dao.vo.financial.user.BudgetCategoryUserVo; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java index f0b4c0e..65c5524 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/CategoryServiceImpl.java @@ -6,10 +6,10 @@ import cn.bunny.dao.dto.financial.category.CategoryDto; import cn.bunny.dao.dto.financial.category.admin.CategoryAddDto; import cn.bunny.dao.dto.financial.category.user.CategoryAddByUserDto; import cn.bunny.dao.dto.financial.category.user.CategoryUpdateByUserDto; -import cn.bunny.dao.entity.financial.Category; -import cn.bunny.dao.pojo.constant.UserConstant; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.Category; +import cn.bunny.dao.constant.UserConstant; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.CategoryVo; import cn.bunny.dao.vo.financial.user.CategoryUserVo; import cn.bunny.services.mapper.financial.CategoryMapper; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java index 6c931ac..d1330f8 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtRepaymentPlanServiceImpl.java @@ -7,9 +7,9 @@ import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanAddDt import cn.bunny.dao.dto.financial.debtRepaymentPlan.admin.DebtRepaymentPlanUpdateDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.user.DebtRepaymentPlanAddByUserDto; import cn.bunny.dao.dto.financial.debtRepaymentPlan.user.DebtRepaymentPlanUpdateByUserDto; -import cn.bunny.dao.entity.financial.DebtRepaymentPlan; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.DebtRepaymentPlan; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.DebtRepaymentPlanVo; import cn.bunny.dao.vo.financial.user.DebtRepaymentPlanUserVo; import cn.bunny.services.mapper.financial.DebtRepaymentPlanMapper; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java index 2e43119..40185d5 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/DebtTrackingServiceImpl.java @@ -7,9 +7,9 @@ import cn.bunny.dao.dto.financial.debtTracking.admin.DebtTrackingAddDto; import cn.bunny.dao.dto.financial.debtTracking.admin.DebtTrackingUpdateDto; import cn.bunny.dao.dto.financial.debtTracking.user.DebtTrackingAddByUserDto; import cn.bunny.dao.dto.financial.debtTracking.user.DebtTrackingUpdateByUserDto; -import cn.bunny.dao.entity.financial.DebtTracking; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.DebtTracking; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.DebtTrackingVo; import cn.bunny.dao.vo.financial.user.DebtTrackingUserVo; import cn.bunny.services.mapper.financial.DebtTrackingMapper; diff --git a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java index df3a1d5..d37140a 100644 --- a/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/financial/impl/SavingGoalServiceImpl.java @@ -7,9 +7,9 @@ import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalAddDto; import cn.bunny.dao.dto.financial.savingGoal.admin.SavingGoalUpdateDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalAddByUserDto; import cn.bunny.dao.dto.financial.savingGoal.user.SavingGoalUpdateByUserDto; -import cn.bunny.dao.entity.financial.SavingGoal; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.SavingGoal; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.financial.admin.SavingGoalVo; import cn.bunny.dao.vo.financial.user.SavingGoalUserVo; import cn.bunny.services.mapper.financial.SavingGoalMapper; diff --git a/service/src/main/java/cn/bunny/services/service/i18n/I18nService.java b/service/src/main/java/cn/bunny/services/service/i18n/I18nService.java index a49967e..4394b1c 100644 --- a/service/src/main/java/cn/bunny/services/service/i18n/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/i18n/I18nService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.i18n; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; import cn.bunny.dao.dto.i18n.I18nUpdateDto; -import cn.bunny.dao.entity.i18n.I18n; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.i18n.I18n; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.i18n.I18nVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/i18n/I18nTypeService.java b/service/src/main/java/cn/bunny/services/service/i18n/I18nTypeService.java index 07c1e19..0aa3f0d 100644 --- a/service/src/main/java/cn/bunny/services/service/i18n/I18nTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/i18n/I18nTypeService.java @@ -3,7 +3,7 @@ package cn.bunny.services.service.i18n; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto; -import cn.bunny.dao.entity.i18n.I18nType; +import cn.bunny.dao.entity.mysql.i18n.I18nType; import cn.bunny.dao.vo.i18n.I18nTypeVo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nServiceImpl.java index 62d62d4..0c5f33f 100644 --- a/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nServiceImpl.java @@ -4,10 +4,10 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.i18n.I18nAddDto; import cn.bunny.dao.dto.i18n.I18nDto; import cn.bunny.dao.dto.i18n.I18nUpdateDto; -import cn.bunny.dao.entity.i18n.I18n; -import cn.bunny.dao.entity.i18n.I18nType; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.i18n.I18n; +import cn.bunny.dao.entity.mysql.i18n.I18nType; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.i18n.I18nVo; import cn.bunny.services.mapper.i18n.I18nMapper; import cn.bunny.services.mapper.i18n.I18nTypeMapper; diff --git a/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nTypeServiceImpl.java index c15814a..1b37aa2 100644 --- a/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/i18n/impl/I18nTypeServiceImpl.java @@ -4,8 +4,8 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.i18n.I18nTypeAddDto; import cn.bunny.dao.dto.i18n.I18nTypeDto; import cn.bunny.dao.dto.i18n.I18nTypeUpdateDto; -import cn.bunny.dao.entity.i18n.I18nType; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.i18n.I18nType; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.i18n.I18nTypeVo; import cn.bunny.services.mapper.i18n.I18nTypeMapper; import cn.bunny.services.service.i18n.I18nTypeService; diff --git a/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java b/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java index 1bec013..105f5ba 100644 --- a/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java +++ b/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.log; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.log.ScheduleExecuteLogVo; import org.springframework.data.domain.PageRequest; diff --git a/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java index f2d5d59..8c455fc 100644 --- a/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java +++ b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.log; import cn.bunny.dao.dto.log.UserLoginLogDto; -import cn.bunny.dao.entity.log.UserLoginLog; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.log.UserLoginLog; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/log/UserRequestLogService.java b/service/src/main/java/cn/bunny/services/service/log/UserRequestLogService.java index 03a5f28..89d02ad 100644 --- a/service/src/main/java/cn/bunny/services/service/log/UserRequestLogService.java +++ b/service/src/main/java/cn/bunny/services/service/log/UserRequestLogService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.log; import cn.bunny.dao.dto.log.UserRequestLogDto; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.log.UserRequestLogVo; import org.springframework.data.domain.PageRequest; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java index 81b73c6..556d3f2 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.log.impl; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; -import cn.bunny.dao.entity.log.schedule.ScheduleExecuteLog; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mongo.ScheduleExecuteLog; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.log.ScheduleExecuteLogVo; import cn.bunny.services.repository.ScheduleExecuteLogRepository; import cn.bunny.services.service.log.ScheduleExecuteLogService; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java index c3ae95d..1092050 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java @@ -2,8 +2,8 @@ package cn.bunny.services.service.log.impl; import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.dto.log.UserLoginLogDto; -import cn.bunny.dao.entity.log.UserLoginLog; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.log.UserLoginLog; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.services.mapper.system.UserLoginLogMapper; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/UserRequestLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/UserRequestLogServiceImpl.java index e0a7d7b..36453a3 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/UserRequestLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/log/impl/UserRequestLogServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.log.impl; import cn.bunny.dao.dto.log.UserRequestLogDto; -import cn.bunny.dao.entity.log.UserRequestLog; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mongo.UserRequestLog; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.log.UserRequestLogVo; import cn.bunny.services.repository.UserRequestLogRepository; import cn.bunny.services.service.log.UserRequestLogService; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java index fb9c1e5..44df93e 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java @@ -3,9 +3,9 @@ package cn.bunny.services.service.message; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; import cn.bunny.dao.dto.system.message.MessageUserDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.entity.system.MessageReceived; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.entity.mysql.system.MessageReceived; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageUserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageService.java b/service/src/main/java/cn/bunny/services/service/message/MessageService.java index 95e416e..0b9af3b 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.message; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; import cn.bunny.dao.dto.system.message.MessageUpdateDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.message.MessageDetailVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo; import cn.bunny.dao.vo.system.message.MessageVo; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java index 8030606..c4b8488 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.message; import cn.bunny.dao.dto.system.message.MessageTypeAddDto; import cn.bunny.dao.dto.system.message.MessageTypeDto; import cn.bunny.dao.dto.system.message.MessageTypeUpdateDto; -import cn.bunny.dao.entity.system.MessageType; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.MessageType; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.message.MessageTypeVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index 9c5584c..4c95092 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -5,10 +5,10 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.message.MessageReceivedDto; import cn.bunny.dao.dto.system.message.MessageReceivedUpdateDto; import cn.bunny.dao.dto.system.message.MessageUserDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.entity.system.MessageReceived; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.entity.mysql.system.MessageReceived; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageUserVo; import cn.bunny.services.factory.UserFactory; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index f51481d..62196cb 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -2,14 +2,14 @@ package cn.bunny.services.service.message.impl; import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.exception.AuthCustomerException; -import cn.bunny.dao.common.entity.BaseEntity; import cn.bunny.dao.dto.system.message.MessageAddDto; import cn.bunny.dao.dto.system.message.MessageDto; import cn.bunny.dao.dto.system.message.MessageUpdateDto; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.entity.system.MessageReceived; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.BaseEntity; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.entity.mysql.system.MessageReceived; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.message.MessageDetailVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithMessageVo; import cn.bunny.dao.vo.system.message.MessageReceivedWithUserVo; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index 5038f07..4d908b7 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.message.impl; import cn.bunny.dao.dto.system.message.MessageTypeAddDto; import cn.bunny.dao.dto.system.message.MessageTypeDto; import cn.bunny.dao.dto.system.message.MessageTypeUpdateDto; -import cn.bunny.dao.entity.system.MessageType; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.MessageType; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.message.MessageTypeVo; import cn.bunny.services.mapper.message.MessageTypeMapper; import cn.bunny.services.service.message.MessageTypeService; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java index bcc66b6..64d5213 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.schedule; import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto; -import cn.bunny.dao.entity.quartz.SchedulersGroup; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.quartz.SchedulersGroup; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index b906574..4c270e1 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -4,8 +4,8 @@ import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersUpdateDto; -import cn.bunny.dao.entity.quartz.Schedulers; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.quartz.Schedulers; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.quartz.SchedulersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index 678515c..0b14f5a 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.schedule.impl; import cn.bunny.dao.dto.quartz.group.SchedulersGroupAddDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; import cn.bunny.dao.dto.quartz.group.SchedulersGroupUpdateDto; -import cn.bunny.dao.entity.quartz.SchedulersGroup; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.quartz.SchedulersGroup; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import cn.bunny.services.mapper.schedule.SchedulersGroupMapper; import cn.bunny.services.service.schedule.SchedulersGroupService; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index d33a94e..af8e14c 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java @@ -5,9 +5,9 @@ import cn.bunny.dao.dto.quartz.SchedulersOperationDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersAddDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersDto; import cn.bunny.dao.dto.quartz.schedule.SchedulersUpdateDto; -import cn.bunny.dao.entity.quartz.Schedulers; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.quartz.Schedulers; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.quartz.SchedulersVo; import cn.bunny.services.aop.AnnotationScanner; import cn.bunny.services.aop.annotation.QuartzSchedulers; diff --git a/service/src/main/java/cn/bunny/services/service/system/DeptService.java b/service/src/main/java/cn/bunny/services/service/system/DeptService.java index cb1125c..9554df9 100644 --- a/service/src/main/java/cn/bunny/services/service/system/DeptService.java +++ b/service/src/main/java/cn/bunny/services/service/system/DeptService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; import cn.bunny.dao.dto.system.dept.DeptUpdateDto; -import cn.bunny.dao.entity.system.Dept; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Dept; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.DeptVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/system/FilesService.java b/service/src/main/java/cn/bunny/services/service/system/FilesService.java index bb1ee39..8dea7cf 100644 --- a/service/src/main/java/cn/bunny/services/service/system/FilesService.java +++ b/service/src/main/java/cn/bunny/services/service/system/FilesService.java @@ -4,8 +4,8 @@ import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.files.FilesAddDto; import cn.bunny.dao.dto.system.files.FilesDto; import cn.bunny.dao.dto.system.files.FilesUpdateDto; -import cn.bunny.dao.entity.system.Files; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Files; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.files.FilesVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/system/PowerService.java b/service/src/main/java/cn/bunny/services/service/system/PowerService.java index 71d4b98..d07c1f2 100644 --- a/service/src/main/java/cn/bunny/services/service/system/PowerService.java +++ b/service/src/main/java/cn/bunny/services/service/system/PowerService.java @@ -4,8 +4,8 @@ import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto; -import cn.bunny.dao.entity.system.Power; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Power; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.rolePower.PowerVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/system/RolePowerService.java b/service/src/main/java/cn/bunny/services/service/system/RolePowerService.java index 9f05c6a..4aa7d92 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RolePowerService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RolePowerService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; -import cn.bunny.dao.entity.system.RolePower; +import cn.bunny.dao.entity.mysql.system.RolePower; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/system/RoleService.java b/service/src/main/java/cn/bunny/services/service/system/RoleService.java index c473fee..2d4d7f7 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RoleService.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.rolePower.RoleVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java b/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java index 0d6569c..b0d0b32 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RouterRoleService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; -import cn.bunny.dao.entity.system.RouterRole; +import cn.bunny.dao.entity.mysql.system.RouterRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/system/RouterService.java b/service/src/main/java/cn/bunny/services/service/system/RouterService.java index 1f16cd0..b0b8e1e 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RouterService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RouterService.java @@ -4,8 +4,8 @@ import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto; import cn.bunny.dao.dto.system.router.RouterUpdateDto; -import cn.bunny.dao.entity.system.Router; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.Router; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.router.RouterManageVo; import cn.bunny.dao.vo.system.router.UserRouterVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java b/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java index 7f26018..876e7c3 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserDeptService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system; -import cn.bunny.dao.entity.system.UserDept; +import cn.bunny.dao.entity.mysql.system.UserDept; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java b/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java index d2e1018..86bbad7 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserRoleService.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; -import cn.bunny.dao.entity.system.UserRole; +import cn.bunny.dao.entity.mysql.system.UserRole; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/system/UserService.java b/service/src/main/java/cn/bunny/services/service/system/UserService.java index 73d648b..0b90776 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.system; import cn.bunny.dao.dto.system.user.*; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.dao.vo.system.user.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index d075d20..72bec56 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java @@ -4,9 +4,9 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.dept.DeptAddDto; import cn.bunny.dao.dto.system.dept.DeptDto; import cn.bunny.dao.dto.system.dept.DeptUpdateDto; -import cn.bunny.dao.entity.system.Dept; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Dept; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.DeptVo; import cn.bunny.services.mapper.system.DeptMapper; import cn.bunny.services.mapper.system.UserDeptMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java index 0eef444..2295550 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java @@ -9,11 +9,11 @@ import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.files.FilesAddDto; import cn.bunny.dao.dto.system.files.FilesDto; import cn.bunny.dao.dto.system.files.FilesUpdateDto; -import cn.bunny.dao.entity.financial.Category; -import cn.bunny.dao.entity.system.Files; -import cn.bunny.dao.pojo.common.MinioFilePath; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.Category; +import cn.bunny.dao.entity.mysql.system.Files; +import cn.bunny.dao.model.file.MinioFilePath; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.files.FilesVo; import cn.bunny.services.mapper.financial.CategoryMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java index 0afd452..6272b52 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java @@ -5,9 +5,9 @@ import cn.bunny.dao.dto.system.rolePower.power.PowerAddDto; import cn.bunny.dao.dto.system.rolePower.power.PowerDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateBatchByParentIdDto; import cn.bunny.dao.dto.system.rolePower.power.PowerUpdateDto; -import cn.bunny.dao.entity.system.Power; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Power; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.PowerVo; import cn.bunny.services.mapper.system.PowerMapper; import cn.bunny.services.mapper.system.RolePowerMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java index 0f030a6..439bef1 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system.impl; import cn.bunny.dao.dto.system.rolePower.AssignPowersToRoleDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.RolePower; -import cn.bunny.dao.entity.system.UserRole; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.RolePower; +import cn.bunny.dao.entity.mysql.system.UserRole; import cn.bunny.services.factory.RoleFactory; import cn.bunny.services.mapper.system.RolePowerMapper; import cn.bunny.services.mapper.system.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index 6a11ba6..209591a 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -4,10 +4,10 @@ import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.rolePower.role.RoleAddDto; import cn.bunny.dao.dto.system.rolePower.role.RoleDto; import cn.bunny.dao.dto.system.rolePower.role.RoleUpdateDto; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.entity.system.UserRole; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.entity.mysql.system.UserRole; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.RoleVo; import cn.bunny.services.factory.RoleFactory; import cn.bunny.services.mapper.system.RoleMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java index dd71af3..d9bb53c 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java @@ -2,8 +2,8 @@ package cn.bunny.services.service.system.impl; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.router.AssignRolesToRoutersDto; -import cn.bunny.dao.entity.system.RouterRole; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.RouterRole; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.system.RouterRoleMapper; import cn.bunny.services.service.system.RouterRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index 76cbe94..053491e 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -6,12 +6,12 @@ import cn.bunny.dao.dto.system.router.RouterAddDto; import cn.bunny.dao.dto.system.router.RouterManageDto; import cn.bunny.dao.dto.system.router.RouterUpdateByIdWithRankDto; import cn.bunny.dao.dto.system.router.RouterUpdateDto; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.entity.system.Router; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.view.ViewRolePower; -import cn.bunny.dao.view.ViewRouterRole; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.entity.mysql.system.Router; +import cn.bunny.dao.views.ViewRolePower; +import cn.bunny.dao.views.ViewRouterRole; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.router.RouterManageVo; import cn.bunny.dao.vo.system.router.RouterMeta; import cn.bunny.dao.vo.system.router.UserRouterVo; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java index 8a686b2..037db52 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.dao.entity.system.UserDept; +import cn.bunny.dao.entity.mysql.system.UserDept; import cn.bunny.services.mapper.system.UserDeptMapper; import cn.bunny.services.service.system.UserDeptService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index fac4560..b2e390a 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -3,10 +3,10 @@ package cn.bunny.services.service.system.impl; import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.system.user.AssignRolesToUsersDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.UserRole; -import cn.bunny.dao.pojo.constant.RedisUserConstant; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.UserRole; +import cn.bunny.dao.constant.RedisUserConstant; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.factory.UserFactory; import cn.bunny.services.mapper.system.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index b0a7ef5..b5305dd 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -4,19 +4,19 @@ import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.common.service.utils.ip.IpUtil; +import cn.bunny.dao.constant.MinioConstant; +import cn.bunny.dao.constant.RedisUserConstant; import cn.bunny.dao.dto.system.files.FileUploadDto; import cn.bunny.dao.dto.system.user.*; -import cn.bunny.dao.entity.log.UserLoginLog; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.entity.system.UserDept; -import cn.bunny.dao.pojo.constant.MinioConstant; -import cn.bunny.dao.pojo.constant.RedisUserConstant; -import cn.bunny.dao.pojo.enums.EmailTemplateEnums; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; -import cn.bunny.dao.view.ViewUserDept; +import cn.bunny.dao.entity.mysql.log.UserLoginLog; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.entity.mysql.system.Role; +import cn.bunny.dao.entity.mysql.system.UserDept; +import cn.bunny.dao.enums.EmailTemplateEnums; +import cn.bunny.dao.views.ViewUserDept; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.files.FileInfoVo; import cn.bunny.dao.vo.system.user.*; import cn.bunny.services.factory.EmailFactory; diff --git a/service/src/main/resources/mapper/configuration/MenuIconMapper.xml b/service/src/main/resources/mapper/configuration/MenuIconMapper.xml index 6249595..ec429dc 100644 --- a/service/src/main/resources/mapper/configuration/MenuIconMapper.xml +++ b/service/src/main/resources/mapper/configuration/MenuIconMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/email/EmailTemplateMapper.xml b/service/src/main/resources/mapper/email/EmailTemplateMapper.xml index 16f1402..e9aa81d 100644 --- a/service/src/main/resources/mapper/email/EmailTemplateMapper.xml +++ b/service/src/main/resources/mapper/email/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/email/EmailUsersMapper.xml b/service/src/main/resources/mapper/email/EmailUsersMapper.xml index 7aa2ba3..761d04c 100644 --- a/service/src/main/resources/mapper/email/EmailUsersMapper.xml +++ b/service/src/main/resources/mapper/email/EmailUsersMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/financial/BillMapper.xml b/service/src/main/resources/mapper/financial/BillMapper.xml index b0bd95b..9d673cb 100644 --- a/service/src/main/resources/mapper/financial/BillMapper.xml +++ b/service/src/main/resources/mapper/financial/BillMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml index 31d410c..09ff4ac 100644 --- a/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml +++ b/service/src/main/resources/mapper/financial/BudgetCategoryMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/financial/CategoryMapper.xml b/service/src/main/resources/mapper/financial/CategoryMapper.xml index d6bd25f..90aab47 100644 --- a/service/src/main/resources/mapper/financial/CategoryMapper.xml +++ b/service/src/main/resources/mapper/financial/CategoryMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml index 188639a..339872f 100644 --- a/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml +++ b/service/src/main/resources/mapper/financial/DebtRepaymentPlanMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml b/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml index 64a70eb..cddc3b2 100644 --- a/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml +++ b/service/src/main/resources/mapper/financial/DebtTrackingMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/financial/SavingGoalMapper.xml b/service/src/main/resources/mapper/financial/SavingGoalMapper.xml index f6ce75b..bc4e6d5 100644 --- a/service/src/main/resources/mapper/financial/SavingGoalMapper.xml +++ b/service/src/main/resources/mapper/financial/SavingGoalMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/i18n/I18nMapper.xml b/service/src/main/resources/mapper/i18n/I18nMapper.xml index ac0a27c..f982d45 100644 --- a/service/src/main/resources/mapper/i18n/I18nMapper.xml +++ b/service/src/main/resources/mapper/i18n/I18nMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/i18n/I18nTypeMapper.xml b/service/src/main/resources/mapper/i18n/I18nTypeMapper.xml index d8b882d..34a8df4 100644 --- a/service/src/main/resources/mapper/i18n/I18nTypeMapper.xml +++ b/service/src/main/resources/mapper/i18n/I18nTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -31,7 +31,7 @@ - select i18n_type.*, create_user.username as createUsername, diff --git a/service/src/main/resources/mapper/message/MessageMapper.xml b/service/src/main/resources/mapper/message/MessageMapper.xml index 395dea4..eded113 100644 --- a/service/src/main/resources/mapper/message/MessageMapper.xml +++ b/service/src/main/resources/mapper/message/MessageMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/message/MessageReceivedMapper.xml b/service/src/main/resources/mapper/message/MessageReceivedMapper.xml index 426a11b..8595a7d 100644 --- a/service/src/main/resources/mapper/message/MessageReceivedMapper.xml +++ b/service/src/main/resources/mapper/message/MessageReceivedMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/message/MessageTypeMapper.xml b/service/src/main/resources/mapper/message/MessageTypeMapper.xml index c8b7aab..ecb6240 100644 --- a/service/src/main/resources/mapper/message/MessageTypeMapper.xml +++ b/service/src/main/resources/mapper/message/MessageTypeMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml b/service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml index 2aad41f..d1aefd5 100644 --- a/service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml +++ b/service/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/schedule/SchedulersMapper.xml b/service/src/main/resources/mapper/schedule/SchedulersMapper.xml index 7358d07..c43e482 100644 --- a/service/src/main/resources/mapper/schedule/SchedulersMapper.xml +++ b/service/src/main/resources/mapper/schedule/SchedulersMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select from view_qrtz_schedulers diff --git a/service/src/main/resources/mapper/system/DeptMapper.xml b/service/src/main/resources/mapper/system/DeptMapper.xml index 4f85ac5..96e25a2 100644 --- a/service/src/main/resources/mapper/system/DeptMapper.xml +++ b/service/src/main/resources/mapper/system/DeptMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/system/FilesMapper.xml b/service/src/main/resources/mapper/system/FilesMapper.xml index 029a496..b41cc1c 100644 --- a/service/src/main/resources/mapper/system/FilesMapper.xml +++ b/service/src/main/resources/mapper/system/FilesMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/system/PowerMapper.xml b/service/src/main/resources/mapper/system/PowerMapper.xml index f096654..818f3bb 100644 --- a/service/src/main/resources/mapper/system/PowerMapper.xml +++ b/service/src/main/resources/mapper/system/PowerMapper.xml @@ -3,7 +3,7 @@ - + @@ -55,7 +55,7 @@ - SELECT p.* FROM sys_user u, sys_user_role ur, diff --git a/service/src/main/resources/mapper/system/RoleMapper.xml b/service/src/main/resources/mapper/system/RoleMapper.xml index 1430707..8fbd2f5 100644 --- a/service/src/main/resources/mapper/system/RoleMapper.xml +++ b/service/src/main/resources/mapper/system/RoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -50,7 +50,7 @@ - SELECT r.* FROM sys_user u, sys_role r, @@ -62,7 +62,7 @@ - SELECT r.* FROM sys_role r, sys_user_role ur diff --git a/service/src/main/resources/mapper/system/RolePowerMapper.xml b/service/src/main/resources/mapper/system/RolePowerMapper.xml index 9cc5076..23a0f76 100644 --- a/service/src/main/resources/mapper/system/RolePowerMapper.xml +++ b/service/src/main/resources/mapper/system/RolePowerMapper.xml @@ -3,7 +3,7 @@ - + @@ -40,14 +40,14 @@ - select * from sys_role_power where role_id = #{roleId} - SELECT rp.power_id, power.parent_id, power.power_code, diff --git a/service/src/main/resources/mapper/system/RouterMapper.xml b/service/src/main/resources/mapper/system/RouterMapper.xml index b17a7e4..afa2ca6 100644 --- a/service/src/main/resources/mapper/system/RouterMapper.xml +++ b/service/src/main/resources/mapper/system/RouterMapper.xml @@ -3,7 +3,7 @@ - + @@ -49,7 +49,7 @@ - WITH RECURSIVE ParentChain AS ( SELECT * FROM sys_router WHERE id IN diff --git a/service/src/main/resources/mapper/system/RouterRoleMapper.xml b/service/src/main/resources/mapper/system/RouterRoleMapper.xml index c2c5f6e..e611d50 100644 --- a/service/src/main/resources/mapper/system/RouterRoleMapper.xml +++ b/service/src/main/resources/mapper/system/RouterRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -50,7 +50,7 @@ - SELECT rr.router_id, router.parent_id, router.path, diff --git a/service/src/main/resources/mapper/system/UserDeptMapper.xml b/service/src/main/resources/mapper/system/UserDeptMapper.xml index 48f4043..914a5af 100644 --- a/service/src/main/resources/mapper/system/UserDeptMapper.xml +++ b/service/src/main/resources/mapper/system/UserDeptMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/main/resources/mapper/system/UserLoginLogMapper.xml b/service/src/main/resources/mapper/system/UserLoginLogMapper.xml index 2532cfe..6530977 100644 --- a/service/src/main/resources/mapper/system/UserLoginLogMapper.xml +++ b/service/src/main/resources/mapper/system/UserLoginLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -55,7 +55,7 @@ - select from log_user_login where user_id = #{id} diff --git a/service/src/main/resources/mapper/system/UserMapper.xml b/service/src/main/resources/mapper/system/UserMapper.xml index ac10216..2ed3b2d 100644 --- a/service/src/main/resources/mapper/system/UserMapper.xml +++ b/service/src/main/resources/mapper/system/UserMapper.xml @@ -3,7 +3,7 @@ - + @@ -29,7 +29,7 @@ - select user.*, user_dept.dept_id, @@ -72,7 +72,7 @@ - select * from sys_user diff --git a/service/src/main/resources/mapper/system/UserRoleMapper.xml b/service/src/main/resources/mapper/system/UserRoleMapper.xml index bc4625b..df5d0e7 100644 --- a/service/src/main/resources/mapper/system/UserRoleMapper.xml +++ b/service/src/main/resources/mapper/system/UserRoleMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/service/src/test/java/cn/bunny/services/EnumsTest.java b/service/src/test/java/cn/bunny/services/EnumsTest.java index 043b2aa..ad72074 100644 --- a/service/src/test/java/cn/bunny/services/EnumsTest.java +++ b/service/src/test/java/cn/bunny/services/EnumsTest.java @@ -1,6 +1,6 @@ package cn.bunny.services; -import cn.bunny.dao.pojo.enums.EmailTemplateEnums; +import cn.bunny.dao.enums.EmailTemplateEnums; import java.util.Arrays; import java.util.List; diff --git a/service/src/test/java/cn/bunny/services/quartz/MailBillReportByWeekTest.java b/service/src/test/java/cn/bunny/services/quartz/MailBillReportByWeekTest.java index bbf9c1d..5da19eb 100644 --- a/service/src/test/java/cn/bunny/services/quartz/MailBillReportByWeekTest.java +++ b/service/src/test/java/cn/bunny/services/quartz/MailBillReportByWeekTest.java @@ -1,10 +1,10 @@ package cn.bunny.services.quartz; import cn.bunny.dao.dto.financial.bill.BillDto; -import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.entity.system.EmailTemplate; -import cn.bunny.dao.pojo.constant.LocalDateTimeConstant; -import cn.bunny.dao.pojo.enums.EmailTemplateEnums; +import cn.bunny.dao.entity.mysql.system.AdminUser; +import cn.bunny.dao.entity.mysql.system.EmailTemplate; +import cn.bunny.dao.constant.LocalDateTimeConstant; +import cn.bunny.dao.enums.EmailTemplateEnums; import cn.bunny.dao.vo.financial.admin.BillVo; import cn.bunny.services.factory.EmailFactory; import cn.bunny.services.mapper.email.EmailTemplateMapper; diff --git a/service/src/test/java/cn/bunny/services/service/financial/impl/BillServiceImplTest.java b/service/src/test/java/cn/bunny/services/service/financial/impl/BillServiceImplTest.java index a3ba11c..7029a70 100644 --- a/service/src/test/java/cn/bunny/services/service/financial/impl/BillServiceImplTest.java +++ b/service/src/test/java/cn/bunny/services/service/financial/impl/BillServiceImplTest.java @@ -2,11 +2,11 @@ package cn.bunny.services.service.financial.impl; import cn.bunny.common.service.exception.AuthCustomerException; import cn.bunny.dao.dto.financial.bill.IncomeExpenseQueryDto; -import cn.bunny.dao.entity.financial.Category; -import cn.bunny.dao.entity.system.Message; -import cn.bunny.dao.entity.system.MessageReceived; -import cn.bunny.dao.excel.BillExportExcelByUser; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.model.excel.BillExportExcelByUser; +import cn.bunny.dao.vo.result.ResultCodeEnum; +import cn.bunny.dao.entity.mysql.financial.Category; +import cn.bunny.dao.entity.mysql.system.Message; +import cn.bunny.dao.entity.mysql.system.MessageReceived; import cn.bunny.dao.vo.financial.user.expendAndIncome.ExpendWithIncome; import cn.bunny.services.mapper.financial.BillMapper; import cn.bunny.services.mapper.financial.CategoryMapper; diff --git a/service/src/test/java/cn/bunny/services/service/system/impl/UserRequestLogServiceImplTest.java b/service/src/test/java/cn/bunny/services/service/system/impl/UserRequestLogServiceImplTest.java index 9175d97..81bbcf9 100644 --- a/service/src/test/java/cn/bunny/services/service/system/impl/UserRequestLogServiceImplTest.java +++ b/service/src/test/java/cn/bunny/services/service/system/impl/UserRequestLogServiceImplTest.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.dao.entity.log.UserRequestLog; +import cn.bunny.dao.entity.mongo.UserRequestLog; import cn.bunny.services.repository.UserRequestLogRepository; import com.alibaba.fastjson2.JSON; import org.junit.jupiter.api.Test;