From 98e694d8e908381d8aeddf265cbf4e8f6fdf4f4d Mon Sep 17 00:00:00 2001
From: sunlei <yemu2333@outlook.com>
Date: Mon, 22 Jun 2026 17:29:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DNapCat=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=97=A8=E7=A6=81=E9=98=BB=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ci/napcat-desktop-cn/Dockerfile                             | 2 +-
 .../qqbot/core/application/account/qqbot-account.service.ts | 4 ++--
 src/modules/qqbot/core/contract/qqbot.types.ts              | 6 ++++--
 .../persistence/account/qqbot-account.entity.ts             | 4 ++--
 .../infrastructure/persistence/napcat-container.entity.ts   | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ci/napcat-desktop-cn/Dockerfile b/ci/napcat-desktop-cn/Dockerfile
index 2f77162..f2c8d41 100644
--- a/ci/napcat-desktop-cn/Dockerfile
+++ b/ci/napcat-desktop-cn/Dockerfile
@@ -1,4 +1,4 @@
-ARG NAPCAT_BASE_IMAGE=mlikiowa/napcat-docker:latest
+ARG NAPCAT_BASE_IMAGE=
 FROM ${NAPCAT_BASE_IMAGE}
 
 USER root
diff --git a/src/modules/qqbot/core/application/account/qqbot-account.service.ts b/src/modules/qqbot/core/application/account/qqbot-account.service.ts
index 84097f1..ad9cd6e 100644
--- a/src/modules/qqbot/core/application/account/qqbot-account.service.ts
+++ b/src/modules/qqbot/core/application/account/qqbot-account.service.ts
@@ -28,8 +28,8 @@ import type {
   QqbotAccountAbilityType,
   QqbotAccountListItem,
   QqbotConnectionRole,
-  QqbotNapcatContainerStatus,
   QqbotNapcatWebuiStatus,
+  QqbotRuntimeContainerStatus,
 } from '../../contract/qqbot.types';
 
 const INSECURE_ACCOUNT_SECRET_VALUES = new Set([
@@ -668,7 +668,7 @@ export class QqbotAccountService {
    */
   private toPersistedContainerStatus(
     napcat?: null | QqbotAccountListItem['napcat'],
-  ): QqbotNapcatContainerStatus {
+  ): QqbotRuntimeContainerStatus {
     if (napcat?.containerStatus) return napcat.containerStatus;
     if (napcat?.containerOnline) return 'running';
     return 'unknown';
diff --git a/src/modules/qqbot/core/contract/qqbot.types.ts b/src/modules/qqbot/core/contract/qqbot.types.ts
index c9c0160..b951010 100644
--- a/src/modules/qqbot/core/contract/qqbot.types.ts
+++ b/src/modules/qqbot/core/contract/qqbot.types.ts
@@ -72,13 +72,15 @@ export type QqbotMessageDirection = 'inbound' | 'outbound';
 
 export type QqbotMessageType = 'channel' | 'group' | 'private';
 
-export type QqbotNapcatContainerStatus =
+export type QqbotRuntimeContainerStatus =
   | 'creating'
   | 'error'
   | 'running'
   | 'stopped'
   | 'unknown';
 
+export type QqbotNapcatContainerStatus = QqbotRuntimeContainerStatus;
+
 export type QqbotAccountNapcatBindStatus = 'bound' | 'disabled' | 'pending';
 
 export type QqbotNapcatWebuiStatus = 'offline' | 'online' | 'unknown';
@@ -106,7 +108,7 @@ export type QqbotAccountNapcatRuntimeInfo = {
   containerId?: string;
   containerName?: string;
   containerOnline?: boolean;
-  containerStatus?: QqbotNapcatContainerStatus;
+  containerStatus?: QqbotRuntimeContainerStatus;
   profileStatus?: 'drift' | 'failed' | 'ok' | 'unknown';
   recoveryState?: 'idle' | 'password' | 'quick' | 'suspended';
   riskMode?: 'cooldown' | 'manual_only' | 'normal';
diff --git a/src/modules/qqbot/core/infrastructure/persistence/account/qqbot-account.entity.ts b/src/modules/qqbot/core/infrastructure/persistence/account/qqbot-account.entity.ts
index d97bc23..ac79396 100644
--- a/src/modules/qqbot/core/infrastructure/persistence/account/qqbot-account.entity.ts
+++ b/src/modules/qqbot/core/infrastructure/persistence/account/qqbot-account.entity.ts
@@ -10,9 +10,9 @@ import type {
   QqbotConnectionMode,
   QqbotConnectionRole,
   QqbotConnectionStatus,
-  QqbotNapcatContainerStatus,
   QqbotNapcatRuntimeLoginStatus,
   QqbotNapcatWebuiStatus,
+  QqbotRuntimeContainerStatus,
 } from '../../../contract/qqbot.types';
 
 @Entity('qqbot_account')
@@ -48,7 +48,7 @@ export class QqbotAccount {
   oneBotStatus: QqbotConnectionStatus;
 
   @Column({ default: 'unknown', length: 32, name: 'container_status' })
-  containerStatus: QqbotNapcatContainerStatus;
+  containerStatus: QqbotRuntimeContainerStatus;
 
   @Column({ default: 'unknown', length: 32, name: 'webui_status' })
   webuiStatus: QqbotNapcatWebuiStatus;
diff --git a/src/modules/qqbot/napcat/infrastructure/persistence/napcat-container.entity.ts b/src/modules/qqbot/napcat/infrastructure/persistence/napcat-container.entity.ts
index 542186a..dd70d13 100644
--- a/src/modules/qqbot/napcat/infrastructure/persistence/napcat-container.entity.ts
+++ b/src/modules/qqbot/napcat/infrastructure/persistence/napcat-container.entity.ts
@@ -6,7 +6,7 @@ import {
   KtDateTimeColumn,
   KtUpdateDateColumn,
 } from '@/common';
-import type { QqbotNapcatContainerStatus } from '@/modules/qqbot/core/contract/qqbot.types';
+import type { QqbotRuntimeContainerStatus } from '@/modules/qqbot/core/contract/qqbot.types';
 
 @Entity('napcat_container')
 @Index('uk_napcat_container_name', ['name'], { unique: true })
@@ -47,7 +47,7 @@ export class NapcatContainer {
   reverseWsUrl: string;
 
   @Column({ default: 'creating', length: 32 })
-  status: QqbotNapcatContainerStatus;
+  status: QqbotRuntimeContainerStatus;
 
   @KtDateTimeColumn({
     default: null,