diff --git a/app/controller/Domain.php b/app/controller/Domain.php
index 03e04a0..dc5081c 100644
--- a/app/controller/Domain.php
+++ b/app/controller/Domain.php
@@ -182,6 +182,7 @@ class Domain extends BaseController
$kw = input('post.kw', null, 'trim');
$type = input('post.type', null, 'trim');
$status = input('post.status', null, 'trim');
+ $order = input('post.order', null, 'trim');
$offset = input('post.offset/d', 0);
$limit = input('post.limit/d', 10);
@@ -203,7 +204,23 @@ class Domain extends BaseController
}
}
$total = $select->count();
- $rows = $select->fieldRaw('A.*,B.type,B.remark aremark')->order('A.id', 'desc')->limit($offset, $limit)->select();
+ switch ($order) {
+ case '1':
+ $select->order('A.regtime', 'asc');
+ break;
+ case '2':
+ $select->order('A.regtime', 'desc');
+ break;
+ case '3':
+ $select->order('A.expiretime', 'asc');
+ break;
+ case '4':
+ $select->order('A.expiretime', 'desc');
+ break;
+ default:
+ $select->order('A.id', 'desc');
+ }
+ $rows = $select->fieldRaw('A.*,B.type,B.remark aremark')->limit($offset, $limit)->select();
$list = [];
foreach ($rows as $row) {
@@ -321,6 +338,12 @@ class Domain extends BaseController
Db::name('optimizeip')->where('did', 'in', $ids)->delete();
Db::name('sctask')->where('did', 'in', $ids)->delete();
return json(['code' => 0, 'msg' => '成功删除' . count($ids) . '个域名！']);
+ } elseif ($act == 'updateexpire') {
+ if (!checkPermission(2)) return $this->alert('error', '无权限');
+ $ids = input('post.ids');
+ if (empty($ids)) return json(['code' => -1, 'msg' => '参数不能为空']);
+ $count = Db::name('domain')->where('id', 'in', $ids)->update(['checkstatus' => 0]);
+ return json(['code' => 0, 'msg' => '已提交' . $count . '个域名，约' . ceil($count / 5) . '分钟后刷新完成。']);
}
return json(['code' => -3]);
}
diff --git a/app/controller/Index.php b/app/controller/Index.php
index 9e56da8..e98b4ef 100644
--- a/app/controller/Index.php
+++ b/app/controller/Index.php
@@ -64,7 +64,7 @@ class Index extends BaseController
'framework_version' => app()->version(),
'php_version' => PHP_VERSION,
'mysql_version' => $mysqlVersion,
- 'software' => $_SERVER['SERVER_SOFTWARE'],
+ 'software' => $_SERVER['SERVER_SOFTWARE'] ?? '未知',
'os' => php_uname(),
'date' => date("Y-m-d H:i:s"),
];
diff --git a/app/lib/DeployHelper.php b/app/lib/DeployHelper.php
index 37c7917..0fb2a0e 100644
--- a/app/lib/DeployHelper.php
+++ b/app/lib/DeployHelper.php
@@ -581,7 +581,7 @@ class DeployHelper
'v1' => '1.x',
'v2' => '2.x',
],
- 'value' => 'v1',
+ 'value' => 'v2',
'required' => true,
],
'proxy' => [
diff --git a/app/service/ExpireNoticeService.php b/app/service/ExpireNoticeService.php
index 85e1a9a..830a0d8 100644
--- a/app/service/ExpireNoticeService.php
+++ b/app/service/ExpireNoticeService.php
@@ -48,7 +48,7 @@ class ExpireNoticeService
private function refreshDomainList()
{
- $domainList = Db::name('domain')->field('id,name')->where('expiretime', null)->where('checkstatus', 0)->select();
+ $domainList = Db::name('domain')->field('id,name')->where('checkstatus', 0)->select();
$count = 0;
foreach ($domainList as $domain) {
$res = $this->updateDomainDate($domain['id'], $domain['name']);
diff --git a/app/view/dmonitor/taskform.html b/app/view/dmonitor/taskform.html
index 99a33e6..e3e4aa7 100644
--- a/app/view/dmonitor/taskform.html
+++ b/app/view/dmonitor/taskform.html
@@ -150,7 +150,7 @@
{block name="script"}
-
+