From 77728543527cb50fddf8fef44805f644e7c8e48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 2 Oct 2026 09:21:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B4=A7=E6=BA=90):=20LLM=20=E5=AF=86?= =?UTF-8?q?=E9=92=A5=E5=8E=BB=E6=8E=89=E5=B9=B3=E5=8F=B0=E5=85=AC=E8=B4=B9?= =?UTF-8?q?=E5=85=9C=E5=BA=95=EF=BC=8C=E4=BB=BB=E5=8A=A1=E6=B2=A1=E5=B8=A6?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E5=AF=86=E9=92=A5=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E6=A3=80=E8=80=8C=E4=B8=8D=E4=BB=A3=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `llm-api-key` 这条回落链(配置 → 公费 key)此前是账目对不上的一个来源:用户没配密钥时 货源任务照样跑完 LLM,花费记在平台头上。现在只认任务自带的 api_key,为空即跳过检测、 保留原始行。两台线上都未设置 AIIMAGE_SIMILAR_ASIN_LLM_API_KEY,本批发布对现网行为零变化。 --- .../com/nanri/aiimage/config/SimilarAsinProperties.java | 3 --- .../modules/similarasin/client/SimilarAsinLlmClient.java | 8 +++----- backend-java/src/main/resources/application.yml | 1 - .../similarasin/service/SimilarAsinLlmLocalVerify.java | 2 +- .../similarasin/service/SimilarAsinLlmServiceTest.java | 5 ++--- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java b/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java index 31dfa8093..3adc6d18c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/SimilarAsinProperties.java @@ -158,9 +158,6 @@ public class SimilarAsinProperties { /** 直连 LLM 的 base url(OpenAI 兼容 /v1/chat/completions)。 */ private String llmHost = "https://ai.t8star.org"; - /** 直连 LLM 的 Bearer token;前端未传 api_key 时兜底使用。 */ - private String llmApiKey = ""; - /** 类目匹配(一级/二级)使用的小模型。 */ private String llmCategoryModel = "gemini-3.1-flash-lite-preview-thinking-medium"; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java index fae2521e2..4cd8187ea 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java @@ -97,12 +97,10 @@ public class SimilarAsinLlmClient { : new IllegalStateException(lastFailure.getMessage(), lastFailure); } - /** 前端 api_key 为空时兜底走服务端配置(工作流里 api_key 为必填项)。 */ + /** 只认任务/用户自己的 api_key(payload → 按 uid 的服务端密钥表已在 readApiKey 兜过); + * 为空即空、跳过 LLM,绝不回落平台公费密钥 —— 各用户的任务只能烧各自的密钥。 */ public String resolveApiKey(String apiKey) { - if (apiKey != null && !apiKey.isBlank()) { - return apiKey.trim(); - } - return normalize(properties.getLlmApiKey()); + return apiKey == null ? "" : apiKey.trim(); } public boolean hasApiKey(String apiKey) { diff --git a/backend-java/src/main/resources/application.yml b/backend-java/src/main/resources/application.yml index 5c4b8429e..2aa23fde1 100644 --- a/backend-java/src/main/resources/application.yml +++ b/backend-java/src/main/resources/application.yml @@ -372,7 +372,6 @@ aiimage: llm-result-buffer-enabled: ${AIIMAGE_SIMILAR_ASIN_LLM_RESULT_BUFFER_ENABLED:true} direct-llm-enabled: ${AIIMAGE_SIMILAR_ASIN_DIRECT_LLM_ENABLED:true} llm-host: ${AIIMAGE_SIMILAR_ASIN_LLM_HOST:https://ai.t8star.org} - llm-api-key: ${AIIMAGE_SIMILAR_ASIN_LLM_API_KEY:} llm-category-model: ${AIIMAGE_SIMILAR_ASIN_LLM_CATEGORY_MODEL:gemini-3.1-flash-lite-preview-thinking-medium} llm-conform-model: ${AIIMAGE_SIMILAR_ASIN_LLM_CONFORM_MODEL:gemini-3.1-flash-lite-preview-thinking-medium} llm-image-compare-model: ${AIIMAGE_SIMILAR_ASIN_LLM_IMAGE_COMPARE_MODEL:gemini-3.1-flash-lite-preview-thinking-medium} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmLocalVerify.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmLocalVerify.java index 98d4c3ed4..e853277fe 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmLocalVerify.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmLocalVerify.java @@ -58,7 +58,7 @@ public class SimilarAsinLlmLocalVerify { } SimilarAsinProperties props = new SimilarAsinProperties(); - props.setLlmApiKey(apiKey); + // 密钥经 inspectRows 参数显式传入(平台公费 llm-api-key 已废除) props.setLlmRowConcurrency(2); props.setLlmImageDownloadTimeoutSeconds(10); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmServiceTest.java index 4ec9a844f..a62ac8dd6 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinLlmServiceTest.java @@ -53,9 +53,8 @@ class SimilarAsinLlmServiceTest { } private SimilarAsinProperties properties() { - SimilarAsinProperties props = new SimilarAsinProperties(); - props.setLlmApiKey("test-key"); - return props; + // 平台公费 llm-api-key 已废除:密钥只来自任务 payload / 用户密钥表(测试里 llmClient 都是 mock) + return new SimilarAsinProperties(); } private SimilarAsinLlmService service(SimilarAsinLlmClient llmClient) {