From efd18676f30eb623e247f0d2f5537f7553ba6fc8 Mon Sep 17 00:00:00 2001 From: net909 Date: Wed, 4 Jun 2025 22:52:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/DeployHelper.php | 2 +- app/utils/DnsQueryUtils.php | 8 +++++++- app/view/cert/account_form.html | 4 ++++ app/view/cert/certaccount.html | 2 +- app/view/cert/certorder.html | 2 +- app/view/cert/cname.html | 2 +- app/view/cert/deployaccount.html | 2 +- app/view/cert/deploytask.html | 2 +- app/view/dmonitor/task.html | 2 +- app/view/domain/account.html | 2 +- app/view/domain/domain.html | 2 +- app/view/domain/record.html | 2 +- app/view/optimizeip/opiplist.html | 2 +- app/view/user/user.html | 2 +- 14 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/lib/DeployHelper.php b/app/lib/DeployHelper.php index 363afc9..15f7a8a 100644 --- a/app/lib/DeployHelper.php +++ b/app/lib/DeployHelper.php @@ -370,7 +370,7 @@ class DeployHelper 'name' => 'GoEdge', 'class' => 1, 'icon' => 'waf.png', - 'desc' => '', + 'desc' => '支持GoEdge与FlexCDN', 'note' => '需要先开启HTTP API端口', 'tasknote' => '系统会根据关联SSL证书的域名，自动更新对应证书', 'inputs' => [ diff --git a/app/utils/DnsQueryUtils.php b/app/utils/DnsQueryUtils.php index cfec380..e5a9591 100644 --- a/app/utils/DnsQueryUtils.php +++ b/app/utils/DnsQueryUtils.php @@ -2,6 +2,8 @@ namespace app\utils; +use Exception; + class DnsQueryUtils { private static $doh_servers = ['https://dns.alidns.com/resolve', 'https://doh.pub/resolve', 'https://doh.360.cn/resolve']; @@ -10,7 +12,11 @@ class DnsQueryUtils { $dns_type = ['A' => DNS_A, 'AAAA' => DNS_AAAA, 'CNAME' => DNS_CNAME, 'MX' => DNS_MX, 'TXT' => DNS_TXT]; if (!array_key_exists($type, $dns_type)) return false; - $list = dns_get_record($domain, $dns_type[$type]); + try{ + $list = dns_get_record($domain, $dns_type[$type]); + }catch(Exception $e){ + return false; + } if (!$list || empty($list)) return false; $result = []; foreach ($list as $row) { diff --git a/app/view/cert/account_form.html b/app/view/cert/account_form.html index 4a443b2..1f8a06c 100644 --- a/app/view/cert/account_form.html +++ b/app/view/cert/account_form.html @@ -73,6 +73,10 @@ @media (max-width: 480px) { .account-type-card { width: 100%; + height: 78px; + } + .account-type-card .desc { + -webkit-line-clamp: 1; } } diff --git a/app/view/cert/certaccount.html b/app/view/cert/certaccount.html index 3759a1e..776affa 100644 --- a/app/view/cert/certaccount.html +++ b/app/view/cert/certaccount.html @@ -65,7 +65,7 @@ $(document).ready(function(){ title: '添加时间' }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '编辑 删除 订单'; diff --git a/app/view/cert/certorder.html b/app/view/cert/certorder.html index c6cdd82..7bebeb6 100644 --- a/app/view/cert/certorder.html +++ b/app/view/cert/certorder.html @@ -195,7 +195,7 @@ $(document).ready(function(){ } }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = ''; diff --git a/app/view/cert/cname.html b/app/view/cert/cname.html index cb6e003..9393d4f 100644 --- a/app/view/cert/cname.html +++ b/app/view/cert/cname.html @@ -130,7 +130,7 @@ $(document).ready(function(){ title: '添加时间' }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '编辑 删除'; diff --git a/app/view/cert/deployaccount.html b/app/view/cert/deployaccount.html index c7d1e0c..41d3dcf 100644 --- a/app/view/cert/deployaccount.html +++ b/app/view/cert/deployaccount.html @@ -65,7 +65,7 @@ $(document).ready(function(){ title: '添加时间' }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '编辑 删除 任务'; diff --git a/app/view/cert/deploytask.html b/app/view/cert/deploytask.html index 709eb48..caf147d 100644 --- a/app/view/cert/deploytask.html +++ b/app/view/cert/deploytask.html @@ -132,7 +132,7 @@ $(document).ready(function(){ } }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = ''; diff --git a/app/view/dmonitor/task.html b/app/view/dmonitor/task.html index 7bf84c8..a3a47a9 100644 --- a/app/view/dmonitor/task.html +++ b/app/view/dmonitor/task.html @@ -134,7 +134,7 @@ $(document).ready(function(){ } }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '切换日志  '; diff --git a/app/view/domain/account.html b/app/view/domain/account.html index 757b25f..e050312 100644 --- a/app/view/domain/account.html +++ b/app/view/domain/account.html @@ -130,7 +130,7 @@ $(document).ready(function(){ title: '添加时间' }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '编辑 删除'; diff --git a/app/view/domain/domain.html b/app/view/domain/domain.html index 3440db5..b1791e8 100644 --- a/app/view/domain/domain.html +++ b/app/view/domain/domain.html @@ -271,7 +271,7 @@ $(document).ready(function(){ title: '备注' }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '解析'; diff --git a/app/view/domain/record.html b/app/view/domain/record.html index 6b478fa..d1c3666 100644 --- a/app/view/domain/record.html +++ b/app/view/domain/record.html @@ -316,7 +316,7 @@ $(document).ready(function(){ } }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { if((row.Type == 'NS' || row.Type == 'SOA') && row.Name == '@') return '-'; diff --git a/app/view/optimizeip/opiplist.html b/app/view/optimizeip/opiplist.html index ba24860..c6f78c5 100644 --- a/app/view/optimizeip/opiplist.html +++ b/app/view/optimizeip/opiplist.html @@ -131,7 +131,7 @@ $(document).ready(function(){ } }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '手动更新  '; diff --git a/app/view/user/user.html b/app/view/user/user.html index 5c18820..57b8f72 100644 --- a/app/view/user/user.html +++ b/app/view/user/user.html @@ -174,7 +174,7 @@ $(document).ready(function(){ } }, { - field: '', + field: 'action', title: '操作', formatter: function(value, row, index) { var html = '编辑 删除';