Merge branch 'llmshield/dev-online-1.7.0' into 'integration_2025-12-05_1090279190786'

feat: [development task] llm shield (1902662)

See merge request iaasng/volcengine-java-sdk!790

Author: BitsAdmin

volcengine-java-sdk-llmshield/src/main/java/com/volcengine/llmshield/ApiClient.java

@@ -1,35 +1,33 @@
 package com.volcengine.llmshield;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
+import java.net.URL;
 import java.util.concurrent.TimeUnit;
 
-
 // 客户端类
 
 public class ApiClient {
     private final String CONTENT_TYPE_HEADER = "application/json";
-
-
     private final String url;
     private final String ak;
     private final String sk;
     private final String region;
-    private HttpClient httpClient;
+    private CloseableHttpClient httpClient;
 
-    private ApiClient(String url, String ak,String sk,String region,  long timeout) {
+    private ApiClient(String url, String ak, String sk, String region, long timeout) {
         this.url = url;
         this.ak = ak;
         this.sk = sk;
@@ -39,6 +37,36 @@ private ApiClient(String url, String ak,String sk,String region,  long timeout)
                 .build();
     }
 
+    private ApiClient(String url, String ak, String sk, String region, long timeout, String proxy, int connMax) throws MalformedURLException {
+        this.url = url;
+        this.ak = ak;
+        this.sk = sk;
+        this.region = region;
+
+        HttpClientBuilder builder = HttpClientBuilder.create().setConnectionTimeToLive(timeout, TimeUnit.MILLISECONDS);
+        if (proxy != null && !proxy.isEmpty()) {
+            try {
+                URL purl = new URL(proxy);
+                String p_protocol = purl.getProtocol(); // 协议（http/https 等）
+                String p_host = purl.getHost();         // 主机名（域名或 IP）
+                int p_port = purl.getPort();            // 显式指定的端口号
+                if (p_port < 0) {
+                    p_port = purl.getDefaultPort();// 协议默认端口
+                }
+                HttpHost httpsProxy = new HttpHost(p_host, p_port, p_protocol);
+                builder.setProxy(httpsProxy);
+            } catch (MalformedURLException e) {
+                throw new IllegalArgumentException("Invalid Proxy Info：" + proxy, e);
+            }
+        }
+
+        if (connMax > 0) {
+            builder.setMaxConnTotal(connMax).setMaxConnPerRoute(connMax);
+        }
+
+        this.httpClient = builder.build();
+    }
+
     /**
      * 创建新的客户端实例
      *
@@ -49,10 +77,51 @@ private ApiClient(String url, String ak,String sk,String region,  long timeout)
      * @param timeout 连接超时时间（毫秒）
      * @return 客户端实例
      */
-    public static ApiClient New(String url, String ak,String sk , String region, long timeout) {
+    public static ApiClient New(String url, String ak, String sk, String region, long timeout) {
         return new ApiClient(url, ak,sk,region, timeout);
     }
 
+    /**
+     * 创建新的客户端实例
+     *
+     * @param url     API 请求的基础 URL
+     * @param ak      访问密钥
+     * @param sk      密钥
+     * @param region  区域
+     * @param proxy   代理地址
+     * @param timeout 连接超时时间（毫秒）
+     * @return 客户端实例
+     */
+    public static ApiClient New(String url, String ak, String sk, String region, long timeout, String proxy, int connMax) throws MalformedURLException {
+        return new ApiClient(url, ak, sk, region, timeout, proxy, connMax);
+    }
+
+    /**
+     * 关闭客户端
+     *
+     * @return 无
+     */
+    public void Close() throws IOException {
+        try {
+            this.httpClient.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 设置环境
+     * @param IsDev 是否为dev环境
+     * @return 无
+     */
+    public void SetServiceDev(boolean IsDev)  {
+        Sign.setServiceDev(IsDev);
+    }
+
+    public String GetServiceCode()  {
+        return Sign.getServiceCode();
+    }
+
     /**
      * 多模态、多轮对话审核
      *

volcengine-java-sdk-llmshield/src/main/java/com/volcengine/llmshield/ContentTypeV2.java

@@ -5,7 +5,8 @@ public enum ContentTypeV2 {
     TEXT(1),        // 文本
     AUDIO(2),       // 音频
     IMAGE(3),       // 图片
-    VIDEO(4);       // 视频
+    VIDEO(4),       // 视频
+    FILE(5);        // 文件
 
     private final long value;
 

volcengine-java-sdk-llmshield/src/main/java/com/volcengine/llmshield/MessageV2.java

@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.ArrayList;
+import java.util.List;
+
 // 消息结构
 public class MessageV2 {
     @JsonProperty("Role")
@@ -13,13 +16,23 @@ public class MessageV2 {
     @JsonProperty("ContentType")
     private ContentTypeV2 contentType;  // 内容类型
 
+    @JsonProperty("MultiPart")
+    private List<MultiPart> multiPart;  // 多模态内容
+
     // 深拷贝构造方法
     public MessageV2(MessageV2 other) {
         // String是不可变类型，直接赋值即可
         this.role = other.role;
         this.content = other.content;
-
         this.contentType = other.contentType;
+
+        // List<multiPart>：新建List并对每个元素深拷贝
+        if (other.multiPart != null) {
+            this.multiPart = new ArrayList<>();
+            for (MultiPart contPart : other.multiPart) {
+                this.multiPart.add(new MultiPart(contPart)); // 假设MultiPart有深拷贝构造方法
+            }
+        }
     }
 
     // 无参构造方法（保留，用于JSON反序列化等场景）
@@ -48,4 +61,17 @@ public ContentTypeV2 getContentType() {
     public void setContentType(ContentTypeV2 contentType) {
         this.contentType = contentType;
     }
+
+    public List<MultiPart> getMultiPart() { return multiPart; }
+
+    public void setMultiPart(List<MultiPart> multiPart) { this.multiPart = multiPart; }
+
+    // 追加单条历史消息
+    public MessageV2 appendMultiPart(MultiPart contPart) {
+        if (this.multiPart == null) {
+            this.multiPart = new ArrayList<>();
+        }
+        this.multiPart.add(contPart);
+        return this; // 支持链式调用
+    }
 }

volcengine-java-sdk-llmshield/src/main/java/com/volcengine/llmshield/ModerateV2Result.java

@@ -16,6 +16,9 @@ public class ModerateV2Result {
     @JsonProperty("PermitInfo")
     private PermitInfoV2 permitInfo;  // 放行信息
 
+    @JsonProperty("ContentInfo")
+    private String contentInfo;  // 提交内容信息
+
     @JsonProperty("Degraded")
     private boolean degraded;   // 是否降级
 
@@ -58,6 +61,10 @@ public void setPermitInfo(PermitInfoV2 permitInfo) {
         this.permitInfo = permitInfo;
     }
 
+    public String getContentInfo() { return contentInfo; }
+
+    public void setContentInfo(String contentInfo) { this.contentInfo = contentInfo;}
+
     public boolean isDegraded() {
         return degraded;
     }

volcengine-java-sdk-llmshield/src/main/java/com/volcengine/llmshield/MultiPart.java

@@ -0,0 +1,28 @@
+package com.volcengine.llmshield;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class MultiPart {
+    @JsonProperty("Content")
+    private String content;     // 内容文本或链接
+
+    @JsonProperty("ContentType")
+    private ContentTypeV2 contentType;  // 内容类型
+
+    // 深拷贝构造方法
+    public MultiPart(MultiPart other) {
+        // String是不可变类型，直接赋值即可
+        this.content = other.content;
+        this.contentType = other.contentType;
+    }
+
+    // 无参构造方法（保留，用于JSON反序列化等场景）
+    public MultiPart() {}
+    public String getContent() { return content; }
+
+    public void setContent(String content) { this.content = content; }
+
+    public ContentTypeV2 getContentType() { return contentType; }
+
+    public void setContentType(ContentTypeV2 contentType) { this.contentType = contentType; }
+}

volcengine-java-sdk-llmshield/src/main/java/com/volcengine/llmshield/Sign.java

@@ -34,14 +34,19 @@
  */
 public class Sign {
     // 常量定义
+    private static final String SERVICE_CODE_DEV = "llmshield_dev";
+    private static final String SERVICE_CODE_ONLINE = "llmshield";
+
     private static final String VERSION = "2025-08-31";
-    private static final String SERVICE = "llmshield";
     private static final BitSet URLENCODER = new BitSet(256);
     private static final String CONST_ENCODE = "0123456789ABCDEF";
     public static final Charset UTF_8 = StandardCharsets.UTF_8;
     // 默认 Content-Type（可根据实际需求调整，若请求体为 JSON 可改为 application/json）
     private static final String DEFAULT_CONTENT_TYPE = "application/json";
 
+    private static boolean isModified = false; //记录是否已修改过
+    private static String SERVICE = SERVICE_CODE_ONLINE;
+
     // 静态初始化 URL 编码允许的字符（复用原逻辑）
     static {
         int i;
@@ -62,6 +67,21 @@ public class Sign {
         URLENCODER.set('~');
     }
 
+    public static synchronized void setServiceDev(boolean IsDev) {
+        if (!isModified) {
+            if (IsDev) {
+                SERVICE = SERVICE_CODE_DEV;
+            } else {
+                SERVICE = SERVICE_CODE_ONLINE;
+            }
+            isModified = true;
+        }
+    }
+
+    public static String getServiceCode() {
+        return SERVICE;
+    }
+
     /**
      * 核心加签方法：为 HttpPost 请求添加火山引擎 API 签名
      *