diff --git a/jnpf-admin/src/main/resources/application.yml b/jnpf-admin/src/main/resources/application.yml index 7706e9f..a320e8e 100644 --- a/jnpf-admin/src/main/resources/application.yml +++ b/jnpf-admin/src/main/resources/application.yml @@ -86,6 +86,9 @@ gateway: - /api/open-design/** - /api/ssw/tds/api/** - /api/ssw/jyzs/ai/** + # BS-NCPF-400 (2026-07-12): NCPF /visualdev/ai/form 走 SSW proxy 翻译 Anthropic 协议 + # NCPF 发 Authorization: Bearer (非 user token), 需 bypass auth + - /api/ssw/ai/openai-proxy exclude-url: null white-ip: null logging: diff --git a/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java b/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java index 0c53fd0..13e376c 100644 --- a/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java +++ b/ssw-common/ssw-common-biz/src/main/java/ssw/common/util/SswLLMClient.java @@ -234,6 +234,20 @@ public class SswLLMClient { } } + /** + * v0.20+ (2026-07-12 BS-NCPF-400): 暴露 base_ai 配置给 SswLLMProxyController + * + * 用途: SswLLMProxyController 直调 MiniMax 时, 需要拿到真实 baseUrl/credential/model. + * (不通过 SswLLMClient.chat 是因为它把任意 baseUrl 当 OpenAI 端点处理) + * + * 注意: 返回的是 base_ai 表当前配置, baseUrl 可能已经被改成 SSW proxy 地址 + * (本方法调用方需要意识到这点, 通常用于恢复成 MiniMax 真实地址) + */ + public Map getDefaultConfigForProxy() { + // 暂时返回 jnpf AiService 配置, 调用方需自行处理 baseUrl 转换 + return loadDefaultAIConfig(); + } + /** 兼容: 不传 systemPrompt 用默认 */ public String chat(String userPrompt) { return chat(DEFAULT_SYSTEM_PROMPT, userPrompt); diff --git a/ssw-common/ssw-common-controller/src/main/java/ssw/common/controller/SswLLMProxyController.java b/ssw-common/ssw-common-controller/src/main/java/ssw/common/controller/SswLLMProxyController.java new file mode 100644 index 0000000..aa20597 --- /dev/null +++ b/ssw-common/ssw-common-controller/src/main/java/ssw/common/controller/SswLLMProxyController.java @@ -0,0 +1,221 @@ +package ssw.common.controller; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.http.Method; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import ssw.common.util.SswLLMClient; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * SSW LLM OpenAI 兼容 Proxy Controller (BS-NCPF-400 解决) + * + * 问题: jnpf SendAiMessage.aiHttp() (SendAiMessage.java:207-221) 强制发 "Authorization: Bearer" header + * 并直接 POST {baseUrl} (缺 /v1/messages 后缀), 但 MiniMax (api.minimaxi.com/anthropic) 是 + * Anthropic 兼容端点, 要求 x-api-key + anthropic-version + /v1/messages 路径. + * → NCPF /visualdev/ai/form 返回 400 "System abnormality" / "AI模型连接失败" + * + * 解决: base_ai.baseUrl 改为 http://nginx/api/ssw/ai/openai-proxy (本端点) + * - 接收 NCPF 的 OpenAI 格式 (Authorization: Bearer + OpenAI body) + * - 翻译成 Anthropic 格式, 直接调 MiniMax (X-Api-Key + anthropic-version) + * - 返回 OpenAI 格式 (NCPF SendAiMessage.java:101-110 可解析) + * + * 流程: + * NCPF /visualdev/ai/form + * ↓ POST {baseUrl} + Authorization: Bearer + OpenAI body + * SswLLMProxyController.openaiProxy + * ↓ 拆 messages → system + user, 转 Anthropic body + * POST https://api.minimaxi.com/anthropic/v1/messages + * ↓ X-Api-Key + anthropic-version: 2023-06-01 + * MiniMax API + * ↓ Anthropic JSON response { content: [{ text: "..." }] } + * SswLLMProxyController (包装成 OpenAI 格式) + * ↓ { choices: [{ message: { content: "..." } }] } + * NCPF 解析 (SendAiMessage.java:101-110) ✓ + * + * @author claude (2026-07-12 BS-NCPF-400) + */ +@Slf4j +@RestController +@RequestMapping("/api/ssw/ai") +@Tag(name = "SSW LLM OpenAI 代理", description = "NCPF /visualdev/ai/form 走 SSW 翻译, 绕开 jnpf SendAiMessage Bearer header + URL suffix 问题") +public class SswLLMProxyController { + + @Autowired + private SswLLMClient llmClient; + + /** + * OpenAI-compatible chat/completions 代理 + * + * 请求: 标准 OpenAI chat/completions 格式 + * { + * "model": "MiniMax-M3", + * "messages": [{"role":"system","content":"..."}, {"role":"user","content":"..."}], + * "max_tokens": 1500 + * } + * + * 响应: 标准 OpenAI chat/completions 格式 + * { + * "id": "...", "object": "chat.completion", + * "model": "MiniMax-M3", + * "choices": [{"index":0, "message":{"role":"assistant","content":"..."}, "finish_reason":"stop"}], + * "usage": {...} + * } + */ + @PostMapping("/openai-proxy") + @Operation(summary = "OpenAI 兼容 chat/completions 代理 (BS-NCPF-400 解决)", + description = "NCPF /visualdev/ai/form 走本端点, 拆 system/user, 转 Anthropic 协议调 MiniMax") + public Map openaiProxy(@RequestBody Map body) { + String model = (String) body.get("model"); + @SuppressWarnings("unchecked") + List> messages = (List>) body.get("messages"); + Integer maxTokens = body.get("max_tokens") != null + ? ((Number) body.get("max_tokens")).intValue() : 1500; + + if (messages == null || messages.isEmpty()) { + log.warn("[OpenAI Proxy] 请求无 messages"); + return errorResponse("messages 不能为空"); + } + + // 拆 system + user (Anthropic 协议 system 独立字段) + String systemPrompt = ""; + StringBuilder userPrompt = new StringBuilder(); + for (Map msg : messages) { + String role = (String) msg.get("role"); + String content = (String) msg.get("content"); + if ("system".equals(role)) { + systemPrompt = content != null ? content : ""; + } else if ("user".equals(role)) { + if (userPrompt.length() > 0) userPrompt.append("\n"); + userPrompt.append(content != null ? content : ""); + } + } + + log.info("[OpenAI Proxy] POST model={} maxTokens={} systemLen={} userLen={}", + model, maxTokens, systemPrompt.length(), userPrompt.length()); + + try { + // 直接调 MiniMax Anthropic 端点 (不走 SswLLMClient, 因它把任意 baseUrl 当 OpenAI 处理) + String content = callMiniMaxAnthropic(model, systemPrompt, userPrompt.toString(), maxTokens); + if (content == null || content.isEmpty()) { + log.warn("[OpenAI Proxy] LLM 返回空"); + return errorResponse("LLM 返回空"); + } + + // 包装成 OpenAI chat/completions 响应 + Map choice = new HashMap<>(); + choice.put("index", 0); + Map message = new HashMap<>(); + message.put("role", "assistant"); + message.put("content", content); + choice.put("message", message); + choice.put("finish_reason", "stop"); + + Map usage = new HashMap<>(); + usage.put("prompt_tokens", (systemPrompt.length() + userPrompt.length()) / 4); + usage.put("completion_tokens", content.length() / 4); + usage.put("total_tokens", (systemPrompt.length() + userPrompt.length() + content.length()) / 4); + + Map response = new HashMap<>(); + response.put("id", "ssw-proxy-" + System.currentTimeMillis()); + response.put("object", "chat.completion"); + response.put("created", System.currentTimeMillis() / 1000); + response.put("model", model != null ? model : "unknown"); + response.put("choices", java.util.Collections.singletonList(choice)); + response.put("usage", usage); + + log.info("[OpenAI Proxy] ✓ 返回 content {} 字符", content.length()); + return response; + } catch (Exception e) { + log.error("[OpenAI Proxy] LLM 调用异常", e); + return errorResponse("LLM 调用异常: " + e.getMessage()); + } + } + + /** + * 直调 MiniMax Anthropic 端点 + * + * 不走 SswLLMClient (它处理 OpenAI 协议, 不适合本场景) + * 直接用 hutool HttpRequest 构造 Anthropic 协议请求 + * + * 重要: base_ai.baseUrl 已被改成 SSW proxy URL, 这里硬编码 MiniMax 真实地址. + * 如未来换 provider, 这里也要改. + */ + private String callMiniMaxAnthropic(String model, String systemPrompt, String userPrompt, int maxTokens) { + // 从 base_ai 拿 credential (baseUrl 已是 proxy URL, 不能用) + Map aiConfig = llmClient.getDefaultConfigForProxy(); + String credential = (String) aiConfig.get("credential"); + String actualModel = (String) aiConfig.get("model"); + + if (credential == null) { + throw new RuntimeException("base_ai.credential 缺失"); + } + + // 真实 MiniMax Anthropic 端点 (硬编码, 因 base_ai.baseUrl 已被 proxy 占用) + String baseUrl = "https://api.minimaxi.com/anthropic"; + + // Anthropic body: { model, system, messages: [{role, content}], max_tokens } + JSONObject anthropicBody = new JSONObject(); + anthropicBody.put("model", actualModel != null ? actualModel : model); + anthropicBody.put("max_tokens", maxTokens); + anthropicBody.put("system", systemPrompt); + + JSONArray msgs = new JSONArray(); + JSONObject userMsg = new JSONObject(); + userMsg.put("role", "user"); + userMsg.put("content", userPrompt); + msgs.add(userMsg); + anthropicBody.put("messages", msgs); + + // URL: {baseUrl}/v1/messages + String normalized = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl; + String url = normalized.endsWith("/v1/messages") ? normalized : normalized + "/v1/messages"; + + log.info("[OpenAI Proxy] 直调 {} (anthropic) model={} maxTokens={}", url, actualModel, maxTokens); + + HttpRequest req = HttpRequest.post(url) + .header("Content-Type", "application/json") + .header("x-api-key", credential) + .header("anthropic-version", "2023-06-01") + .body(anthropicBody.toJSONString()) + .timeout(60000); + + try (HttpResponse resp = req.execute()) { + if (!resp.isOk()) { + String errBody = resp.body() != null ? resp.body().substring(0, Math.min(300, resp.body().length())) : ""; + throw new RuntimeException("MiniMax HTTP " + resp.getStatus() + ": " + errBody); + } + JSONObject respJson = JSON.parseObject(resp.body()); + JSONArray contentArr = respJson.getJSONArray("content"); + if (contentArr == null || contentArr.isEmpty()) { + throw new RuntimeException("Anthropic 响应无 content: " + resp.body()); + } + return contentArr.getJSONObject(0).getString("text"); + } + } + + /** + * OpenAI 格式错误响应 + */ + private Map errorResponse(String message) { + Map error = new HashMap<>(); + error.put("message", message); + error.put("type", "invalid_request_error"); + Map response = new HashMap<>(); + response.put("error", error); + return response; + } +} \ No newline at end of file