From 9356d39347208ab6196dc5e461b954d7904b0e6c Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 1 May 2025 16:17:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8C=85=E7=BB=8F=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bunny/controller/SqlParserController.java | 6 +- .../cn/bunny/controller/TableController.java | 8 +- .../cn/bunny/controller/VmsController.java | 8 +- .../java/cn/bunny/core/DatabaseInfoCore.java | 6 +- .../java/cn/bunny/core/SqlParserCore.java | 4 +- .../bunny/core/vms/AbstractVmsGenerator.java | 4 +- .../vms/VmsArgumentDtoBaseVmsGenerator.java | 2 +- .../cn/bunny/dao/result/ResultCodeEnum.java | 90 ------------------- .../{dao => domain}/dto/VmsArgumentDto.java | 4 +- .../entity/ColumnMetaData.java | 2 +- .../entity/DatabaseInfoMetaData.java | 2 +- .../{dao => domain}/entity/TableMetaData.java | 2 +- .../{dao => domain}/result/PageResult.java | 12 +-- .../bunny/{dao => domain}/result/Result.java | 2 +- .../bunny/domain/result/ResultCodeEnum.java | 90 +++++++++++++++++++ .../bunny/{dao => domain}/vo/GeneratorVo.java | 2 +- .../bunny/{dao => domain}/vo/TableInfoVo.java | 2 +- .../bunny/{dao => domain}/vo/VmsPathVo.java | 2 +- .../exception/GeneratorCodeException.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 +- .../cn/bunny/service/SqlParserService.java | 2 +- .../java/cn/bunny/service/TableService.java | 6 +- .../java/cn/bunny/service/VmsService.java | 6 +- .../service/impl/SqlParserServiceImpl.java | 4 +- .../bunny/service/impl/TableServiceImpl.java | 8 +- .../cn/bunny/service/impl/VmsServiceImpl.java | 10 +-- .../src/main/resources/application-dev.yml | 2 +- .../vms/server/controller/controller.java.vm | 34 +++---- .../server/service/impl/serviceImpl.java.vm | 2 +- .../vms/server/service/service.java.vm | 5 +- .../src/test/java/cn/bunny/JDBCTest.java | 4 +- .../src/test/java/cn/bunny/SqlParserTest.java | 4 +- .../service/impl/VmsServiceImplTest.java | 2 +- .../cn/bunny/utils/DatabaseInfoCoreTest.java | 2 +- generator-code-web/src/utils/file.ts | 2 +- 35 files changed, 172 insertions(+), 175 deletions(-) delete mode 100644 generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/dto/VmsArgumentDto.java (95%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/entity/ColumnMetaData.java (95%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/entity/DatabaseInfoMetaData.java (94%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/entity/TableMetaData.java (94%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/result/PageResult.java (56%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/result/Result.java (99%) create mode 100644 generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/ResultCodeEnum.java rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/vo/GeneratorVo.java (93%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/vo/TableInfoVo.java (94%) rename generator-code-server/generator-code/src/main/java/cn/bunny/{dao => domain}/vo/VmsPathVo.java (92%) diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/controller/SqlParserController.java b/generator-code-server/generator-code/src/main/java/cn/bunny/controller/SqlParserController.java index 6441078..62bcf75 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/controller/SqlParserController.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/controller/SqlParserController.java @@ -1,9 +1,9 @@ package cn.bunny.controller; import cn.bunny.core.SqlParserCore; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.result.Result; -import cn.bunny.dao.vo.TableInfoVo; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.result.Result; +import cn.bunny.domain.vo.TableInfoVo; import cn.bunny.service.SqlParserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/controller/TableController.java b/generator-code-server/generator-code/src/main/java/cn/bunny/controller/TableController.java index b53163d..62030a1 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/controller/TableController.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/controller/TableController.java @@ -1,9 +1,9 @@ package cn.bunny.controller; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.DatabaseInfoMetaData; -import cn.bunny.dao.result.Result; -import cn.bunny.dao.vo.TableInfoVo; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.DatabaseInfoMetaData; +import cn.bunny.domain.result.Result; +import cn.bunny.domain.vo.TableInfoVo; import cn.bunny.service.TableService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/controller/VmsController.java b/generator-code-server/generator-code/src/main/java/cn/bunny/controller/VmsController.java index dace7af..9d82778 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/controller/VmsController.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/controller/VmsController.java @@ -1,9 +1,9 @@ package cn.bunny.controller; -import cn.bunny.dao.dto.VmsArgumentDto; -import cn.bunny.dao.result.Result; -import cn.bunny.dao.vo.GeneratorVo; -import cn.bunny.dao.vo.VmsPathVo; +import cn.bunny.domain.dto.VmsArgumentDto; +import cn.bunny.domain.result.Result; +import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.domain.vo.VmsPathVo; import cn.bunny.service.VmsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/core/DatabaseInfoCore.java b/generator-code-server/generator-code/src/main/java/cn/bunny/core/DatabaseInfoCore.java index 58c7789..30414ef 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/core/DatabaseInfoCore.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/core/DatabaseInfoCore.java @@ -1,8 +1,8 @@ package cn.bunny.core; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.DatabaseInfoMetaData; -import cn.bunny.dao.entity.TableMetaData; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.DatabaseInfoMetaData; +import cn.bunny.domain.entity.TableMetaData; import jakarta.annotation.Resource; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/core/SqlParserCore.java b/generator-code-server/generator-code/src/main/java/cn/bunny/core/SqlParserCore.java index 43a914d..d657ab5 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/core/SqlParserCore.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/core/SqlParserCore.java @@ -1,7 +1,7 @@ package cn.bunny.core; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.TableMetaData; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.TableMetaData; import lombok.SneakyThrows; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.parser.CCJSqlParserUtil; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/AbstractVmsGenerator.java b/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/AbstractVmsGenerator.java index 1fa4715..7717c6e 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/AbstractVmsGenerator.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/AbstractVmsGenerator.java @@ -1,7 +1,7 @@ package cn.bunny.core.vms; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.TableMetaData; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.TableMetaData; import org.apache.velocity.VelocityContext; import java.io.StringWriter; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/VmsArgumentDtoBaseVmsGenerator.java b/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/VmsArgumentDtoBaseVmsGenerator.java index 159ac53..1ef78b2 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/VmsArgumentDtoBaseVmsGenerator.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/core/vms/VmsArgumentDtoBaseVmsGenerator.java @@ -1,7 +1,7 @@ package cn.bunny.core.vms; import cn.bunny.core.TypeConvertCore; -import cn.bunny.dao.dto.VmsArgumentDto; +import cn.bunny.domain.dto.VmsArgumentDto; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java b/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java deleted file mode 100644 index c83e50c..0000000 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/ResultCodeEnum.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.bunny.dao.result; - -import lombok.Getter; - -/** - * 统一返回结果状态信息类 - */ -@Getter -public enum ResultCodeEnum { - // 成功操作 200 - SUCCESS(200, "操作成功" ), - ADD_SUCCESS(200, "添加成功" ), - UPDATE_SUCCESS(200, "修改成功" ), - DELETE_SUCCESS(200, "删除成功" ), - SORT_SUCCESS(200, "排序成功" ), - SUCCESS_UPLOAD(200, "上传成功" ), - SUCCESS_LOGOUT(200, "退出成功" ), - LOGOUT_SUCCESS(200, "退出成功" ), - EMAIL_CODE_REFRESH(200, "邮箱验证码已刷新" ), - EMAIL_CODE_SEND_SUCCESS(200, "邮箱验证码已发送" ), - - // 验证错误 201 - USERNAME_OR_PASSWORD_NOT_EMPTY(201, "用户名或密码不能为空" ), - EMAIL_CODE_NOT_EMPTY(201, "邮箱验证码不能为空" ), - SEND_EMAIL_CODE_NOT_EMPTY(201, "请先发送邮箱验证码" ), - EMAIL_CODE_NOT_MATCHING(201, "邮箱验证码不匹配" ), - LOGIN_ERROR(500, "账号或密码错误" ), - LOGIN_ERROR_USERNAME_PASSWORD_NOT_EMPTY(201, "登录信息不能为空" ), - GET_BUCKET_EXCEPTION(201, "获取文件信息失败" ), - SEND_MAIL_CODE_ERROR(201, "邮件发送失败" ), - EMAIL_CODE_EMPTY(201, "邮箱验证码过期或不存在" ), - EMAIL_EXIST(201, "邮箱已存在" ), - REQUEST_IS_EMPTY(201, "请求数据为空" ), - DATA_TOO_LARGE(201, "请求数据为空" ), - UPDATE_NEW_PASSWORD_SAME_AS_OLD_PASSWORD(201, "新密码与密码相同" ), - - // 数据相关 206 - ILLEGAL_REQUEST(206, "非法请求" ), - REPEAT_SUBMIT(206, "重复提交" ), - DATA_ERROR(206, "数据异常" ), - EMAIL_USER_TEMPLATE_IS_EMPTY(206, "邮件模板为空" ), - EMAIL_TEMPLATE_IS_EMPTY(206, "邮件模板为空" ), - EMAIL_USER_IS_EMPTY(206, "关联邮件用户配置为空" ), - DATA_EXIST(206, "数据已存在" ), - DATA_NOT_EXIST(206, "数据不存在" ), - ALREADY_USER_EXCEPTION(206, "用户已存在" ), - USER_IS_EMPTY(206, "用户不存在" ), - FILE_NOT_EXIST(206, "文件不存在" ), - NEW_PASSWORD_SAME_OLD_PASSWORD(206, "新密码不能和旧密码相同" ), - MISSING_TEMPLATE_FILES(206, "缺少模板文件" ), - - // 身份过期 208 - LOGIN_AUTH(208, "请先登陆" ), - AUTHENTICATION_EXPIRED(208, "身份验证过期" ), - SESSION_EXPIRATION(208, "会话过期" ), - - // 209 - THE_SAME_USER_HAS_LOGGED_IN(209, "相同用户已登录" ), - - // 提示错误 - UPDATE_ERROR(216, "修改失败" ), - URL_ENCODE_ERROR(216, "URL编码失败" ), - ILLEGAL_CALLBACK_REQUEST_ERROR(217, "非法回调请求" ), - FETCH_USERINFO_ERROR(219, "获取用户信息失败" ), - ILLEGAL_DATA_REQUEST(219, "非法数据请求" ), - CLASS_NOT_FOUND(219, "类名不存在" ), - ADMIN_ROLE_CAN_NOT_DELETED(219, "无法删除admin角色" ), - ROUTER_RANK_NEED_LARGER_THAN_THE_PARENT(219, "设置路由等级需要大于或等于父级的路由等级" ), - - // 无权访问 403 - FAIL_NO_ACCESS_DENIED(403, "无权访问" ), - FAIL_NO_ACCESS_DENIED_USER_OFFLINE(403, "用户强制下线" ), - TOKEN_PARSING_FAILED(403, "token解析失败" ), - FAIL_NO_ACCESS_DENIED_USER_LOCKED(403, "该账户已封禁" ), - - // 系统错误 500 - UNKNOWN_EXCEPTION(500, "服务异常" ), - SERVICE_ERROR(500, "服务异常" ), - UPLOAD_ERROR(500, "上传失败" ), - FAIL(500, "失败" ), - ; - - private final Integer code; - private final String message; - - ResultCodeEnum(Integer code, String message) { - this.code = code; - this.message = message; - } -} \ No newline at end of file diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java similarity index 95% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java index d096a44..2498f94 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/dto/VmsArgumentDto.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java @@ -1,17 +1,15 @@ -package cn.bunny.dao.dto; +package cn.bunny.domain.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; @Data -@Builder @AllArgsConstructor @NoArgsConstructor public class VmsArgumentDto { diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/ColumnMetaData.java similarity index 95% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/ColumnMetaData.java index d2c10d0..bab09c2 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/ColumnMetaData.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/ColumnMetaData.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity; +package cn.bunny.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/DatabaseInfoMetaData.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/DatabaseInfoMetaData.java similarity index 94% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/DatabaseInfoMetaData.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/DatabaseInfoMetaData.java index e6741c7..3d82be9 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/DatabaseInfoMetaData.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/DatabaseInfoMetaData.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity; +package cn.bunny.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/TableMetaData.java similarity index 94% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/TableMetaData.java index 502c817..966bd5d 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/entity/TableMetaData.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/entity/TableMetaData.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.entity; +package cn.bunny.domain.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/PageResult.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/PageResult.java similarity index 56% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/PageResult.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/PageResult.java index c18b55e..f717ce4 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/PageResult.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/PageResult.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.result; +package cn.bunny.domain.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -16,19 +16,19 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Builder -@Schema(name = "PageResult 对象" , title = "分页返回结果" , description = "分页返回结果" ) +@Schema(name = "PageResult 对象", title = "分页返回结果", description = "分页返回结果") public class PageResult implements Serializable { - @Schema(name = "pageNo" , title = "当前页" ) + @Schema(name = "pageNo", title = "当前页") private Long pageNo; - @Schema(name = "pageSize" , title = "每页记录数" ) + @Schema(name = "pageSize", title = "每页记录数") private Long pageSize; - @Schema(name = "total" , title = "总记录数" ) + @Schema(name = "total", title = "总记录数") private Long total; - @Schema(name = "list" , title = "当前页数据集合" ) + @Schema(name = "list", title = "当前页数据集合") private List list; } \ No newline at end of file diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/Result.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/Result.java similarity index 99% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/Result.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/Result.java index a8eca29..97cc870 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/result/Result.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/Result.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.result; +package cn.bunny.domain.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/ResultCodeEnum.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/ResultCodeEnum.java new file mode 100644 index 0000000..fdf7510 --- /dev/null +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/result/ResultCodeEnum.java @@ -0,0 +1,90 @@ +package cn.bunny.domain.result; + +import lombok.Getter; + +/** + * 统一返回结果状态信息类 + */ +@Getter +public enum ResultCodeEnum { + // 成功操作 200 + SUCCESS(200, "操作成功"), + ADD_SUCCESS(200, "添加成功"), + UPDATE_SUCCESS(200, "修改成功"), + DELETE_SUCCESS(200, "删除成功"), + SORT_SUCCESS(200, "排序成功"), + SUCCESS_UPLOAD(200, "上传成功"), + SUCCESS_LOGOUT(200, "退出成功"), + LOGOUT_SUCCESS(200, "退出成功"), + EMAIL_CODE_REFRESH(200, "邮箱验证码已刷新"), + EMAIL_CODE_SEND_SUCCESS(200, "邮箱验证码已发送"), + + // 验证错误 201 + USERNAME_OR_PASSWORD_NOT_EMPTY(201, "用户名或密码不能为空"), + EMAIL_CODE_NOT_EMPTY(201, "邮箱验证码不能为空"), + SEND_EMAIL_CODE_NOT_EMPTY(201, "请先发送邮箱验证码"), + EMAIL_CODE_NOT_MATCHING(201, "邮箱验证码不匹配"), + LOGIN_ERROR(500, "账号或密码错误"), + LOGIN_ERROR_USERNAME_PASSWORD_NOT_EMPTY(201, "登录信息不能为空"), + GET_BUCKET_EXCEPTION(201, "获取文件信息失败"), + SEND_MAIL_CODE_ERROR(201, "邮件发送失败"), + EMAIL_CODE_EMPTY(201, "邮箱验证码过期或不存在"), + EMAIL_EXIST(201, "邮箱已存在"), + REQUEST_IS_EMPTY(201, "请求数据为空"), + DATA_TOO_LARGE(201, "请求数据为空"), + UPDATE_NEW_PASSWORD_SAME_AS_OLD_PASSWORD(201, "新密码与密码相同"), + + // 数据相关 206 + ILLEGAL_REQUEST(206, "非法请求"), + REPEAT_SUBMIT(206, "重复提交"), + DATA_ERROR(206, "数据异常"), + EMAIL_USER_TEMPLATE_IS_EMPTY(206, "邮件模板为空"), + EMAIL_TEMPLATE_IS_EMPTY(206, "邮件模板为空"), + EMAIL_USER_IS_EMPTY(206, "关联邮件用户配置为空"), + DATA_EXIST(206, "数据已存在"), + DATA_NOT_EXIST(206, "数据不存在"), + ALREADY_USER_EXCEPTION(206, "用户已存在"), + USER_IS_EMPTY(206, "用户不存在"), + FILE_NOT_EXIST(206, "文件不存在"), + NEW_PASSWORD_SAME_OLD_PASSWORD(206, "新密码不能和旧密码相同"), + MISSING_TEMPLATE_FILES(206, "缺少模板文件"), + + // 身份过期 208 + LOGIN_AUTH(208, "请先登陆"), + AUTHENTICATION_EXPIRED(208, "身份验证过期"), + SESSION_EXPIRATION(208, "会话过期"), + + // 209 + THE_SAME_USER_HAS_LOGGED_IN(209, "相同用户已登录"), + + // 提示错误 + UPDATE_ERROR(216, "修改失败"), + URL_ENCODE_ERROR(216, "URL编码失败"), + ILLEGAL_CALLBACK_REQUEST_ERROR(217, "非法回调请求"), + FETCH_USERINFO_ERROR(219, "获取用户信息失败"), + ILLEGAL_DATA_REQUEST(219, "非法数据请求"), + CLASS_NOT_FOUND(219, "类名不存在"), + ADMIN_ROLE_CAN_NOT_DELETED(219, "无法删除admin角色"), + ROUTER_RANK_NEED_LARGER_THAN_THE_PARENT(219, "设置路由等级需要大于或等于父级的路由等级"), + + // 无权访问 403 + FAIL_NO_ACCESS_DENIED(403, "无权访问"), + FAIL_NO_ACCESS_DENIED_USER_OFFLINE(403, "用户强制下线"), + TOKEN_PARSING_FAILED(403, "token解析失败"), + FAIL_NO_ACCESS_DENIED_USER_LOCKED(403, "该账户已封禁"), + + // 系统错误 500 + UNKNOWN_EXCEPTION(500, "服务异常"), + SERVICE_ERROR(500, "服务异常"), + UPLOAD_ERROR(500, "上传失败"), + FAIL(500, "失败"), + ; + + private final Integer code; + private final String message; + + ResultCodeEnum(Integer code, String message) { + this.code = code; + this.message = message; + } +} \ No newline at end of file diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/GeneratorVo.java similarity index 93% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/GeneratorVo.java index 8223b84..298b178 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/GeneratorVo.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/GeneratorVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo; +package cn.bunny.domain.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/TableInfoVo.java similarity index 94% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/TableInfoVo.java index c60e480..bff677d 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/TableInfoVo.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/TableInfoVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo; +package cn.bunny.domain.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/VmsPathVo.java similarity index 92% rename from generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java rename to generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/VmsPathVo.java index a8ee0dd..e841da7 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/dao/vo/VmsPathVo.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/vo/VmsPathVo.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.vo; +package cn.bunny.domain.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GeneratorCodeException.java b/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GeneratorCodeException.java index 8ee61aa..656e4b9 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GeneratorCodeException.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GeneratorCodeException.java @@ -1,6 +1,6 @@ package cn.bunny.exception; -import cn.bunny.dao.result.ResultCodeEnum; +import cn.bunny.domain.result.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java b/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java index ce50ad5..4ced964 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/exception/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ package cn.bunny.exception; -import cn.bunny.dao.result.Result; -import cn.bunny.dao.result.ResultCodeEnum; +import cn.bunny.domain.result.Result; +import cn.bunny.domain.result.ResultCodeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.util.StringUtils; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/SqlParserService.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/SqlParserService.java index ba63a2f..e755d5f 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/SqlParserService.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/SqlParserService.java @@ -1,6 +1,6 @@ package cn.bunny.service; -import cn.bunny.dao.vo.TableInfoVo; +import cn.bunny.domain.vo.TableInfoVo; public interface SqlParserService { /** diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/TableService.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/TableService.java index bca186f..f416c90 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/TableService.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/TableService.java @@ -1,8 +1,8 @@ package cn.bunny.service; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.DatabaseInfoMetaData; -import cn.bunny.dao.vo.TableInfoVo; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.DatabaseInfoMetaData; +import cn.bunny.domain.vo.TableInfoVo; import java.util.List; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/VmsService.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/VmsService.java index 12d9c1b..06a9a4c 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/VmsService.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/VmsService.java @@ -1,8 +1,8 @@ package cn.bunny.service; -import cn.bunny.dao.dto.VmsArgumentDto; -import cn.bunny.dao.vo.GeneratorVo; -import cn.bunny.dao.vo.VmsPathVo; +import cn.bunny.domain.dto.VmsArgumentDto; +import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.domain.vo.VmsPathVo; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/SqlParserServiceImpl.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/SqlParserServiceImpl.java index 72378f4..0f76fb7 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/SqlParserServiceImpl.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/SqlParserServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.service.impl; import cn.bunny.core.SqlParserCore; -import cn.bunny.dao.entity.TableMetaData; -import cn.bunny.dao.vo.TableInfoVo; +import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.domain.vo.TableInfoVo; import cn.bunny.service.SqlParserService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java index c34420f..86ef9fb 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/TableServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.service.impl; import cn.bunny.core.DatabaseInfoCore; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.DatabaseInfoMetaData; -import cn.bunny.dao.entity.TableMetaData; -import cn.bunny.dao.vo.TableInfoVo; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.DatabaseInfoMetaData; +import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.domain.vo.TableInfoVo; import cn.bunny.service.TableService; import jakarta.annotation.Resource; import lombok.SneakyThrows; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java index ddeaeea..66c9245 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java @@ -4,11 +4,11 @@ import cn.bunny.core.DatabaseInfoCore; import cn.bunny.core.ResourceFileCore; import cn.bunny.core.SqlParserCore; import cn.bunny.core.vms.VmsArgumentDtoBaseVmsGenerator; -import cn.bunny.dao.dto.VmsArgumentDto; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.TableMetaData; -import cn.bunny.dao.vo.GeneratorVo; -import cn.bunny.dao.vo.VmsPathVo; +import cn.bunny.domain.dto.VmsArgumentDto; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.TableMetaData; +import cn.bunny.domain.vo.GeneratorVo; +import cn.bunny.domain.vo.VmsPathVo; import cn.bunny.service.VmsService; import cn.bunny.utils.VmsUtil; import cn.hutool.crypto.digest.MD5; diff --git a/generator-code-server/generator-code/src/main/resources/application-dev.yml b/generator-code-server/generator-code/src/main/resources/application-dev.yml index 7342bc0..a8bc19d 100644 --- a/generator-code-server/generator-code/src/main/resources/application-dev.yml +++ b/generator-code-server/generator-code/src/main/resources/application-dev.yml @@ -3,6 +3,6 @@ bunny: # host: 192.168.3.137 host: localhost port: 3306 - database: auth_admin + database: bunny_admin username: root password: "123456" diff --git a/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm b/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm index f861711..e510b29 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm @@ -1,14 +1,14 @@ package ${package}.controller; -import cn.bunny.dao.pojo.result.Result; -import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.domain.pojo.result.Result; +import cn.bunny.domain.pojo.result.ResultCodeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Mono; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.domain.pojo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -21,43 +21,43 @@ import java.util.List; * @author ${author} * @since ${date} */ -@Tag(name = "${comment}" , description = "${comment}相关接口" ) +@Tag(name = "${comment}", description = "${comment}相关接口") @RestController -@RequestMapping("${requestMapping}/${classLowercaseName}" ) +@RequestMapping("${requestMapping}/${classLowercaseName}") public class ${classUppercaseName}Controller { @Autowired private ${classUppercaseName}Service ${classLowercaseName}Service; - @Operation(summary = "分页查询${comment}" , description = "分页查询${comment}" ) - @GetMapping("get${classUppercaseName}List/{page}/{limit}" ) + @Operation(summary = "分页查询${comment}", description = "分页查询${comment}") + @GetMapping("get${classUppercaseName}List/{page}/{limit}") public Result> get${classUppercaseName}List( - @Parameter(name = "page" , description = "当前页" , required = true) - @PathVariable("page" ) Integer page, - @Parameter(name = "limit" , description = "每页记录数" , required = true) - @PathVariable("limit" ) Integer limit, + @Parameter(name = "page", description = "当前页", required = true) + @PathVariable("page") Integer page, + @Parameter(name = "limit", description = "每页记录数", required = true) + @PathVariable("limit") Integer limit, ${classUppercaseName}Dto dto) { Page<${classUppercaseName}> pageParams = new Page<>(page, limit); PageResult<${classUppercaseName}Vo> pageResult = ${classLowercaseName}Service.get${classUppercaseName}List(pageParams, dto); return Result.success(pageResult); } - @Operation(summary = "添加${comment}" , description = "添加${comment}" ) - @PostMapping("add${classUppercaseName}" ) + @Operation(summary = "添加${comment}", description = "添加${comment}") + @PostMapping("add${classUppercaseName}") public Result add${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}AddDto dto) { ${classLowercaseName}Service.add${classUppercaseName}(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新${comment}" , description = "更新${comment}" ) - @PutMapping("update${classUppercaseName}" ) + @Operation(summary = "更新${comment}", description = "更新${comment}") + @PutMapping("update${classUppercaseName}") public Result update${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}UpdateDto dto) { ${classLowercaseName}Service.update${classUppercaseName}(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除${comment}" , description = "删除${comment}" ) - @DeleteMapping("delete${classUppercaseName}" ) + @Operation(summary = "删除${comment}", description = "删除${comment}") + @DeleteMapping("delete${classUppercaseName}") public Result delete${classUppercaseName}(@RequestBody List ids) { ${classLowercaseName}Service.delete${classUppercaseName}(ids); return Result.success(ResultCodeEnum.DELETE_SUCCESS); diff --git a/generator-code-server/generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm b/generator-code-server/generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm index 8f70329..1b1dd77 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/server/service/impl/serviceImpl.java.vm @@ -1,6 +1,6 @@ package ${package}.service.impl; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.domain.pojo.result.PageResult; import ${package}.mapper.${classUppercaseName}Mapper; import ${package}.service.${classUppercaseName}Service; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/generator-code-server/generator-code/src/main/resources/vms/server/service/service.java.vm b/generator-code-server/generator-code/src/main/resources/vms/server/service/service.java.vm index 64656e6..f33d4c6 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/server/service/service.java.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/server/service/service.java.vm @@ -1,12 +1,11 @@ package ${package}.service; -import cn.bunny.dao.entity.system.MenuIcon; -import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.domain.entity.system.MenuIcon; +import cn.bunny.domain.pojo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; -import java.util.HashMap; import java.util.List; /** diff --git a/generator-code-server/generator-code/src/test/java/cn/bunny/JDBCTest.java b/generator-code-server/generator-code/src/test/java/cn/bunny/JDBCTest.java index 2753380..27eb873 100644 --- a/generator-code-server/generator-code/src/test/java/cn/bunny/JDBCTest.java +++ b/generator-code-server/generator-code/src/test/java/cn/bunny/JDBCTest.java @@ -2,8 +2,8 @@ package cn.bunny; import cn.bunny.core.TypeConvertCore; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.TableMetaData; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.TableMetaData; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/generator-code-server/generator-code/src/test/java/cn/bunny/SqlParserTest.java b/generator-code-server/generator-code/src/test/java/cn/bunny/SqlParserTest.java index 859ef28..e328ccf 100644 --- a/generator-code-server/generator-code/src/test/java/cn/bunny/SqlParserTest.java +++ b/generator-code-server/generator-code/src/test/java/cn/bunny/SqlParserTest.java @@ -1,8 +1,8 @@ package cn.bunny; import cn.bunny.core.TypeConvertCore; -import cn.bunny.dao.entity.ColumnMetaData; -import cn.bunny.dao.entity.TableMetaData; +import cn.bunny.domain.entity.ColumnMetaData; +import cn.bunny.domain.entity.TableMetaData; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.statement.Statement; diff --git a/generator-code-server/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java b/generator-code-server/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java index 58ddb9b..f427a0b 100644 --- a/generator-code-server/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java +++ b/generator-code-server/generator-code/src/test/java/cn/bunny/service/impl/VmsServiceImplTest.java @@ -1,7 +1,7 @@ package cn.bunny.service.impl; import cn.bunny.core.ResourceFileCore; -import cn.bunny.dao.vo.VmsPathVo; +import cn.bunny.domain.vo.VmsPathVo; import com.alibaba.fastjson2.JSON; import org.junit.jupiter.api.Test; diff --git a/generator-code-server/generator-code/src/test/java/cn/bunny/utils/DatabaseInfoCoreTest.java b/generator-code-server/generator-code/src/test/java/cn/bunny/utils/DatabaseInfoCoreTest.java index 033ffd1..18d5e2b 100644 --- a/generator-code-server/generator-code/src/test/java/cn/bunny/utils/DatabaseInfoCoreTest.java +++ b/generator-code-server/generator-code/src/test/java/cn/bunny/utils/DatabaseInfoCoreTest.java @@ -1,6 +1,6 @@ package cn.bunny.utils; -import cn.bunny.dao.entity.TableMetaData; +import cn.bunny.domain.entity.TableMetaData; import lombok.SneakyThrows; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/generator-code-web/src/utils/file.ts b/generator-code-web/src/utils/file.ts index 8ed1faa..20316f8 100644 --- a/generator-code-web/src/utils/file.ts +++ b/generator-code-web/src/utils/file.ts @@ -25,7 +25,7 @@ export const downloadBlob = (response: any) => { const contentDisposition = response.headers['content-disposition']; let fileName = 'download.zip'; if (contentDisposition) { - const fileNameMatch = contentDisposition.match(/filename="?(.+)"?/); + const fileNameMatch = contentDisposition.match(/filename="?(.+)"/); if (fileNameMatch && fileNameMatch[1]) { fileName = fileNameMatch[1]; }