feat(app): 适配最新版本

- 修改软件内部分提示文本 - 添加 API KEY 掩码，防止直接输出 API KEY 内容
2026-02-04 04:14:42 +08:00 · 2026-01-10 20:15:32 +08:00
parent 0825e48902
commit 3324b630d1
14 changed files with 112 additions and 59 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,13 @@ out
 __pycache__
 .venv
 test.py
+
 engine/build
-engine/dist
-engine/.venv
-engine/__pycache__
 engine/portaudio
-package-lock.json
 engine/pyinstaller_cache
 engine/models
 engine/notebook
+# engine/main.spec
+
 .repomap
 .virtualme
-engine/main.spec
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ SOSV 模型下载：[ Shepra-ONNX SenseVoice Model](https://github.com/HiMeditat
 - 支持调用本地 Ollama 模型或云端 Google 翻译 API 进行翻译
 - 跨平台（Windows、macOS、Linux）、多界面语言（中文、英语、日语）支持
 - 丰富的字幕样式设置（字体、字体大小、字体粗细、字体颜色、背景颜色等）
- 灵活的字幕引擎选择（阿里云 Gummy 云端模型、本地 Vosk 模型、本地 SOSV 模型、还可以自己开发模型）
+- 灵活的字幕引擎选择（阿里云 Gummy 云端模型、GLM-ASR 云端模型、本地 Vosk 模型、本地 SOSV 模型、还可以自己开发模型）
 - 多语言识别与翻译（见下文“⚙️ 自带字幕引擎说明”）
 - 字幕记录展示与导出（支持导出 `.srt` 和 `.json` 格式）

@@ -62,6 +62,7 @@ macOS 平台和 Linux 平台获取系统音频输出需要进行额外设置，
 |                                                              | 识别效果 | 部署类型          | 支持语言   | 翻译       | 备注                                                       |
 | ------------------------------------------------------------ | -------- | ------------- | ---------- | ---------- | ---------------------------------------------------------- |
 | [Gummy](https://help.aliyun.com/zh/model-studio/gummy-speech-recognition-translation) | 很好😊    | 云端 / 阿里云 | 10 种      | 自带翻译   | 收费，0.54CNY / 小时                                       |
+| [glm-asr-2512](https://docs.bigmodel.cn/cn/guide/models/sound-and-video/glm-asr-2512) | 很好😊 | 云端 / 智谱 AI | 4 种 | 需额外配置 | 收费，约 0.72CNY / 小时 |
 | [Vosk](https://alphacephei.com/vosk)                         | 较差😞    | 本地 / CPU    | 超过 30 种 | 需额外配置 | 支持的语言非常多                                           |
 | [SOSV](https://k2-fsa.github.io/sherpa/onnx/sense-voice/index.html) | 一般😐    | 本地 / CPU    | 5 种       | 需额外配置 | 仅有一个模型                                               |
 | 自己开发                                                     | 🤔        | 自定义        | 自定义     | 自定义     | 根据[文档](./docs/engine-manual/zh.md)使用 Python 自己开发 |
--- a/engine/utils/translation.py
+++ b/engine/utils/translation.py
@@ -27,14 +27,14 @@ def ollama_translate(model: str, target: str, text: str, time_s: str, url: str =
        if url:
            if OpenAI:
                client = OpenAI(base_url=url, api_key=key if key else "ollama")
-                response = client.chat.completions.create(
+                openai_response = client.chat.completions.create(
                    model=model,
                    messages=[
                        {"role": "system", "content": f"/no_think Translate the following content into {lang_map[target]}, and do not output any additional information."},
                        {"role": "user", "content": text}
                    ]
                )
-                content = response.choices[0].message.content or ""
+                content = openai_response.choices[0].message.content or ""
            else:
                client = Client(host=url)
                response: ChatResponse = client.chat(
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "auto-caption",
  "productName": "Auto Caption",
-  "version": "1.0.0",
+  "version": "1.1.0",
  "description": "A cross-platform subtitle display software.",
  "main": "./out/main/index.js",
  "author": "himeditator",
--- a/src/main/utils/AllConfig.ts
+++ b/src/main/utils/AllConfig.ts
@@ -4,6 +4,7 @@ import {
 } from '../types'
 import { Log } from './Log'
 import { app, BrowserWindow } from 'electron'
+import { passwordMaskingForObject } from './UtilsFunc'
 import * as path from 'path'
 import * as fs from 'fs'
 import * as os from 'os'
@@ -151,9 +152,7 @@ class AllConfig {
      }
    }
    this.controls.engineEnabled = engineEnabled
-    let _controls = {...this.controls}
-    _controls.API_KEY = _controls.API_KEY.replace(/./g, '*')
-    Log.info('Set Controls:', _controls)
+    Log.info('Set Controls:', passwordMaskingForObject(this.controls))
  }

  public sendControls(window: BrowserWindow, info = true) {
--- a/src/main/utils/CaptionEngine.ts
+++ b/src/main/utils/CaptionEngine.ts
@@ -7,6 +7,7 @@ import { controlWindow } from '../ControlWindow'
 import { allConfig } from './AllConfig'
 import { i18n } from '../i18n'
 import { Log } from './Log'
+import { passwordMaskingForList } from './UtilsFunc'

 export class CaptionEngine {
  appPath: string = ''
@@ -114,12 +115,7 @@ export class CaptionEngine {
      }
    }
    Log.info('Engine Path:', this.appPath)
-    if(this.command.length > 2 && this.command[this.command.length - 2] === '-k') {
-      const _command = [...this.command]
-      _command[_command.length -1] = _command[_command.length -1].replace(/./g, '*')
-      Log.info('Engine Command:', _command)
-    }
-    else Log.info('Engine Command:', this.command)
+    Log.info('Engine Command:', passwordMaskingForList(this.command))
    return true
  }

@@ -182,7 +178,7 @@ export class CaptionEngine {
            const data_obj = JSON.parse(line)
            handleEngineData(data_obj)
          } catch (e) {
-            controlWindow.sendErrorMessage(i18n('engine.output.parse.error') + e)
+            // controlWindow.sendErrorMessage(i18n('engine.output.parse.error') + e)
            Log.error('Error parsing JSON:', e)
          }
        }
--- a/src/main/utils/UtilsFunc.ts
+++ b/src/main/utils/UtilsFunc.ts
@@ -0,0 +1,24 @@
+function passwordMasking(pwd: string) {
+  return pwd.replace(/./g, '*')
+}
+
+export function passwordMaskingForList(args: string[]) {
+  const maskedArgs = [...args]
+  for(let i = 1; i < maskedArgs.length; i++) {
+    if(maskedArgs[i-1] === '-k' || maskedArgs[i-1] === '-okey' || maskedArgs[i-1] === '-gkey') {
+      maskedArgs[i] = passwordMasking(maskedArgs[i])
+    }
+  }
+  return maskedArgs
+}
+
+export function passwordMaskingForObject(args: Record<string, any>) {
+  const maskedArgs = {...args}
+  for(const key in maskedArgs) {
+    const lKey = key.toLowerCase()
+    if(lKey.includes('api') && lKey.includes('key')) {
+      maskedArgs[key] = passwordMasking(maskedArgs[key])
+    }
+  }
+  return maskedArgs
+}
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -2,7 +2,7 @@
 <html>
  <head>
    <meta charset="UTF-8" />
-    <title>Auto Caption v1.0.0</title>
+    <title>Auto Caption v1.1.0</title>
    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
    <meta
      http-equiv="Content-Security-Policy"
--- a/src/renderer/src/components/EngineControl.vue
+++ b/src/renderer/src/components/EngineControl.vue
@@ -41,11 +41,11 @@
    <div class="input-item" v-if="transModel && currentTransModel === 'ollama'">
      <a-popover placement="right">
        <template #content>
-          <p class="label-hover-info">{{ $t('engine.ollamaNote') }}</p>
+          <p class="label-hover-info">{{ $t('engine.modelNameNote') }}</p>
        </template>
        <span class="input-label info-label"
          :style="{color: uiColor}"
-        >{{ $t('engine.ollama') }}</span>
+        >{{ $t('engine.modelName') }}</span>
      </a-popover>
      <a-input
        class="input-area"
@@ -53,7 +53,14 @@
      ></a-input>
    </div>
    <div class="input-item" v-if="transModel && currentTransModel === 'ollama'">
-      <span class="input-label">Ollama Domain</span>
+      <a-popover placement="right">
+        <template #content>
+          <p class="label-hover-info">{{ $t('engine.baseURL') }}</p>
+        </template>
+        <span class="input-label info-label"
+          :style="{color: uiColor}"
+        >Base URL</span>
+      </a-popover>
      <a-input
        class="input-area"
        v-model:value="currentOllamaUrl"
@@ -61,11 +68,19 @@
      ></a-input>
    </div>
    <div class="input-item" v-if="transModel && currentTransModel === 'ollama'">
-      <span class="input-label">Ollama API Key</span>
-      <a-input-password
-        class="input-area"
-        v-model:value="currentOllamaApiKey"
-      ></a-input-password>
+      <a-popover placement="right">
+        <template #content>
+          <p class="label-hover-info">{{ $t('engine.apiKey') }}</p>
+        </template>
+        <span class="input-label info-label"
+          :style="{color: uiColor}"
+        >API Key</span>
+      </a-popover>
+      <a-input
+          class="input-area"
+          type="password"
+          v-model:value="currentOllamaApiKey"
+      />
    </div>
    <div class="input-item" v-if="currentEngine === 'glm'">
      <span class="input-label">GLM API URL</span>
@@ -83,13 +98,6 @@
        placeholder="glm-asr-2512"
      ></a-input>
    </div>
-    <div class="input-item" v-if="currentEngine === 'glm'">
-      <span class="input-label">GLM API Key</span>
-      <a-input-password
-        class="input-area"
-        v-model:value="currentGlmApiKey"
-      ></a-input-password>
-    </div>
    <div class="input-item">
      <span class="input-label">{{ $t('engine.audioType') }}</span>
      <a-select
@@ -153,7 +161,7 @@
          </template>
          <span class="input-label info-label"
            :style="{color: uiColor}"
-          >{{ $t('engine.apikey') }}</span>
+          >ALI {{ $t('engine.apikey') }}</span>
        </a-popover>
        <a-input
          class="input-area"
@@ -161,6 +169,24 @@
          v-model:value="currentAPI_KEY"
        />
      </div>
+      <div class="input-item">
+        <a-popover placement="right">
+          <template #content>
+            <p class="label-hover-info">{{ $t('engine.glmApikeyInfo') }}</p>
+            <p><a href="https://open.bigmodel.cn/" target="_blank">
+              https://open.bigmodel.cn
+            </a></p>
+          </template>
+          <span class="input-label info-label"
+            :style="{color: uiColor}"
+          >GLM {{ $t('engine.apikey') }}</span>
+        </a-popover>
+        <a-input
+          class="input-area"
+          type="password"
+          v-model:value="currentGlmApiKey"
+        />
+      </div>
      <div class="input-item">
        <a-popover placement="right">
          <template #content>
--- a/src/renderer/src/components/EngineStatus.vue
+++ b/src/renderer/src/components/EngineStatus.vue
@@ -101,7 +101,7 @@
      <p class="about-desc">{{ $t('status.about.desc') }}</p>
      <a-divider />
      <div class="about-info">
-        <p><b>{{ $t('status.about.version') }}</b><a-tag color="green">v1.0.0</a-tag></p>
+        <p><b>{{ $t('status.about.version') }}</b><a-tag color="green">v1.1.0</a-tag></p>
        <p>
          <b>{{ $t('status.about.author') }}</b>
          <a
--- a/src/renderer/src/i18n/config/engine.ts
+++ b/src/renderer/src/i18n/config/engine.ts
@@ -34,7 +34,7 @@ export const engines = {
        { value: 'it', type: 1, label: '意大利语' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama 本地模型' },
+        { value: 'ollama', label: 'Ollama 模型或 OpenAI 兼容模型' },
        { value: 'google', label: 'Google API 调用' },
      ]
    },
@@ -55,7 +55,7 @@ export const engines = {
        { value: 'it', type: 1, label: '意大利语' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama 本地模型' },
+        { value: 'ollama', label: 'Ollama 模型或 OpenAI 兼容模型' },
        { value: 'google', label: 'Google API 调用' },
      ]
    },
@@ -70,7 +70,7 @@ export const engines = {
        { value: 'ko', type: 0, label: '韩语' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama 本地模型' },
+        { value: 'ollama', label: 'Ollama 模型或 OpenAI 兼容模型' },
        { value: 'google', label: 'Google API 调用' },
      ]
    }
@@ -109,7 +109,7 @@ export const engines = {
        { value: 'it', type: 1, label: 'Italian' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama Local Model' },
+        { value: 'ollama', label: 'Ollama Model or OpenAI-compatible Model' },
        { value: 'google', label: 'Google API Call' },
      ]
    },
@@ -130,7 +130,7 @@ export const engines = {
        { value: 'it', type: 1, label: 'Italian' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama Local Model' },
+        { value: 'ollama', label: 'Ollama Model or OpenAI-compatible Model' },
        { value: 'google', label: 'Google API Call' },
      ]
    },
@@ -145,7 +145,7 @@ export const engines = {
        { value: 'ko', type: 0, label: 'Korean' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama Local Model' },
+        { value: 'ollama', label: 'Ollama Model or OpenAI-compatible Model' },
        { value: 'google', label: 'Google API Call' },
      ]
    }
@@ -184,7 +184,7 @@ export const engines = {
        { value: 'it', type: 1, label: 'イタリア語' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama ローカルモデル' },
+        { value: 'ollama', label: 'Ollama モデルまたは OpenAI 互換モデル' },
        { value: 'google', label: 'Google API 呼び出し' },
      ]
    },
@@ -205,7 +205,7 @@ export const engines = {
        { value: 'it', type: 1, label: 'イタリア語' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama ローカルモデル' },
+        { value: 'ollama', label: 'Ollama モデルまたは OpenAI 互換モデル' },
        { value: 'google', label: 'Google API 呼び出し' },
      ]
    },
@@ -220,7 +220,7 @@ export const engines = {
        { value: 'ko', type: 0, label: '韓国語' },
      ],
      transModel: [
-        { value: 'ollama', label: 'Ollama ローカルモデル' },
+        { value: 'ollama', label: 'Ollama モデルまたは OpenAI 互換モデル' },
        { value: 'google', label: 'Google API 呼び出し' },
      ]
    }
--- a/src/renderer/src/i18n/lang/en.ts
+++ b/src/renderer/src/i18n/lang/en.ts
@@ -22,7 +22,7 @@ export default {
    "stopped": "Caption Engine Stopped",
    "stoppedInfo": "The caption engine has stopped. You can click the 'Start Caption Engine' button to restart it.",
    "error": "An error occurred",
-    "engineError": "The subtitle engine encountered an error and requested a forced exit.",
+    "engineError": "The caption engine encountered an error and requested a forced exit.",
    "socketError": "The Socket connection between the main program and the caption engine failed",
    "engineChange": "Cpation Engine Configuration Changed",
    "changeInfo": "If the caption engine is already running, you need to restart it for the changes to take effect.",
@@ -50,8 +50,10 @@ export default {
    "sourceLang": "Source",
    "transLang": "Translation",
    "transModel": "Model",
-    "ollama": "Ollama",
-    "ollamaNote": "To use for translation, the name of the local Ollama model that will call the service on the default port. It is recommended to use a non-inference model with less than 1B parameters.",
+    "modelName": "Model Name",
+    "modelNameNote": "Please enter the translation model name you wish to use, which can be either a local Ollama model or an OpenAI API compatible cloud model. If the Base URL field is left blank, the local Ollama service will be called by default; otherwise, the API service at the specified address will be called via the Python OpenAI library.",
+    "baseURL": "The base request URL for calling OpenAI API. If left empty, the local default port Ollama model will be used.",
+    "apiKey": "The API KEY required for the model corresponding to OpenAI API.",
    "captionEngine": "Engine",
    "audioType": "Audio Type",
    "systemOutput": "System Audio Output (Speaker)",
@@ -65,9 +67,10 @@ export default {
    "recordingPath": "Save Path",
    "startTimeout": "Timeout",
    "seconds": "seconds",
-    "apikeyInfo": "API KEY required for the Gummy subtitle engine, which needs to be obtained from the Alibaba Cloud Bailing platform. For more details, see the project user manual.",
-    "voskModelPathInfo": "The folder path of the model required by the Vosk subtitle engine. You need to download the required model to your local machine in advance. For more details, see the project user manual.",
-    "sosvModelPathInfo": "The folder path of the model required by the SOSV subtitle engine. You need to download the required model to your local machine in advance. For more details, see the project user manual.",
+    "apikeyInfo": "API KEY required for the Gummy caption engine, which needs to be obtained from the Alibaba Cloud Bailing platform. For more details, see the project user manual.",
+    "glmApikeyInfo": "API KEY required for GLM caption engine, which needs to be obtained from the Zhipu AI platform.",
+    "voskModelPathInfo": "The folder path of the model required by the Vosk caption engine. You need to download the required model to your local machine in advance. For more details, see the project user manual.",
+    "sosvModelPathInfo": "The folder path of the model required by the SOSV caption engine. You need to download the required model to your local machine in advance. For more details, see the project user manual.",
    "recordingPathInfo": "The path to save recording files, requiring a folder path. The software will automatically name the recording file and save it as .wav file.",
    "modelDownload": "Model Download Link",
    "startTimeoutInfo": "Caption engine startup timeout duration. Engine will be forcefully stopped if startup exceeds this time. Recommended range: 10-120 seconds.",
@@ -143,7 +146,7 @@ export default {
      "projLink": "Project Link",
      "manual": "User Manual",
      "engineDoc": "Caption Engine Manual",
-      "date": "September 8th, 2025"
+      "date": "January 10th, 2026"
    }
  },
  log: {
--- a/src/renderer/src/i18n/lang/ja.ts
+++ b/src/renderer/src/i18n/lang/ja.ts
@@ -50,8 +50,10 @@ export default {
    "sourceLang": "ソース言語",
    "transLang": "翻訳言語",
    "transModel": "翻訳モデル",
-    "ollama": "Ollama",
-    "ollamaNote": "翻訳に使用する、デフォルトポートでサービスを呼び出すローカルOllamaモデルの名前。1B 未満のパラメータを持つ非推論モデルの使用を推奨します。",
+    "modelName": "モデル名",
+    "modelNameNote": "使用する翻訳モデル名を入力してください。Ollama のローカルモデルでも OpenAI API 互換のクラウドモデルでも可能です。Base URL フィールドが未入力の場合、デフォルトでローカルの Ollama サービスが呼び出され、それ以外の場合は Python OpenAI ライブラリ経由で指定されたアドレスの API サービスが呼び出されます。",
+    "baseURL": "OpenAI API を呼び出すための基本リクエスト URL です。未記入の場合、ローカルのデフォルトポートの Ollama モデルが呼び出されます。",
+    "apiKey": "OpenAI API に対応するモデルを使用するために必要な API キーです。",
    "captionEngine": "エンジン",
    "audioType": "オーディオ",
    "systemOutput": "システムオーディオ出力（スピーカー）",
@@ -66,6 +68,7 @@ export default {
    "startTimeout": "時間制限",
    "seconds": "秒",
    "apikeyInfo": "Gummy 字幕エンジンに必要な API KEY は、アリババクラウド百煉プラットフォームから取得する必要があります。詳細情報はプロジェクトのユーザーマニュアルをご覧ください。",
+    "glmApikeyInfo": "GLM 字幕エンジンに必要な API KEY で、智譜 AI プラットフォームから取得する必要があります。",
    "voskModelPathInfo": "Vosk 字幕エンジンに必要なモデルのフォルダパスです。必要なモデルを事前にローカルマシンにダウンロードする必要があります。詳細情報はプロジェクトのユーザーマニュアルをご覧ください。",
    "sosvModelPathInfo": "SOSV 字幕エンジンに必要なモデルのフォルダパスです。必要なモデルを事前にローカルマシンにダウンロードする必要があります。詳細情報はプロジェクトのユーザーマニュアルをご覧ください。",
    "recordingPathInfo": "録音ファイルの保存パスで、フォルダパスを指定する必要があります。ソフトウェアが自動的に録音ファイルに名前を付けて .wav ファイルとして保存します。",
@@ -142,7 +145,7 @@ export default {
      "projLink": "プロジェクトリンク",
      "manual": "ユーザーマニュアル",
      "engineDoc": "字幕エンジンマニュアル",
-      "date": "2025 年 9 月 8 日"
+      "date": "2026 年 1 月 10 日"
    }
  },
  log: {
--- a/src/renderer/src/i18n/lang/zh.ts
+++ b/src/renderer/src/i18n/lang/zh.ts
@@ -50,8 +50,10 @@ export default {
    "sourceLang": "源语言",
    "transLang": "翻译语言",
    "transModel": "翻译模型",
-    "ollama": "Ollama",
-    "ollamaNote": "要使用的进行翻译的本地 Ollama 模型的名称，将调用默认端口的服务，建议使用参数量小于 1B 的非推理模型。",
+    "modelName": "模型名称",
+    "modelNameNote": "请输入要使用的翻译模型名称，可以是 Ollama 本地模型，也可以是 OpenAI API 兼容的云端模型。若未填写 Base URL 字段，则默认调用本地 Ollama 服务，否则会通过 Python OpenAI 库调用该地址指向的 API 服务。",
+    "baseURL": "调用 OpenAI API 的基础请求地址，如果不填写则调用本地默认端口的 Ollama 模型。",
+    "apiKey": "调用 OpenAI API 对应的模型需要使用的 API KEY。",
    "captionEngine": "字幕引擎",
    "audioType": "音频类型",
    "systemOutput": "系统音频输出（扬声器）",
@@ -66,6 +68,7 @@ export default {
    "startTimeout": "启动超时",
    "seconds": "秒",
    "apikeyInfo": "Gummy 字幕引擎需要的 API KEY，需要在阿里云百炼平台获取。详细信息见项目用户手册。",
+    "glmApikeyInfo": "GLM 字幕引擎需要的 API KEY，需要在智谱 AI 平台获取。",
    "voskModelPathInfo": "Vosk 字幕引擎需要的模型的文件夹路径，需要提前下载需要的模型到本地。信息详情见项目用户手册。",
    "sosvModelPathInfo": "SOSV 字幕引擎需要的模型的文件夹路径，需要提前下载需要的模型到本地。信息详情见项目用户手册。",
    "recordingPathInfo": "录音文件保存路径，需要提供文件夹路径。软件会自动命名录音文件并保存为 .wav 文件。",
@@ -142,7 +145,7 @@ export default {
      "projLink": "项目链接",
      "manual": "用户手册",
      "engineDoc": "字幕引擎手册",
-      "date": "2025 年 9 月 8 日"
+      "date": "2026 年 1 月 10 日"
    }
  },
  log: {