diff --git a/backend/app/service/website_acme_account.go b/backend/app/service/website_acme_account.go index 711fa0b95..48d2ac124 100644 --- a/backend/app/service/website_acme_account.go +++ b/backend/app/service/website_acme_account.go @@ -39,19 +39,20 @@ func (w WebsiteAcmeAccountService) Create(create request.WebsiteAcmeAccountCreat if exist != nil { return nil, buserr.New(constant.ErrEmailIsExist) } - - if create.Type == "google" && (create.EabKid == "" || create.EabHmacKey == "") { - return nil, buserr.New(constant.ErrEabKidOrEabHmacKeyCannotBlank) - } else { - create.EabKid = "" - create.EabHmacKey = "" - } - acmeAccount := &model.WebsiteAcmeAccount{ Email: create.Email, Type: create.Type, KeyType: create.KeyType, } + + if create.Type == "google" { + if create.EabKid == "" || create.EabHmacKey == "" { + return nil, buserr.New(constant.ErrEabKidOrEabHmacKeyCannotBlank) + } + acmeAccount.EabKid = create.EabKid + acmeAccount.EabHmacKey = create.EabHmacKey + } + client, err := ssl.NewAcmeClient(acmeAccount) if err != nil { return nil, err diff --git a/frontend/src/global/mimetype.ts b/frontend/src/global/mimetype.ts index 675c30b9e..28b8708ba 100644 --- a/frontend/src/global/mimetype.ts +++ b/frontend/src/global/mimetype.ts @@ -165,7 +165,7 @@ export const DNSTypes = [ value: 'NameCom', }, { - label: 'Godaddy', + label: 'GoDaddy', value: 'Godaddy', }, ]; diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index d7fe85e4f..831d2768a 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1872,6 +1872,7 @@ const message = { buypassHelper: 'Buypass 大陸地區無法訪問', googleHelper: "如何取得EAB HmacKey 和EAB kid ", + googleCloudHelper: 'Google Cloud API is not accessible in most parts of mainland China', }, firewall: { create: 'Create rule', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index b63c2fc64..0c8173ec2 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1756,6 +1756,7 @@ const message = { buypassHelper: 'Buypass 大陸地區無法訪問', googleHelper: "如何取得EAB HmacKey 和EAB kid ", + googleCloudHelper: 'Google Cloud API 大陸大部分地區無法存取', }, firewall: { create: '創建規則', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 728d12f38..21a952e61 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1756,6 +1756,7 @@ const message = { buypassHelper: 'Buypass 大陆地区无法访问', googleHelper: "如何获取 EAB HmacKey 和 EAB kid ", + googleCloudHelper: 'Google Cloud API 大陆大部分地区无法访问', }, firewall: { create: '创建规则', diff --git a/frontend/src/views/website/ssl/acme-account/create/index.vue b/frontend/src/views/website/ssl/acme-account/create/index.vue index 9a83b0828..0315a70da 100644 --- a/frontend/src/views/website/ssl/acme-account/create/index.vue +++ b/frontend/src/views/website/ssl/acme-account/create/index.vue @@ -34,6 +34,7 @@ :value="keyType.value" > + {{ $t('ssl.googleCloudHelper') }}