coosld/dnsmgr
1
0
Fork 0
mirror of https://github.com/netcccyun/dnsmgr.git synced 2026-02-21 15:31:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复FTP部署

Browse Source
This commit is contained in:
net909 2024-12-21 23:29:30 +08:00
parent 259693fb3f
commit 3fc8c72d1b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/deploy/ftp.php
View File

@ -38,7 +38,7 @@ class ftp implements DeployInterface
fclose($temp_stream);
$temp_stream = fopen('php://temp', 'r+');
fwrite($temp_stream, $fullchain);
fwrite($temp_stream, $privatekey);
rewind($temp_stream);
if (ftp_fput($conn_id, $config['pem_key_file'], $temp_stream, FTP_BINARY)) {
$this->log('私钥文件上传成功：' . $config['pem_key_file']);

2
app/lib/deploy/opanel.php
View File

@ -90,7 +90,7 @@ class opanel implements DeployInterface
{
$url = $this->url . $path;
$timestamp = getMillisecond();
$timestamp = time().'';
$token = md5('1panel' . $this->key . $timestamp);
$headers = [
'1Panel-Token: '.$token,

5
app/lib/dns/cloudflare.php
View File

@ -59,12 +59,13 @@ class cloudflare implements DnsInterface
//获取解析记录列表
public function getDomainRecords($PageNumber = 1, $PageSize = 20, $KeyWord = null, $SubDomain = null, $Value = null, $Type = null, $Line = null, $Status = null)
{
if (!isNullOrEmpty($Value)) $KeyWord = $Value;
$param = ['type' => $Type, 'search' => $KeyWord, 'page' => $PageNumber, 'per_page' => $PageSize];
if (!isNullOrEmpty($SubDomain)) {
if ($SubDomain == '@') $SubDomain = $this->domain;
else $SubDomain .= '.' . $this->domain;
$param['name'] = $SubDomain;
}
if (!isNullOrEmpty($Value)) $KeyWord = $Value;
$param = ['name' => $SubDomain, 'type' => $Type, 'search' => $KeyWord, 'page' => $PageNumber, 'per_page' => $PageSize];
if (!isNullOrEmpty($Line)) {
$param['proxied'] = $Line == '1' ? 'true' : 'false';
}

2
app/middleware/ViewOutput.php
View File

@ -19,7 +19,7 @@ class ViewOutput
{
View::assign('islogin', $request->islogin);
View::assign('user', $request->user);
View::assign('cdnpublic', 'https://cdnjs.webstatic.cn/ajax/libs/');
View::assign('cdnpublic', 'https://s4.zstatic.net/ajax/libs/');
View::assign('skin', getAdminSkin());
return $next($request);
}