refactor: 实体类移动

ReadMe.md

@@ -1,181 +1,264 @@
-# 项目预览
+# 环境搭建
 
-不知道为什么，图床用的使自己的，Gitee就是不显示其它GitHub和Gitea都能显示就Gitee显示不出来
+## Ubuntu环境搭建
-
-或者把项目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
 
 ```shell
-# 更新yum 和 dnf
+sudo apt-get remove docker docker-engine docker.io containerd runc
-yum update -y
+sudo apt update
-dnf update -y
+sudo apt upgrade
-
+sudo apt-get install ca-certificates curl gnupg lsb-release
-# 安装必要依赖
+# 添加Docker官方GPG密钥
-yum install -y yum-utils device-mapper-persistent-data lvm2
+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"
-# 设置镜像源
-sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
-yum list docker-ce --showduplicates | sort -r
-
 # 安装docker
-yum -y install docker-ce.x86_64 
+sudo apt-get install docker-ce docker-ce-cli containerd.io
-
+# 默认情况下，只有root用户和docker组的用户才能运行Docker命令。我们可以将当前用户添加到docker组，以避免每次使用Docker时都需要使用sudo，设置完成后退出当前用户之后再进入既可
-# 开机启动docker
+sudo usermod -aG docker $USER
-systemctl enable docker
+# 运行docker
-systemctl start 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
 ```
 
-**添加以下内容**
+修改配置文件
 
-有注释大概率启动不了
+```yaml
-
+network:
-```
+  ethernets:
-# bind 127.0.0.1 #注释掉这部分，使redis可以外部访问
+    ens33:
-daemonize no #用守护线程的方式启动
+      dhcp4: false
-requirepass 123456
+      addresses: [192.168.3.130/24]
-appendonly yes #redis持久化　　默认是no
+      optional: true
-tcp-keepalive 300 #防止出现远程主机强迫关闭了一个现有的连接的错误 默认是300
+      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
+```bash
-docker pull redis:7.0.10
 docker run -p 6379:6379 --name redis_master \
--v /bunny/docker_data/redis_master/redis.conf:/etc/redis/redis.conf \
+-v ~/docker/docker_data/redis_master/redis.conf:/etc/redis/redis.conf \
--v/bunny/docker_data/redis_master/data:/data \
+-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
+```mysql
-docker stop master
+[mysqld]
-docker rm master
+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 \
+character-set-server=utf8mb4
--v /bunny/docker_data/mysql/master/data:/var/lib/mysql \
+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
+docker stop mongodb
-mysql -uroot -p02120212
+docker rm mongodb
-use mysql
+
-ALTER USER 'root'@'%' IDENTIFIED BY "02120212";
+docker run -it \
-FLUSH PRIVILEGES;
+	--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]
+> mkdir -p ~/docker/docker_data/mongo/conf
-> skip-host-cache
+> mkdir -p ~/docker/docker_data/mongo/logs
-> skip-name-resolve
+> chmod 777 ~/docker/docker_data/mongo/logs
-> secure-file-priv=/var/lib/mysql-files
+> chmod 777 ~/docker/docker_data/mongo/conf
-> user=mysql
 > 
-> # 设置字符集
+> cd ~/docker/docker_data/mongo/logs
-> character-set-server=utf8mb4
+> touch mongod.log
-> collation-server=utf8mb4_unicode_ci
+> chmod 777 mongod.log
-> 
-> # 设置服务器ID（如果是复制集群，确保每个节点的ID唯一）
-> server-id=1
-> 
-> # 启用二进制日志
-> log-bin=mysql-bin
-> 
-> # 设置表名不区分大小写
-> lower_case_table_names = 1
 > 
+> 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" } ] });
+```
 
 # 项目特点
 

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;

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;

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.vo.result.Result;
-import cn.bunny.dao.pojo.result.ResultCodeEnum;
+import cn.bunny.dao.vo.result.ResultCodeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.web.bind.MethodArgumentNotValidException;

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;

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;

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.model.email.EmailSend;
-import cn.bunny.dao.pojo.common.EmailSendInit;
+import cn.bunny.dao.model.email.EmailSendInit;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import org.jetbrains.annotations.NotNull;

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.constant.MinioConstant;
-import cn.bunny.dao.pojo.constant.MinioConstant;
+import cn.bunny.dao.model.file.MinioFilePath;
-import cn.bunny.dao.pojo.result.ResultCodeEnum;
+import cn.bunny.dao.vo.result.ResultCodeEnum;
 import io.minio.*;
 import io.minio.messages.DeleteError;
 import io.minio.messages.DeleteObject;

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
-    
+
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;
 

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;

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;

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;

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;

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.*;
 

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.*;
 

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.*;

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.*;

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.*;
 

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;

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;

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;
 

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.*;
 

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.*;
 

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;

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.*;
 

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.*;
 

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.*;
 

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.*;
 

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;

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.*;
 

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;

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;

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;

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.*;
 

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;

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;

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.*;
 

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.*;
 

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;

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.mongo.ScheduleExecuteLog;
-import cn.bunny.dao.entity.log.schedule.ScheduleExecuteLogJson;
+import cn.bunny.dao.constant.LocalDateTimeConstant;
-import cn.bunny.dao.pojo.constant.LocalDateTimeConstant;
+import cn.bunny.dao.enums.JobEnums;
-import cn.bunny.dao.pojo.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;

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.entity.mongo.UserRequestLog;
-import cn.bunny.dao.pojo.constant.LocalDateTimeConstant;
+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;