Skip to content

Commit f6e3814

Browse files
Merge "integration_2025-10-09_1063734499074" into "redis-Java-2020-12-07-online-1640-2025_09_25_15_25_25"
Conflicts: README.md meta.json pom.xml volcengine-java-sdk-acep/pom.xml volcengine-java-sdk-advdefence/pom.xml volcengine-java-sdk-advdefence20230308/pom.xml volcengine-java-sdk-aiotvideo/pom.xml volcengine-java-sdk-aiotvideo20231001/pom.xml volcengine-java-sdk-alb/pom.xml volcengine-java-sdk-apig/pom.xml volcengine-java-sdk-apig20221112/pom.xml volcengine-java-sdk-ark-runtime/pom.xml volcengine-java-sdk-ark/pom.xml volcengine-java-sdk-autoscaling/pom.xml volcengine-java-sdk-billing/pom.xml volcengine-java-sdk-bio/pom.xml volcengine-java-sdk-bmq/pom.xml volcengine-java-sdk-bmq20240901/pom.xml volcengine-java-sdk-bom/pom.xml volcengine-java-sdk-bytehousece20240831/pom.xml volcengine-java-sdk-cdn/pom.xml volcengine-java-sdk-cen/pom.xml volcengine-java-sdk-certificateservice/pom.xml volcengine-java-sdk-clb/pom.xml volcengine-java-sdk-clouddetect/pom.xml volcengine-java-sdk-cloudidentity/pom.xml volcengine-java-sdk-cloudtrail/pom.xml volcengine-java-sdk-cloudtrail20180101/pom.xml volcengine-java-sdk-core/pom.xml volcengine-java-sdk-core/src/main/java/com/volcengine/version/Version.java volcengine-java-sdk-coze20250601/pom.xml volcengine-java-sdk-cr/pom.xml volcengine-java-sdk-cv20240606/pom.xml volcengine-java-sdk-dataleap/pom.xml volcengine-java-sdk-dbw/pom.xml volcengine-java-sdk-dcdn/pom.xml volcengine-java-sdk-directconnect/pom.xml volcengine-java-sdk-dms/pom.xml volcengine-java-sdk-dns/pom.xml volcengine-java-sdk-ecs/pom.xml volcengine-java-sdk-edx/pom.xml volcengine-java-sdk-emr/pom.xml volcengine-java-sdk-escloud/pom.xml volcengine-java-sdk-filenas/pom.xml volcengine-java-sdk-flink20250101/pom.xml volcengine-java-sdk-fwcenter/pom.xml volcengine-java-sdk-ga/pom.xml volcengine-java-sdk-graph/pom.xml volcengine-java-sdk-graph20250815/pom.xml volcengine-java-sdk-hbase/pom.xml volcengine-java-sdk-httpdns/pom.xml volcengine-java-sdk-iam/pom.xml volcengine-java-sdk-iam20210801/pom.xml volcengine-java-sdk-kafka/pom.xml volcengine-java-sdk-kms/pom.xml volcengine-java-sdk-llmshield/pom.xml volcengine-java-sdk-mcdn/pom.xml volcengine-java-sdk-mcs/pom.xml volcengine-java-sdk-mlplatform20240701/pom.xml volcengine-java-sdk-mongodb/pom.xml volcengine-java-sdk-natgateway/pom.xml volcengine-java-sdk-nta/pom.xml volcengine-java-sdk-organization/pom.xml volcengine-java-sdk-privatelink/pom.xml volcengine-java-sdk-privatezone/pom.xml volcengine-java-sdk-quota/pom.xml volcengine-java-sdk-rabbitmq/pom.xml volcengine-java-sdk-rdsmssql/pom.xml volcengine-java-sdk-rdsmysql/pom.xml volcengine-java-sdk-rdsmysqlv2/pom.xml volcengine-java-sdk-rdspostgresql/pom.xml volcengine-java-sdk-redis/pom.xml volcengine-java-sdk-resourcecenter/pom.xml volcengine-java-sdk-resourceshare/pom.xml volcengine-java-sdk-rocketmq/pom.xml volcengine-java-sdk-secagent/pom.xml volcengine-java-sdk-seccenter/pom.xml volcengine-java-sdk-seccenter20240508/pom.xml volcengine-java-sdk-spark/pom.xml volcengine-java-sdk-speechsaasprod/pom.xml volcengine-java-sdk-speechsaasprod20250521/pom.xml volcengine-java-sdk-sqs/pom.xml volcengine-java-sdk-storageebs/pom.xml volcengine-java-sdk-sts/pom.xml volcengine-java-sdk-tag/pom.xml volcengine-java-sdk-tis/pom.xml volcengine-java-sdk-transitrouter/pom.xml volcengine-java-sdk-translate20250301/pom.xml volcengine-java-sdk-vedbm/pom.xml volcengine-java-sdk-vefaas/pom.xml volcengine-java-sdk-vefaasdev/pom.xml volcengine-java-sdk-veiapi/pom.xml volcengine-java-sdk-vepfs/pom.xml volcengine-java-sdk-vikingdb/pom.xml volcengine-java-sdk-vke/pom.xml volcengine-java-sdk-vmp/pom.xml volcengine-java-sdk-vms/pom.xml volcengine-java-sdk-vod20250101/pom.xml volcengine-java-sdk-volccontentplatform/pom.xml volcengine-java-sdk-volcobserve/pom.xml volcengine-java-sdk-vpc/pom.xml volcengine-java-sdk-vpn/pom.xml volcengine-java-sdk-waf/pom.xml volcengine-java-sdk-wafruntime/pom.xml
2 parents 1e5252f + 424daff commit f6e3814

File tree

467 files changed

+80698
-1935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+80698
-1935
lines changed

SDK_Integration_zh.md

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- [退避策略](#退避策略)
3333
- [异常处理](#异常处理)
3434
- [Debug机制](#debug机制)
35+
- [开启Debug模式](#开启debug模式)
3536

3637
# 集成SDK
3738

@@ -641,23 +642,17 @@ public class SampleCode {
641642

642643
为便于客户在处理请求时进行问题排查和调试,SDK 支持日志功能,并提供多种日志级别设置。客户可根据实际需求配置日志级别,获取详细的请求与响应信息,以提升排障效率和系统可 observability(可观测性)。
643644

645+
## 开启Debug模式
646+
644647
> **默认**
645-
> * `debugging` - `false` (表示不开启debug模式)
648+
> * `debug` - `false` (表示不开启debug模式)
646649
647-
Java SDK使用的是`com.squareup.okhttp.OkHttpClient`,可以通过设置`debugging`来开启debug模式
650+
Java SDK日志使用的是slf4j,需要依赖客户的配置文件,客户可以根据自己的需求,配置日志级别
648651

649-
```java
650-
import com.volcengine.ApiClient;
651-
import com.volcengine.sign.Credentials;
652-
653-
public class SampleCode {
654-
public static void main(String[] args) {
655-
String regionId = "cn-beijing";
656-
ApiClient apiClient = new ApiClient()
657-
.setCredentials(Credentials.getEnvCredentials())
658-
.setRegion(regionId)
659-
.setDebugging(true);
660-
}
661-
}
652+
**配置示例:**
662653

654+
```xml
655+
<!--开启debug日志-->
656+
<logger name="com.volcengine.sdkcore" level="debug"/>
663657
```
658+

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<common-lang-version>2.6</common-lang-version>
4444
<javax.annotation-version>1.3.2</javax.annotation-version>
4545
<javax.validation-version>2.0.1.Final</javax.validation-version>
46+
<org.slf4j.version>1.7.36</org.slf4j.version>
4647
</properties>
4748
<dependencyManagement>
4849
<dependencies>
@@ -91,6 +92,12 @@
9192
<artifactId>validation-api</artifactId>
9293
<version>${javax.validation-version}</version>
9394
</dependency>
95+
<!-- SDK 中提供日志接口 -->
96+
<dependency>
97+
<groupId>org.slf4j</groupId>
98+
<artifactId>slf4j-api</artifactId>
99+
<version>${org.slf4j.version}</version>
100+
</dependency>
94101
</dependencies>
95102
</dependencyManagement>
96103
<profiles>
@@ -306,6 +313,7 @@
306313
<module>volcengine-java-sdk-bmq</module>
307314
<module>volcengine-java-sdk-cloudidentity</module>
308315
<module>volcengine-java-sdk-vikingdb</module>
316+
<module>volcengine-java-sdk-cloudmonitor</module>
309317
<module>volcengine-java-sdk-resourceshare</module>
310318
</modules>
311319
</project>

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/images/generation/GenerateImagesRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.volcengine.ark.runtime.model.images.generation;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnore;
34
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
45
import com.fasterxml.jackson.annotation.JsonProperty;
56
import com.fasterxml.jackson.core.JsonParser;
@@ -115,6 +116,7 @@ public void setImage(List<String> image) {
115116
this.image = image;
116117
}
117118

119+
@JsonIgnore
118120
public void setImage(String image) {
119121
this.image = image == null ? null : Collections.singletonList(image);
120122
}

volcengine-java-sdk-bom/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,12 @@
595595
<optional>false</optional>
596596
<version>${project.version}</version>
597597
</dependency>
598+
<dependency>
599+
<groupId>com.volcengine</groupId>
600+
<artifactId>volcengine-java-sdk-cloudmonitor</artifactId>
601+
<optional>false</optional>
602+
<version>${project.version}</version>
603+
</dependency>
598604
<dependency>
599605
<groupId>com.volcengine</groupId>
600606
<artifactId>volcengine-java-sdk-resourceshare</artifactId>
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<parent>
4+
<artifactId>volcengine-java-sdk</artifactId>
5+
<groupId>com.volcengine</groupId>
6+
<version>0.2.36</version>
7+
<relativePath>../pom.xml</relativePath>
8+
</parent>
9+
<modelVersion>4.0.0</modelVersion>
10+
<artifactId>volcengine-java-sdk-cloudmonitor</artifactId>
11+
<name>volcengine-java-sdk-cloudmonitor</name>
12+
<description>The Java SDK for Volcengine cloudmonitor</description>
13+
<dependencies>
14+
<dependency>
15+
<groupId>com.volcengine</groupId>
16+
<artifactId>volcengine-java-sdk-core</artifactId>
17+
<version>${project.version}</version>
18+
</dependency>
19+
</dependencies>
20+
<build>
21+
<plugins>
22+
<plugin>
23+
<groupId>org.apache.maven.plugins</groupId>
24+
<artifactId>maven-source-plugin</artifactId>
25+
<configuration>
26+
<excludes>
27+
<exclude>com/volcengine/cloudmonitor/examples/**</exclude>
28+
</excludes>
29+
</configuration>
30+
</plugin>
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-jar-plugin</artifactId>
34+
<configuration>
35+
<excludes>
36+
<exclude>com/volcengine/cloudmonitor/examples/**</exclude>
37+
</excludes>
38+
</configuration>
39+
</plugin>
40+
</plugins>
41+
</build>
42+
</project>

0 commit comments

Comments
 (0)