From 3e642a8aae29707459d6ed195e99ecd551a9bcae Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 26 Jun 2026 12:32:42 +0800 Subject: [PATCH] =?UTF-8?q?chore(dev):=20=E6=9C=AC=E5=9C=B0=20dev=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=8C=87=E5=90=91=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=BA=93=20eip4(=E4=B8=9A=E5=8A=A1+=E6=B5=81=E7=A8=8B=E5=90=8C?= =?UTF-8?q?=E5=BA=93)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 把 eip4dev(业务)/eip4flow(流程)合并为单库 eip4,对齐生产单库拓扑,跨库报表(审批意见 act_hi_comment 等)可单连接直接 join。原分库保留作回滚。均经 SPRING_DATASOURCE_URL/FLOWABLE_JDBC_URL/BIZ_JDBC_URL 可覆盖。 Co-Authored-By: Claude Opus 4.8 (1M context) --- flowable-service/src/main/resources/application.yml | 6 +++--- platform-app/src/main/resources/application-dev.yml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flowable-service/src/main/resources/application.yml b/flowable-service/src/main/resources/application.yml index 29176e8..d93b222 100644 --- a/flowable-service/src/main/resources/application.yml +++ b/flowable-service/src/main/resources/application.yml @@ -16,15 +16,15 @@ flowable: datasource: # Hikari 原生属性名 jdbc-url(@ConfigurationProperties 绑到已 build 的 HikariDataSource, # 须用 jdbc-url 而非 url,否则报 "jdbcUrl is required with driverClassName") - jdbc-url: ${FLOWABLE_JDBC_URL:jdbc:postgresql://localhost:5433/eip4flow?currentSchema=eip3} + jdbc-url: ${FLOWABLE_JDBC_URL:jdbc:postgresql://localhost:5433/eip4?currentSchema=eip3} username: ${FLOWABLE_JDBC_USER:zhengwr} password: ${FLOWABLE_JDBC_PASS:} driver-class-name: org.postgresql.Driver biz: datasource: - # F2-13: 本地验证用本地 eip4dev(5435 不可达,人名解析正降级) - jdbc-url: ${BIZ_JDBC_URL:jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3} + # F2-13: 本地验证用合并库 eip4(业务+流程同库;原 eip4dev 已并入)。5435 不可达,人名解析正降级。 + jdbc-url: ${BIZ_JDBC_URL:jdbc:postgresql://localhost:5433/eip4?currentSchema=eip3} username: ${BIZ_JDBC_USER:zhengwr} password: ${BIZ_JDBC_PASS:} driver-class-name: org.postgresql.Driver diff --git a/platform-app/src/main/resources/application-dev.yml b/platform-app/src/main/resources/application-dev.yml index 39ae9e7..4cafc80 100644 --- a/platform-app/src/main/resources/application-dev.yml +++ b/platform-app/src/main/resources/application-dev.yml @@ -16,7 +16,9 @@ server: spring: datasource: - url: jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3 + # 合并库 eip4:业务表 + flowable(act_*) 同库(对齐生产单库拓扑),跨库报表(审批意见等)可直接 join。 + # 原分库 eip4dev(业务)/eip4flow(流程)保留作回滚。覆盖:SPRING_DATASOURCE_URL。 + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5433/eip4?currentSchema=eip3} username: zhengwr password: hikari: