diff --git a/app/lib/DeployHelper.php b/app/lib/DeployHelper.php
index 61334cb..f26c253 100644
--- a/app/lib/DeployHelper.php
+++ b/app/lib/DeployHelper.php
@@ -880,9 +880,7 @@ class DeployHelper
sudo visudo
#在文件最后一行增加以下内容,需要将username替换成自己的用户名
username ALL=(ALL) NOPASSWD: NOPASSWD: ALL
-ctrl+x 保存退出
-sudo mkdir -p /home/<用户名>
-sudo chown -R <用户名>: /home/<用户名>
',
+ctrl+x 保存退出
',
'tasknote' => '系统会根据关联SSL证书的域名,自动更新对应证书',
'inputs' => [
'host' => [
diff --git a/app/lib/deploy/fnos.php b/app/lib/deploy/fnos.php
index 221e0ed..08844c0 100644
--- a/app/lib/deploy/fnos.php
+++ b/app/lib/deploy/fnos.php
@@ -52,7 +52,7 @@ class fnos implements DeployInterface
$this->exec($connection, '上传证书文件', "sudo tee ".$certPath." > /dev/null <<'EOF'\n".$fullchain."\nEOF");
$this->exec($connection, '上传私钥文件', "sudo tee ".$keyPath." > /dev/null <<'EOF'\n".$privatekey."\nEOF");
$this->exec($connection, '刷新目录权限', 'sudo chmod 0755 "'.$certDir.'" -R');
- $this->exec($connection, '更新数据表', 'sudo -u postgres psql -d trim_connect -c "UPDATE cert SET valid_to='.$certInfo['validTo_time_t'].'000,valid_from='.$certInfo['validFrom_time_t'].'000,issued_by=\''.$certInfo['issuer']['CN'].'\',updated_time='.getMillisecond().' WHERE private_key=\''.$keyPath.'\'"');
+ $this->exec($connection, '更新数据表', 'cd /tmp && sudo -u postgres psql -d trim_connect -c "UPDATE cert SET valid_to='.$certInfo['validTo_time_t'].'000,valid_from='.$certInfo['validFrom_time_t'].'000,issued_by=\''.$certInfo['issuer']['CN'].'\',updated_time='.getMillisecond().' WHERE private_key=\''.$keyPath.'\'"');
$this->log('证书 '.$row['domain'].' 更新成功');
$success++;
}
diff --git a/app/lib/dns/qingcloud.php b/app/lib/dns/qingcloud.php
index 5420585..4cd22f0 100644
--- a/app/lib/dns/qingcloud.php
+++ b/app/lib/dns/qingcloud.php
@@ -160,7 +160,7 @@ class qingcloud implements DnsInterface
if ($Type == 'MX') {
$Value = intval($MX).' '.$Value;
- } elseif ($Type == 'TXT') {
+ } elseif ($Type == 'TXT' && substr($Value, 0, 1) != '"') {
$Value = '"'.$Value.'"';
}
@@ -184,7 +184,7 @@ class qingcloud implements DnsInterface
if ($Type == 'MX') {
$Value = intval($MX).' '.$Value;
- } elseif ($Type == 'TXT') {
+ } elseif ($Type == 'TXT' && substr($Value, 0, 1) != '"') {
$Value = '"'.$Value.'"';
}