Skip to content

Commit ff6b814

Browse files
liuweiwei-xyzliuweiwei-xyz
committed
Merge 'integration_2024-11-14_582008940034' into 'master'
merge branch integration_2024-11-14_582008940034 into master See merge request: !295
2 parents e0281a5 + 96bdf2f commit ff6b814

File tree

375 files changed

+76148
-58
lines changed

Some content is hidden

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

375 files changed

+76148
-58
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.volcengine</groupId>
5656
<artifactId>volcengine-java-sdk-bom</artifactId>
57-
<version>0.1.135</version>
57+
<version>0.1.136</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -70,12 +70,12 @@
7070
<dependency>
7171
<groupId>com.volcengine</groupId>
7272
<artifactId>volcengine-java-sdk-vpc</artifactId>
73-
<version>0.1.135</version>
73+
<version>0.1.136</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.135</version>
78+
<version>0.1.136</version>
7979
</dependency>
8080
</dependencies>
8181
```

‎meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.1.135",
3-
"meta_commit": "6db564666e5fd246a21e0e9636ad57c4448879ba"
2+
"lasted": "0.1.136",
3+
"meta_commit": "a1fdc335d868cd0996f1defe82ada23f169d5fc3"
44
}

‎pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volcengine</groupId>
55
<artifactId>volcengine-java-sdk</artifactId>
66
<packaging>pom</packaging>
7-
<version>0.1.135</version>
7+
<version>0.1.136</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -252,5 +252,9 @@
252252
<module>volcengine-java-sdk-dms</module>
253253
<module>volcengine-java-sdk-rabbitmq</module>
254254
<module>volcengine-java-sdk-tis</module>
255+
<module>volcengine-java-sdk-fwcenter</module>
256+
<module>volcengine-java-sdk-escloud</module>
257+
<module>volcengine-java-sdk-mcs</module>
258+
<module>volcengine-java-sdk-flink20250101</module>
255259
</modules>
256260
</project>

‎volcengine-java-sdk-alb/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.135</version>
6+
<version>0.1.136</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-ark-runtime/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.135</version>
6+
<version>0.1.136</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

‎volcengine-java-sdk-ark/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.135</version>
6+
<version>0.1.136</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-autoscaling/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.135</version>
6+
<version>0.1.136</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-billing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.135</version>
6+
<version>0.1.136</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-billing/src/main/java/com/volcengine/billing/model/ListForListBillDetailOutput.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ public class ListForListBillDetailOutput {
123123
@SerializedName("FactorCode")
124124
private String factorCode = null;
125125

126+
@SerializedName("Formula")
127+
private String formula = null;
128+
126129
@SerializedName("InstanceName")
127130
private String instanceName = null;
128131

@@ -801,6 +804,24 @@ public void setFactorCode(String factorCode) {
801804
this.factorCode = factorCode;
802805
}
803806

807+
public ListForListBillDetailOutput formula(String formula) {
808+
this.formula = formula;
809+
return this;
810+
}
811+
812+
/**
813+
* Get formula
814+
* @return formula
815+
**/
816+
@Schema(description = "")
817+
public String getFormula() {
818+
return formula;
819+
}
820+
821+
public void setFormula(String formula) {
822+
this.formula = formula;
823+
}
824+
804825
public ListForListBillDetailOutput instanceName(String instanceName) {
805826
this.instanceName = instanceName;
806827
return this;
@@ -1562,6 +1583,7 @@ public boolean equals(java.lang.Object o) {
15621583
Objects.equals(this.expenseEndTime, listForListBillDetailOutput.expenseEndTime) &&
15631584
Objects.equals(this.factor, listForListBillDetailOutput.factor) &&
15641585
Objects.equals(this.factorCode, listForListBillDetailOutput.factorCode) &&
1586+
Objects.equals(this.formula, listForListBillDetailOutput.formula) &&
15651587
Objects.equals(this.instanceName, listForListBillDetailOutput.instanceName) &&
15661588
Objects.equals(this.instanceNo, listForListBillDetailOutput.instanceNo) &&
15671589
Objects.equals(this.marketPrice, listForListBillDetailOutput.marketPrice) &&
@@ -1606,7 +1628,7 @@ public boolean equals(java.lang.Object o) {
16061628

16071629
@Override
16081630
public int hashCode() {
1609-
return Objects.hash(billCategory, billDetailId, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, couponAmount, creditCarriedAmount, currency, deductionCount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, elementCode, expandField, expenseBeginTime, expenseDate, expenseEndTime, factor, factorCode, instanceName, instanceNo, marketPrice, measureInterval, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, region, regionCode, reservationInstance, roundAmount, sellerCustomerName, sellerID, sellerUserName, sellingMode, settlementType, solutionZh, subjectName, tag, tradeTime, unit, unpaidAmount, useDuration, useDurationUnit, zone, zoneCode);
1631+
return Objects.hash(billCategory, billDetailId, billID, billPeriod, billingFunction, billingMethodCode, billingMode, busiPeriod, businessMode, configName, configurationCode, count, couponAmount, creditCarriedAmount, currency, deductionCount, deductionUseDuration, discountBillAmount, discountBizBillingFunction, discountBizMeasureInterval, discountBizUnitPrice, discountBizUnitPriceInterval, effectiveFactor, element, elementCode, expandField, expenseBeginTime, expenseDate, expenseEndTime, factor, factorCode, formula, instanceName, instanceNo, marketPrice, measureInterval, originalBillAmount, ownerCustomerName, ownerID, ownerUserName, paidAmount, payableAmount, payerCustomerName, payerID, payerUserName, preferentialBillAmount, price, priceInterval, priceUnit, product, productZh, project, projectDisplayName, region, regionCode, reservationInstance, roundAmount, sellerCustomerName, sellerID, sellerUserName, sellingMode, settlementType, solutionZh, subjectName, tag, tradeTime, unit, unpaidAmount, useDuration, useDurationUnit, zone, zoneCode);
16101632
}
16111633

16121634

@@ -1646,6 +1668,7 @@ public String toString() {
16461668
sb.append(" expenseEndTime: ").append(toIndentedString(expenseEndTime)).append("\n");
16471669
sb.append(" factor: ").append(toIndentedString(factor)).append("\n");
16481670
sb.append(" factorCode: ").append(toIndentedString(factorCode)).append("\n");
1671+
sb.append(" formula: ").append(toIndentedString(formula)).append("\n");
16491672
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");
16501673
sb.append(" instanceNo: ").append(toIndentedString(instanceNo)).append("\n");
16511674
sb.append(" marketPrice: ").append(toIndentedString(marketPrice)).append("\n");

‎volcengine-java-sdk-bom/pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.1.135</version>
6+
<version>0.1.136</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -277,6 +277,30 @@
277277
<optional>false</optional>
278278
<version>${project.version}</version>
279279
</dependency>
280+
<dependency>
281+
<groupId>com.volcengine</groupId>
282+
<artifactId>volcengine-java-sdk-escloud</artifactId>
283+
<optional>false</optional>
284+
<version>${project.version}</version>
285+
</dependency>
286+
<dependency>
287+
<groupId>com.volcengine</groupId>
288+
<artifactId>volcengine-java-sdk-fwcenter</artifactId>
289+
<optional>false</optional>
290+
<version>${project.version}</version>
291+
</dependency>
292+
<dependency>
293+
<groupId>com.volcengine</groupId>
294+
<artifactId>volcengine-java-sdk-mcs</artifactId>
295+
<optional>false</optional>
296+
<version>${project.version}</version>
297+
</dependency>
298+
<dependency>
299+
<groupId>com.volcengine</groupId>
300+
<artifactId>volcengine-java-sdk-flink20250101</artifactId>
301+
<optional>false</optional>
302+
<version>${project.version}</version>
303+
</dependency>
280304
</dependencies>
281305
</dependencyManagement>
282306
</project>

0 commit comments

Comments
 (0)