From d9603aa7dad089ef04788bc669e2d5b12c19328b Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 18:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=9F=E4=B8=80=E5=A2=9E?=
 =?UTF-8?q?=E9=87=8F=E4=B8=AD=E7=9A=84IAM=E6=9D=83=E9=99=90=E5=8C=BA?=
 =?UTF-8?q?=E5=9D=97=E8=BE=B9=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/sql/头程数据库统一增量-MySQL8.sql                   | 5 +++--
 .../ContainerWorkspacePermissionSqlContractTest.java       | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql
index 48e19d649..beb436e62 100644
--- a/deploy/sql/头程数据库统一增量-MySQL8.sql
+++ b/deploy/sql/头程数据库统一增量-MySQL8.sql
@@ -18493,6 +18493,9 @@ DELIMITER ;
 CALL migrate_container_workspace_permissions();
 DROP PROCEDURE IF EXISTS migrate_container_workspace_permissions;
 
+-- 货柜双工作台权限结束，恢复头程数据库上下文
+USE baiyue_firstleg;
+
 -- 财务 P0：海外费用原币、计费依据与钱包结算关联
 DROP PROCEDURE IF EXISTS add_finance_p0_column;
 DELIMITER $$
@@ -18524,8 +18527,6 @@ DROP PROCEDURE IF EXISTS add_finance_p0_column;
 
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema='baiyue_finance' AND table_name='fin_fee_source' AND index_name='idx_fin_fee_source_wallet_hold'), 'SELECT 1', 'ALTER TABLE baiyue_finance.fin_fee_source ADD KEY idx_fin_fee_source_wallet_hold(wallet_hold_id)'));
 PREPARE statement FROM @ddl; EXECUTE statement; DEALLOCATE PREPARE statement;
--- 货柜双工作台权限结束，恢复头程数据库上下文
-USE baiyue_firstleg;
 
 CALL baiyue_firstleg.assert_unified_final_schema();
 DROP PROCEDURE IF EXISTS baiyue_firstleg.assert_unified_final_schema;
diff --git a/iam/src/test/java/com/baiyue/iam/repository/ContainerWorkspacePermissionSqlContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/ContainerWorkspacePermissionSqlContractTest.java
index 40f5c5878..64b215294 100644
--- a/iam/src/test/java/com/baiyue/iam/repository/ContainerWorkspacePermissionSqlContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/repository/ContainerWorkspacePermissionSqlContractTest.java
@@ -107,7 +107,12 @@ class ContainerWorkspacePermissionSqlContractTest {
         assertThat(start).isGreaterThanOrEqualTo(0);
         assertThat(bodyStart).isGreaterThan(start);
         assertThat(end).isGreaterThan(bodyStart);
-        assertThat(unified.substring(bodyStart, end).trim()).isEqualTo(sql().trim());
+        assertThat(normalizeLineEndings(unified.substring(bodyStart, end)).trim())
+            .isEqualTo(normalizeLineEndings(sql()).trim());
+    }
+
+    private static String normalizeLineEndings(String value) {
+        return value.replace("\r\n", "\n");
     }
 
     private static String sql() throws Exception {