diff --git a/internal/web/actions/default/servers/certs/acme/index.go b/internal/web/actions/default/servers/certs/acme/index.go index 537589ee..419faef3 100644 --- a/internal/web/actions/default/servers/certs/acme/index.go +++ b/internal/web/actions/default/servers/certs/acme/index.go @@ -46,6 +46,7 @@ func (this *IndexAction) RunGet(params struct{}) { continue } + // 证书 var certMap maps.Map = nil if task.SslCert != nil { certMap = maps.Map{ @@ -56,6 +57,17 @@ func (this *IndexAction) RunGet(params struct{}) { } } + // 日志 + var logMap maps.Map = nil + if task.LatestACMETaskLog != nil { + logMap = maps.Map{ + "id": task.LatestACMETaskLog.Id, + "isOk": task.LatestACMETaskLog.IsOk, + "error": task.LatestACMETaskLog.Error, + "createdTime": timeutil.FormatTime("m-d", task.CreatedAt), + } + } + taskMaps = append(taskMaps, maps.Map{ "id": task.Id, "acmeUser": maps.Map{ @@ -70,6 +82,7 @@ func (this *IndexAction) RunGet(params struct{}) { "domains": task.Domains, "autoRenew": task.AutoRenew, "cert": certMap, + "log": logMap, }) } this.Data["tasks"] = taskMaps diff --git a/web/public/js/components/common/links.js b/web/public/js/components/common/links.js index 0824ae9e..679b665b 100644 --- a/web/public/js/components/common/links.js +++ b/web/public/js/components/common/links.js @@ -1,7 +1,12 @@ // 使用Icon的链接方式 Vue.component("link-icon", { - props: ["href"], - template: ` ` + props: ["href", "title"], + data: function () { + return { + vTitle: (this.title == null) ? "打开链接" : this.title + } + }, + template: ` ` }) // 带有下划虚线的连接 diff --git a/web/views/@default/servers/certs/acme/index.html b/web/views/@default/servers/certs/acme/index.html index e77ec5aa..5ef9ed61 100644 --- a/web/views/@default/servers/certs/acme/index.html +++ b/web/views/@default/servers/certs/acme/index.html @@ -12,37 +12,41 @@ ACME用户 - 域名服务商 - 顶级域名 证书域名 到期时间 - 自动续期 - 关联证书 + 更新时间 + 自动续期 + 关联证书 操作 {{task.acmeUser.email}} - {{task.dnsProvider.name}} - {{task.dnsDomain}} - +
{{domain}}
- +
{{task.cert.endTime}}
- + +
+ {{task.log.createdTime}} + {{task.log.createdTime}} +
+ 尚未执行 + Y N - +
- {{task.cert.name}} +
- diff --git a/web/views/@default/servers/certs/acme/index.js b/web/views/@default/servers/certs/acme/index.js index 2f48dda4..2fa7b62b 100644 --- a/web/views/@default/servers/certs/acme/index.js +++ b/web/views/@default/servers/certs/acme/index.js @@ -45,7 +45,7 @@ Tea.context(function () { taskId: task.id }) .success(function (resp) { - teaweb.success("执行成功", function () { + teaweb.success("任务执行成功", function () { teaweb.reload() }) }) @@ -55,4 +55,8 @@ Tea.context(function () { }) }) } + + this.showError = function (err) { + teaweb.popupTip("任务执行失败:" + err) + } }) \ No newline at end of file