Merge pull request #218 from jdcloud-apigateway/master

public cdn 0.10.46

Author: jdcloud-apigateway

services/cdn/ChangeLog.md

@@ -1,11 +1,12 @@
 # 更新历史 #
-API版本：0.10.45
+API版本：0.10.46
 
 
 
 
 | 发布时间   | 版本号 | 更新                                                       | 说明 |
 | ---------- | ------ | ---------------------------------------------------------- | ---- |
+| 2023-05-06  | 0.10.46  |新增generateDomainTxt接口解决原有接口java sdk格式兼容问题,domainTxtGenerate仅对内使用|
 | 2023-04-06  | 0.10.45  |domainTxtGenerate、domainTxtValidate txt生成及校验接口对外开放|
 | 2023-02-22  | 0.10.44  |增加域名海外CF状态信息|
 | 2023-02-06  | 0.10.43  |控制台增加域名备案检查接口|

services/cdn/apis/DomainTxtGenerate.go services/cdn/apis/GenerateDomainTxt.goservices/cdn/apis/DomainTxtGenerate.go renamed to services/cdn/apis/GenerateDomainTxt.go

@@ -20,7 +20,7 @@ import (
     "github.com/jdcloud-api/jdcloud-sdk-go/core"
 )
 
-type DomainTxtGenerateRequest struct {
+type GenerateDomainTxtRequest struct {
 
     core.JDCloudRequest
 
@@ -32,12 +32,12 @@ type DomainTxtGenerateRequest struct {
  *
  * @Deprecated, not compatible when mandatory parameters changed
  */
-func NewDomainTxtGenerateRequest(
-) *DomainTxtGenerateRequest {
+func NewGenerateDomainTxtRequest(
+) *GenerateDomainTxtRequest {
 
-	return &DomainTxtGenerateRequest{
+	return &GenerateDomainTxtRequest{
         JDCloudRequest: core.JDCloudRequest{
-			URL:     "/domainTxtGenerate",
+			URL:     "/generateDomainTxt",
 			Method:  "POST",
 			Header:  nil,
 			Version: "v1",
@@ -48,13 +48,13 @@ func NewDomainTxtGenerateRequest(
 /*
  * param domain: 域名 (Optional)
  */
-func NewDomainTxtGenerateRequestWithAllParams(
+func NewGenerateDomainTxtRequestWithAllParams(
     domain *string,
-) *DomainTxtGenerateRequest {
+) *GenerateDomainTxtRequest {
 
-    return &DomainTxtGenerateRequest{
+    return &GenerateDomainTxtRequest{
         JDCloudRequest: core.JDCloudRequest{
-            URL:     "/domainTxtGenerate",
+            URL:     "/generateDomainTxt",
             Method:  "POST",
             Header:  nil,
             Version: "v1",
@@ -64,11 +64,11 @@ func NewDomainTxtGenerateRequestWithAllParams(
 }
 
 /* This constructor has better compatible ability when API parameters changed */
-func NewDomainTxtGenerateRequestWithoutParam() *DomainTxtGenerateRequest {
+func NewGenerateDomainTxtRequestWithoutParam() *GenerateDomainTxtRequest {
 
-    return &DomainTxtGenerateRequest{
+    return &GenerateDomainTxtRequest{
             JDCloudRequest: core.JDCloudRequest{
-            URL:     "/domainTxtGenerate",
+            URL:     "/generateDomainTxt",
             Method:  "POST",
             Header:  nil,
             Version: "v1",
@@ -77,22 +77,23 @@ func NewDomainTxtGenerateRequestWithoutParam() *DomainTxtGenerateRequest {
 }
 
 /* param domain: 域名(Optional) */
-func (r *DomainTxtGenerateRequest) SetDomain(domain string) {
+func (r *GenerateDomainTxtRequest) SetDomain(domain string) {
     r.Domain = &domain
 }
 
 
 // GetRegionId returns path parameter 'regionId' if exist,
 // otherwise return empty string
-func (r DomainTxtGenerateRequest) GetRegionId() string {
+func (r GenerateDomainTxtRequest) GetRegionId() string {
     return ""
 }
 
-type DomainTxtGenerateResponse struct {
+type GenerateDomainTxtResponse struct {
     RequestID string `json:"requestId"`
     Error core.ErrorResponse `json:"error"`
-    Result DomainTxtGenerateResult `json:"result"`
+    Result GenerateDomainTxtResult `json:"result"`
 }
 
-type DomainTxtGenerateResult struct {
+type GenerateDomainTxtResult struct {
+    Txt string `json:"txt"`
 }

services/cdn/client/CdnClient.go

@@ -40,7 +40,7 @@ func NewCdnClient(credential *core.Credential) *CdnClient {
             Credential:  *credential,
             Config:      *config,
             ServiceName: "cdn",
-            Revision:    "0.10.45",
+            Revision:    "0.10.46",
             Logger:      core.NewDefaultLogger(core.LogInfo),
         }}
 }
@@ -1197,6 +1197,26 @@ func (c *CdnClient) QueryMixTrafficGroupSum(request *cdn.QueryMixTrafficGroupSum
     return jdResp, err
 }
 
+/* 生成域名txt记录 */
+func (c *CdnClient) GenerateDomainTxt(request *cdn.GenerateDomainTxtRequest) (*cdn.GenerateDomainTxtResponse, error) {
+    if request == nil {
+        return nil, errors.New("Request object is nil. ")
+    }
+    resp, err := c.Send(request, c.ServiceName)
+    if err != nil {
+        return nil, err
+    }
+
+    jdResp := &cdn.GenerateDomainTxtResponse{}
+    err = json.Unmarshal(resp, jdResp)
+    if err != nil {
+        c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp))
+        return nil, err
+    }
+
+    return jdResp, err
+}
+
 /* 查询oss存储域名 */
 func (c *CdnClient) QueryOssBuckets(request *cdn.QueryOssBucketsRequest) (*cdn.QueryOssBucketsResponse, error) {
     if request == nil {
@@ -2437,26 +2457,6 @@ func (c *CdnClient) DisableWafBlackRules(request *cdn.DisableWafBlackRulesReques
     return jdResp, err
 }
 
-/* 域名txt记录生成 */
-func (c *CdnClient) DomainTxtGenerate(request *cdn.DomainTxtGenerateRequest) (*cdn.DomainTxtGenerateResponse, error) {
-    if request == nil {
-        return nil, errors.New("Request object is nil. ")
-    }
-    resp, err := c.Send(request, c.ServiceName)
-    if err != nil {
-        return nil, err
-    }
-
-    jdResp := &cdn.DomainTxtGenerateResponse{}
-    err = json.Unmarshal(resp, jdResp)
-    if err != nil {
-        c.Logger.Log(core.LogError, "Unmarshal json failed, resp: %s", string(resp))
-        return nil, err
-    }
-
-    return jdResp, err
-}
-
 /* 查询web防护开关 */
 func (c *CdnClient) QueryWebProtectSettings(request *cdn.QueryWebProtectSettingsRequest) (*cdn.QueryWebProtectSettingsResponse, error) {
     if request == nil {