合并门禁:将R3门禁能力集成至一期综合验收

- 将QA数据库配置对齐至隔离库 railwaysystem_integrated_qa_20260916
This commit is contained in:
wangzhibiao committed 2026-09-16 15:43:46 +08:00
1 parent 307c9cd172
commit 63f463d094
11 files changed
+714 -4

No files matched your search

+20 -3
View File
@@ -219,6 +219,23 @@ public class DbAssertionChecker {
return map;
}
private static String resolveDbUrl() {
try {
File yml = new File("RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml");
if (!yml.exists()) {
yml = new File("../RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml");
}
if (yml.exists()) {
for (String line : Files.readAllLines(yml.toPath())) {
if (line.trim().startsWith("url:")) {
return line.trim().substring("url:".length()).trim();
}
}
}
} catch (Exception ignored) {}
return "jdbc:kingbase8://127.0.0.1:4321/railwaysystem_integrated_qa_20260916?currentSchema=public,sys_catalog&useUnicode=true&characterEncoding=utf8";
}
private static String resolveDbPassword() {
String env = System.getenv("DB_PASSWORD");
if (env != null && !env.isEmpty()) {
@@ -257,7 +274,7 @@ public class DbAssertionChecker {
}
private static void executeDependentsCleanup(String resourcesPath) {
String dbUrl = "jdbc:kingbase8://127.0.0.1:4321/training?currentSchema=public,sys_catalog&useUnicode=true&characterEncoding=utf8";
String dbUrl = resolveDbUrl();
String dbUser = "kingbase";
String dbPassword = resolveDbPassword();
@@ -280,7 +297,7 @@ public class DbAssertionChecker {
}
private static void executeExactIdCleanup(String resourcesPath) {
String dbUrl = "jdbc:kingbase8://127.0.0.1:4321/training?currentSchema=public,sys_catalog&useUnicode=true&characterEncoding=utf8";
String dbUrl = resolveDbUrl();
String dbUser = "kingbase";
String dbPassword = resolveDbPassword();
@@ -349,7 +366,7 @@ public class DbAssertionChecker {
}
private static void disableStudent(String studentId) {
String dbUrl = "jdbc:kingbase8://127.0.0.1:4321/training?currentSchema=public,sys_catalog&useUnicode=true&characterEncoding=utf8";
String dbUrl = resolveDbUrl();
String dbUser = "kingbase";
String dbPassword = resolveDbPassword();
try (Connection conn = DriverManager.getConnection(dbUrl, dbUser, dbPassword)) {