增加上次运行时间显示

app/lib/DnsHelper.php

@@ -126,6 +126,7 @@ class DnsHelper
         'huoshan' => ['DEF' => 'default', 'CT' => 'telecom', 'CU' => 'unicom', 'CM' => 'mobile', 'AB' => 'oversea'],
         'baidu' => ['DEF' => 'default', 'CT' => 'ct', 'CU' => 'cnc', 'CM' => 'cmnet', 'AB' => ''],
         'cloudflare' => ['DEF' => '0'],
+        'namesilo' => ['DEF' => '0'],
     ];
 
     public static function getList()

app/lib/deploy/btpanel.php

@@ -26,7 +26,7 @@ class btpanel implements DeployInterface
         $path = '/config?action=get_config';
         $response = $this->request($path, []);
         $result = json_decode($response, true);
-        if (isset($result['status']) && $result['status'] == 1) {
+        if (isset($result['status']) && ($result['status']==1 || isset($result['sites_path']))) {
             return true;
         } else {
             throw new Exception(isset($result['msg']) ? $result['msg'] : '面板地址无法连接');

app/lib/dns/cloudflare.php

@@ -75,10 +75,10 @@ class cloudflare implements DnsInterface
         if ($data) {
             $list = [];
             foreach ($data['result'] as $row) {
-                $name = $row['zone_name'] == $row['name'] ? '@' : str_replace('.'.$row['zone_name'], '', $row['name']);
+                $name = $this->domain == $row['name'] ? '@' : str_replace('.'.$this->domain, '', $row['name']);
                 $list[] = [
                     'RecordId' => $row['id'],
-                    'Domain' => $row['zone_name'],
+                    'Domain' => $this->domain,
                     'Name' => $name,
                     'Type' => $row['type'],
                     'Value' => $row['content'],
@@ -107,11 +107,11 @@ class cloudflare implements DnsInterface
     {
         $data = $this->send_reuqest('GET', '/zones/'.$this->domainid.'/dns_records/'.$RecordId);
         if ($data) {
-            $name = $data['result']['zone_name'] == $data['result']['name'] ? '@' : str_replace('.' . $data['result']['zone_name'], '', $data['result']['name']);
+            $name = $this->domain == $data['result']['name'] ? '@' : str_replace('.' . $this->domain, '', $data['result']['name']);
             return [
                 'RecordId' => $data['result']['id'],
-                'Domain' => $data['result']['zone_name'],
-                'Name' => str_replace('.'.$data['result']['zone_name'], '', $data['result']['name']),
+                'Domain' => $this->domain,
+                'Name' => $name,
                 'Type' => $data['result']['type'],
                 'Value' => $data['result']['content'],
                 'Line' => $data['result']['proxied'] ? '1' : '0',

app/service/CertTaskService.php

@@ -13,6 +13,7 @@ class CertTaskService
     {
         $this->execute_deploy();
         $this->execute_order();
+        config_set('certtask_time', date("Y-m-d H:i:s"));
         echo 'done'.PHP_EOL;
     }
 

app/utils/CertDnsUtils.php

@@ -70,7 +70,8 @@ class CertDnsUtils
                     }
                 }
 
-                $res = $dns->addDomainRecord($row['name'], $row['type'], $row['value'], DnsHelper::$line_name[$drow['type']]['DEF'], 600);
+                $ttl = $drow['type'] == 'namesilo' ? 3600 : 600;
+                $res = $dns->addDomainRecord($row['name'], $row['type'], $row['value'], DnsHelper::$line_name[$drow['type']]['DEF'], $ttl);
                 if (!$res && $row['type'] != 'CAA') throw new Exception('添加'.$domain.'解析记录失败，' . $dns->getError());
                 $log('Add DNS Record: '.$domain.' '.$row['type'].' '.$row['value']);
             }

app/view/cert/certset.html

@@ -8,6 +8,7 @@
 <div class="panel-body">
   <p><li>计划任务：将以下命令添加到计划任务，1分钟1次</li></p>
   <p><code>cd {:app()->getRootPath()} && php think certtask</code></p>
+  <p><li>上次运行时间：<font color="green">{:config_get('certtask_time', '未运行', true)}</font></li></p>
 </div>
 </div>
 

config/app.php

@@ -31,7 +31,7 @@ return [
     'show_error_msg'   => true,
     'exception_tmpl'   => \think\facade\App::getAppPath() . 'view/exception.tpl',
 
-    'version' => '1027',
+    'version' => '1028',
 
     'dbversion' => '1023'
 ];