fix(BS-NCPF-400): SSW OpenAI proxy 解 NCPF 400 System abnormality
根因 (jnpf/后端/.../SendAiMessage.java:207-221 aiHttp):
NCPF /visualdev/ai/form 强制发 'Authorization: Bearer' + 直接 POST {baseUrl}
但 base_ai.baseUrl 配的是 Anthropic 兼容端点 (api.minimaxi.com/anthropic)
缺 /v1/messages 后缀 + 缺 x-api-key / anthropic-version 头 → 400
解决方案 (合规扩展层, jnpf/ 0 改动):
- 新增 SswLLMProxyController (/api/ssw/ai/openai-proxy)
* 接 NCPF 的 OpenAI 格式请求 (Authorization: Bearer + OpenAI body)
* 拆 messages → system + user
* 转 Anthropic body, 直调 MiniMax (X-Api-Key + anthropic-version)
* 返回 OpenAI 格式响应 (NCPF SendAiMessage.java:101-110 可解析)
- SswLLMClient.getDefaultConfigForProxy() 暴露 base_ai 配置
- application.yml gateway.white-url 加 /api/ssw/ai/openai-proxy (NCPF 发的 Authorization 是 base_ai.credential, 非 user token, 需 bypass AuthFilter)
- base_ai.baseUrl 改 http://nginx/api/ssw/ai/openai-proxy (jnpf 调用入口)
验证 (POST /api/visualdev/ai/form):
修复前: {code:400, msg:'System abnormality'} / 'AI模型连接失败'
修复后: {code:200, data:{enCode:'ncpfRepairTest', fullName:'NCPF修复测试',
aiModelList:[{tableName:'ncpf_repair_test',
fields:[{fieldTitle:'姓名',...},{fieldTitle:'电话',...}]}]}}
链路:
NCPF /visualdev/ai/form
↓ POST baseUrl + Bearer
SSW proxy /api/ssw/ai/openai-proxy (whitelist bypass auth)
↓ Anthropic 协议 + X-Api-Key
https://api.minimaxi.com/anthropic/v1/messages
↓ Anthropic JSON response
SSW proxy (包装成 OpenAI 格式)
↓ { choices: [...] }
NCPF 解析 ✓
已知限制:
- proxy 硬编码 MiniMax URL, 未来换 provider 要改 SswLLMProxyController.callMiniMaxAnthropic()
This commit is contained in:
1 parent
bc18222485
commit
f66734d9a6
3 files changed
+238
No files matched your search
@@ -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 <base_ai.credential> (非 user token), 需 bypass auth
|
||||
- /api/ssw/ai/openai-proxy
|
||||
exclude-url: null
|
||||
white-ip: null
|
||||
logging:
|
||||
|
||||
@@ -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<String, Object> getDefaultConfigForProxy() {
|
||||
// 暂时返回 jnpf AiService 配置, 调用方需自行处理 baseUrl 转换
|
||||
return loadDefaultAIConfig();
|
||||
}
|
||||
|
||||
/** 兼容: 不传 systemPrompt 用默认 */
|
||||
public String chat(String userPrompt) {
|
||||
return chat(DEFAULT_SYSTEM_PROMPT, userPrompt);
|
||||
|
||||
+221
@@ -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<String, Object> openaiProxy(@RequestBody Map<String, Object> body) {
|
||||
String model = (String) body.get("model");
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Map<String, Object>> messages = (List<Map<String, Object>>) 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<String, Object> 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<String, Object> choice = new HashMap<>();
|
||||
choice.put("index", 0);
|
||||
Map<String, Object> message = new HashMap<>();
|
||||
message.put("role", "assistant");
|
||||
message.put("content", content);
|
||||
choice.put("message", message);
|
||||
choice.put("finish_reason", "stop");
|
||||
|
||||
Map<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> errorResponse(String message) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("message", message);
|
||||
error.put("type", "invalid_request_error");
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("error", error);
|
||||
return response;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user