From 52b8a812d75546bf85895ab9e167d0ae47e083e3 Mon Sep 17 00:00:00 2001 From: let5sne Date: Tue, 14 Jul 2026 16:34:41 +0800 Subject: [PATCH] fix(dev): align local service ports --- .../src/main/resources/application-dev.yml | 14 +++++++------- docs/BRD_IMPLEMENTATION_AUDIT.md | 1 + scripts/demo-check.sh | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/backend/ruoyi-admin/src/main/resources/application-dev.yml b/backend/ruoyi-admin/src/main/resources/application-dev.yml index ac451edb..7151bc93 100644 --- a/backend/ruoyi-admin/src/main/resources/application-dev.yml +++ b/backend/ruoyi-admin/src/main/resources/application-dev.yml @@ -47,9 +47,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://${AIHR_MYSQL_HOST:127.0.0.1}:${AIHR_MYSQL_PORT:13306}/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: ${AIHR_MYSQL_USERNAME:root} + password: ${AIHR_MYSQL_PASSWORD:root} # # 从库数据源 # slave: # lazy: true @@ -96,13 +96,13 @@ spring: spring.data: redis: # 地址 - host: localhost - # 端口，默认为6379 - port: 6379 + host: ${AIHR_REDIS_HOST:127.0.0.1} + # 本项目本地编排使用16379，可通过环境变量覆盖 + port: ${AIHR_REDIS_PORT:16379} # 数据库索引 database: 0 # redis 密码必须配置 - password: ruoyi123 + password: ${AIHR_REDIS_PASSWORD:ruoyi123} # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/docs/BRD_IMPLEMENTATION_AUDIT.md b/docs/BRD_IMPLEMENTATION_AUDIT.md index ed3b38ad..1a2da8e1 100644 --- a/docs/BRD_IMPLEMENTATION_AUDIT.md +++ b/docs/BRD_IMPLEMENTATION_AUDIT.md @@ -3,6 +3,7 @@ 更新时间：2026-07-14 - 2026-07-14 BRD G3/G6 生产验证码安全边界修复：`CaptchaController` 原先允许通过 `aihr.sms.demo-fixed-code-enabled=true` 在 `prod` profile 放行固定短信验证码，和项目要求的“生产代码级禁用”冲突；现仅允许非 `prod` profile 使用 `aihr.sms.dev-fixed-code`，删除生产覆盖开关，并新增源码契约回归与 `demo-check` marker。未修改线上配置或生产数据。 +- 2026-07-14 本地验证环境一致性修复：项目 Docker 编排使用 MySQL `13306`、Redis `16379`，但 `application-dev.yml` 原先仍默认连接 `3306/6379`，导致 admin Spring 全量测试误连其他本机容器；现 dev 数据源改为 `AIHR_MYSQL_*`、`AIHR_REDIS_*` 可覆盖配置，默认与本项目编排一致，生产配置不变。`ruoyi-admin` 全量测试已通过。 ## 1. 审查口径 diff --git a/scripts/demo-check.sh b/scripts/demo-check.sh index 949f99e2..81a57ce8 100755 --- a/scripts/demo-check.sh +++ b/scripts/demo-check.sh @@ -613,6 +613,8 @@ contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "aihr_knowledge_gap" contains backend/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java '!environment.acceptsProfiles(Profiles.of("prod"))' contains backend/ruoyi-admin/src/test/java/org/dromara/web/controller/CaptchaControllerSecurityTest.java "CaptchaControllerSecurityTest" +contains backend/ruoyi-admin/src/main/resources/application-dev.yml "AIHR_MYSQL_PORT:13306" +contains backend/ruoyi-admin/src/main/resources/application-dev.yml "AIHR_REDIS_PORT:16379" contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "requester_ext_party_id" contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/controller/AihrSopController.java "currentRequesterExtPartyId" contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "hasExplicitSopReviewDecision"