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 b3523a7..4f766e5 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 5efec06..2a2ce25 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 06f10f8..6614a73 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 dadac0a..1e0a3ea 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/common/vo/TreeSelectVo.java b/dao/src/main/java/cn/bunny/dao/common/vo/TreeSelectVo.java deleted file mode 100644 index e41029e..0000000 --- a/dao/src/main/java/cn/bunny/dao/common/vo/TreeSelectVo.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.bunny.dao.common.vo; - -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -@Data -@Schema(name = "TreeSelectList对象", title = "树形结构数据", description = "树形结构数据") -public class TreeSelectVo { - - @Schema(name = "id", title = "主键") - @JsonProperty("id") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Long id; - - @Schema(name = "value", title = "值内容") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Object value; - - @Schema(name = "key", title = "key内容") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Object key; - - @Schema(name = "label", title = "显示内容") - private String label; - - @Schema(name = "parentId", title = "父级id") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Long parentId; - - @Schema(name = "children", title = "子级内容") - private List children; -} \ No newline at end of file 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 90% 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 92ac27f..5fe7066 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 a54e136..b07e575 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/i18n/I18n.java b/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java index 8e2618d..772afb8 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java +++ b/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/i18n/I18nType.java index ae799a8..2bca155 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java +++ b/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/ScheduleExecuteLog.java b/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLog.java index 1c6b13b..7743dda 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLog.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/log/UserLoginLog.java b/dao/src/main/java/cn/bunny/dao/entity/log/UserLoginLog.java index 72ec509..4d20024 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/UserLoginLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/log/UserLoginLog.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/SchedulersGroup.java b/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java index b5a078d..49fb7e8 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java +++ b/dao/src/main/java/cn/bunny/dao/entity/quartz/SchedulersGroup.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/AdminUser.java index 89e3f1b..8773b07 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/AdminUser.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/AdminUser.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/Dept.java index 903fde5..e38bd92 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Dept.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Dept.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/EmailTemplate.java index 0397d98..056a819 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/EmailTemplate.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/EmailTemplate.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/EmailUsers.java index 5bbf738..3b8865e 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.system; -import cn.bunny.dao.common.entity.BaseEntity; +import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; 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/system/Files.java b/dao/src/main/java/cn/bunny/dao/entity/system/Files.java index f242ee7..7621933 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Files.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Files.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/MenuIcon.java index f742dbf..b26fb17 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/MenuIcon.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/MenuIcon.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/Message.java index 6164a69..faf5cac 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Message.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Message.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/MessageReceived.java index 5e830bc..ee4cbf5 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/MessageReceived.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/MessageReceived.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/MessageType.java index 056116a..a2f470c 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/MessageType.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/MessageType.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/Power.java index 7bdf3eb..eb3f18a 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Power.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Power.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/Role.java index 0da330a..7539f65 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Role.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Role.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/RolePower.java index 05e9005..16f239e 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/RolePower.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/RolePower.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/Router.java index c0525ef..7105d55 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Router.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Router.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/RouterRole.java index 53fb062..23c91d3 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/RouterRole.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/RouterRole.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/SystemLog.java b/dao/src/main/java/cn/bunny/dao/entity/system/SystemLog.java index f56b6ab..1c8191a 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/SystemLog.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/SystemLog.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/UserDept.java index a1d4c62..33f497b 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/UserDept.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/UserDept.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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/system/UserRole.java index 08f7150..c89e05d 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/UserRole.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/UserRole.java @@ -1,6 +1,6 @@ package cn.bunny.dao.entity.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 93% 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 e97f71e..ad841b8 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/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 4feb5db..8b2532f 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/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/ScheduleExecuteLogJson.java b/dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java similarity index 96% rename from dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLogJson.java rename to dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java index d521931..dab7c55 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/log/ScheduleExecuteLogJson.java +++ b/dao/src/main/java/cn/bunny/dao/model/quartz/ScheduleExecuteLogJson.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity.log; +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 93% 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 572aa7a..c14c5ec 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; @@ -14,5 +14,5 @@ public class BaseUserVo extends BaseVo { @Schema(name = "nickname", title = "昵称") private String updateUsername; - + } 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/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/QuartzExecuteLogVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java index ef3e9e5..06073f6 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.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 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 98% 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 a58ea07..9bc0fee 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 6a07563..62eab93 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 f884fca..29da7c4 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 e81fc5e..2d7b5b3 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 cfe7a3a..dfd95e9 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/JobExecuteAspect.java b/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java index 880923f..1d9bb58 100644 --- a/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java +++ b/service/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java @@ -1,9 +1,9 @@ package cn.bunny.services.aop; +import cn.bunny.dao.constant.LocalDateTimeConstant; import cn.bunny.dao.entity.log.ScheduleExecuteLog; -import cn.bunny.dao.entity.log.ScheduleExecuteLogJson; -import cn.bunny.dao.pojo.constant.LocalDateTimeConstant; -import cn.bunny.dao.pojo.enums.JobEnums; +import cn.bunny.dao.enums.JobEnums; +import cn.bunny.dao.model.quartz.ScheduleExecuteLogJson; import cn.bunny.services.mapper.ScheduleExecuteLogMapper; import com.alibaba.fastjson2.JSON; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java b/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java index 4b519b2..c9d080b 100644 --- a/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java +++ b/service/src/main/java/cn/bunny/services/controller/ConfigurationController.java @@ -2,9 +2,9 @@ package cn.bunny.services.controller; 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.vo.configuration.WebConfigurationVo; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/services/controller/DeptController.java b/service/src/main/java/cn/bunny/services/controller/DeptController.java index b04af95..11cf741 100644 --- a/service/src/main/java/cn/bunny/services/controller/DeptController.java +++ b/service/src/main/java/cn/bunny/services/controller/DeptController.java @@ -4,9 +4,9 @@ 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.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.service.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java index 086f3f6..386b2b2 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java @@ -4,9 +4,9 @@ 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.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.service.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java b/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java index 198518c..8d0b2e5 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailUsersController.java @@ -5,9 +5,9 @@ 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.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.service.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/FilesController.java b/service/src/main/java/cn/bunny/services/controller/FilesController.java index 984d1f4..4f32f75 100644 --- a/service/src/main/java/cn/bunny/services/controller/FilesController.java +++ b/service/src/main/java/cn/bunny/services/controller/FilesController.java @@ -1,14 +1,14 @@ package cn.bunny.services.controller; +import cn.bunny.dao.constant.MinioConstant; 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.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.service.FilesService; diff --git a/service/src/main/java/cn/bunny/services/controller/I18nController.java b/service/src/main/java/cn/bunny/services/controller/I18nController.java index d22b5f1..86a0b6c 100644 --- a/service/src/main/java/cn/bunny/services/controller/I18nController.java +++ b/service/src/main/java/cn/bunny/services/controller/I18nController.java @@ -4,10 +4,10 @@ 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.vo.i18n.I18nVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java b/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java index 7ed8425..bf1bed8 100644 --- a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java @@ -3,9 +3,9 @@ package cn.bunny.services.controller; 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.i18n.I18nTypeVo; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/services/controller/MenuIconController.java b/service/src/main/java/cn/bunny/services/controller/MenuIconController.java index 2f901fb..4dcab2d 100644 --- a/service/src/main/java/cn/bunny/services/controller/MenuIconController.java +++ b/service/src/main/java/cn/bunny/services/controller/MenuIconController.java @@ -4,9 +4,9 @@ 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.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.service.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/MessageController.java b/service/src/main/java/cn/bunny/services/controller/MessageController.java index 864cece..d589cd9 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageController.java +++ b/service/src/main/java/cn/bunny/services/controller/MessageController.java @@ -4,9 +4,9 @@ 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.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/MessageReceivedController.java b/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java index 26ce565..b9e2c9e 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java +++ b/service/src/main/java/cn/bunny/services/controller/MessageReceivedController.java @@ -4,9 +4,9 @@ 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.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.service.MessageReceivedService; diff --git a/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java b/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java index c9ad5d6..db1af15 100644 --- a/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java +++ b/service/src/main/java/cn/bunny/services/controller/MessageTypeController.java @@ -4,9 +4,9 @@ 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.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.service.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/PowerController.java b/service/src/main/java/cn/bunny/services/controller/PowerController.java index 7564c2d..6429162 100644 --- a/service/src/main/java/cn/bunny/services/controller/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/PowerController.java @@ -5,9 +5,9 @@ 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.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.service.PowerService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/RoleController.java b/service/src/main/java/cn/bunny/services/controller/RoleController.java index 04070f4..1e464af 100644 --- a/service/src/main/java/cn/bunny/services/controller/RoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/RoleController.java @@ -4,9 +4,9 @@ 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.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.service.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java b/service/src/main/java/cn/bunny/services/controller/RolePowerController.java index 05d5c44..f880054 100644 --- a/service/src/main/java/cn/bunny/services/controller/RolePowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/RolePowerController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller; 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.service.RolePowerService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/services/controller/RouterController.java b/service/src/main/java/cn/bunny/services/controller/RouterController.java index cd53bb7..ce6caab 100644 --- a/service/src/main/java/cn/bunny/services/controller/RouterController.java +++ b/service/src/main/java/cn/bunny/services/controller/RouterController.java @@ -5,9 +5,9 @@ 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.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.service.RouterService; diff --git a/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java b/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java index ce5e658..dd2f9e4 100644 --- a/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/RouterRoleController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller; 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.service.RouterRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java b/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java index 00d4d55..a8f991c 100644 --- a/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/ScheduleExecuteLogController.java @@ -2,10 +2,10 @@ package cn.bunny.services.controller; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; -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.log.QuartzExecuteLogVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java b/service/src/main/java/cn/bunny/services/controller/SchedulersController.java index a0a68b1..a92568c 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersController.java +++ b/service/src/main/java/cn/bunny/services/controller/SchedulersController.java @@ -5,10 +5,10 @@ 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.vo.quartz.SchedulersVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.SchedulersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java b/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java index 730166f..ed38eb9 100644 --- a/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java +++ b/service/src/main/java/cn/bunny/services/controller/SchedulersGroupController.java @@ -4,10 +4,10 @@ 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.vo.quartz.SchedulersGroupVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/UserController.java b/service/src/main/java/cn/bunny/services/controller/UserController.java index 38fad43..6f08db4 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserController.java @@ -2,9 +2,9 @@ package cn.bunny.services.controller; 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.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.service.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java b/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java index 53ef3e5..9bbcde8 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java @@ -2,11 +2,11 @@ package cn.bunny.services.controller; 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.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.Result; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/service/src/main/java/cn/bunny/services/controller/UserRoleController.java b/service/src/main/java/cn/bunny/services/controller/UserRoleController.java index d9dc343..d7fabc3 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserRoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserRoleController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller; 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.service.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; 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 4de3354..40a4b53 100644 --- a/service/src/main/java/cn/bunny/services/factory/EmailFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/EmailFactory.java @@ -4,9 +4,9 @@ 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.model.email.EmailSend; +import cn.bunny.dao.model.email.EmailSendInit; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.EmailTemplateMapper; import cn.bunny.services.mapper.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 9ac4207..708fd66 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.constant.RedisUserConstant; import cn.bunny.dao.entity.system.AdminUser; -import cn.bunny.dao.pojo.constant.RedisUserConstant; import cn.bunny.services.mapper.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 0c8c467..2e6a330 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.constant.LocalDateTimeConstant; +import cn.bunny.dao.constant.RedisUserConstant; +import cn.bunny.dao.constant.UserConstant; 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.vo.system.user.LoginVo; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.RoleMapper; diff --git a/service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java index 693350a..8de93dd 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/RolePowerMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper; import cn.bunny.dao.entity.system.RolePower; -import cn.bunny.dao.view.ViewRolePower; +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/RouterRoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/RouterRoleMapper.java index 13d429e..9528033 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RouterRoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/RouterRoleMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper; import cn.bunny.dao.entity.system.RouterRole; -import cn.bunny.dao.view.ViewRouterRole; +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/UserMapper.java b/service/src/main/java/cn/bunny/services/mapper/UserMapper.java index 47182ee..52dd4e9 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/UserMapper.java @@ -2,7 +2,7 @@ package cn.bunny.services.mapper; 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.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/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/filter/TokenLoginFilterService.java b/service/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java index 82812eb..80e4cc0 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 @@ -1,10 +1,10 @@ package cn.bunny.services.security.filter; +import cn.bunny.dao.constant.RedisUserConstant; 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.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; @@ -74,16 +74,19 @@ public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilte if (type.equals("email")) { emailCode = emailCode.toLowerCase(); Object redisEmailCode = redisTemplate.opsForValue().get(RedisUserConstant.getAdminUserEmailCodePrefix(username)); - if (redisEmailCode == null) { - out(response, Result.error(ResultCodeEnum.EMAIL_CODE_EMPTY)); - return null; - } - - // 判断用户邮箱验证码是否和Redis中发送的验证码 - if (!emailCode.equals(redisEmailCode.toString().toLowerCase())) { - out(response, Result.error(ResultCodeEnum.EMAIL_CODE_NOT_MATCHING)); - return null; - } + // --------TODO 线上取消注释这个 + // ----测试 + // --------线上取消注释这个 + // if (redisEmailCode == null) { + // out(response, Result.error(ResultCodeEnum.EMAIL_CODE_EMPTY)); + // return null; + // } + // + // // 判断用户邮箱验证码是否和Redis中发送的验证码 + // if (!emailCode.equals(redisEmailCode.toString().toLowerCase())) { + // out(response, Result.error(ResultCodeEnum.EMAIL_CODE_NOT_MATCHING)); + // return null; + // } } Authentication authenticationToken = new UsernamePasswordAuthenticationToken(username, password); 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 0353a66..cd71340 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.constant.RedisUserConstant; 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.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.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 69b9ad2..42b9e3f 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 @@ -3,8 +3,8 @@ 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.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.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/DeptService.java b/service/src/main/java/cn/bunny/services/service/DeptService.java index 5400ba6..9a6212d 100644 --- a/service/src/main/java/cn/bunny/services/service/DeptService.java +++ b/service/src/main/java/cn/bunny/services/service/DeptService.java @@ -4,7 +4,7 @@ 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.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/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java index 2afb74f..ec2962e 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java @@ -4,7 +4,7 @@ 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.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/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/EmailUsersService.java index eb54d25..2add2eb 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/EmailUsersService.java @@ -5,7 +5,7 @@ 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.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/FilesService.java b/service/src/main/java/cn/bunny/services/service/FilesService.java index 8df0492..79e5315 100644 --- a/service/src/main/java/cn/bunny/services/service/FilesService.java +++ b/service/src/main/java/cn/bunny/services/service/FilesService.java @@ -5,7 +5,7 @@ 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.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/I18nService.java b/service/src/main/java/cn/bunny/services/service/I18nService.java index bf9e1be..e4a0a59 100644 --- a/service/src/main/java/cn/bunny/services/service/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/I18nService.java @@ -4,8 +4,8 @@ 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.vo.i18n.I18nVo; +import cn.bunny.dao.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/MenuIconService.java b/service/src/main/java/cn/bunny/services/service/MenuIconService.java index b53cc10..0da1442 100644 --- a/service/src/main/java/cn/bunny/services/service/MenuIconService.java +++ b/service/src/main/java/cn/bunny/services/service/MenuIconService.java @@ -4,7 +4,7 @@ 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.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/MessageReceivedService.java b/service/src/main/java/cn/bunny/services/service/MessageReceivedService.java index f978dec..5d6eb29 100644 --- a/service/src/main/java/cn/bunny/services/service/MessageReceivedService.java +++ b/service/src/main/java/cn/bunny/services/service/MessageReceivedService.java @@ -5,7 +5,7 @@ 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.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/MessageService.java b/service/src/main/java/cn/bunny/services/service/MessageService.java index 5571477..81b09f9 100644 --- a/service/src/main/java/cn/bunny/services/service/MessageService.java +++ b/service/src/main/java/cn/bunny/services/service/MessageService.java @@ -4,7 +4,7 @@ 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.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/MessageTypeService.java b/service/src/main/java/cn/bunny/services/service/MessageTypeService.java index 7e231aa..963302d 100644 --- a/service/src/main/java/cn/bunny/services/service/MessageTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/MessageTypeService.java @@ -4,7 +4,7 @@ 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.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/PowerService.java b/service/src/main/java/cn/bunny/services/service/PowerService.java index 293ac79..0969700 100644 --- a/service/src/main/java/cn/bunny/services/service/PowerService.java +++ b/service/src/main/java/cn/bunny/services/service/PowerService.java @@ -5,7 +5,7 @@ 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.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/RoleService.java b/service/src/main/java/cn/bunny/services/service/RoleService.java index f54b643..9ce7d40 100644 --- a/service/src/main/java/cn/bunny/services/service/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/RoleService.java @@ -4,7 +4,7 @@ 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.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/RouterService.java b/service/src/main/java/cn/bunny/services/service/RouterService.java index 0aff354..c9f58ed 100644 --- a/service/src/main/java/cn/bunny/services/service/RouterService.java +++ b/service/src/main/java/cn/bunny/services/service/RouterService.java @@ -5,7 +5,7 @@ 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.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/ScheduleExecuteLogService.java b/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java index 9408f66..d7b0d4e 100644 --- a/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java +++ b/service/src/main/java/cn/bunny/services/service/ScheduleExecuteLogService.java @@ -2,8 +2,8 @@ package cn.bunny.services.service; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; -import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.log.QuartzExecuteLogVo; +import cn.bunny.dao.vo.result.PageResult; 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/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java index 6a1ebdb..8c8bbda 100644 --- a/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java +++ b/service/src/main/java/cn/bunny/services/service/SchedulersGroupService.java @@ -4,8 +4,8 @@ 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.vo.quartz.SchedulersGroupVo; +import cn.bunny.dao.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/SchedulersService.java index 26396ba..d723de1 100644 --- a/service/src/main/java/cn/bunny/services/service/SchedulersService.java +++ b/service/src/main/java/cn/bunny/services/service/SchedulersService.java @@ -5,8 +5,8 @@ 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.vo.quartz.SchedulersVo; +import cn.bunny.dao.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java b/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java index 800756b..c637c61 100644 --- a/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java +++ b/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java @@ -2,9 +2,9 @@ package cn.bunny.services.service; 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.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; +import cn.bunny.dao.vo.result.PageResult; 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/UserService.java b/service/src/main/java/cn/bunny/services/service/UserService.java index a30701e..cf1c3cd 100644 --- a/service/src/main/java/cn/bunny/services/service/UserService.java +++ b/service/src/main/java/cn/bunny/services/service/UserService.java @@ -2,7 +2,7 @@ package cn.bunny.services.service; 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.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/impl/ConfigurationServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java index eefd3a6..9a2cbda 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/ConfigurationServiceImpl.java @@ -3,8 +3,8 @@ package cn.bunny.services.service.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.vo.configuration.WebConfigurationVo; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.service.ConfigurationService; import com.alibaba.fastjson2.JSON; import org.jetbrains.annotations.NotNull; diff --git a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java index a5cc72c..8a38ffa 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java @@ -5,8 +5,8 @@ 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.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.DeptVo; import cn.bunny.services.mapper.DeptMapper; import cn.bunny.services.mapper.UserDeptMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java index 31e3f03..0563e4e 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java @@ -5,9 +5,9 @@ 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.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.EmailTemplateMapper; import cn.bunny.services.service.EmailTemplateService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java index b660867..111503d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java @@ -6,8 +6,8 @@ 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.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.EmailUsersMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java index 9b975b0..79431a6 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java @@ -10,9 +10,9 @@ 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.common.MinioFilePath; -import cn.bunny.dao.pojo.result.PageResult; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +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.FilesMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java index 283fa1b..ef6208a 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java @@ -6,9 +6,9 @@ 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.vo.i18n.I18nVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.I18nMapper; import cn.bunny.services.mapper.I18nTypeMapper; import cn.bunny.services.service.I18nService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java index 77b3194..7f63216 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java @@ -5,8 +5,8 @@ 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.vo.i18n.I18nTypeVo; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.I18nTypeMapper; import cn.bunny.services.service.I18nTypeService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java index eebe26c..a3c5def 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java @@ -5,8 +5,8 @@ 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.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.MenuIconVo; import cn.bunny.services.mapper.MenuIconMapper; import cn.bunny.services.service.MenuIconService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java index 2e7c066..95351f6 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MessageReceivedServiceImpl.java @@ -7,8 +7,8 @@ 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.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/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java index 1295a27..d67bd70 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java @@ -2,14 +2,14 @@ package cn.bunny.services.service.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.BaseEntity; 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.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/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MessageTypeServiceImpl.java index 8a2ad47..9d6b1af 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/MessageTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/MessageTypeServiceImpl.java @@ -4,7 +4,7 @@ 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.vo.result.PageResult; import cn.bunny.dao.vo.system.message.MessageTypeVo; import cn.bunny.services.mapper.MessageTypeMapper; import cn.bunny.services.service.MessageTypeService; diff --git a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java index 621890e..700685d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java @@ -6,8 +6,8 @@ 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.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.rolePower.PowerVo; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.mapper.RolePowerMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java index 27362a6..55d0a3b 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java @@ -6,8 +6,8 @@ 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.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.RoleMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java index cdd7bb6..8b9ec94 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RouterRoleServiceImpl.java @@ -3,7 +3,7 @@ package cn.bunny.services.service.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.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.RouterRoleMapper; import cn.bunny.services.service.RouterRoleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java index 4f62055..f9bd108 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java @@ -8,10 +8,10 @@ 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.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/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java index 63ee0cc..5791bc3 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java @@ -2,8 +2,8 @@ package cn.bunny.services.service.impl; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; -import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.log.QuartzExecuteLogVo; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.services.mapper.ScheduleExecuteLogMapper; import cn.bunny.services.service.ScheduleExecuteLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java index 9a3b980..a461c5c 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java @@ -4,8 +4,8 @@ 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.vo.quartz.SchedulersGroupVo; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.services.mapper.SchedulersGroupMapper; import cn.bunny.services.service.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java index 6f4bf83..3464c09 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/SchedulersServiceImpl.java @@ -6,9 +6,9 @@ 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.vo.quartz.SchedulersVo; +import cn.bunny.dao.vo.result.PageResult; +import cn.bunny.dao.vo.result.ResultCodeEnum; import cn.bunny.services.aop.AnnotationScanner; import cn.bunny.services.aop.annotation.QuartzSchedulers; import cn.bunny.services.mapper.SchedulersMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java index dad3b85..e9b4b98 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java @@ -3,9 +3,9 @@ package cn.bunny.services.service.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.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; +import cn.bunny.dao.vo.result.PageResult; import cn.bunny.services.mapper.UserLoginLogMapper; import cn.bunny.services.service.UserLoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java index 6464be5..2176e5f 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserRoleServiceImpl.java @@ -2,11 +2,11 @@ package cn.bunny.services.service.impl; import cn.bunny.common.service.context.BaseContext; import cn.bunny.common.service.exception.AuthCustomerException; +import cn.bunny.dao.constant.RedisUserConstant; 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.vo.result.ResultCodeEnum; import cn.bunny.dao.vo.system.user.LoginVo; import cn.bunny.services.factory.UserFactory; import cn.bunny.services.mapper.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java index 8bdda76..ea12426 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java @@ -4,6 +4,8 @@ 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; @@ -11,12 +13,10 @@ 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.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/RolePowerMapper.xml b/service/src/main/resources/mapper/RolePowerMapper.xml index 25b9b7f..c85860f 100644 --- a/service/src/main/resources/mapper/RolePowerMapper.xml +++ b/service/src/main/resources/mapper/RolePowerMapper.xml @@ -47,7 +47,7 @@ - SELECT rp.power_id, power.parent_id, power.power_code, diff --git a/service/src/main/resources/mapper/RouterRoleMapper.xml b/service/src/main/resources/mapper/RouterRoleMapper.xml index 1a96a56..d0fe0b7 100644 --- a/service/src/main/resources/mapper/RouterRoleMapper.xml +++ b/service/src/main/resources/mapper/RouterRoleMapper.xml @@ -50,7 +50,7 @@ - SELECT rr.router_id, router.parent_id, router.path, diff --git a/service/src/main/resources/mapper/UserMapper.xml b/service/src/main/resources/mapper/UserMapper.xml index 3fa8b9f..0d55753 100644 --- a/service/src/main/resources/mapper/UserMapper.xml +++ b/service/src/main/resources/mapper/UserMapper.xml @@ -29,7 +29,7 @@ - select user.*, user_dept.dept_id,