diff --git a/ERP费用核销并发控制方案.md b/ERP费用核销并发控制方案.md
new file mode 100644
index 00000000..1751315d
--- /dev/null
+++ b/ERP费用核销并发控制方案.md
@@ -0,0 +1,571 @@
+# ERP 费用核销并发控制方案
+
+## 1. 文档目的
+
+本文整理 ERP 费用核销场景下的并发控制方案，重点解决以下问题：
+
+- 一笔费用允许被多次核销；
+- 多个用户可能同时核销同一笔费用；
+- 任何情况下都不能超额核销；
+- 必须保留完整核销流水；
+- 必须支持核销撤销和财务审计；
+- 批量核销多笔费用时，允许部分成功，一笔失败不能影响其他费用；
+- 接口重试、重复点击等情况不能导致重复核销。
+
+本文对版本锁、数据库悲观锁和数据库原子更新三种方案进行分析，并给出推荐实现。
+
+## 2. 基本业务场景
+
+假设费用原始金额为 100，当前状态如下：
+
+```text
+原始金额：100
+已核销金额：0
+剩余金额：100
+```
+
+用户 A 和用户 B 同时打开该费用：
+
+- 用户 A 核销 50；
+- 用户 B 核销 30；
+- 正确结果应为剩余金额 20；
+- 系统不能因为两个用户读取到相同旧余额而产生覆盖或超额核销。
+
+并发控制需要解决的核心问题不是让所有操作真正并行修改同一余额，而是确保对同一余额的修改在数据库中正确串行化，同时尽量减少不必要的用户重试。
+
+## 3. 方案一：版本锁
+
+### 3.1 实现方式
+
+费用表增加版本字段：
+
+```text
+remain_amount = 100
+version = 1
+```
+
+用户 A 提交核销 50：
+
+```sql
+UPDATE dbo.fee
+SET remain_amount = remain_amount - 50,
+    version = version + 1
+WHERE id = @fee_id
+  AND version = 1
+  AND remain_amount >= 50;
+```
+
+更新成功后：
+
+```text
+remain_amount = 50
+version = 2
+```
+
+用户 B 仍然携带页面读取到的 `version = 1`，因此更新影响行数为 0，需要提示用户刷新后重新操作。
+
+### 3.2 优点
+
+- 可以防止旧数据覆盖新数据；
+- 不需要在用户查看页面期间持有数据库锁；
+- 实现方式简单，适合普通资料编辑；
+- 可以明确告诉用户数据已经发生变化。
+
+### 3.3 局限
+
+- 会拒绝原本可以成功的合法并发核销；
+- 批量核销时容易出现多笔版本冲突；
+- 财务人员需要刷新、重新定位并重新操作，使用体验较差；
+- 如果版本冲突后自动读取最新余额重试，实际行为已经接近原子更新方案；
+- 版本锁只防止旧数据覆盖，不等同于完整的财务一致性设计。
+
+版本锁能够保证金额正确的前提是：所有余额修改入口都严格执行版本校验，并且余额更新与流水写入处于同一事务。任何绕过版本条件的接口、脚本或后台任务都可能破坏该保证。
+
+### 3.4 适用范围
+
+版本字段适合用于：
+
+- 普通资料编辑冲突检测；
+- 页面数据变化提示；
+- 缓存失效；
+- 判断记录在用户查看后是否发生过变化。
+
+如果业务允许多用户对同一费用连续核销，不建议将页面版本作为核销成功的必要条件。
+
+## 4. 方案二：数据库悲观锁
+
+### 4.1 实现方式
+
+在事务中读取并锁定费用记录，然后校验和更新：
+
+```sql
+BEGIN TRANSACTION;
+
+SELECT remain_amount, status
+FROM dbo.fee WITH (UPDLOCK, ROWLOCK)
+WHERE id = @fee_id;
+
+-- 校验余额和状态
+-- 更新余额
+-- 写入核销流水
+
+COMMIT;
+```
+
+用户 A 先锁定记录并核销 50，用户 B 等待。A 提交后，B 读取到最新余额 50，再核销 30，最终剩余金额为 20。
+
+### 4.2 优点
+
+- 读取、判断、更新之间的数据状态稳定；
+- 可以处理多表、多条件和复杂额度判断；
+- 后来的用户通常只需等待，不必因为页面版本过期而立即失败；
+- 逻辑直观，便于表达复杂业务规则。
+
+### 4.3 局限
+
+- 显式锁从查询开始持有，临界区通常比原子 UPDATE 更长；
+- 热点费用会产生锁等待；
+- 同时锁定多条费用且顺序不一致时容易产生死锁；
+- `ROWLOCK` 只是 SQL Server 锁提示，不保证数据库一定采用行锁；
+- 大批量处理时，如果使用一个总事务，前面记录的锁可能一直持有到整个批次结束。
+
+### 4.4 使用要求
+
+- 锁定查询必须在数据库事务内执行；
+- 获取锁后不能等待用户确认，也不能执行耗时的远程调用；
+- 事务应尽可能短；
+- 同时操作多条费用时，应按费用主键的固定顺序加锁；
+- 对死锁错误和锁等待超时设置有限次数的重试机制。
+
+### 4.5 适用范围
+
+悲观锁适合以下场景：
+
+- 一次核销需要同时读取和修改多条费用；
+- 需要跨表判断预算、额度、期间、审批或占用状态；
+- 核销金额需要根据数据库当前状态动态分配；
+- 业务规则无法表达为单条带条件的 UPDATE。
+
+对于单条费用的简单余额扣减，没有必要先执行显式锁定查询。
+
+## 5. 方案三：数据库原子更新
+
+### 5.1 实现方式
+
+直接通过带余额条件的 UPDATE 完成扣减：
+
+```sql
+UPDATE dbo.fee
+SET remain_amount = remain_amount - @amount,
+    version = version + 1
+WHERE id = @fee_id
+  AND status = 'OPEN'
+  AND remain_amount >= @amount;
+```
+
+根据影响行数判断结果：
+
+```sql
+IF @@ROWCOUNT = 0
+BEGIN
+    THROW 50001, N'费用不存在、状态不可核销或剩余金额不足', 1;
+END;
+```
+
+### 5.2 并发结果
+
+用户 A 和用户 B 同时更新同一条费用时：
+
+1. 一个 UPDATE 先获得记录的更新锁和排他锁；
+2. 另一个 UPDATE 等待；
+3. 第一个事务提交后，第二个 UPDATE 基于数据库当前余额继续判断；
+4. 当前余额足够则更新成功，不足则影响行数为 0；
+5. 余额不会被旧页面数据覆盖，也不会出现负数。
+
+原子更新并不是数据库完全不加锁，而是不需要应用程序预先显式加锁。SQL Server 会在执行 UPDATE 时取得必要的锁。
+
+### 5.3 SQL Server 锁行为
+
+在常见的 `READ COMMITTED` 或启用 RCSI 的环境中：
+
+- UPDATE 通常先获得更新锁，修改时转换为排他锁；
+- 排他锁一般持有到事务结束；
+- 同一记录上的其他写操作会等待；
+- RCSI 可以减少读写阻塞，但写操作之间仍然需要锁；
+- 使用完整 `SNAPSHOT` 事务隔离时可能出现更新冲突，需要捕获异常并重试。
+
+对于同一个费用余额，任何能够保证强一致性的方案最终都需要串行化写操作。原子 UPDATE 的优势在于锁持有时间通常最短。
+
+### 5.4 适用范围
+
+原子 UPDATE 非常适合：
+
+- 单条费用余额扣减；
+- 库存扣减；
+- 额度占用；
+- 次数扣减；
+- 其他可以使用条件 UPDATE 表达的数值变更。
+
+## 6. 三种方案对比
+
+| 方案 | 防止超额核销 | 合法并发体验 | 锁持有时间 | 实现复杂度 | 推荐用途 |
+| --- | --- | --- | --- | --- | --- |
+| 版本锁 | 可以，但所有入口必须使用版本条件 | 较差，版本变化即失败 | 短 | 低 | 普通资料编辑、变化提示 |
+| 显式悲观锁 | 可以 | 会等待，通常不要求刷新 | 相对较长 | 中高 | 多行、多表、复杂规则 |
+| 原子 UPDATE | 可以 | 合法操作依次成功 | 较短 | 低 | 单费用余额扣减，首选 |
+
+如果在原子 UPDATE 中同时增加页面版本条件：
+
+```sql
+WHERE id = @fee_id
+  AND version = @page_version
+  AND remain_amount >= @amount
+```
+
+虽然仍然安全，但会因为版本变化拒绝本来可以成功的核销，因此不建议在正常核销时使用页面版本作为必要条件。
+
+## 7. 核销流水与事务一致性
+
+### 7.1 建议数据结构
+
+费用主表：
+
+```text
+fee
+- id
+- original_amount
+- remain_amount
+- status
+- version
+```
+
+核销流水表：
+
+```text
+fee_writeoff
+- id
+- request_id
+- batch_id
+- batch_item_id
+- fee_id
+- amount
+- operation_type
+- reversal_of_id
+- operator_id
+- operation_time
+- reason
+- business_document_no
+```
+
+### 7.2 单笔核销事务
+
+余额扣减与核销流水必须在同一个数据库事务内：
+
+```sql
+SET XACT_ABORT ON;
+
+BEGIN TRY
+    BEGIN TRANSACTION;
+
+    UPDATE dbo.fee
+    SET remain_amount = remain_amount - @amount,
+        version = version + 1
+    WHERE id = @fee_id
+      AND status = 'OPEN'
+      AND remain_amount >= @amount;
+
+    IF @@ROWCOUNT = 0
+        THROW 50001, N'剩余金额不足或费用当前不可核销', 1;
+
+    INSERT INTO dbo.fee_writeoff
+    (
+        request_id,
+        fee_id,
+        amount,
+        operation_type,
+        operator_id,
+        operation_time,
+        business_document_no
+    )
+    VALUES
+    (
+        @request_id,
+        @fee_id,
+        @amount,
+        'WRITEOFF',
+        @operator_id,
+        SYSDATETIME(),
+        @business_document_no
+    );
+
+    COMMIT;
+END TRY
+BEGIN CATCH
+    IF @@TRANCOUNT > 0
+        ROLLBACK;
+
+    THROW;
+END CATCH;
+```
+
+这样可以保证：
+
+- 不会出现余额已扣减但没有流水；
+- 不会出现流水已生成但余额没有扣减；
+- 任意一步失败，当前费用的余额和流水一起回滚。
+
+## 8. 批量核销与部分成功
+
+### 8.1 事务边界
+
+如果业务要求一笔费用失败不能影响其他费用，推荐采用：
+
+> 批次负责组织和汇总，每个批次明细使用独立事务处理。
+
+处理流程：
+
+```text
+创建批次和批次明细
+        |
+逐笔处理，每笔一个独立事务
+        |
+记录每笔成功或失败结果
+        |
+汇总批次最终状态
+```
+
+不能简单地在整个批量方法外层开启一个总事务，否则中间一笔抛出异常时，之前成功的费用也可能被回滚。
+
+### 8.2 业务失败与技术失败
+
+需要区分：
+
+- 业务失败：余额不足、版本冲突、费用已关闭、期间不允许核销；
+- 技术失败：数据库死锁、锁等待超时、程序异常、唯一键冲突。
+
+如果多笔费用放在一个数据库事务中，可以通过检查 `@@ROWCOUNT` 跳过余额不足等业务失败，但一旦发生导致事务不可提交的技术异常，整个事务仍可能回滚。
+
+如果要求任何一笔发生任何类型的失败都不影响已经处理成功的费用，则每笔费用必须使用独立事务。
+
+### 8.3 版本锁下的批量处理
+
+每笔费用使用自己的页面版本和独立事务：
+
+```text
+费用1：成功
+费用2：版本冲突
+费用3：成功
+```
+
+费用2的失败不会回滚费用1和费用3。但批量选择的费用越多，页面数据过期和版本冲突的概率越高，因此用户体验通常较差。
+
+### 8.4 悲观锁下的批量处理
+
+每笔费用分别执行以下过程：
+
+1. 开启当前费用的事务；
+2. 使用 `UPDLOCK` 读取当前余额；
+3. 校验、更新并写入流水；
+4. 提交当前事务；
+5. 继续处理下一笔。
+
+不要在一个总事务中先后锁定全部费用，否则锁会长期持有，并增加等待和死锁概率。
+
+### 8.5 原子 UPDATE 下的批量处理
+
+每笔费用分别执行原子 UPDATE：
+
+```text
+费用A：剩余100，核销50，成功
+费用B：剩余20，核销30，失败
+费用C：剩余80，核销40，成功
+```
+
+最终批次结果：
+
+```text
+成功：2笔，金额90
+失败：1笔，金额30
+批次状态：PARTIAL_SUCCESS
+```
+
+费用 A 和费用 C 的余额及流水正常提交，不受费用 B 影响。
+
+### 8.6 推荐批次状态
+
+批次主表状态：
+
+```text
+PROCESSING
+SUCCESS
+PARTIAL_SUCCESS
+FAILED
+```
+
+批次明细状态：
+
+```text
+PENDING
+PROCESSING
+SUCCESS
+FAILED
+```
+
+失败原因建议使用明确的业务代码：
+
+```text
+INSUFFICIENT_BALANCE
+VERSION_CONFLICT
+FEE_CLOSED
+PERIOD_CLOSED
+DUPLICATE_REQUEST
+LOCK_TIMEOUT
+SYSTEM_ERROR
+```
+
+财务流水表只记录实际成功的财务变动；失败尝试记录在批次明细或操作日志中。
+
+### 8.7 批量处理伪代码
+
+```text
+创建批次及所有批次明细
+
+for each batchItem:
+    开启独立事务
+    尝试原子扣减当前费用余额
+
+    如果余额扣减成功：
+        写入核销流水
+        将批次明细标记为 SUCCESS
+        提交当前事务
+
+    如果业务校验失败：
+        将批次明细标记为 FAILED
+        保存失败原因
+        提交当前事务
+
+    如果发生技术异常：
+        回滚当前事务
+        使用新的短事务记录技术失败
+
+汇总批次状态和金额
+```
+
+如果应用框架使用外层事务注解，需要确保逐笔处理真正开启独立事务。例如 Java/Spring 中应避免因为同类内部调用导致 `REQUIRES_NEW` 代理失效，也不应让外层批量方法持有一个覆盖全部明细的事务。
+
+## 9. 幂等控制
+
+前端重复点击、HTTP 超时重试、消息重复消费或批次恢复都可能导致重复核销，因此必须为每个批次明细生成唯一请求号。
+
+建议增加唯一约束：
+
+```sql
+CREATE UNIQUE INDEX UX_fee_writeoff_request
+ON dbo.fee_writeoff(request_id);
+```
+
+批次明细还可以增加：
+
+```sql
+CREATE UNIQUE INDEX UX_writeoff_batch_item
+ON dbo.writeoff_batch_item(batch_id, line_no);
+```
+
+重复请求的处理规则：
+
+- 已成功明细直接返回第一次成功结果，不再次扣款；
+- 业务失败明细可按业务规则重新校验；
+- 技术失败明细可以有限次数重试；
+- 重试整个批次时，只处理未成功的明细。
+
+如果一个批次中允许同一费用出现多条明细，应提前明确规则：
+
+- 可以先按费用汇总核销金额后执行一次原子更新；或者
+- 按固定明细顺序逐条处理并接受后续明细可能余额不足。
+
+否则，同一费用多条明细的成功结果可能依赖执行顺序。
+
+## 10. 核销撤销
+
+财务审计场景不建议删除或覆盖原核销流水。撤销应通过新增反向流水完成：
+
+```text
+原流水：operation_type = WRITEOFF，amount = 50
+撤销流水：operation_type = REVERSAL，amount = 50
+reversal_of_id = 原流水ID
+```
+
+撤销时原子增加余额：
+
+```sql
+UPDATE dbo.fee
+SET remain_amount = remain_amount + @amount,
+    version = version + 1
+WHERE id = @fee_id
+  AND remain_amount + @amount <= original_amount;
+```
+
+同时要求：
+
+- 撤销余额更新和反向流水写入处于同一事务；
+- `reversal_of_id` 建立唯一约束，防止同一笔核销被撤销两次；
+- 保存撤销人、撤销时间、原因和审批信息；
+- 已结账期间通过冲销记录处理，不物理修改或删除历史流水；
+- 批量撤销同样按每笔独立事务处理，以支持部分成功。
+
+## 11. 数据库防御性约束
+
+建议增加余额非负约束：
+
+```sql
+ALTER TABLE dbo.fee
+ADD CONSTRAINT CK_fee_remain_nonnegative
+CHECK (remain_amount >= 0);
+```
+
+如果业务始终要求剩余金额不能超过原始金额，可以增加：
+
+```sql
+ALTER TABLE dbo.fee
+ADD CONSTRAINT CK_fee_remain_range
+CHECK (
+    remain_amount >= 0
+    AND remain_amount <= original_amount
+);
+```
+
+其他建议：
+
+- 金额字段使用 `decimal`，不要使用 `float`；
+- 精度根据币种和业务确定，例如 `decimal(19, 4)`；
+- 原子更新必须通过费用主键或高选择性索引定位记录；
+- 限制业务账号直接修改余额字段的权限；
+- 所有余额变化统一通过服务或存储过程执行；
+- 定期使用流水汇总结果与费用余额进行一致性对账。
+
+## 12. 最终推荐架构
+
+推荐采用：
+
+> 数据库原子 UPDATE + 每笔独立事务 + 核销流水 + 批次明细 + 幂等控制 + 数据库约束
+
+各机制职责如下：
+
+- 原子 UPDATE：保证余额不会被超扣；
+- 每笔独立事务：保证批量核销可以部分成功；
+- 核销流水：满足审计、追溯、对账和撤销要求；
+- 唯一请求号：防止重复提交和故障重试造成重复扣款；
+- CHECK 约束：作为余额合法性的数据库防线；
+- version/rowversion：用于页面变化提示、缓存失效和普通资料编辑，不作为正常核销的必要条件；
+- 显式悲观锁：仅在多行、多表或复杂规则无法使用条件 UPDATE 表达时采用；
+- 批次主表和明细表：记录部分成功结果、失败原因和重试状态。
+
+## 13. 财务业务边界
+
+采用部分成功前，需要确认批量核销的业务含义。
+
+如果多笔费用只是一次操作选择形成的处理批次，可以允许部分成功，成功项分别形成核销流水。
+
+如果多笔费用共同对应一张不可拆分的付款单、结算单或会计凭证，并且必须满足固定总金额，则部分成功可能造成单据金额不平。这种场景应采用全成全败，或者先完成逐笔预校验和额度预占，再统一确认入账。
+
+因此，建议将允许部分成功的批次定义为“操作批次”，而不是一笔不可拆分的会计交易。最终会计单据应根据成功明细生成，并确保借贷和业务金额平衡。
diff --git a/code/app/app-rn/.env.development b/code/app/app-rn/.env.development
index d26d0f76..e40d5588 100644
--- a/code/app/app-rn/.env.development
+++ b/code/app/app-rn/.env.development
@@ -1,5 +1,5 @@
-EXPO_PUBLIC_API_URL=http://192.168.5.80:8087
+EXPO_PUBLIC_API_URL=http://192.168.5.115:8087
 # EXPO_PUBLIC_API_URL=https://www.oneao.cn/app
-EXPO_PUBLIC_WS_URL=ws://192.168.5.80:8087
+EXPO_PUBLIC_WS_URL=ws://192.168.5.115:8087
 EXPO_PUBLIC_G3_URL=http://118.89.70.199:9001
 EXPO_PUBLIC_G3_BUCKET=app-dev
\ No newline at end of file
diff --git a/code/app/app-rn/scripts/alias-loader.mjs b/code/app/app-rn/scripts/alias-loader.mjs
new file mode 100644
index 00000000..4e4eaa05
--- /dev/null
+++ b/code/app/app-rn/scripts/alias-loader.mjs
@@ -0,0 +1,21 @@
+// 开发期测试用的路径别名解析器：把 @/ 映射到 src/，并为 .ts/.tsx 探测扩展名
+import { pathToFileURL } from "node:url";
+import { resolve as pathResolve } from "node:path";
+
+const SRC = pathResolve(process.cwd(), "src");
+
+const EXTS = [".ts", ".tsx", ".js", ".mjs", "/index.ts", "/index.tsx"];
+
+export async function resolve(specifier, context, nextResolve) {
+  if (specifier.startsWith("@/")) {
+    const base = pathResolve(SRC, specifier.slice(2));
+    for (const ext of EXTS) {
+      try {
+        return await nextResolve(pathToFileURL(base + ext).href, context);
+      } catch {
+        // 尝试下一个扩展名
+      }
+    }
+  }
+  return nextResolve(specifier, context);
+}
diff --git a/code/app/app-rn/scripts/test-auto-rules.mts b/code/app/app-rn/scripts/test-auto-rules.mts
new file mode 100644
index 00000000..f9fa6d21
--- /dev/null
+++ b/code/app/app-rn/scripts/test-auto-rules.mts
@@ -0,0 +1,80 @@
+import dayjs from "dayjs";
+import { getMissedDates, buildAutoBillInserts } from "@/helpers/financeAuto";
+
+// 对应 src/types/finance.ts 中 FinanceAutoRepeatType 的枚举值（从 1 开始）
+const Daily = 1;
+const Weekly = 2;
+const Monthly = 3;
+const Quarterly = 4;
+const Yearly = 5;
+
+// b_finance 表合法列（由前端查询推断，确认不含 type）
+const B_FINANCE_COLUMNS = new Set([
+  "id", "family_id", "category_id", "amount", "remark",
+  "record_time", "create_by", "update_by", "create_time", "update_time",
+]);
+
+// 统一使用本地时间，与 financeAuto.ts 内部 dayjs() 保持一致
+const todayStr = () => dayjs().format("YYYY-MM-DD");
+const yesterday = () => dayjs().subtract(1, "day").format("YYYY-MM-DD");
+const day = () => dayjs().day();
+const dateOfMonth = () => String(dayjs().date());
+const monthDay = () => `${dayjs().month() + 1},${dayjs().date()}`;
+
+let passed = 0;
+function check(name, cond) {
+  if (!cond) {
+    console.error("  ✗ " + name);
+    throw new Error("FAILED: " + name);
+  }
+  passed++;
+  console.log("  ✓ " + name);
+}
+
+console.log("== 1. 触发日期计算 (getMissedDates) ==");
+{
+  const dates = getMissedDates(Daily, "", yesterday());
+  check("Daily 上次昨天→今天1条", dates.length === 1);
+  check("Daily 日期=今天", dates[0] === todayStr());
+}
+{
+  const dates = getMissedDates(Monthly, dateOfMonth(), yesterday());
+  check("Monthly 今天日期→1条", dates.length === 1 && dates[0] === todayStr());
+}
+{
+  const dates = getMissedDates(Yearly, monthDay(), yesterday());
+  check("Yearly 今天月日→1条", dates.length === 1 && dates[0] === todayStr());
+}
+{
+  const dates = getMissedDates(Daily, "!" + day(), yesterday()); // 排除今天星期
+  check("Daily 排除今天→0条", dates.length === 0);
+}
+{
+  const dates = getMissedDates(Daily, "", todayStr()); // lastRun=今天
+  check("lastRun=今天→0条", dates.length === 0);
+}
+
+console.log("== 2. 写入 b_finance 的记录构造 (buildAutoBillInserts) ==");
+{
+  const rule = { category_id: 10, amount: 99.5, remark: "房租" };
+  const missed = [todayStr(), yesterday()];
+  const ids = [1001, 1002];
+  const inserts = buildAutoBillInserts(rule, missed, ids, 7, 3);
+  check("生成2条记录", inserts.length === 2);
+  let ok = true;
+  for (const rec of inserts) {
+    for (const k of Object.keys(rec)) {
+      if (!B_FINANCE_COLUMNS.has(k)) ok = false;
+    }
+    if ("type" in rec) ok = false;
+  }
+  check("记录字段均在 b_finance 合法列内且不含 type", ok);
+  check("remark 正确透传", inserts[0].remark === "房租");
+  check("record_time 使用补记账日期", inserts[1].record_time === yesterday());
+}
+{
+  const inserts = buildAutoBillInserts({ category_id: 1, amount: 1 }, [todayStr()], [], 7, 3);
+  check("ids 为空→0条", inserts.length === 0);
+}
+
+console.log("\n全部通过：" + passed + " 项 ✅");
diff --git a/code/app/app-rn/src/app/(main)/family/settings.tsx b/code/app/app-rn/src/app/(main)/family/settings.tsx
index e48f4bad..7670a677 100644
--- a/code/app/app-rn/src/app/(main)/family/settings.tsx
+++ b/code/app/app-rn/src/app/(main)/family/settings.tsx
@@ -552,6 +552,12 @@ export default function HomeSettings() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content animateOnMount={false} className="gap-4">
+            <BottomSheet.Header
+              title="家庭名称"
+              onCancel={() => setShowFamilyNameSheet(false)}
+              onConfirm={handleRename}
+              confirmDisabled={isLoading || !renameForm.name.trim()}
+            />
             <TextField>
               <Label className="mb-2">家庭名称</Label>
               <BottomSheet.Input
@@ -563,9 +569,6 @@ export default function HomeSettings() {
                 returnKeyType="done"
               />
             </TextField>
-            <Button onPress={handleRename} isDisabled={isLoading || !renameForm.name.trim()}>
-              <Button.Label>保存</Button.Label>
-            </Button>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -575,6 +578,12 @@ export default function HomeSettings() {
           <BottomSheet.Overlay />
           <BottomSheet.Content animateOnMount={false}>
             <View className="gap-4">
+              <BottomSheet.Header
+                title="我的昵称"
+                onCancel={() => setShowNicknameSheet(false)}
+                onConfirm={handleNickname}
+                confirmDisabled={isLoading || !nicknameForm.nickname.trim()}
+              />
               <TextField>
                 <Label className="mb-2">我的昵称</Label>
                 <BottomSheet.Input
@@ -586,12 +595,6 @@ export default function HomeSettings() {
                   returnKeyType="done"
                 />
               </TextField>
-              <Button
-                onPress={handleNickname}
-                isDisabled={isLoading || !nicknameForm.nickname.trim()}
-              >
-                <Button.Label>保存</Button.Label>
-              </Button>
             </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
diff --git a/code/app/app-rn/src/app/(main)/family/user.tsx b/code/app/app-rn/src/app/(main)/family/user.tsx
index e1fe22b8..bc052e59 100644
--- a/code/app/app-rn/src/app/(main)/family/user.tsx
+++ b/code/app/app-rn/src/app/(main)/family/user.tsx
@@ -731,6 +731,12 @@ export default function UserSetting() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4">
+            <BottomSheet.Header
+              title="修改姓名"
+              onCancel={() => setShowNameSheet(false)}
+              onConfirm={handleRename}
+              confirmDisabled={isLoading || !renameForm.name.trim()}
+            />
             <TextField>
               <Label className="mb-2">姓名</Label>
               <BottomSheet.Input
@@ -742,9 +748,6 @@ export default function UserSetting() {
                 returnKeyType="done"
               />
             </TextField>
-            <Button onPress={handleRename} isDisabled={isLoading || !renameForm.name.trim()}>
-              <Button.Label>保存</Button.Label>
-            </Button>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -753,6 +756,12 @@ export default function UserSetting() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4">
+            <BottomSheet.Header
+              title="修改手机号"
+              onCancel={() => setShowPhoneSheet(false)}
+              onConfirm={handlePhone}
+              confirmDisabled={isLoading || !phoneForm.phone.trim()}
+            />
             <TextField>
               <Label className="mb-2">手机号</Label>
               <BottomSheet.Input
@@ -764,9 +773,6 @@ export default function UserSetting() {
                 returnKeyType="done"
               />
             </TextField>
-            <Button onPress={handlePhone} isDisabled={isLoading || !phoneForm.phone.trim()}>
-              <Button.Label>保存</Button.Label>
-            </Button>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/clothes/(tabs)/home/index.tsx b/code/app/app-rn/src/app/clothes/(tabs)/home/index.tsx
index fe64a3c6..b8078b16 100644
--- a/code/app/app-rn/src/app/clothes/(tabs)/home/index.tsx
+++ b/code/app/app-rn/src/app/clothes/(tabs)/home/index.tsx
@@ -19,6 +19,7 @@ import {
   Trash2Icon,
 } from "lucide-react-native";
 import BottomSheet from "@/components/BottomSheet";
+import CategoryChipBar from "@/components/CategoryChipBar";
 import ContextMenu from "@/components/ContextMenu";
 import EmptyState from "@/components/EmptyStatus";
 import LayoutView from "@/components/layout/view";
@@ -78,9 +79,17 @@ export default function ClothingHome() {
   const hasMore = clothes.length < clothesTotal;
 
   const clothesCategories = useMemo(
-    () => categories.filter((c) => c.type === ClothingTargetType.Clothes),
+    () =>
+      categories
+        .filter((c) => c.type === ClothingTargetType.Clothes)
+        .sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
     [categories],
   );
+
+  // 顶部分类快捷筛选（与筛选弹层的分类状态共用 filter.categoryId）
+  const handleQuickCategory = useCallback((id: number | null) => {
+    setFilter((p) => ({ ...p, categoryId: id }));
+  }, []);
   const clothesTags = useMemo(
     () => tags.filter((t) => t.type === ClothingTargetType.Clothes),
     [tags],
@@ -353,6 +362,12 @@ export default function ClothingHome() {
         ]}
       >
         {renderHeader()}
+        <CategoryChipBar
+          categories={clothesCategories}
+          activeId={filter.categoryId}
+          onChange={handleQuickCategory}
+          style={{ marginBottom: 14 }}
+        />
         {filteredClothes.length === 0 ? (
           <EmptyState
             type={loading ? "loading" : "empty"}
diff --git a/code/app/app-rn/src/app/clothes/(tabs)/manage/index.tsx b/code/app/app-rn/src/app/clothes/(tabs)/manage/index.tsx
index 9231768a..fcab7e6d 100644
--- a/code/app/app-rn/src/app/clothes/(tabs)/manage/index.tsx
+++ b/code/app/app-rn/src/app/clothes/(tabs)/manage/index.tsx
@@ -1,13 +1,16 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 import { Button, Dialog, Label, TextField } from "heroui-native";
-import { PlusIcon, RotateCcwIcon, Trash2Icon } from "lucide-react-native";
+import { GripVerticalIcon, PlusIcon, RotateCcwIcon, Trash2Icon } from "lucide-react-native";
+import Sortable, { SortableGridRenderItem } from "react-native-sortables";
+import { useAnimatedRef } from "react-native-reanimated";
 import BottomSheet from "@/components/BottomSheet";
 import LayoutView from "@/components/layout/view";
 import { useListLoading, useLoading } from "@/hooks/useLoading";
 import { LoadingOverlay } from "@/components/LoadingOverlay";
 import { useClothingStore, useFamilyStore } from "@/store";
 import { ClothingCategory, ClothingTag, ClothingTargetType } from "@/types/clothing";
+import { toast } from "sonner-native";
 
 const COLORS = [
   "#EF4444",
@@ -217,14 +220,151 @@ export default function ClothingManage() {
     }
   }, [loadData, saveTagChanges, startLoading, stopLoading, tagDelete]);
 
-  const getTagsByGroup = useCallback(
-    (groupId: number) => tags.filter((t) => t.parent_id === groupId),
+  // ── 拖拽排序 ──────────────────────────────────
+  const scrollRef = useAnimatedRef<any>();
+
+  const sortedCurCategories = useMemo(
+    () => [...curCategories].sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
+    [curCategories],
+  );
+  const sortedCurTagGroups = useMemo(
+    () => [...curTagGroups].sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
+    [curTagGroups],
+  );
+  const getSortedTagsByGroup = useCallback(
+    (groupId: number) =>
+      tags
+        .filter((t) => t.parent_id === groupId)
+        .sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
     [tags],
   );
 
+  const handleCatDragEnd = useCallback(
+    async ({ data }: { data: ClothingCategory[] }) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveCategoryChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveCategoryChanges],
+  );
+
+  const handleTagGroupDragEnd = useCallback(
+    async ({ data }: { data: ClothingTag[] }) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveTagChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveTagChanges],
+  );
+
+  const handleChildTagDragEnd = useCallback(
+    async (data: ClothingTag[]) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveTagChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveTagChanges],
+  );
+
+  const renderChildTagItem = useCallback<SortableGridRenderItem<ClothingTag>>(
+    ({ item }) => (
+      <View className="flex-row items-center gap-2">
+        <Sortable.Handle>
+          <GripVerticalIcon size={16} color="#9CA3AF" />
+        </Sortable.Handle>
+        <TouchableOpacity
+          className="rounded-full px-2.5 py-1"
+          style={{ backgroundColor: item.color || "#E5E7EB" }}
+          onPress={() => openTag(item.parent_id as number, item)}
+        >
+          <Text className="text-xs font-medium" style={{ color: item.color ? "#fff" : "#4B5563" }}>
+            {item.name}
+          </Text>
+        </TouchableOpacity>
+      </View>
+    ),
+    [openTag],
+  );
+
+  const renderGroupItem = useCallback<SortableGridRenderItem<ClothingTag>>(
+    ({ item }) => {
+      const gt = getSortedTagsByGroup(item.id);
+      return (
+        <View className="bg-white rounded-xl px-4 py-3.5 border border-gray-100">
+          <View className="flex-row items-center justify-between mb-2.5">
+            <View className="flex-row items-center gap-2 flex-1">
+              <Sortable.Handle>
+                <GripVerticalIcon size={18} color="#9CA3AF" />
+              </Sortable.Handle>
+              <TouchableOpacity className="flex-1" onPress={() => openGroup(item)}>
+                <Text className="text-sm font-semibold text-gray-900">{item.name}</Text>
+              </TouchableOpacity>
+            </View>
+            <TouchableOpacity
+              className="w-7 h-7 items-center justify-center"
+              onPress={() => setGroupDelete(item)}
+            >
+              <Trash2Icon size={14} color="#EF4444" />
+            </TouchableOpacity>
+          </View>
+          {gt.length > 0 && (
+            <Sortable.Grid
+              columns={1}
+              customHandle
+              scrollableRef={scrollRef}
+              data={gt}
+              keyExtractor={(t) => String(t.id)}
+              renderItem={renderChildTagItem}
+              rowGap={8}
+              onDragEnd={({ data }) => handleChildTagDragEnd(data)}
+            />
+          )}
+          <TouchableOpacity
+            className="mt-2 self-start rounded-full px-2.5 py-1 bg-gray-50 border border-dashed border-gray-300"
+            onPress={() => openTag(item.id)}
+          >
+            <Text className="text-xs text-gray-400">+ 添加</Text>
+          </TouchableOpacity>
+        </View>
+      );
+    },
+    [getSortedTagsByGroup, handleChildTagDragEnd, openGroup, openTag, renderChildTagItem],
+  );
+
+  const renderCatItem = useCallback<SortableGridRenderItem<ClothingCategory>>(
+    ({ item }) => (
+      <TouchableOpacity
+        className="bg-white rounded-xl px-4 py-3.5 border border-gray-100 flex-row items-center justify-between"
+        activeOpacity={0.72}
+        onPress={() => openCat(item)}
+      >
+        <View className="flex-row items-center gap-2 flex-1">
+          <Sortable.Handle>
+            <GripVerticalIcon size={18} color="#9CA3AF" />
+          </Sortable.Handle>
+          <Text className="text-sm font-semibold text-gray-900">{item.name}</Text>
+        </View>
+        <TouchableOpacity
+          className="w-7 h-7 items-center justify-center"
+          onPress={(e) => {
+            e.stopPropagation();
+            setCatDelete(item);
+          }}
+        >
+          <Trash2Icon size={14} color="#EF4444" />
+        </TouchableOpacity>
+      </TouchableOpacity>
+    ),
+    [openCat],
+  );
+
   return (
     <LayoutView>
       <LayoutView.ScrollView
+        ref={scrollRef}
         refreshing={refreshing}
         onRefresh={() => runRefresh(loadData)}
         showsVerticalScrollIndicator={false}
@@ -285,38 +425,17 @@ export default function ClothingManage() {
               <Text className="text-xs font-medium text-white">添加</Text>
             </TouchableOpacity>
           </View>
-          {curCategories.length > 0 ? (
-            <View className="gap-3">
-              {curCategories.map((c) => (
-                <View
-                  key={c.id}
-                  className="bg-white rounded-xl px-4 py-3.5 border border-gray-100"
-                  style={{
-                    shadowColor: "#000",
-                    shadowOffset: { width: 0, height: 1 },
-                    shadowOpacity: 0.04,
-                    shadowRadius: 2,
-                    elevation: 1,
-                  }}
-                >
-                  <TouchableOpacity
-                    className="flex-row items-center justify-between"
-                    onPress={() => openCat(c)}
-                  >
-                    <Text className="text-sm font-semibold text-gray-900">{c.name}</Text>
-                    <TouchableOpacity
-                      className="w-7 h-7 items-center justify-center"
-                      onPress={(e) => {
-                        e.stopPropagation();
-                        setCatDelete(c);
-                      }}
-                    >
-                      <Trash2Icon size={14} color="#EF4444" />
-                    </TouchableOpacity>
-                  </TouchableOpacity>
-                </View>
-              ))}
-            </View>
+          {sortedCurCategories.length > 0 ? (
+            <Sortable.Grid
+              columns={1}
+              customHandle
+              scrollableRef={scrollRef}
+              data={sortedCurCategories}
+              keyExtractor={(c) => String(c.id)}
+              renderItem={renderCatItem}
+              rowGap={12}
+              onDragEnd={handleCatDragEnd}
+            />
           ) : (
             <Text className="text-sm text-gray-400 py-4">暂无分类，点击右上角添加</Text>
           )}
@@ -337,60 +456,17 @@ export default function ClothingManage() {
               <Text className="text-xs font-medium text-white">新建分组</Text>
             </TouchableOpacity>
           </View>
-          {curTagGroups.length > 0 ? (
-            <View className="gap-3">
-              {curTagGroups.map((group) => {
-                const gTags = getTagsByGroup(group.id);
-                return (
-                  <View
-                    key={group.id}
-                    className="bg-white rounded-xl px-4 py-3.5 border border-gray-100"
-                    style={{
-                      shadowColor: "#000",
-                      shadowOffset: { width: 0, height: 1 },
-                      shadowOpacity: 0.04,
-                      shadowRadius: 2,
-                      elevation: 1,
-                    }}
-                  >
-                    <View className="flex-row items-center justify-between mb-2.5">
-                      <TouchableOpacity className="flex-1" onPress={() => openGroup(group)}>
-                        <Text className="text-sm font-semibold text-gray-900">{group.name}</Text>
-                      </TouchableOpacity>
-                      <TouchableOpacity
-                        className="w-7 h-7 items-center justify-center"
-                        onPress={() => setGroupDelete(group)}
-                      >
-                        <Trash2Icon size={14} color="#EF4444" />
-                      </TouchableOpacity>
-                    </View>
-                    <View className="flex-row flex-wrap gap-1.5">
-                      {gTags.map((t) => (
-                        <TouchableOpacity
-                          key={t.id}
-                          className="rounded-full px-2.5 py-1"
-                          style={{ backgroundColor: t.color || "#E5E7EB" }}
-                          onPress={() => openTag(group.id, t)}
-                        >
-                          <Text
-                            className="text-xs font-medium"
-                            style={{ color: t.color ? "#fff" : "#4B5563" }}
-                          >
-                            {t.name}
-                          </Text>
-                        </TouchableOpacity>
-                      ))}
-                      <TouchableOpacity
-                        className="rounded-full px-2.5 py-1 bg-gray-50 border border-dashed border-gray-300"
-                        onPress={() => openTag(group.id)}
-                      >
-                        <Text className="text-xs text-gray-400">+ 添加</Text>
-                      </TouchableOpacity>
-                    </View>
-                  </View>
-                );
-              })}
-            </View>
+          {sortedCurTagGroups.length > 0 ? (
+            <Sortable.Grid
+              columns={1}
+              customHandle
+              scrollableRef={scrollRef}
+              data={sortedCurTagGroups}
+              keyExtractor={(g) => String(g.id)}
+              renderItem={renderGroupItem}
+              rowGap={12}
+              onDragEnd={handleTagGroupDragEnd}
+            />
           ) : (
             <Text className="text-sm text-gray-400 py-4">暂无标签分组，先新建分组再添加标签</Text>
           )}
@@ -401,10 +477,13 @@ export default function ClothingManage() {
       <BottomSheet isOpen={showCatSheet} onOpenChange={setShowCatSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-900">
-              {editingCat ? "编辑分类" : "添加分类"}
-            </Text>
+          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }} onSubmit={saveCat}>
+            <BottomSheet.Header
+              title={editingCat ? "编辑分类" : "添加分类"}
+              onCancel={() => setShowCatSheet(false)}
+              onConfirm={saveCat}
+              confirmDisabled={!catForm.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -414,14 +493,6 @@ export default function ClothingManage() {
                 autoFocus
               />
             </TextField>
-            <View className="flex-row gap-3">
-              <Button variant="secondary" className="flex-1" onPress={() => setShowCatSheet(false)}>
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveCat} isDisabled={!catForm.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -430,10 +501,13 @@ export default function ClothingManage() {
       <BottomSheet isOpen={showGroupSheet} onOpenChange={setShowGroupSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-900">
-              {editingGroup ? "编辑分组" : "新建分组"}
-            </Text>
+          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }} onSubmit={saveGroup}>
+            <BottomSheet.Header
+              title={editingGroup ? "编辑分组" : "新建分组"}
+              onCancel={() => setShowGroupSheet(false)}
+              onConfirm={saveGroup}
+              confirmDisabled={!groupForm.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -443,18 +517,6 @@ export default function ClothingManage() {
                 autoFocus
               />
             </TextField>
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowGroupSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveGroup} isDisabled={!groupForm.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -464,9 +526,12 @@ export default function ClothingManage() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-900">
-              {editingTag ? "编辑标签" : "添加标签"}
-            </Text>
+            <BottomSheet.Header
+              title={editingTag ? "编辑标签" : "添加标签"}
+              onCancel={() => setShowTagSheet(false)}
+              onConfirm={saveTag}
+              confirmDisabled={!tagForm.name.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -507,14 +572,6 @@ export default function ClothingManage() {
                 />
               </View>
             </View>
-            <View className="flex-row gap-3">
-              <Button variant="secondary" className="flex-1" onPress={() => setShowTagSheet(false)}>
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveTag} isDisabled={!tagForm.name.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/clothes/(tabs)/outfit/index.tsx b/code/app/app-rn/src/app/clothes/(tabs)/outfit/index.tsx
index 19735852..01e58d7d 100644
--- a/code/app/app-rn/src/app/clothes/(tabs)/outfit/index.tsx
+++ b/code/app/app-rn/src/app/clothes/(tabs)/outfit/index.tsx
@@ -11,6 +11,7 @@ import {
 import { router, useFocusEffect } from "expo-router";
 import { Button, Dialog, Label, TextField } from "heroui-native";
 import BottomSheet from "@/components/BottomSheet";
+import CategoryChipBar from "@/components/CategoryChipBar";
 import ContextMenu from "@/components/ContextMenu";
 import {
   FilterIcon,
@@ -180,6 +181,14 @@ export default function ClothingOutfitList() {
     [outfitClothes],
   );
 
+  const outfitCategories = useMemo(
+    () =>
+      categories
+        .filter((c) => c.type === ClothingTargetType.Outfit)
+        .sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
+    [categories],
+  );
+
   const filteredOutfits = useMemo(() => {
     const kw = keyword.trim().toLowerCase();
     return outfits.filter((item) => {
@@ -309,6 +318,12 @@ export default function ClothingOutfitList() {
         ]}
       >
         {renderHeader()}
+        <CategoryChipBar
+          categories={outfitCategories}
+          activeId={filterCategoryId}
+          onChange={setFilterCategoryId}
+          style={{ marginBottom: 14 }}
+        />
         {filteredOutfits.length === 0 ? (
           <EmptyState
             type={loading ? "loading" : "empty"}
@@ -380,9 +395,7 @@ export default function ClothingOutfitList() {
                     全部
                   </Text>
                 </TouchableOpacity>
-                {categories
-                  .filter((c) => c.type === ClothingTargetType.Outfit)
-                  .map((c) => {
+                {outfitCategories.map((c) => {
                     const s = filterCategoryId === c.id;
                     return (
                       <TouchableOpacity
diff --git a/code/app/app-rn/src/app/clothes/outfit/edit/index.tsx b/code/app/app-rn/src/app/clothes/outfit/edit/index.tsx
index 6ef32f58..b01c686f 100644
--- a/code/app/app-rn/src/app/clothes/outfit/edit/index.tsx
+++ b/code/app/app-rn/src/app/clothes/outfit/edit/index.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   ActivityIndicator,
+  Dimensions,
   NativeSyntheticEvent,
   NativeScrollEvent,
   PanResponder,
@@ -93,14 +94,16 @@ function createCanvasItem(clothesId: number, index: number, zIndex: number): Can
 
 function DraggableCanvasItem({
   item,
-  canvasSize,
+  canvasWidth,
+  canvasHeight,
   clothes,
   selected,
   onSelect,
   onMove,
 }: {
   item: CanvasItem;
-  canvasSize: number;
+  canvasWidth: number;
+  canvasHeight: number;
   clothes?: ClothingClothes;
   selected: boolean;
   onSelect: (uid: string) => void;
@@ -108,9 +111,11 @@ function DraggableCanvasItem({
 }) {
   const startRef = useRef({ x: item.x, y: item.y });
   const itemRef = useRef(item);
-  const sizeRef = useRef(canvasSize);
+  const widthRef = useRef(canvasWidth);
+  const heightRef = useRef(canvasHeight);
   itemRef.current = item;
-  sizeRef.current = canvasSize;
+  widthRef.current = canvasWidth;
+  heightRef.current = canvasHeight;
 
   const panResponder = useRef(
     PanResponder.create({
@@ -121,17 +126,18 @@ function DraggableCanvasItem({
         onSelect(itemRef.current.uid);
       },
       onPanResponderMove: (_, gestureState) => {
-        const sz = sizeRef.current;
+        const w = widthRef.current;
+        const h = heightRef.current;
         const it = itemRef.current;
-        if (!sz) return;
-        const nextX = clamp(startRef.current.x + gestureState.dx / sz, 0, 1 - it.width);
-        const nextY = clamp(startRef.current.y + gestureState.dy / sz, 0, 1 - it.height);
+        if (!w || !h) return;
+        const nextX = clamp(startRef.current.x + gestureState.dx / w, 0, 1 - it.width);
+        const nextY = clamp(startRef.current.y + gestureState.dy / h, 0, 1 - it.height);
         onMove(it.uid, normalizeNumber(nextX), normalizeNumber(nextY));
       },
     }),
   ).current;
 
-  if (!canvasSize) return null;
+  if (!canvasWidth || !canvasHeight) return null;
 
   return (
     <View
@@ -140,10 +146,10 @@ function DraggableCanvasItem({
         selected ? "border-2 border-gray-900" : "border border-white"
       }`}
       style={{
-        left: item.x * canvasSize,
-        top: item.y * canvasSize,
-        width: item.width * canvasSize,
-        height: item.height * canvasSize,
+        left: item.x * canvasWidth,
+        top: item.y * canvasHeight,
+        width: item.width * canvasWidth,
+        height: item.height * canvasHeight,
         zIndex: item.zIndex,
       }}
     >
@@ -190,6 +196,7 @@ export default function ClothingOutfitEdit() {
   const [remark, setRemark] = useState("");
   const [selectedTagIds, setSelectedTagIds] = useState<number[]>([]);
   const [canvasSize, setCanvasSize] = useState(0);
+  const [canvasHeight, setCanvasHeight] = useState(0);
   const [items, setItems] = useState<CanvasItem[]>([]);
   const [selectedUid, setSelectedUid] = useState<string | null>(null);
   const [pageLoading, setPageLoading] = useState(true);
@@ -246,11 +253,13 @@ export default function ClothingOutfitEdit() {
 
   const clothesFilterCount = useMemo(() => {
     let c = 0;
-    if (clothesFilterCatId) c++;
     if (clothesFilterTagIds.length > 0) c++;
     if (clothesFilterOwnerId) c++;
     return c;
-  }, [clothesFilterCatId, clothesFilterTagIds, clothesFilterOwnerId]);
+  }, [clothesFilterTagIds, clothesFilterOwnerId]);
+
+  // 从衣橱选择衣服弹窗默认高度：固定接近顶部，约为屏幕高度减去外壳估算
+  const clothesSheetHeight = Math.max(Dimensions.get("window").height - 200, 360);
 
   const clothesById = useMemo(() => new Map(clothes.map((item) => [item.id, item])), [clothes]);
   const outfitCategories = useMemo(
@@ -729,7 +738,11 @@ export default function ClothingOutfitEdit() {
       collapsable={false}
       className="w-full flex-1"
       style={{ aspectRatio: 3 / 4 }}
-      onLayout={(event) => setCanvasSize(event.nativeEvent.layout.width)}
+      onLayout={(event) => {
+        const { width, height } = event.nativeEvent.layout;
+        setCanvasSize(width);
+        setCanvasHeight(height);
+      }}
     >
       {items.length === 0 && (
         <View className="absolute inset-0 items-center justify-center" pointerEvents="none">
@@ -741,7 +754,8 @@ export default function ClothingOutfitEdit() {
         <DraggableCanvasItem
           key={item.uid}
           item={item}
-          canvasSize={canvasSize}
+          canvasWidth={canvasSize}
+          canvasHeight={canvasHeight}
           clothes={clothesById.get(item.clothesId)}
           selected={!capturingCover && item.uid === selectedUid}
           onSelect={setSelectedUid}
@@ -890,7 +904,11 @@ export default function ClothingOutfitEdit() {
       </LayoutView>
 
       {/* 从衣橱选择衣服 */}
-      <BottomSheet isOpen={showClothesSheet} onOpenChange={setShowClothesSheet}>
+      <BottomSheet
+        isOpen={showClothesSheet}
+        onOpenChange={setShowClothesSheet}
+        avoidKeyboard={false}
+      >
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-3" style={{ paddingHorizontal: 16 }}>
@@ -915,9 +933,40 @@ export default function ClothingOutfitEdit() {
               </TouchableOpacity>
             </View>
 
+            {/* 分类快捷选择（直接放在外部，不进筛选） */}
+            <ScrollView
+              horizontal
+              showsHorizontalScrollIndicator={false}
+              contentContainerStyle={{ gap: 8, paddingRight: 4 }}
+            >
+              <TouchableOpacity
+                className={`rounded-full border px-3 py-2 ${clothesFilterCatId == null ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
+                onPress={() => setClothesFilterCatId(null)}
+              >
+                <Text
+                  className={`text-xs ${clothesFilterCatId == null ? "text-white" : "text-gray-700"}`}
+                >
+                  全部
+                </Text>
+              </TouchableOpacity>
+              {clothesCategories.map((c) => (
+                <TouchableOpacity
+                  key={c.id}
+                  className={`rounded-full border px-3 py-2 ${clothesFilterCatId === c.id ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
+                  onPress={() => setClothesFilterCatId((p) => (p === c.id ? null : c.id))}
+                >
+                  <Text
+                    className={`text-xs ${clothesFilterCatId === c.id ? "text-white" : "text-gray-700"}`}
+                  >
+                    {c.name}
+                  </Text>
+                </TouchableOpacity>
+              ))}
+            </ScrollView>
+
             {/* 衣服列表 */}
             <ScrollView
-              className="max-h-80"
+              style={{ height: clothesSheetHeight }}
               showsVerticalScrollIndicator
               onMomentumScrollEnd={async (e: NativeSyntheticEvent<NativeScrollEvent>) => {
                 const { contentOffset, contentSize, layoutMeasurement } = e.nativeEvent;
@@ -1029,36 +1078,6 @@ export default function ClothingOutfitEdit() {
               </View>
             </View>
 
-            {/* 分类 */}
-            <View>
-              <Label className="mb-2">分类</Label>
-              <View className="flex-row flex-wrap gap-2">
-                <TouchableOpacity
-                  className={`rounded-full border px-3 py-2 ${clothesFilterCatId == null ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
-                  onPress={() => setClothesFilterCatId(null)}
-                >
-                  <Text
-                    className={`text-xs ${clothesFilterCatId == null ? "text-white" : "text-gray-700"}`}
-                  >
-                    全部
-                  </Text>
-                </TouchableOpacity>
-                {clothesCategories.map((c) => (
-                  <TouchableOpacity
-                    key={c.id}
-                    className={`rounded-full border px-3 py-2 ${clothesFilterCatId === c.id ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
-                    onPress={() => setClothesFilterCatId((p) => (p === c.id ? null : c.id))}
-                  >
-                    <Text
-                      className={`text-xs ${clothesFilterCatId === c.id ? "text-white" : "text-gray-700"}`}
-                    >
-                      {c.name}
-                    </Text>
-                  </TouchableOpacity>
-                ))}
-              </View>
-            </View>
-
             {/* 标签 */}
             <View>
               <Label className="mb-2">标签</Label>
diff --git a/code/app/app-rn/src/app/finance/(tabs)/analysis/index.tsx b/code/app/app-rn/src/app/finance/(tabs)/analysis/index.tsx
index 27b94b7f..d8741214 100644
--- a/code/app/app-rn/src/app/finance/(tabs)/analysis/index.tsx
+++ b/code/app/app-rn/src/app/finance/(tabs)/analysis/index.tsx
@@ -592,20 +592,26 @@ export default function FinanceAnalysis() {
       <BottomSheet isOpen={showFilterSheet} onOpenChange={setShowFilterSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content animateOnMount={false} className="gap-4">
-            <View className="flex-row items-center">
-              <View className="flex-1" />
-              <Text className="text-center text-lg font-semibold text-gray-900">筛选分析</Text>
-              <View className="flex-1 items-end">
+          <BottomSheet.Content
+            animateOnMount={false}
+            className="gap-4"
+            onSubmit={handleApplyFilter}
+          >
+            <BottomSheet.Header
+              title="筛选分析"
+              confirmText="应用"
+              onCancel={() => setShowFilterSheet(false)}
+              onConfirm={handleApplyFilter}
+              rightExtra={
                 <TouchableOpacity
-                  className="h-9 px-3 rounded-full bg-gray-100 flex-row items-center gap-1"
+                  className="h-8 px-3 rounded-full bg-gray-100 flex-row items-center gap-1"
                   onPress={handleResetFilter}
                 >
                   <RotateCcwIcon size={14} color="#4B5563" />
                   <Text className="text-xs text-gray-600">重置</Text>
                 </TouchableOpacity>
-              </View>
-            </View>
+              }
+            />
 
             <ScrollView
               showsVerticalScrollIndicator={false}
@@ -807,20 +813,6 @@ export default function FinanceAnalysis() {
                 />
               </TextField>
             </ScrollView>
-
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowFilterSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleApplyFilter}>
-                <CheckIcon size={18} color="#fff" />
-                <Button.Label>应用</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/finance/(tabs)/auto-rules/index.tsx b/code/app/app-rn/src/app/finance/(tabs)/auto-rules/index.tsx
index 0ad874e9..0678ea0c 100644
--- a/code/app/app-rn/src/app/finance/(tabs)/auto-rules/index.tsx
+++ b/code/app/app-rn/src/app/finance/(tabs)/auto-rules/index.tsx
@@ -385,9 +385,12 @@ export default function AutoRulesPage() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content style={{ paddingHorizontal: 16, maxHeight: 600 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950 mb-3">
-              {editingRuleId ? "编辑规则" : "新增规则"}
-            </Text>
+            <BottomSheet.Header
+              title={editingRuleId ? "编辑规则" : "新增规则"}
+              onCancel={() => setShowEditor(false)}
+              onConfirm={handleSave}
+            />
+            <View className="mb-3" />
 
             <ScrollView
               showsVerticalScrollIndicator={false}
@@ -616,16 +619,6 @@ export default function AutoRulesPage() {
                 </View>
               )}
             </ScrollView>
-
-            <View className="flex-row gap-3 pt-3">
-              <Button variant="secondary" className="flex-1" onPress={() => setShowEditor(false)}>
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleSave}>
-                <CheckIcon size={18} color="#fff" />
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/finance/(tabs)/home/index.tsx b/code/app/app-rn/src/app/finance/(tabs)/home/index.tsx
index fdc3bbec..6f3b7880 100644
--- a/code/app/app-rn/src/app/finance/(tabs)/home/index.tsx
+++ b/code/app/app-rn/src/app/finance/(tabs)/home/index.tsx
@@ -256,11 +256,15 @@ export default function Home() {
       // 自动记账：加载规则并执行
       if (!autoRunRef.current && userId) {
         autoRunRef.current = true;
-        fetchAutoRules(familyId).then(() => {
-          runAutoRules(familyId, userId).then((count) => {
+        fetchAutoRules(familyId)
+          .then(() => runAutoRules(familyId, userId))
+          .then((count) => {
             if (count > 0) loadBills(filter);
+          })
+          .catch((err) => {
+            console.error("自动记账执行失败", err);
+            Alert.alert("自动记账失败", err?.message || "请稍后重试");
           });
-        });
       }
     }, [familyId, filter, loadBills, fetchAutoRules, runAutoRules, userId]),
   );
@@ -589,20 +593,26 @@ export default function Home() {
       <BottomSheet isOpen={showFilterSheet} onOpenChange={setShowFilterSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content animateOnMount={false} className="gap-4">
-            <View className="flex-row items-center">
-              <View className="flex-1" />
-              <Text className="text-center text-lg font-semibold text-gray-900">筛选记账</Text>
-              <View className="flex-1 items-end">
+          <BottomSheet.Content
+            animateOnMount={false}
+            className="gap-4"
+            onSubmit={handleApplyFilter}
+          >
+            <BottomSheet.Header
+              title="筛选记账"
+              confirmText="应用"
+              onCancel={() => setShowFilterSheet(false)}
+              onConfirm={handleApplyFilter}
+              rightExtra={
                 <TouchableOpacity
-                  className="h-9 px-3 rounded-full bg-gray-100 flex-row items-center gap-1"
+                  className="h-8 px-3 rounded-full bg-gray-100 flex-row items-center gap-1"
                   onPress={handleResetFilter}
                 >
                   <RotateCcwIcon size={14} color="#4B5563" />
                   <Text className="text-xs text-gray-600">重置</Text>
                 </TouchableOpacity>
-              </View>
-            </View>
+              }
+            />
 
             <ScrollView
               showsVerticalScrollIndicator={false}
@@ -725,20 +735,6 @@ export default function Home() {
                 </View>
               </View>
             </ScrollView>
-
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowFilterSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleApplyFilter}>
-                <CheckIcon size={18} color="#fff" />
-                <Button.Label>应用</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -817,8 +813,13 @@ export default function Home() {
       <BottomSheet isOpen={showAutoSheet} onOpenChange={setShowAutoSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content style={{ paddingHorizontal: 16, maxHeight: 560 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950 mb-3">自动记账</Text>
+          <BottomSheet.Content style={{ paddingHorizontal: 16, maxHeight: 560 }} onSubmit={handleSaveAuto}>
+            <BottomSheet.Header
+              title="自动记账"
+              onCancel={() => setShowAutoSheet(false)}
+              onConfirm={handleSaveAuto}
+            />
+            <View className="mb-3" />
 
             <ScrollView
               showsVerticalScrollIndicator={false}
@@ -1031,20 +1032,6 @@ export default function Home() {
                 </View>
               )}
             </ScrollView>
-
-            <View className="flex-row gap-3 pt-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowAutoSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleSaveAuto}>
-                <CheckIcon size={18} color="#fff" />
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/finance/add/index.tsx b/code/app/app-rn/src/app/finance/add/index.tsx
index dd4b7109..d48d9ff2 100644
--- a/code/app/app-rn/src/app/finance/add/index.tsx
+++ b/code/app/app-rn/src/app/finance/add/index.tsx
@@ -62,6 +62,9 @@ export default function Add() {
   const { isLoading, startLoading, stopLoading } = useLoading();
   const notifyModuleOperation = useModuleChatNotifier();
   const amountInputRef = useRef<any>(null);
+  const remarkInputRef = useRef<any>(null);
+  const enteredRemarkRef = useRef(false);
+  const amountProgrammaticFocusRef = useRef(false);
 
   const [activeTab, setActiveTab] = useState("0"); // 0=支出 1=收入
   const [keyword, setKeyword] = useState("");
@@ -335,6 +338,28 @@ export default function Add() {
                 ref={amountInputRef}
                 placeholder="0.00"
                 inputMode="decimal"
+                returnKeyType="next"
+                blurOnSubmit={false}
+                onSubmitEditing={() => {
+                  enteredRemarkRef.current = true;
+                  Keyboard.dismiss();
+                  // 收起后重新聚焦，强制触发键盘弹出事件，让面板重新适配
+                  setTimeout(() => remarkInputRef.current?.focus(), 100);
+                }}
+                onFocus={() => {
+                  // 从备注框点回金额框时，键盘已打开不会重新弹出，
+                  // 需强制收起再聚焦以触发适配，避免备注内容被遮挡。
+                  // 程序化 focus 触发的 onFocus 直接跳过，避免循环
+                  if (!enteredRemarkRef.current) return;
+                  if (amountProgrammaticFocusRef.current) {
+                    amountProgrammaticFocusRef.current = false;
+                    return;
+                  }
+                  enteredRemarkRef.current = false;
+                  Keyboard.dismiss();
+                  amountProgrammaticFocusRef.current = true;
+                  setTimeout(() => amountInputRef.current?.focus(), 100);
+                }}
                 value={amount}
                 onChangeText={setAmount}
                 className="text-4xl font-bold text-center w-full"
@@ -346,6 +371,7 @@ export default function Add() {
             <TextField>
               <Label className="mb-2">备注</Label>
               <BottomSheet.Input
+                ref={remarkInputRef}
                 placeholder="写点什么..."
                 value={remark}
                 onChangeText={setRemark}
diff --git a/code/app/app-rn/src/app/finance/category/index.tsx b/code/app/app-rn/src/app/finance/category/index.tsx
index e1f45171..1a3a0f44 100644
--- a/code/app/app-rn/src/app/finance/category/index.tsx
+++ b/code/app/app-rn/src/app/finance/category/index.tsx
@@ -356,9 +356,15 @@ export default function FinanceCategoryList() {
       >
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content animateOnMount={false} className="gap-4">
+          <BottomSheet.Content animateOnMount={false} className="gap-4" onSubmit={handleSave}>
             {form && (
               <>
+                <BottomSheet.Header
+                  title={form.id ? "编辑分类" : "新增分类"}
+                  onCancel={closeSheet}
+                  onConfirm={handleSave}
+                  confirmDisabled={saving || uploading}
+                />
                 <View className="items-center py-2">
                   <TouchableOpacity
                     className="w-24 h-24 rounded-3xl bg-gray-100 items-center justify-center"
@@ -402,10 +408,6 @@ export default function FinanceCategoryList() {
                   </Tabs>
                 </View>
 
-                <Button onPress={handleSave} isDisabled={saving || uploading}>
-                  <SaveIcon size={18} color="#fff" />
-                  <Button.Label>保存</Button.Label>
-                </Button>
               </>
             )}
           </BottomSheet.Content>
diff --git a/code/app/app-rn/src/app/meal/(tabs)/manage/index.tsx b/code/app/app-rn/src/app/meal/(tabs)/manage/index.tsx
index 2bac672b..35c8b753 100644
--- a/code/app/app-rn/src/app/meal/(tabs)/manage/index.tsx
+++ b/code/app/app-rn/src/app/meal/(tabs)/manage/index.tsx
@@ -1,7 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Text, TextInput, TouchableOpacity, View } from "react-native";
 import { Button, Dialog, Label, TextField } from "heroui-native";
-import { PlusIcon, RotateCcwIcon, Trash2Icon } from "lucide-react-native";
+import { GripVerticalIcon, PlusIcon, RotateCcwIcon, Trash2Icon } from "lucide-react-native";
+import Sortable, { SortableGridRenderItem } from "react-native-sortables";
+import { useAnimatedRef } from "react-native-reanimated";
 import BottomSheet from "@/components/BottomSheet";
 import LayoutView from "@/components/layout/view";
 import { LoadingOverlay } from "@/components/LoadingOverlay";
@@ -9,6 +11,7 @@ import { useListLoading, useLoading } from "@/hooks/useLoading";
 import { getUniqueIdApi } from "@/request/api";
 import { useFamilyStore, useMealStore } from "@/store";
 import { MealCategory, MealSlot, MealStatus, MealTag } from "@/types/meal";
+import { toast } from "sonner-native";
 
 type ManageTab = "category" | "tag" | "slot";
 
@@ -387,14 +390,195 @@ export default function MealManagePage() {
     }
   }, [loadData, saveSlotChanges, slotDelete, startLoading, stopLoading]);
 
-  const getTagsByGroup = useCallback(
-    (gId: number) => tags.filter((t) => t.parent_id === gId),
+  // ── 拖拽排序 ──────────────────────────────────
+  const scrollRef = useAnimatedRef<any>();
+
+  const sortedCategories = useMemo(
+    () => [...categories].sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
+    [categories],
+  );
+  const sortedSlots = useMemo(
+    () => [...slots].sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
+    [slots],
+  );
+  const sortedParentTags = useMemo(
+    () => [...parentTags].sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
+    [parentTags],
+  );
+  const getSortedTagsByGroup = useCallback(
+    (gId: number) =>
+      tags
+        .filter((t) => t.parent_id === gId)
+        .sort((a, b) => a.sort_number - b.sort_number || a.id - b.id),
     [tags],
   );
 
+  const handleCatDragEnd = useCallback(
+    async ({ data }: { data: MealCategory[] }) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveCategoryChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveCategoryChanges],
+  );
+
+  const handleSlotDragEnd = useCallback(
+    async ({ data }: { data: MealSlot[] }) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveSlotChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveSlotChanges],
+  );
+
+  const handleParentTagDragEnd = useCallback(
+    async ({ data }: { data: MealTag[] }) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveTagChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveTagChanges],
+  );
+
+  const handleChildTagDragEnd = useCallback(
+    async (data: MealTag[]) => {
+      const updates = data.map((item, index) => ({ id: item.id, sort_number: index }));
+      const ok = await saveTagChanges({ updates });
+      if (!ok) toast.error("排序保存失败");
+      else await loadData();
+    },
+    [loadData, saveTagChanges],
+  );
+
+  const renderChildTagItem = useCallback<SortableGridRenderItem<MealTag>>(
+    ({ item }) => (
+      <View className="flex-row items-center gap-2">
+        <Sortable.Handle>
+          <GripVerticalIcon size={16} color="#9CA3AF" />
+        </Sortable.Handle>
+        <TouchableOpacity
+          className="rounded-full px-2.5 py-1"
+          style={{ backgroundColor: item.color || "#E5E7EB" }}
+          onPress={() => openTag(item.parent_id as number, item)}
+        >
+          <Text
+            className="text-xs font-medium"
+            style={{ color: item.color ? "#fff" : "#4B5563" }}
+          >
+            {item.name}
+          </Text>
+        </TouchableOpacity>
+      </View>
+    ),
+    [openTag],
+  );
+
+  const renderGroupItem = useCallback<SortableGridRenderItem<MealTag>>(
+    ({ item }) => {
+      const gt = getSortedTagsByGroup(item.id);
+      return (
+        <View className="bg-white rounded-xl px-4 py-3.5 border border-gray-100">
+          <View className="flex-row items-center justify-between mb-2.5">
+            <View className="flex-row items-center gap-2 flex-1">
+              <Sortable.Handle>
+                <GripVerticalIcon size={18} color="#9CA3AF" />
+              </Sortable.Handle>
+              <TouchableOpacity className="flex-1" onPress={() => openGroup(item)}>
+                <Text className="text-sm font-semibold text-gray-950">{item.name}</Text>
+              </TouchableOpacity>
+            </View>
+            <TouchableOpacity
+              className="w-7 h-7 items-center justify-center"
+              onPress={() => setGroupDelete(item)}
+            >
+              <Trash2Icon size={14} color="#EF4444" />
+            </TouchableOpacity>
+          </View>
+          {gt.length > 0 && (
+            <Sortable.Grid
+              columns={1}
+              customHandle
+              scrollableRef={scrollRef}
+              data={gt}
+              keyExtractor={(t) => String(t.id)}
+              renderItem={renderChildTagItem}
+              rowGap={8}
+              onDragEnd={({ data }) => handleChildTagDragEnd(data)}
+            />
+          )}
+          <TouchableOpacity
+            className="mt-2 self-start rounded-full px-2.5 py-1 bg-gray-50 border border-dashed border-gray-300"
+            onPress={() => openTag(item.id)}
+          >
+            <Text className="text-xs text-gray-400">+ 添加</Text>
+          </TouchableOpacity>
+        </View>
+      );
+    },
+    [getSortedTagsByGroup, handleChildTagDragEnd, openGroup, openTag, renderChildTagItem],
+  );
+
+  const renderCatItem = useCallback<SortableGridRenderItem<MealCategory>>(
+    ({ item }) => (
+      <TouchableOpacity
+        className="bg-white rounded-xl px-4 py-3.5 border border-gray-100 flex-row items-center justify-between"
+        activeOpacity={0.72}
+        onPress={() => openCat(item)}
+      >
+        <View className="flex-row items-center gap-2 flex-1">
+          <Sortable.Handle>
+            <GripVerticalIcon size={18} color="#9CA3AF" />
+          </Sortable.Handle>
+          <Text className="text-sm font-semibold text-gray-950">{item.name}</Text>
+        </View>
+        <TouchableOpacity
+          className="w-7 h-7 items-center justify-center"
+          onPress={(e) => {
+            e.stopPropagation();
+            setCatDelete(item);
+          }}
+        >
+          <Trash2Icon size={14} color="#EF4444" />
+        </TouchableOpacity>
+      </TouchableOpacity>
+    ),
+    [openCat],
+  );
+
+  const renderSlotItem = useCallback<SortableGridRenderItem<MealSlot>>(
+    ({ item }) => (
+      <TouchableOpacity
+        className="bg-white rounded-xl px-4 py-3.5 border border-gray-100 flex-row items-center justify-between"
+        activeOpacity={0.72}
+        onPress={() => openSlot(item)}
+      >
+        <View className="flex-row items-center gap-2 flex-1">
+          <Sortable.Handle>
+            <GripVerticalIcon size={18} color="#9CA3AF" />
+          </Sortable.Handle>
+          <Text className="text-sm font-semibold text-gray-950">{item.name}</Text>
+        </View>
+        <TouchableOpacity
+          className="w-7 h-7 items-center justify-center"
+          onPress={(e) => {
+            e.stopPropagation();
+            setSlotDelete(item);
+          }}
+        >
+          <Trash2Icon size={14} color="#EF4444" />
+        </TouchableOpacity>
+      </TouchableOpacity>
+    ),
+    [openSlot],
+  );
+
   return (
     <LayoutView>
       <LayoutView.ScrollView
+        ref={scrollRef}
         refreshing={refreshing}
         onRefresh={() => runRefresh(loadData)}
         showsVerticalScrollIndicator={false}
@@ -447,38 +631,17 @@ export default function MealManagePage() {
                 <Text className="text-xs font-medium text-white">添加</Text>
               </TouchableOpacity>
             </View>
-            {categories.length > 0 ? (
-              <View className="gap-3">
-                {categories.map((c) => (
-                  <View
-                    key={c.id}
-                    className="bg-white rounded-xl px-4 py-3.5 border border-gray-100"
-                    style={{
-                      shadowColor: "#000",
-                      shadowOffset: { width: 0, height: 1 },
-                      shadowOpacity: 0.04,
-                      shadowRadius: 2,
-                      elevation: 1,
-                    }}
-                  >
-                    <TouchableOpacity
-                      className="flex-row items-center justify-between"
-                      onPress={() => openCat(c)}
-                    >
-                      <Text className="text-sm font-semibold text-gray-950">{c.name}</Text>
-                      <TouchableOpacity
-                        className="w-7 h-7 items-center justify-center"
-                        onPress={(e) => {
-                          e.stopPropagation();
-                          setCatDelete(c);
-                        }}
-                      >
-                        <Trash2Icon size={14} color="#EF4444" />
-                      </TouchableOpacity>
-                    </TouchableOpacity>
-                  </View>
-                ))}
-              </View>
+            {sortedCategories.length > 0 ? (
+              <Sortable.Grid
+                columns={1}
+                customHandle
+                scrollableRef={scrollRef}
+                data={sortedCategories}
+                keyExtractor={(c) => String(c.id)}
+                renderItem={renderCatItem}
+                rowGap={12}
+                onDragEnd={handleCatDragEnd}
+              />
             ) : (
               <Text className="text-sm text-gray-400 py-4">暂无分类，点击右上角添加</Text>
             )}
@@ -501,60 +664,17 @@ export default function MealManagePage() {
                 <Text className="text-xs font-medium text-white">新建分组</Text>
               </TouchableOpacity>
             </View>
-            {parentTags.length > 0 ? (
-              <View className="gap-3">
-                {parentTags.map((g) => {
-                  const gt = getTagsByGroup(g.id);
-                  return (
-                    <View
-                      key={g.id}
-                      className="bg-white rounded-xl px-4 py-3.5 border border-gray-100"
-                      style={{
-                        shadowColor: "#000",
-                        shadowOffset: { width: 0, height: 1 },
-                        shadowOpacity: 0.04,
-                        shadowRadius: 2,
-                        elevation: 1,
-                      }}
-                    >
-                      <View className="flex-row items-center justify-between mb-2.5">
-                        <TouchableOpacity className="flex-1" onPress={() => openGroup(g)}>
-                          <Text className="text-sm font-semibold text-gray-950">{g.name}</Text>
-                        </TouchableOpacity>
-                        <TouchableOpacity
-                          className="w-7 h-7 items-center justify-center"
-                          onPress={() => setGroupDelete(g)}
-                        >
-                          <Trash2Icon size={14} color="#EF4444" />
-                        </TouchableOpacity>
-                      </View>
-                      <View className="flex-row flex-wrap gap-1.5">
-                        {gt.map((t) => (
-                          <TouchableOpacity
-                            key={t.id}
-                            className="rounded-full px-2.5 py-1"
-                            style={{ backgroundColor: t.color || "#E5E7EB" }}
-                            onPress={() => openTag(g.id, t)}
-                          >
-                            <Text
-                              className="text-xs font-medium"
-                              style={{ color: t.color ? "#fff" : "#4B5563" }}
-                            >
-                              {t.name}
-                            </Text>
-                          </TouchableOpacity>
-                        ))}
-                        <TouchableOpacity
-                          className="rounded-full px-2.5 py-1 bg-gray-50 border border-dashed border-gray-300"
-                          onPress={() => openTag(g.id)}
-                        >
-                          <Text className="text-xs text-gray-400">+ 添加</Text>
-                        </TouchableOpacity>
-                      </View>
-                    </View>
-                  );
-                })}
-              </View>
+            {sortedParentTags.length > 0 ? (
+              <Sortable.Grid
+                columns={1}
+                customHandle
+                scrollableRef={scrollRef}
+                data={sortedParentTags}
+                keyExtractor={(g) => String(g.id)}
+                renderItem={renderGroupItem}
+                rowGap={12}
+                onDragEnd={handleParentTagDragEnd}
+              />
             ) : (
               <Text className="text-sm text-gray-400 py-4">暂无标签分组，先新建分组再添加标签</Text>
             )}
@@ -577,40 +697,17 @@ export default function MealManagePage() {
                 <Text className="text-xs font-medium text-white">添加</Text>
               </TouchableOpacity>
             </View>
-            {slots.length > 0 ? (
-              <View className="gap-3">
-                {slots.map((s, i) => {
-                  return (
-                    <TouchableOpacity
-                      key={s.id}
-                      className="bg-white rounded-xl px-4 py-3.5 border border-gray-100"
-                      style={{
-                        shadowColor: "#000",
-                        shadowOffset: { width: 0, height: 1 },
-                        shadowOpacity: 0.04,
-                        shadowRadius: 2,
-                        elevation: 1,
-                      }}
-                      onPress={() => openSlot(s)}
-                    >
-                      <View className="flex-row items-center justify-between">
-                        <View className="flex-1">
-                          <Text className="text-sm font-semibold text-gray-950">{s.name}</Text>
-                        </View>
-                        <TouchableOpacity
-                          className="w-7 h-7 items-center justify-center"
-                          onPress={(e) => {
-                            e.stopPropagation();
-                            setSlotDelete(s);
-                          }}
-                        >
-                          <Trash2Icon size={14} color="#EF4444" />
-                        </TouchableOpacity>
-                      </View>
-                    </TouchableOpacity>
-                  );
-                })}
-              </View>
+            {sortedSlots.length > 0 ? (
+              <Sortable.Grid
+                columns={1}
+                customHandle
+                scrollableRef={scrollRef}
+                data={sortedSlots}
+                keyExtractor={(s) => String(s.id)}
+                renderItem={renderSlotItem}
+                rowGap={12}
+                onDragEnd={handleSlotDragEnd}
+              />
             ) : (
               <Text className="text-sm text-gray-400 py-4">暂无餐段，点击右上角添加</Text>
             )}
@@ -625,10 +722,13 @@ export default function MealManagePage() {
       <BottomSheet isOpen={showCatSheet} onOpenChange={setShowCatSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">
-              {editingCat ? "编辑分类" : "添加分类"}
-            </Text>
+          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }} onSubmit={saveCat}>
+            <BottomSheet.Header
+              title={editingCat ? "编辑分类" : "添加分类"}
+              onCancel={() => setShowCatSheet(false)}
+              onConfirm={saveCat}
+              confirmDisabled={!catForm.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -638,24 +738,19 @@ export default function MealManagePage() {
                 ref={catInputRef}
               />
             </TextField>
-            <View className="flex-row gap-3">
-              <Button variant="secondary" className="flex-1" onPress={() => setShowCatSheet(false)}>
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveCat} isDisabled={!catForm.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
       <BottomSheet isOpen={showGroupSheet} onOpenChange={setShowGroupSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">
-              {editingGroup ? "编辑分组" : "新建分组"}
-            </Text>
+          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }} onSubmit={saveGroup}>
+            <BottomSheet.Header
+              title={editingGroup ? "编辑分组" : "新建分组"}
+              onCancel={() => setShowGroupSheet(false)}
+              onConfirm={saveGroup}
+              confirmDisabled={!groupForm.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -665,18 +760,6 @@ export default function MealManagePage() {
                 ref={groupInputRef}
               />
             </TextField>
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowGroupSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveGroup} isDisabled={!groupForm.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -684,9 +767,12 @@ export default function MealManagePage() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">
-              {editingTag ? "编辑标签" : "添加标签"}
-            </Text>
+            <BottomSheet.Header
+              title={editingTag ? "编辑标签" : "添加标签"}
+              onCancel={() => setShowTagSheet(false)}
+              onConfirm={saveTag}
+              confirmDisabled={!tagForm.name.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -727,24 +813,19 @@ export default function MealManagePage() {
                 />
               </View>
             </View>
-            <View className="flex-row gap-3">
-              <Button variant="secondary" className="flex-1" onPress={() => setShowTagSheet(false)}>
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveTag} isDisabled={!tagForm.name.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
       <BottomSheet isOpen={showSlotSheet} onOpenChange={setShowSlotSheet}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">
-              {editingSlot ? "编辑餐段" : "添加餐段"}
-            </Text>
+          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }} onSubmit={saveSlot}>
+            <BottomSheet.Header
+              title={editingSlot ? "编辑餐段" : "添加餐段"}
+              onCancel={() => setShowSlotSheet(false)}
+              onConfirm={saveSlot}
+              confirmDisabled={!slotForm.trim()}
+            />
             <TextField>
               <Label className="mb-2">名称</Label>
               <BottomSheet.Input
@@ -754,18 +835,6 @@ export default function MealManagePage() {
                 ref={slotInputRef}
               />
             </TextField>
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowSlotSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={saveSlot} isDisabled={!slotForm.trim()}>
-                <Button.Label>保存</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/meal/dish/edit/index.tsx b/code/app/app-rn/src/app/meal/dish/edit/index.tsx
index a0a6da04..ae115585 100644
--- a/code/app/app-rn/src/app/meal/dish/edit/index.tsx
+++ b/code/app/app-rn/src/app/meal/dish/edit/index.tsx
@@ -13,7 +13,7 @@ import { useLoading } from "@/hooks/useLoading";
 import { useModuleChatNotifier } from "@/hooks/useModuleChatNotifier";
 import { getUniqueIdApi } from "@/request/api";
 import { useFamilyStore, useMealStore, useUserStore } from "@/store";
-import { MealDishDifficulty, MealStatus } from "@/types/meal";
+import { MealDishDifficulty, MealDishTag, MealStatus } from "@/types/meal";
 
 interface DishForm {
   name: string;
@@ -54,10 +54,16 @@ export default function MealDishEdit() {
   const fetchDishSteps = useMealStore((s) => s.fetchDishSteps);
   const uploadDishImage = useMealStore((s) => s.uploadDishImage);
   const uploadStepImage = useMealStore((s) => s.uploadStepImage);
+  const tags = useMealStore((s) => s.tags);
+  const fetchTags = useMealStore((s) => s.fetchTags);
+  const fetchDishTags = useMealStore((s) => s.fetchDishTags);
+  const dishTags = useMealStore((s) => s.dishTags);
+  const saveDishTagChanges = useMealStore((s) => s.saveDishTagChanges);
   const { isLoading, startLoading, stopLoading } = useLoading();
   const notifyOp = useModuleChatNotifier();
 
   const [form, setForm] = useState<DishForm>(emptyForm);
+  const [selectedTagIds, setSelectedTagIds] = useState<number[]>([]);
   const [steps, setSteps] = useState<
     {
       key: string;
@@ -89,13 +95,53 @@ export default function MealDishEdit() {
     setSteps((p) => p.map((s) => (s.key === key ? { ...s, description: desc } : s)));
   }, []);
 
+  const saveDishTagsForDish = useCallback(
+    async (dishId: number) => {
+      const existing = (useMealStore.getState().dishTags ?? []).filter(
+        (r) => r.dish_id === dishId,
+      );
+      const existingIds = new Set(existing.map((r) => r.tag_id));
+      const toAdd = selectedTagIds.filter((id) => !existingIds.has(id));
+      const toRemove = existing.filter((r) => !selectedTagIds.includes(r.tag_id));
+      const inserts: Partial<MealDishTag>[] = [];
+      const deletes: Partial<MealDishTag>[] = [];
+      if (toAdd.length > 0) {
+        const res = await getUniqueIdApi(toAdd.length);
+        const ids = res.data ?? [];
+        toAdd.forEach((tid, i) => {
+          inserts.push({
+            id: ids[i] ?? 0,
+            family_id: familyId,
+            dish_id: dishId,
+            tag_id: tid,
+            create_by: userId,
+            update_by: userId,
+          });
+        });
+      }
+      toRemove.forEach((r) => deletes.push({ id: r.id }));
+      if (inserts.length > 0 || deletes.length > 0) {
+        const ok = await saveDishTagChanges({ inserts, deletes });
+        if (ok) await fetchDishTags(familyId, dishId);
+        return ok;
+      }
+      return true;
+    },
+    [familyId, userId, selectedTagIds, saveDishTagChanges, fetchDishTags],
+  );
+
   const enabledCats = useMemo(() => categories.filter((c) => c.status !== 0), [categories]);
+  const enabledTags = useMemo(() => tags.filter((t) => t.status !== 0), [tags]);
+  const parentTags = useMemo(
+    () => enabledTags.filter((t) => !t.parent_id),
+    [enabledTags],
+  );
 
   const loadData = useCallback(async () => {
     if (!familyId) return;
     setPageLoading(true);
     try {
-      await Promise.all([fetchDishes(familyId), fetchCategories(familyId)]);
+      await Promise.all([fetchDishes(familyId), fetchCategories(familyId), fetchTags(familyId)]);
       if (isEdit) {
         const st = useMealStore.getState();
         const item = st.dishes.find((d) => d.id === editId);
@@ -124,6 +170,9 @@ export default function MealDishEdit() {
           })),
         );
         setStepsIdsToDelete([]);
+        await fetchDishTags(familyId, editId);
+        const dt = useMealStore.getState().dishTags;
+        setSelectedTagIds(dt.filter((r) => r.dish_id === editId).map((r) => r.tag_id));
       }
     } finally {
       setPageLoading(false);
@@ -210,6 +259,11 @@ export default function MealDishEdit() {
           sourceTable: "b_meal_dish",
           sourceId: editId,
         });
+        try {
+          await saveDishTagsForDish(editId);
+        } catch {
+          /* 标签保存失败不影响主流程 */
+        }
       } else {
         const sc = steps.length + 1;
         const idsRes = await getUniqueIdApi(sc);
@@ -256,6 +310,11 @@ export default function MealDishEdit() {
           sourceTable: "b_meal_dish",
           sourceId: dishId,
         });
+        try {
+          await saveDishTagsForDish(dishId);
+        } catch {
+          /* 标签保存失败不影响主流程 */
+        }
       }
 
       stopLoading({ type: "success", message: "已保存" });
@@ -274,6 +333,7 @@ export default function MealDishEdit() {
     uploadDishImage,
     saveDishBundle,
     saveDishChanges,
+    saveDishTagsForDish,
     notifyOp,
     router,
   ]);
@@ -348,6 +408,59 @@ export default function MealDishEdit() {
             </View>
           </View>
 
+          <View className="mb-4">
+            <Label className="mb-2">标签</Label>
+            {enabledTags.length > 0 ? (
+              <View className="gap-3">
+                {parentTags.map((p) => {
+                  const children = enabledTags.filter((c) => c.parent_id === p.id);
+                  const pSel = children.some((c) => selectedTagIds.includes(c.id));
+                  return (
+                    <View key={p.id} className="gap-2">
+                      <View
+                        className={
+                          "self-start rounded-full border px-4 py-2 " +
+                          (pSel ? "border-accent bg-accent" : "border-gray-200 bg-white")
+                        }
+                      >
+                        <Text className={"text-sm " + (pSel ? "text-white" : "text-gray-600")}>
+                          {p.name}
+                        </Text>
+                      </View>
+                      {children.length > 0 && (
+                        <View className="flex-row flex-wrap gap-2 pl-3">
+                          {children.map((c) => {
+                            const cSel = selectedTagIds.includes(c.id);
+                            return (
+                              <TouchableOpacity
+                                key={c.id}
+                                className={
+                                  "rounded-full border px-3 py-1.5 " +
+                                  (cSel ? "border-accent bg-accent" : "border-gray-200 bg-white")
+                                }
+                                onPress={() =>
+                                  setSelectedTagIds((prev) =>
+                                    cSel ? prev.filter((id) => id !== c.id) : [...prev, c.id],
+                                  )
+                                }
+                              >
+                                <Text className={"text-xs " + (cSel ? "text-white" : "text-gray-600")}>
+                                  {c.name}
+                                </Text>
+                              </TouchableOpacity>
+                            );
+                          })}
+                        </View>
+                      )}
+                    </View>
+                  );
+                })}
+              </View>
+            ) : (
+              <Text className="text-sm text-gray-400">暂无标签</Text>
+            )}
+          </View>
+
           <View className="mb-4">
             <Label className="mb-2">难度</Label>
             <View className="flex-row gap-2">
diff --git a/code/app/app-rn/src/app/meal/plan/detail/[id]/index.tsx b/code/app/app-rn/src/app/meal/plan/detail/[id]/index.tsx
index dcbe475c..23fd8211 100644
--- a/code/app/app-rn/src/app/meal/plan/detail/[id]/index.tsx
+++ b/code/app/app-rn/src/app/meal/plan/detail/[id]/index.tsx
@@ -6,6 +6,7 @@ import {
   ScrollView,
   Text,
   TextInput,
+  Dimensions,
   TouchableOpacity,
   View,
 } from "react-native";
@@ -111,6 +112,8 @@ export default function MealPlanDetail() {
   const removeDishFromPlan = useMealStore((s) => s.removeDishFromPlan);
   const confirmPlan = useMealStore((s) => s.confirmPlan);
   const completePlan = useMealStore((s) => s.completePlan);
+  const revertPlanToPlanning = useMealStore((s) => s.revertPlanToPlanning);
+  const revertPlanToConfirmed = useMealStore((s) => s.revertPlanToConfirmed);
   const planRatings = useMealStore((s) => s.planRatings);
   const fetchPlanRatings = useMealStore((s) => s.fetchPlanRatings);
   const ratePlan = useMealStore((s) => s.ratePlan);
@@ -131,12 +134,16 @@ export default function MealPlanDetail() {
   const [showCookSheet, setShowCookSheet] = useState(false);
   const [completing, setCompleting] = useState(false);
   const [confirming, setConfirming] = useState(false);
+  const [reverting, setReverting] = useState(false);
   const [showRateSheet, setShowRateSheet] = useState(false);
   const [rateValue, setRateValue] = useState(5);
   const [rateContent, setRateContent] = useState("");
   const [rating, setRating] = useState(false);
   const scrollRef = useRef<any>(null);
 
+  // 加菜弹窗默认高度：固定接近顶部，约为屏幕高度减去外壳估算
+  const dishSheetMaxHeight = Math.max(Dimensions.get("window").height - 200, 360);
+
   // 加菜筛选
   const [showDishFilterSheet, setShowDishFilterSheet] = useState(false);
   const [dishKeyword, setDishKeyword] = useState("");
@@ -192,10 +199,9 @@ export default function MealPlanDetail() {
 
   const dishFilterCount = useMemo(() => {
     let c = 0;
-    if (dishFilterCatId) c++;
     if (dishFilterTagIds.length > 0) c++;
     return c;
-  }, [dishFilterCatId, dishFilterTagIds]);
+  }, [dishFilterTagIds]);
 
   // 菜单状态
   const isPlanning = plan?.status === MealPlanStatus.Planning;
@@ -375,6 +381,44 @@ export default function MealPlanDetail() {
     }
   }, [familyId, planId, isConfirmed, userId, completePlan, refreshPlan]);
 
+  // 撤回确认（已确认 → 进行中）
+  const handleRevertConfirm = useCallback(async () => {
+    if (!familyId || !planId || !isConfirmed) return;
+    setReverting(true);
+    try {
+      const ok = await revertPlanToPlanning({ planId, familyId, userId });
+      if (ok) {
+        await refreshPlan();
+        toast.success("已撤回确认，回到进行中");
+      } else {
+        toast.error("操作失败");
+      }
+    } catch {
+      toast.error("操作失败");
+    } finally {
+      setReverting(false);
+    }
+  }, [familyId, planId, isConfirmed, userId, revertPlanToPlanning, refreshPlan]);
+
+  // 撤回完成（已完成 → 已确认）
+  const handleRevertComplete = useCallback(async () => {
+    if (!familyId || !planId || !isCompleted) return;
+    setReverting(true);
+    try {
+      const ok = await revertPlanToConfirmed({ planId, familyId, userId });
+      if (ok) {
+        await refreshPlan();
+        toast.success("已撤回完成，回到已确认");
+      } else {
+        toast.error("操作失败");
+      }
+    } catch {
+      toast.error("操作失败");
+    } finally {
+      setReverting(false);
+    }
+  }, [familyId, planId, isCompleted, userId, revertPlanToConfirmed, refreshPlan]);
+
   // 添加评论
   const addComment = useCallback(async () => {
     if (!familyId || !comment.trim() || sending || isLocked) return;
@@ -796,17 +840,37 @@ export default function MealPlanDetail() {
                     </TouchableOpacity>
                   )}
                   {isConfirmed && (
+                    <>
+                      <TouchableOpacity
+                        className="flex-row items-center gap-1 rounded-full border border-gray-300 bg-white px-4 py-1.5 active:bg-gray-50"
+                        onPress={handleRevertConfirm}
+                        disabled={reverting}
+                      >
+                        <RotateCcwIcon size={14} color="#6b7280" />
+                        <Text className="text-xs font-semibold text-gray-600">撤回</Text>
+                      </TouchableOpacity>
+                      <TouchableOpacity
+                        className="flex-row items-center gap-1 rounded-full bg-green-500 px-4 py-1.5 active:bg-green-600"
+                        onPress={handleComplete}
+                        disabled={completing}
+                      >
+                        {completing ? (
+                          <ActivityIndicator size="small" color="#fff" />
+                        ) : (
+                          <CheckCircleIcon size={14} color="#fff" />
+                        )}
+                        <Text className="text-xs font-semibold text-white">完成菜单</Text>
+                      </TouchableOpacity>
+                    </>
+                  )}
+                  {isCompleted && (
                     <TouchableOpacity
-                      className="flex-row items-center gap-1 rounded-full bg-green-500 px-4 py-1.5 active:bg-green-600"
-                      onPress={handleComplete}
-                      disabled={completing}
+                      className="flex-row items-center gap-1 rounded-full border border-gray-300 bg-white px-4 py-1.5 active:bg-gray-50"
+                      onPress={handleRevertComplete}
+                      disabled={reverting}
                     >
-                      {completing ? (
-                        <ActivityIndicator size="small" color="#fff" />
-                      ) : (
-                        <CheckCircleIcon size={14} color="#fff" />
-                      )}
-                      <Text className="text-xs font-semibold text-white">完成菜单</Text>
+                      <RotateCcwIcon size={14} color="#6b7280" />
+                      <Text className="text-xs font-semibold text-gray-600">撤回</Text>
                     </TouchableOpacity>
                   )}
                   {isCompleted && !hasRated && (
@@ -973,6 +1037,7 @@ export default function MealPlanDetail() {
       {/* ======== 添加菜品 Sheet ======== */}
       <BottomSheet
         isOpen={showAddDish}
+        avoidKeyboard={false}
         onOpenChange={(v) => {
           setShowAddDish(v);
           if (!v) {
@@ -1008,9 +1073,40 @@ export default function MealPlanDetail() {
               </TouchableOpacity>
             </View>
 
+            {/* 分类快捷选择（直接放在外部，不进筛选） */}
+            <ScrollView
+              horizontal
+              showsHorizontalScrollIndicator={false}
+              contentContainerStyle={{ gap: 8, paddingRight: 4 }}
+            >
+              <TouchableOpacity
+                className={`rounded-full border px-3 py-2 ${dishFilterCatId == null ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
+                onPress={() => setDishFilterCatId(null)}
+              >
+                <Text
+                  className={`text-xs ${dishFilterCatId == null ? "text-white" : "text-gray-700"}`}
+                >
+                  全部
+                </Text>
+              </TouchableOpacity>
+              {categories.map((c) => (
+                <TouchableOpacity
+                  key={c.id}
+                  className={`rounded-full border px-3 py-2 ${dishFilterCatId === c.id ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
+                  onPress={() => setDishFilterCatId((p) => (p === c.id ? null : c.id))}
+                >
+                  <Text
+                    className={`text-xs ${dishFilterCatId === c.id ? "text-white" : "text-gray-700"}`}
+                  >
+                    {c.name}
+                  </Text>
+                </TouchableOpacity>
+              ))}
+            </ScrollView>
+
             {/* 菜品列表 */}
             <ScrollView
-              className="max-h-80"
+              style={{ height: dishSheetMaxHeight }}
               showsVerticalScrollIndicator
               onMomentumScrollEnd={async (e: NativeSyntheticEvent<NativeScrollEvent>) => {
                 const { contentOffset, contentSize, layoutMeasurement } = e.nativeEvent;
@@ -1080,35 +1176,6 @@ export default function MealPlanDetail() {
                 </TouchableOpacity>
               </View>
             </View>
-            {/* 分类 */}
-            <View>
-              <Label className="mb-2">分类</Label>
-              <View className="flex-row flex-wrap gap-2">
-                <TouchableOpacity
-                  className={`rounded-full border px-3 py-2 ${dishFilterCatId == null ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
-                  onPress={() => setDishFilterCatId(null)}
-                >
-                  <Text
-                    className={`text-xs ${dishFilterCatId == null ? "text-white" : "text-gray-700"}`}
-                  >
-                    全部
-                  </Text>
-                </TouchableOpacity>
-                {categories.map((c) => (
-                  <TouchableOpacity
-                    key={c.id}
-                    className={`rounded-full border px-3 py-2 ${dishFilterCatId === c.id ? "border-accent bg-accent" : "border-gray-200 bg-white"}`}
-                    onPress={() => setDishFilterCatId((p) => (p === c.id ? null : c.id))}
-                  >
-                    <Text
-                      className={`text-xs ${dishFilterCatId === c.id ? "text-white" : "text-gray-700"}`}
-                    >
-                      {c.name}
-                    </Text>
-                  </TouchableOpacity>
-                ))}
-              </View>
-            </View>
             {/* 标签 */}
             <View>
               <Label className="mb-2">标签</Label>
@@ -1195,7 +1262,13 @@ export default function MealPlanDetail() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">评价菜单</Text>
+            <BottomSheet.Header
+              title="评价菜单"
+              confirmText="提交"
+              onCancel={() => setShowRateSheet(false)}
+              onConfirm={handleRate}
+              confirmDisabled={rating}
+            />
 
             {/* 星级 */}
             <View className="flex-row justify-center gap-1">
@@ -1217,23 +1290,6 @@ export default function MealPlanDetail() {
               onChangeText={setRateContent}
               placeholder="写点评价..."
             />
-
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowRateSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleRate} isDisabled={rating}>
-                {rating ? (
-                  <ActivityIndicator size="small" color="#fff" />
-                ) : (
-                  <Button.Label>提交</Button.Label>
-                )}
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/meal/plan/edit/index.tsx b/code/app/app-rn/src/app/meal/plan/edit/index.tsx
index 0df5f3cd..f5ddab12 100644
--- a/code/app/app-rn/src/app/meal/plan/edit/index.tsx
+++ b/code/app/app-rn/src/app/meal/plan/edit/index.tsx
@@ -282,30 +282,34 @@ export default function MealPlanEdit() {
       <BottomSheet isOpen={showDate} onOpenChange={setShowDate}>
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
-          <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16, maxHeight: 320 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">选择日期</Text>
+          <BottomSheet.Content
+            className="gap-4"
+            style={{ paddingHorizontal: 16, maxHeight: 320 }}
+            onSubmit={() => {
+              if (dayjs(dateVal).isValid()) {
+                setPlanDate(dateVal);
+                setShowDate(false);
+              } else {
+                toast.error("日期格式无效");
+              }
+            }}
+          >
+            <BottomSheet.Header
+              title="选择日期"
+              confirmText="确定"
+              onCancel={() => setShowDate(false)}
+              onConfirm={() => {
+                if (dayjs(dateVal).isValid()) {
+                  setPlanDate(dateVal);
+                  setShowDate(false);
+                } else {
+                  toast.error("日期格式无效");
+                }
+              }}
+            />
             <View>
               <BottomSheet.Input value={dateVal} onChangeText={setDateVal} placeholder={today} />
             </View>
-            <View className="flex-row gap-3">
-              <Button variant="secondary" className="flex-1" onPress={() => setShowDate(false)}>
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button
-                className="flex-1"
-                onPress={() => {
-                  if (dayjs(dateVal).isValid()) {
-                    setPlanDate(dateVal);
-                    setShowDate(false);
-                  } else {
-                    toast.error("日期格式无效");
-                  }
-                }}
-              >
-                <CheckIcon size={18} color="#fff" />
-                <Button.Label>确定</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/app/todo/detail/[id]/index.tsx b/code/app/app-rn/src/app/todo/detail/[id]/index.tsx
index d722ef2d..f62f3fcc 100644
--- a/code/app/app-rn/src/app/todo/detail/[id]/index.tsx
+++ b/code/app/app-rn/src/app/todo/detail/[id]/index.tsx
@@ -638,7 +638,15 @@ export default function TodoDetail() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16, maxHeight: 480 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">完成任务</Text>
+            <BottomSheet.Header
+              title="完成任务"
+              confirmText="完成"
+              onCancel={() => {
+                setShowCompleteSheet(false);
+                setCompleteFiles([]);
+              }}
+              onConfirm={handleComplete}
+            />
             <TextArea
               value={completeNote}
               onChangeText={setCompleteNote}
@@ -668,21 +676,6 @@ export default function TodoDetail() {
               <ImageIcon size={16} color="#4B5563" />
               <Button.Label>添加图片</Button.Label>
             </Button>
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => {
-                  setShowCompleteSheet(false);
-                  setCompleteFiles([]);
-                }}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleComplete}>
-                <Button.Label>确认完成</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
@@ -736,7 +729,12 @@ export default function TodoDetail() {
         <BottomSheet.Portal>
           <BottomSheet.Overlay />
           <BottomSheet.Content className="gap-4" style={{ paddingHorizontal: 16, maxHeight: 380 }}>
-            <Text className="text-center text-lg font-semibold text-gray-950">评价任务</Text>
+            <BottomSheet.Header
+              title="评价任务"
+              confirmText="提交"
+              onCancel={() => setShowRateSheet(false)}
+              onConfirm={handleRate}
+            />
             <View className="flex-row justify-center gap-1">
               {[1, 2, 3, 4, 5].map((s) => (
                 <TouchableOpacity key={s} onPress={() => setRateValue(s)}>
@@ -749,18 +747,6 @@ export default function TodoDetail() {
               ))}
             </View>
             <TextArea value={rateContent} onChangeText={setRateContent} placeholder="写点评价..." />
-            <View className="flex-row gap-3">
-              <Button
-                variant="secondary"
-                className="flex-1"
-                onPress={() => setShowRateSheet(false)}
-              >
-                <Button.Label>取消</Button.Label>
-              </Button>
-              <Button className="flex-1" onPress={handleRate}>
-                <Button.Label>提交</Button.Label>
-              </Button>
-            </View>
           </BottomSheet.Content>
         </BottomSheet.Portal>
       </BottomSheet>
diff --git a/code/app/app-rn/src/components/BottomSheet.tsx b/code/app/app-rn/src/components/BottomSheet.tsx
index b83f8653..8ce1d67d 100644
--- a/code/app/app-rn/src/components/BottomSheet.tsx
+++ b/code/app/app-rn/src/components/BottomSheet.tsx
@@ -18,6 +18,7 @@ import {
   Pressable,
   StyleSheet,
   Text,
+  TouchableOpacity,
   View,
   type TextInput,
   type TextProps,
@@ -26,6 +27,7 @@ import {
 import { Input, TextArea, useBottomSheetAwareHandlers } from "heroui-native";
 import { Toaster } from "sonner-native";
 import { resetToaster } from "@/utils/toaster";
+import { useKeyboardAnimation } from "react-native-keyboard-controller";
 
 // ── Props ──────────────────────────────────────────────
 
@@ -38,6 +40,8 @@ type AppBottomSheetProps = {
   animationDuration?: number;
   backgroundStyle?: ViewStyle;
   handleIndicatorStyle?: ViewStyle;
+  /** 键盘弹出时是否整体上移面板，默认 true；高弹窗（如接近顶部）可设为 false 以免顶部内容被推出屏幕 */
+  avoidKeyboard?: boolean;
 };
 
 type AppBottomSheetContentProps = {
@@ -48,25 +52,29 @@ type AppBottomSheetContentProps = {
   animation?: unknown;
   backgroundClassName?: string;
   style?: ViewStyle;
+  /** 当内容中只有一个输入框时，按回车触发该回调（一般传保存事件） */
+  onSubmit?: () => void;
 };
 
 type CtxValue = {
   isOpen: boolean;
   animationDuration: number;
-  registerInput: (node: TextInput | null) => void;
 };
-type ContentCtxValue = CtxValue & { shouldAutoFocusSingleInput: boolean };
+type ContentCtxValue = CtxValue & {
+  shouldAutoFocusSingleInput: boolean;
+  isSingleInput: boolean;
+  onSubmit?: () => void;
+};
 
 const AppBottomSheetContext = createContext<CtxValue>({
   isOpen: false,
   animationDuration: 300,
-  registerInput: () => {},
 });
 const AppBottomSheetContentContext = createContext<ContentCtxValue>({
   isOpen: false,
   animationDuration: 300,
-  registerInput: () => {},
   shouldAutoFocusSingleInput: false,
+  isSingleInput: false,
 });
 
 // ── Helpers ────────────────────────────────────────────
@@ -100,6 +108,20 @@ function countInputs(children: ReactNode): number {
   });
   return c;
 }
+// 仅统计单行 Input（TextArea 回车用于换行，不参与回车提交）
+function countSingleLineInputs(children: ReactNode): number {
+  let c = 0;
+  Children.forEach(children, (child) => {
+    if (!isValidElement(child)) return;
+    const t = child.type as { displayName?: string };
+    if (typeof t === "object" && t?.displayName === "AppBottomSheetInput") {
+      c += 1;
+      return;
+    }
+    c += countSingleLineInputs((child as ReactElement<{ children?: ReactNode }>).props.children);
+  });
+  return c;
+}
 
 // ── Root ───────────────────────────────────────────────
 
@@ -114,15 +136,18 @@ function AppBottomSheetRoot({
   animationDuration = 260,
   backgroundStyle,
   handleIndicatorStyle,
+  avoidKeyboard = true,
 }: AppBottomSheetProps) {
   const slideY = useRef(new Animated.Value(SCREEN_H)).current;
   const backdropFade = useRef(new Animated.Value(0)).current;
-  const keyboardY = useRef(new Animated.Value(0)).current;
-  const panelY = useRef(Animated.add(slideY, keyboardY)).current;
+  // useKeyboardAnimation 的 height 为负值（0 → -键盘高度），直接叠加即可让面板随键盘上移
+  const { height } = useKeyboardAnimation();
+  const panelY = useRef(
+    avoidKeyboard ? Animated.add(slideY, height) : slideY,
+  ).current;
 
   const [visible, setVisible] = useState(false);
   const animatingRef = useRef(false);
-  const focusedInputRef = useRef<TextInput | null>(null);
   const onOpenRef = useRef(onOpen);
   onOpenRef.current = onOpen;
 
@@ -149,7 +174,6 @@ function AppBottomSheetRoot({
   const doAnimateOut = useCallback(
     (done: () => void) => {
       Keyboard.dismiss();
-      keyboardY.setValue(0);
       Animated.parallel([
         Animated.timing(slideY, {
           toValue: SCREEN_H,
@@ -182,44 +206,6 @@ function AppBottomSheetRoot({
     }
   }, [isOpen]);
 
-  const adjustForKeyboard = useCallback((kbHeight: number) => {
-    const input = focusedInputRef.current;
-    if (!input) {
-      keyboardY.setValue(-Math.min(kbHeight, 0));
-      return;
-    }
-    setTimeout(() => {
-      input.measureInWindow((x, y, w, h) => {
-        const screenBottom = SCREEN_H - kbHeight;
-        const inputBottom = y + h;
-        const needed = inputBottom - screenBottom;
-        keyboardY.setValue(needed > 0 ? -(needed - 24) : 0);
-      });
-    }, 50);
-  }, []);
-
-  const registerInput = useCallback((node: TextInput | null) => {
-    focusedInputRef.current = node;
-  }, []);
-
-  useEffect(() => {
-    if (!visible) return;
-    const s1 = Keyboard.addListener("keyboardWillShow", (e) =>
-      adjustForKeyboard(e.endCoordinates.height),
-    );
-    const s2 = Keyboard.addListener("keyboardDidShow", (e) =>
-      adjustForKeyboard(e.endCoordinates.height),
-    );
-    const h1 = Keyboard.addListener("keyboardWillHide", () => keyboardY.setValue(0));
-    const h2 = Keyboard.addListener("keyboardDidHide", () => keyboardY.setValue(0));
-    return () => {
-      s1.remove();
-      s2.remove();
-      h1.remove();
-      h2.remove();
-    };
-  }, [visible, adjustForKeyboard]);
-
   // Modal 关闭后恢复全局 Toaster
   useEffect(() => {
     if (visible) return;
@@ -230,13 +216,14 @@ function AppBottomSheetRoot({
   if (!visible) return null;
 
   return (
-    <AppBottomSheetContext.Provider value={{ isOpen, animationDuration, registerInput }}>
+    <AppBottomSheetContext.Provider value={{ isOpen, animationDuration }}>
       <Modal
         visible={visible}
         transparent
         animationType="none"
         onRequestClose={() => onOpenChange?.(false)}
         statusBarTranslucent
+        navigationBarTranslucent
       >
         <Pressable style={StyleSheet.absoluteFill} onPress={() => onOpenChange?.(false)}>
           <Animated.View
@@ -299,13 +286,20 @@ function AppBottomSheetContent({
   className,
   contentContainerClassName,
   style,
+  onSubmit,
   ...props
 }: AppBottomSheetContentProps) {
   const ctx = useContext(AppBottomSheetContext);
   const inputCount = countInputs(children);
+  const singleLineInputCount = countSingleLineInputs(children);
   return (
     <AppBottomSheetContentContext.Provider
-      value={{ ...ctx, shouldAutoFocusSingleInput: inputCount === 1 }}
+      value={{
+        ...ctx,
+        shouldAutoFocusSingleInput: inputCount === 1,
+        isSingleInput: singleLineInputCount === 1,
+        onSubmit,
+      }}
     >
       <View
         className={contentContainerClassName ?? className ?? ""}
@@ -321,13 +315,12 @@ function AppBottomSheetContent({
 // ── Input ──────────────────────────────────────────────
 
 const AppBottomSheetInput = forwardRef<TextInput, ComponentProps<typeof Input>>(
-  ({ onFocus, onBlur, ...props }, ref) => {
+  ({ onFocus, onBlur, onSubmitEditing, returnKeyType, ...props }, ref) => {
     const handlers = useBottomSheetAwareHandlers();
-    const inputRef = useRef<TextInput | null>(null);
-    const { registerInput } = useContext(AppBottomSheetContentContext);
+    const { isSingleInput, onSubmit } = useContext(AppBottomSheetContentContext);
+    const submitOnEnter = isSingleInput && !!onSubmit;
     const handleRef = useCallback(
       (node: TextInput | null) => {
-        inputRef.current = node;
         setInputRef(ref, node);
       },
       [ref],
@@ -338,13 +331,17 @@ const AppBottomSheetInput = forwardRef<TextInput, ComponentProps<typeof Input>>(
         ref={handleRef}
         onFocus={(e) => {
           handlers.onFocus(e);
-          registerInput(inputRef.current);
           onFocus?.(e);
         }}
         onBlur={(e) => {
           handlers.onBlur(e);
           onBlur?.(e);
         }}
+        returnKeyType={returnKeyType ?? (submitOnEnter ? "done" : undefined)}
+        onSubmitEditing={(e) => {
+          onSubmitEditing?.(e);
+          if (submitOnEnter) onSubmit?.();
+        }}
         {...props}
       />
     );
@@ -357,11 +354,8 @@ AppBottomSheetInput.displayName = "AppBottomSheetInput";
 const AppBottomSheetTextArea = forwardRef<TextInput, ComponentProps<typeof TextArea>>(
   ({ onFocus, onBlur, ...props }, ref) => {
     const handlers = useBottomSheetAwareHandlers();
-    const inputRef = useRef<TextInput | null>(null);
-    const { registerInput } = useContext(AppBottomSheetContentContext);
     const handleRef = useCallback(
       (node: TextInput | null) => {
-        inputRef.current = node;
         setInputRef(ref, node);
       },
       [ref],
@@ -372,7 +366,6 @@ const AppBottomSheetTextArea = forwardRef<TextInput, ComponentProps<typeof TextA
         ref={handleRef}
         onFocus={(e) => {
           handlers.onFocus(e);
-          registerInput(inputRef.current);
           onFocus?.(e);
         }}
         onBlur={(e) => {
@@ -386,6 +379,70 @@ const AppBottomSheetTextArea = forwardRef<TextInput, ComponentProps<typeof TextA
 );
 AppBottomSheetTextArea.displayName = "AppBottomSheetTextArea";
 
+// ── Header（左取消 / 中标题 / 右保存，小按钮） ─────────
+
+type AppBottomSheetHeaderProps = {
+  title?: string;
+  cancelText?: string;
+  confirmText?: string;
+  onCancel?: () => void;
+  onConfirm?: () => void;
+  confirmDisabled?: boolean;
+  /** 渲染在确认按钮左侧的额外内容（如「重置」按钮） */
+  rightExtra?: ReactNode;
+};
+
+function AppBottomSheetHeader({
+  title,
+  cancelText = "取消",
+  confirmText = "保存",
+  onCancel,
+  onConfirm,
+  confirmDisabled = false,
+  rightExtra,
+}: AppBottomSheetHeaderProps) {
+  return (
+    <View className="flex-row items-center">
+      <View className="flex-1 flex-row justify-start">
+        {onCancel ? (
+          <TouchableOpacity
+            className="h-8 px-3.5 rounded-full bg-gray-100 items-center justify-center"
+            onPress={onCancel}
+          >
+            <Text className="text-[13px] text-gray-600">{cancelText}</Text>
+          </TouchableOpacity>
+        ) : null}
+      </View>
+      {!!title && (
+        <Text
+          className="text-base font-semibold text-gray-950 text-center px-2"
+          numberOfLines={1}
+        >
+          {title}
+        </Text>
+      )}
+      <View className="flex-1 flex-row justify-end items-center gap-2">
+        {rightExtra}
+        {onConfirm ? (
+          <TouchableOpacity
+            disabled={confirmDisabled}
+            className={`h-8 px-3.5 rounded-full items-center justify-center ${
+              confirmDisabled ? "bg-gray-200" : "bg-accent"
+            }`}
+            onPress={onConfirm}
+          >
+            <Text
+              className={`text-[13px] font-medium ${confirmDisabled ? "text-gray-400" : "text-white"}`}
+            >
+              {confirmText}
+            </Text>
+          </TouchableOpacity>
+        ) : null}
+      </View>
+    </View>
+  );
+}
+
 function AppBottomSheetTitle(props: TextProps) {
   return <Text className="text-center text-base font-semibold" {...props} />;
 }
@@ -397,6 +454,7 @@ const BottomSheet = Object.assign(AppBottomSheetRoot, {
   Portal: AppBottomSheetPortal,
   Overlay: AppBottomSheetOverlay,
   Content: AppBottomSheetContent,
+  Header: AppBottomSheetHeader,
   Input: AppBottomSheetInput,
   TextArea: AppBottomSheetTextArea,
   Title: AppBottomSheetTitle,
diff --git a/code/app/app-rn/src/components/CategoryChipBar.tsx b/code/app/app-rn/src/components/CategoryChipBar.tsx
new file mode 100644
index 00000000..23cb3905
--- /dev/null
+++ b/code/app/app-rn/src/components/CategoryChipBar.tsx
@@ -0,0 +1,61 @@
+import { ScrollView, Text, TouchableOpacity } from "react-native";
+import type { StyleProp, ViewStyle } from "react-native";
+
+type CategoryChipItem = { id: number; name: string };
+
+type CategoryChipBarProps = {
+  categories: CategoryChipItem[];
+  activeId: number | null;
+  onChange: (id: number | null) => void;
+  style?: StyleProp<ViewStyle>;
+};
+
+/** 横向滑动的分类快捷筛选条（全部 + 分类），点击选中，再点取消 */
+export default function CategoryChipBar({
+  categories,
+  activeId,
+  onChange,
+  style,
+}: CategoryChipBarProps) {
+  if (categories.length === 0) return null;
+  return (
+    <ScrollView
+      horizontal
+      showsHorizontalScrollIndicator={false}
+      style={[{ flexGrow: 0, marginHorizontal: -16 }, style]}
+      contentContainerStyle={{ paddingHorizontal: 16, gap: 8 }}
+    >
+      <TouchableOpacity
+        className={`h-9 px-4 rounded-full items-center justify-center ${
+          activeId == null ? "bg-accent" : "bg-gray-100"
+        }`}
+        onPress={() => onChange(null)}
+      >
+        <Text
+          className={`text-[13px] font-medium ${activeId == null ? "text-white" : "text-gray-600"}`}
+        >
+          全部
+        </Text>
+      </TouchableOpacity>
+      {categories.map((c) => {
+        const active = activeId === c.id;
+        return (
+          <TouchableOpacity
+            key={c.id}
+            className={`h-9 px-4 rounded-full items-center justify-center ${
+              active ? "bg-accent" : "bg-gray-100"
+            }`}
+            onPress={() => onChange(active ? null : c.id)}
+          >
+            <Text
+              className={`text-[13px] font-medium ${active ? "text-white" : "text-gray-600"}`}
+              numberOfLines={1}
+            >
+              {c.name}
+            </Text>
+          </TouchableOpacity>
+        );
+      })}
+    </ScrollView>
+  );
+}
diff --git a/code/app/app-rn/src/helpers/financeAuto.ts b/code/app/app-rn/src/helpers/financeAuto.ts
index 88f37dda..6bd216bb 100644
--- a/code/app/app-rn/src/helpers/financeAuto.ts
+++ b/code/app/app-rn/src/helpers/financeAuto.ts
@@ -169,3 +169,33 @@ export const WEEK_DAYS = [
   { value: 6, label: "六" },
   { value: 0, label: "日" },
 ];
+
+/**
+ * 构造写入 b_finance 的自动记账记录。
+ * 注意：b_finance 表没有 type 列（type 是 b_finance_category 的冗余字段），
+ * 这里绝不能包含 type，否则后端 insert 会因未知列报错。
+ */
+export function buildAutoBillInserts(
+  rule: { category_id: number; amount: number; remark?: string | null },
+  missedDates: string[],
+  ids: number[],
+  userId: number,
+  familyId: number,
+): any[] {
+  const inserts: any[] = [];
+  for (let i = 0; i < missedDates.length; i++) {
+    if (!ids[i]) continue;
+    inserts.push({
+      id: ids[i],
+      family_id: familyId,
+      category_id: rule.category_id,
+      amount: rule.amount,
+      remark: rule.remark || "",
+      record_time: missedDates[i],
+      create_by: userId,
+      update_by: userId,
+    });
+  }
+  return inserts;
+}
+
diff --git a/code/app/app-rn/src/layouts/ModuleLayout.tsx b/code/app/app-rn/src/layouts/ModuleLayout.tsx
index a3a71af0..6fe1d9c8 100644
--- a/code/app/app-rn/src/layouts/ModuleLayout.tsx
+++ b/code/app/app-rn/src/layouts/ModuleLayout.tsx
@@ -1,9 +1,9 @@
-import { View } from "react-native";
+import { View, BackHandler } from "react-native";
 import Tabbar, { TabbarItem } from "@/components/layout/tabbar";
 import Navbar from "@/components/layout/navbar";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Slot, useRouter, usePathname } from "expo-router";
-import { useMemo, useRef } from "react";
+import { useMemo, useRef, useEffect } from "react";
 
 export default function ModuleLayout({ tabs }: { tabs: TabbarItem[] }) {
   const router = useRouter();
@@ -26,8 +26,26 @@ export default function ModuleLayout({ tabs }: { tabs: TabbarItem[] }) {
     return lastValidTabRef.current;
   }, [pathname, tabs]);
 
+  // 区分当前是否在 tab 页上
+  const isTabPage = useMemo(
+    () => tabs.some((t) => t.id === pathname && !t.isCenter),
+    [pathname, tabs],
+  );
+
+  // 在 tab 页时，手势返回直接回首页；子页面时正常返回
+  useEffect(() => {
+    const handler = BackHandler.addEventListener("hardwareBackPress", () => {
+      if (isTabPage) {
+        router.dismissTo("/home");
+        return true;
+      }
+      return false;
+    });
+    return () => handler.remove();
+  }, [isTabPage, router]);
+
   function handleClose() {
-    router.dismissTo("/tools");
+    router.dismissTo("/home");
   }
 
   return (
diff --git a/code/app/app-rn/src/store/finance.ts b/code/app/app-rn/src/store/finance.ts
index 8cb5ae10..87a1808c 100644
--- a/code/app/app-rn/src/store/finance.ts
+++ b/code/app/app-rn/src/store/finance.ts
@@ -7,7 +7,7 @@ import {
   FinanceCategoryStatus,
   FinanceType,
 } from "@/types/finance";
-import { shouldRun, getMissedDates } from "@/helpers/financeAuto";
+import { shouldRun, getMissedDates, buildAutoBillInserts } from "@/helpers/financeAuto";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 
 const AUTO_BILL_IDS_KEY = "finance_auto_bill_ids";
@@ -141,22 +141,8 @@ export const useFinanceStore = create<FinanceState>((set, get) => ({
       const missedDates = getMissedDates(rule.repeat_type, rule.repeat_date ?? "", rule.last_run);
       if (missedDates.length === 0) continue;
 
-      const inserts: any[] = [];
       const ids = (await getUniqueIdApi(missedDates.length)).data ?? [];
-      for (let i = 0; i < missedDates.length; i++) {
-        if (!ids[i]) continue;
-        inserts.push({
-          id: ids[i],
-          family_id: familyId,
-          category_id: rule.category_id,
-          amount: rule.amount,
-          remark: rule.remark || "",
-          type: rule.type,
-          record_time: missedDates[i],
-          create_by: userId,
-          update_by: userId,
-        });
-      }
+      const inserts = buildAutoBillInserts(rule, missedDates, ids, userId, familyId);
 
       if (inserts.length > 0) {
         await saveDataApi([
diff --git a/code/app/app-rn/src/store/meal.ts b/code/app/app-rn/src/store/meal.ts
index f6419fc0..e200ba87 100644
--- a/code/app/app-rn/src/store/meal.ts
+++ b/code/app/app-rn/src/store/meal.ts
@@ -113,6 +113,10 @@ interface MealState {
   }) => Promise<number | null>;
   confirmPlan: (params: { planId: number; familyId: number; userId: number }) => Promise<boolean>;
   completePlan: (params: { planId: number; familyId: number; userId: number }) => Promise<boolean>;
+  /** 撤回确认：已确认 → 进行中 */
+  revertPlanToPlanning: (params: { planId: number; familyId: number; userId: number }) => Promise<boolean>;
+  /** 撤回完成：已完成 → 已确认 */
+  revertPlanToConfirmed: (params: { planId: number; familyId: number; userId: number }) => Promise<boolean>;
   addDishToPlan: (params: {
     familyId: number;
     planId: number;
@@ -612,6 +616,38 @@ export const useMealStore = create<MealState>((set, get) => ({
     });
   },
 
+  // 撤回确认（已确认 → 进行中）
+  revertPlanToPlanning: async ({ planId, familyId, userId }) => {
+    if (!familyId || !planId) return false;
+    const now = new Date().toISOString();
+    return get().savePlanChanges({
+      updates: [
+        {
+          id: planId,
+          status: MealPlanStatus.Planning,
+          update_time: now,
+          update_by: userId,
+        },
+      ],
+    });
+  },
+
+  // 撤回完成（已完成 → 已确认）
+  revertPlanToConfirmed: async ({ planId, familyId, userId }) => {
+    if (!familyId || !planId) return false;
+    const now = new Date().toISOString();
+    return get().savePlanChanges({
+      updates: [
+        {
+          id: planId,
+          status: MealPlanStatus.Confirmed,
+          update_time: now,
+          update_by: userId,
+        },
+      ],
+    });
+  },
+
   // 添加菜品到菜单（事件驱动：写入 plan_item + plan_log）
   addDishToPlan: async ({ familyId, planId, dishId, dishName, userId, sortNumber }) => {
     if (!familyId || !planId) return {};
diff --git a/code/app/需求.txt b/code/app/需求.txt
new file mode 100644
index 00000000..5f34d42b
--- /dev/null
+++ b/code/app/需求.txt
@@ -0,0 +1,4 @@
+待修改：
+	1、记账点击保存没有返回记账首页
+	2、衣服、菜品都允许排序
+	3、搭配分类会闪烁，有可能加载不出来
\ No newline at end of file
diff --git a/code/fms/.codebuddy/plans/FmsTable_内置单元格编辑_a4f723e8.md b/code/fms/.codebuddy/plans/FmsTable_内置单元格编辑_a4f723e8.md
new file mode 100644
index 00000000..5d731484
--- /dev/null
+++ b/code/fms/.codebuddy/plans/FmsTable_内置单元格编辑_a4f723e8.md
@@ -0,0 +1,143 @@
+---
+name: FmsTable 内置单元格编辑
+overview: "将当前散落在 ModulePowersPanel.vue 的“单行/单元格编辑”逻辑（row._editing 协议 + handleAreaSelectionChange + col._onEditEnd）下沉到 FmsTable 内，通过 editable: boolean prop 控制启用，组件自闭环；现有唯一调用方 ModulePowersPanel 同步改写为新 API。"
+todos:
+  - id: refactor-utils
+    content: 重构 createEditableCellRenderer.js 与 createCellRenderer.js，使 createInputCell 通过闭包读取 editingState，resolveCustomCell 根据 ctx.editable 决定是否注入 input customCell
+    status: completed
+  - id: enhance-fmstable
+    content: 在 FmsTable.vue 新增 editable prop、editingState 内部 shallowRef、internalData + watch、handleAreaSelectionChange 处理器与 change 事件 emit，将 StkTable 的 dataSource 指向 internalData
+    status: completed
+    dependencies:
+      - refactor-utils
+  - id: refactor-powers-panel
+    content: 改写 ModulePowersPanel.vue：移除 handleEditEnd / handleAreaSelectionChange 函数，列定义移除 _onEditEnd 与 onChange，模板改为 :editable="true" + @change="onCellChange"，清理无效的 :area-selection 与 @area-selection-change
+    status: completed
+    dependencies:
+      - enhance-fmstable
+---
+
+## Product Overview
+
+将当前散落在 `ModulePowersPanel.vue` 的"单元格编辑"逻辑（row._editing 协议 + handleAreaSelectionChange + col._onEditEnd）下沉到 `FmsTable` 内部。组件自闭环，通过 `editable: boolean` prop 控制是否启用单元格编辑。
+
+## Core Features
+
+- 新增 `FmsTable.editable: boolean` prop（默认 `false`），`type:"input"` 列在该 prop 为 `true` 时才进入可编辑态
+- `FmsTable` 内部维护 `editingState: { rowKey, col } | null`（shallowRef），**不挂在 row 上**，零数据污染，父组件保存前无需清理
+- `FmsTable` 内部监听 `@area-selection-change`（鼠标点击 / 键盘方向键统一入口），自动把命中单元格设为编辑格
+- 内部 watch `editingState` → 浅拷贝内部 `dataSource` → 触发 `stk-table` 重渲染让 `customCell` 重新求值
+- 退出编辑（Enter / Esc / Blur）时 `emit("change", row, col, newValue)` 给父组件
+- 沿用现有 `createInputCell` 的"非编辑零 VNode / 原生 input / 自动 focus.select()" 行为
+- `ModulePowersPanel.vue` 同步改写为新 API：删除 `handleEditEnd` / `handleAreaSelectionChange` / 列定义中的 `_onEditEnd` / `onChange`，模板改为 `:editable="true"` + `@change="onCellChange"`
+- 其他 7 个 `FmsTable` 调用方（dashboard / TableDemo / i18n-type / I18nPanel / Fields / ListConfig / EditConfig / QueryConfig）**完全不受影响**——`editable` 默认 `false`，与现状一致
+
+## Tech Stack
+
+- Vue 3 `<script setup>` + `shallowRef` + `watch`
+- 复用 `stk-table-vue` 已有的 `area-selection` 与 `customCell` 机制
+- 无新增依赖、无新增组件库、无 composable 文件
+
+## Implementation Approach
+
+**核心策略**：把"编辑态"从 `row` 对象上的 `_editing` 字段迁移到 `FmsTable` 内部的 `shallowRef`；`customCell` 通过闭包读取 `editingState`；通过内部 `dataSource` 浅拷贝触发 `stk-table` 重渲染。
+
+### 数据流（一次完整编辑）
+
+```
+stk-table area-selection-change(ranges)
+  ↓
+FmsTable.handleAreaSelectionChange(ranges)
+  ├─ !props.editable → return
+  ├─ ranges 为空 / 列非 input / 行越界 → editingState = null
+  ├─ editingState 已指向同一 row+col → return（避免方向键连按重渲染）
+  └─ editingState = { rowKey, col } → watch → internalData = [...internalData] → 重渲染
+       ↓
+customCell({ row, cellValue }) 重跑
+  ├─ editing 不匹配 → 返回纯文本字符串（零 VNode 开销）
+  └─ 匹配 → 返回原生 <input ref=focus.select()>
+       ├─ onInput: row[col.dataIndex] = e.target.value
+       └─ onBlur / Enter / Esc → notifyChange(row, col, newValue)
+             ├─ emit("change", row, col, newValue) → 父 onCellChange → emitUpdate
+             └─ editingState = null → watch → 重渲染 → 文本回退
+```
+
+### 关键设计决策
+
+1. **`editable: boolean`（表格级）**：`type:"input"` 列在 `editable=true` 时由 `resolveCustomCell` 注入自定义 `customCell`；`false` 时回退到 `stk-table` 默认文本渲染，零运行时开销
+2. **`editingState` 用 `shallowRef`，不挂 row**：避免"保存前清理 `_editing` 字段"的脏数据风险；customCell 通过闭包读 `ctx.getEditing()`
+3. **只 emit `change(row, col, newValue)`**：进入编辑不发事件（语义冗余）；退出编辑统一把"新值"冒泡给父组件用于脏数据判定
+4. **内部 `internalData` 浅拷贝触发重渲染**：复用 `stk-table` 的 `dataSource` 响应式机制；`editingState` 变更 → watch → 引用变更 → 重渲染
+5. **复用现有 `createInputCell` 行为**：Enter=不退出（允许多行编辑后续扩展）/ Esc=退出 / Blur=退出 / 自动 `focus().select()`
+6. **沿用硬编码 `:area-selection`**（keyboard:true / ctrl:false / shift:false），不动——本次删除 `ModulePowersPanel` 上无效的覆盖赋值属清理
+
+### 性能保证
+
+- non-editing 单元格仍然"返回字符串，零 VNode"（`createInputCell` 早返回）
+- `editingState` 用 `shallowRef`，watch 仅在状态变更时触发
+- 方向键连按同一目标时早 return，避免每按一次重渲染整表
+- `checkbox` / `actions` 渲染器继续用 `WeakMap` 缓存，不受影响
+
+## Implementation Notes
+
+- `props.dataSource` 外部引用变更（含父组件 `localPowers = [...localPowers]`）会同步触发 watch；`editingState` 内的 `rowKey` 是字符串，与引用解耦，引用变更不影响编辑态判定
+- `props.editable` 由 `true` → `false` 动态切换时，`displayColumns` 重算 → `resolveCustomCell` 返回无 `customCell` 的 col → `stk-table` 回退到默认文本渲染
+- `ModulePowersPanel` 的 `localPowers` ref / `addRow` / `deleteRow` / `batchDelete` 行为不变（仍是父组件编辑副本），仅事件链路从"列 `onChange`"改为"`@change`"
+- 删除 `:area-selection="true"`（被硬编码覆盖，无效）和 `@area-selection-change`（下沉的入口）属"现状无效 prop 清理"，不改变运行时行为
+
+## Directory Structure
+
+```
+fms-vue/src/
+├── components/fms-table/
+│   ├── FmsTable.vue                          [MODIFY] 新增 editable prop + editingState 内部状态 +
+│   │                                                   handleAreaSelectionChange + change emit，
+│   │                                                   dataSource 改为内部 shallowRef 触发重渲染
+│   └── utils/
+│       ├── createCellRenderer.js             [MODIFY] resolveCustomCell(col, ctx) 接 ctx，
+│   │                                                   editable=false 时不注入 input customCell
+│       └── createEditableCellRenderer.js     [MODIFY] createInputCell(col, ctx) 通过闭包读
+│                                                            editingState；onExit→ctx.onExit(row, val)
+└── views/module-management/components/
+    └── ModulePowersPanel.vue                 [MODIFY] 删 handleEditEnd/handleAreaSelectionChange；
+                                                        列定义移除 _onEditEnd / onChange；
+                                                        模板加 editable + @change="onCellChange"，
+                                                        删 :area-selection / @area-selection-change
+```
+
+### 关键代码契约
+
+**FmsTable 关键改动点**
+
+| 位置 | 改动 |
+| --- | --- |
+| `props` (L9-22) | 新增 `editable: { type: Boolean, default: false }` |
+| `defineEmits` (L24) | 新增 `"change"` |
+| 新增 `editingState = shallowRef(null)` | 编辑态内部 ref |
+| 新增 `internalData = shallowRef([])` + 两个 watch | dataSource 同步 + 编辑态触发浅拷贝重渲染 |
+| `displayColumns` (L41-55) | 改为 `props.columns.map(col => resolveCustomCell(col, ctx))`，ctx 每次重算以追踪 `props.editable` |
+| 新增 `handleAreaSelectionChange(ranges)` | 校验 editable / ranges / row / col，写入 editingState |
+| 新增 `notifyChange(row, col, val)` | emit change + 清空 editingState |
+| `<StkTable>` `:data-source` (L120) | 由 `dataSource` 改为 `internalData` |
+
+
+**utils 新签名**
+
+```js
+// createEditableCellRenderer.js
+createInputCell(col, ctx)
+//   ctx = { getEditing, onExit(row, col, val), getRowKey }
+
+// createCellRenderer.js
+resolveCustomCell(col, ctx)
+//   editable=false → type:"input" 列不注入 customCell（stk-table 默认文本）
+//   editable=true  → 注入 createInputCell(col, ctx)
+```
+
+**ModulePowersPanel 改动要点**
+
+- 删除 `handleEditEnd`、`handleAreaSelectionChange` 两个函数（约 L100-141）
+- 列定义移除 `_onEditEnd: handleEditEnd` 与 `onChange: () => emitUpdate()`（L200-203 共 4 处）
+- 模板 `<FmsTable>` 加 `editable` 与 `@change="onCellChange"`，移除无效的 `:area-selection` 与 `@area-selection-change`
+- 新增 `function onCellChange(row, col, val) { emitUpdate() }`
+- `localPowers` ref / `addRow` / `deleteRow` / `batchDelete` 逻辑不变
\ No newline at end of file
diff --git a/code/fms/.codebuddy/plans/登录日志功能_前后端__eef08f78.md b/code/fms/.codebuddy/plans/登录日志功能_前后端__eef08f78.md
new file mode 100644
index 00000000..d14a3c3d
--- /dev/null
+++ b/code/fms/.codebuddy/plans/登录日志功能_前后端__eef08f78.md
@@ -0,0 +1,180 @@
+---
+name: 登录日志功能（前后端）
+overview: 后端在登录时统一采集客户端信息（IP、IP归属地、浏览器/版本、操作系统/版本、设备类型、原始UA），复用通用 saveobjt 机制写入新表 s_log_login（成功与失败都记录）；前端新增只读列表页展示登录日志。表名 s_log_login，权限暂不接入。
+design:
+  styleKeywords:
+    - Enterprise
+    - Clean
+    - Audit Table
+    - Teal Accent
+    - Light Theme
+  fontSystem:
+    fontFamily: PingFang SC
+    heading:
+      size: 20px
+      weight: 600
+    subheading:
+      size: 14px
+      weight: 500
+    body:
+      size: 13px
+      weight: 400
+  colorSystem:
+    primary:
+      - "#15998E"
+      - "#173A42"
+    background:
+      - "#F5F7F8"
+      - "#FFFFFF"
+    text:
+      - "#19323A"
+      - "#5B6B70"
+    functional:
+      - "#52C41A"
+      - "#FF4D4F"
+      - "#15998E"
+todos:
+  - id: add-deps-xdb
+    content: pom.xml 新增 ip2region/uap-java 依赖并下载 ip2region.xdb 到 resources
+    status: completed
+  - id: client-info-utils
+    content: 实现 IpUtils、ClientInfo、IpRegionSearcher、ClientInfoExtractor 采集工具
+    status: completed
+    dependencies:
+      - add-deps-xdb
+  - id: login-log-service
+    content: 实现 LoginLogService 并在 AuthController/AuthService 登录成功与失败分支串联记录
+    status: completed
+    dependencies:
+      - client-info-utils
+  - id: migration-table
+    content: 新增 003_create_login_log.sql 建表 s_log_login 及索引
+    status: completed
+  - id: frontend-log-page
+    content: 用 [skill:antdv-next] 新增路由、侧边栏菜单与登录日志只读列表页（筛选+分页）
+    status: completed
+    dependencies:
+      - migration-table
+---
+
+## 用户需求
+
+统一在登录环节采集客户端信息，落地「登录日志」功能，覆盖登录成功与失败（账号不存在、密码错误）两类行为，供后续操作日志与系统审计复用。前端提供只读的登录日志列表页。
+
+## 产品概述
+
+登录时由后端统一采集客户端环境信息并落库，形成可审计的登录轨迹；管理员可在前端以表格形式分页查看每次登录的客户端画像与结果。
+
+## 核心功能
+
+- 后端登录流程中采集：IP 地址、IP 归属地（国家/省/市/运营商）、浏览器及版本、操作系统及版本、设备类型、原始 User-Agent。
+- 登录成功与失败均写登录日志（表 `s_log_login`），失败记录失败原因，写日志失败不影响登录。
+- 前端新增「登录日志」只读列表页：分页展示全部采集字段，成功/失败以标签区分，支持按账号、结果、时间筛选。
+- 权限按用户要求暂不做限制（路由不带 moduleCode，登录用户均可访问）。
+
+## 技术栈
+
+- 后端：Java 21 + Spring Boot 4.1，沿用 `DbUtils` 原生 JDBC 与多机构 `OrgRoutingDataSource`；新增依赖 `org.lionsoul:ip2region`（本地 xdb 解析）、`com.github.ua-parser:uap-java`（User-Agent 解析）。
+- 前端：Vue 3 + Vite + antdv-next + Pinia，复用现有 `pageDataApi` 通用分页接口。
+
+## 实现思路
+
+- 客户端信息全部在后端登录时采集：IP 与 UA 本就是 HTTP 请求头，服务端获取更可靠、不可被前端伪造，也契合规范中「优先通用接口、不新增业务接口」。
+- `IpUtils`：按 `X-Real-IP` → `X-Forwarded-For`（取首个有效 IP）→ `request.getRemoteAddr()` 顺序取值，兼容 Nginx 代理。
+- `IpRegionSearcher`：以 `@Component` 单例在启动时把 `ip2region.xdb` 读入内存（`Searcher.newWithBuffer(bytes)`），避免每次文件 IO；`search(ip)` 返回 `国家|省|市|运营商`，异常时返回「未知」。
+- `ClientInfoExtractor`：`@Component`，注入 `IpRegionSearcher` 与 uap-java `Parser`（单例），`extract(HttpServletRequest)` 解析 UA 得到浏览器/版本、系统/版本、设备类型（依据 `device.family` 映射 Mobile/Tablet/Desktop/Bot/Unknown）。
+- `LoginLogService.recordLogin(...)`：在方法内 `OrgContext.setOrgId(orgId)` 后，组装 `s_log_login` 行（`b_id = IdGenerator.nextId()`），以通用保存结构 `{table:'s_log_login', key_field:'b_id', inserts:[row]}` 调用 `DataSaveService.save(...)`（即 `saveobjt` 后端实现），整段 `try/catch` 包裹、失败仅记录日志、`finally` 中 `OrgContext.clear()`，保证登录绝不因写日志失败而中断；机构无效（无数据源）时自然抛错被捕获跳过落库。
+- `AuthController.login` 将 `HttpServletRequest` 透传给 `AuthService.login`；在成功（含 `sessionId`）与失败（账号不存在/密码错误）分支均调用 `recordLogin`。
+- 前端：新增路由（无 `moduleCode`）+ 侧边栏菜单项（无 `moduleCode` 经 `canModule` 恒为可见）+ 只读 `a-table` 列表页，调用 `pageDataApi({viewName:'s_log_login', orderBy:'b_login_time DESC'})`，分页依据响应 `rows/total`。
+
+## 性能与可靠性
+
+- ip2region 内存检索为 O(1) 级、uap-java 解析为微秒级，登录非高频操作，无性能瓶颈；不引入每请求文件 IO 或额外 SQL。
+- 写日志与登录主流程解耦（try/catch + 独立事务回滚不影响登录），`OrgContext` 严格 `finally` 清理，避免线程上下文污染。
+- 不改动 `saveobjt`/通用查询等既有接口与共享组件，向后兼容。
+
+## 架构设计
+
+```mermaid
+flowchart TD
+    A[AuthController.login HttpServletRequest] --> B[AuthService.login]
+    B -->|成功/失败| C[LoginLogService.recordLogin]
+    C --> D[ClientInfoExtractor.extract]
+    D --> E[IpUtils 取IP]
+    D --> F[IpRegionSearcher 归属地]
+    D --> G[uap-java 解析UA]
+    C -->|OrgContext.setOrgId| H[DataSaveService.save 通用saveobjt]
+    H --> I[(s_log_login 机构库)]
+    subgraph 前端
+        J[LoginLogView] --> K[pageDataApi /data/page]
+        K --> L[(s_log_login)]
+    end
+```
+
+## 目录结构
+
+```
+fms-api/
+├── pom.xml                                          # [MODIFY] 新增 ip2region、uap-java 依赖
+├── src/main/resources/ip2region.xdb                 # [NEW] 官方 ip2region 二进制库（约11MB，不入库/可 gitignore）
+├── src/main/resources/application.yaml              # [MODIFY/可选] 如需配置 xdb 路径占位
+├── config/migrations/003_create_login_log.sql      # [NEW] 建表 s_log_login + 索引
+└── src/main/java/cn/g3soft/fmsapi/
+    ├── utils/
+    │   ├── IpUtils.java                             # [NEW] 从请求头/远程地址提取客户端 IP
+    │   ├── ClientInfo.java                          # [NEW] 客户端信息载体（ip/location/browser/os/deviceType/ua）
+    │   ├── IpRegionSearcher.java                    # [NEW] 启动初始化 xdb Searcher，提供 search(ip)
+    │   └── ClientInfoExtractor.java                 # [NEW] 组合 IpUtils+IpRegionSearcher+uap-java，extract(request)
+    ├── service/
+    │   ├── LoginLogService.java                     # [NEW] recordLogin：组装并调用 DataSaveService.save
+    │   └── AuthService.java                         # [MODIFY] 注入 LoginLogService，login 增 HttpServletRequest 参数并在成功/失败分支记录
+    └── controller/AuthController.java               # [MODIFY] login 透传 HttpServletRequest 给 service
+
+fms-vue/
+├── src/services/api.js                              # [MODIFY] 新增 pageLoginLogApi 包装 pageDataApi
+├── src/router/routes.js                             # [MODIFY] 新增 /system/login-log 路由（无 moduleCode）
+├── src/layouts/components/AppSidebar.vue           # [MODIFY] systemPages 增加「登录日志」菜单项（无 moduleCode）
+└── src/views/system/login-log/
+    └── index.vue                                    # [NEW] 只读列表页：筛选栏 + a-table 分页展示
+```
+
+## 关键代码结构
+
+```java
+// ClientInfo：客户端环境信息载体
+public record ClientInfo(
+    String ip, String ipLocation,
+    String browser, String browserVersion,
+    String os, String osVersion,
+    String deviceType, String userAgent
+) {}
+
+// LoginLogService 写日志入口（成功/失败均调用）
+void recordLogin(String orgId, String account, Map<String,Object> user,
+                 boolean success, String failReason, String sessionId,
+                 HttpServletRequest request);
+```
+
+## 设计风格
+
+沿用系统现有的企业级货运物流后台风格：浅色画布、左侧深色（`#173a42`）侧栏、青绿主色（`#15998e`）点缀。登录日志页为「筛选栏 + 只读数据表格」的经典审计列表布局，保持与模块管理页一致的视觉语言与栅格间距，整体克制、清晰、专业。
+
+## 页面规划（1 屏）
+
+- 顶部区块：页标题「登录日志」+ 筛选栏（账号输入框、登录结果下拉「成功/失败」、登录时间范围选择器、查询按钮）。
+- 主体区块：antdv `a-table` 只读表格，列含 登录时间、账号、用户姓名、IP、IP 归属地、浏览器(版本)、操作系统(版本)、设备类型、登录结果(标签)、原始 UA（溢出省略，tooltip 全显）；底部分页。
+- 结果列用 `a-tag` 区分：成功=绿色、失败=红色。
+
+## 交互与响应式
+
+- 筛选条件变更触发分页查询（`pageDataApi`），加载态用 `a-spin`/表格 `loading`。
+- 表格列在窄屏下横向滚动（`scroll.x`），筛选栏在移动端自动换行。
+- 行 hover 高亮；UA 等超长文本 `ellipsis` + `tooltip`，避免撑破布局。
+
+## Agent Extensions
+
+### Skill
+
+- **antdv-next**
+- Purpose: 在实现登录日志只读列表页时，获取 antdv-next 表格（a-table）、筛选控件（a-input / a-select / a-range-picker）、a-tag 等组件的准确 API、事件与插槽用法。
+- Expected outcome: 前端列表页使用符合项目自动导入约定的 antdv-next 组件，分页/筛选/标签渲染正确且无 API 误用。
\ No newline at end of file
diff --git a/code/fms/.gitattributes b/code/fms/.gitattributes
new file mode 100644
index 00000000..358881c8
--- /dev/null
+++ b/code/fms/.gitattributes
@@ -0,0 +1 @@
+fms-vue/** text=auto eol=lf
diff --git a/code/fms/CODEBUDDY.md b/code/fms/CODEBUDDY.md
index aa199c26..3a789419 100644
--- a/code/fms/CODEBUDDY.md
+++ b/code/fms/CODEBUDDY.md
@@ -88,7 +88,7 @@ Feature code should call these, or wrap them in a dedicated service like `src/se
 
 ### Routing & permissions
 - `src/router/index.js` registers view components via **static explicit `import()`**, not a dynamic whitelist. Each route carries `meta.moduleCode` (e.g. `m_module`), plus `menuKey`, `title`, `requiresAuth`.
-- A `beforeEach` guard checks auth, then `permissionStore.canModule(to.meta.moduleCode)`. `src/stores/permissions.js` loads `b_user_module` / `b_user_power` / `b_module_power` and gates page entry and button enable/disable. Currently permission enforcement is **frontend-only**; backend interception is not yet implemented.
+- A `beforeEach` guard checks auth, then `permissionStore.canModule(to.meta.moduleCode)`. `src/stores/permissions.js` loads `b_user_module` / `b_user_power` / `s_module_power` and gates page entry and button enable/disable. Currently permission enforcement is **frontend-only**; backend interception is not yet implemented.
 - `src/layouts/components/AppSidebar.vue` still uses a hardcoded `fallbackMenuItems` array. It should fall back to this static menu when the generic-interface module load fails.
 
 ### State & i18n
@@ -96,7 +96,7 @@ Feature code should call these, or wrap them in a dedicated service like `src/se
 - i18n: `app` store holds `locale` (default `zh-CN`); translation text comes from the DB `b_i18n` table (loaded via `loadModuleConfiguration`), not vue-i18n.
 
 ### Module management feature
-`src/views/module-management/` holds `ModuleManagementView.vue` plus `components/` panels (`ModuleTreePanel`, `ModuleBasicInfoPanel`, `ModuleFieldDefinitionPanel`, `ModulePowerPanel`, `ModuleTranslationsPanel`). Demo data lives in `src/data/moduleDemo.js` — the real page must not depend on it. The table design (six tables: `b_module`, `b_module_field`, `b_module_power`, `b_user_module`, `b_user_power`, `b_i18n`) is in `新数据库结构.md`; follow that schema exactly. `b_module.b_id` is an immutable snowflake ID; `b_module.b_code` is a mutable, unique lowercase code (e.g. `m_biz`). Bigint IDs are returned to the frontend as strings.
+`src/views/module-management/` holds `ModuleManagementView.vue` plus `components/` panels (`ModuleTreePanel`, `ModuleBasicInfoPanel`, `ModuleFieldDefinitionPanel`, `ModulePowerPanel`, `ModuleTranslationsPanel`). Demo data lives in `src/data/moduleDemo.js` — the real page must not depend on it. The table design (six tables: `s_module`, `s_module_field`, `s_module_power`, `b_user_module`, `b_user_power`, `b_i18n`) is in `新数据库结构.md`; follow that schema exactly. `s_module.b_id` is an immutable snowflake ID; `s_module.b_code` is a mutable, unique lowercase code (e.g. `m_biz`). Bigint IDs are returned to the frontend as strings.
 
 ## Cross-cutting conventions
 - Reuse existing components and antdv-next; extract shared logic into components/composables/services only when it genuinely reduces duplication. Keep new CSS scoped to the component.
diff --git a/code/fms/fms-api/.gitignore b/code/fms/fms-api/.gitignore
index 80dc5024..007c3fcd 100644
--- a/code/fms/fms-api/.gitignore
+++ b/code/fms/fms-api/.gitignore
@@ -1,36 +1,5 @@
-HELP.md
-target/
-.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
+# 本地 IP 归属地数据库（二进制，约 11MB，从官方仓库下载，不入库）
+src/main/resources/ip2region.xdb
 
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Organization database configs ###
-/config/dbconfigs/*.properties
+# 多机构数据库连接配置（含敏感信息，已约定不入库）
+config/dbconfigs/
diff --git a/code/fms/fms-api/.idea/.gitignore b/code/fms/fms-api/.idea/.gitignore
new file mode 100644
index 00000000..30cf57ed
--- /dev/null
+++ b/code/fms/fms-api/.idea/.gitignore
@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/code/fms/fms-api/.idea/compiler.xml b/code/fms/fms-api/.idea/compiler.xml
new file mode 100644
index 00000000..0ad0a12a
--- /dev/null
+++ b/code/fms/fms-api/.idea/compiler.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="fms-api" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="fms-api" options="-parameters" />
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/code/fms/fms-api/.idea/encodings.xml b/code/fms/fms-api/.idea/encodings.xml
new file mode 100644
index 00000000..63e90019
--- /dev/null
+++ b/code/fms/fms-api/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/code/fms/fms-api/.idea/jarRepositories.xml b/code/fms/fms-api/.idea/jarRepositories.xml
new file mode 100644
index 00000000..b074d705
--- /dev/null
+++ b/code/fms/fms-api/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/central" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/code/fms/fms-api/.idea/legacy-tls.security b/code/fms/fms-api/.idea/legacy-tls.security
new file mode 100644
index 00000000..0f825c8b
--- /dev/null
+++ b/code/fms/fms-api/.idea/legacy-tls.security
@@ -0,0 +1,5 @@
+# Local compatibility for a legacy SQL Server that only supports TLS 1.0.
+# Remove this override after TLS 1.2 is enabled on the database server.
+jdk.tls.disabledAlgorithms=SSLv3, TLSv1.1, DTLSv1.0, RC4, DES, \
+    MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, \
+    ECDH
diff --git a/code/fms/fms-api/.idea/misc.xml b/code/fms/fms-api/.idea/misc.xml
new file mode 100644
index 00000000..0ef1e0e5
--- /dev/null
+++ b/code/fms/fms-api/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="temurin-21" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/code/fms/fms-api/.idea/vcs.xml b/code/fms/fms-api/.idea/vcs.xml
new file mode 100644
index 00000000..c2365ab1
--- /dev/null
+++ b/code/fms/fms-api/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/code/fms/fms-api/config/migrations/000_reset_metadata.sql b/code/fms/fms-api/config/migrations/000_reset_metadata.sql
index 4d57c4fe..8c9d3bdd 100644
--- a/code/fms/fms-api/config/migrations/000_reset_metadata.sql
+++ b/code/fms/fms-api/config/migrations/000_reset_metadata.sql
@@ -44,7 +44,7 @@ GO
     IF @AdminId IS NULL
         THROW 51001, N'重置会话缺少管理员 ID。', 1;
 
-    CREATE TABLE dbo.b_module (
+    CREATE TABLE dbo.s_module (
         b_id bigint NOT NULL,
         b_code varchar(50) NOT NULL,
         b_parent_id bigint NULL,
@@ -56,28 +56,28 @@ GO
         b_savetable varchar(128) NULL,
         b_keyfield varchar(50) NULL,
         b_orderfield varchar(500) NULL,
-        b_canmenu int NOT NULL CONSTRAINT DF_b_module_canmenu DEFAULT (0),
-        b_canuse int NOT NULL CONSTRAINT DF_b_module_canuse DEFAULT (1),
-        b_xh int NOT NULL CONSTRAINT DF_b_module_xh DEFAULT (0),
-        CONSTRAINT PK_b_module PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_parent FOREIGN KEY (b_parent_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT UQ_b_module_code UNIQUE (b_code),
-        CONSTRAINT CK_b_module_code CHECK (
+        b_canmenu int NOT NULL CONSTRAINT DF_s_module_canmenu DEFAULT (0),
+        b_canuse int NOT NULL CONSTRAINT DF_s_module_canuse DEFAULT (1),
+        b_xh int NOT NULL CONSTRAINT DF_s_module_xh DEFAULT (0),
+        CONSTRAINT PK_s_module PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_parent FOREIGN KEY (b_parent_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT UQ_s_module_code UNIQUE (b_code),
+        CONSTRAINT CK_s_module_code CHECK (
             LEN(b_code) BETWEEN 2 AND 50
             AND b_code COLLATE Latin1_General_100_BIN2 LIKE '[a-z]%'
             AND b_code COLLATE Latin1_General_100_BIN2 NOT LIKE '%[^a-z0-9_]%'
         ),
-        CONSTRAINT CK_b_module_type CHECK (b_module_type IN ('directory', 'page', 'data')),
-        CONSTRAINT CK_b_module_canmenu CHECK (b_canmenu IN (0, 1)),
-        CONSTRAINT CK_b_module_canuse CHECK (b_canuse IN (0, 1)),
-        CONSTRAINT CK_b_module_directory CHECK (b_module_type <> 'directory' OR (b_route IS NULL AND b_viewtable IS NULL AND b_savetable IS NULL)),
-        CONSTRAINT CK_b_module_page CHECK (b_module_type <> 'page' OR b_route IS NOT NULL),
-        CONSTRAINT CK_b_module_data CHECK (b_module_type <> 'data' OR (b_canmenu = 0 AND b_route IS NULL))
+        CONSTRAINT CK_s_module_type CHECK (b_module_type IN ('directory', 'page', 'data')),
+        CONSTRAINT CK_s_module_canmenu CHECK (b_canmenu IN (0, 1)),
+        CONSTRAINT CK_s_module_canuse CHECK (b_canuse IN (0, 1)),
+        CONSTRAINT CK_s_module_directory CHECK (b_module_type <> 'directory' OR (b_route IS NULL AND b_viewtable IS NULL AND b_savetable IS NULL)),
+        CONSTRAINT CK_s_module_page CHECK (b_module_type <> 'page' OR b_route IS NOT NULL),
+        CONSTRAINT CK_s_module_data CHECK (b_module_type <> 'data' OR (b_canmenu = 0 AND b_route IS NULL))
     );
-    CREATE UNIQUE INDEX UX_b_module_route ON dbo.b_module (b_route) WHERE b_route IS NOT NULL;
-    CREATE INDEX IX_b_module_parent ON dbo.b_module (b_parent_id, b_xh, b_id);
+    CREATE UNIQUE INDEX UX_s_module_route ON dbo.s_module (b_route) WHERE b_route IS NOT NULL;
+    CREATE INDEX IX_s_module_parent ON dbo.s_module (b_parent_id, b_xh, b_id);
 
-    CREATE TABLE dbo.b_module_field (
+    CREATE TABLE dbo.s_module_field (
         b_id bigint NOT NULL,
         b_module_id bigint NOT NULL,
         b_field varchar(50) NOT NULL,
@@ -86,103 +86,100 @@ GO
         b_type varchar(30) NOT NULL,
         b_default_value nvarchar(500) NULL,
         b_options nvarchar(max) NULL,
-        b_canuse int NOT NULL CONSTRAINT DF_b_module_field_canuse DEFAULT (1),
-        CONSTRAINT PK_b_module_field PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_field_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT UQ_b_module_field UNIQUE (b_module_id, b_field),
-        CONSTRAINT CK_b_module_field_type CHECK (b_type IN ('input', 'textarea', 'number', 'money', 'date', 'datetime', 'switch', 'select')),
-        CONSTRAINT CK_b_module_field_canuse CHECK (b_canuse IN (0, 1)),
-        CONSTRAINT CK_b_module_field_options CHECK (b_options IS NULL OR ISJSON(b_options) = 1)
+        b_canuse int NOT NULL CONSTRAINT DF_s_module_field_canuse DEFAULT (1),
+        CONSTRAINT PK_s_module_field PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_field_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT UQ_s_module_field UNIQUE (b_module_id, b_field),
+        CONSTRAINT CK_s_module_field_type CHECK (b_type IN ('input', 'textarea', 'number', 'money', 'date', 'datetime', 'switch', 'select')),
+        CONSTRAINT CK_s_module_field_canuse CHECK (b_canuse IN (0, 1)),
+        CONSTRAINT CK_s_module_field_options CHECK (b_options IS NULL OR ISJSON(b_options) = 1)
     );
-    CREATE INDEX IX_b_module_field_module ON dbo.b_module_field (b_module_id, b_canuse, b_id);
+    CREATE INDEX IX_s_module_field_module ON dbo.s_module_field (b_module_id, b_canuse, b_id);
 
-    CREATE TABLE dbo.b_module_field_group (
+    CREATE TABLE dbo.s_module_field_group (
         b_id bigint NOT NULL,
         b_module_id bigint NOT NULL,
         b_parent_id bigint NULL,
         b_title nvarchar(100) NOT NULL,
         b_i18n varchar(150) NULL,
-        b_xh int NOT NULL CONSTRAINT DF_b_module_field_group_xh DEFAULT (0),
-        b_canuse int NOT NULL CONSTRAINT DF_b_module_field_group_canuse DEFAULT (1),
-        CONSTRAINT PK_b_module_field_group PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_field_group_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT FK_b_module_field_group_parent FOREIGN KEY (b_parent_id) REFERENCES dbo.b_module_field_group (b_id),
-        CONSTRAINT CK_b_module_field_group_canuse CHECK (b_canuse IN (0, 1))
+        b_xh int NOT NULL CONSTRAINT DF_s_module_field_group_xh DEFAULT (0),
+        b_canuse int NOT NULL CONSTRAINT DF_s_module_field_group_canuse DEFAULT (1),
+        CONSTRAINT PK_s_module_field_group PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_field_group_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT FK_s_module_field_group_parent FOREIGN KEY (b_parent_id) REFERENCES dbo.s_module_field_group (b_id),
+        CONSTRAINT CK_s_module_field_group_canuse CHECK (b_canuse IN (0, 1))
     );
-    CREATE INDEX IX_b_module_field_group_module ON dbo.b_module_field_group (b_module_id, b_canuse, b_xh, b_id);
+    CREATE INDEX IX_s_module_field_group_module ON dbo.s_module_field_group (b_module_id, b_canuse, b_xh, b_id);
 
-    CREATE TABLE dbo.b_module_field_list (
+    CREATE TABLE dbo.s_module_field_list (
         b_id bigint NOT NULL,
         b_module_id bigint NOT NULL,
         b_field_id bigint NULL,
         b_group_id bigint NULL,
-        b_title nvarchar(100) NULL,
         b_i18n varchar(150) NULL,
-        b_visible int NOT NULL CONSTRAINT DF_b_module_field_list_visible DEFAULT (1),
-        b_xh int NOT NULL CONSTRAINT DF_b_module_field_list_xh DEFAULT (0),
+        b_visible int NOT NULL CONSTRAINT DF_s_module_field_list_visible DEFAULT (1),
+        b_xh int NOT NULL CONSTRAINT DF_s_module_field_list_xh DEFAULT (0),
         b_width int NULL,
-        b_sortable int NOT NULL CONSTRAINT DF_b_module_field_list_sortable DEFAULT (0),
-        CONSTRAINT PK_b_module_field_list PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_field_list_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT FK_b_module_field_list_field FOREIGN KEY (b_field_id) REFERENCES dbo.b_module_field (b_id),
-        CONSTRAINT FK_b_module_field_list_group FOREIGN KEY (b_group_id) REFERENCES dbo.b_module_field_group (b_id),
-        CONSTRAINT CK_b_module_field_list_visible CHECK (b_visible IN (0, 1)),
-        CONSTRAINT CK_b_module_field_list_sortable CHECK (b_sortable IN (0, 1)),
-        CONSTRAINT CK_b_module_field_list_width CHECK (b_width IS NULL OR b_width > 0)
+        CONSTRAINT PK_s_module_field_list PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_field_list_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT FK_s_module_field_list_field FOREIGN KEY (b_field_id) REFERENCES dbo.s_module_field (b_id),
+        CONSTRAINT FK_s_module_field_list_group FOREIGN KEY (b_group_id) REFERENCES dbo.s_module_field_group (b_id),
+        CONSTRAINT CK_s_module_field_list_visible CHECK (b_visible IN (0, 1)),
+        CONSTRAINT CK_s_module_field_list_width CHECK (b_width IS NULL OR b_width > 0)
     );
-    CREATE UNIQUE INDEX UX_b_module_field_list_field ON dbo.b_module_field_list (b_module_id, b_field_id) WHERE b_field_id IS NOT NULL;
-    CREATE INDEX IX_b_module_field_list_tree ON dbo.b_module_field_list (b_module_id, b_group_id, b_xh, b_id);
+    CREATE UNIQUE INDEX UX_s_module_field_list_field ON dbo.s_module_field_list (b_module_id, b_field_id) WHERE b_field_id IS NOT NULL;
+    CREATE INDEX IX_s_module_field_list_tree ON dbo.s_module_field_list (b_module_id, b_group_id, b_xh, b_id);
 
-    CREATE TABLE dbo.b_module_field_edit (
+    CREATE TABLE dbo.s_module_field_edit (
         b_id bigint NOT NULL,
         b_module_id bigint NOT NULL,
         b_field_id bigint NOT NULL,
-        b_required int NOT NULL CONSTRAINT DF_b_module_field_edit_required DEFAULT (0),
-        b_readonly int NOT NULL CONSTRAINT DF_b_module_field_edit_readonly DEFAULT (0),
-        b_disabled int NOT NULL CONSTRAINT DF_b_module_field_edit_disabled DEFAULT (0),
+        b_required int NOT NULL CONSTRAINT DF_s_module_field_edit_required DEFAULT (0),
+        b_readonly int NOT NULL CONSTRAINT DF_s_module_field_edit_readonly DEFAULT (0),
+        b_disabled int NOT NULL CONSTRAINT DF_s_module_field_edit_disabled DEFAULT (0),
         b_group_id bigint NULL,
-        b_xh int NOT NULL CONSTRAINT DF_b_module_field_edit_xh DEFAULT (0),
-        CONSTRAINT PK_b_module_field_edit PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_field_edit_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT FK_b_module_field_edit_field FOREIGN KEY (b_field_id) REFERENCES dbo.b_module_field (b_id),
-        CONSTRAINT FK_b_module_field_edit_group FOREIGN KEY (b_group_id) REFERENCES dbo.b_module_field_group (b_id),
-        CONSTRAINT UQ_b_module_field_edit UNIQUE (b_module_id, b_field_id),
-        CONSTRAINT CK_b_module_field_edit_required CHECK (b_required IN (0, 1)),
-        CONSTRAINT CK_b_module_field_edit_readonly CHECK (b_readonly IN (0, 1)),
-        CONSTRAINT CK_b_module_field_edit_disabled CHECK (b_disabled IN (0, 1))
+        b_xh int NOT NULL CONSTRAINT DF_s_module_field_edit_xh DEFAULT (0),
+        CONSTRAINT PK_s_module_field_edit PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_field_edit_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT FK_s_module_field_edit_field FOREIGN KEY (b_field_id) REFERENCES dbo.s_module_field (b_id),
+        CONSTRAINT FK_s_module_field_edit_group FOREIGN KEY (b_group_id) REFERENCES dbo.s_module_field_group (b_id),
+        CONSTRAINT UQ_s_module_field_edit UNIQUE (b_module_id, b_field_id),
+        CONSTRAINT CK_s_module_field_edit_required CHECK (b_required IN (0, 1)),
+        CONSTRAINT CK_s_module_field_edit_readonly CHECK (b_readonly IN (0, 1)),
+        CONSTRAINT CK_s_module_field_edit_disabled CHECK (b_disabled IN (0, 1))
     );
-    CREATE INDEX IX_b_module_field_edit_module ON dbo.b_module_field_edit (b_module_id, b_xh, b_id);
+    CREATE INDEX IX_s_module_field_edit_module ON dbo.s_module_field_edit (b_module_id, b_xh, b_id);
 
-    CREATE TABLE dbo.b_module_field_query (
+    CREATE TABLE dbo.s_module_field_query (
         b_id bigint NOT NULL,
         b_module_id bigint NOT NULL,
         b_field_id bigint NOT NULL,
         b_component varchar(30) NOT NULL,
         b_operator varchar(20) NOT NULL,
         b_default_value nvarchar(500) NULL,
-        b_xh int NOT NULL CONSTRAINT DF_b_module_field_query_xh DEFAULT (0),
-        b_canuse int NOT NULL CONSTRAINT DF_b_module_field_query_canuse DEFAULT (1),
-        CONSTRAINT PK_b_module_field_query PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_field_query_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT FK_b_module_field_query_field FOREIGN KEY (b_field_id) REFERENCES dbo.b_module_field (b_id),
-        CONSTRAINT UQ_b_module_field_query UNIQUE (b_module_id, b_field_id),
-        CONSTRAINT CK_b_module_field_query_operator CHECK (b_operator IN ('=', 'like', 'between', 'in')),
-        CONSTRAINT CK_b_module_field_query_canuse CHECK (b_canuse IN (0, 1))
+        b_xh int NOT NULL CONSTRAINT DF_s_module_field_query_xh DEFAULT (0),
+        b_canuse int NOT NULL CONSTRAINT DF_s_module_field_query_canuse DEFAULT (1),
+        CONSTRAINT PK_s_module_field_query PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_field_query_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT FK_s_module_field_query_field FOREIGN KEY (b_field_id) REFERENCES dbo.s_module_field (b_id),
+        CONSTRAINT UQ_s_module_field_query UNIQUE (b_module_id, b_field_id),
+        CONSTRAINT CK_s_module_field_query_operator CHECK (b_operator IN ('=', 'like', 'between', 'in')),
+        CONSTRAINT CK_s_module_field_query_canuse CHECK (b_canuse IN (0, 1))
     );
-    CREATE INDEX IX_b_module_field_query_module ON dbo.b_module_field_query (b_module_id, b_canuse, b_xh, b_id);
+    CREATE INDEX IX_s_module_field_query_module ON dbo.s_module_field_query (b_module_id, b_canuse, b_xh, b_id);
 
-    CREATE TABLE dbo.b_module_power (
+    CREATE TABLE dbo.s_module_power (
         b_id bigint NOT NULL,
         b_module_id bigint NOT NULL,
         b_code varchar(50) NOT NULL,
         b_name nvarchar(100) NOT NULL,
         b_i18n varchar(150) NULL,
-        b_xh int NOT NULL CONSTRAINT DF_b_module_power_xh DEFAULT (0),
-        b_canuse int NOT NULL CONSTRAINT DF_b_module_power_canuse DEFAULT (1),
-        CONSTRAINT PK_b_module_power PRIMARY KEY (b_id),
-        CONSTRAINT FK_b_module_power_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
-        CONSTRAINT UQ_b_module_power UNIQUE (b_module_id, b_code),
-        CONSTRAINT CK_b_module_power_canuse CHECK (b_canuse IN (0, 1))
+        b_xh int NOT NULL CONSTRAINT DF_s_module_power_xh DEFAULT (0),
+        b_canuse int NOT NULL CONSTRAINT DF_s_module_power_canuse DEFAULT (1),
+        CONSTRAINT PK_s_module_power PRIMARY KEY (b_id),
+        CONSTRAINT FK_s_module_power_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
+        CONSTRAINT UQ_s_module_power UNIQUE (b_module_id, b_code),
+        CONSTRAINT CK_s_module_power_canuse CHECK (b_canuse IN (0, 1))
     );
 
     CREATE TABLE dbo.b_user_module (
@@ -193,7 +190,7 @@ GO
         b_inputdatetime datetime NOT NULL CONSTRAINT DF_b_user_module_inputdatetime DEFAULT (GETDATE()),
         CONSTRAINT PK_b_user_module PRIMARY KEY (b_id),
         CONSTRAINT FK_b_user_module_user FOREIGN KEY (b_user_id) REFERENCES dbo.b_user (b_id),
-        CONSTRAINT FK_b_user_module_module FOREIGN KEY (b_module_id) REFERENCES dbo.b_module (b_id),
+        CONSTRAINT FK_b_user_module_module FOREIGN KEY (b_module_id) REFERENCES dbo.s_module (b_id),
         CONSTRAINT FK_b_user_module_inputuser FOREIGN KEY (b_inputuser_id) REFERENCES dbo.b_user (b_id),
         CONSTRAINT UQ_b_user_module UNIQUE (b_user_id, b_module_id)
     );
@@ -206,7 +203,7 @@ GO
         b_inputdatetime datetime NOT NULL CONSTRAINT DF_b_user_power_inputdatetime DEFAULT (GETDATE()),
         CONSTRAINT PK_b_user_power PRIMARY KEY (b_id),
         CONSTRAINT FK_b_user_power_user FOREIGN KEY (b_user_id) REFERENCES dbo.b_user (b_id),
-        CONSTRAINT FK_b_user_power_power FOREIGN KEY (b_power_id) REFERENCES dbo.b_module_power (b_id),
+        CONSTRAINT FK_b_user_power_power FOREIGN KEY (b_power_id) REFERENCES dbo.s_module_power (b_id),
         CONSTRAINT FK_b_user_power_inputuser FOREIGN KEY (b_inputuser_id) REFERENCES dbo.b_user (b_id),
         CONSTRAINT UQ_b_user_power UNIQUE (b_user_id, b_power_id)
     );
@@ -223,11 +220,11 @@ GO
 
     DECLARE @SystemId bigint = 910000000000000001;
     DECLARE @MetadataId bigint = 910000000000000002;
-    INSERT INTO dbo.b_module (b_id, b_code, b_parent_id, b_name, b_i18n, b_module_type, b_route, b_canmenu, b_canuse, b_xh) VALUES
+    INSERT INTO dbo.s_module (b_id, b_code, b_parent_id, b_name, b_i18n, b_module_type, b_route, b_canmenu, b_canuse, b_xh) VALUES
         (@SystemId, 'm_system', NULL, N'系统管理', 'module.m_system', 'directory', NULL, 1, 1, 100),
         (@MetadataId, 'm_metadata', @SystemId, N'元数据配置', 'module.m_metadata', 'page', '/system/metadata', 1, 1, 10);
 
-    INSERT INTO dbo.b_module_power (b_id, b_module_id, b_code, b_name, b_i18n, b_xh, b_canuse) VALUES
+    INSERT INTO dbo.s_module_power (b_id, b_module_id, b_code, b_name, b_i18n, b_xh, b_canuse) VALUES
         (910000000000000101, @MetadataId, 'create', N'新增', 'power.m_metadata.create', 10, 1),
         (910000000000000102, @MetadataId, 'update', N'保存', 'power.m_metadata.update', 20, 1),
         (910000000000000103, @MetadataId, 'delete', N'删除', 'power.m_metadata.delete', 30, 1),
@@ -237,7 +234,7 @@ GO
         (910000000000000201, @AdminId, @MetadataId, @AdminId);
     INSERT INTO dbo.b_user_power (b_id, b_user_id, b_power_id, b_inputuser_id)
     SELECT 910000000000000300 + ROW_NUMBER() OVER (ORDER BY b_id), @AdminId, b_id, @AdminId
-    FROM dbo.b_module_power;
+    FROM dbo.s_module_power;
 
 EXEC sys.sp_set_session_context @key = N'allow_g3soft', @value = NULL;
 EXEC sys.sp_set_session_context @key = N'reset_admin_id', @value = NULL;
diff --git a/code/fms/fms-api/config/migrations/001_add_i18n_type.sql b/code/fms/fms-api/config/migrations/001_add_i18n_type.sql
index 88fe8cb1..37ba14d8 100644
--- a/code/fms/fms-api/config/migrations/001_add_i18n_type.sql
+++ b/code/fms/fms-api/config/migrations/001_add_i18n_type.sql
@@ -20,7 +20,7 @@ BEGIN TRANSACTION;
 
     -- 系统管理目录（000 脚本播种）
     DECLARE @SystemId bigint = (
-        SELECT TOP (1) b_id FROM dbo.b_module WHERE b_code = N'm_system'
+        SELECT TOP (1) b_id FROM dbo.s_module WHERE b_code = N'm_system'
     );
 
     -- 1. 多语言类型表
@@ -47,11 +47,11 @@ BEGIN TRANSACTION;
     END
 
     -- 2. 注册模块与管理员权限（仅在模块不存在时播种）
-    IF NOT EXISTS (SELECT 1 FROM dbo.b_module WHERE b_code = N'm_i18n_type')
+    IF NOT EXISTS (SELECT 1 FROM dbo.s_module WHERE b_code = N'm_i18n_type')
     BEGIN
         DECLARE @I18nTypeId bigint = 910000000000000003;
 
-        INSERT INTO dbo.b_module (
+        INSERT INTO dbo.s_module (
             b_id, b_code, b_parent_id, b_name, b_i18n, b_module_type,
             b_route, b_canmenu, b_canuse, b_xh
         ) VALUES (
@@ -59,7 +59,7 @@ BEGIN TRANSACTION;
             'page', N'/system/i18n-type', 1, 1, 20
         );
 
-        INSERT INTO dbo.b_module_power (b_id, b_module_id, b_code, b_name, b_i18n, b_xh, b_canuse) VALUES
+        INSERT INTO dbo.s_module_power (b_id, b_module_id, b_code, b_name, b_i18n, b_xh, b_canuse) VALUES
             (910000000000000105, @I18nTypeId, 'create', N'新增', 'power.m_i18n_type.create', 10, 1),
             (910000000000000106, @I18nTypeId, 'update', N'保存', 'power.m_i18n_type.update', 20, 1),
             (910000000000000107, @I18nTypeId, 'delete', N'删除', 'power.m_i18n_type.delete', 30, 1);
@@ -71,7 +71,7 @@ BEGIN TRANSACTION;
 
             INSERT INTO dbo.b_user_power (b_id, b_user_id, b_power_id, b_inputuser_id)
             SELECT 910000000000000303 + ROW_NUMBER() OVER (ORDER BY b_id), @AdminId, b_id, @AdminId
-            FROM dbo.b_module_power
+            FROM dbo.s_module_power
             WHERE b_module_id = @I18nTypeId;
         END
     END
diff --git a/code/fms/fms-api/config/migrations/002_add_system_dir.sql b/code/fms/fms-api/config/migrations/002_add_system_dir.sql
index 8d035904..936e4733 100644
--- a/code/fms/fms-api/config/migrations/002_add_system_dir.sql
+++ b/code/fms/fms-api/config/migrations/002_add_system_dir.sql
@@ -5,20 +5,20 @@
   - m_system 仅在其不存在时创建；
   - m_i18n_type 仅在其父级未指向系统管理目录时才更新。
 
-  依赖：b_module 表已存在（由 001_add_i18n_type.sql 或业务库结构保证）。
+  依赖：s_module 表已存在（由 001_add_i18n_type.sql 或业务库结构保证）。
 */
 
 SET NOCOUNT ON;
 BEGIN TRANSACTION;
 
     -- 系统管理目录（若不存在则创建）
-    DECLARE @SystemId bigint = (SELECT TOP (1) b_id FROM dbo.b_module WHERE b_code = N'm_system');
+    DECLARE @SystemId bigint = (SELECT TOP (1) b_id FROM dbo.s_module WHERE b_code = N'm_system');
 
     IF @SystemId IS NULL
     BEGIN
         SET @SystemId = 911000000000000001;
 
-        INSERT INTO dbo.b_module (
+        INSERT INTO dbo.s_module (
             b_id, b_code, b_parent_id, b_name, b_i18n, b_module_type,
             b_canmenu, b_canuse, b_xh
         ) VALUES (
@@ -28,7 +28,7 @@ BEGIN TRANSACTION;
     END
 
     -- 多语言类型挂到系统管理目录
-    UPDATE dbo.b_module
+    UPDATE dbo.s_module
     SET b_parent_id = @SystemId
     WHERE b_code = N'm_i18n_type'
       AND (b_parent_id IS NULL OR b_parent_id <> @SystemId);
diff --git a/code/fms/fms-api/config/migrations/003_create_login_log.sql b/code/fms/fms-api/config/migrations/003_create_login_log.sql
new file mode 100644
index 00000000..b7dbb6b1
--- /dev/null
+++ b/code/fms/fms-api/config/migrations/003_create_login_log.sql
@@ -0,0 +1,40 @@
+/*
+  登录日志表 s_log_login：记录每次登录尝试（成功/失败）的客户端环境与结果，用于登录审计。
+  后端在登录时统一采集 IP、IP 归属地、浏览器/版本、操作系统/版本、设备类型、原始 User-Agent，
+  并通过通用 saveobjt 接口写入本表；前端通过分页接口只读展示。
+  表名使用 s_ 前缀以区别于业务模块表（b_）。
+
+  可重复执行：通过 sys.tables 存在性判断避免重复建表。
+*/
+SET NOCOUNT ON;
+
+BEGIN TRANSACTION;
+
+    IF NOT EXISTS (SELECT 1 FROM sys.tables WHERE name = N's_log_login')
+    BEGIN
+        CREATE TABLE dbo.s_log_login (
+            b_id              bigint        NOT NULL,
+            b_org_id          nvarchar(50)  NULL,
+            b_user_id         bigint        NULL,
+            b_account         nvarchar(50)  NULL,
+            b_login_time      datetime      NOT NULL CONSTRAINT DF_s_log_login_time    DEFAULT (GETDATE()),
+            b_ip              nvarchar(50)  NULL,
+            b_ip_location     nvarchar(200) NULL,
+            b_browser         nvarchar(100) NULL,
+            b_browser_version nvarchar(50)  NULL,
+            b_os              nvarchar(100) NULL,
+            b_os_version      nvarchar(50)  NULL,
+            b_device_type     nvarchar(20)  NULL,
+            b_user_agent      nvarchar(max) NULL,
+            b_login_result    int           NOT NULL CONSTRAINT DF_s_log_login_result DEFAULT (0),
+            b_fail_reason     nvarchar(200) NULL,
+            b_session_id      nvarchar(50)  NULL,
+            CONSTRAINT PK_s_log_login PRIMARY KEY (b_id)
+        );
+
+        CREATE INDEX IX_s_log_login_time    ON dbo.s_log_login (b_login_time DESC, b_id);
+        CREATE INDEX IX_s_log_login_account ON dbo.s_log_login (b_account, b_login_time DESC);
+        CREATE INDEX IX_s_log_login_result  ON dbo.s_log_login (b_login_result, b_login_time DESC);
+    END
+
+COMMIT TRANSACTION;
diff --git a/code/fms/fms-api/config/migrations/004_rename_module_tables.sql b/code/fms/fms-api/config/migrations/004_rename_module_tables.sql
new file mode 100644
index 00000000..9aec762d
--- /dev/null
+++ b/code/fms/fms-api/config/migrations/004_rename_module_tables.sql
@@ -0,0 +1,163 @@
+/*
+  将新元数据结构的 b_module* 表无损重命名为 s_module*，与旧系统模块表前缀保持一致。
+  字段名 b_module_id、b_module_type 以及用户授权表 b_user_module、b_user_power 保持不变。
+
+  如果数据库仍存在旧版 dbo.s_module（没有 b_code 字段），脚本会终止，避免覆盖同名旧结构。
+*/
+SET NOCOUNT ON;
+SET XACT_ABORT ON;
+
+BEGIN TRANSACTION;
+
+    IF OBJECT_ID(N'dbo.s_module', N'U') IS NOT NULL
+       AND COL_LENGTH(N'dbo.s_module', N'b_code') IS NULL
+        THROW 51020, N'检测到旧版 dbo.s_module，无法自动迁移新模块元数据表。', 1;
+
+    DECLARE @Tables TABLE (
+        b_old_name sysname NOT NULL,
+        b_new_name sysname NOT NULL,
+        b_xh int NOT NULL
+    );
+
+    INSERT INTO @Tables (b_old_name, b_new_name, b_xh) VALUES
+        (N'b_module', N's_module', 10),
+        (N'b_module_field', N's_module_field', 20),
+        (N'b_module_field_group', N's_module_field_group', 30),
+        (N'b_module_field_list', N's_module_field_list', 40),
+        (N'b_module_field_edit', N's_module_field_edit', 50),
+        (N'b_module_field_query', N's_module_field_query', 60),
+        (N'b_module_power', N's_module_power', 70);
+
+    IF EXISTS (
+        SELECT 1
+        FROM @Tables
+        WHERE OBJECT_ID(N'dbo.' + b_old_name, N'U') IS NOT NULL
+          AND OBJECT_ID(N'dbo.' + b_new_name, N'U') IS NOT NULL
+    )
+        THROW 51021, N'模块新旧表名同时存在，已取消自动重命名。', 1;
+
+    DECLARE @OldName sysname;
+    DECLARE @NewName sysname;
+    DECLARE @QualifiedName nvarchar(517);
+
+    DECLARE table_cursor CURSOR LOCAL FAST_FORWARD FOR
+        SELECT b_old_name, b_new_name
+        FROM @Tables
+        ORDER BY b_xh;
+
+    OPEN table_cursor;
+    FETCH NEXT FROM table_cursor INTO @OldName, @NewName;
+
+    WHILE @@FETCH_STATUS = 0
+    BEGIN
+        IF OBJECT_ID(N'dbo.' + @OldName, N'U') IS NOT NULL
+        BEGIN
+            SET @QualifiedName = N'dbo.' + QUOTENAME(@OldName);
+            EXEC sys.sp_rename @objname = @QualifiedName, @newname = @NewName, @objtype = N'OBJECT';
+        END;
+        FETCH NEXT FROM table_cursor INTO @OldName, @NewName;
+    END;
+
+    CLOSE table_cursor;
+    DEALLOCATE table_cursor;
+
+    IF OBJECT_ID(N'dbo.s_module', N'U') IS NOT NULL
+    BEGIN
+        UPDATE module
+        SET b_viewtable = CASE
+                WHEN module.b_viewtable = tables.b_old_name THEN tables.b_new_name
+                ELSE N'dbo.' + tables.b_new_name
+            END
+        FROM dbo.s_module AS module
+        INNER JOIN @Tables AS tables
+            ON module.b_viewtable IN (tables.b_old_name, N'dbo.' + tables.b_old_name);
+
+        UPDATE module
+        SET b_savetable = CASE
+                WHEN module.b_savetable = tables.b_old_name THEN tables.b_new_name
+                ELSE N'dbo.' + tables.b_new_name
+            END
+        FROM dbo.s_module AS module
+        INNER JOIN @Tables AS tables
+            ON module.b_savetable IN (tables.b_old_name, N'dbo.' + tables.b_old_name);
+    END;
+
+    DECLARE @ObjectName sysname;
+    DECLARE @RenamedObjectName sysname;
+
+    DECLARE object_cursor CURSOR LOCAL FAST_FORWARD FOR
+        SELECT o.name, REPLACE(o.name, N'b_module', N's_module')
+        FROM sys.objects AS o
+        WHERE o.parent_object_id IN (
+            OBJECT_ID(N'dbo.s_module'),
+            OBJECT_ID(N'dbo.s_module_field'),
+            OBJECT_ID(N'dbo.s_module_field_group'),
+            OBJECT_ID(N'dbo.s_module_field_list'),
+            OBJECT_ID(N'dbo.s_module_field_edit'),
+            OBJECT_ID(N'dbo.s_module_field_query'),
+            OBJECT_ID(N'dbo.s_module_power')
+        )
+          AND o.name LIKE N'%b[_]module%'
+          AND NOT EXISTS (
+              SELECT 1
+              FROM sys.objects AS renamed
+              WHERE renamed.name = REPLACE(o.name, N'b_module', N's_module')
+          );
+
+    OPEN object_cursor;
+    FETCH NEXT FROM object_cursor INTO @ObjectName, @RenamedObjectName;
+
+    WHILE @@FETCH_STATUS = 0
+    BEGIN
+        SET @QualifiedName = N'dbo.' + QUOTENAME(@ObjectName);
+        EXEC sys.sp_rename
+            @objname = @QualifiedName,
+            @newname = @RenamedObjectName,
+            @objtype = N'OBJECT';
+        FETCH NEXT FROM object_cursor INTO @ObjectName, @RenamedObjectName;
+    END;
+
+    CLOSE object_cursor;
+    DEALLOCATE object_cursor;
+
+    DECLARE @TableName sysname;
+
+    DECLARE index_cursor CURSOR LOCAL FAST_FORWARD FOR
+        SELECT t.name, i.name, REPLACE(i.name, N'b_module', N's_module')
+        FROM sys.indexes AS i
+        INNER JOIN sys.tables AS t ON t.object_id = i.object_id
+        WHERE t.name IN (
+            N's_module',
+            N's_module_field',
+            N's_module_field_group',
+            N's_module_field_list',
+            N's_module_field_edit',
+            N's_module_field_query',
+            N's_module_power'
+        )
+          AND i.name LIKE N'%b[_]module%'
+          AND NOT EXISTS (
+              SELECT 1
+              FROM sys.indexes AS renamed
+              WHERE renamed.object_id = i.object_id
+                AND renamed.name = REPLACE(i.name, N'b_module', N's_module')
+          );
+
+    OPEN index_cursor;
+    FETCH NEXT FROM index_cursor INTO @TableName, @ObjectName, @RenamedObjectName;
+
+    WHILE @@FETCH_STATUS = 0
+    BEGIN
+        SET @QualifiedName =
+            N'dbo.' + QUOTENAME(@TableName) + N'.' + QUOTENAME(@ObjectName);
+        EXEC sys.sp_rename
+            @objname = @QualifiedName,
+            @newname = @RenamedObjectName,
+            @objtype = N'INDEX';
+        FETCH NEXT FROM index_cursor INTO @TableName, @ObjectName, @RenamedObjectName;
+    END;
+
+    CLOSE index_cursor;
+    DEALLOCATE index_cursor;
+
+COMMIT TRANSACTION;
diff --git a/code/fms/fms-api/pom.xml b/code/fms/fms-api/pom.xml
index 3659fe72..4b20bbfe 100644
--- a/code/fms/fms-api/pom.xml
+++ b/code/fms/fms-api/pom.xml
@@ -61,6 +61,18 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>3.3.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.ua-parser</groupId>
+            <artifactId>uap-java</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/controller/AuthController.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/controller/AuthController.java
index f0e4f7e5..e0dfc157 100644
--- a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/controller/AuthController.java
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/controller/AuthController.java
@@ -6,6 +6,7 @@ import cn.g3soft.fmsapi.utils.ApiResponse;
 import cn.g3soft.fmsapi.utils.ParamUtils;
 import cn.g3soft.fmsapi.utils.StringUtils;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +25,8 @@ public class AuthController {
 
     @PostMapping("/login")
     public ApiResponse<Map<String, Object>> login(
-            @RequestBody(required = false) Map<String, Object> request
+            @RequestBody(required = false) Map<String, Object> request,
+            HttpServletRequest httpRequest
     ) throws SQLException {
         String orgId = ParamUtils.getString(request, "orgid");
         String userId = ParamUtils.getString(request, "userid");
@@ -40,7 +42,8 @@ public class AuthController {
         Optional<Map<String, Object>> loginResponse = authService.login(
                 orgId,
                 userId,
-                password
+                password,
+                httpRequest
         );
         if (loginResponse.isEmpty()) {
             return ApiResponse.fail(
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/AuthService.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/AuthService.java
index af758754..8252bcdd 100644
--- a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/AuthService.java
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/AuthService.java
@@ -3,6 +3,7 @@ package cn.g3soft.fmsapi.service;
 import cn.g3soft.fmsapi.utils.DbUtils;
 import cn.g3soft.fmsapi.utils.JwtUtils;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Service;
 
 import java.nio.charset.StandardCharsets;
@@ -27,10 +28,14 @@ public class AuthService {
     @Resource
     private ActiveSessionRegistry activeSessionRegistry;
 
+    @Resource
+    private LoginLogService loginLogService;
+
     public Optional<Map<String, Object>> login(
             String orgId,
             String userId,
-            String password
+            String password,
+            HttpServletRequest request
     ) throws SQLException {
         String normalizedOrgId = orgId.trim().toUpperCase(Locale.ROOT);
         String normalizedUserId = userId.trim();
@@ -40,25 +45,36 @@ public class AuthService {
         );
 
         if (users.isEmpty()) {
+            loginLogService.recordLogin(
+                    normalizedOrgId, normalizedUserId, null,
+                    false, "账号不存在", null, request);
             return Optional.empty();
         }
 
-        Map<String, Object> account = users.getFirst();
+        Map<String, Object> account = users.get(0);
         String storedPassword = getString(account, "b_password");
         if (!passwordMatches(storedPassword, password)) {
+            loginLogService.recordLogin(
+                    normalizedOrgId, normalizedUserId, null,
+                    false, "密码错误", null, request);
             return Optional.empty();
         }
 
         String accountId = getString(account, "b_account");
         long userPrimaryKey = getLong(account, "b_id");
+        String name = getString(account, "b_name");
         String sessionId = UUID.randomUUID().toString();
         String token = jwtUtils.generateToken(accountId, normalizedOrgId, sessionId);
         activeSessionRegistry.activate(normalizedOrgId, accountId, sessionId);
 
+        loginLogService.recordLogin(
+                normalizedOrgId, accountId, userPrimaryKey,
+                true, null, sessionId, request);
+
         Map<String, Object> user = new LinkedHashMap<>();
         user.put("id", userPrimaryKey);
         user.put("account", accountId);
-        user.put("name", getString(account, "b_name"));
+        user.put("name", name);
 
         Map<String, Object> result = new LinkedHashMap<>();
         result.put("token", token);
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/LoginLogService.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/LoginLogService.java
new file mode 100644
index 00000000..cd2649c0
--- /dev/null
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/LoginLogService.java
@@ -0,0 +1,83 @@
+package cn.g3soft.fmsapi.service;
+
+import cn.g3soft.fmsapi.database.OrgContext;
+import cn.g3soft.fmsapi.utils.ClientInfo;
+import cn.g3soft.fmsapi.utils.ClientInfoExtractor;
+import cn.g3soft.fmsapi.utils.snowflake.idgen.IdGenerator;
+import jakarta.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 登录日志服务：在登录成功或失败时采集客户端信息，并通过通用 saveobjt 机制写入 s_log_login 表。
+ * 写日志失败不影响登录主流程；机构上下文通过 OrgContext 临时设置并在 finally 中清理。
+ */
+@Service
+public class LoginLogService {
+
+    private static final Logger log = LoggerFactory.getLogger(LoginLogService.class);
+
+    private final DataSaveService dataSaveService;
+    private final ClientInfoExtractor clientInfoExtractor;
+
+    public LoginLogService(DataSaveService dataSaveService, ClientInfoExtractor clientInfoExtractor) {
+        this.dataSaveService = dataSaveService;
+        this.clientInfoExtractor = clientInfoExtractor;
+    }
+
+    public void recordLogin(
+            String orgId,
+            String account,
+            Long userId,
+            boolean success,
+            String failReason,
+            String sessionId,
+            HttpServletRequest request
+    ) {
+        if (orgId == null || orgId.isBlank()) {
+            return;
+        }
+        try {
+            ClientInfo info = clientInfoExtractor.extract(request);
+
+            Map<String, Object> row = new LinkedHashMap<>();
+            row.put("b_id", IdGenerator.nextId());
+            row.put("b_org_id", orgId);
+            row.put("b_user_id", userId);
+            row.put("b_account", account);
+            row.put("b_login_time", Timestamp.valueOf(LocalDateTime.now()));
+            row.put("b_ip", info.ip());
+            row.put("b_ip_location", info.ipLocation());
+            row.put("b_browser", info.browser());
+            row.put("b_browser_version", info.browserVersion());
+            row.put("b_os", info.os());
+            row.put("b_os_version", info.osVersion());
+            row.put("b_device_type", info.deviceType());
+            row.put("b_user_agent", info.userAgent());
+            row.put("b_login_result", success ? 1 : 0);
+            row.put("b_fail_reason", failReason);
+            row.put("b_session_id", sessionId);
+
+            Map<String, Object> tableOp = new LinkedHashMap<>();
+            tableOp.put("table", "s_log_login");
+            tableOp.put("key_field", "b_id");
+            tableOp.put("inserts", List.of(row));
+
+            OrgContext.setOrgId(orgId);
+            try {
+                dataSaveService.save(List.of(tableOp));
+            } finally {
+                OrgContext.clear();
+            }
+        } catch (Exception e) {
+            log.error("写入登录日志失败 orgId={} account={}", orgId, account, e);
+        }
+    }
+}
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/ClientInfo.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/ClientInfo.java
new file mode 100644
index 00000000..c43ab2ea
--- /dev/null
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/ClientInfo.java
@@ -0,0 +1,15 @@
+package cn.g3soft.fmsapi.utils;
+
+/**
+ * 登录时采集到的客户端环境信息载体。
+ */
+public record ClientInfo(
+        String ip,
+        String ipLocation,
+        String browser,
+        String browserVersion,
+        String os,
+        String osVersion,
+        String deviceType,
+        String userAgent) {
+}
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/ClientInfoExtractor.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/ClientInfoExtractor.java
new file mode 100644
index 00000000..970b5337
--- /dev/null
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/ClientInfoExtractor.java
@@ -0,0 +1,110 @@
+package cn.g3soft.fmsapi.utils;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import ua_parser.Client;
+import ua_parser.Parser;
+
+/**
+ * 组合 IpUtils、IpRegionSearcher 与 uap-java，从 HttpServletRequest 提取客户端环境信息。
+ */
+@Component
+public class ClientInfoExtractor {
+
+    private static final Logger log = LoggerFactory.getLogger(ClientInfoExtractor.class);
+
+    private final IpRegionSearcher ipRegionSearcher;
+
+    // uap-java 的 Parser 加载一次正则表达式后即可安全复用（无状态、线程安全）
+    private final Parser uaParser = new Parser();
+
+    public ClientInfoExtractor(IpRegionSearcher ipRegionSearcher) {
+        this.ipRegionSearcher = ipRegionSearcher;
+    }
+
+    public ClientInfo extract(HttpServletRequest request) {
+        if (request == null) {
+            return new ClientInfo("unknown", "未知", "未知", "", "未知", "", "Unknown", null);
+        }
+        String ip = IpUtils.getClientIp(request);
+        String userAgent = request.getHeader("User-Agent");
+        String ipLocation = ipRegionSearcher.search(ip);
+
+        String browser = "未知";
+        String browserVersion = "";
+        String os = "未知";
+        String osVersion = "";
+        String deviceType = "Unknown";
+
+        if (userAgent != null && !userAgent.isBlank()) {
+            try {
+                Client client = uaParser.parse(userAgent);
+                if (client.userAgent != null) {
+                    browser = orDefault(client.userAgent.family, "未知");
+                    browserVersion = buildVersion(
+                            client.userAgent.major, client.userAgent.minor, client.userAgent.patch);
+                }
+                if (client.os != null) {
+                    os = orDefault(client.os.family, "未知");
+                    osVersion = buildVersion(client.os.major, client.os.minor, client.os.patch);
+                }
+                if (client.device != null) {
+                    deviceType = deriveDeviceType(client.device.family, userAgent);
+                }
+            } catch (Exception e) {
+                log.warn("User-Agent 解析失败: {}", userAgent, e);
+            }
+        }
+        return new ClientInfo(ip, ipLocation, browser, browserVersion, os, osVersion, deviceType, userAgent);
+    }
+
+    private static String buildVersion(String major, String minor, String patch) {
+        StringBuilder sb = new StringBuilder();
+        if (isNotBlank(major)) {
+            sb.append(major);
+        }
+        if (isNotBlank(minor)) {
+            sb.append('.').append(minor);
+        }
+        if (isNotBlank(patch)) {
+            sb.append('.').append(patch);
+        }
+        return sb.toString();
+    }
+
+    private static String deriveDeviceType(String deviceFamily, String userAgent) {
+        if (deviceFamily == null) {
+            return "Unknown";
+        }
+        String family = deviceFamily.toLowerCase();
+        if (family.contains("ipad") || family.contains("tablet") || family.contains("kindle")) {
+            return "Tablet";
+        }
+        if (family.contains("spider") || family.contains("bot") || family.contains("crawler")) {
+            return "Bot";
+        }
+        if (family.contains("iphone") || family.contains("android")
+                || family.contains("windows phone") || family.contains("phone")) {
+            return "Mobile";
+        }
+        // device.family 通常为 "Other"，再依据 UA 关键字推断
+        String ua = userAgent.toLowerCase();
+        if (ua.contains("mobile")) {
+            return "Mobile";
+        }
+        if (family.equals("other")) {
+            return "Desktop";
+        }
+        return "Desktop";
+    }
+
+    private static String orDefault(String value, String def) {
+        return (value == null || value.isBlank()) ? def : value;
+    }
+
+    private static boolean isNotBlank(String s) {
+        return s != null && !s.isBlank();
+    }
+}
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/IpRegionSearcher.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/IpRegionSearcher.java
new file mode 100644
index 00000000..6bf84b05
--- /dev/null
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/IpRegionSearcher.java
@@ -0,0 +1,114 @@
+package cn.g3soft.fmsapi.utils;
+
+import jakarta.annotation.PostConstruct;
+import org.lionsoul.ip2region.xdb.LongByteArray;
+import org.lionsoul.ip2region.xdb.Searcher;
+import org.lionsoul.ip2region.xdb.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * 基于本地 ip2region xdb 数据库的 IP 归属地查询。
+ * 启动时将 xdb 文件读入内存，避免每次查询的磁盘 IO。
+ */
+@Component
+public class IpRegionSearcher {
+
+    private static final Logger log = LoggerFactory.getLogger(IpRegionSearcher.class);
+
+    private Searcher searcher;
+
+    @PostConstruct
+    public void init() {
+        try (InputStream in = new ClassPathResource("ip2region.xdb").getInputStream()) {
+            byte[] bytes = in.readAllBytes();
+            LongByteArray buffer = new LongByteArray();
+            buffer.append(bytes);
+            searcher = Searcher.newWithBuffer(Version.IPv4, buffer);
+            log.info("ip2region Searcher 初始化完成，数据大小 {} 字节", bytes.length);
+        } catch (IOException e) {
+            log.error("未找到 classpath 下的 ip2region.xdb，IP 归属地将返回「未知」", e);
+            searcher = null;
+        } catch (Exception e) {
+            log.error("ip2region Searcher 初始化失败，IP 归属地将返回「未知」", e);
+            searcher = null;
+        }
+    }
+
+    /**
+     * 根据 IP 查询归属地，返回格式如 国家|省|市|运营商。
+     * 内网/保留地址直接返回「内网」；任何异常或数据缺失时返回「未知」，不影响主流程。
+     */
+    public String search(String ip) {
+        if (ip == null || ip.isBlank()) {
+            return "未知";
+        }
+        if (searcher == null) {
+            return "未知";
+        }
+        if (isInternalIp(ip)) {
+            return "内网";
+        }
+        try {
+            String region = searcher.search(ip);
+            return (region == null || region.isBlank()) ? "未知" : region;
+        } catch (Exception e) {
+            log.warn("ip2region 查询失败 ip={}", ip, e);
+            return "未知";
+        }
+    }
+
+    /**
+     * 判断是否为内网/保留地址（IPv4 RFC1918、回环、链路本地、未指定地址，以及 IPv6 回环/唯一本地地址）。
+     */
+    private static boolean isInternalIp(String ip) {
+        if (ip.contains(".")) {
+            String v4 = ip;
+            int colon = ip.lastIndexOf(':');
+            if (colon >= 0 && ip.substring(colon + 1).contains(".")) {
+                v4 = ip.substring(colon + 1);
+            }
+            String[] parts = v4.split("\\.");
+            if (parts.length != 4) {
+                return false;
+            }
+            int[] o = new int[4];
+            try {
+                for (int i = 0; i < 4; i++) {
+                    int n = Integer.parseUnsignedInt(parts[i]);
+                    if (n > 255) {
+                        return false;
+                    }
+                    o[i] = n;
+                }
+            } catch (NumberFormatException e) {
+                return false;
+            }
+            if (o[0] == 0) {
+                return true; // 0.0.0.0/8 未指定
+            }
+            if (o[0] == 10) {
+                return true; // 10.0.0.0/8
+            }
+            if (o[0] == 127) {
+                return true; // 127.0.0.0/8 回环
+            }
+            if (o[0] == 169 && o[1] == 254) {
+                return true; // 169.254.0.0/16 链路本地
+            }
+            if (o[0] == 172 && o[1] >= 16 && o[1] <= 31) {
+                return true; // 172.16.0.0/12
+            }
+            return o[0] == 192 && o[1] == 168; // 192.168.0.0/16
+        }
+        if (ip.equalsIgnoreCase("::1")) {
+            return true; // IPv6 回环
+        }
+        return ip.startsWith("fe80") || ip.startsWith("fc") || ip.startsWith("fd");
+    }
+}
diff --git a/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/IpUtils.java b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/IpUtils.java
new file mode 100644
index 00000000..d9200e2f
--- /dev/null
+++ b/code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/IpUtils.java
@@ -0,0 +1,51 @@
+package cn.g3soft.fmsapi.utils;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+/**
+ * 从 HttpServletRequest 中解析客户端真实 IP。
+ * 获取顺序兼容 Nginx 等反向代理：X-Real-IP → X-Forwarded-For(首个) → 远程地址。
+ */
+public final class IpUtils {
+
+    private static final String UNKNOWN = "unknown";
+
+    private IpUtils() {
+    }
+
+    public static String getClientIp(HttpServletRequest request) {
+        if (request == null) {
+            return UNKNOWN;
+        }
+        String ip = request.getHeader("X-Real-IP");
+        if (isEffective(ip)) {
+            return ip.trim();
+        }
+        ip = request.getHeader("X-Forwarded-For");
+        if (isEffective(ip)) {
+            // X-Forwarded-For 可能包含多个以逗号分隔的 IP，取第一个
+            return ip.split(",")[0].trim();
+        }
+        ip = request.getHeader("Proxy-Client-IP");
+        if (isEffective(ip)) {
+            return ip.trim();
+        }
+        ip = request.getHeader("WL-Proxy-Client-IP");
+        if (isEffective(ip)) {
+            return ip.trim();
+        }
+        ip = request.getRemoteAddr();
+        if (ip == null || ip.isBlank()) {
+            return UNKNOWN;
+        }
+        // 归一化 IPv6 本地回环地址
+        if ("0:0:0:0:0:0:0:1".equals(ip)) {
+            ip = "127.0.0.1";
+        }
+        return ip.trim();
+    }
+
+    private static boolean isEffective(String ip) {
+        return ip != null && !ip.isBlank() && !UNKNOWN.equalsIgnoreCase(ip.trim());
+    }
+}
diff --git a/code/fms/fms-api/src/test/java/cn/g3soft/fmsapi/service/AuthServiceTests.java b/code/fms/fms-api/src/test/java/cn/g3soft/fmsapi/service/AuthServiceTests.java
index b7bc5126..f72e4913 100644
--- a/code/fms/fms-api/src/test/java/cn/g3soft/fmsapi/service/AuthServiceTests.java
+++ b/code/fms/fms-api/src/test/java/cn/g3soft/fmsapi/service/AuthServiceTests.java
@@ -20,6 +20,7 @@ class AuthServiceTests {
     private DbUtils dbUtils;
     private JwtUtils jwtUtils;
     private ActiveSessionRegistry activeSessionRegistry;
+    private LoginLogService loginLogService;
     private AuthService authService;
 
     @BeforeEach
@@ -27,6 +28,7 @@ class AuthServiceTests {
         dbUtils = mock(DbUtils.class);
         jwtUtils = mock(JwtUtils.class);
         activeSessionRegistry = new ActiveSessionRegistry();
+        loginLogService = mock(LoginLogService.class);
         authService = new AuthService();
 
         ReflectionTestUtils.setField(authService, "dbUtils", dbUtils);
@@ -36,6 +38,7 @@ class AuthServiceTests {
                 "activeSessionRegistry",
                 activeSessionRegistry
         );
+        ReflectionTestUtils.setField(authService, "loginLogService", loginLogService);
     }
 
     @Test
@@ -56,7 +59,7 @@ class AuthServiceTests {
         ))
                 .thenReturn("token");
 
-        Optional<Map<String, Object>> result = authService.login("fms", "g3soft", "");
+        Optional<Map<String, Object>> result = authService.login("fms", "g3soft", "", null);
 
         assertThat(result).isPresent();
         assertThat(result.orElseThrow()).containsEntry("token", "token");
diff --git a/code/fms/fms-api/target/classes/application.yaml b/code/fms/fms-api/target/classes/application.yaml
new file mode 100644
index 00000000..7332141a
--- /dev/null
+++ b/code/fms/fms-api/target/classes/application.yaml
@@ -0,0 +1,26 @@
+server:
+  port: 8088
+  servlet:
+    context-path: /api
+
+spring:
+  application:
+    name: fms-api
+
+fms:
+  auth:
+    jwt-secret: "${FMS_JWT_SECRET:fms-api-development-jwt-secret-change-me}"
+    jwt-expiration: 24h
+  database:
+    config-dir: ./config/dbconfigs
+    pool:
+      initial-size: 0
+      min-idle: 0
+      max-active: 10
+      max-wait: 5000
+      validation-query: SELECT 1
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      time-between-eviction-runs: 60s
+      min-evictable-idle-time: 5m
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/FmsApiApplication.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/FmsApiApplication.class
new file mode 100644
index 00000000..7f750184
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/FmsApiApplication.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/AuthProperties.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/AuthProperties.class
new file mode 100644
index 00000000..2d89587f
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/AuthProperties.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/JacksonConfig.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/JacksonConfig.class
new file mode 100644
index 00000000..e5e23112
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/JacksonConfig.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/JwtAuthFilter.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/JwtAuthFilter.class
new file mode 100644
index 00000000..b7e4b8dd
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/config/JwtAuthFilter.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/controller/AuthController.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/controller/AuthController.class
new file mode 100644
index 00000000..bfe3d655
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/controller/AuthController.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/controller/DataController.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/controller/DataController.class
new file mode 100644
index 00000000..2549a36a
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/controller/DataController.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgContext.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgContext.class
new file mode 100644
index 00000000..a1bb1e95
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgContext.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDataSourceFactory.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDataSourceFactory.class
new file mode 100644
index 00000000..6a1a3145
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDataSourceFactory.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDataSourceManager.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDataSourceManager.class
new file mode 100644
index 00000000..51d6801d
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDataSourceManager.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseConfig.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseConfig.class
new file mode 100644
index 00000000..fd2ff24a
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseConfig.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseConfigLoader.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseConfigLoader.class
new file mode 100644
index 00000000..2320bf09
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseConfigLoader.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseProperties$Pool.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseProperties$Pool.class
new file mode 100644
index 00000000..d4906bf6
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseProperties$Pool.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseProperties.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseProperties.class
new file mode 100644
index 00000000..1ee3ab4a
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgDatabaseProperties.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgRoutingDataSource.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgRoutingDataSource.class
new file mode 100644
index 00000000..9cca0be2
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/database/OrgRoutingDataSource.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/AuthenticationException.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/AuthenticationException.class
new file mode 100644
index 00000000..d0cbca6f
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/AuthenticationException.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/BusinessException.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/BusinessException.class
new file mode 100644
index 00000000..35cee485
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/BusinessException.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/GlobalExceptionHandler.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/GlobalExceptionHandler.class
new file mode 100644
index 00000000..9a3f9b87
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/GlobalExceptionHandler.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/SaveObjectException.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/SaveObjectException.class
new file mode 100644
index 00000000..b5450773
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/exception/SaveObjectException.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/ActiveSessionRegistry$AccountKey.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/ActiveSessionRegistry$AccountKey.class
new file mode 100644
index 00000000..f4b1bd6e
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/ActiveSessionRegistry$AccountKey.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/ActiveSessionRegistry.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/ActiveSessionRegistry.class
new file mode 100644
index 00000000..cb3d9d9c
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/ActiveSessionRegistry.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/AuthService.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/AuthService.class
new file mode 100644
index 00000000..a37ff97e
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/AuthService.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/DataSaveService.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/DataSaveService.class
new file mode 100644
index 00000000..e2aeae78
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/DataSaveService.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/DataService.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/DataService.class
new file mode 100644
index 00000000..b0862058
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/DataService.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/LoginLogService.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/LoginLogService.class
new file mode 100644
index 00000000..f0513ed5
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/service/LoginLogService.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ApiResponse.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ApiResponse.class
new file mode 100644
index 00000000..25ded8ee
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ApiResponse.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ClientInfo.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ClientInfo.class
new file mode 100644
index 00000000..b3c53153
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ClientInfo.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ClientInfoExtractor.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ClientInfoExtractor.class
new file mode 100644
index 00000000..1bf8ecd3
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ClientInfoExtractor.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$ColumnMetadata.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$ColumnMetadata.class
new file mode 100644
index 00000000..4ddb503d
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$ColumnMetadata.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$PageResult.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$PageResult.class
new file mode 100644
index 00000000..077732ba
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$PageResult.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$TableMetadata.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$TableMetadata.class
new file mode 100644
index 00000000..93902b00
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils$TableMetadata.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils.class
new file mode 100644
index 00000000..672a5aea
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/DbUtils.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/IpRegionSearcher.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/IpRegionSearcher.class
new file mode 100644
index 00000000..e1bc47f1
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/IpRegionSearcher.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/IpUtils.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/IpUtils.class
new file mode 100644
index 00000000..24f01248
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/IpUtils.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/JwtUtils$TokenClaims.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/JwtUtils$TokenClaims.class
new file mode 100644
index 00000000..8bbb1a64
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/JwtUtils$TokenClaims.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/JwtUtils.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/JwtUtils.class
new file mode 100644
index 00000000..4d562bce
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/JwtUtils.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ParamUtils.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ParamUtils.class
new file mode 100644
index 00000000..5dfa41b1
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/ParamUtils.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/StringUtils.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/StringUtils.class
new file mode 100644
index 00000000..b714f650
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/StringUtils.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IIdGenerator.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IIdGenerator.class
new file mode 100644
index 00000000..9dbc55d9
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IIdGenerator.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/ISnowWorker.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/ISnowWorker.class
new file mode 100644
index 00000000..20955c2b
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/ISnowWorker.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IdGeneratorException.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IdGeneratorException.class
new file mode 100644
index 00000000..e4b2e1fa
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IdGeneratorException.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IdGeneratorOptions.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IdGeneratorOptions.class
new file mode 100644
index 00000000..197e3549
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/IdGeneratorOptions.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/OverCostActionArg.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/OverCostActionArg.class
new file mode 100644
index 00000000..31ca95dc
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/contract/OverCostActionArg.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/core/SnowWorkerM1.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/core/SnowWorkerM1.class
new file mode 100644
index 00000000..dbee6c3e
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/core/SnowWorkerM1.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/core/SnowWorkerM2.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/core/SnowWorkerM2.class
new file mode 100644
index 00000000..714faaf0
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/core/SnowWorkerM2.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/idgen/DefaultIdGenerator.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/idgen/DefaultIdGenerator.class
new file mode 100644
index 00000000..ae477a85
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/idgen/DefaultIdGenerator.class differ
diff --git a/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/idgen/IdGenerator.class b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/idgen/IdGenerator.class
new file mode 100644
index 00000000..462d228b
Binary files /dev/null and b/code/fms/fms-api/target/classes/cn/g3soft/fmsapi/utils/snowflake/idgen/IdGenerator.class differ
diff --git a/code/fms/fms-api/target/classes/ip2region.xdb b/code/fms/fms-api/target/classes/ip2region.xdb
new file mode 100644
index 00000000..0e75dc87
Binary files /dev/null and b/code/fms/fms-api/target/classes/ip2region.xdb differ
diff --git a/code/fms/fms-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 00000000..11a14414
--- /dev/null
+++ b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,44 @@
+cn\g3soft\fmsapi\utils\ParamUtils.class
+cn\g3soft\fmsapi\utils\JwtUtils.class
+cn\g3soft\fmsapi\database\OrgDataSourceFactory.class
+cn\g3soft\fmsapi\database\OrgContext.class
+cn\g3soft\fmsapi\database\OrgDatabaseProperties$Pool.class
+cn\g3soft\fmsapi\FmsApiApplication.class
+cn\g3soft\fmsapi\utils\DbUtils$TableMetadata.class
+cn\g3soft\fmsapi\utils\snowflake\idgen\IdGenerator.class
+cn\g3soft\fmsapi\utils\JwtUtils$TokenClaims.class
+cn\g3soft\fmsapi\utils\IpRegionSearcher.class
+cn\g3soft\fmsapi\exception\GlobalExceptionHandler.class
+cn\g3soft\fmsapi\service\ActiveSessionRegistry.class
+cn\g3soft\fmsapi\service\DataSaveService.class
+cn\g3soft\fmsapi\service\DataService.class
+cn\g3soft\fmsapi\utils\snowflake\contract\IdGeneratorOptions.class
+cn\g3soft\fmsapi\config\JwtAuthFilter.class
+cn\g3soft\fmsapi\utils\DbUtils$ColumnMetadata.class
+cn\g3soft\fmsapi\utils\snowflake\core\SnowWorkerM1.class
+cn\g3soft\fmsapi\database\OrgDataSourceManager.class
+cn\g3soft\fmsapi\controller\AuthController.class
+cn\g3soft\fmsapi\utils\ClientInfo.class
+cn\g3soft\fmsapi\utils\snowflake\contract\IIdGenerator.class
+cn\g3soft\fmsapi\utils\snowflake\contract\ISnowWorker.class
+cn\g3soft\fmsapi\utils\snowflake\contract\OverCostActionArg.class
+cn\g3soft\fmsapi\utils\snowflake\idgen\DefaultIdGenerator.class
+cn\g3soft\fmsapi\utils\IpUtils.class
+cn\g3soft\fmsapi\utils\StringUtils.class
+cn\g3soft\fmsapi\utils\DbUtils.class
+cn\g3soft\fmsapi\controller\DataController.class
+cn\g3soft\fmsapi\database\OrgDatabaseConfigLoader.class
+cn\g3soft\fmsapi\exception\SaveObjectException.class
+cn\g3soft\fmsapi\service\AuthService.class
+cn\g3soft\fmsapi\config\AuthProperties.class
+cn\g3soft\fmsapi\database\OrgDatabaseConfig.class
+cn\g3soft\fmsapi\database\OrgRoutingDataSource.class
+cn\g3soft\fmsapi\exception\BusinessException.class
+cn\g3soft\fmsapi\utils\ApiResponse.class
+cn\g3soft\fmsapi\utils\snowflake\core\SnowWorkerM2.class
+cn\g3soft\fmsapi\service\ActiveSessionRegistry$AccountKey.class
+cn\g3soft\fmsapi\utils\DbUtils$PageResult.class
+cn\g3soft\fmsapi\config\JacksonConfig.class
+cn\g3soft\fmsapi\utils\snowflake\contract\IdGeneratorException.class
+cn\g3soft\fmsapi\exception\AuthenticationException.class
+cn\g3soft\fmsapi\database\OrgDatabaseProperties.class
diff --git a/code/fms/fms-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 00000000..84bcbdec
--- /dev/null
+++ b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,40 @@
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\config\AuthProperties.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\config\JacksonConfig.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\config\JwtAuthFilter.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\controller\AuthController.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\controller\DataController.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgContext.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgDatabaseConfig.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgDatabaseConfigLoader.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgDatabaseProperties.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgDataSourceFactory.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgDataSourceManager.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\database\OrgRoutingDataSource.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\exception\AuthenticationException.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\exception\BusinessException.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\exception\GlobalExceptionHandler.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\exception\SaveObjectException.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\FmsApiApplication.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\service\ActiveSessionRegistry.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\service\AuthService.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\service\DataSaveService.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\service\DataService.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\service\LoginLogService.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\ApiResponse.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\ClientInfo.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\ClientInfoExtractor.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\DbUtils.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\IpRegionSearcher.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\IpUtils.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\JwtUtils.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\ParamUtils.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\contract\IdGeneratorException.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\contract\IdGeneratorOptions.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\contract\IIdGenerator.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\contract\ISnowWorker.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\contract\OverCostActionArg.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\core\SnowWorkerM1.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\core\SnowWorkerM2.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\idgen\DefaultIdGenerator.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\snowflake\idgen\IdGenerator.java
+D:\workspace\code\fms\fms-api\src\main\java\cn\g3soft\fmsapi\utils\StringUtils.java
diff --git a/code/fms/fms-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
new file mode 100644
index 00000000..f9719b48
--- /dev/null
+++ b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -0,0 +1,9 @@
+cn\g3soft\fmsapi\database\OrgDatabaseConfigLoaderTests.class
+cn\g3soft\fmsapi\database\OrgDataSourceFactoryTests.class
+cn\g3soft\fmsapi\service\AuthServiceTests.class
+cn\g3soft\fmsapi\utils\JwtUtilsTests.class
+cn\g3soft\fmsapi\exception\GlobalExceptionHandlerTests.class
+cn\g3soft\fmsapi\FmsApiApplicationTests.class
+cn\g3soft\fmsapi\service\DataSaveServiceTests$JdbcFixture.class
+cn\g3soft\fmsapi\service\ActiveSessionRegistryTests.class
+cn\g3soft\fmsapi\service\DataSaveServiceTests.class
diff --git a/code/fms/fms-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 00000000..98c8e119
--- /dev/null
+++ b/code/fms/fms-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -0,0 +1,8 @@
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\database\OrgDatabaseConfigLoaderTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\database\OrgDataSourceFactoryTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\exception\GlobalExceptionHandlerTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\FmsApiApplicationTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\service\ActiveSessionRegistryTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\service\AuthServiceTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\service\DataSaveServiceTests.java
+D:\workspace\code\fms\fms-api\src\test\java\cn\g3soft\fmsapi\utils\JwtUtilsTests.java
diff --git a/code/fms/fms-api/target/surefire-reports/2026-07-22T21-37-44_042.dumpstream b/code/fms/fms-api/target/surefire-reports/2026-07-22T21-37-44_042.dumpstream
new file mode 100644
index 00000000..60851bfb
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/2026-07-22T21-37-44_042.dumpstream
@@ -0,0 +1,5 @@
+# Created at 2026-07-22T21:37:44.167
+Boot Manifest-JAR contains absolute paths in classpath 'D:\workspace\code\fms\fms-api\target\test-classes'
+Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+'other' has different root
+
diff --git a/code/fms/fms-api/target/surefire-reports/2026-07-26T13-34-26_231.dumpstream b/code/fms/fms-api/target/surefire-reports/2026-07-26T13-34-26_231.dumpstream
new file mode 100644
index 00000000..805faea7
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/2026-07-26T13-34-26_231.dumpstream
@@ -0,0 +1,5 @@
+# Created at 2026-07-26T13:34:26.389
+Boot Manifest-JAR contains absolute paths in classpath 'D:\workspace\code\fms\fms-api\target\test-classes'
+Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+'other' has different root
+
diff --git a/code/fms/fms-api/target/surefire-reports/2026-07-26T13-52-25_206.dumpstream b/code/fms/fms-api/target/surefire-reports/2026-07-26T13-52-25_206.dumpstream
new file mode 100644
index 00000000..a5d7976c
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/2026-07-26T13-52-25_206.dumpstream
@@ -0,0 +1,5 @@
+# Created at 2026-07-26T13:52:25.410
+Boot Manifest-JAR contains absolute paths in classpath 'D:\workspace\code\fms\fms-api\target\test-classes'
+Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+'other' has different root
+
diff --git a/code/fms/fms-api/target/surefire-reports/2026-07-26T13-55-36_579.dumpstream b/code/fms/fms-api/target/surefire-reports/2026-07-26T13-55-36_579.dumpstream
new file mode 100644
index 00000000..376e6ac6
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/2026-07-26T13-55-36_579.dumpstream
@@ -0,0 +1,5 @@
+# Created at 2026-07-26T13:55:36.766
+Boot Manifest-JAR contains absolute paths in classpath 'D:\workspace\code\fms\fms-api\target\test-classes'
+Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+'other' has different root
+
diff --git a/code/fms/fms-api/target/surefire-reports/2026-07-26T21-40-45_527.dumpstream b/code/fms/fms-api/target/surefire-reports/2026-07-26T21-40-45_527.dumpstream
new file mode 100644
index 00000000..daf30b5b
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/2026-07-26T21-40-45_527.dumpstream
@@ -0,0 +1,5 @@
+# Created at 2026-07-26T21:40:45.645
+Boot Manifest-JAR contains absolute paths in classpath 'D:\workspace\code\fms\fms-api\target\test-classes'
+Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+'other' has different root
+
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.FmsApiApplicationTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.FmsApiApplicationTests.xml
new file mode 100644
index 00000000..12b73923
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.FmsApiApplicationTests.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.FmsApiApplicationTests" time="1.861" tests="1" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="APPLICATION_NAME" value="fms-api"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="FILE_LOG_CHARSET" value="UTF-8"/>
+    <property name="java.awt.headless" value="true"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="PID" value="5600"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="CONSOLE_LOG_CHARSET" value="UTF-8"/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+    <property name="LOGGED_APPLICATION_NAME" value="[fms-api] "/>
+  </properties>
+  <testcase name="contextLoads" classname="cn.g3soft.fmsapi.FmsApiApplicationTests" time="0.364">
+    <system-out><![CDATA[21:40:46.503 [main] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils -- Could not detect default configuration classes for test class [cn.g3soft.fmsapi.FmsApiApplicationTests]: FmsApiApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration.
+21:40:46.557 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper -- Found @SpringBootConfiguration cn.g3soft.fmsapi.FmsApiApplication for test class cn.g3soft.fmsapi.FmsApiApplicationTests
+21:40:46.609 [main] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils -- Could not detect default configuration classes for test class [cn.g3soft.fmsapi.FmsApiApplicationTests]: FmsApiApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration.
+21:40:46.610 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper -- Found @SpringBootConfiguration cn.g3soft.fmsapi.FmsApiApplication for test class cn.g3soft.fmsapi.FmsApiApplicationTests
+21:40:46.643 [main] INFO org.springframework.boot.devtools.restart.RestartApplicationListener -- Restart disabled due to context in which it is running
+
+  .   ____          _            __ _ _
+ /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
+( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
+ \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
+  '  |____| .__|_| |_|_| |_\__, | / / / /
+ =========|_|==============|___/=/_/_/_/
+
+ :: Spring Boot ::                (v4.1.0)
+
+2026-07-26T21:40:46.821+08:00  INFO 5600 --- [fms-api] [           main] c.g3soft.fmsapi.FmsApiApplicationTests   : Starting FmsApiApplicationTests using Java 21.0.11 with PID 5600 (started by admin in D:\workspace\code\fms\fms-api)
+2026-07-26T21:40:46.822+08:00  INFO 5600 --- [fms-api] [           main] c.g3soft.fmsapi.FmsApiApplicationTests   : No active profile set, falling back to 1 default profile: "default"
+2026-07-26T21:40:47.537+08:00  INFO 5600 --- [fms-api] [           main] c.g3soft.fmsapi.utils.IpRegionSearcher   : ip2region Searcher 初始化完成，数据大小 11114380 字节
+2026-07-26T21:40:47.951+08:00  INFO 5600 --- [fms-api] [           main] c.g3soft.fmsapi.FmsApiApplicationTests   : Started FmsApiApplicationTests in 1.314 seconds (process running for 2.253)
+]]></system-out>
+    <system-err><![CDATA[Mockito is currently self-attaching to enable the inline-mock-maker. This will no longer work in future releases of the JDK. Please add Mockito as an agent to your build as described in Mockito's documentation: https://javadoc.io/doc/org.mockito/mockito-core/latest/org.mockito/org/mockito/Mockito.html#0.3
+WARNING: A Java agent has been loaded dynamically (C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar)
+WARNING: If a serviceability tool is in use, please run with -XX:+EnableDynamicAgentLoading to hide this warning
+WARNING: If a serviceability tool is not in use, please run with -Djdk.instrument.traceUsage for more information
+WARNING: Dynamic loading of agents will be disallowed by default in a future release
+]]></system-err>
+  </testcase>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests.xml
new file mode 100644
index 00000000..e7fc76fb
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests" time="0.185" tests="1" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+  </properties>
+  <testcase name="databaseConnectionFailureDoesNotRetry" classname="cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests" time="0.185">
+    <system-out><![CDATA[21:40:46.409 [main] INFO com.alibaba.druid.pool.DruidDataSource -- {dataSource-1,TEST} inited
+21:40:46.439 [main] INFO com.alibaba.druid.pool.DruidDataSource -- {dataSource-1} closing ...
+21:40:46.440 [main] INFO com.alibaba.druid.pool.DruidDataSource -- {dataSource-1} closed
+]]></system-out>
+  </testcase>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests.xml
new file mode 100644
index 00000000..70db6346
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests" time="0.148" tests="1" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+  </properties>
+  <testcase name="missingConfigFileIsReportedAsInvalidOrgId" classname="cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests" time="0.139"/>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.xml
new file mode 100644
index 00000000..b0878ad6
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests" time="0.018" tests="2" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+  </properties>
+  <testcase name="databaseExceptionReturnsSystemError" classname="cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests" time="0.012">
+    <system-out><![CDATA[21:40:46.451 [main] ERROR cn.g3soft.fmsapi.exception.GlobalExceptionHandler -- 系统异常，method=POST，uri=/api/auth/login
+java.sql.SQLException: connection failed
+	at cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.databaseExceptionReturnsSystemError(GlobalExceptionHandlerTests.java:19)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:701)
+	at org.junit.platform.commons.support.ReflectionSupport.invokeMethod(ReflectionSupport.java:502)
+	at org.junit.jupiter.engine.support.MethodReflectionUtils.invoke(MethodReflectionUtils.java:45)
+	at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:61)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:124)
+	at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:163)
+	at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:148)
+	at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:86)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(InterceptingExecutableInvoker.java:123)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.lambda$invoke$0(InterceptingExecutableInvoker.java:105)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:99)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:66)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:47)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:39)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:104)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:98)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invokeVoid(InterceptingExecutableInvoker.java:71)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$0(TestMethodTestDescriptor.java:219)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:215)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:157)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:70)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$2(NodeTestTask.java:176)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$1(NodeTestTask.java:166)
+	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:138)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$0(NodeTestTask.java:164)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:163)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:116)
+	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
+	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:42)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$2(NodeTestTask.java:180)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$1(NodeTestTask.java:166)
+	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:138)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$0(NodeTestTask.java:164)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:163)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:116)
+	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
+	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:42)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$2(NodeTestTask.java:180)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$1(NodeTestTask.java:166)
+	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:138)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$0(NodeTestTask.java:164)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:163)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:116)
+	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:36)
+	at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:52)
+	at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:58)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.executeEngine(EngineExecutionOrchestrator.java:246)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.failOrExecuteEngine(EngineExecutionOrchestrator.java:218)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:179)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:108)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:66)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:157)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:65)
+	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:125)
+	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:114)
+	at org.junit.platform.launcher.core.DelegatingLauncher.execute(DelegatingLauncher.java:58)
+	at org.junit.platform.launcher.core.InterceptingLauncher.lambda$execute$2(InterceptingLauncher.java:57)
+	at org.junit.platform.launcher.core.ClasspathAlignmentCheckingLauncherInterceptor.intercept(ClasspathAlignmentCheckingLauncherInterceptor.java:25)
+	at org.junit.platform.launcher.core.InterceptingLauncher.execute(InterceptingLauncher.java:56)
+	at org.junit.platform.launcher.core.DelegatingLauncher.execute(DelegatingLauncher.java:58)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:125)
+	at org.apache.maven.surefire.junitplatform.LauncherAdapter.executeWithCancellationToken(LauncherAdapter.java:68)
+	at org.apache.maven.surefire.junitplatform.LauncherAdapter.execute(LauncherAdapter.java:54)
+	at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.execute(JUnitPlatformProvider.java:203)
+	at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invokeAllTests(JUnitPlatformProvider.java:168)
+	at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invoke(JUnitPlatformProvider.java:136)
+	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:385)
+	at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:162)
+	at org.apache.maven.surefire.booter.ForkedBooter.run(ForkedBooter.java:507)
+	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495)
+]]></system-out>
+  </testcase>
+  <testcase name="saveExceptionReturnsOperationLocation" classname="cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests" time="0.004">
+    <system-out><![CDATA[21:40:46.455 [main] ERROR cn.g3soft.fmsapi.exception.GlobalExceptionHandler -- 保存失败，table=bs_business，action=update，index=2
+cn.g3soft.fmsapi.exception.SaveObjectException: 保存失败
+	at cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.saveExceptionReturnsOperationLocation(GlobalExceptionHandlerTests.java:32)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:701)
+	at org.junit.platform.commons.support.ReflectionSupport.invokeMethod(ReflectionSupport.java:502)
+	at org.junit.jupiter.engine.support.MethodReflectionUtils.invoke(MethodReflectionUtils.java:45)
+	at org.junit.jupiter.engine.execution.MethodInvocation.proceed(MethodInvocation.java:61)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain$ValidatingInvocation.proceed(InvocationInterceptorChain.java:124)
+	at org.junit.jupiter.engine.extension.TimeoutExtension.intercept(TimeoutExtension.java:163)
+	at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestableMethod(TimeoutExtension.java:148)
+	at org.junit.jupiter.engine.extension.TimeoutExtension.interceptTestMethod(TimeoutExtension.java:86)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall.lambda$ofVoidMethod$0(InterceptingExecutableInvoker.java:123)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.lambda$invoke$0(InterceptingExecutableInvoker.java:105)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain$InterceptedInvocation.proceed(InvocationInterceptorChain.java:99)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.proceed(InvocationInterceptorChain.java:66)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.chainAndInvoke(InvocationInterceptorChain.java:47)
+	at org.junit.jupiter.engine.execution.InvocationInterceptorChain.invoke(InvocationInterceptorChain.java:39)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:104)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invoke(InterceptingExecutableInvoker.java:98)
+	at org.junit.jupiter.engine.execution.InterceptingExecutableInvoker.invokeVoid(InterceptingExecutableInvoker.java:71)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.lambda$invokeTestMethod$0(TestMethodTestDescriptor.java:219)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.invokeTestMethod(TestMethodTestDescriptor.java:215)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:157)
+	at org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor.execute(TestMethodTestDescriptor.java:70)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$2(NodeTestTask.java:176)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$1(NodeTestTask.java:166)
+	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:138)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$0(NodeTestTask.java:164)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:163)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:116)
+	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
+	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:42)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$2(NodeTestTask.java:180)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$1(NodeTestTask.java:166)
+	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:138)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$0(NodeTestTask.java:164)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:163)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:116)
+	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
+	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.invokeAll(SameThreadHierarchicalTestExecutorService.java:42)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$2(NodeTestTask.java:180)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$1(NodeTestTask.java:166)
+	at org.junit.platform.engine.support.hierarchical.Node.around(Node.java:138)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.lambda$executeRecursively$0(NodeTestTask.java:164)
+	at org.junit.platform.engine.support.hierarchical.ThrowableCollector.execute(ThrowableCollector.java:74)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.executeRecursively(NodeTestTask.java:163)
+	at org.junit.platform.engine.support.hierarchical.NodeTestTask.execute(NodeTestTask.java:116)
+	at org.junit.platform.engine.support.hierarchical.SameThreadHierarchicalTestExecutorService.submit(SameThreadHierarchicalTestExecutorService.java:36)
+	at org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutor.execute(HierarchicalTestExecutor.java:52)
+	at org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine.execute(HierarchicalTestEngine.java:58)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.executeEngine(EngineExecutionOrchestrator.java:246)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.failOrExecuteEngine(EngineExecutionOrchestrator.java:218)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:179)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:108)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.lambda$execute$0(EngineExecutionOrchestrator.java:66)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.withInterceptedStreams(EngineExecutionOrchestrator.java:157)
+	at org.junit.platform.launcher.core.EngineExecutionOrchestrator.execute(EngineExecutionOrchestrator.java:65)
+	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:125)
+	at org.junit.platform.launcher.core.DefaultLauncher.execute(DefaultLauncher.java:114)
+	at org.junit.platform.launcher.core.DelegatingLauncher.execute(DelegatingLauncher.java:58)
+	at org.junit.platform.launcher.core.InterceptingLauncher.lambda$execute$2(InterceptingLauncher.java:57)
+	at org.junit.platform.launcher.core.ClasspathAlignmentCheckingLauncherInterceptor.intercept(ClasspathAlignmentCheckingLauncherInterceptor.java:25)
+	at org.junit.platform.launcher.core.InterceptingLauncher.execute(InterceptingLauncher.java:56)
+	at org.junit.platform.launcher.core.DelegatingLauncher.execute(DelegatingLauncher.java:58)
+	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
+	at org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:125)
+	at org.apache.maven.surefire.junitplatform.LauncherAdapter.executeWithCancellationToken(LauncherAdapter.java:68)
+	at org.apache.maven.surefire.junitplatform.LauncherAdapter.execute(LauncherAdapter.java:54)
+	at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.execute(JUnitPlatformProvider.java:203)
+	at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invokeAllTests(JUnitPlatformProvider.java:168)
+	at org.apache.maven.surefire.junitplatform.JUnitPlatformProvider.invoke(JUnitPlatformProvider.java:136)
+	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:385)
+	at org.apache.maven.surefire.booter.ForkedBooter.execute(ForkedBooter.java:162)
+	at org.apache.maven.surefire.booter.ForkedBooter.run(ForkedBooter.java:507)
+	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:495)
+Caused by: java.sql.SQLException: update failed
+	... 82 common frames omitted
+]]></system-out>
+  </testcase>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.ActiveSessionRegistryTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.ActiveSessionRegistryTests.xml
new file mode 100644
index 00000000..e7102e0a
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.ActiveSessionRegistryTests.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.service.ActiveSessionRegistryTests" time="0.002" tests="2" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="APPLICATION_NAME" value="fms-api"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="FILE_LOG_CHARSET" value="UTF-8"/>
+    <property name="java.awt.headless" value="true"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="PID" value="5600"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="CONSOLE_LOG_CHARSET" value="UTF-8"/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+    <property name="LOGGED_APPLICATION_NAME" value="[fms-api] "/>
+  </properties>
+  <testcase name="newerLoginReplacesPreviousSessionForSameAccount" classname="cn.g3soft.fmsapi.service.ActiveSessionRegistryTests" time="0.001"/>
+  <testcase name="sameUserIdInDifferentOrganizationsHasIndependentSessions" classname="cn.g3soft.fmsapi.service.ActiveSessionRegistryTests" time="0.0"/>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.AuthServiceTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.AuthServiceTests.xml
new file mode 100644
index 00000000..3071355f
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.AuthServiceTests.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.service.AuthServiceTests" time="0.218" tests="1" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="APPLICATION_NAME" value="fms-api"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="FILE_LOG_CHARSET" value="UTF-8"/>
+    <property name="java.awt.headless" value="true"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="PID" value="5600"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="CONSOLE_LOG_CHARSET" value="UTF-8"/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+    <property name="LOGGED_APPLICATION_NAME" value="[fms-api] "/>
+  </properties>
+  <testcase name="hiddenSuperAdministratorCanLoginWithEmptyPassword" classname="cn.g3soft.fmsapi.service.AuthServiceTests" time="0.216"/>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.DataSaveServiceTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.DataSaveServiceTests.xml
new file mode 100644
index 00000000..93dbd051
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.service.DataSaveServiceTests.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.service.DataSaveServiceTests" time="0.453" tests="2" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="APPLICATION_NAME" value="fms-api"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="FILE_LOG_CHARSET" value="UTF-8"/>
+    <property name="java.awt.headless" value="true"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="PID" value="5600"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="CONSOLE_LOG_CHARSET" value="UTF-8"/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+    <property name="LOGGED_APPLICATION_NAME" value="[fms-api] "/>
+  </properties>
+  <testcase name="savesDirectArrayInOneTransactionAndKeepsEmptyString" classname="cn.g3soft.fmsapi.service.DataSaveServiceTests" time="0.435"/>
+  <testcase name="sqlFailureRollsBackAndReportsOperationLocation" classname="cn.g3soft.fmsapi.service.DataSaveServiceTests" time="0.016"/>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.utils.JwtUtilsTests.xml b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.utils.JwtUtilsTests.xml
new file mode 100644
index 00000000..217346e1
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/TEST-cn.g3soft.fmsapi.utils.JwtUtilsTests.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="cn.g3soft.fmsapi.utils.JwtUtilsTests" time="0.098" tests="1" errors="0" skipped="0" failures="0" flakes="0">
+  <properties>
+    <property name="java.specification.version" value="21"/>
+    <property name="sun.cpu.isalist" value="amd64"/>
+    <property name="sun.jnu.encoding" value="GBK"/>
+    <property name="java.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="java.vm.vendor" value="Eclipse Adoptium"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="user.variant" value=""/>
+    <property name="java.vendor.url" value="https://adoptium.net/"/>
+    <property name="user.timezone" value="Asia/Shanghai"/>
+    <property name="os.name" value="Windows 11"/>
+    <property name="java.vm.specification.version" value="21"/>
+    <property name="APPLICATION_NAME" value="fms-api"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="user.country" value="CN"/>
+    <property name="sun.boot.library.path" value="D:\devtool\jdk\jdk21\bin"/>
+    <property name="sun.java.command" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782 2026-07-26T21-40-45_527-jvmRun1 surefire-20260726214045610_1tmp surefire_0-20260726214045610_2tmp"/>
+    <property name="jdk.debug" value="release"/>
+    <property name="surefire.test.class.path" value="D:\workspace\code\fms\fms-api\target\test-classes;D:\workspace\code\fms\fms-api\target\classes;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc\4.1.0\spring-boot-starter-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter\4.1.0\spring-boot-starter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-logging\4.1.0\spring-boot-starter-logging-4.1.0.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-classic\1.5.34\logback-classic-1.5.34.jar;C:\Users\admin\.m2\repository\ch\qos\logback\logback-core\1.5.34\logback-core-1.5.34.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.25.4\log4j-to-slf4j-2.25.4.jar;C:\Users\admin\.m2\repository\org\apache\logging\log4j\log4j-api\2.25.4\log4j-api-2.25.4.jar;C:\Users\admin\.m2\repository\org\slf4j\jul-to-slf4j\2.0.18\jul-to-slf4j-2.0.18.jar;C:\Users\admin\.m2\repository\jakarta\annotation\jakarta.annotation-api\3.0.0\jakarta.annotation-api-3.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson\4.1.0\spring-boot-starter-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jackson\4.1.0\spring-boot-jackson-4.1.0.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-databind\3.1.4\jackson-databind-3.1.4.jar;C:\Users\admin\.m2\repository\tools\jackson\core\jackson-core\3.1.4\jackson-core-3.1.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\4.1.0\spring-boot-starter-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat-runtime\4.1.0\spring-boot-starter-tomcat-runtime-4.1.0.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\11.0.22\tomcat-embed-core-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\11.0.22\tomcat-embed-el-11.0.22.jar;C:\Users\admin\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\11.0.22\tomcat-embed-websocket-11.0.22.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-tomcat\4.1.0\spring-boot-tomcat-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-http-converter\4.1.0\spring-boot-http-converter-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-web\7.0.8\spring-web-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-beans\7.0.8\spring-beans-7.0.8.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-observation\1.17.0\micrometer-observation-1.17.0.jar;C:\Users\admin\.m2\repository\io\micrometer\micrometer-commons\1.17.0\micrometer-commons-1.17.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc\4.1.0\spring-boot-webmvc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-servlet\4.1.0\spring-boot-servlet-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-webmvc\7.0.8\spring-webmvc-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-aop\7.0.8\spring-aop-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-expression\7.0.8\spring-expression-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\4.1.0\spring-boot-starter-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-jdbc\4.1.0\spring-boot-jdbc-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-sql\4.1.0\spring-boot-sql-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-transaction\4.1.0\spring-boot-transaction-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-persistence\4.1.0\spring-boot-persistence-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-tx\7.0.8\spring-tx-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\spring-jdbc\7.0.8\spring-jdbc-7.0.8.jar;C:\Users\admin\.m2\repository\com\zaxxer\HikariCP\7.0.2\HikariCP-7.0.2.jar;C:\Users\admin\.m2\repository\org\slf4j\slf4j-api\2.0.18\slf4j-api-2.0.18.jar;C:\Users\admin\.m2\repository\com\alibaba\druid\1.2.18\druid-1.2.18.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-api\0.12.6\jjwt-api-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-impl\0.12.6\jjwt-impl-0.12.6.jar;C:\Users\admin\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.12.6\jjwt-jackson-0.12.6.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.21.4\jackson-databind-2.21.4.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.21\jackson-annotations-2.21.jar;C:\Users\admin\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.21.4\jackson-core-2.21.4.jar;C:\Users\admin\.m2\repository\org\lionsoul\ip2region\3.3.7\ip2region-3.3.7.jar;C:\Users\admin\.m2\repository\com\github\ua-parser\uap-java\1.6.1\uap-java-1.6.1.jar;C:\Users\admin\.m2\repository\org\yaml\snakeyaml\2.6\snakeyaml-2.6.jar;C:\Users\admin\.m2\repository\org\apache\commons\commons-collections4\4.4\commons-collections4-4.4.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-devtools\4.1.0\spring-boot-devtools-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot\4.1.0\spring-boot-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-core\7.0.8\spring-core-7.0.8.jar;C:\Users\admin\.m2\repository\commons-logging\commons-logging\1.3.6\commons-logging-1.3.6.jar;C:\Users\admin\.m2\repository\org\jspecify\jspecify\1.0.0\jspecify-1.0.0.jar;C:\Users\admin\.m2\repository\org\springframework\spring-context\7.0.8\spring-context-7.0.8.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\4.1.0\spring-boot-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\microsoft\sqlserver\mssql-jdbc\13.4.0.jre11\mssql-jdbc-13.4.0.jre11.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-webmvc-test\4.1.0\spring-boot-starter-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-jackson-test\4.1.0\spring-boot-starter-jackson-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-starter-test\4.1.0\spring-boot-starter-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test\4.1.0\spring-boot-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\4.1.0\spring-boot-test-autoconfigure-4.1.0.jar;C:\Users\admin\.m2\repository\com\jayway\jsonpath\json-path\2.10.0\json-path-2.10.0.jar;C:\Users\admin\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\4.0.5\jakarta.xml.bind-api-4.0.5.jar;C:\Users\admin\.m2\repository\jakarta\activation\jakarta.activation-api\2.1.4\jakarta.activation-api-2.1.4.jar;C:\Users\admin\.m2\repository\net\minidev\json-smart\2.6.0\json-smart-2.6.0.jar;C:\Users\admin\.m2\repository\net\minidev\accessors-smart\2.6.0\accessors-smart-2.6.0.jar;C:\Users\admin\.m2\repository\org\ow2\asm\asm\9.7.1\asm-9.7.1.jar;C:\Users\admin\.m2\repository\org\assertj\assertj-core\3.27.7\assertj-core-3.27.7.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy\1.18.10\byte-buddy-1.18.10.jar;C:\Users\admin\.m2\repository\org\awaitility\awaitility\4.3.0\awaitility-4.3.0.jar;C:\Users\admin\.m2\repository\org\hamcrest\hamcrest\3.0\hamcrest-3.0.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter\6.0.3\junit-jupiter-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-api\6.0.3\junit-jupiter-api-6.0.3.jar;C:\Users\admin\.m2\repository\org\opentest4j\opentest4j\1.3.0\opentest4j-1.3.0.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-commons\6.0.3\junit-platform-commons-6.0.3.jar;C:\Users\admin\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-params\6.0.3\junit-jupiter-params-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\jupiter\junit-jupiter-engine\6.0.3\junit-jupiter-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\junit\platform\junit-platform-engine\6.0.3\junit-platform-engine-6.0.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-core\5.23.0\mockito-core-5.23.0.jar;C:\Users\admin\.m2\repository\net\bytebuddy\byte-buddy-agent\1.18.10\byte-buddy-agent-1.18.10.jar;C:\Users\admin\.m2\repository\org\objenesis\objenesis\3.3\objenesis-3.3.jar;C:\Users\admin\.m2\repository\org\mockito\mockito-junit-jupiter\5.23.0\mockito-junit-jupiter-5.23.0.jar;C:\Users\admin\.m2\repository\org\skyscreamer\jsonassert\1.5.3\jsonassert-1.5.3.jar;C:\Users\admin\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\admin\.m2\repository\org\springframework\spring-test\7.0.8\spring-test-7.0.8.jar;C:\Users\admin\.m2\repository\org\xmlunit\xmlunit-core\2.11.0\xmlunit-core-2.11.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-webmvc-test\4.1.0\spring-boot-webmvc-test-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-web-server\4.1.0\spring-boot-web-server-4.1.0.jar;C:\Users\admin\.m2\repository\org\springframework\boot\spring-boot-resttestclient\4.1.0\spring-boot-resttestclient-4.1.0.jar;"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="user.home" value="C:\Users\admin"/>
+    <property name="user.language" value="zh"/>
+    <property name="java.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.version.date" value="2026-04-21"/>
+    <property name="java.home" value="D:\devtool\jdk\jdk21"/>
+    <property name="file.separator" value="\"/>
+    <property name="basedir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="java.vm.compressedOopsMode" value="Zero based"/>
+    <property name="line.separator" value="&#10;"/>
+    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="FILE_LOG_CHARSET" value="UTF-8"/>
+    <property name="java.awt.headless" value="true"/>
+    <property name="surefire.real.class.path" value="C:\Users\admin\AppData\Local\Temp\surefire10791345176578591782\surefirebooter-20260726214045610_3.jar"/>
+    <property name="user.script" value=""/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+    <property name="java.runtime.version" value="21.0.11+10-LTS"/>
+    <property name="user.name" value="admin"/>
+    <property name="stdout.encoding" value="GBK"/>
+    <property name="path.separator" value=";"/>
+    <property name="os.version" value="10.0"/>
+    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
+    <property name="java.vendor.version" value="Temurin-21.0.11+10"/>
+    <property name="localRepository" value="C:\Users\admin\.m2\repository"/>
+    <property name="java.vendor.url.bug" value="https://github.com/adoptium/adoptium-support/issues"/>
+    <property name="java.io.tmpdir" value="C:\Users\admin\AppData\Local\Temp\"/>
+    <property name="java.version" value="21.0.11"/>
+    <property name="user.dir" value="D:\workspace\code\fms\fms-api"/>
+    <property name="os.arch" value="amd64"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="PID" value="5600"/>
+    <property name="sun.os.patch.level" value=""/>
+    <property name="CONSOLE_LOG_CHARSET" value="UTF-8"/>
+    <property name="native.encoding" value="GBK"/>
+    <property name="java.library.path" value="D:\devtool\jdk\jdk21\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;D:\devtool\conda;D:\devtool\conda\Library\mingw-w64\bin;D:\devtool\conda\Library\usr\bin;D:\devtool\conda\Library\bin;D:\devtool\conda\Scripts;D:\devtool\conda\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\NVIDIA Corporation\NVIDIA App\NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;D:\soft\Bandizip;D:\devtool\Git\cmd;D:\devtool\nvm;D:\devtool\nodejs;D:\data\sdk\platform-tools;D:\data\sdk\tools;D:\data\sdk\tools;D:\devtool\jdk\jdk17\bin;D:\devtool\maven\bin;D:\devtool\conda\condabin;D:\devtool\mc;C:\Users\admin\AppData\Local\pnpm\bin;C:\Users\admin\AppData\Local\Microsoft\WindowsApps;D:\soft\Microsoft VS Code\bin;D:\soft\CodeBuddy CN\bin;."/>
+    <property name="java.vm.info" value="mixed mode, sharing"/>
+    <property name="stderr.encoding" value="GBK"/>
+    <property name="java.vendor" value="Eclipse Adoptium"/>
+    <property name="java.vm.version" value="21.0.11+10-LTS"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="java.class.version" value="65.0"/>
+    <property name="LOGGED_APPLICATION_NAME" value="[fms-api] "/>
+  </properties>
+  <testcase name="tokenContainsAccountAndSessionClaims" classname="cn.g3soft.fmsapi.utils.JwtUtilsTests" time="0.097"/>
+</testsuite>
\ No newline at end of file
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.FmsApiApplicationTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.FmsApiApplicationTests.txt
new file mode 100644
index 00000000..5dba46f3
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.FmsApiApplicationTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.FmsApiApplicationTests
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.861 s -- in cn.g3soft.fmsapi.FmsApiApplicationTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests.txt
new file mode 100644
index 00000000..d61a32d8
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.185 s -- in cn.g3soft.fmsapi.database.OrgDataSourceFactoryTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests.txt
new file mode 100644
index 00000000..f9c5b7a1
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.148 s -- in cn.g3soft.fmsapi.database.OrgDatabaseConfigLoaderTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.txt
new file mode 100644
index 00000000..44ba2a9a
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.018 s -- in cn.g3soft.fmsapi.exception.GlobalExceptionHandlerTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.ActiveSessionRegistryTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.ActiveSessionRegistryTests.txt
new file mode 100644
index 00000000..39d18265
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.ActiveSessionRegistryTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.service.ActiveSessionRegistryTests
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s -- in cn.g3soft.fmsapi.service.ActiveSessionRegistryTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.AuthServiceTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.AuthServiceTests.txt
new file mode 100644
index 00000000..b22c6746
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.AuthServiceTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.service.AuthServiceTests
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.218 s -- in cn.g3soft.fmsapi.service.AuthServiceTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.DataSaveServiceTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.DataSaveServiceTests.txt
new file mode 100644
index 00000000..f7fba139
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.service.DataSaveServiceTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.service.DataSaveServiceTests
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.453 s -- in cn.g3soft.fmsapi.service.DataSaveServiceTests
diff --git a/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.utils.JwtUtilsTests.txt b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.utils.JwtUtilsTests.txt
new file mode 100644
index 00000000..95948964
--- /dev/null
+++ b/code/fms/fms-api/target/surefire-reports/cn.g3soft.fmsapi.utils.JwtUtilsTests.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: cn.g3soft.fmsapi.utils.JwtUtilsTests
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.098 s -- in cn.g3soft.fmsapi.utils.JwtUtilsTests
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/FmsApiApplicationTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/FmsApiApplicationTests.class
new file mode 100644
index 00000000..f4dc5e95
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/FmsApiApplicationTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/database/OrgDataSourceFactoryTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/database/OrgDataSourceFactoryTests.class
new file mode 100644
index 00000000..5bbf6291
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/database/OrgDataSourceFactoryTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/database/OrgDatabaseConfigLoaderTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/database/OrgDatabaseConfigLoaderTests.class
new file mode 100644
index 00000000..3e2e076c
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/database/OrgDatabaseConfigLoaderTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/exception/GlobalExceptionHandlerTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/exception/GlobalExceptionHandlerTests.class
new file mode 100644
index 00000000..31565e27
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/exception/GlobalExceptionHandlerTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/ActiveSessionRegistryTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/ActiveSessionRegistryTests.class
new file mode 100644
index 00000000..e0b7f8cd
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/ActiveSessionRegistryTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/AuthServiceTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/AuthServiceTests.class
new file mode 100644
index 00000000..c4ef6422
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/AuthServiceTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/DataSaveServiceTests$JdbcFixture.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/DataSaveServiceTests$JdbcFixture.class
new file mode 100644
index 00000000..32750586
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/DataSaveServiceTests$JdbcFixture.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/DataSaveServiceTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/DataSaveServiceTests.class
new file mode 100644
index 00000000..16466a31
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/service/DataSaveServiceTests.class differ
diff --git a/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/utils/JwtUtilsTests.class b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/utils/JwtUtilsTests.class
new file mode 100644
index 00000000..79688108
Binary files /dev/null and b/code/fms/fms-api/target/test-classes/cn/g3soft/fmsapi/utils/JwtUtilsTests.class differ
diff --git a/code/fms/fms-vue/src/App.vue b/code/fms/fms-vue/src/App.vue
index 1d3571c8..6dcdd937 100644
--- a/code/fms/fms-vue/src/App.vue
+++ b/code/fms/fms-vue/src/App.vue
@@ -1,9 +1,43 @@
 <script setup>
+import zhCN from "antdv-next/locale/zh_CN";
+
 const themeConfig = {};
+const timePickerLocale = {
+  ...zhCN.TimePicker,
+  placeholder: "",
+  rangePlaceholder: ["", ""],
+};
+const datePickerLocale = {
+  ...zhCN.DatePicker,
+  lang: {
+    ...zhCN.DatePicker.lang,
+    placeholder: "",
+    yearPlaceholder: "",
+    quarterPlaceholder: "",
+    monthPlaceholder: "",
+    weekPlaceholder: "",
+    rangePlaceholder: ["", ""],
+    rangeYearPlaceholder: ["", ""],
+    rangeQuarterPlaceholder: ["", ""],
+    rangeMonthPlaceholder: ["", ""],
+    rangeWeekPlaceholder: ["", ""],
+  },
+  timePickerLocale,
+};
+const locale = {
+  ...zhCN,
+  global: {
+    ...zhCN.global,
+    placeholder: "",
+  },
+  DatePicker: datePickerLocale,
+  Calendar: datePickerLocale,
+  TimePicker: timePickerLocale,
+};
 </script>
 
 <template>
-  <a-config-provider :theme="themeConfig">
+  <a-config-provider :theme="themeConfig" :locale="locale">
     <a-app>
       <div class="theme-root">
         <router-view />
diff --git a/code/fms/fms-vue/src/components/FpsMonitor.vue b/code/fms/fms-vue/src/components/FpsMonitor.vue
index 5a7ed2ac..89bcc5ea 100644
--- a/code/fms/fms-vue/src/components/FpsMonitor.vue
+++ b/code/fms/fms-vue/src/components/FpsMonitor.vue
@@ -20,6 +20,8 @@ let lastTime = 0;
 let totalFrames = 0;
 let totalTime = 0;
 let minFps = Infinity;
+const avgFps = ref(0);
+const minFpsDisplay = ref("--");
 
 function tick(now) {
   frames++;
@@ -30,6 +32,8 @@ function tick(now) {
     currentFps.value = fps;
     if (fps < minFps) minFps = fps;
     totalTime += elapsed;
+    avgFps.value = Math.round((totalFrames * 1000) / totalTime);
+    minFpsDisplay.value = minFps;
     const next =
       history.value.length >= props.historySize ? history.value.slice(1) : history.value.slice();
     next.push(fps);
@@ -49,9 +53,6 @@ onBeforeUnmount(() => {
   if (rafId) cancelAnimationFrame(rafId);
 });
 
-const avgFps = computed(() => (totalTime > 0 ? Math.round((totalFrames * 1000) / totalTime) : 0));
-const minFpsDisplay = computed(() => (minFps === Infinity ? "--" : minFps));
-
 const fpsColor = computed(() => {
   const f = currentFps.value;
   if (f >= 50) return "#52c41a";
@@ -70,7 +71,11 @@ function reset() {
   totalFrames = 0;
   totalTime = 0;
   minFps = Infinity;
+  frames = 0;
+  lastTime = performance.now();
   currentFps.value = 0;
+  avgFps.value = 0;
+  minFpsDisplay.value = "--";
 }
 </script>
 
@@ -104,7 +109,7 @@ function reset() {
   display: flex;
   flex-direction: column;
   gap: 6px;
-  width: 108px;
+  width: 132px;
   padding: 8px 10px;
   font-size: 12px;
   line-height: 1.4;
@@ -160,11 +165,12 @@ function reset() {
   align-items: flex-end;
   gap: 1px;
   height: 32px;
+  overflow: hidden;
 }
 
 .fps-monitor__bar {
   flex: 1;
-  min-width: 2px;
+  min-width: 0;
   border-radius: 1px;
   transition:
     height 0.2s ease,
diff --git a/code/fms/fms-vue/src/components/fms-module-list/FmsModuleListPage.vue b/code/fms/fms-vue/src/components/fms-module-list/FmsModuleListPage.vue
new file mode 100644
index 00000000..0b03e0a3
--- /dev/null
+++ b/code/fms/fms-vue/src/components/fms-module-list/FmsModuleListPage.vue
@@ -0,0 +1,207 @@
+<script setup>
+import { computed, h, nextTick, ref, toRef, useSlots, watch } from "vue";
+import { message } from "antdv-next";
+import { Columns3, RefreshCw } from "@lucide/vue";
+import FmsModuleTable from "./FmsModuleTable.vue";
+import FmsQueryToolbar from "./FmsQueryToolbar.vue";
+import { useModuleList } from "./useModuleList";
+
+const props = defineProps({
+  moduleCode: { type: String, default: "" },
+  columnExtensions: { type: Object, default: () => ({}) },
+  rowActions: { type: Array, default: () => [] },
+  rowClassName: { type: Function, default: undefined },
+  expandable: { type: [Boolean, Object], default: false },
+  pageSize: { type: Number, default: 20 },
+  inlineActionLimit: { type: Number, default: 2 },
+});
+
+const emit = defineEmits(["row-click", "cell-click", "row-action", "expand", "loaded"]);
+const slots = useSlots();
+const tableRef = ref(null);
+const moduleList = useModuleList({
+  moduleCode: toRef(props, "moduleCode"),
+  pageSize: props.pageSize,
+});
+
+const moreMenuItems = [
+  { key: "refresh", label: "刷新数据", icon: h(RefreshCw, { size: 14 }) },
+  { key: "reset-columns", label: "恢复配置列宽", icon: h(Columns3, { size: 14 }) },
+];
+const cellSlotNames = computed(() => Object.keys(slots).filter((name) => name.startsWith("cell-")));
+
+function reload() {
+  return moduleList.reload();
+}
+
+async function resetColumns() {
+  await nextTick();
+  tableRef.value?.resetColumns?.();
+}
+
+async function handleMoreAction({ key }) {
+  if (key === "refresh") {
+    await reload();
+    return;
+  }
+  if (key === "reset-columns") {
+    await resetColumns();
+    message.success("已恢复配置列宽");
+  }
+}
+
+watch(
+  () => moduleList.dataSource.value,
+  (rows) => {
+    emit("loaded", {
+      rows,
+      total: moduleList.pagination.total,
+      module: moduleList.dataModule.value,
+    });
+  },
+);
+
+defineExpose({
+  reload,
+  resetColumns,
+  initialize: moduleList.initialize,
+  dataSource: moduleList.dataSource,
+  dataModule: moduleList.dataModule,
+  pagination: moduleList.pagination,
+});
+</script>
+
+<template>
+  <div class="fms-module-list-page">
+    <div v-if="moduleList.configError.value" class="module-config-error">
+      <a-result status="error" title="模块配置加载失败" :sub-title="moduleList.configError.value">
+        <template #extra>
+          <a-button type="primary" @click="moduleList.initialize">重新加载</a-button>
+        </template>
+      </a-result>
+    </div>
+
+    <template v-else>
+      <FmsQueryToolbar
+        :query-items="moduleList.queryItems.value"
+        :loading="moduleList.dataLoading.value"
+        :more-items="moreMenuItems"
+        @search="moduleList.search"
+        @reset="moduleList.resetSearch"
+        @more-action="handleMoreAction"
+      >
+        <template #actions>
+          <slot
+            name="actions"
+            :reload="reload"
+            :data-module="moduleList.dataModule.value"
+            :loading="moduleList.loading.value"
+          />
+        </template>
+      </FmsQueryToolbar>
+
+      <section class="module-table-panel">
+        <div class="module-table-stage">
+          <FmsModuleTable
+            ref="tableRef"
+            :fields="moduleList.activeFields.value"
+            :list-config="moduleList.listConfig.value"
+            :data-source="moduleList.dataSource.value"
+            :row-key="moduleList.resolveRowKey"
+            :column-extensions="columnExtensions"
+            :row-actions="rowActions"
+            :row-class-name="rowClassName"
+            :expandable="expandable"
+            :inline-action-limit="inlineActionLimit"
+            @row-click="$emit('row-click', $event)"
+            @cell-click="$emit('cell-click', $event)"
+            @row-action="$emit('row-action', $event)"
+            @expand="$emit('expand', $event)"
+          >
+            <template v-for="slotName in cellSlotNames" :key="slotName" #[slotName]="slotProps">
+              <slot :name="slotName" v-bind="slotProps" />
+            </template>
+            <template v-if="$slots['expanded-row']" #expanded-row="slotProps">
+              <slot name="expanded-row" v-bind="slotProps" />
+            </template>
+            <template v-if="$slots.empty" #empty>
+              <slot name="empty" />
+            </template>
+          </FmsModuleTable>
+
+          <div v-if="moduleList.loading.value" class="module-table-loading">
+            <a-spin />
+          </div>
+        </div>
+
+        <div v-if="moduleList.dataError.value" class="module-data-error">
+          {{ moduleList.dataError.value }}
+        </div>
+
+        <a-pagination
+          :current="moduleList.pagination.current"
+          :page-size="moduleList.pagination.pageSize"
+          :total="moduleList.pagination.total"
+          :show-total="(total) => `共 ${total} 条`"
+          show-size-changer
+          @change="moduleList.changePage"
+        />
+      </section>
+    </template>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.fms-module-list-page {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  flex-direction: column;
+  overflow: hidden;
+  border: 1px solid var(--fms-border, #e5e7eb);
+  border-radius: 6px;
+  background: var(--fms-surface, #fff);
+}
+
+.module-config-error {
+  display: grid;
+  flex: 1;
+  place-items: center;
+}
+
+.module-table-panel {
+  display: flex;
+  flex: 1;
+  min-height: 0;
+  flex-direction: column;
+  gap: 8px;
+  padding: 10px 12px;
+
+  > :deep(.ant-pagination) {
+    flex: none;
+    align-self: flex-end;
+  }
+}
+
+.module-table-stage {
+  position: relative;
+  flex: 1;
+  min-height: 220px;
+}
+
+.module-table-loading {
+  position: absolute;
+  z-index: 5;
+  inset: 0;
+  display: grid;
+  place-items: center;
+  background: rgb(255 255 255 / 68%);
+}
+
+.module-data-error {
+  flex: none;
+  color: #ff4d4f;
+  font-size: 13px;
+}
+</style>
diff --git a/code/fms/fms-vue/src/components/fms-module-list/FmsModuleTable.vue b/code/fms/fms-vue/src/components/fms-module-list/FmsModuleTable.vue
new file mode 100644
index 00000000..df80dff4
--- /dev/null
+++ b/code/fms/fms-vue/src/components/fms-module-list/FmsModuleTable.vue
@@ -0,0 +1,320 @@
+<script setup>
+import { computed, h, ref, shallowRef, useSlots, watch } from "vue";
+import FmsTable from "@/components/fms-table/FmsTable.vue";
+
+const props = defineProps({
+  fields: { type: Array, default: () => [] },
+  listConfig: { type: Array, default: () => [] },
+  dataSource: { type: Array, default: () => [] },
+  rowKey: { type: [String, Function], default: "b_id" },
+  columnExtensions: { type: Object, default: () => ({}) },
+  rowActions: { type: Array, default: () => [] },
+  rowClassName: { type: Function, default: undefined },
+  expandable: { type: [Boolean, Object], default: false },
+  inlineActionLimit: { type: Number, default: 2 },
+});
+
+const emit = defineEmits(["row-click", "cell-click", "row-action", "expand"]);
+const slots = useSlots();
+const tableRef = ref(null);
+const columns = shallowRef([]);
+let expandedRecord = null;
+
+const expansionEnabled = computed(
+  () =>
+    props.expandable === true ||
+    Boolean(props.expandable?.enabled) ||
+    Boolean(slots["expanded-row"]),
+);
+const expansionOptions = computed(() =>
+  props.expandable && typeof props.expandable === "object" ? props.expandable : {},
+);
+const expandConfig = computed(() => ({ height: Number(expansionOptions.value.height) || 180 }));
+
+function parseOptions(field) {
+  if (!field?.b_options) return { config: {}, options: [] };
+  try {
+    const parsed = JSON.parse(field.b_options);
+    const config = Array.isArray(parsed) ? {} : parsed || {};
+    const source = Array.isArray(parsed)
+      ? parsed
+      : Array.isArray(parsed?.options)
+        ? parsed.options
+        : Array.isArray(parsed?.items)
+          ? parsed.items
+          : [];
+    const options = source.map((option) => {
+      if (option && typeof option === "object") {
+        const value = option.value ?? option.key ?? option.id;
+        return { ...option, value, label: String(option.label ?? option.name ?? value ?? "") };
+      }
+      return { value: option, label: String(option ?? "") };
+    });
+    return { config, options };
+  } catch {
+    return { config: {}, options: [] };
+  }
+}
+
+function formatDateValue(value, withTime) {
+  if (value === null || value === undefined || value === "") return "-";
+  const text = String(value).replace("T", " ");
+  if (/^\d{4}-\d{2}-\d{2}/.test(text)) return withTime ? text.slice(0, 19) : text.slice(0, 10);
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return text;
+  const pad = (number) => String(number).padStart(2, "0");
+  const datePart = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+  return withTime
+    ? `${datePart} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+    : datePart;
+}
+
+function formatCellValue(value, field, optionInfo) {
+  if (value === null || value === undefined || value === "") return "-";
+  if (field.b_type === "date") return formatDateValue(value, false);
+  if (field.b_type === "datetime") return formatDateValue(value, true);
+  if (field.b_type === "switch") {
+    return value === true || Number(value) === 1
+      ? (optionInfo.config.trueLabel ?? "是")
+      : (optionInfo.config.falseLabel ?? "否");
+  }
+  if (field.b_type === "select") {
+    const option = optionInfo.options.find((item) => String(item.value) === String(value));
+    return option?.label ?? String(value);
+  }
+  if (field.b_type === "money") {
+    const number = Number(value);
+    if (!Number.isFinite(number)) return String(value);
+    const precision = Number.isInteger(optionInfo.config.precision)
+      ? optionInfo.config.precision
+      : 2;
+    return number.toLocaleString("zh-CN", {
+      minimumFractionDigits: precision,
+      maximumFractionDigits: precision,
+    });
+  }
+  return String(value);
+}
+
+function resolveExtension(fieldName) {
+  return props.columnExtensions?.[fieldName] || {};
+}
+
+function createRuntimeColumn(config, field) {
+  const optionInfo = parseOptions(field);
+  const extension = resolveExtension(field.b_field);
+  const { formatter, clickable, cellClassName, onClick: _onClick, ...columnProps } = extension;
+  const slot = slots[`cell-${field.b_field}`];
+  const column = {
+    title: field.b_name || field.b_field,
+    dataIndex: field.b_field,
+    key: field.b_field,
+    width: Number(config.b_width) || 120,
+    ...columnProps,
+  };
+
+  column.customCell = ({ row, cellValue, rowIndex, colIndex }) => {
+    const formattedValue = formatter
+      ? formatter({ value: cellValue, record: row, field, config })
+      : formatCellValue(cellValue, field, optionInfo);
+    const cellClass =
+      typeof cellClassName === "function"
+        ? cellClassName({ value: cellValue, record: row, field, config })
+        : cellClassName;
+    const content = slot
+      ? slot({
+          value: cellValue,
+          displayValue: formattedValue,
+          record: row,
+          field,
+          config,
+          rowIndex,
+          colIndex,
+        })
+      : formattedValue;
+    return h(
+      "span",
+      {
+        class: [
+          "fms-module-cell",
+          cellClass,
+          { "fms-module-cell--clickable": clickable || extension.onClick },
+        ],
+        title: typeof formattedValue === "string" && formattedValue !== "-" ? formattedValue : "",
+      },
+      content,
+    );
+  };
+  return column;
+}
+
+function createActionColumn() {
+  if (!props.rowActions.length) return null;
+  const actions = props.rowActions.map((action, index) => {
+    const actionContext = (record) => ({ ...record, record, action });
+    return {
+      ...action,
+      key: String(action.key ?? action.type ?? index),
+      type: action.type || (action.danger ? "danger" : "action"),
+      visible:
+        typeof action.visible === "function"
+          ? (record) => action.visible(actionContext(record))
+          : action.visible,
+      disabled:
+        typeof action.disabled === "function"
+          ? (record) => action.disabled(actionContext(record))
+          : action.disabled,
+      onClick: (record) => {
+        action.onClick?.(record);
+        emit("row-action", {
+          key: String(action.key ?? action.type ?? index),
+          record,
+          action,
+        });
+      },
+    };
+  });
+  const inlineLimit = Math.max(0, props.inlineActionLimit);
+  const inlineActions = actions.slice(0, inlineLimit);
+  const overflowActions = actions.slice(inlineLimit);
+  if (overflowActions.length) {
+    inlineActions.push({ type: "more", title: "更多操作", items: overflowActions });
+  }
+  return {
+    dataIndex: "__actions__",
+    key: "__actions__",
+    title: "操作",
+    width: Math.max(70, inlineActions.length * 52),
+    align: "center",
+    fixed: "right",
+    resizable: false,
+    actions: inlineActions,
+  };
+}
+
+function buildColumns() {
+  const fieldById = new Map(props.fields.map((field) => [String(field.b_id), field]));
+  const runtimeColumns = props.listConfig
+    .filter((config) => config.b_visible === 1)
+    .map((config) => {
+      const field = fieldById.get(String(config.b_field_id));
+      return field ? createRuntimeColumn(config, field) : null;
+    })
+    .filter(Boolean);
+
+  if (expansionEnabled.value) {
+    runtimeColumns.unshift({
+      type: "expand",
+      dataIndex: "__expand__",
+      key: "__expand__",
+      title: "",
+      width: 42,
+      fixed: "left",
+      resizable: false,
+    });
+  }
+  const actionColumn = createActionColumn();
+  if (actionColumn) runtimeColumns.push(actionColumn);
+  return runtimeColumns;
+}
+
+function rebuildColumns() {
+  columns.value = buildColumns();
+}
+
+function resetColumns() {
+  rebuildColumns();
+  tableRef.value?.clearSelectedArea?.();
+  tableRef.value?.initVirtualScroll?.();
+}
+
+function handleCellClick(event, record, column, meta) {
+  if (!column?.dataIndex || String(column.dataIndex).startsWith("__")) return;
+  const field = props.fields.find((item) => item.b_field === column.dataIndex);
+  const payload = {
+    event,
+    record,
+    field,
+    column,
+    value: record?.[column.dataIndex],
+    ...meta,
+  };
+  resolveExtension(column.dataIndex).onClick?.(payload);
+  emit("cell-click", payload);
+}
+
+function handleRowClick(event, record, meta) {
+  emit("row-click", { event, record, ...meta });
+}
+
+function handleToggleExpand(payload) {
+  const single = expansionOptions.value.mode !== "multiple";
+  if (payload.expanded && single && expandedRecord && expandedRecord !== payload.row) {
+    tableRef.value?.setRowExpand?.(expandedRecord, false, { silent: true });
+  }
+  expandedRecord = payload.expanded
+    ? payload.row
+    : expandedRecord === payload.row
+      ? null
+      : expandedRecord;
+  emit("expand", { expanded: payload.expanded, record: payload.row, column: payload.col });
+}
+
+watch(
+  [
+    () => props.fields,
+    () => props.listConfig,
+    () => props.columnExtensions,
+    () => props.rowActions,
+    expansionEnabled,
+  ],
+  rebuildColumns,
+  { immediate: true, deep: true },
+);
+
+watch(
+  () => props.dataSource,
+  () => {
+    expandedRecord = null;
+  },
+);
+
+defineExpose({ resetColumns, clearSelectedArea: () => tableRef.value?.clearSelectedArea?.() });
+</script>
+
+<template>
+  <FmsTable
+    ref="tableRef"
+    v-model:columns="columns"
+    :data-source="dataSource"
+    :row-key="rowKey"
+    :row-class-name="rowClassName"
+    :expand-config="expansionEnabled ? expandConfig : undefined"
+    :editable="false"
+    @cell-click="handleCellClick"
+    @row-click="handleRowClick"
+    @toggle-row-expand="handleToggleExpand"
+  >
+    <template v-if="expansionEnabled" #expand="{ row, col }">
+      <slot name="expanded-row" :record="row" :column="col" />
+    </template>
+    <template v-if="$slots.empty" #empty>
+      <slot name="empty" />
+    </template>
+  </FmsTable>
+</template>
+
+<style scoped lang="scss">
+:deep(.fms-module-cell) {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+:deep(.fms-module-cell--clickable) {
+  color: #1677ff;
+  cursor: pointer;
+}
+</style>
diff --git a/code/fms/fms-vue/src/components/fms-module-list/FmsQueryControl.vue b/code/fms/fms-vue/src/components/fms-module-list/FmsQueryControl.vue
new file mode 100644
index 00000000..47942ab8
--- /dev/null
+++ b/code/fms/fms-vue/src/components/fms-module-list/FmsQueryControl.vue
@@ -0,0 +1,174 @@
+<script setup>
+import { computed } from "vue";
+
+const props = defineProps({
+  item: { type: Object, required: true },
+  modelValue: { type: [String, Number, Boolean, Array, Object], default: undefined },
+  compact: { type: Boolean, default: false },
+});
+
+const emit = defineEmits(["update:modelValue", "enter"]);
+
+const isRange = computed(
+  () =>
+    props.item.config.b_operator === "between" ||
+    props.item.config.b_component === "number-range" ||
+    props.item.field.b_type === "datetime",
+);
+const isNumeric = computed(
+  () => props.item.field.b_type === "number" || props.item.field.b_type === "money",
+);
+const isDate = computed(
+  () =>
+    props.item.config.b_component === "date-picker" ||
+    props.item.field.b_type === "date" ||
+    props.item.field.b_type === "datetime",
+);
+const value = computed({
+  get: () => props.modelValue,
+  set: (nextValue) => emit("update:modelValue", nextValue),
+});
+const startValue = computed({
+  get: () => (Array.isArray(props.modelValue) ? props.modelValue[0] : undefined),
+  set: (nextValue) => {
+    const range = Array.isArray(props.modelValue) ? [...props.modelValue] : [];
+    range[0] = nextValue;
+    emit("update:modelValue", range);
+  },
+});
+const endValue = computed({
+  get: () => (Array.isArray(props.modelValue) ? props.modelValue[1] : undefined),
+  set: (nextValue) => {
+    const range = Array.isArray(props.modelValue) ? [...props.modelValue] : [];
+    range[1] = nextValue;
+    emit("update:modelValue", range);
+  },
+});
+
+function isEmptyValue(current) {
+  return current === undefined || current === null || current === "";
+}
+
+function comparableDate(current) {
+  if (isEmptyValue(current)) return null;
+  if (current && typeof current.format === "function") {
+    const dateNumber = Number(current.format("YYYYMMDD"));
+    return Number.isFinite(dateNumber) ? dateNumber : null;
+  }
+  const match = String(current).match(/^(\d{4})-(\d{2})-(\d{2})/);
+  if (match) return Number(`${match[1]}${match[2]}${match[3]}`);
+  const date = new Date(current);
+  if (Number.isNaN(date.getTime())) return null;
+  return date.getFullYear() * 10000 + (date.getMonth() + 1) * 100 + date.getDate();
+}
+
+function isDateAfterLimit(current) {
+  const currentDate = comparableDate(current);
+  const limitDate = comparableDate(endValue.value);
+  return currentDate !== null && limitDate !== null && currentDate > limitDate;
+}
+
+function isDateBeforeLimit(current) {
+  const currentDate = comparableDate(current);
+  const limitDate = comparableDate(startValue.value);
+  return currentDate !== null && limitDate !== null && currentDate < limitDate;
+}
+</script>
+
+<template>
+  <div
+    v-if="isRange"
+    class="fms-query-control__range"
+    :class="{ 'fms-query-control__range--compact': compact }"
+  >
+    <template v-if="isDate">
+      <a-date-picker
+        v-model:value="startValue"
+        :disabled-date="isDateAfterLimit"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        aria-label="开始日期"
+      />
+      <span class="fms-query-control__separator">-</span>
+      <a-date-picker
+        v-model:value="endValue"
+        :disabled-date="isDateBeforeLimit"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        aria-label="结束日期"
+      />
+    </template>
+    <template v-else>
+      <a-input-number v-if="isNumeric" v-model:value="startValue" @keyup.enter="$emit('enter')" />
+      <a-input v-else v-model:value="startValue" @press-enter="$emit('enter')" />
+      <span class="fms-query-control__separator">-</span>
+      <a-input-number v-if="isNumeric" v-model:value="endValue" @keyup.enter="$emit('enter')" />
+      <a-input v-else v-model:value="endValue" @press-enter="$emit('enter')" />
+    </template>
+  </div>
+
+  <a-select
+    v-else-if="item.config.b_component === 'select'"
+    v-model:value="value"
+    :mode="item.config.b_operator === 'in' ? 'multiple' : undefined"
+    :options="item.options"
+    :max-tag-count="compact ? 1 : undefined"
+    allow-clear
+  />
+  <a-date-picker
+    v-else-if="isDate"
+    v-model:value="value"
+    format="YYYY-MM-DD"
+    value-format="YYYY-MM-DD"
+  />
+  <a-input-number v-else-if="isNumeric" v-model:value="value" @keyup.enter="$emit('enter')" />
+  <a-input v-else v-model:value="value" allow-clear @press-enter="$emit('enter')" />
+</template>
+
+<style scoped lang="scss">
+.fms-query-control__range {
+  display: grid;
+  width: 100%;
+  min-width: 0;
+  align-items: center;
+  grid-template-columns: minmax(0, 1fr) 18px minmax(0, 1fr);
+  gap: 6px;
+
+  > :deep(.ant-input-number),
+  > :deep(.ant-picker) {
+    width: 100%;
+  }
+}
+
+.fms-query-control__separator {
+  color: var(--fms-text-secondary, #646a73);
+  font-size: 12px;
+  text-align: center;
+}
+
+.fms-query-control__range--compact {
+  grid-template-columns: minmax(0, 1fr) 24px minmax(0, 1fr);
+  gap: 0;
+
+  > :deep(.ant-input),
+  > :deep(.ant-input-number),
+  > :deep(.ant-picker) {
+    border-radius: 0;
+  }
+
+  > :deep(.ant-input-number),
+  > :deep(.ant-picker),
+  > :deep(.ant-input) {
+    margin-left: -1px;
+  }
+
+  .fms-query-control__separator {
+    display: inline-flex;
+    height: 32px;
+    align-items: center;
+    justify-content: center;
+    border-block: 1px solid var(--fms-border, #d9d9d9);
+    background: var(--fms-surface, #fff);
+  }
+}
+</style>
diff --git a/code/fms/fms-vue/src/components/fms-module-list/FmsQueryToolbar.vue b/code/fms/fms-vue/src/components/fms-module-list/FmsQueryToolbar.vue
new file mode 100644
index 00000000..68eeaff9
--- /dev/null
+++ b/code/fms/fms-vue/src/components/fms-module-list/FmsQueryToolbar.vue
@@ -0,0 +1,403 @@
+<script setup>
+import { computed, reactive, ref, watch } from "vue";
+import { ChevronDown, ChevronUp, Ellipsis, RotateCcw, Search } from "@lucide/vue";
+import FmsQueryControl from "./FmsQueryControl.vue";
+
+const props = defineProps({
+  queryItems: { type: Array, default: () => [] },
+  loading: { type: Boolean, default: false },
+  moreItems: { type: Array, default: () => [] },
+  defaultAdvancedCount: { type: Number, default: 6 },
+});
+
+const emit = defineEmits(["search", "reset", "more-action"]);
+
+const filters = reactive({});
+const quickFieldName = ref("");
+const quickValue = ref(undefined);
+const advancedOpen = ref(false);
+const advancedMoreOpen = ref(false);
+
+const quickFieldOptions = computed(() =>
+  props.queryItems.map((item) => ({
+    key: item.field.b_field,
+    value: item.field.b_field,
+    label: item.field.b_name || item.field.b_field,
+  })),
+);
+const quickItem = computed(() =>
+  props.queryItems.find((item) => item.field.b_field === quickFieldName.value),
+);
+const hiddenAdvancedQueryCount = computed(() =>
+  Math.max(props.queryItems.length - props.defaultAdvancedCount, 0),
+);
+const visibleAdvancedQueryItems = computed(() =>
+  advancedMoreOpen.value ? props.queryItems : props.queryItems.slice(0, props.defaultAdvancedCount),
+);
+
+function isRangeQuery(item) {
+  return (
+    item.config.b_operator === "between" ||
+    item.config.b_component === "number-range" ||
+    item.field.b_type === "datetime"
+  );
+}
+
+function isNumericField(item) {
+  return item.field.b_type === "number" || item.field.b_type === "money";
+}
+
+function isDateQuery(item) {
+  return (
+    item.config.b_component === "date-picker" ||
+    item.field.b_type === "date" ||
+    item.field.b_type === "datetime"
+  );
+}
+
+function emptyQueryValue(item) {
+  if (isRangeQuery(item) || item.config.b_operator === "in") return [];
+  return undefined;
+}
+
+function defaultQueryValue(item) {
+  const configuredValue = item.config.b_default_value;
+  if (configuredValue === null || configuredValue === undefined || configuredValue === "") {
+    return emptyQueryValue(item);
+  }
+  if (isRangeQuery(item) || item.config.b_operator === "in") {
+    try {
+      const parsed = JSON.parse(configuredValue);
+      if (Array.isArray(parsed)) return parsed;
+    } catch {
+      // 非 JSON 默认值继续按逗号分隔处理。
+    }
+    return String(configuredValue)
+      .split(",")
+      .map((part) => part.trim())
+      .filter(Boolean);
+  }
+  if (isNumericField(item)) {
+    const number = Number(configuredValue);
+    return Number.isFinite(number) ? number : undefined;
+  }
+  return configuredValue;
+}
+
+function cloneQueryValue(current) {
+  return Array.isArray(current) ? [...current] : current;
+}
+
+function initializeDrafts() {
+  Object.keys(filters).forEach((key) => delete filters[key]);
+  props.queryItems.forEach((item) => {
+    filters[item.field.b_field] = defaultQueryValue(item);
+  });
+  const firstItem = props.queryItems[0];
+  quickFieldName.value = firstItem?.field.b_field || "";
+  quickValue.value = firstItem ? defaultQueryValue(firstItem) : undefined;
+  advancedOpen.value = false;
+  advancedMoreOpen.value = false;
+}
+
+function handleQuickFieldChange(fieldName) {
+  const item = props.queryItems.find((query) => query.field.b_field === fieldName);
+  quickValue.value = item ? emptyQueryValue(item) : undefined;
+}
+
+function handleQuickSearch() {
+  emit("search", {
+    mode: "quick",
+    entries: quickItem.value
+      ? [{ item: quickItem.value, value: cloneQueryValue(quickValue.value) }]
+      : [],
+  });
+}
+
+function toggleAdvancedSearch() {
+  const nextOpen = !advancedOpen.value;
+  if (nextOpen && quickItem.value) {
+    filters[quickItem.value.field.b_field] = cloneQueryValue(quickValue.value);
+  }
+  if (!nextOpen) advancedMoreOpen.value = false;
+  advancedOpen.value = nextOpen;
+}
+
+function handleAdvancedSearch() {
+  emit("search", {
+    mode: "advanced",
+    entries: props.queryItems.map((item) => ({
+      item,
+      value: cloneQueryValue(filters[item.field.b_field]),
+    })),
+  });
+}
+
+function handleAdvancedReset() {
+  props.queryItems.forEach((item) => {
+    filters[item.field.b_field] = emptyQueryValue(item);
+  });
+  emit("reset");
+}
+
+watch(() => props.queryItems, initializeDrafts, { immediate: true });
+</script>
+
+<template>
+  <div class="fms-query-toolbar">
+    <div class="list-toolbar">
+      <div class="toolbar-operations">
+        <slot name="actions" />
+      </div>
+      <div class="toolbar-tools">
+        <a-space-compact
+          v-if="quickItem && !advancedOpen"
+          class="quick-search"
+          :class="{
+            'quick-search--date-range': isRangeQuery(quickItem) && isDateQuery(quickItem),
+          }"
+        >
+          <a-select
+            v-model:value="quickFieldName"
+            class="quick-field-select"
+            :options="quickFieldOptions"
+            :popup-match-select-width="false"
+            @change="handleQuickFieldChange"
+          />
+          <FmsQueryControl
+            v-model="quickValue"
+            :item="quickItem"
+            compact
+            class="quick-query-control"
+            @enter="handleQuickSearch"
+          />
+          <a-button
+            type="primary"
+            class="quick-submit"
+            :loading="loading"
+            aria-label="搜索"
+            @click="handleQuickSearch"
+          >
+            <Search :size="16" />
+          </a-button>
+        </a-space-compact>
+
+        <a-tooltip v-if="queryItems.length" :title="advancedOpen ? '收起高级搜索' : '高级搜索'">
+          <a-button
+            shape="circle"
+            class="toolbar-icon-button"
+            :class="{ 'toolbar-icon-button--active': advancedOpen }"
+            :aria-label="advancedOpen ? '收起高级搜索' : '高级搜索'"
+            @click="toggleAdvancedSearch"
+          >
+            <Search :size="16" />
+          </a-button>
+        </a-tooltip>
+
+        <a-dropdown
+          v-if="moreItems.length"
+          :menu="{ items: moreItems, onClick: (event) => $emit('more-action', event) }"
+          :trigger="['click']"
+          placement="bottomRight"
+        >
+          <span class="more-trigger">
+            <a-tooltip title="更多">
+              <a-button shape="circle" class="toolbar-icon-button" aria-label="更多">
+                <Ellipsis :size="17" />
+              </a-button>
+            </a-tooltip>
+          </span>
+        </a-dropdown>
+      </div>
+    </div>
+
+    <a-form v-if="advancedOpen && queryItems.length" class="query-panel" layout="vertical">
+      <div class="query-content">
+        <div class="query-fields">
+          <a-form-item
+            v-for="item in visibleAdvancedQueryItems"
+            :key="item.field.b_field"
+            :class="{ 'query-field--wide': isRangeQuery(item) }"
+            :label="item.field.b_name"
+          >
+            <FmsQueryControl
+              v-model="filters[item.field.b_field]"
+              :item="item"
+              class="query-control"
+              @enter="handleAdvancedSearch"
+            />
+          </a-form-item>
+        </div>
+
+        <a-button
+          v-if="hiddenAdvancedQueryCount"
+          type="text"
+          class="query-more-toggle"
+          @click="advancedMoreOpen = !advancedMoreOpen"
+        >
+          <ChevronUp v-if="advancedMoreOpen" :size="15" />
+          <ChevronDown v-else :size="15" />
+          {{ advancedMoreOpen ? "收起条件" : `更多条件 (${hiddenAdvancedQueryCount})` }}
+        </a-button>
+      </div>
+
+      <div class="query-actions">
+        <a-button type="primary" :loading="loading" @click="handleAdvancedSearch">
+          <Search :size="15" />
+          查询
+        </a-button>
+        <a-button :disabled="loading" @click="handleAdvancedReset">
+          <RotateCcw :size="15" />
+          重置
+        </a-button>
+      </div>
+    </a-form>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.fms-query-toolbar {
+  width: 100%;
+  min-width: 0;
+  flex: none;
+}
+
+.list-toolbar {
+  display: flex;
+  min-height: 50px;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  padding: 8px 12px;
+  border-bottom: 1px solid var(--fms-border, #e5e7eb);
+  background: var(--fms-surface, #fff);
+}
+
+.toolbar-operations {
+  min-width: 0;
+  flex: 1;
+}
+
+.toolbar-tools {
+  display: flex;
+  min-width: 0;
+  flex: none;
+  align-items: center;
+  gap: 8px;
+}
+
+.quick-search {
+  width: min(330px, 38vw);
+  min-width: 300px;
+}
+
+.quick-search--date-range {
+  width: 470px;
+  min-width: 470px;
+}
+
+.quick-field-select {
+  width: 132px;
+  flex: none;
+}
+
+.quick-query-control {
+  width: 0;
+  min-width: 80px;
+  flex: 1;
+}
+
+.quick-submit {
+  width: 38px;
+  flex: none;
+  padding-inline: 0;
+}
+
+.toolbar-icon-button {
+  display: inline-flex;
+  width: 34px;
+  min-width: 34px;
+  height: 34px;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+
+  &--active {
+    border-color: #91caff;
+    background: #e6f4ff;
+    color: #1677ff;
+  }
+}
+
+.more-trigger {
+  display: inline-flex;
+  width: 34px;
+  height: 34px;
+}
+
+.query-panel {
+  display: grid;
+  width: min(1100px, calc(100% - 24px));
+  align-self: flex-start;
+  grid-template-columns: minmax(0, 1fr) 160px;
+  gap: 14px;
+  padding: 10px 12px 12px;
+  border-left: 1px solid var(--fms-border, #e5e7eb);
+  border-bottom: 1px solid var(--fms-border, #e5e7eb);
+  background: var(--fms-surface, #fff);
+
+  :deep(.ant-form-item-label) {
+    padding-bottom: 2px;
+  }
+
+  :deep(.ant-form-item-control) {
+    min-width: 0;
+  }
+}
+
+.query-content {
+  display: flex;
+  min-height: 0;
+  flex-direction: column;
+}
+
+.query-fields {
+  display: grid;
+  min-height: 0;
+  flex: 1;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 8px 12px;
+
+  > :deep(.ant-form-item) {
+    min-width: 0;
+    margin: 0;
+  }
+
+  > :deep(.query-field--wide) {
+    grid-column: span 2;
+  }
+}
+
+.query-more-toggle {
+  align-self: flex-start;
+  margin-top: 6px;
+  padding-inline: 0;
+  color: var(--fms-text-secondary, #646a73);
+}
+
+.query-control {
+  width: 100%;
+}
+
+.query-actions {
+  display: flex;
+  width: 160px;
+  align-self: center;
+  justify-content: space-between;
+  gap: 8px;
+
+  > :deep(.ant-btn) {
+    width: 76px;
+  }
+}
+</style>
diff --git a/code/fms/fms-vue/src/components/fms-module-list/useModuleList.js b/code/fms/fms-vue/src/components/fms-module-list/useModuleList.js
new file mode 100644
index 00000000..de32b148
--- /dev/null
+++ b/code/fms/fms-vue/src/components/fms-module-list/useModuleList.js
@@ -0,0 +1,461 @@
+import { computed, onBeforeUnmount, reactive, ref, shallowRef, unref, watch } from "vue";
+import { useRoute } from "vue-router";
+import { loadDataApi, pageDataApi } from "@/services/api";
+
+const IDENTIFIER_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+
+function escapeSqlText(value) {
+  return String(value).replaceAll("'", "''");
+}
+
+function requireModuleId(value) {
+  const id = String(value ?? "");
+  if (!/^\d+$/.test(id)) throw new Error("模块 ID 格式不正确");
+  return id;
+}
+
+function parseOptions(field) {
+  if (!field?.b_options) return { optionConfig: {}, options: [] };
+  try {
+    const parsed = JSON.parse(field.b_options);
+    const optionConfig = Array.isArray(parsed) ? {} : parsed || {};
+    const source = Array.isArray(parsed)
+      ? parsed
+      : Array.isArray(parsed?.options)
+        ? parsed.options
+        : Array.isArray(parsed?.items)
+          ? parsed.items
+          : [];
+    const options = source.map((option) => {
+      if (option && typeof option === "object") {
+        const value = option.value ?? option.key ?? option.id;
+        return { ...option, value, label: String(option.label ?? option.name ?? value ?? "") };
+      }
+      return { value: option, label: String(option ?? "") };
+    });
+    return { optionConfig, options };
+  } catch {
+    return { optionConfig: {}, options: [] };
+  }
+}
+
+function isRangeQuery(item) {
+  return (
+    item.config.b_operator === "between" ||
+    item.config.b_component === "number-range" ||
+    item.field.b_type === "datetime"
+  );
+}
+
+function isNumericField(item) {
+  return item.field.b_type === "number" || item.field.b_type === "money";
+}
+
+function emptyQueryValue(item) {
+  if (isRangeQuery(item) || item.config.b_operator === "in") return [];
+  return undefined;
+}
+
+function defaultQueryValue(item) {
+  const value = item.config.b_default_value;
+  if (value === null || value === undefined || value === "") return emptyQueryValue(item);
+  if (isRangeQuery(item) || item.config.b_operator === "in") {
+    try {
+      const parsed = JSON.parse(value);
+      if (Array.isArray(parsed)) return parsed;
+    } catch {
+      // 非 JSON 默认值继续按逗号分隔处理。
+    }
+    return String(value)
+      .split(",")
+      .map((part) => part.trim())
+      .filter(Boolean);
+  }
+  if (isNumericField(item)) {
+    const number = Number(value);
+    return Number.isFinite(number) ? number : undefined;
+  }
+  return value;
+}
+
+function isEmptyValue(value) {
+  return value === undefined || value === null || value === "";
+}
+
+function formatDateValue(value, withTime = false) {
+  if (isEmptyValue(value)) return "";
+  if (value && typeof value.format === "function") {
+    return value.format(withTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+  }
+  const text = String(value).replace("T", " ");
+  if (/^\d{4}-\d{2}-\d{2}/.test(text)) return withTime ? text.slice(0, 19) : text.slice(0, 10);
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return text;
+  const pad = (number) => String(number).padStart(2, "0");
+  const datePart = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+  return withTime
+    ? `${datePart} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+    : datePart;
+}
+
+function formatSqlDate(value, fieldType, endOfRange = false) {
+  if (value && typeof value.format === "function") {
+    if (fieldType === "datetime") {
+      return `${value.format("YYYY-MM-DD")} ${endOfRange ? "23:59:59" : "00:00:00"}`;
+    }
+    return value.format("YYYY-MM-DD");
+  }
+  const date = String(value).slice(0, 10);
+  if (fieldType === "datetime" && /^\d{4}-\d{2}-\d{2}$/.test(date)) {
+    return `${date} ${endOfRange ? "23:59:59" : "00:00:00"}`;
+  }
+  return date;
+}
+
+function sqlLiteral(value, field, endOfRange = false) {
+  if (isEmptyValue(value)) return null;
+  if (field.b_type === "number" || field.b_type === "money") {
+    const number = Number(value);
+    return Number.isFinite(number) ? String(number) : null;
+  }
+  if (field.b_type === "switch") return value === true || Number(value) === 1 ? "1" : "0";
+  const normalized =
+    field.b_type === "date" || field.b_type === "datetime"
+      ? formatSqlDate(value, field.b_type, endOfRange)
+      : String(value);
+  return `N'${escapeSqlText(normalized)}'`;
+}
+
+function buildQueryCondition(item, value) {
+  const fieldName = item.field.b_field;
+  if (!IDENTIFIER_RE.test(fieldName)) return "";
+  const identifier = `[${fieldName}]`;
+  const operator = item.config.b_operator;
+
+  if (isRangeQuery(item)) {
+    const [start, end] = Array.isArray(value) ? value : [];
+    const startLiteral = sqlLiteral(start, item.field);
+    const endLiteral = sqlLiteral(end, item.field, true);
+    if (startLiteral && endLiteral) {
+      return `${identifier} BETWEEN ${startLiteral} AND ${endLiteral}`;
+    }
+    if (startLiteral) return `${identifier} >= ${startLiteral}`;
+    if (endLiteral) return `${identifier} <= ${endLiteral}`;
+    return "";
+  }
+
+  if (operator === "in") {
+    const values = Array.isArray(value)
+      ? value
+      : String(value ?? "")
+          .split(",")
+          .map((part) => part.trim())
+          .filter(Boolean);
+    const literals = values.map((entry) => sqlLiteral(entry, item.field)).filter(Boolean);
+    return literals.length ? `${identifier} IN (${literals.join(", ")})` : "";
+  }
+
+  const literal = sqlLiteral(value, item.field);
+  if (!literal) return "";
+  if (operator === "like") return `${identifier} LIKE N'%${escapeSqlText(String(value))}%'`;
+  return `${identifier} = ${literal}`;
+}
+
+function displayQueryValue(item, value) {
+  if (isEmptyValue(value)) return "";
+  if (item.field.b_type === "date" || item.field.b_type === "datetime") {
+    return formatDateValue(value);
+  }
+  const option = item.options.find((entry) => String(entry.value) === String(value));
+  return option?.label ?? String(value);
+}
+
+function formatAppliedFilterValue(item, value) {
+  if (isRangeQuery(item)) {
+    const [start, end] = Array.isArray(value) ? value : [];
+    const startText = displayQueryValue(item, start);
+    const endText = displayQueryValue(item, end);
+    if (startText && endText) return `${startText} - ${endText}`;
+    if (startText) return `${startText} 起`;
+    if (endText) return `${endText} 止`;
+    return "";
+  }
+  if (Array.isArray(value)) {
+    return value
+      .map((entry) => displayQueryValue(item, entry))
+      .filter(Boolean)
+      .join("、");
+  }
+  return displayQueryValue(item, value);
+}
+
+function createAppliedFilter(item, value) {
+  const condition = buildQueryCondition(item, value);
+  if (!condition) return null;
+  return {
+    key: item.field.b_field,
+    label: item.field.b_name || item.field.b_field,
+    value: formatAppliedFilterValue(item, value),
+    condition,
+  };
+}
+
+function resolveKeyField(module, activeFields) {
+  if (IDENTIFIER_RE.test(module?.b_keyfield || "")) return module.b_keyfield;
+  return (
+    activeFields.find((field) => field.b_field === "b_id")?.b_field ||
+    activeFields.find((field) => IDENTIFIER_RE.test(field.b_field || ""))?.b_field ||
+    ""
+  );
+}
+
+export function useModuleList(options = {}) {
+  const route = useRoute();
+  const pageModule = ref(null);
+  const dataModule = ref(null);
+  const activeFields = shallowRef([]);
+  const listConfig = shallowRef([]);
+  const queryItems = shallowRef([]);
+  const dataSource = shallowRef([]);
+  const appliedFilters = shallowRef([]);
+  const configLoading = ref(false);
+  const dataLoading = ref(false);
+  const configError = ref("");
+  const dataError = ref("");
+  const pagination = reactive({
+    current: 1,
+    pageSize: Number(unref(options.pageSize)) || 20,
+    total: 0,
+  });
+  let requestVersion = 0;
+  let dataRequestVersion = 0;
+  let disposed = false;
+
+  const loading = computed(() => configLoading.value || dataLoading.value);
+  const appliedSearchCondition = computed(() =>
+    appliedFilters.value.map((item) => item.condition).join(" AND "),
+  );
+
+  function commitAppliedFilters(filters) {
+    appliedFilters.value = filters.filter(Boolean);
+  }
+
+  async function resolveConfiguredModule() {
+    const moduleCode = String(unref(options.moduleCode) || "").trim();
+    if (moduleCode) {
+      const response = await loadDataApi(
+        "s_module",
+        `b_code = N'${escapeSqlText(moduleCode)}' AND b_canuse = 1`,
+        "b_id ASC",
+      );
+      const module = response.data?.[0];
+      if (!module) throw new Error(`未找到编码为 ${moduleCode} 的启用模块`);
+      return module;
+    }
+
+    const routePath = escapeSqlText(route.path);
+    const response = await loadDataApi(
+      "s_module",
+      `b_route = N'${routePath}' AND b_canuse = 1`,
+      "b_id ASC",
+    );
+    const module = response.data?.[0];
+    if (!module) throw new Error(`未找到路由 ${route.path} 对应的启用模块`);
+    return module;
+  }
+
+  async function resolveDataModule(runtimePage) {
+    if (runtimePage.b_viewtable) return runtimePage;
+    const pageId = requireModuleId(runtimePage.b_id);
+    const response = await loadDataApi(
+      "s_module",
+      `b_parent_id = ${pageId} AND b_module_type = 'data' AND b_canuse = 1`,
+      "b_xh ASC, b_id ASC",
+    );
+    const module = response.data?.find((item) => item.b_viewtable);
+    if (!module) throw new Error("当前页面没有配置可用的数据模块");
+    return module;
+  }
+
+  async function loadModuleConfig(version) {
+    configLoading.value = true;
+    configError.value = "";
+    try {
+      const runtimePage = await resolveConfiguredModule();
+      const runtimeData = await resolveDataModule(runtimePage);
+      const dataId = requireModuleId(runtimeData.b_id);
+      const [fieldResponse, listResponse, queryResponse] = await Promise.all([
+        loadDataApi("s_module_field", `b_module_id = ${dataId}`, "b_id ASC"),
+        loadDataApi("s_module_field_list", `b_module_id = ${dataId}`, "b_xh ASC, b_id ASC"),
+        loadDataApi(
+          "s_module_field_query",
+          `b_module_id = ${dataId} AND b_canuse = 1`,
+          "b_xh ASC, b_id ASC",
+        ),
+      ]);
+      if (disposed || version !== requestVersion) return false;
+
+      const fields = (fieldResponse.data || []).filter(
+        (field) => field.b_canuse === 1 && IDENTIFIER_RE.test(field.b_field || ""),
+      );
+      const fieldById = new Map(fields.map((field) => [String(field.b_id), field]));
+      const lists = (listResponse.data || []).filter(
+        (item) => item.b_visible === 1 && fieldById.has(String(item.b_field_id)),
+      );
+      const queries = (queryResponse.data || [])
+        .map((config) => {
+          const field = fieldById.get(String(config.b_field_id));
+          if (!field) return null;
+          return { config, field, ...parseOptions(field) };
+        })
+        .filter(Boolean);
+
+      runtimeData.resolvedKeyField = resolveKeyField(runtimeData, fields);
+      pageModule.value = runtimePage;
+      dataModule.value = runtimeData;
+      activeFields.value = fields;
+      listConfig.value = lists;
+      queryItems.value = queries;
+      commitAppliedFilters(
+        queries.map((item) => createAppliedFilter(item, defaultQueryValue(item))),
+      );
+      return true;
+    } catch (error) {
+      if (disposed || version !== requestVersion) return false;
+      configError.value = error?.message || String(error);
+      throw error;
+    } finally {
+      if (version === requestVersion) configLoading.value = false;
+    }
+  }
+
+  function resolveOrderBy() {
+    const configured = String(dataModule.value?.b_orderfield || "").trim();
+    if (configured) return configured;
+    const keyField = dataModule.value?.resolvedKeyField;
+    if (keyField) return `${keyField} DESC`;
+    const fieldById = new Map(activeFields.value.map((field) => [String(field.b_id), field]));
+    const firstField = fieldById.get(String(listConfig.value[0]?.b_field_id))?.b_field;
+    if (IDENTIFIER_RE.test(firstField || "")) return `${firstField} ASC`;
+    throw new Error("数据模块未配置可用的默认排序字段");
+  }
+
+  async function fetchData(version = requestVersion) {
+    if (!dataModule.value?.b_viewtable || version !== requestVersion) return;
+    const dataVersion = ++dataRequestVersion;
+    dataLoading.value = true;
+    dataError.value = "";
+    try {
+      const fieldById = new Map(activeFields.value.map((field) => [String(field.b_id), field]));
+      const searchColumns = [
+        ...new Set(
+          [
+            dataModule.value.resolvedKeyField,
+            ...listConfig.value.map((item) => fieldById.get(String(item.b_field_id))?.b_field),
+          ].filter(Boolean),
+        ),
+      ];
+      const response = await pageDataApi({
+        viewName: dataModule.value.b_viewtable,
+        orderBy: resolveOrderBy(),
+        searchColumns,
+        searchCondition: appliedSearchCondition.value,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
+      });
+      if (disposed || version !== requestVersion || dataVersion !== dataRequestVersion) return;
+      dataSource.value = response.data?.rows || [];
+      pagination.total = Number(response.data?.total ?? response.data?.row_count) || 0;
+    } catch (error) {
+      if (disposed || version !== requestVersion || dataVersion !== dataRequestVersion) return;
+      dataSource.value = [];
+      pagination.total = 0;
+      dataError.value = error?.message || String(error);
+    } finally {
+      if (version === requestVersion && dataVersion === dataRequestVersion) {
+        dataLoading.value = false;
+      }
+    }
+  }
+
+  async function initialize() {
+    const version = ++requestVersion;
+    dataRequestVersion += 1;
+    dataLoading.value = false;
+    pagination.current = 1;
+    dataSource.value = [];
+    pagination.total = 0;
+    try {
+      const loaded = await loadModuleConfig(version);
+      if (loaded) await fetchData(version);
+    } catch {
+      dataSource.value = [];
+    }
+  }
+
+  function search({ entries = [] }) {
+    commitAppliedFilters(entries.map(({ item, value }) => createAppliedFilter(item, value)));
+    pagination.current = 1;
+    return fetchData();
+  }
+
+  function resetSearch() {
+    commitAppliedFilters([]);
+    pagination.current = 1;
+    return fetchData();
+  }
+
+  function removeFilter(fieldName) {
+    commitAppliedFilters(appliedFilters.value.filter((filter) => filter.key !== fieldName));
+    pagination.current = 1;
+    return fetchData();
+  }
+
+  function changePage(page, pageSize) {
+    pagination.current = pageSize === pagination.pageSize ? page : 1;
+    pagination.pageSize = pageSize;
+    return fetchData();
+  }
+
+  function reload() {
+    return fetchData();
+  }
+
+  function resolveRowKey(row) {
+    const keyField = dataModule.value?.resolvedKeyField;
+    return keyField ? row?.[keyField] : JSON.stringify(row);
+  }
+
+  watch(() => [String(unref(options.moduleCode) || ""), route.path], initialize, {
+    immediate: true,
+  });
+
+  onBeforeUnmount(() => {
+    disposed = true;
+    requestVersion += 1;
+    dataRequestVersion += 1;
+  });
+
+  return {
+    pageModule,
+    dataModule,
+    activeFields,
+    listConfig,
+    queryItems,
+    dataSource,
+    appliedFilters,
+    pagination,
+    configLoading,
+    dataLoading,
+    loading,
+    configError,
+    dataError,
+    initialize,
+    search,
+    resetSearch,
+    removeFilter,
+    changePage,
+    reload,
+    resolveRowKey,
+  };
+}
diff --git a/code/fms/fms-vue/src/components/fms-table/FmsTable.vue b/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
index cec56a50..510d85d3 100644
--- a/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
+++ b/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { computed, nextTick, ref, useSlots } from "vue";
+import { computed, nextTick, onBeforeUnmount, ref, shallowRef, useSlots, watch } from "vue";
+import { useRafFn, useResizeObserver } from "@vueuse/core";
 import { StkTable } from "stk-table-vue";
 import { createSelectionColumn, isSelectionColumn } from "./utils/createSelectionCellRenderers";
 import { resolveCustomCell } from "./utils/createCellRenderer";
@@ -12,6 +13,7 @@ const props = defineProps({
   colResizable: { type: Boolean, default: true },
   bordered: { type: [Boolean, String], default: true },
   noDataFull: { type: Boolean, default: true },
+  showOverflow: { type: Boolean, default: true },
   columns: { type: Array, default: () => [] },
   // 序号列：false=关闭；true=默认；{ title, width }=自定义
   seq: { type: [Boolean, Object], default: false },
@@ -19,13 +21,114 @@ const props = defineProps({
   rowSelection: { type: Object, default: null },
   dataSource: { type: Array, default: () => [] },
   rowKey: { type: [String, Function], default: "id" },
+  activeRowKey: { type: [String, Number], default: null },
+  // 行拖拽排序：开启后显示拖拽手柄，并通过 row-order-change 回传排序后的完整数据。
+  rowDraggable: { type: Boolean, default: false },
+  // 存在 editor 配置的列默认可编辑；设为 false 可整体禁用编辑。
+  editable: { type: Boolean, default: true },
 });
 
-const emit = defineEmits(["update:columns"]);
+const emit = defineEmits(["update:columns", "change", "row-order-change"]);
 
+const rootRef = ref(null);
 const tableRef = ref(null);
 const slots = useSlots();
 
+// Tab 面板从隐藏恢复时，等到容器拥有有效尺寸再刷新虚拟滚动布局。
+// RAF 将同一帧内的多次 ResizeObserver 通知合并，避免重复重排。
+const { resume: refreshLayout } = useRafFn(
+  async () => {
+    await nextTick();
+    tableRef.value?.initVirtualScroll?.();
+    await nextTick();
+  },
+  { immediate: false, once: true },
+);
+
+useResizeObserver(rootRef, ([entry]) => {
+  const { width, height } = entry.contentRect;
+  if (width > 0 && height > 0) refreshLayout();
+});
+
+const NAVIGATION_KEYS = new Set(["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Tab"]);
+const NAVIGATION_IDLE_MS = 80;
+const rowEditingStates = new WeakMap();
+let activeEditingRow = null;
+let pendingEditingTarget = null;
+let navigationEvent = null;
+let navigationTimer = null;
+const pressedNavigationKeys = new Set();
+
+function getRowKey(row) {
+  return typeof props.rowKey === "function" ? props.rowKey(row) : row?.[props.rowKey];
+}
+
+function getRowEditingState(row) {
+  if (!row || typeof row !== "object") return null;
+  let state = rowEditingStates.get(row);
+  if (!state) {
+    state = shallowRef({ editing: false, focusCol: null, initialValues: null });
+    rowEditingStates.set(row, state);
+  }
+  return state;
+}
+
+function captureEditableValues(row) {
+  return new Map(
+    props.columns.filter((col) => col.editor).map((col) => [col.dataIndex, row[col.dataIndex]]),
+  );
+}
+
+function clearActiveEditing() {
+  if (!activeEditingRow) return;
+  const state = rowEditingStates.get(activeEditingRow);
+  activeEditingRow = null;
+  if (state) state.value = { editing: false, focusCol: null, initialValues: null };
+}
+
+function activateEditing(row, focusCol) {
+  if (!props.editable || !row) return;
+  const state = getRowEditingState(row);
+  if (!state) return;
+
+  if (activeEditingRow !== row) {
+    clearActiveEditing();
+    activeEditingRow = row;
+    state.value = {
+      editing: true,
+      focusCol,
+      initialValues: captureEditableValues(row),
+    };
+    return;
+  }
+
+  const current = state.value;
+  if (current.editing && current.focusCol === focusCol) return;
+  state.value = { ...current, editing: true, focusCol };
+}
+
+function editorValuesEqual(col, previous, current) {
+  if (col.editor?.type === "select" || col.editor?.type === "checkbox") {
+    return Object.is(previous, current);
+  }
+  return String(previous ?? "") === String(current ?? "");
+}
+
+const editingCtx = {
+  isEditing: (row) => props.editable && getRowEditingState(row)?.value.editing,
+  shouldFocus: (row, col) => getRowEditingState(row)?.value.focusCol === col.dataIndex,
+  shouldNotify: (row, col, newValue) => {
+    const values = getRowEditingState(row)?.value.initialValues;
+    if (!values?.has(col.dataIndex)) return true;
+    if (editorValuesEqual(col, values.get(col.dataIndex), newValue)) return false;
+    values.set(col.dataIndex, newValue);
+    return true;
+  },
+  onChange: (row, col, newValue) => {
+    emit("change", row, col, newValue);
+  },
+};
+
 // 由 seq 派生：enabled / title / width
 const seqConfig = computed(() => {
   const enabled = !!props.seq;
@@ -37,10 +140,19 @@ const seqConfig = computed(() => {
     width: Number(cfg.width ?? 50),
   };
 });
+const hasRowSelection = computed(() => Boolean(props.rowSelection));
+const dragRowColumn = {
+  type: "dragRow",
+  dataIndex: "__drag_row__",
+  title: "",
+  width: 40,
+  resizable: false,
+};
 
 const displayColumns = computed(() => {
-  const cols = props.columns.map(resolveCustomCell);
-  if (selectionColumn) cols.unshift(selectionColumn);
+  const cols = props.columns.map((col) => resolveCustomCell(col, editingCtx));
+  if (props.rowDraggable) cols.unshift(dragRowColumn);
+  if (hasRowSelection.value) cols.unshift(selectionColumn);
   const seq = seqConfig.value;
   if (seq.enabled) {
     cols.unshift({
@@ -54,14 +166,29 @@ const displayColumns = computed(() => {
   return cols;
 });
 
-// 剥离内部列（选择列、序号列）后回传，避免污染父组件 columns
+// 剥离内部列（选择列、序号列、拖拽列）后回传，避免污染父组件 columns
 function onColumnsUpdate(columns) {
-  const real = (columns || []).filter(
-    (c) => !isSelectionColumn(c) && c.type !== "seq" && c.dataIndex !== "",
+  const originalByKey = new Map(
+    props.columns.map((col) => [String(col.key ?? col.dataIndex ?? ""), col]),
   );
+  const real = (columns || [])
+    .filter(
+      (c) =>
+        !isSelectionColumn(c) && c.type !== "seq" && c.type !== "dragRow" && c.dataIndex !== "",
+    )
+    .map((col) => {
+      const original = originalByKey.get(String(col.key ?? col.dataIndex ?? ""));
+      return original ? { ...original, width: col.width ?? original.width } : col;
+    });
   emit("update:columns", real);
 }
 
+function handleRowOrderChange(sourceIndex, targetIndex) {
+  const rows = tableRef.value?.getTableData?.() ?? props.dataSource;
+  tableRef.value?.clearSelectedArea?.();
+  emit("row-order-change", [...rows], sourceIndex, targetIndex);
+}
+
 // 行高同时作为 CSS 变量与 StkTable 的 row-height / header-row-height
 const rowHeight = 34;
 const headerRowHeight = 40;
@@ -71,28 +198,20 @@ const customVars = {
   "--footer-row-height": "36px",
 };
 
-function getRowKey(row) {
-  return typeof props.rowKey === "function" ? props.rowKey(row) : row?.[props.rowKey];
-}
-
 // 选择列：已选状态管理 + 渲染逻辑全部内聚在 createSelectionColumn 中
-const selectionColumn = props.rowSelection
-  ? createSelectionColumn({
-      getDataSource: () => props.dataSource,
-      getRowKey,
-      getSelectedRowKeys: () => props.rowSelection.selectedRowKeys ?? [],
-      onChange: (keys, rows) => props.rowSelection?.onChange?.(keys, rows),
-    })
-  : null;
+const selectionColumn = createSelectionColumn({
+  getDataSource: () => props.dataSource,
+  getRowKey,
+  getSelectedRowKeys: () => props.rowSelection?.selectedRowKeys ?? [],
+  onChange: (keys, rows) => props.rowSelection?.onChange?.(keys, rows),
+});
 
 // 滚动到指定行（新增后聚焦）
 async function scrollToRow(rowKey) {
   await nextTick();
   const table = tableRef.value;
   if (!table) return;
-  const idx = props.dataSource.findIndex(
-    (row) => String(getRowKey(row)) === String(rowKey),
-  );
+  const idx = props.dataSource.findIndex((row) => String(getRowKey(row)) === String(rowKey));
   if (idx < 0) return;
   table.scrollTo(idx * rowHeight, null);
 }
@@ -101,44 +220,169 @@ function getSelectedArea() {
   return tableRef.value?.getSelectedArea?.();
 }
 
-defineExpose({ scrollToRow, getSelectedArea });
+function clearSelectedArea() {
+  tableRef.value?.clearSelectedArea?.();
+}
+
+function setRowExpand(...args) {
+  return tableRef.value?.setRowExpand?.(...args);
+}
+
+function initVirtualScroll() {
+  return tableRef.value?.initVirtualScroll?.();
+}
+
+function clearNavigationTimer() {
+  if (navigationTimer) clearTimeout(navigationTimer);
+  navigationTimer = null;
+}
+
+function commitPendingEditing() {
+  clearNavigationTimer();
+  const target = pendingEditingTarget;
+  pendingEditingTarget = null;
+  if (!target) return;
+  const row = props.dataSource.find(
+    (item) => item === target.row || String(getRowKey(item)) === String(getRowKey(target.row)),
+  );
+  if (row) activateEditing(row, target.focusCol);
+}
+
+function schedulePendingEditing() {
+  clearNavigationTimer();
+  navigationTimer = setTimeout(commitPendingEditing, NAVIGATION_IDLE_MS);
+}
+
+function handleKeydownCapture(event) {
+  if (!NAVIGATION_KEYS.has(event.key)) return;
+  pressedNavigationKeys.add(event.key);
+  const currentEvent = { repeat: event.repeat };
+  navigationEvent = currentEvent;
+  queueMicrotask(() => {
+    if (navigationEvent === currentEvent) navigationEvent = null;
+  });
+}
+
+function handleKeyupCapture(event) {
+  if (!NAVIGATION_KEYS.has(event.key)) return;
+  pressedNavigationKeys.delete(event.key);
+  if (!pressedNavigationKeys.size) commitPendingEditing();
+}
+
+// 选区变化后，目标行进入编辑，活动单元格获得焦点。
+function handleAreaSelectionChange(ranges) {
+  if (!props.editable) return;
+
+  const target = ranges?.at(-1)?.index.end;
+  const row = target ? tableRef.value?.getTableData?.()[target.row] : null;
+  const col = target ? displayColumns.value[target.col] : null;
+  if (!row) {
+    pendingEditingTarget = null;
+    clearNavigationTimer();
+    clearActiveEditing();
+    return;
+  }
+
+  const focusCol = col?.editor ? col.dataIndex : null;
+  if (navigationEvent?.repeat) {
+    pendingEditingTarget = { row, focusCol };
+    clearActiveEditing();
+    schedulePendingEditing();
+    return;
+  }
+
+  pendingEditingTarget = null;
+  clearNavigationTimer();
+  activateEditing(row, focusCol);
+}
+
+watch(
+  [() => props.activeRowKey, () => props.dataSource],
+  async ([rowKey]) => {
+    if (activeEditingRow && !props.dataSource.includes(activeEditingRow)) clearActiveEditing();
+    await nextTick();
+    if (rowKey == null) {
+      tableRef.value?.setCurrentRow?.(undefined, { silent: true });
+      return;
+    }
+    const row = props.dataSource.find((item) => String(getRowKey(item)) === String(rowKey));
+    tableRef.value?.setCurrentRow?.(row, { silent: true });
+  },
+  { immediate: true },
+);
+
+watch(
+  () => props.editable,
+  (editable) => {
+    if (editable) return;
+    pendingEditingTarget = null;
+    pressedNavigationKeys.clear();
+    clearNavigationTimer();
+    clearActiveEditing();
+  },
+);
+
+onBeforeUnmount(() => {
+  pressedNavigationKeys.clear();
+  clearNavigationTimer();
+});
+
+defineExpose({
+  scrollToRow,
+  getSelectedArea,
+  clearSelectedArea,
+  setRowExpand,
+  initVirtualScroll,
+  refreshLayout: initVirtualScroll,
+});
 </script>
 
 <template>
-  <StkTable
-    ref="tableRef"
+  <div
+    ref="rootRef"
     class="fms-table"
-    v-bind="$attrs"
-    :style="customVars"
-    :row-height="rowHeight"
-    :header-row-height="headerRowHeight"
-    :virtual="virtual"
-    :virtual-x="virtualX"
-    :col-resizable="colResizable"
-    :columns="displayColumns"
-    @update:columns="onColumnsUpdate"
-    :data-source="dataSource"
-    :row-key="rowKey"
-    :bordered="bordered"
-    :no-data-full="noDataFull"
-    :area-selection="{
-      enabled:true,
-      keyboard:true,
-      ctrl:false,
-      shift:false
-    }"
+    @keydown.capture="handleKeydownCapture"
+    @keyup.capture="handleKeyupCapture"
   >
-    <template v-if="slots.empty" #empty>
-      <slot name="empty" />
-    </template>
-    <template v-else #empty>
-      <a-result status="info" title="暂无数据" sub-title="当前没有可显示的内容" size="small"/>
-    </template>
-  </StkTable>
+    <StkTable
+      ref="tableRef"
+      class="fms-table__inner"
+      v-bind="$attrs"
+      :style="customVars"
+      :row-height="rowHeight"
+      :header-row-height="headerRowHeight"
+      :virtual="virtual"
+      :virtual-x="virtualX"
+      :auto-resize="false"
+      :col-resizable="colResizable"
+      :columns="displayColumns"
+      @update:columns="onColumnsUpdate"
+      :data-source="dataSource"
+      :drag-row-config="{ mode: rowDraggable ? 'insert' : 'none' }"
+      :row-key="rowKey"
+      :bordered="bordered"
+      :no-data-full="noDataFull"
+      :show-overflow="showOverflow"
+      :area-selection="true"
+      @area-selection-change="handleAreaSelectionChange"
+      @row-order-change="handleRowOrderChange"
+    >
+      <template v-if="slots.expand" #expand="slotProps">
+        <slot name="expand" v-bind="slotProps" />
+      </template>
+      <template v-if="slots.empty" #empty>
+        <slot name="empty" />
+      </template>
+      <template v-else #empty>
+        <a-result status="info" title="暂无数据" sub-title="当前没有可显示的内容" size="small" />
+      </template>
+    </StkTable>
+  </div>
 </template>
 
 <style scoped>
-.fms-table {
+.fms-table,
+.fms-table__inner {
   width: 100%;
   height: 100%;
 }
@@ -208,12 +452,34 @@ defineExpose({ scrollToRow, getSelectedArea });
       height: 2px;
       background: #fff;
       border: none;
-      border-radius: 1px;
+      border-radius: 2px;
       transform: none;
     }
   }
 }
 
+.fms-cell-editor {
+  width: 100%;
+  height: calc(100% - 4px);
+  min-width: 0;
+  font-size: 13px;
+}
+
+.fms-cell-display {
+  display: block;
+  min-width: 0;
+}
+
+.fms-table__inner.text-overflow .fms-cell-display {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.fms-table__inner td:has(> .fms-cell-editor-root) {
+  padding-inline: 3px;
+}
+
 // actions 列按钮容器
 .fms-actions-cell {
   display: inline-flex;
@@ -223,11 +489,14 @@ defineExpose({ scrollToRow, getSelectedArea });
 
 // 操作按钮基础样式
 .fms-action-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 3px;
   border: none;
   background: transparent;
   cursor: pointer;
   padding: 2px 4px;
-  color: #ff4d4f;
+  color: #1677ff;
   font-size: 12px;
   line-height: 20px;
   white-space: nowrap;
@@ -235,6 +504,16 @@ defineExpose({ scrollToRow, getSelectedArea });
   &:hover {
     opacity: 0.75;
   }
+
+  &:disabled {
+    cursor: not-allowed;
+    color: #bfbfbf;
+    opacity: 1;
+  }
+
+  &--danger {
+    color: #ff4d4f;
+  }
 }
 
 // "更多" 展开按钮样式
diff --git a/code/fms/fms-vue/src/components/fms-table/utils/createCellRenderer.js b/code/fms/fms-vue/src/components/fms-table/utils/createCellRenderer.js
index 94f8c91b..759fa26f 100644
--- a/code/fms/fms-vue/src/components/fms-table/utils/createCellRenderer.js
+++ b/code/fms/fms-vue/src/components/fms-table/utils/createCellRenderer.js
@@ -1,198 +1,162 @@
 import { h, ref } from "vue";
-import { Dropdown, Menu, MenuItem, Modal } from "antdv-next";
-import { createInputCell } from "./createEditableCellRenderer";
+import { Dropdown, Modal } from "antdv-next";
+import { createEditableCell } from "./createEditableCellRenderer";
 
-const stop = (e) => e.stopPropagation();
+const stop = (event) => event.stopPropagation();
 
-// ──────────────────────────────────────────
-// 1. 通用操作触发：支持 confirm 弹窗
-// ──────────────────────────────────────────
 function triggerAction(action, row) {
-  if (action.confirm) {
-    Modal.confirm({
-      title: action.confirm,
-      okText: "确定",
-      okType: "danger",
-      cancelText: "取消",
-      onOk: () => action.onClick?.(row),
-    });
-  } else {
+  if (resolveActionState(action.disabled, row)) return;
+  if (!action.confirm) {
     action.onClick?.(row);
+    return;
   }
+
+  const confirm = typeof action.confirm === "string" ? { title: action.confirm } : action.confirm;
+  Modal.confirm({
+    okText: "确定",
+    okType: "danger",
+    cancelText: "取消",
+    ...confirm,
+    onOk: () => action.onClick?.(row),
+  });
 }
 
-// ──────────────────────────────────────────
-// 2. checkbox 类型渲染器
-// ──────────────────────────────────────────
-function createCheckboxCell(col) {
-  return ({ row, cellValue }) => {
-    const checked = cellValue === 1;
-    return h(
-      "label",
-      {
-        class: checked ? "fms-checkbox checked" : "fms-checkbox",
-        onClick: stop,
-        onMousedown: stop,
-      },
-      [
-        h("input", {
-          type: "checkbox",
-          checked,
-          onChange: (e) => {
-            e.stopPropagation();
-            row[col.dataIndex] = e.target.checked ? 1 : 0;
-            col.onChange?.();
-          },
-          onClick: stop,
-          onMousedown: stop,
-        }),
-        h("span", { class: "fms-checkbox-box" }),
+function resolveActionState(state, row) {
+  return typeof state === "function" ? Boolean(state(row)) : Boolean(state);
+}
+
+function isActionVisible(action, row) {
+  return action.visible === undefined || resolveActionState(action.visible, row);
+}
+
+function actionButton(action, row, className = "fms-action-btn") {
+  const disabled = resolveActionState(action.disabled, row);
+  const content = [];
+  if (action.icon) content.push(h(action.icon, { size: 14 }));
+  if (action.label || action.type) content.push(action.label || action.type);
+  return h(
+    "button",
+    {
+      type: "button",
+      class: [
+        className,
+        {
+          "fms-action-btn--danger":
+            action.danger || action.type === "danger" || action.type === "delete",
+        },
       ],
-    );
-  };
+      title: action.title || action.label,
+      disabled,
+      onMousedown: stop,
+      onClick: (event) => {
+        event.stopPropagation();
+        triggerAction(action, row);
+      },
+    },
+    content,
+  );
 }
 
-// ──────────────────────────────────────────
-// 3. actions 类型渲染器
-// ──────────────────────────────────────────
 function createActionsCell(actions) {
   if (!actions?.length) return undefined;
 
-  const inlineActions = actions.filter((a) => a.type !== "more");
-  const moreAction = actions.find((a) => a.type === "more");
-  const moreOpen = ref(false);
-  const moreRow = ref(null);
+  const inlineActions = actions.filter((action) => action.type !== "more");
+  const moreAction = actions.find((action) => action.type === "more");
+  const openRow = ref(null);
+  const itemByKey = new Map(
+    moreAction?.items?.map((item, index) => [String(item.key ?? item.type ?? index), item]) ?? [],
+  );
 
-  function makeButton(action, row) {
-    return h(
-      "button",
-      {
-        type: "button",
-        class: "fms-action-btn",
-        onMousedown: stop,
-        onClick: (e) => {
-          e.stopPropagation();
-          triggerAction(action, row);
-        },
-      },
-      action.label || action.type,
-    );
+  function closeMenu() {
+    openRow.value = null;
   }
 
   return ({ row }) => {
-    const children = [];
+    const children = inlineActions
+      .filter((action) => isActionVisible(action, row))
+      .map((action) => actionButton(action, row));
+    const visibleMoreItems = (moreAction?.items || []).filter((item) => isActionVisible(item, row));
+    if (!visibleMoreItems.length) return h("span", { class: "fms-actions-cell" }, children);
 
-    for (const action of inlineActions) {
-      children.push(makeButton(action, row));
+    const menuItems = visibleMoreItems.map((item, index) => ({
+      key: String(item.key ?? item.type ?? index),
+      label: item.label,
+      icon: item.icon ? h(item.icon, { size: 14 }) : undefined,
+      disabled: resolveActionState(item.disabled, row),
+      danger: item.danger || item.type === "danger" || item.type === "delete",
+    }));
+    const visibleItemByKey = new Map(
+      visibleMoreItems.map((item, index) => [String(item.key ?? item.type ?? index), item]),
+    );
+
+    if (openRow.value !== row) {
+      children.push(
+        h(
+          "button",
+          {
+            type: "button",
+            class: "fms-action-btn fms-action-more",
+            title: moreAction.title || "更多操作",
+            "aria-label": moreAction.title || "更多操作",
+            onMousedown: stop,
+            onClick: (event) => {
+              event.stopPropagation();
+              openRow.value = row;
+            },
+          },
+          moreAction.label || "⋯",
+        ),
+      );
+      return h("span", { class: "fms-actions-cell" }, children);
     }
 
-    if (moreAction?.items?.length) {
-      if (!moreOpen.value) {
-        children.push(
-          h(
-            "button",
-            {
-              type: "button",
-              class: "fms-action-btn fms-action-more",
-              onMousedown: stop,
-              onClick: (e) => {
-                e.stopPropagation();
-                moreOpen.value = true;
-                moreRow.value = row;
+    children.push(
+      h(
+        Dropdown,
+        {
+          open: true,
+          trigger: ["click"],
+          placement: "bottomRight",
+          menu: {
+            items: menuItems,
+            onClick: ({ key }) => {
+              const item = visibleItemByKey.get(String(key)) || itemByKey.get(String(key));
+              closeMenu();
+              if (item) triggerAction(item, row);
+            },
+          },
+          onOpenChange: (open) => {
+            if (!open) closeMenu();
+          },
+        },
+        {
+          default: () =>
+            h(
+              "button",
+              {
+                type: "button",
+                class: "fms-action-btn fms-action-more fms-action-more-open",
+                title: moreAction.title || "更多操作",
+                "aria-label": moreAction.title || "更多操作",
+                onMousedown: stop,
+                onClick: stop,
               },
-            },
-            "更多",
-          ),
-        );
-      } else {
-        children.push(
-          h(
-            Dropdown,
-            {
-              visible: true,
-              trigger: "click",
-              placement: "bottomRight",
-              onVisibleChange: (v) => {
-                if (!v) {
-                  moreOpen.value = false;
-                  moreRow.value = null;
-                }
-              },
-            },
-            {
-              default: () =>
-                h(
-                  "button",
-                  {
-                    type: "button",
-                    class: "fms-action-btn fms-action-more fms-action-more-open",
-                    onMousedown: stop,
-                  },
-                  "更多",
-                ),
-              overlay: () =>
-                h(Menu, null, {
-                  default: () =>
-                    moreAction.items.map((item) =>
-                      h(MenuItem, { key: item.label }, {
-                        default: () =>
-                          h(
-                            "span",
-                            {
-                              onClick: (e) => {
-                                e.stopPropagation();
-                                moreOpen.value = false;
-                                triggerAction(item, moreRow.value);
-                              },
-                            },
-                            item.label,
-                          ),
-                      }),
-                    ),
-                }),
-            },
-          ),
-        );
-      }
-    }
-
+              moreAction.label || "⋯",
+            ),
+        },
+      ),
+    );
     return h("span", { class: "fms-actions-cell" }, children);
   };
 }
 
-// ──────────────────────────────────────────
-// 4. 统一入口：根据 col.type 注入 customCell
-// ──────────────────────────────────────────
-const cellCache = new WeakMap();
-
-/**
- * 根据列定义的 type 属性自动注入 customCell 渲染器。
- * - `type: "input"`    → 原生 input（编辑态通过 row._editing 控制，非编辑态零 VNode 纯文本）
- * - `type: "checkbox"` → 原生 checkbox
- * - `type: "actions"`  → 操作按钮列（从 col.actions 读取按钮配置）
- * - 无 type 或有自定义 customCell → 保持原样
- *
- * input 类型不做缓存：因为 customCell 读的是 row._editing 运行时状态，
- * 不依赖闭包捕获的外部值，每次创建相同函数亦可安全返回。
- * checkbox/actions 使用 WeakMap 缓存，避免重复创建。
- */
-export function resolveCustomCell(col) {
+export function resolveCustomCell(col, editingContext) {
   if (col.customCell) return col;
+  if (col.editor) return { ...col, customCell: createEditableCell(col, editingContext) };
 
-  const cached = cellCache.get(col);
-  if (cached) return cached;
-
-  let result = col;
-  if (col.type === "input") {
-    // 不缓存：row._editing 在渲染时动态读取
-    return { ...col, customCell: createInputCell(col) };
-  } else if (col.type === "checkbox") {
-    result = { ...col, customCell: createCheckboxCell(col) };
-  } else if (col.type === "actions") {
-    const fn = createActionsCell(col.actions);
-    if (fn) result = { ...col, customCell: fn };
+  if (col.actions?.length) {
+    const customCell = createActionsCell(col.actions);
+    if (customCell) return { ...col, customCell };
   }
-
-  cellCache.set(col, result);
-  return result;
+  return col;
 }
diff --git a/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js b/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
index 14f33aa2..f7af44d5 100644
--- a/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
+++ b/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
@@ -1,52 +1,150 @@
 import { h } from "vue";
+import { Input, Select } from "antdv-next";
 
-/**
- * 为 type:"input" 的列创建 customCell 渲染器。
- *
- * 编辑状态通过 row._editing 控制：
- * - row._editing = { mode: "cell", col: "b_code" } → 该列显示 <input>（自动聚焦+全选）
- * - row._editing = undefined 或 col 不匹配 → 非编辑态，直接返回纯文本字符串（零 VNode 开销）
- *
- * 退出编辑时调用 col._onEditEnd()，由父组件触发全表重渲染。
- */
-export function createInputCell(col) {
-  return ({ row, cellValue }) => {
-    const editing = row._editing;
-    if (!editing || editing.mode !== "cell" || editing.col !== col.dataIndex) {
-      return cellValue ?? "";
+const stop = (event) => event.stopPropagation();
+
+function resolveOptions(editor) {
+  return typeof editor.options === "function" ? editor.options() : (editor.options ?? []);
+}
+
+function displayValue(row, col, editor) {
+  const value = row[col.dataIndex];
+  const text =
+    editor.type === "select"
+      ? (resolveOptions(editor).find((item) => String(item.value) === String(value))?.label ??
+        value)
+      : value;
+  const content = text ?? "";
+  return h("span", { class: "fms-cell-display", title: String(content) }, content);
+}
+
+function notifyChange(ctx, editor, row, col, value) {
+  if (!ctx.shouldNotify(row, col, value)) return;
+  editor.onChange?.(value, row, col);
+  ctx.onChange(row, col, value);
+}
+
+function createFocusHandler(ctx, row, col, selectText = false) {
+  return ({ component, el }) => {
+    if (!ctx.shouldFocus(row, col)) return;
+    const input = el?.matches?.("input") ? el : el?.querySelector?.("input");
+    if (document.activeElement === input) return;
+
+    const instance = component?.exposed || component?.proxy;
+    if (instance?.focus) {
+      instance.focus(selectText ? { cursor: "all" } : undefined);
+      return;
     }
 
-    const exitEdit = () => {
-      delete row._editing;
-      col._onEditEnd?.();
-    };
+    input?.focus();
+    if (selectText) input?.select();
+  };
+}
 
-    return h("input", {
-      type: "text",
-      value: cellValue ?? "",
-      class: "fms-editable-input",
-      onInput: (e) => {
-        row[col.dataIndex] = e.target.value;
-      },
-      onBlur: () => {
-        col.onChange?.();
-        exitEdit();
-      },
-      onKeydown: (e) => {
-        if (e.key === "Escape") {
-          col.onChange?.();
-          exitEdit();
-        }
-        if (e.key === "Enter") {
-          col.onChange?.();
-        }
-      },
-      ref: (el) => {
-        if (el) {
-          el.focus();
-          el.select();
-        }
-      },
-    });
+function createInput(row, col, editor, ctx) {
+  const focus = createFocusHandler(ctx, row, col, true);
+  return h(Input, {
+    type: editor.inputType || "text",
+    value: row[col.dataIndex] ?? "",
+    size: "small",
+    class: "fms-cell-editor fms-cell-editor-root",
+    "aria-label": col.title || col.dataIndex,
+    "onUpdate:value": (value) => {
+      row[col.dataIndex] = value;
+    },
+    onBlur: (event) => {
+      const value = event.target.value;
+      notifyChange(ctx, editor, row, col, value);
+    },
+    onKeydown: (event) => {
+      if (event.key === "Enter") {
+        event.preventDefault();
+        event.stopPropagation();
+        event.currentTarget.select();
+      } else if (event.key === "Escape") {
+        event.currentTarget.blur();
+      }
+    },
+    onClick: stop,
+    onVnodeMounted: focus,
+    onVnodeUpdated: focus,
+  });
+}
+
+function createSelect(row, col, editor, ctx) {
+  const options = resolveOptions(editor);
+  const focus = createFocusHandler(ctx, row, col);
+  return h(Select, {
+    value: row[col.dataIndex] ?? undefined,
+    options,
+    size: "small",
+    allowClear: editor.allowClear ?? true,
+    class: "fms-cell-editor fms-cell-editor-root",
+    "aria-label": col.title || col.dataIndex,
+    style: { width: "100%" },
+    getPopupContainer: (trigger) => trigger.parentNode,
+    "onUpdate:value": (value) => {
+      const resolved = value ?? (editor.emptyValue ?? null);
+      row[col.dataIndex] = resolved;
+      notifyChange(ctx, editor, row, col, resolved);
+    },
+    onClick: stop,
+    onVnodeMounted: focus,
+    onVnodeUpdated: focus,
+  });
+}
+
+function createCheckbox(row, col, editor, ctx) {
+  const checked = row[col.dataIndex] === 1;
+  const focus = ctx.isEditing(row) ? createFocusHandler(ctx, row, col) : undefined;
+  const update = (value) => {
+    row[col.dataIndex] = value;
+    notifyChange(ctx, editor, row, col, value);
+  };
+  return h(
+    "label",
+    {
+      class: checked
+        ? "fms-checkbox fms-cell-editor-root checked"
+        : "fms-checkbox fms-cell-editor-root",
+      onClick: stop,
+    },
+    [
+      h("input", {
+        type: "checkbox",
+        checked,
+        "aria-label": col.title || col.dataIndex,
+        onChange: (event) => {
+          update(event.target.checked ? 1 : 0);
+        },
+        onKeydown: (event) => {
+          if (event.key !== "Enter") return;
+          event.preventDefault();
+          event.stopPropagation();
+          const value = row[col.dataIndex] === 1 ? 0 : 1;
+          event.currentTarget.checked = value === 1;
+          update(value);
+        },
+        onClick: stop,
+        onVnodeMounted: focus,
+        onVnodeUpdated: focus,
+      }),
+      h("span", { class: "fms-checkbox-box" }),
+    ],
+  );
+}
+
+export function createEditableCell(col, ctx) {
+  const editor = col.editor;
+  return ({ row }) => {
+    // checkbox 始终可交互，点击即切换，无需先让整行进入编辑态
+    if (editor?.type === "checkbox") {
+      return createCheckbox(row, col, editor, ctx);
+    }
+    if (!ctx.isEditing(row)) {
+      return displayValue(row, col, editor);
+    }
+    if (editor.type === "select") return createSelect(row, col, editor, ctx);
+    return createInput(row, col, editor, ctx);
   };
 }
diff --git a/code/fms/fms-vue/src/components/fms-table/utils/createSelectionCellRenderers.js b/code/fms/fms-vue/src/components/fms-table/utils/createSelectionCellRenderers.js
index 057761d5..b7ca7030 100644
--- a/code/fms/fms-vue/src/components/fms-table/utils/createSelectionCellRenderers.js
+++ b/code/fms/fms-vue/src/components/fms-table/utils/createSelectionCellRenderers.js
@@ -18,10 +18,14 @@ const stop = (e) => e.stopPropagation();
 export function createSelectionColumn({ getDataSource, getRowKey, getSelectedRowKeys, onChange }) {
   // 已选 key 集合，内部响应式计算，仅对外暴露 column 对象
   const selectedRowKeySet = computed(() => new Set(getSelectedRowKeys()));
+  const rowByKey = computed(() => {
+    const rows = new Map();
+    for (const row of getDataSource()) rows.set(getRowKey(row), row);
+    return rows;
+  });
 
   function updateSelection(nextKeys) {
-    const keySet = new Set(nextKeys);
-    const rows = getDataSource().filter((row) => keySet.has(getRowKey(row)));
+    const rows = nextKeys.map((key) => rowByKey.value.get(key)).filter(Boolean);
     onChange(nextKeys, rows);
   }
 
@@ -49,7 +53,11 @@ export function createSelectionColumn({ getDataSource, getRowKey, getSelectedRow
     const checked = selectedRowKeySet.value.has(key);
     return h(
       "label",
-      { class: checked ? "fms-checkbox checked" : "fms-checkbox", onClick: stop, onMousedown: stop },
+      {
+        class: checked ? "fms-checkbox checked" : "fms-checkbox",
+        onClick: stop,
+        onMousedown: stop,
+      },
       [
         h("input", {
           type: "checkbox",
@@ -66,10 +74,13 @@ export function createSelectionColumn({ getDataSource, getRowKey, getSelectedRow
     );
   };
 
-  // 表头全选复选框：直接使用 Set.size 判断已选数，避免 filter 全表遍历
+  // 表头只统计当前数据中的选中项，避免筛选后被隐藏的 key 干扰状态。
   const SelectionHeaderCell = () => {
     const rows = getDataSource();
-    const selectedCount = selectedRowKeySet.value.size;
+    let selectedCount = 0;
+    for (const key of selectedRowKeySet.value) {
+      if (rowByKey.value.has(key)) selectedCount++;
+    }
     const allChecked = rows.length > 0 && selectedCount === rows.length;
     const indeterminate = selectedCount > 0 && selectedCount < rows.length;
 
diff --git a/code/fms/fms-vue/src/layouts/DefaultLayout.vue b/code/fms/fms-vue/src/layouts/DefaultLayout.vue
index 5c994a40..752d60de 100644
--- a/code/fms/fms-vue/src/layouts/DefaultLayout.vue
+++ b/code/fms/fms-vue/src/layouts/DefaultLayout.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { computed, defineAsyncComponent } from "vue";
 import { useRoute } from "vue-router";
 import { Minimize2 } from "@lucide/vue";
 import { useAppStore } from "@/stores/app";
@@ -8,6 +9,12 @@ import AppToolbar from "./components/AppToolbar.vue";
 
 const route = useRoute();
 const appStore = useAppStore();
+const FpsMonitor = import.meta.env.DEV
+  ? defineAsyncComponent(() => import("@/components/FpsMonitor.vue"))
+  : null;
+const routeInstanceKey = computed(
+  () => `${route.fullPath}:${appStore.getRouteRefreshKey(route.fullPath)}`,
+);
 </script>
 
 <template>
@@ -21,8 +28,8 @@ const appStore = useAppStore();
       <a-layout-content class="app-content">
         <router-view v-slot="{ Component }">
           <transition name="slide" mode="out-in">
-            <keep-alive>
-              <component :is="Component" :key="route.fullPath + ':' + appStore.routeRefreshKey" />
+            <keep-alive :max="8">
+              <component :is="Component" :key="routeInstanceKey" />
             </keep-alive>
           </transition>
         </router-view>
@@ -39,6 +46,11 @@ const appStore = useAppStore();
       <Minimize2 />
       <span>退出最大化</span>
     </button>
+
+    <FpsMonitor
+      v-if="FpsMonitor"
+      style="position: fixed; top: 8px; left: 50%; transform: translateX(-50%); z-index: 1000"
+    />
   </a-layout>
 </template>
 
diff --git a/code/fms/fms-vue/src/layouts/components/AppSidebar.vue b/code/fms/fms-vue/src/layouts/components/AppSidebar.vue
index a50a3cc9..0a883fbf 100644
--- a/code/fms/fms-vue/src/layouts/components/AppSidebar.vue
+++ b/code/fms/fms-vue/src/layouts/components/AppSidebar.vue
@@ -16,7 +16,8 @@ const menuItems = computed(() => {
   const systemPages = [
     { key: "/system/module-management", label: "模块管理", moduleCode: "m_metadata" },
     { key: "/system/i18n-type", label: "多语言类型", moduleCode: "m_i18n_type" },
-  ].filter((item) => permissionStore.canModule(item.moduleCode));
+    { key: "/system/login-log", label: "登录日志" },
+  ].filter((item) => !item.moduleCode || permissionStore.canModule(item.moduleCode));
   const items = [{ key: "/dashboard", icon: menuIcon(House), label: "工作台" }];
   if (systemPages.length)
     items.push({
diff --git a/code/fms/fms-vue/src/layouts/components/AppTabs.vue b/code/fms/fms-vue/src/layouts/components/AppTabs.vue
index 8badac7c..0c9c55a5 100644
--- a/code/fms/fms-vue/src/layouts/components/AppTabs.vue
+++ b/code/fms/fms-vue/src/layouts/components/AppTabs.vue
@@ -155,7 +155,7 @@ function goBack() {
 }
 
 function refreshCurrentRoute() {
-  appStore.refreshRoute();
+  appStore.refreshRoute(route.fullPath);
 }
 
 function toggleMaximize() {
diff --git a/code/fms/fms-vue/src/router/routes.js b/code/fms/fms-vue/src/router/routes.js
index 74db814f..2a982af7 100644
--- a/code/fms/fms-vue/src/router/routes.js
+++ b/code/fms/fms-vue/src/router/routes.js
@@ -14,16 +14,6 @@ const routes = [
         component: () => import("@/views/dashboard/index.vue"),
         meta: { title: "工作台", menuKey: "/dashboard" },
       },
-      {
-        path: "dashboard/table-demo",
-        name: "dashboard-table-demo",
-        component: () => import("@/views/dashboard/TableDemo.vue"),
-        meta: {
-          title: "表格 Demo",
-          section: "工作台",
-          menuKey: "/dashboard/table-demo",
-        },
-      },
       {
         path: "system/module-management",
         name: "system-module-management",
@@ -46,6 +36,16 @@ const routes = [
           moduleCode: "m_i18n_type",
         },
       },
+      {
+        path: "system/login-log",
+        name: "system-login-log",
+        component: () => import("@/views/system/login-log/index.vue"),
+        meta: {
+          title: "登录日志",
+          section: "系统管理",
+          menuKey: "/system/login-log",
+        },
+      },
     ],
   },
   {
diff --git a/code/fms/fms-vue/src/services/api.js b/code/fms/fms-vue/src/services/api.js
index 794f29b6..705754c8 100644
--- a/code/fms/fms-vue/src/services/api.js
+++ b/code/fms/fms-vue/src/services/api.js
@@ -79,6 +79,44 @@ export function pageDataApi({
   });
 }
 
+/**
+ * 分页查询登录日志（只读列表）。
+ * 通过通用分页接口加载 s_log_login 表，支持按账号（模糊）、登录结果、登录时间范围筛选。
+ * @param {object} options
+ * @param {string} [options.account] 账号关键字
+ * @param {0|1} [options.result] 登录结果：1 成功 / 0 失败
+ * @param {[Dayjs, Dayjs]} [options.range] 登录时间范围（antdv RangePicker 的 dayjs 值）
+ * @param {number} [options.pageNo=1]
+ * @param {number} [options.pageSize=20]
+ * @returns {Promise<ApiResult<{rows: object[], total: number}>>} 分页响应。
+ */
+export function pageLoginLogApi({ account, result, range, pageNo = 1, pageSize = 20 } = {}) {
+  const conditions = [];
+  if (account && account.trim()) {
+    const safe = account.trim().replace(/'/g, "''");
+    conditions.push(`b_account LIKE N'%${safe}%'`);
+  }
+  if (result === 1 || result === 0) {
+    conditions.push(`b_login_result = ${result}`);
+  }
+  if (Array.isArray(range) && range.length === 2 && range[0] && range[1]) {
+    const fmt = (v) =>
+      v && typeof v.format === "function"
+        ? v.format("YYYY-MM-DD")
+        : new Date(v).toISOString().slice(0, 10);
+    conditions.push(`b_login_time >= '${fmt(range[0])} 00:00:00'`);
+    conditions.push(`b_login_time <= '${fmt(range[1])} 23:59:59'`);
+  }
+  const searchCondition = conditions.length ? conditions.join(" AND ") : null;
+  return pageDataApi({
+    viewName: "s_log_login",
+    orderBy: "b_login_time DESC",
+    searchCondition,
+    pageNo,
+    pageSize,
+  });
+}
+
 /**
  * 在同一事务中保存一个或多个表的数据变更。
  * @param {{table: string, key_field: string, inserts?: object[], updates?: object[], deletes?: object[]}[]} requests 保存配置，不能为空数组。
diff --git a/code/fms/fms-vue/src/services/http.js b/code/fms/fms-vue/src/services/http.js
index 0f2361b8..999bf0ad 100644
--- a/code/fms/fms-vue/src/services/http.js
+++ b/code/fms/fms-vue/src/services/http.js
@@ -33,7 +33,7 @@ function isAuthenticationError(code) {
 function handleUnauthorized(code) {
   const authStore = useAuthStore();
   authStore.clearSession();
-  redirectToLogin(code === SESSION_REPLACED_CODE ? "session-replaced" : undefined);
+  redirectToLogin(code === SESSION_REPLACED_CODE ? "session-replaced" : "expired");
 }
 
 http.interceptors.request.use((config) => {
diff --git a/code/fms/fms-vue/src/stores/app.js b/code/fms/fms-vue/src/stores/app.js
index ccce01b9..48f169bb 100644
--- a/code/fms/fms-vue/src/stores/app.js
+++ b/code/fms/fms-vue/src/stores/app.js
@@ -10,7 +10,7 @@ export const useAppStore = defineStore(
     const sidebarCollapsed = ref(false);
     const visitedTabs = ref(createDefaultVisitedTabs());
     const contentMaximized = ref(false);
-    const routeRefreshKey = ref(0);
+    const routeRefreshKeys = ref({});
 
     function toggleSidebar() {
       sidebarCollapsed.value = !sidebarCollapsed.value;
@@ -20,8 +20,13 @@ export const useAppStore = defineStore(
       contentMaximized.value = !contentMaximized.value;
     }
 
-    function refreshRoute() {
-      routeRefreshKey.value++;
+    function refreshRoute(routeKey) {
+      const key = String(routeKey || "");
+      routeRefreshKeys.value[key] = (routeRefreshKeys.value[key] || 0) + 1;
+    }
+
+    function getRouteRefreshKey(routeKey) {
+      return routeRefreshKeys.value[String(routeKey || "")] || 0;
     }
 
     function setLocale(value) {
@@ -36,6 +41,7 @@ export const useAppStore = defineStore(
 
     function removeVisitedTab(key) {
       visitedTabs.value = visitedTabs.value.filter((item) => item.key !== key);
+      delete routeRefreshKeys.value[key];
     }
 
     return {
@@ -43,10 +49,10 @@ export const useAppStore = defineStore(
       sidebarCollapsed,
       visitedTabs,
       contentMaximized,
-      routeRefreshKey,
       toggleSidebar,
       toggleContentMaximized,
       refreshRoute,
+      getRouteRefreshKey,
       setLocale,
       addVisitedTab,
       removeVisitedTab,
diff --git a/code/fms/fms-vue/src/stores/permissions.js b/code/fms/fms-vue/src/stores/permissions.js
index 2e02f24b..337d801f 100644
--- a/code/fms/fms-vue/src/stores/permissions.js
+++ b/code/fms/fms-vue/src/stores/permissions.js
@@ -1,18 +1,20 @@
-import { computed, ref } from "vue";
+import { computed, ref, watch } from "vue";
 import { defineStore } from "pinia";
 import { loadDataApi } from "@/services/api";
 import { useAuthStore } from "./auth";
 
 export const usePermissionStore = defineStore("permissions", () => {
-  const loadedUserId = ref("");
-  const loadingPromise = ref(null);
+  const authStore = useAuthStore();
+  const loadedPrincipalKey = ref("");
   const moduleCodes = ref([]);
   const powerCodes = ref([]);
+  let loadingPromise = null;
+  let loadingPrincipalKey = "";
+  let loadVersion = 0;
 
   const moduleSet = computed(() => new Set(moduleCodes.value));
   const powerSet = computed(() => new Set(powerCodes.value));
   const isG3soft = computed(() => {
-    const authStore = useAuthStore();
     return (
       String(authStore.user?.account || "")
         .trim()
@@ -21,25 +23,33 @@ export const usePermissionStore = defineStore("permissions", () => {
   });
 
   async function load() {
-    const authStore = useAuthStore();
     const userId = String(authStore.user?.id || "");
+    const principalKey = `${String(authStore.orgId || "")}:${userId}`;
     if (isG3soft.value) {
-      loadedUserId.value = `g3soft:${userId}`;
+      const elevatedKey = `g3soft:${principalKey}`;
+      if (loadedPrincipalKey.value === elevatedKey) return;
+      loadVersion++;
+      loadingPromise = null;
+      loadingPrincipalKey = "";
+      loadedPrincipalKey.value = elevatedKey;
       moduleCodes.value = [];
       powerCodes.value = [];
       return;
     }
     if (!/^\d+$/.test(userId)) throw new Error("登录用户 ID 无效，请重新登录");
-    if (loadedUserId.value === userId) return;
-    if (loadingPromise.value) return loadingPromise.value;
+    if (loadedPrincipalKey.value === principalKey) return;
+    if (loadingPromise && loadingPrincipalKey === principalKey) return loadingPromise;
 
-    loadingPromise.value = Promise.all([
-      loadDataApi("b_module", "b_canuse = 1", "b_id ASC"),
+    const requestVersion = ++loadVersion;
+    loadingPrincipalKey = principalKey;
+    const request = Promise.all([
+      loadDataApi("s_module", "b_canuse = 1", "b_id ASC"),
       loadDataApi("b_user_module", `b_user_id = ${userId}`, "b_id ASC"),
       loadDataApi("b_user_power", `b_user_id = ${userId}`, "b_id ASC"),
-      loadDataApi("b_module_power", "b_canuse = 1", "b_id ASC"),
+      loadDataApi("s_module_power", "b_canuse = 1", "b_id ASC"),
     ])
       .then(([modules, userModules, userPowers, powers]) => {
+        if (requestVersion !== loadVersion) return;
         const moduleCodeById = new Map(
           modules.data.map((module) => [String(module.b_id), module.b_code]),
         );
@@ -55,12 +65,15 @@ export const usePermissionStore = defineStore("permissions", () => {
             return moduleCode ? `${moduleCode}.${power.b_code}` : "";
           })
           .filter(Boolean);
-        loadedUserId.value = userId;
+        loadedPrincipalKey.value = principalKey;
       })
       .finally(() => {
-        loadingPromise.value = null;
+        if (requestVersion !== loadVersion) return;
+        loadingPromise = null;
+        loadingPrincipalKey = "";
       });
-    return loadingPromise.value;
+    loadingPromise = request;
+    return request;
   }
 
   function canModule(moduleCode) {
@@ -74,10 +87,18 @@ export const usePermissionStore = defineStore("permissions", () => {
   }
 
   function clear() {
-    loadedUserId.value = "";
+    loadVersion++;
+    loadingPromise = null;
+    loadingPrincipalKey = "";
+    loadedPrincipalKey.value = "";
     moduleCodes.value = [];
     powerCodes.value = [];
   }
 
+  watch(
+    () => [authStore.orgId, authStore.user?.id, authStore.user?.account, authStore.token],
+    clear,
+  );
+
   return { load, canModule, canPower, clear, moduleCodes, powerCodes, isG3soft };
 });
diff --git a/code/fms/fms-vue/src/views/dashboard/TableDemo.vue b/code/fms/fms-vue/src/views/dashboard/TableDemo.vue
deleted file mode 100644
index e71f6186..00000000
--- a/code/fms/fms-vue/src/views/dashboard/TableDemo.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<script setup>
-import { h, shallowRef } from "vue";
-import { message } from "antdv-next";
-import { Input, InputNumber, Select } from "antdv-next";
-import FmsTable from "@/components/fms-table/FmsTable.vue";
-
-const COLUMN_COUNT = 20;
-const ROW_COUNT = 4000;
-
-const STATUS_OPTIONS = [
-  { label: "启用", value: 1 },
-  { label: "禁用", value: 0 },
-];
-
-function randInt(min, max) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-function randText(len) {
-  const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  let s = "";
-  for (let i = 0; i < len; i++) s += chars[randInt(0, chars.length - 1)];
-  return s;
-}
-function generateValue(c, i) {
-  switch (c % 5) {
-    case 0:
-      return randText(randInt(4, 10));
-    case 1:
-      return randInt(0, 99999);
-    case 2:
-      return STATUS_OPTIONS[randInt(0, 1)].value;
-    case 3:
-      return `名称-${i}-${c}`;
-    default:
-      return `${randInt(1000, 9999)}-${randText(4)}`;
-  }
-}
-
-function buildData() {
-  const rows = [];
-  for (let i = 0; i < ROW_COUNT; i++) {
-    const row = { id: `R${i}` };
-    for (let c = 1; c <= COLUMN_COUNT; c++) row[`col${c}`] = generateValue(c, i);
-    rows.push(row);
-  }
-  return rows;
-}
-
-const dataSource = shallowRef(buildData());
-
-// 当前编辑行 key；进入编辑时留存快照，取消可还原
-const editingKey = shallowRef(null);
-const editSnapshot = shallowRef(null);
-
-function editConfigFor(c) {
-  switch (c % 5) {
-    case 1:
-      return { type: "number" };
-    case 2:
-      return { type: "select", options: STATUS_OPTIONS };
-    default:
-      return { type: "text", maxlength: 64 };
-  }
-}
-
-// 单元格渲染：编辑行显示控件，其他行直接返回文本值（让 stk-table 用原生 textContent 渲染，零 VNode 开销）
-function makeCellEditor(dataIndex, edit) {
-  const selectOptions = edit.options || [];
-  return (props) => {
-    const { row, cellValue } = props;
-    if (row.id !== editingKey.value) {
-      // 非编辑态：直接返回文本字符串，不创建 VNode 包装
-      if (edit.type === "select") {
-        const opt = selectOptions.find((o) => o.value === cellValue);
-        return opt ? opt.label : (cellValue ?? "");
-      }
-      return cellValue ?? "";
-    }
-    // 编辑态：返回编辑组件 VNode
-    const update = (v) => {
-      row[dataIndex] = v;
-    };
-    const common = {
-      size: "small",
-      style: { width: "100%" },
-      onClick: (e) => e.stopPropagation(),
-    };
-    if (edit.type === "number") {
-      return h(InputNumber, {
-        ...common,
-        value: cellValue,
-        min: edit.min,
-        max: edit.max,
-        precision: edit.precision,
-        "onUpdate:value": update,
-      });
-    }
-    if (edit.type === "select") {
-      return h(Select, {
-        ...common,
-        value: cellValue,
-        options: selectOptions,
-        "onUpdate:value": update,
-      });
-    }
-    return h(Input, {
-      ...common,
-      value: cellValue,
-      maxlength: edit.maxlength,
-      "onUpdate:value": update,
-    });
-  };
-}
-
-function buildColumns() {
-  const cols = [
-    {
-      dataIndex: "id",
-      title: "编码",
-      width: 120,
-      fixed: "left",
-      customCell: makeCellEditor("id", { type: "text", maxlength: 32 }),
-    },
-  ];
-  for (let c = 1; c <= COLUMN_COUNT; c++) {
-    const edit = editConfigFor(c);
-    cols.push({
-      dataIndex: `col${c}`,
-      title: `列 ${c}`,
-      width: 140,
-      sorter: edit.type === "number" ? true : undefined,
-      customCell: makeCellEditor(`col${c}`, edit),
-    });
-  }
-  return cols;
-}
-
-const columns = shallowRef(buildColumns());
-
-function onRowClick(ev, row) {
-  if (row.id === editingKey.value) return;
-  editingKey.value = row.id;
-  editSnapshot.value = JSON.parse(JSON.stringify(row));
-}
-
-function saveEdit() {
-  if (editingKey.value == null) return;
-  editingKey.value = null;
-  editSnapshot.value = null;
-  message.success("已保存当前行修改");
-}
-
-function cancelEdit() {
-  if (editingKey.value != null && editSnapshot.value) {
-    const idx = dataSource.value.findIndex((r) => r.id === editingKey.value);
-    if (idx >= 0) dataSource.value[idx] = editSnapshot.value;
-  }
-  editingKey.value = null;
-  editSnapshot.value = null;
-  message.info("已取消编辑");
-}
-
-function regenerate() {
-  editingKey.value = null;
-  editSnapshot.value = null;
-  dataSource.value = buildData();
-  message.success("已重新生成随机数据");
-}
-
-function rowClassName(row) {
-  return row.id === editingKey.value ? "fms-row-editing" : "";
-}
-</script>
-
-<template>
-  <main class="table-demo">
-    <header class="table-demo__toolbar">
-      <div class="table-demo__title">
-        <strong>大数据表格 Demo</strong>
-        <span class="table-demo__meta">
-          共 {{ dataSource.length }} 行 · {{ columns.length }} 列 ·
-          <template v-if="editingKey">正在编辑：{{ editingKey }}</template>
-          <template v-else>点击任意行进入编辑</template>
-        </span>
-      </div>
-      <div class="table-demo__actions">
-        <a-button :disabled="editingKey == null" type="primary" @click="saveEdit">保存</a-button>
-        <a-button :disabled="editingKey == null" @click="cancelEdit">取消</a-button>
-        <a-button @click="regenerate">重新生成</a-button>
-      </div>
-    </header>
-
-    <section class="table-demo__body">
-      <FmsTable
-        v-model:columns="columns"
-        :data-source="dataSource"
-        row-key="id"
-        :row-class-name="rowClassName"
-        show-overflow
-        @row-click="onRowClick"
-      />
-    </section>
-  </main>
-</template>
-
-<style scoped>
-.table-demo {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  min-height: 0;
-  color: var(--fms-text);
-  background: var(--fms-surface);
-}
-
-.table-demo__toolbar {
-  display: flex;
-  flex: none;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 12px 16px;
-  border-bottom: 1px solid var(--fms-border);
-}
-
-.table-demo__title {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  min-width: 0;
-}
-
-.table-demo__title strong {
-  font-size: 15px;
-  font-weight: 600;
-}
-
-.table-demo__meta {
-  color: var(--fms-text-secondary);
-  font-size: 12px;
-}
-
-.table-demo__actions {
-  display: flex;
-  flex: none;
-  gap: 8px;
-}
-
-.table-demo__body {
-  flex: 1;
-  min-height: 0;
-  padding: 12px 16px 16px;
-}
-
-::deep(.fms-row-editing) {
-  background: rgba(22, 119, 255, 0.08) !important;
-}
-</style>
diff --git a/code/fms/fms-vue/src/views/dashboard/index.vue b/code/fms/fms-vue/src/views/dashboard/index.vue
index d70fd3cc..e104d5af 100644
--- a/code/fms/fms-vue/src/views/dashboard/index.vue
+++ b/code/fms/fms-vue/src/views/dashboard/index.vue
@@ -3,7 +3,6 @@ import { h, shallowRef } from "vue";
 import { message } from "antdv-next";
 import { Input, InputNumber, Select } from "antdv-next";
 import FmsTable from "@/components/fms-table/FmsTable.vue";
-import FpsMonitor from "@/components/FpsMonitor.vue";
 
 const COLUMN_COUNT = 20;
 const ROW_COUNT = 4000;
@@ -192,7 +191,6 @@ function rowClassName(row) {
     </header>
 
     <section class="table-demo__body">
-      <FpsMonitor />
       <FmsTable
         v-model:columns="columns"
         :data-source="dataSource"
@@ -256,7 +254,7 @@ function rowClassName(row) {
   padding: 12px 16px 16px;
 }
 
-::deep(.fms-row-editing) {
+:deep(.fms-row-editing) {
   background: rgba(22, 119, 255, 0.08) !important;
 }
 </style>
diff --git a/code/fms/fms-vue/src/views/login/index.vue b/code/fms/fms-vue/src/views/login/index.vue
index bed6a202..351309d5 100644
--- a/code/fms/fms-vue/src/views/login/index.vue
+++ b/code/fms/fms-vue/src/views/login/index.vue
@@ -41,9 +41,15 @@ const form = reactive({
 });
 
 onMounted(() => {
-  if (route.query.reason !== "session-replaced") return;
+  const reason = route.query.reason;
+  if (reason !== "session-replaced" && reason !== "expired") return;
+
+  if (reason === "session-replaced") {
+    message.warning("账号已在其他设备登录，请重新登录");
+  } else {
+    message.warning("登录已过期或已失效，请重新登录");
+  }
 
-  message.warning("账号已在其他设备登录，请重新登录");
   const query = { ...route.query };
   delete query.reason;
   router.replace({ name: "login", query });
diff --git a/code/fms/fms-vue/src/views/module-management/components/FieldGroupManager.vue b/code/fms/fms-vue/src/views/module-management/components/FieldGroupManager.vue
index 69b979b4..46dca0a6 100644
--- a/code/fms/fms-vue/src/views/module-management/components/FieldGroupManager.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/FieldGroupManager.vue
@@ -7,6 +7,7 @@ import {
   cloneData,
   diffRows,
   allocateTemporaryIds,
+  remapForeignKeys,
   tableChange,
   hasChanges,
 } from "@/utils/dataChanges";
@@ -22,7 +23,6 @@ const emit = defineEmits(["update:visible", "update"]);
 
 const localGroups = ref([]);
 const selectedGroupId = ref(null);
-const editForm = ref(null);
 
 watch(
   () => props.groups,
@@ -37,34 +37,29 @@ const treeData = computed(() => {
 });
 
 function buildTreeData(items) {
-  const map = new Map();
+  const nodes = new Map();
   const roots = [];
-  items.forEach((item) => {
-    item.key = String(item.b_id);
-    map.set(item.key, item);
-  });
-  items.forEach((item) => {
-    if (item.b_parent_id && map.has(String(item.b_parent_id))) {
-      const parent = map.get(String(item.b_parent_id));
-      if (!parent.children) parent.children = [];
-      parent.children.push(item);
+
+  for (const item of items) {
+    const key = String(item.b_id);
+    nodes.set(key, {
+      key,
+      title: item.b_title || `分组-${item.b_id}`,
+      children: [],
+    });
+  }
+
+  for (const item of items) {
+    const node = nodes.get(String(item.b_id));
+    const parent = item.b_parent_id ? nodes.get(String(item.b_parent_id)) : null;
+    if (parent && parent !== node) {
+      parent.children.push(node);
     } else {
-      roots.push(item);
+      roots.push(node);
     }
-  });
-  return roots.map((r) => ({
-    key: r.key,
-    title: r.b_title || `分组-${r.b_id}`,
-    children:
-      r.children?.map((c) => ({
-        key: c.key,
-        title: c.b_title || `分组-${c.b_id}`,
-        children: c.children?.map((gc) => ({
-          key: gc.key,
-          title: gc.b_title || `分组-${gc.b_id}`,
-        })),
-      })) || [],
-  }));
+  }
+
+  return roots;
 }
 
 const selectedGroup = computed(() =>
@@ -74,11 +69,8 @@ const selectedGroup = computed(() =>
 function onTreeSelect(keys) {
   if (keys.length > 0) {
     selectedGroupId.value = String(keys[0]);
-    const g = selectedGroup.value;
-    editForm.value = g ? { ...g } : null;
   } else {
     selectedGroupId.value = null;
-    editForm.value = null;
   }
 }
 
@@ -94,26 +86,33 @@ function addGroup(parentId) {
   };
   localGroups.value.push(newGroup);
   selectedGroupId.value = String(newGroup.b_id);
-  editForm.value = { ...newGroup };
 }
 
 function deleteGroup() {
   if (!selectedGroupId.value) return;
   localGroups.value = localGroups.value.filter((g) => String(g.b_id) !== selectedGroupId.value);
   selectedGroupId.value = null;
-  editForm.value = null;
 }
 
 async function saveAllGroups() {
+  if (localGroups.value.some((group) => !String(group.b_title || "").trim())) {
+    message.warning("请填写分组标题");
+    return;
+  }
   const original = cloneData(props.groups || []);
   const changes = diffRows(localGroups.value, original);
-  const req = tableChange("b_module_field_group", changes);
+  const req = tableChange("s_module_field_group", changes);
   if (!hasChanges(req)) {
     message.info("没有需要保存的变更");
     return;
   }
   try {
-    await allocateTemporaryIds([req.inserts || [], req.updates || [], req.deletes || []]);
+    const idMapping = await allocateTemporaryIds([
+      req.inserts || [],
+      req.updates || [],
+      req.deletes || [],
+    ]);
+    remapForeignKeys(localGroups.value, ["b_parent_id"], idMapping);
     await saveObjectApi([req]);
     emit("update", cloneData(localGroups.value));
     message.success("分组已保存");
@@ -155,28 +154,24 @@ function onClose() {
         </FmsTree>
         <a-empty v-else description="暂无分组" />
       </div>
-      <div class="group-detail" v-if="editForm">
+      <div v-if="selectedGroup" class="group-detail">
         <a-form layout="vertical">
           <a-form-item label="分组标题" required>
-            <a-input :value="editForm.b_title" @update:value="(v) => (editForm.b_title = v)" />
+            <a-input v-model:value="selectedGroup.b_title" />
           </a-form-item>
           <a-form-item label="多语言键">
             <a-input
-              :value="editForm.b_i18n"
-              @update:value="(v) => (editForm.b_i18n = v || null)"
+              :value="selectedGroup.b_i18n"
+              @update:value="(v) => (selectedGroup.b_i18n = v || null)"
             />
           </a-form-item>
           <a-form-item label="排序号">
-            <a-input-number
-              :value="editForm.b_xh"
-              :min="0"
-              @update:value="(v) => (editForm.b_xh = v)"
-            />
+            <a-input-number v-model:value="selectedGroup.b_xh" :min="0" />
           </a-form-item>
           <a-form-item label="启用">
             <a-switch
-              :checked="editForm.b_canuse === 1"
-              @update:checked="(v) => (editForm.b_canuse = v ? 1 : 0)"
+              :checked="selectedGroup.b_canuse === 1"
+              @update:checked="(v) => (selectedGroup.b_canuse = v ? 1 : 0)"
             />
           </a-form-item>
           <a-form-item>
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModuleBasicPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModuleBasicPanel.vue
index 4a7abd9c..50c55277 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModuleBasicPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModuleBasicPanel.vue
@@ -17,6 +17,7 @@ const formData = ref(null);
 watch(
   () => props.data,
   (val) => {
+    if (val === formData.value) return;
     formData.value = val ? { ...val } : null;
   },
   { immediate: true },
@@ -27,7 +28,7 @@ const isPage = computed(() => formData.value?.b_module_type === "page");
 const isData = computed(() => formData.value?.b_module_type === "data");
 
 function emitUpdate() {
-  if (formData.value) emit("update", { ...formData.value });
+  if (formData.value) emit("update", formData.value);
 }
 
 function setField(field, value) {
@@ -37,9 +38,10 @@ function setField(field, value) {
 }
 
 // 多语言键由模块编码自动生成（module.<编码>），无需手动填写。
+// 编码变化时始终以完整编码重新派生，避免只生成首字母后不再更新。
 function onCodeInput(v) {
   setField("b_code", v);
-  if (!formData.value.b_i18n && v) {
+  if (v) {
     formData.value.b_i18n = `module.${v}`;
     emitUpdate();
   }
@@ -60,7 +62,7 @@ function onI18nSaved(key) {
 <template>
   <div class="basic-panel" v-if="formData">
     <div class="panel-body">
-      <a-form layout="vertical" class="basic-form">
+      <a-form layout="vertical" class="basic-form" :disabled="loading">
         <a-row :gutter="16">
           <a-col :span="8">
             <a-form-item label="模块编码" required>
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModuleEditConfigPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModuleEditConfigPanel.vue
index 99a2a4c2..0451cbe6 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModuleEditConfigPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModuleEditConfigPanel.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { computed, ref, shallowRef, watch } from "vue";
 import FmsTable from "@/components/fms-table/FmsTable.vue";
-import { createTempId } from "@/utils/tempId";
 import FieldGroupManager from "./FieldGroupManager.vue";
 
 const props = defineProps({
@@ -21,16 +20,22 @@ const activeKey = ref(null);
 watch(
   () => props.editConfig,
   (val) => {
+    if (val === localEdit.value) return;
     localEdit.value = val?.map((r) => ({ ...r })) || [];
   },
   { immediate: true },
 );
 
 function emitUpdate() {
-  emit(
-    "update",
-    localEdit.value.map((r) => ({ ...r })),
-  );
+  emit("update", localEdit.value);
+}
+
+function onRowOrderChange(rows) {
+  localEdit.value = rows.map((row, index) => ({
+    ...row,
+    b_xh: (index + 1) * 10,
+  }));
+  emitUpdate();
 }
 
 const availableFields = computed(() =>
@@ -45,21 +50,8 @@ const groupOptions = computed(() =>
     .map((g) => ({ label: g.b_title || `分组-${g.b_id}`, value: String(g.b_id) })),
 );
 
-function addRow() {
-  localEdit.value.push({
-    b_id: createTempId(),
-    b_module_id: props.moduleId,
-    b_field_id: null,
-    b_required: 0,
-    b_readonly: 0,
-    b_disabled: 0,
-    b_group_id: null,
-    b_xh: localEdit.value.length * 10,
-  });
-  emitUpdate();
-}
-
 function deleteRow(record) {
+  if (props.loading) return;
   localEdit.value = localEdit.value.filter((r) => r.b_id !== record.b_id);
   emitUpdate();
 }
@@ -120,17 +112,19 @@ const columns = shallowRef([
   <div class="edit-config-panel">
     <div class="panel-toolbar">
       <a-space>
-        <a-button type="primary" @click="addRow">新增行</a-button>
-        <a-button @click="groupManagerVisible = true">分组管理</a-button>
+        <a-button :disabled="loading" @click="groupManagerVisible = true">分组管理</a-button>
       </a-space>
     </div>
     <div class="panel-body">
       <FmsTable
         v-model:columns="columns"
         :data-source="localEdit"
+        :editable="!loading"
+        :row-draggable="!loading"
         row-key="b_id"
         :active-row-key="activeKey"
         @row-click="(ev, row) => (activeKey = row.b_id)"
+        @row-order-change="onRowOrderChange"
       />
     </div>
     <FieldGroupManager
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModuleFieldsPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModuleFieldsPanel.vue
index 321879ae..9e156b34 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModuleFieldsPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModuleFieldsPanel.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { ref, shallowRef, watch } from "vue";
+import { ref, watch, computed } from "vue";
+import { message, Modal } from "antdv-next";
 import FmsTable from "@/components/fms-table/FmsTable.vue";
 
 const FIELD_TYPES = [
@@ -25,24 +26,95 @@ const emit = defineEmits(["update", "sync"]);
 const localFields = ref([]);
 const activeKey = ref(null);
 
+// 同步：未配置查询视图时，手动输入表/视图名
+const syncOpen = ref(false);
+const syncTable = ref("");
+
+function onSyncClick() {
+  if (props.viewTable) {
+    emit("sync", props.viewTable);
+    return;
+  }
+  syncTable.value = "";
+  syncOpen.value = true;
+}
+
+function onSyncConfirm() {
+  const name = syncTable.value.trim();
+  if (!name) {
+    message.warning("请输入表或视图名");
+    return;
+  }
+  syncOpen.value = false;
+  emit("sync", name);
+}
+
 watch(
   () => props.fields,
   (val) => {
+    if (val === localFields.value) return;
     localFields.value = val?.map((r) => ({ ...r })) || [];
   },
   { immediate: true },
 );
 
 function emitUpdate() {
-  emit(
-    "update",
-    localFields.value.map((r) => ({ ...r })),
-  );
+  emit("update", localFields.value);
 }
 
-const columns = shallowRef([
+// 编辑器已直接更新当前行，这里只向父级同步草稿。
+function onCellChange() {
+  emitUpdate();
+}
+
+// 行多选：selectedRowKeys 由 FmsTable 的选择列回写；
+// 传了 rowSelection 时 FmsTable 会在最前列插入复选框列（也是单击进入编辑态所需的机制）。
+const selectedRowKeys = ref([]);
+const rowSelection = computed(() => ({
+  selectedRowKeys: selectedRowKeys.value,
+  onChange: (keys) => {
+    selectedRowKeys.value = keys;
+  },
+}));
+
+function deleteRow(record) {
+  if (props.loading) return;
+  localFields.value = localFields.value.filter((r) => r.b_id !== record.b_id);
+  const k = String(record.b_id);
+  if (selectedRowKeys.value.includes(k)) {
+    selectedRowKeys.value = selectedRowKeys.value.filter((x) => x !== k);
+  }
+  emitUpdate();
+}
+
+// 批量删除选中行
+function batchDelete() {
+  if (props.loading) return;
+  const keys = selectedRowKeys.value;
+  if (!keys.length) return;
+  Modal.confirm({
+    title: `确定删除选中的 ${keys.length} 条记录？`,
+    okText: "删除",
+    okType: "danger",
+    cancelText: "取消",
+    onOk: () => {
+      const delSet = new Set(keys);
+      localFields.value = localFields.value.filter((r) => !delSet.has(r.b_id));
+      selectedRowKeys.value = [];
+      if (activeKey.value && delSet.has(activeKey.value)) activeKey.value = "";
+      emitUpdate();
+    },
+  });
+}
+
+const columns = ref([
   { dataIndex: "b_field", title: "字段名", width: 140 },
-  { dataIndex: "b_name", title: "字段名称", width: 140 },
+  {
+    dataIndex: "b_name",
+    title: "字段名称",
+    width: 140,
+    editor: { type: "input", onChange: () => emitUpdate() },
+  },
   {
     dataIndex: "b_type",
     title: "控件类型",
@@ -53,8 +125,18 @@ const columns = shallowRef([
       onChange: () => emitUpdate(),
     },
   },
-  { dataIndex: "b_default_value", title: "默认值", width: 120 },
-  { dataIndex: "b_i18n", title: "多语言键", width: 140 },
+  {
+    dataIndex: "b_default_value",
+    title: "默认值",
+    width: 120,
+    editor: { type: "input", onChange: () => emitUpdate() },
+  },
+  {
+    dataIndex: "b_i18n",
+    title: "多语言键",
+    width: 140,
+    editor: { type: "input", onChange: () => emitUpdate() },
+  },
   {
     dataIndex: "b_canuse",
     title: "启用",
@@ -62,6 +144,19 @@ const columns = shallowRef([
     align: "center",
     editor: { type: "checkbox", onChange: () => emitUpdate() },
   },
+  {
+    dataIndex: "actions",
+    title: "操作",
+    width: 60,
+    actions: [
+      {
+        type: "delete",
+        label: "删除",
+        confirm: "确定删除该字段？",
+        onClick: (row) => deleteRow(row),
+      },
+    ],
+  },
 ]);
 </script>
 
@@ -69,18 +164,39 @@ const columns = shallowRef([
   <div class="fields-panel">
     <div class="panel-toolbar">
       <a-space>
-        <a-button v-if="viewTable" type="primary" @click="emit('sync')">
-          同步字段 ({{ viewTable }})
+        <a-button type="primary" :disabled="loading" @click="onSyncClick">
+          同步字段{{ viewTable ? ` (${viewTable})` : "" }}
         </a-button>
+        <a-button danger :disabled="loading || !selectedRowKeys.length" @click="batchDelete">
+          批量删除{{ selectedRowKeys.length ? `(${selectedRowKeys.length})` : "" }}
+        </a-button>
+        <span v-if="!viewTable" class="panel-hint">未配置查询视图，点击后手动输入表名</span>
       </a-space>
     </div>
+
+    <a-modal
+      v-model:open="syncOpen"
+      title="同步字段"
+      @ok="onSyncConfirm"
+      :confirm-loading="loading"
+    >
+      <p>当前模块未配置查询视图，请填写要同步字段的表或视图名：</p>
+      <a-input
+        v-model:value="syncTable"
+        placeholder="例如 s_log_login 或 v_biz"
+        @press-enter="onSyncConfirm"
+      />
+    </a-modal>
     <div class="panel-body">
       <FmsTable
         v-model:columns="columns"
         :data-source="localFields"
+        :editable="!loading"
         row-key="b_id"
         :active-row-key="activeKey"
-        @row-click="(ev, row) => (activeKey = row.b_id)"
+        :row-selection="rowSelection"
+        @row-click="(_, row) => (activeKey = String(row.b_id))"
+        @change="onCellChange"
       />
     </div>
   </div>
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModuleI18nPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModuleI18nPanel.vue
index 67ecdc47..6b6c672d 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModuleI18nPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModuleI18nPanel.vue
@@ -2,7 +2,6 @@
 import { computed, nextTick, ref, watch } from "vue";
 import { message, Modal } from "antdv-next";
 import FmsTable from "@/components/fms-table/FmsTable.vue";
-import FpsMonitor from "@/components/FpsMonitor.vue";
 import { loadDataApi } from "@/services/api";
 import {
   cloneData,
@@ -86,6 +85,7 @@ async function loadI18n() {
 watch(() => props.moduleId, loadI18n, { immediate: true });
 
 async function addRow() {
+  if (props.loading || isLoading.value) return;
   const newId = createTempId();
   // 用新引用替换（而非 push），否则 displayedData 这个 computed 因返回同一数组引用而不会触发重渲染
   pivotRows.value = [...pivotRows.value, { _id: newId, b_key: "", _localeIds: {} }];
@@ -96,6 +96,7 @@ async function addRow() {
 }
 
 function deleteRow(record) {
+  if (props.loading || isLoading.value) return;
   pivotRows.value = pivotRows.value.filter((r) => r._id !== record._id);
   // 同步清理选择状态，避免选中项被删后 keys 残留
   const k = String(record._id);
@@ -116,6 +117,7 @@ const rowSelection = computed(() => ({
 
 // 批量删除选中行（整条 key，含其全部语言）
 function batchDelete() {
+  if (props.loading || isLoading.value) return;
   const keys = selectedRowKeys.value;
   if (!keys.length) return;
   Modal.confirm({
@@ -189,9 +191,13 @@ const columns = computed(() => {
     title: "操作",
     width: 60,
     align: "center",
-    type: "actions",
     actions: [
-      { type: "delete", label: "删除", confirm: "确定删除该记录（含其全部语言）？", onClick: (row) => deleteRow(row) },
+      {
+        type: "delete",
+        label: "删除",
+        confirm: "确定删除该记录（含其全部语言）？",
+        onClick: (row) => deleteRow(row),
+      },
     ],
   });
   return cols;
@@ -204,22 +210,29 @@ const columns = computed(() => {
       <a-space>
         <a-input-search
           v-model:value="searchKey"
+          :disabled="loading || isLoading"
           placeholder="搜索键"
           style="width: 200px"
           allow-clear
         />
-        <a-button type="primary" @click="addRow">新增翻译</a-button>
-        <a-button danger :disabled="!selectedRowKeys.length" @click="batchDelete">
+        <a-button type="primary" :disabled="loading || isLoading" @click="addRow"
+          >新增翻译</a-button
+        >
+        <a-button
+          danger
+          :disabled="loading || isLoading || !selectedRowKeys.length"
+          @click="batchDelete"
+        >
           批量删除{{ selectedRowKeys.length ? `(${selectedRowKeys.length})` : "" }}
         </a-button>
       </a-space>
     </div>
     <div class="panel-body">
-      <FpsMonitor />
       <FmsTable
         ref="tableRef"
         :columns="columns"
         :data-source="displayedData"
+        :editable="!loading && !isLoading"
         row-key="_id"
         :active-row-key="activeKey"
         :row-selection="rowSelection"
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModuleListConfigPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModuleListConfigPanel.vue
index 32b86cf2..0ee785a8 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModuleListConfigPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModuleListConfigPanel.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { computed, ref, shallowRef, watch } from "vue";
 import FmsTable from "@/components/fms-table/FmsTable.vue";
-import { createTempId } from "@/utils/tempId";
 import FieldGroupManager from "./FieldGroupManager.vue";
 
 const props = defineProps({
@@ -21,16 +20,22 @@ const activeKey = ref(null);
 watch(
   () => props.listConfig,
   (val) => {
+    if (val === localList.value) return;
     localList.value = val?.map((r) => ({ ...r })) || [];
   },
   { immediate: true },
 );
 
 function emitUpdate() {
-  emit(
-    "update",
-    localList.value.map((r) => ({ ...r })),
-  );
+  emit("update", localList.value);
+}
+
+function onRowOrderChange(rows) {
+  localList.value = rows.map((row, index) => ({
+    ...row,
+    b_xh: (index + 1) * 10,
+  }));
+  emitUpdate();
 }
 
 const availableFields = computed(() =>
@@ -45,23 +50,8 @@ const groupOptions = computed(() =>
     .map((g) => ({ label: g.b_title || `分组-${g.b_id}`, value: String(g.b_id) })),
 );
 
-function addRow() {
-  localList.value.push({
-    b_id: createTempId(),
-    b_module_id: props.moduleId,
-    b_field_id: null,
-    b_group_id: null,
-    b_title: null,
-    b_i18n: null,
-    b_visible: 1,
-    b_xh: localList.value.length * 10,
-    b_width: null,
-    b_sortable: 0,
-  });
-  emitUpdate();
-}
-
 function deleteRow(record) {
+  if (props.loading) return;
   localList.value = localList.value.filter((r) => r.b_id !== record.b_id);
   emitUpdate();
 }
@@ -77,7 +67,6 @@ const columns = shallowRef([
       onChange: () => emitUpdate(),
     },
   },
-  { dataIndex: "b_title", title: "列标题", width: 120 },
   { dataIndex: "b_width", title: "列宽", width: 80 },
   {
     dataIndex: "b_group_id",
@@ -96,13 +85,6 @@ const columns = shallowRef([
     align: "center",
     editor: { type: "checkbox", onChange: () => emitUpdate() },
   },
-  {
-    dataIndex: "b_sortable",
-    title: "排序",
-    width: 60,
-    align: "center",
-    editor: { type: "checkbox", onChange: () => emitUpdate() },
-  },
   { dataIndex: "b_xh", title: "排序号", width: 80 },
   {
     dataIndex: "actions",
@@ -125,17 +107,19 @@ const columns = shallowRef([
   <div class="list-config-panel">
     <div class="panel-toolbar">
       <a-space>
-        <a-button type="primary" @click="addRow">新增列</a-button>
-        <a-button @click="groupManagerVisible = true">分组管理</a-button>
+        <a-button :disabled="loading" @click="groupManagerVisible = true">分组管理</a-button>
       </a-space>
     </div>
     <div class="panel-body">
       <FmsTable
         v-model:columns="columns"
         :data-source="localList"
+        :editable="!loading"
+        :row-draggable="!loading"
         row-key="b_id"
         :active-row-key="activeKey"
         @row-click="(ev, row) => (activeKey = row.b_id)"
+        @row-order-change="onRowOrderChange"
       />
     </div>
     <FieldGroupManager
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModulePowersPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModulePowersPanel.vue
index 477ebdeb..11edbf6a 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModulePowersPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModulePowersPanel.vue
@@ -3,7 +3,6 @@ import { computed, h, nextTick, ref, watch } from "vue";
 import { message, Modal } from "antdv-next";
 import { Languages } from "@lucide/vue";
 import FmsTable from "@/components/fms-table/FmsTable.vue";
-import FpsMonitor from "@/components/FpsMonitor.vue";
 import { createTempId } from "@/utils/tempId";
 import I18nQuickSetModal from "./I18nQuickSetModal.vue";
 
@@ -23,7 +22,8 @@ const tableRef = ref(null);
 // 多语言键按 power.<模块代码>.<操作编码> 自动生成，无需手动填写。
 watch(
   () => [props.powers, props.moduleCode],
-  ([val]) => {
+  ([val, moduleCode], previous = []) => {
+    if (val === localPowers.value && moduleCode === previous[1]) return;
     localPowers.value = (val || []).map((r) => ({
       ...r,
       b_i18n:
@@ -34,13 +34,11 @@ watch(
 );
 
 function emitUpdate() {
-  emit(
-    "update",
-    localPowers.value.map((r) => ({ ...r })),
-  );
+  emit("update", localPowers.value);
 }
 
 async function addRow() {
+  if (props.loading) return;
   const newId = createTempId();
   localPowers.value.push({
     b_id: newId,
@@ -59,6 +57,7 @@ async function addRow() {
 }
 
 function deleteRow(record) {
+  if (props.loading) return;
   localPowers.value = localPowers.value.filter((r) => r.b_id !== record.b_id);
   // 同步清理选择状态，避免选中项被删后 keys 残留
   const k = String(record.b_id);
@@ -80,6 +79,7 @@ const rowSelection = computed(() => ({
 
 // 批量删除选中行
 function batchDelete() {
+  if (props.loading) return;
   const keys = selectedRowKeys.value;
   if (!keys.length) return;
   Modal.confirm({
@@ -97,47 +97,9 @@ function batchDelete() {
   });
 }
 
-// ── 编辑状态管理 ──
-// 通过 row._editing = { mode: "cell", col: dataIndex } 控制单元格编辑。
-// area-selection-change 统一响应鼠标点击和键盘方向键，无需额外 row-click 处理。
-// 编辑状态变更后需触发表格重渲染。
-function handleEditEnd() {
-  let hasEditing = false;
-  localPowers.value.forEach((r) => {
-    if (r._editing) {
-      delete r._editing;
-      hasEditing = true;
-    }
-  });
-  if (hasEditing) localPowers.value = [...localPowers.value];
-}
-
-function handleAreaSelectionChange(ranges) {
-  if (!ranges?.length) {
-    handleEditEnd();
-    return;
-  }
-  const begin = ranges[0].index.begin;
-  const row = localPowers.value[begin.row];
-  const area = tableRef.value?.getSelectedArea();
-  if (!row || !area) return;
-
-  const col = area.cols[begin.col];
-  if (!col || col.type !== "input") {
-    handleEditEnd();
-    return;
-  }
-
-  const rowId = String(row.b_id);
-  // 目标未变则跳过，避免方向键连续触发全表重渲染
-  const cur = row._editing;
-  if (cur && cur.mode === "cell" && cur.col === col.dataIndex && cur.rowId === rowId) return;
-
-  localPowers.value.forEach((r) => {
-    if (r._editing) delete r._editing;
-  });
-  row._editing = { mode: "cell", col: col.dataIndex, rowId };
-  localPowers.value = [...localPowers.value];
+// 编辑器已直接更新当前行，这里只向父级同步草稿。
+function onCellChange() {
+  emitUpdate();
 }
 
 // ── 快速设置多语言 ──
@@ -197,14 +159,29 @@ const I18nKeyCell = ({ row, cellValue }) =>
   );
 
 const columns = ref([
-  { dataIndex: "b_code", title: "操作编码", width: 160, type: "input", onChange: () => emitUpdate(), _onEditEnd: handleEditEnd },
-  { dataIndex: "b_name", title: "操作名称", width: 160, type: "input", onChange: () => emitUpdate(), _onEditEnd: handleEditEnd },
+  { dataIndex: "b_code", title: "操作编码", width: 160, editor: { type: "input" } },
+  { dataIndex: "b_name", title: "操作名称", width: 160, editor: { type: "input" } },
   { dataIndex: "b_i18n", title: "多语言键", width: 160, customCell: I18nKeyCell },
-  { dataIndex: "b_xh", title: "排序", width: 80, type: "input", onChange: () => emitUpdate(), _onEditEnd: handleEditEnd },
-  { dataIndex: "b_canuse", title: "启用", width: 70, type: "checkbox", onChange: () => emitUpdate() },
-  { dataIndex: "actions", title: "操作", width: 60, type: "actions", actions: [
-    { type: "delete", label: "删除", confirm: "确定删除该记录？", onClick: (row) => deleteRow(row) },
-  ] },
+  { dataIndex: "b_xh", title: "排序", width: 80, editor: { type: "input" } },
+  {
+    dataIndex: "b_canuse",
+    title: "启用",
+    width: 70,
+    editor: { type: "checkbox" },
+  },
+  {
+    dataIndex: "actions",
+    title: "操作",
+    width: 60,
+    actions: [
+      {
+        type: "delete",
+        label: "删除",
+        confirm: "确定删除该记录？",
+        onClick: (row) => deleteRow(row),
+      },
+    ],
+  },
 ]);
 </script>
 
@@ -212,24 +189,23 @@ const columns = ref([
   <div class="powers-panel">
     <div class="panel-toolbar">
       <a-space>
-        <a-button type="primary" @click="addRow">新增权限</a-button>
-        <a-button danger :disabled="!selectedRowKeys.length" @click="batchDelete">
+        <a-button type="primary" :disabled="loading" @click="addRow">新增权限</a-button>
+        <a-button danger :disabled="loading || !selectedRowKeys.length" @click="batchDelete">
           批量删除{{ selectedRowKeys.length ? `(${selectedRowKeys.length})` : "" }}
         </a-button>
       </a-space>
     </div>
     <div class="panel-body">
-      <FpsMonitor />
       <FmsTable
         ref="tableRef"
         v-model:columns="columns"
         :data-source="localPowers"
+        :editable="!loading"
         row-key="b_id"
         :active-row-key="activeKey"
         :row-selection="rowSelection"
-        :area-selection="true"
         @row-click="(_, row) => (activeKey = String(row.b_id))"
-        @area-selection-change="handleAreaSelectionChange"
+        @change="onCellChange"
       />
     </div>
     <I18nQuickSetModal ref="i18nModalRef" />
@@ -263,22 +239,4 @@ const columns = ref([
   min-height: 0;
   width: 100%;
 }
-
-// 编辑态 input 样式
-:deep(.fms-editable-input) {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #1677ff;
-  border-radius: 4px;
-  padding: 0 8px;
-  font-size: 13px;
-  outline: none;
-  box-sizing: border-box;
-  background: #fff;
-
-  &:focus {
-    border-color: #1677ff;
-    box-shadow: 0 0 0 2px rgba(22, 119, 255, 0.12);
-  }
-}
 </style>
diff --git a/code/fms/fms-vue/src/views/module-management/components/ModuleQueryConfigPanel.vue b/code/fms/fms-vue/src/views/module-management/components/ModuleQueryConfigPanel.vue
index 49dac577..8ab89d0b 100644
--- a/code/fms/fms-vue/src/views/module-management/components/ModuleQueryConfigPanel.vue
+++ b/code/fms/fms-vue/src/views/module-management/components/ModuleQueryConfigPanel.vue
@@ -32,16 +32,22 @@ const activeKey = ref(null);
 watch(
   () => props.queryConfig,
   (val) => {
+    if (val === localQuery.value) return;
     localQuery.value = val?.map((r) => ({ ...r })) || [];
   },
   { immediate: true },
 );
 
 function emitUpdate() {
-  emit(
-    "update",
-    localQuery.value.map((r) => ({ ...r })),
-  );
+  emit("update", localQuery.value);
+}
+
+function onRowOrderChange(rows) {
+  localQuery.value = rows.map((row, index) => ({
+    ...row,
+    b_xh: (index + 1) * 10,
+  }));
+  emitUpdate();
 }
 
 const availableFields = computed(() =>
@@ -51,6 +57,7 @@ const availableFields = computed(() =>
 );
 
 function addRow() {
+  if (props.loading) return;
   localQuery.value.push({
     b_id: createTempId(),
     b_module_id: props.moduleId,
@@ -65,6 +72,7 @@ function addRow() {
 }
 
 function deleteRow(record) {
+  if (props.loading) return;
   localQuery.value = localQuery.value.filter((r) => r.b_id !== record.b_id);
   emitUpdate();
 }
@@ -130,16 +138,19 @@ const columns = shallowRef([
   <div class="query-config-panel">
     <div class="panel-toolbar">
       <a-space>
-        <a-button type="primary" @click="addRow">新增查询条件</a-button>
+        <a-button type="primary" :disabled="loading" @click="addRow">新增查询条件</a-button>
       </a-space>
     </div>
     <div class="panel-body">
       <FmsTable
         v-model:columns="columns"
         :data-source="localQuery"
+        :editable="!loading"
+        :row-draggable="!loading"
         row-key="b_id"
         :active-row-key="activeKey"
         @row-click="(ev, row) => (activeKey = row.b_id)"
+        @row-order-change="onRowOrderChange"
       />
     </div>
   </div>
diff --git a/code/fms/fms-vue/src/views/module-management/index.vue b/code/fms/fms-vue/src/views/module-management/index.vue
index 1bcd7dfc..0ab3b45a 100644
--- a/code/fms/fms-vue/src/views/module-management/index.vue
+++ b/code/fms/fms-vue/src/views/module-management/index.vue
@@ -72,6 +72,13 @@ const drafts = ref({
 const configLoading = ref(false);
 const configSaving = ref(false);
 const i18nPanelRef = ref(null);
+let configRequestId = 0;
+
+// ref 写在 v-for 内部会被 Vue 收集为数组，这里统一取单个组件实例
+function getI18nPanel() {
+  const r = i18nPanelRef.value;
+  return Array.isArray(r) ? r[0] : r;
+}
 
 // 当前选中模块对象（从 drafts.module 获取）
 const selectedModule = computed(() => drafts.value.module);
@@ -138,7 +145,7 @@ function buildTree(modules) {
 async function loadTree() {
   treeLoading.value = true;
   try {
-    const res = await loadDataApi("b_module", "b_canuse = 1", "b_xh ASC, b_id ASC");
+    const res = await loadDataApi("s_module", "b_canuse = 1", "b_xh ASC, b_id ASC");
     treeData.value = buildTree(res.data || []);
   } finally {
     treeLoading.value = false;
@@ -146,19 +153,19 @@ async function loadTree() {
 }
 
 // ---- 模块配置加载 ----
-async function loadModuleConfig(moduleId) {
+async function loadModuleConfig(moduleId, requestId) {
   configLoading.value = true;
   try {
     const id = String(moduleId);
     const [moduleRes, fieldsRes, groupsRes, listRes, editRes, queryRes, powersRes] =
       await Promise.all([
-        loadDataApi("b_module", `b_id = ${id}`),
-        loadDataApi("b_module_field", `b_module_id = ${id}`, "b_id ASC"),
-        loadDataApi("b_module_field_group", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
-        loadDataApi("b_module_field_list", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
-        loadDataApi("b_module_field_edit", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
-        loadDataApi("b_module_field_query", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
-        loadDataApi("b_module_power", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
+        loadDataApi("s_module", `b_id = ${id}`),
+        loadDataApi("s_module_field", `b_module_id = ${id}`, "b_id ASC"),
+        loadDataApi("s_module_field_group", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
+        loadDataApi("s_module_field_list", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
+        loadDataApi("s_module_field_edit", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
+        loadDataApi("s_module_field_query", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
+        loadDataApi("s_module_power", `b_module_id = ${id}`, "b_xh ASC, b_id ASC"),
       ]);
 
     const original = {
@@ -170,11 +177,16 @@ async function loadModuleConfig(moduleId) {
       queryConfig: queryRes.data || [],
       powers: powersRes.data || [],
     };
+    if (requestId !== configRequestId) return;
     originals.value = original;
     drafts.value = cloneData(original);
     activeTab.value = "basic";
+  } catch (e) {
+    if (requestId === configRequestId) {
+      message.error("模块配置加载失败：" + (e.message || e));
+    }
   } finally {
-    configLoading.value = false;
+    if (requestId === configRequestId) configLoading.value = false;
   }
 }
 
@@ -186,12 +198,17 @@ function onTreeSelect(keys) {
 }
 
 watch(selectedModuleId, (id) => {
-  if (!id) return;
-  if (skipLoad.value) {
-    skipLoad.value = false;
+  const requestId = ++configRequestId;
+  if (!id) {
+    configLoading.value = false;
     return;
   }
-  loadModuleConfig(id);
+  if (skipLoad.value) {
+    skipLoad.value = false;
+    configLoading.value = false;
+    return;
+  }
+  void loadModuleConfig(id, requestId);
 });
 
 // ---- 子面板数据变更 ----
@@ -314,7 +331,7 @@ async function onDeleteNodeById(moduleId) {
     return;
   }
   try {
-    await saveObjectApi([{ table: "b_module", key_field: "b_id", deletes: [{ b_id: moduleId }] }]);
+    await saveObjectApi([{ table: "s_module", key_field: "b_id", deletes: [{ b_id: moduleId }] }]);
     message.success("模块已删除");
     if (selectedModuleId.value === moduleId) {
       selectedModuleId.value = null;
@@ -334,13 +351,13 @@ async function saveAll() {
   try {
     const saveReqs = [];
 
-    // b_module 主表
+    // s_module 主表
     const moduleData = drafts.value.module;
     const moduleOriginal = originals.value.module;
     if (moduleData && JSON.stringify(moduleData) !== JSON.stringify(moduleOriginal)) {
       const isNew = !moduleOriginal?.b_code;
       saveReqs.push({
-        table: "b_module",
+        table: "s_module",
         key_field: "b_id",
         [isNew ? "inserts" : "updates"]: [moduleData],
       });
@@ -348,11 +365,11 @@ async function saveAll() {
 
     // 子表：fields, listConfig, editConfig, queryConfig, powers
     const subTables = [
-      ["b_module_field", "fields"],
-      ["b_module_field_list", "listConfig"],
-      ["b_module_field_edit", "editConfig"],
-      ["b_module_field_query", "queryConfig"],
-      ["b_module_power", "powers"],
+      ["s_module_field", "fields"],
+      ["s_module_field_list", "listConfig"],
+      ["s_module_field_edit", "editConfig"],
+      ["s_module_field_query", "queryConfig"],
+      ["s_module_power", "powers"],
     ];
     for (const [table, section] of subTables) {
       const current = drafts.value[section] || [];
@@ -366,8 +383,9 @@ async function saveAll() {
     }
 
     // 多语言：由各子面板收集变更，统一在此保存
-    if (i18nPanelRef.value) {
-      const i18nReq = await i18nPanelRef.value.buildSaveRequest();
+    const i18nPanel = getI18nPanel();
+    if (i18nPanel) {
+      const i18nReq = await i18nPanel.buildSaveRequest();
       if (i18nReq) saveReqs.push(i18nReq);
     }
 
@@ -380,7 +398,7 @@ async function saveAll() {
 
     // 更新 originals
     originals.value = cloneData(drafts.value);
-    i18nPanelRef.value?.markSaved();
+    getI18nPanel()?.markSaved();
     message.success("保存成功");
     await loadTree();
   } catch (e) {
@@ -390,7 +408,7 @@ async function saveAll() {
   }
 }
 
-// ---- 字段同步 ----
+// ---- 字段同步与默认配置 ----
 function typeFromSqlType(sqlType) {
   if (!sqlType) return "input";
   const t = sqlType.toLowerCase();
@@ -419,16 +437,109 @@ function typeFromSqlType(sqlType) {
   return "input";
 }
 
-async function syncFields() {
+function guessFieldWidth(fieldName) {
+  const n = (fieldName || "").toLowerCase();
+  if (n === "b_id" || n.endsWith("_id")) return 100;
+  if (n.includes("time") || n.includes("date") || n.includes("_at")) return 160;
+  if (n.includes("name")) return 150;
+  if (n.includes("code") || n.includes("type")) return 120;
+  if (n.includes("ip")) return 140;
+  if (n.includes("status") || n.includes("state") || n.includes("result")) return 90;
+  return 120;
+}
+
+function guessQueryComponent(b_type) {
+  const t = (b_type || "").toLowerCase();
+  if (t === "date" || t === "datetime") return "date-picker";
+  if (t === "select" || t === "switch") return "select";
+  if (t === "number" || t === "money") return "number-range";
+  return "input";
+}
+
+function guessQueryOperator(b_type) {
+  const t = (b_type || "").toLowerCase();
+  if (t === "datetime" || t === "number" || t === "money") return "between";
+  return "=";
+}
+
+function configuredFieldIds(section) {
+  return new Set(
+    [...(originals.value[section] || []), ...(drafts.value[section] || [])]
+      .map((row) => row.b_field_id)
+      .filter((id) => id != null)
+      .map(String),
+  );
+}
+
+function buildMissingDefaultConfigs(module, fields) {
+  const moduleId = String(module.b_id);
+  const listFieldIds = configuredFieldIds("listConfig");
+  const editFieldIds = configuredFieldIds("editConfig");
+  const queryFieldIds = configuredFieldIds("queryConfig");
+  const generated = { listConfig: [], editConfig: [], queryConfig: [] };
+
+  fields
+    .filter((field) => field.b_canuse === 1)
+    .forEach((field, index) => {
+      const fieldId = String(field.b_id);
+      const order = (index + 1) * 10;
+
+      if (!listFieldIds.has(fieldId)) {
+        generated.listConfig.push({
+          b_id: createTempId(),
+          b_module_id: moduleId,
+          b_field_id: fieldId,
+          b_group_id: null,
+          b_title: null,
+          b_i18n: field.b_i18n || null,
+          b_visible: 1,
+          b_xh: order,
+          b_width: guessFieldWidth(field.b_field),
+          b_sortable: 0,
+        });
+      }
+
+      if (!editFieldIds.has(fieldId)) {
+        generated.editConfig.push({
+          b_id: createTempId(),
+          b_module_id: moduleId,
+          b_field_id: fieldId,
+          b_required: 0,
+          b_readonly: 0,
+          b_disabled: 0,
+          b_group_id: null,
+          b_xh: order,
+        });
+      }
+
+      if (!queryFieldIds.has(fieldId)) {
+        generated.queryConfig.push({
+          b_id: createTempId(),
+          b_module_id: moduleId,
+          b_field_id: fieldId,
+          b_component: guessQueryComponent(field.b_type),
+          b_operator: guessQueryOperator(field.b_type),
+          b_default_value: null,
+          b_xh: order,
+          b_canuse: 1,
+        });
+      }
+    });
+
+  return generated;
+}
+
+async function syncFields(tableName) {
   const module = selectedModule.value;
-  if (!module?.b_viewtable) {
-    message.warning("当前模块未配置查询视图");
+  const view = tableName || module?.b_viewtable;
+  if (!view) {
+    message.warning("请先配置查询视图或输入表名");
     return;
   }
 
   try {
     configSaving.value = true;
-    const res = await describeApi(module.b_viewtable);
+    const res = await describeApi(view);
     const columns = res.data || [];
     const existingFields = originals.value.fields || [];
 
@@ -469,27 +580,55 @@ async function syncFields() {
       }
     }
 
-    // 保存到 b_module_field
+    // 字段多语言键只补空值，保留已有人工配置。
+    mergedFields.forEach((field) => {
+      if (!field.b_i18n) field.b_i18n = `field.${field.b_field}`;
+    });
+
+    // 先为新字段分配真实 ID，后续配置通过外键引用这些 ID。
     const changes = diffRows(mergedFields, existingFields);
-    const req = tableChange("b_module_field", changes);
-    if (hasChanges(req)) {
-      await allocateTemporaryIds([req.inserts || [], req.updates || [], req.deletes || []]);
-      await saveObjectApi([req]);
-      message.success(
-        `字段同步完成：${columns.length} 列，新增 ${req.inserts?.length || 0}，停用 ${req.deletes?.length || 0}`,
-      );
-    } else {
-      message.info("字段已是最新，无需同步");
+    const fieldReq = tableChange("s_module_field", changes);
+    await allocateTemporaryIds([
+      fieldReq.inserts || [],
+      fieldReq.updates || [],
+      fieldReq.deletes || [],
+    ]);
+
+    const generated = buildMissingDefaultConfigs(module, mergedFields);
+    const generatedSections = ["listConfig", "editConfig", "queryConfig"];
+    const generatedCount = generatedSections.reduce(
+      (total, section) => total + generated[section].length,
+      0,
+    );
+
+    if (!hasChanges(fieldReq) && !generatedCount) {
+      message.info("字段和默认配置已是最新，无需同步");
+      return;
     }
 
-    // 重新加载
-    const fieldsRes = await loadDataApi(
-      "b_module_field",
-      `b_module_id = ${module.b_id}`,
-      "b_id ASC",
+    if (hasChanges(fieldReq)) {
+      // 字段先保存以取得真实 ID，自动生成的配置留在草稿中由顶部“保存”统一提交。
+      await saveObjectApi([fieldReq]);
+      const fieldsRes = await loadDataApi(
+        "s_module_field",
+        `b_module_id = ${module.b_id}`,
+        "b_id ASC",
+      );
+      originals.value.fields = fieldsRes.data || [];
+      drafts.value.fields = cloneData(originals.value.fields);
+    }
+
+    for (const section of generatedSections) {
+      if (!generated[section].length) continue;
+      drafts.value[section] = [...(drafts.value[section] || []), ...cloneData(generated[section])];
+    }
+
+    const disabledCount = existingFields.filter(
+      (field) => field.b_canuse === 1 && !viewColumnSet.has(field.b_field?.toLowerCase()),
+    ).length;
+    message.success(
+      `字段同步完成：${columns.length} 列，新增 ${fieldReq.inserts?.length || 0}，停用 ${disabledCount}；自动生成列表 ${generated.listConfig.length}、编辑 ${generated.editConfig.length}、查询 ${generated.queryConfig.length} 项配置${generatedCount ? "，请点击保存" : ""}`,
     );
-    originals.value.fields = fieldsRes.data || [];
-    drafts.value.fields = cloneData(originals.value.fields);
   } catch (e) {
     message.error("字段同步失败：" + (e.message || e));
   } finally {
@@ -498,7 +637,7 @@ async function syncFields() {
 }
 
 // ---- 初始化 ----
-loadTree();
+void loadTree().catch((e) => message.error("模块树加载失败：" + (e.message || e)));
 </script>
 
 <template>
@@ -549,13 +688,14 @@ loadTree();
               <span>启用</span>
               <a-switch
                 :checked="drafts.module?.b_canuse === 1"
+                :disabled="configSaving"
                 @update:checked="(v) => onSetField('b_canuse', v ? 1 : 0)"
               />
               <a-divider type="vertical" />
               <span>显示菜单</span>
               <a-switch
                 :checked="drafts.module?.b_canmenu === 1"
-                :disabled="drafts.module?.b_module_type === 'data'"
+                :disabled="configSaving || drafts.module?.b_module_type === 'data'"
                 @update:checked="(v) => onSetField('b_canmenu', v ? 1 : 0)"
               />
             </a-space>
diff --git a/code/fms/fms-vue/src/views/system/login-log/index.vue b/code/fms/fms-vue/src/views/system/login-log/index.vue
new file mode 100644
index 00000000..c17a2616
--- /dev/null
+++ b/code/fms/fms-vue/src/views/system/login-log/index.vue
@@ -0,0 +1,7 @@
+<script setup>
+import FmsModuleListPage from "@/components/fms-module-list/FmsModuleListPage.vue";
+</script>
+
+<template>
+  <FmsModuleListPage module-code="d_login_log" />
+</template>
diff --git a/code/fms/新数据库结构.md b/code/fms/新数据库结构.md
index c10f857d..d55a442a 100644
--- a/code/fms/新数据库结构.md
+++ b/code/fms/新数据库结构.md
@@ -2,38 +2,38 @@
 
 ## 设计原则
 
-- `b_module` 是核心元数据对象，统一表示菜单目录、页面和数据模块。
+- `s_module` 是核心元数据对象，统一表示菜单目录、页面和数据模块。
 - 字段来源于数据模块配置的查询视图。系统不创建业务字段，只同步视图字段，并维护其展示、编辑、查询和权限配置。
 - 页面和业务逻辑不完全元数据化。海运等复杂业务页面由 Vue 页面显式组合多个数据模块，元数据只提供 Table、Form 和 Query 配置。
 - 字段基础定义、列表、编辑、查询四个职责分离；一个字段可以只参与其中任一场景。
-- 编辑规则与列表布局解耦：`b_module_field_edit` 是通用编辑配置，FmsForm 和 FmsTable 可按自身规则消费；`b_module_field_list` 只描述列表展示，不保存编辑状态。
+- 编辑规则与列表布局解耦：`s_module_field_edit` 是通用编辑配置，FmsForm 和 FmsTable 可按自身规则消费；`s_module_field_list` 只描述列表展示，不保存编辑状态。
 - 模块权限控制访问，操作权限控制按钮动作；操作权限必须依赖模块访问权限。
-- 表名和字段名沿用旧系统的 `b_` 风格。全部 `b_id` 使用 `bigint` 雪花 ID，返回前端时序列化为字符串。
+- 模块元数据表沿用旧系统的 `s_module*` 命名；基础资料和用户授权表使用 `b_`，字段名继续使用 `b_`。全部 `b_id` 使用 `bigint` 雪花 ID，返回前端时序列化为字符串。
 - 布尔字段统一使用 `int`，`1` 表示是、`0` 表示否；`b_xh` 数值越小越靠前。
 - 当前按机构使用独立数据库，表中不保存机构编号。表名、视图名和字段名必须由后端白名单校验，不能直接拼接 SQL。
 
 ## 整体关系
 
 ```text
-b_module
-  |-- parent_id --> b_module
-  |-- 1:N --------> b_module_field
-  |-- 1:N --------> b_module_field_group -- parent_id --> b_module_field_group
-  |-- 1:N --------> b_module_power ---- 1:N ----> b_user_power
+s_module
+  |-- parent_id --> s_module
+  |-- 1:N --------> s_module_field
+  |-- 1:N --------> s_module_field_group -- parent_id --> s_module_field_group
+  |-- 1:N --------> s_module_power ---- 1:N ----> b_user_power
   `-- 1:N --------> b_user_module
 
-b_module_field
-  |-- 0:N --------> b_module_field_list -- group_id --> b_module_field_group
-  |-- 0:1 --------> b_module_field_edit -- group_id --> b_module_field_group
-  `-- 0:1 --------> b_module_field_query
+s_module_field
+  |-- 0:N --------> s_module_field_list -- group_id --> s_module_field_group
+  |-- 0:1 --------> s_module_field_edit -- group_id --> s_module_field_group
+  `-- 0:1 --------> s_module_field_query
 
-b_module / b_module_field / b_module_field_list / b_module_field_group / b_module_power
+s_module / s_module_field / s_module_field_list / s_module_field_group / s_module_power
   `-- b_i18n --> b_i18n.b_key
 ```
 
 ## 模块
 
-### `dbo.b_module`
+### `dbo.s_module`
 
 统一保存目录、页面和数据模块。
 
@@ -56,7 +56,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 约束：
 
-- `b_parent_id` 外键引用 `b_module.b_id`；保存服务校验父节点不形成循环。
+- `b_parent_id` 外键引用 `s_module.b_id`；保存服务校验父节点不形成循环。
 - `b_code` 唯一，格式为 `^[a-z][a-z0-9_]{1,49}$`；`b_route` 非空时唯一。
 - `directory` 不能配置 `b_route`、`b_viewtable` 或 `b_savetable`。
 - `page` 必须配置 `b_route`；其业务数据由页面组合的数据模块提供。
@@ -65,7 +65,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 ## 字段来源与同步
 
-### `dbo.b_module_field`
+### `dbo.s_module_field`
 
 保存字段的基础定义。字段来自数据模块的 `b_viewtable`，并以 `(b_module_id, b_field)` 作为稳定标识；列表、编辑和查询场景属性均由独立配置表维护。
 
@@ -83,7 +83,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 约束：
 
-- `b_module_id` 外键引用 `b_module.b_id`，`(b_module_id, b_field)` 唯一。
+- `b_module_id` 外键引用 `s_module.b_id`，`(b_module_id, b_field)` 唯一。
 - `b_canuse` 只能为 `0` 或 `1`；`b_options` 非空时通过 `ISJSON` 校验。建议建立 `(b_module_id, b_canuse, b_id)` 索引。
 - 字段没有 list、edit 或 query 配置记录时，不参与对应场景。
 - `b_type` 是展示和编辑的唯一类型来源：Table 按它渲染默认显示器，Form 或可编辑 Table 按它选择控件。
@@ -94,57 +94,55 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 字段同步服务仅面向 `b_module_type = 'data'` 且配置了 `b_viewtable` 的模块执行：
 
 1. 后端校验视图名并读取列名、SQL 类型和可空性等结构信息。
-2. 按列名查找同模块的 `b_module_field`；新列创建字段基础记录。
+2. 按列名查找同模块的 `s_module_field`；新列创建字段基础记录。
 3. 新字段按 SQL 类型初始化 `b_type`，例如字符串映射为 `input`、长文本映射为 `textarea`、数值映射为 `number`、日期映射为 `date` 或 `datetime`、位值映射为 `switch`。已有字段不覆盖管理员维护的 `b_type` 与 `b_options`；`select`、`money` 等业务类型由管理员按语义调整。
 4. 本次视图中不存在的已有字段保留其记录和全部场景配置，但将 `b_canuse` 置为 `0`。
 5. 不覆盖人工维护的 `b_name`、`b_i18n`、`b_default_value` 与 `b_options`，不物理删除字段或场景配置。
 
 ## 列表配置
 
-### `dbo.b_module_field_list`
+### `dbo.s_module_field_list`
 
-控制列表字段列。多级表头由 `b_module_field_group` 的 `list` 分组树表达；本表不保存编辑状态。
+控制列表字段列。多级表头由 `s_module_field_group` 的 `list` 分组树表达；本表不保存编辑状态。
 
 | 字段 | 类型 | 说明 |
 | --- | --- | --- |
 | `b_id` | `bigint` | 雪花 ID 主键 |
 | `b_module_id` | `bigint` | 所属模块 ID |
-| `b_field_id` | `bigint` | 关联 `b_module_field.b_id` |
+| `b_field_id` | `bigint` | 关联 `s_module_field.b_id` |
 | `b_group_id` | `bigint` | 所属分组 ID；为空时为顶层列 |
-| `b_title` | `nvarchar(100)` | 字段标题覆盖值；为空时使用默认字段名称 |
 | `b_i18n` | `varchar(150)` | 字段标题多语言键覆盖值 |
 | `b_visible` | `int` | 是否显示，默认 `1` |
 | `b_xh` | `int` | 同一分组内的显示顺序，默认 `0` |
 | `b_width` | `int` | 字段列宽 |
-| `b_sortable` | `int` | 是否允许排序，默认 `0` |
 
 约束：
 
-- `b_module_id` 外键引用 `b_module.b_id`，`b_field_id` 外键引用 `b_module_field.b_id`，`b_group_id` 引用同模块的 `b_module_field_group`。
+- `b_module_id` 外键引用 `s_module.b_id`，`b_field_id` 外键引用 `s_module_field.b_id`，`b_group_id` 引用同模块的 `s_module_field_group`。
 - `b_field_id` 必填；同一字段在同一模块的列表中最多出现一次，使用 `(b_module_id, b_field_id)` 唯一约束。
-- `b_visible`、`b_sortable` 只能为 `0` 或 `1`。
+- `b_visible` 只能为 `0` 或 `1`。
 - 字段列的显示器由关联字段的 `b_type` 与 `b_options` 决定，例如 `money`、`date`、`datetime` 均由前端按统一规则渲染。建议建立 `(b_module_id, b_group_id, b_xh, b_id)` 索引。
 - 不保存 `level`、`colspan`、`rowspan`；前端加载 Table 分组树和字段列后，按分组的 `b_parent_id`、`b_xh` 组装嵌套表头。隐藏分组的后代不显示；没有可见字段后代的分组不渲染。
 
 示例：
 
 ```text
-费用（`b_module_field_group`）
-|-- 人工费（`b_module_field_list.b_group_id` 指向费用）
-`-- 海运费（`b_module_field_list.b_group_id` 指向费用）
+费用（`s_module_field_group`）
+|-- 人工费（`s_module_field_list.b_group_id` 指向费用）
+`-- 海运费（`s_module_field_list.b_group_id` 指向费用）
 ```
 
 ## 编辑配置
 
-### `dbo.b_module_field_edit`
+### `dbo.s_module_field_edit`
 
-控制字段的通用编辑属性与编辑分组。控件类型、显示规则和类型专属参数统一由 `b_module_field.b_type`、`b_options` 决定；FmsForm 与 FmsTable 自行决定何时使用本配置。
+控制字段的通用编辑属性与编辑分组。控件类型、显示规则和类型专属参数统一由 `s_module_field.b_type`、`b_options` 决定；FmsForm 与 FmsTable 自行决定何时使用本配置。
 
 | 字段 | 类型 | 说明 |
 | --- | --- | --- |
 | `b_id` | `bigint` | 雪花 ID 主键 |
 | `b_module_id` | `bigint` | 所属模块 ID |
-| `b_field_id` | `bigint` | 关联 `b_module_field.b_id` |
+| `b_field_id` | `bigint` | 关联 `s_module_field.b_id` |
 | `b_required` | `int` | 是否必填，默认 `0` |
 | `b_readonly` | `int` | 是否只读，默认 `0` |
 | `b_disabled` | `int` | 是否禁用，默认 `0` |
@@ -153,18 +151,18 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 约束：
 
-- `b_module_id` 外键引用 `b_module.b_id`，`b_field_id` 外键引用 `b_module_field.b_id`；`(b_module_id, b_field_id)` 唯一，保存服务校验字段属于同一模块。
+- `b_module_id` 外键引用 `s_module.b_id`，`b_field_id` 外键引用 `s_module_field.b_id`；`(b_module_id, b_field_id)` 唯一，保存服务校验字段属于同一模块。
 - `b_required`、`b_readonly`、`b_disabled` 只能为 `0` 或 `1`。
-- `b_group_id` 必须关联同模块的 `b_module_field_group`；分组为空时字段进入默认编辑区域。
+- `b_group_id` 必须关联同模块的 `s_module_field_group`；分组为空时字段进入默认编辑区域。
 - 已分组字段按分组的 `b_xh` 排列，组内按 `b_xh` 排列；默认区域字段按 `b_xh` 排列。
 
 ## 布局分组
 
-### `dbo.b_module_field_group`
+### `dbo.s_module_field_group`
 
 统一保存列表多级表头和编辑分组。分组只负责布局，不定义编辑能力；列表或编辑用途由引用它的配置表决定。
 
-被 `b_module_field_list` 引用时，分组组成同一份 FmsTable 的多级表头；被 `b_module_field_edit` 引用时，分组组成同一份编辑界面中的业务区块，例如提单、订舱、报关、备注，不代表拆分为多个 Form。
+被 `s_module_field_list` 引用时，分组组成同一份 FmsTable 的多级表头；被 `s_module_field_edit` 引用时，分组组成同一份编辑界面中的业务区块，例如提单、订舱、报关、备注，不代表拆分为多个 Form。
 
 | 字段 | 类型 | 说明 |
 | --- | --- | --- |
@@ -178,7 +176,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 约束：
 
-- `b_module_id` 外键引用 `b_module.b_id`；`b_id` 是分组的稳定关联键。
+- `b_module_id` 外键引用 `s_module.b_id`；`b_id` 是分组的稳定关联键。
 - `b_parent_id` 必须引用同模块的分组且不能形成循环。
 - 多级分组可用于 FmsTable 表头；FmsForm 与 FmsTable 如何消费编辑分组由各自实现决定。
 - `b_canuse` 只能为 `0` 或 `1`。建议建立 `(b_module_id, b_canuse, b_xh, b_id)` 索引。
@@ -200,7 +198,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 ## 查询配置
 
-### `dbo.b_module_field_query`
+### `dbo.s_module_field_query`
 
 独立控制主列表查询条件，不依赖字段是否配置为可见列表列。
 
@@ -208,7 +206,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 | --- | --- | --- |
 | `b_id` | `bigint` | 雪花 ID 主键 |
 | `b_module_id` | `bigint` | 所属模块 ID |
-| `b_field_id` | `bigint` | 关联 `b_module_field.b_id` |
+| `b_field_id` | `bigint` | 关联 `s_module_field.b_id` |
 | `b_component` | `varchar(30)` | 查询组件 |
 | `b_operator` | `varchar(20)` | `=`、`like`、`between` 或 `in` |
 | `b_default_value` | `nvarchar(500)` | 默认查询值 |
@@ -217,14 +215,14 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 
 约束：
 
-- `b_module_id` 外键引用 `b_module.b_id`，`b_field_id` 外键引用 `b_module_field.b_id`；`(b_module_id, b_field_id)` 唯一，保存服务校验模块一致性。
+- `b_module_id` 外键引用 `s_module.b_id`，`b_field_id` 外键引用 `s_module_field.b_id`；`(b_module_id, b_field_id)` 唯一，保存服务校验模块一致性。
 - `b_canuse` 只能为 `0` 或 `1`；`b_operator` 必须属于定义的操作符集合。
 - 查询组件与操作符由后端白名单校验；查询值必须参数化，不能由配置直接拼接 SQL。
 - 建议建立 `(b_module_id, b_canuse, b_xh, b_id)` 索引。
 
 ## 权限与多语言
 
-### `dbo.b_module_power`
+### `dbo.s_module_power`
 
 定义模块内可授权的按钮操作。
 
@@ -238,7 +236,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 | `b_xh` | `int` | 显示顺序 |
 | `b_canuse` | `int` | 是否启用，默认 `1` |
 
-约束：`b_module_id` 外键引用 `b_module.b_id`，`(b_module_id, b_code)` 唯一，`b_canuse` 只能为 `0` 或 `1`。
+约束：`b_module_id` 外键引用 `s_module.b_id`，`(b_module_id, b_code)` 唯一，`b_canuse` 只能为 `0` 或 `1`。
 
 ### `dbo.b_user_module`
 
@@ -252,7 +250,7 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 | `b_inputuser_id` | `bigint` | 授权人雪花 ID |
 | `b_inputdatetime` | `datetime` | 授权时间 |
 
-约束：`b_module_id` 外键引用 `b_module.b_id`，`(b_user_id, b_module_id)` 唯一。目录不单独授权；用户拥有下级模块时自动显示上级目录。
+约束：`b_module_id` 外键引用 `s_module.b_id`，`(b_user_id, b_module_id)` 唯一。目录不单独授权；用户拥有下级模块时自动显示上级目录。
 
 ### `dbo.b_user_power`
 
@@ -262,11 +260,11 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 | --- | --- | --- |
 | `b_id` | `bigint` | 雪花 ID 主键 |
 | `b_user_id` | `bigint` | 用户雪花 ID |
-| `b_power_id` | `bigint` | `b_module_power.b_id` |
+| `b_power_id` | `bigint` | `s_module_power.b_id` |
 | `b_inputuser_id` | `bigint` | 授权人雪花 ID |
 | `b_inputdatetime` | `datetime` | 授权时间 |
 
-约束：`b_power_id` 外键引用 `b_module_power.b_id`，`(b_user_id, b_power_id)` 唯一。
+约束：`b_power_id` 外键引用 `s_module_power.b_id`，`(b_user_id, b_power_id)` 唯一。
 
 权限规则：
 
@@ -299,27 +297,27 @@ b_module / b_module_field / b_module_field_list / b_module_field_group / b_modul
 `-- 箱明细 d_container（data）
 ```
 
-若订舱字段实际保存于海运主单表，不创建 `d_booking`，而在 `d_sea` 的编辑配置中用 `b_group_id` 和 `b_xh` 定义编辑分组与顺序，分组标题来自 `b_module_field_group`。主子表关联、加载时机、保存顺序和页面布局均由业务 Vue 页面明确实现。
+若订舱字段实际保存于海运主单表，不创建 `d_booking`，而在 `d_sea` 的编辑配置中用 `b_group_id` 和 `b_xh` 定义编辑分组与顺序，分组标题来自 `s_module_field_group`。主子表关联、加载时机、保存顺序和页面布局均由业务 Vue 页面明确实现。
 
 ## 现有字段迁移
 
-当前 `b_module_field` 混合保存基础、列表、编辑和查询属性。迁移应分阶段实施：
+当前 `s_module_field` 混合保存基础、列表、编辑和查询属性。迁移应分阶段实施：
 
 | 当前字段 | 目标位置 |
 | --- | --- |
-| `b_type` | `b_module_field.b_type` |
-| `b_canlist` | `b_module_field_list.b_visible` |
-| `b_width` | `b_module_field_list.b_width` |
-| `b_xh` | 初始化 `b_module_field_list.b_xh`、`b_module_field_edit.b_xh` 与 `b_module_field_query.b_xh` |
-| `b_canform` | 为原 Form 字段创建 `b_module_field_edit` 记录 |
-| `b_must` | `b_module_field_edit.b_required` |
-| `b_readonly` | `b_module_field_edit.b_readonly` |
-| `b_canquery` | 创建 `b_module_field_query` 记录 |
-| `b_value` | 迁移为 `b_module_field.b_default_value` |
+| `b_type` | `s_module_field.b_type` |
+| `b_canlist` | `s_module_field_list.b_visible` |
+| `b_width` | `s_module_field_list.b_width` |
+| `b_xh` | 初始化 `s_module_field_list.b_xh`、`s_module_field_edit.b_xh` 与 `s_module_field_query.b_xh` |
+| `b_canform` | 为原 Form 字段创建 `s_module_field_edit` 记录 |
+| `b_must` | `s_module_field_edit.b_required` |
+| `b_readonly` | `s_module_field_edit.b_readonly` |
+| `b_canquery` | 创建 `s_module_field_query` 记录 |
+| `b_value` | 迁移为 `s_module_field.b_default_value` |
 
 迁移步骤：
 
-1. 新建 list、edit、group、query 表和必要索引，新增 `b_module.b_module_type` 与 `b_module_field.b_type` 的兼容列。
+1. 新建 list、edit、group、query 表和必要索引，新增 `s_module.b_module_type` 与 `s_module_field.b_type` 的兼容列。
 2. 为原有字段创建列表配置；根据原 `b_canform`、`b_canquery` 初始化编辑和查询配置。
 3. 前端和后端改为读取新场景表，查询不再读取 list 配置；模块类型切换为读取 `b_module_type`。
 4. 完成视图同步服务并验证新结构的读写稳定后，删除旧混合列和兼容字段。
diff --git a/code/fms/模块管理实施计划.md b/code/fms/模块管理实施计划.md
index 7ed1c4e4..8648c2c4 100644
--- a/code/fms/模块管理实施计划.md
+++ b/code/fms/模块管理实施计划.md
@@ -30,9 +30,9 @@ fms-api/config/migrations/003_module_surrogate_key.sql
 
 按以下顺序建立表：
 
-1. `b_module`
-2. `b_module_field`
-3. `b_module_power`
+1. `s_module`
+2. `s_module_field`
+3. `s_module_power`
 4. `b_user_module`
 5. `b_user_power`
 6. `b_i18n`
@@ -91,9 +91,9 @@ grant   用户授权
 
 | 数据 | 接口 | 数据源 |
 | --- | --- | --- |
-| 模块树 | `/data/loaddata` | `b_module` |
-| 模块字段 | `/data/loaddata` | `b_module_field` |
-| 操作权限定义 | `/data/loaddata` | `b_module_power` |
+| 模块树 | `/data/loaddata` | `s_module` |
+| 模块字段 | `/data/loaddata` | `s_module_field` |
+| 操作权限定义 | `/data/loaddata` | `s_module_power` |
 | 多语言 | `/data/loaddata` | `b_i18n` |
 | 删除依赖检查 | `/data/loaddata` | `b_user_module`、`b_user_power` |
 
@@ -103,21 +103,21 @@ grant   用户授权
 
 新增以下数据前调用 `/data/nextid`：
 
-- `b_module_field.b_id`
-- `b_module_power.b_id`
+- `s_module_field.b_id`
+- `s_module_power.b_id`
 - `b_i18n.b_id`
-- `b_module.b_id`
+- `s_module.b_id`
 
-`b_module.b_id` 使用不可变雪花 ID；可修改的小写模块编码保存在 `b_module.b_code`。
+`s_module.b_id` 使用不可变雪花 ID；可修改的小写模块编码保存在 `s_module.b_code`。
 
 ### 模块保存
 
 前端维护服务器快照和编辑副本，计算 inserts、updates、deletes，然后一次调用 `/data/saveobjt` 保存：
 
 ```text
-b_module
-b_module_field
-b_module_power
+s_module
+s_module_field
+s_module_power
 b_i18n
 ```
 
@@ -126,12 +126,12 @@ b_i18n
 ```json
 [
   {
-    "table": "b_module",
+    "table": "s_module",
     "key_field": "b_id",
     "updates": []
   },
   {
-    "table": "b_module_field",
+    "table": "s_module_field",
     "key_field": "b_id",
     "inserts": [],
     "updates": [],
@@ -159,10 +159,10 @@ b_i18n
 ```text
 b_user_power
 b_user_module
-b_module_power
-b_module_field
+s_module_power
+s_module_field
 b_i18n
-b_module
+s_module
 ```
 
 ## 第四阶段：将 Demo 改为真实页面
@@ -200,7 +200,7 @@ services/moduleManagement.js
 
 ### 菜单
 
-`AppSidebar` 通过现有通用查询接口读取当前用户的 `b_user_module` 和可用的 `b_module`，在前端构建菜单树。
+`AppSidebar` 通过现有通用查询接口读取当前用户的 `b_user_module` 和可用的 `s_module`，在前端构建菜单树。
 
 - 只显示 `b_canmenu = 1`、`b_canuse = 1` 且用户有权限的页面。
 - 上级目录根据可访问下级页面自动显示。
diff --git a/新建 文本文档.txt b/新建 文本文档.txt
new file mode 100644
index 00000000..e69de29b