fix(llm): 回退读取厂商环境变量中的 API Key 与 Base URL，并去除重复的 Bearer 前缀

Author: iammm0

server/src/common/llm/llm.factory.ts

@@ -1,7 +1,37 @@
 import { LLMProvider } from './llm.interface';
 import { OllamaProvider } from './ollama.provider';
 import { OpenAICompatProvider } from './openai-compat.provider';
-import { getDefaultOpenAICompatBaseUrl } from '../../modules/system/llm-provider-registry';
+import {
+  getDefaultOpenAICompatBaseUrl,
+  getEnvBackedApiKey,
+  getEnvBackedBaseUrl,
+} from '../../modules/system/llm-provider-registry';
+
+/** 去掉用户误填的「Bearer 」前缀，避免 Authorization 变成 Bearer Bearer … */
+function normalizeBearerApiKey(raw: string): string {
+  const t = raw.trim();
+  if (!t) return '';
+  return t.replace(/^Bearer\s+/i, '').trim();
+}
+
+function resolveOpenAICompatApiKey(provider: string, explicit?: string): string {
+  const candidates = [
+    normalizeBearerApiKey(explicit ?? ''),
+    normalizeBearerApiKey(process.env.LLM_API_KEY ?? ''),
+    normalizeBearerApiKey(getEnvBackedApiKey(provider)),
+  ];
+  return candidates.find((k) => k.length > 0) ?? '';
+}
+
+function resolveOpenAICompatBaseUrl(provider: string, explicit?: string): string | undefined {
+  const candidates = [
+    (explicit ?? '').trim(),
+    (process.env.LLM_BASE_URL ?? '').trim(),
+    getEnvBackedBaseUrl(provider),
+  ];
+  const first = candidates.find((u) => u.length > 0);
+  return first;
+}
 
 export interface LLMConfig {
   provider: string;
@@ -21,11 +51,17 @@ export function createLLM(config: LLMConfig): LLMProvider {
   }
 
   const baseUrl =
-    config.baseUrl ??
+    resolveOpenAICompatBaseUrl(provider, config.baseUrl) ??
     getDefaultOpenAICompatBaseUrl(provider) ??
     (provider === 'deepseek' ? 'https://api.deepseek.com' : 'https://api.openai.com');
-  const model = config.model ?? (provider === 'deepseek' ? 'deepseek-chat' : 'gpt-4o-mini');
-  const apiKey = config.apiKey ?? '';
+  const modelFromEnv =
+    (process.env.LLM_MODEL ?? '').trim() ||
+    (provider === 'deepseek' ? (process.env.DEEPSEEK_MODEL ?? '').trim() : '');
+  const model =
+    (config.model ?? '').trim() ||
+    modelFromEnv ||
+    (provider === 'deepseek' ? 'deepseek-chat' : 'gpt-4o-mini');
+  const apiKey = resolveOpenAICompatApiKey(provider, config.apiKey);
 
   return new OpenAICompatProvider(baseUrl, apiKey, model);
 }

server/src/modules/system/llm-provider-registry.ts

@@ -280,3 +280,19 @@ const REGISTRY_BY_ID = new Map(LLM_PROVIDER_REGISTRY.map((e) => [e.id, e]));
 export function getDefaultOpenAICompatBaseUrl(providerId: string): string | undefined {
   return REGISTRY_BY_ID.get(providerId.toLowerCase())?.defaultOpenAICompatBaseUrl;
 }
+
+/** 当未设置 LLM_API_KEY 时，回退读取各厂商文档中的标准环境变量 */
+export function getEnvBackedApiKey(providerId: string): string {
+  const entry = REGISTRY_BY_ID.get(providerId.toLowerCase());
+  const envName = entry?.apiKeyEnv;
+  if (!envName) return '';
+  return (process.env[envName] ?? '').trim();
+}
+
+/** 当未设置 LLM_BASE_URL 时，回退读取各厂商的 Base URL 环境变量 */
+export function getEnvBackedBaseUrl(providerId: string): string {
+  const entry = REGISTRY_BY_ID.get(providerId.toLowerCase());
+  const envName = entry?.baseUrlEnv;
+  if (!envName) return '';
+  return (process.env[envName] ?? '').trim();
+}