Merge branch 'v2-dev' into v2-dev-buy

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -57,6 +57,7 @@ export default {
   suiteBuy: "Suite Purchase",
   myTrade: "My Orders",
   paymentReturn: "Payment Return",
+  hasExpired: "Expired",
   user: {
     greeting: "Hello",
     profile: "Account Info",
@@ -136,10 +137,16 @@ export default {
     triggerType: "Trigger Type",
     pipelineId: "Pipeline Id",
   },
+
+  pi: {
+    validTime: "Piepline Valid Time",
+    validTimeHelper: "Not filled in means permanent validity",
+  },
   types: {
-    certApply: "Certificate Application",
-    certUpload: "Certificate Upload",
+    certApply: "Cert Apply",
+    certUpload: "Cert Upload",
     custom: "Custom",
+    template: "Template",
   },
   myPipelines: "My Pipelines",
   selectedCount: "Selected {count} items",
@@ -175,6 +182,7 @@ export default {
     suiteSetting: "Suite Settings",
     orderManager: "Order Management",
     userSuites: "User Suites",
+    netTest: "Network Test",
   },
   certificateRepo: {
     title: "Certificate Repository",
@@ -223,9 +231,13 @@ export default {
     notificationWhen: "Notification Timing",
     notificationHelper: "Get real-time alerts when the task fails",
     groupIdTitle: "Pipeline Group",
+
+    addToMonitorEnabled: "Add to Cert Monitor",
+    addToMonitorDomains: "Add to Monitor Domains",
   },
   notificationDefault: "Use Default Notification",
   monitor: {
+    remark: "Remark",
     title: "Site Certificate Monitoring",
     description: "Check website certificates' expiration at 0:00 daily; reminders sent 10 days before expiration (using default notification channel);",
     settingLink: "Site Monitoring Settings",
@@ -247,6 +259,7 @@ export default {
     certDomains: "Certificate Domains",
     certProvider: "Issuer",
     certStatus: "Certificate Status",
+    error: "Error",
     status: {
       ok: "Valid",
       expired: "Expired",
@@ -280,6 +293,8 @@ export default {
       cronTrigger: "Scheduled trigger for monitoring",
       dnsServer: "DNS Server",
       dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1 , support multiple",
+      certValidDays: "Certificate Valid Days",
+      certValidDaysHelper: "Number of days before expiration to send a notification",
     },
   },
   checkStatus: {
@@ -289,7 +304,7 @@ export default {
   },
   domainList: {
     title: "Domain List",
-    helper: "Format: domain:port:name, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com",
+    helper: "Format: domain:port:name:remark, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu:remarkText\nwww.taobao.com::Taobao\nwww.google.com",
     required: "Please enter domains to import",
     placeholder: "www.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com\n",
   },
@@ -447,6 +462,7 @@ export default {
   description: "Description",
   createTime: "Creation Time",
   updateTime: "Update Time",
+  mainDomain: "Main Domain",
   edit: "Edit",
   groupName: "Group Name",
   enterGroupName: "Please enter group name",
@@ -715,19 +731,32 @@ export default {
   addonName: "Name",
   addonNameHelper: "Fill freely, helps to distinguish when multiple same type exist",
   addonTypeSelect: "Select type",
+  dates: {
+    years: "{count} years",
+    months: "{count} months",
+  },
   sys: {
     setting: {
+      baseSetting: "Base Settings",
+      registerSetting: "Register Settings",
+      safeSetting: "Safe Settings",
+      paymentSetting: "Payment Settings",
+      captchaSetting: "Captcha Setting",
+      pipelineSetting: "Pipeline Settings",
       showRunStrategy: "Show RunStrategy",
       showRunStrategyHelper: "Allow modify the run strategy of the task",
 
       captchaEnabled: "Enable Login Captcha",
       captchaHelper: "Whether to enable captcha verification for login",
       captchaType: "Captcha Setting",
+      captchaTest: "Captcha Test",
+      // 保存后再点击测试，请务必测试通过了，再开启登录验证码
+      captchaTestHelper: "Save and click test, please make sure the test is passed before enabling login captcha",
 
-      baseSetting: "Base Settings",
-      registerSetting: "Register Settings",
-      safeSetting: "Safe Settings",
-      paymentSetting: "Payment Settings",
+      pipelineValidTimeEnabled: "Enable Pipeline Valid Time",
+      pipelineValidTimeEnabledHelper: "Whether to enable the valid time of the pipeline",
+      certDomainAddToMonitorEnabled: "Add Domain to Certificate Monitor",
+      certDomainAddToMonitorEnabledHelper: "Whether to add the domain to the certificate monitor",
     },
   },
   modal: {

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -62,6 +62,7 @@ export default {
   suiteBuy: "套餐购买",
   myTrade: "我的订单",
   paymentReturn: "支付返回",
+  hasExpired: "已过期",
 
   user: {
     greeting: "您好",
@@ -142,10 +143,15 @@ export default {
     triggerType: "触发类型",
     pipelineId: "流水线Id",
   },
+  pi: {
+    validTime: "流水线有效期",
+    validTimeHelper: "不填则为永久有效",
+  },
   types: {
     certApply: "证书申请",
     certUpload: "证书上传",
     custom: "自定义",
+    template: "模版",
   },
   myPipelines: "我的流水线",
   selectedCount: "已选择 {count} 项",
@@ -181,6 +187,7 @@ export default {
     suiteSetting: "套餐设置",
     orderManager: "订单管理",
     userSuites: "用户套餐",
+    netTest: "网络测试",
   },
   certificateRepo: {
     title: "证书仓库",
@@ -228,9 +235,12 @@ export default {
     notificationWhen: "通知时机",
     notificationHelper: "任务执行失败实时提醒",
     groupIdTitle: "流水线分组",
+    addToMonitorEnabled: "添加到证书监控",
+    addToMonitorDomains: "添加到监控域名",
   },
   notificationDefault: "使用默认通知",
   monitor: {
+    remark: "备注",
     title: "站点证书监控",
     description: "每天0点，检查网站证书的过期时间，到期前10天时将发出提醒（使用默认通知渠道）;",
     settingLink: "站点监控设置",
@@ -252,6 +262,7 @@ export default {
     certDomains: "证书域名",
     certProvider: "颁发机构",
     certStatus: "证书状态",
+    error: "错误信息",
     status: {
       ok: "正常",
       expired: "过期",
@@ -285,6 +296,8 @@ export default {
       cronTrigger: "定时触发监控",
       dnsServer: "DNS服务器",
       dnsServerHelper: "使用自定义的域名解析服务器，如：1.1.1.1 , 支持多个",
+      certValidDays: "证书到期前天数",
+      certValidDaysHelper: "证书到期前多少天发送通知",
     },
   },
   checkStatus: {
@@ -294,9 +307,9 @@ export default {
   },
   domainList: {
     title: "域名列表",
-    helper: "格式【域名:端口:名称】，一行一个，其中端口、名称可以省略\n比如：\nwww.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com",
+    helper: "格式【域名:端口:名称:备注】，一行一个，其中端口、名称、备注可以省略\n比如：\nwww.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com",
     required: "请输入要导入的域名",
-    placeholder: "www.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com\n",
+    placeholder: "www.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com\n",
   },
   accountInfo: "账号信息",
   securitySettings: "认证安全设置",
@@ -453,6 +466,7 @@ export default {
   description: "说明",
   createTime: "创建时间",
   updateTime: "更新时间",
+  mainDomain: "主域名",
   edit: "编辑",
   groupName: "分组名称",
   enterGroupName: "请输入分组名称",
@@ -461,7 +475,7 @@ export default {
   batchDeleteConfirm: "确定要批量删除这{count}条记录吗",
   selectRecordFirst: "请先勾选记录",
   subdomainHosted: "托管的子域名",
-  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置，可能导致证书无法申请，可以参考文档",
+  subdomainHelpText: "如果您不理解什么是子域托管，请不要随意设置（可能导致证书无法申请，以前设置过的cname记录也需要重新配置），可以参考文档",
   subdomainManagement: "子域管理",
   isDisabled: "是否禁用",
   enabled: "启用",
@@ -717,19 +731,32 @@ export default {
     copyPipelineConfig: "复制该流水线配置作为模板来源",
     pipeline: "流水线",
   },
+  dates: {
+    years: "{count}年",
+    months: "{count}月",
+  },
   sys: {
     setting: {
+      baseSetting: "基本设置",
+      registerSetting: "注册设置",
+      safeSetting: "安全设置",
+      paymentSetting: "支付设置",
+      captchaSetting: "验证码设置",
+      pipelineSetting: "流水线设置",
+
       showRunStrategy: "显示运行策略选择",
       showRunStrategyHelper: "任务设置中是否允许选择运行策略",
 
       captchaEnabled: "启用登录验证码",
       captchaHelper: "登录时是否启用验证码",
       captchaType: "验证码配置",
+      captchaTest: "测试验证码",
+      captchaTestHelper: "保存后再点击测试，请务必测试通过了，再开启登录验证码",
 
-      baseSetting: "基本设置",
-      registerSetting: "注册设置",
-      safeSetting: "安全设置",
-      paymentSetting: "支付设置",
+      pipelineValidTimeEnabled: "启用流水线有效期",
+      pipelineValidTimeEnabledHelper: "是否启用流水线有效期",
+      certDomainAddToMonitorEnabled: "证书域名添加到证书监控",
+      certDomainAddToMonitorEnabledHelper: "创建证书流水线时是否可以选择将域名添加到证书监控",
     },
   },
   modal: {