version

app/controller/Cert.php

@@ -36,7 +36,7 @@ class Cert extends BaseController
 
         $select = Db::name('cert_account')->where('deploy', $deploy);
         if (!empty($kw)) {
-            $select->whereLike('name|remark', '%' . $kw . '%');
+            $select->whereLike('name|remark', '%' . $kw . '%')->whereOr('id', $kw);
         }
         $total = $select->count();
         $rows = $select->order('id', 'desc')->limit($offset, $limit)->select();

app/controller/Domain.php

@@ -523,6 +523,7 @@ class Domain extends BaseController
         $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
         $recordid = $dns->updateDomainRecord($recordid, $name, $type, $value, $line, $ttl, $mx, $weight, $remark);
         if ($recordid) {
+            if (is_array($recordinfo['Value'])) $recordinfo['Value'] = implode(',', $recordinfo['Value']);
             if ($recordinfo['Name'] != $name || $recordinfo['Type'] != $type || $recordinfo['Value'] != $value) {
                 $this->add_log($drow['name'], '修改解析', $recordinfo['Name'].' ['.$recordinfo['Type'].'] '.$recordinfo['Value'].' → '.$name.' ['.$type.'] '.$value.' (线路:'.$line.' TTL:'.$ttl.')');
             } elseif($recordinfo['Line'] != $line || $recordinfo['TTL'] != $ttl) {
@@ -554,6 +555,7 @@ class Domain extends BaseController
         $dns = DnsHelper::getModel($drow['aid'], $drow['name'], $drow['thirdid']);
         if ($dns->deleteDomainRecord($recordid)) {
             if ($recordinfo) {
+                if (is_array($recordinfo['Value'])) $recordinfo['Value'] = implode(',', $recordinfo['Value']);
                 $this->add_log($drow['name'], '删除解析', $recordinfo['Name'].' ['.$recordinfo['Type'].'] '.$recordinfo['Value'].' (线路:'.$recordinfo['Line'].' TTL:'.$recordinfo['TTL'].')');
             } else {
                 $this->add_log($drow['name'], '删除解析', '记录ID:'.$recordid);
@@ -586,6 +588,7 @@ class Domain extends BaseController
         if ($dns->setDomainRecordStatus($recordid, $status)) {
             $action = $status == '1' ? '启用解析' : '暂停解析';
             if ($recordinfo) {
+                if (is_array($recordinfo['Value'])) $recordinfo['Value'] = implode(',', $recordinfo['Value']);
                 $this->add_log($drow['name'], $action, $recordinfo['Name'].' ['.$recordinfo['Type'].'] '.$recordinfo['Value'].' (线路:'.$recordinfo['Line'].' TTL:'.$recordinfo['TTL'].')');
             } else {
                 $this->add_log($drow['name'], $action, '记录ID:'.$recordid);
@@ -644,6 +647,7 @@ class Domain extends BaseController
         if ($action == 'open') {
             foreach ($recordinfo as $record) {
                 if ($dns->setDomainRecordStatus($record['RecordId'], '1')) {
+                    if (is_array($record['Value'])) $record['Value'] = implode(',', $record['Value']);
                     $this->add_log($drow['name'], '启用解析', $record['Name'].' ['.$record['Type'].'] '.$record['Value'].' (线路:'.$record['Line'].' TTL:'.$record['TTL'].')');
                     $success++;
                 }
@@ -652,6 +656,7 @@ class Domain extends BaseController
         } else if ($action == 'pause') {
             foreach ($recordinfo as $record) {
                 if ($dns->setDomainRecordStatus($record['RecordId'], '0')) {
+                    if (is_array($record['Value'])) $record['Value'] = implode(',', $record['Value']);
                     $this->add_log($drow['name'], '暂停解析', $record['Name'].' ['.$record['Type'].'] '.$record['Value'].' (线路:'.$record['Line'].' TTL:'.$record['TTL'].')');
                     $success++;
                 }
@@ -660,6 +665,7 @@ class Domain extends BaseController
         } else if ($action == 'delete') {
             foreach ($recordinfo as $record) {
                 if ($dns->deleteDomainRecord($record['RecordId'])) {
+                    if (is_array($record['Value'])) $record['Value'] = implode(',', $record['Value']);
                     $this->add_log($drow['name'], '删除解析', $record['Name'].' ['.$record['Type'].'] '.$record['Value'].' (线路:'.$record['Line'].' TTL:'.$record['TTL'].')');
                     $success++;
                 }
@@ -708,6 +714,7 @@ class Domain extends BaseController
             foreach ($recordinfo as $record) {
                 $recordid = $dns->updateDomainRecord($record['RecordId'], $record['Name'], $type, $value, $record['Line'], $record['TTL'], $record['MX'], $record['Weight'], $record['Remark']);
                 if ($recordid) {
+                    if (is_array($record['Value'])) $record['Value'] = implode(',', $record['Value']);
                     $this->add_log($drow['name'], '修改解析', $record['Name'].' ['.$record['Type'].'] '.$record['Value'].' → '.$record['Name'].' ['.$type.'] '.$value.' (线路:'.$record['Line'].' TTL:'.$record['TTL'].')');
                     $success++;
                 } else {
@@ -729,6 +736,7 @@ class Domain extends BaseController
             foreach ($recordinfo as $record) {
                 $recordid = $dns->updateDomainRecord($record['RecordId'], $record['Name'], $record['Type'], $record['Value'], $line, $record['TTL'], $record['MX'], $record['Weight'], $record['Remark']);
                 if ($recordid) {
+                    if (is_array($record['Value'])) $record['Value'] = implode(',', $record['Value']);
                     $this->add_log($drow['name'], '修改解析', $record['Name'].' ['.$record['Type'].'] '.$record['Value'].' (线路:'.$line.' TTL:'.$record['TTL'].')');
                     $success++;
                 } else {
@@ -825,6 +833,7 @@ class Domain extends BaseController
 
     private function add_log($domain, $action, $data)
     {
+        if (strlen($data) > 500) $data = substr($data, 0, 500);
         Db::name('log')->insert(['uid' => request()->user['id'], 'domain' => $domain, 'action' => $action, 'data' => $data, 'addtime' => date("Y-m-d H:i:s")]);
     }
 }

app/lib/DeployHelper.php

@@ -467,7 +467,7 @@ class DeployHelper
             ],
         ],
         'synology' => [
-            'name' => '群辉面板',
+            'name' => '群晖面板',
             'class' => 1,
             'icon' => 'synology.png',
             'note' => null,
@@ -476,7 +476,7 @@ class DeployHelper
                 'url' => [
                     'name' => '面板地址',
                     'type' => 'input',
-                    'placeholder' => '群辉面板地址',
+                    'placeholder' => '群晖面板地址',
                     'note' => '填写规则如：http://192.168.1.100:5000 ，不要带其他后缀',
                     'required' => true,
                 ],
@@ -493,7 +493,7 @@ class DeployHelper
                     'required' => true,
                 ],
                 'version' => [
-                    'name' => '群辉版本',
+                    'name' => '群晖版本',
                     'type' => 'radio',
                     'options' => [
                         '0' => '7.x',
@@ -1040,6 +1040,35 @@ class DeployHelper
                 ],
             ],
         ],
+        'upyun' => [
+            'name' => '又拍云',
+            'class' => 2,
+            'icon' => 'upyun.ico',
+            'tasknote' => '系统会根据关联SSL证书的域名，进行证书的迁移操作',
+            'inputs' => [
+                'username' => [
+                    'name' => '用户名',
+                    'type' => 'input',
+                    'placeholder' => '',
+                    'required' => true,
+                ],
+                'password' => [
+                    'name' => '密码',
+                    'type' => 'input',
+                    'placeholder' => '',
+                    'required' => true,
+                ],
+                'proxy' => [
+                    'name' => '使用代理服务器',
+                    'type' => 'radio',
+                    'options' => [
+                        '0' => '否',
+                        '1' => '是',
+                    ],
+                    'value' => '0'
+                ],
+            ],
+        ],
         'baidu' => [
             'name' => '百度云',
             'class' => 2,

app/lib/deploy/upyun.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace app\lib\deploy;
+
+use app\lib\DeployInterface;
+use Exception;
+
+class upyun implements DeployInterface
+{
+    private $logger;
+    private $username;
+    private $password;
+    private $proxy;
+    private $cookie;
+
+    public function __construct($config)
+    {
+        $this->username = $config['username'];
+        $this->password = $config['password'];
+        $this->proxy = $config['proxy'] == 1;
+    }
+
+    public function check()
+    {
+        if (empty($this->username) || empty($this->password)) throw new Exception('用户名或密码不能为空');
+        $this->login();
+    }
+
+    public function deploy($fullchain, $privatekey, $config, &$info)
+    {
+        $this->login();
+
+        $url = 'https://console.upyun.com/api/https/certificate/';
+        $params = [
+            'certificate' => $fullchain,
+            'private_key' => $privatekey,
+        ];
+        $response = curl_client($url, http_build_query($params), null, $this->cookie, null, $this->proxy);
+        $result = json_decode($response['body'], true);
+        if ($result['data']['status'] === 0) {
+            $common_name = $result['data']['result']['commonName'];
+            $certificate_id = $result['data']['result']['certificate_id'];
+            $this->log('证书上传成功！证书ID:' . $certificate_id);
+        } elseif (isset($result['data']['message'])) {
+            throw new Exception('证书上传失败:' . $result['data']['message']);
+        } else {
+            throw new Exception('证书上传失败');
+        }
+
+        $url = 'https://console.upyun.com/api/https/certificate/search';
+        $params = [
+            'limit' => 100,
+            'domain' => $common_name,
+        ];
+        $response = curl_client($url . '?' . http_build_query($params), null, null, $this->cookie, null, $this->proxy);
+        $result = json_decode($response['body'], true);
+        if (isset($result['data']['result']) && is_array($result['data']['result'])) {
+            $cert_list = $result['data']['result'];
+        } elseif (isset($result['data']['message'])) {
+            throw new Exception('查找证书失败:' . $result['data']['message']);
+        } else {
+            throw new Exception('查找证书失败');
+        }
+
+        $i = 0;
+        $d = 0;
+        foreach ($cert_list as $crt_id => $item) {
+            if ($crt_id == $certificate_id || $item['commonName'] != $common_name || $item['config_domain'] == 0) {
+                continue;
+            }
+            $url = 'https://console.upyun.com/api/https/migrate/certificate';
+            $params = [
+                'new_crt_id' => $certificate_id,
+                'old_crt_id' => $crt_id,
+            ];
+            $response = curl_client($url, http_build_query($params), null, $this->cookie, null, $this->proxy);
+            $result = json_decode($response['body'], true);
+            if (isset($result['data']['result']) && $result['data']['result'] == true) {
+                $i++;
+                $d += $item['config_domain'];
+                $this->log('证书ID:' . $crt_id . ' 迁移成功！');
+            } elseif (isset($result['data']['message'])) {
+                throw new Exception('证书迁移失败:' . $result['data']['message']);
+            } else {
+                throw new Exception('证书迁移失败');
+            }
+        }
+
+        if ($i == 0) throw new Exception('未找到可迁移的证书');
+        $this->log('共迁移' . $i . '个证书,关联域名' . $d . '个');
+    }
+
+    private function login()
+    {
+        $url = 'https://console.upyun.com/accounts/signin/';
+        $params = [
+            'username' => $this->username,
+            'password' => $this->password,
+        ];
+        $response = curl_client($url, http_build_query($params), null, null, null, $this->proxy);
+        $result = json_decode($response['body'], true);
+        if (isset($result['data']['result']) && $result['data']['result'] == true) {
+            $cookie = '';
+            if (preg_match_all('/Set-Cookie: (.*);/iU', $response['header'], $matchs)) {
+                foreach ($matchs[1] as $val) {
+                    $arr = explode('=', $val);
+                    if ($arr[1] == '' || $arr[1] == 'deleted') continue;
+                    $cookie .= $val . '; ';
+                }
+            } else {
+                throw new Exception('登录成功，获取cookie失败');
+            }
+            $this->cookie = $cookie;
+            return true;
+        } elseif (isset($result['data']['message'])) {
+            throw new Exception('登录失败:' . $result['data']['message']);
+        } else {
+            throw new Exception('登录失败');
+        }
+    }
+
+    public function setLogger($func)
+    {
+        $this->logger = $func;
+    }
+
+    private function log($txt)
+    {
+        if ($this->logger) {
+            call_user_func($this->logger, $txt);
+        }
+    }
+}

app/lib/dns/powerdns.php

@@ -138,7 +138,7 @@ class powerdns implements DnsInterface
     public function addDomainRecord($Name, $Type, $Value, $Line = 'default', $TTL = 600, $MX = 1, $Weight = null, $Remark = null)
     {
         if ($Type == 'TXT' && substr($Value, 0, 1) != '"') $Value = '"' . $Value . '"';
-        if ($Type == 'CNAME' && substr($Value, -1) != '.') $Value .= '.';
+        if (($Type == 'CNAME' || $Type == 'MX') && substr($Value, -1) != '.') $Value .= '.';
         if ($Type == 'MX') $Value = intval($MX) . ' ' . $Value;
         $records = [];
         $rrsets = cache('powerdns_' . $this->domainid);
@@ -166,7 +166,7 @@ class powerdns implements DnsInterface
     public function updateDomainRecord($RecordId, $Name, $Type, $Value, $Line = 'default', $TTL = 600, $MX = 1, $Weight = null, $Remark = null)
     {
         if ($Type == 'TXT' && substr($Value, 0, 1) != '"') $Value = '"' . $Value . '"';
-        if ($Type == 'CNAME' && substr($Value, -1) != '.') $Value .= '.';
+        if (($Type == 'CNAME' || $Type == 'MX') && substr($Value, -1) != '.') $Value .= '.';
         if ($Type == 'MX') $Value = intval($MX) . ' ' . $Value;
         $rrsets = cache('powerdns_' . $this->domainid);
         $add = false;

config/app.php

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