From ef88ed0103ec0c2e67015963e5f4f0d8539a76bb Mon Sep 17 00:00:00 2001 From: Lxy Date: Sat, 4 Jul 2026 08:01:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book-system/pom.xml | 6 ++++ .../changes/add-api-versioning/.comet.yaml | 7 ----- .../changes/add-api-versioning/proposal.md | 24 --------------- openspec/changes/add-api-versioning/tasks.md | 30 ------------------- pom.xml | 4 ++- .../src/main/resources/application-druid.yml | 4 +-- .../web/exception/GlobalExceptionHandler.java | 12 -------- ruoyi-ui-next/src/auto-imports.d.ts | 20 +------------ 8 files changed, 12 insertions(+), 95 deletions(-) delete mode 100644 openspec/changes/add-api-versioning/.comet.yaml delete mode 100644 openspec/changes/add-api-versioning/proposal.md delete mode 100644 openspec/changes/add-api-versioning/tasks.md diff --git a/book-system/pom.xml b/book-system/pom.xml index d430431..166388e 100644 --- a/book-system/pom.xml +++ b/book-system/pom.xml @@ -23,6 +23,12 @@ spring-boot-starter + + + io.springfox + springfox-boot-starter + + com.ruoyi diff --git a/openspec/changes/add-api-versioning/.comet.yaml b/openspec/changes/add-api-versioning/.comet.yaml deleted file mode 100644 index e2473f9..0000000 --- a/openspec/changes/add-api-versioning/.comet.yaml +++ /dev/null @@ -1,7 +0,0 @@ -change_name: add-api-versioning -phase: build -auto_transition: true -build_pause: null -verify_result: null -archived: false -workflow: full diff --git a/openspec/changes/add-api-versioning/proposal.md b/openspec/changes/add-api-versioning/proposal.md deleted file mode 100644 index f287849..0000000 --- a/openspec/changes/add-api-versioning/proposal.md +++ /dev/null @@ -1,24 +0,0 @@ -# P1 优化：API 版本管理 - -## 目标 - -为 RuoYi-Vue 后端实现 API 版本控制，支持向后兼容和渐进式升级。 - -## 范围 - -- URL 路径版本控制（/api/v1/、/api/v2/） -- 版本路由映射 -- 版本弃用机制 -- 版本文档 - -## 技术栈 - -- Spring MVC -- 自定义注解 -- 请求映射 - -## 验收标准 - -- 支持 v1、v2 版本 -- 版本路由正确映射 -- 向后兼容 diff --git a/openspec/changes/add-api-versioning/tasks.md b/openspec/changes/add-api-versioning/tasks.md deleted file mode 100644 index 170954d..0000000 --- a/openspec/changes/add-api-versioning/tasks.md +++ /dev/null @@ -1,30 +0,0 @@ -# Tasks: API 版本管理 - -## Task 1: 版本配置 - -- [ ] 1.1 创建版本注解 -- [ ] 1.2 配置版本路由 -- [ ] 1.3 创建版本常量 - -## Task 2: 版本 Controller - -- [ ] 2.1 创建 v1 版本 Controller 示例 -- [ ] 2.2 创建 v2 版本 Controller 示例 -- [ ] 2.3 版本路由映射 - -## Task 3: 版本弃用机制 - -- [ ] 3.1 创建版本弃用注解 -- [ ] 3.2 实现弃用警告 -- [ ] 3.3 版本迁移提示 - -## Task 4: 版本文档 - -- [ ] 4.1 Swagger 版本分组 -- [ ] 4.2 版本迁移指南 - -## 验收标准 - -- [ ] 支持 v1、v2 版本 -- [ ] 版本路由正确映射 -- [ ] 向后兼容 diff --git a/pom.xml b/pom.xml index 3d4b7ac..a598b6b 100644 --- a/pom.xml +++ b/pom.xml @@ -223,19 +223,21 @@ com.github.ben-manes.caffeine caffeine - ${caffeine.version} + 2.9.3 org.springframework.boot spring-boot-starter-actuator + 2.5.8 io.micrometer micrometer-registry-prometheus + 1.8.2 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index fc5c513..677a5e7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# url: jdbc:mysql://192.168.0.222:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.222:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 1qazse42W3 # 从库数据源 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java index 75e83dd..c9a0321 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java @@ -11,7 +11,6 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.servlet.resource.NoResourceFoundException; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.exception.DemoModeException; @@ -135,17 +134,6 @@ public class GlobalExceptionHandler return AjaxResult.error("请求参数格式错误"); } - /** - * 资源未找到异常 - */ - @ExceptionHandler(NoResourceFoundException.class) - public AjaxResult handleNoResourceFoundException(NoResourceFoundException e, HttpServletRequest request) - { - String requestURI = request.getRequestURI(); - log.error("请求地址'{}',资源未找到", requestURI); - return AjaxResult.error(HttpStatus.NOT_FOUND, "请求资源不存在"); - } - /** * 非法参数异常 */ diff --git a/ruoyi-ui-next/src/auto-imports.d.ts b/ruoyi-ui-next/src/auto-imports.d.ts index 7507e6b..101b7d6 100644 --- a/ruoyi-ui-next/src/auto-imports.d.ts +++ b/ruoyi-ui-next/src/auto-imports.d.ts @@ -85,24 +85,6 @@ declare global { // for type re-export declare global { // @ts-ignore - export type { - Component, - Slot, - Slots, - ComponentPublicInstance, - ComputedRef, - DirectiveBinding, - ExtractDefaultPropTypes, - ExtractPropTypes, - ExtractPublicPropTypes, - InjectionKey, - PropType, - Ref, - ShallowRef, - MaybeRef, - MaybeRefOrGetter, - VNode, - WritableComputedRef, - } from 'vue' + export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, ShallowRef, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' import('vue') }