增加域名列表排序，批量刷新到期时间

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]);
     }

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"),
         ];

app/lib/DeployHelper.php

@@ -581,7 +581,7 @@ class DeployHelper
                         'v1' => '1.x',
                         'v2' => '2.x',
                     ],
-                    'value' => 'v1',
+                    'value' => 'v2',
                     'required' => true,
                 ],
                 'proxy' => [

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']);

app/view/dmonitor/taskform.html

@@ -150,7 +150,7 @@
 {block name="script"}
 <script src="/static/js/vue-2.7.16.min.js"></script>
 <script src="/static/js/layer/layer.js"></script>
-<script src="/static/js/bootstrapValidator.min.js"></script>
+<script src="/static/js/bootstrapValidator.min.js?v=2"></script>
 <script>
 var action = '{$action}';
 var info = {$info|json_encode|raw};

app/view/domain/domain.html

@@ -139,12 +139,15 @@
   <div class="form-group">
 	<select name="status" class="form-control"><option value="">所有状态</option><option value="1">即将到期</option><option value="2">已到期</option></select>
   </div>
+  <div class="form-group">
+	<select name="order" class="form-control"><option value="">默认排序</option><option value="1">注册时间↑</option><option value="2">注册时间↓</option><option value="3">到期时间↑</option><option value="4">到期时间↓</option></select>
+  </div>
   <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> 搜索</button>
   <a href="javascript:searchClear()" class="btn btn-default" title="刷新域名列表"><i class="fa fa-refresh"></i> 刷新</a>
   {if request()->user['level'] eq 2}<a href="javascript:addframe()" class="btn btn-success"><i class="fa fa-plus"></i> 添加</a>
   <div class="btn-group" role="group">
 	<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">批量操作 <span class="caret"></span></button>
-	<ul class="dropdown-menu"><li><a href="/domain/add">添加域名</a></li><li><a href="javascript:operation('editremark')">修改域名备注</a></li><li><a href="javascript:operation('opennotice')">开启到期提醒</a></li><li><a href="javascript:operation('closenotice')">关闭到期提醒</a></li><li><a href="javascript:operation('delete')">删除域名</a></li><li role="separator" class="divider"></li><li><a href="javascript:operation('addrecord')">添加解析</a></li><li><a href="javascript:operation('editrecord')">修改解析</a></li></ul>
+	<ul class="dropdown-menu"><li><a href="/domain/add">添加域名</a></li><li><a href="javascript:operation('editremark')">修改域名备注</a></li><li><a href="javascript:operation('opennotice')">开启到期提醒</a></li><li><a href="javascript:operation('closenotice')">关闭到期提醒</a></li><li><a href="javascript:operation('updateexpire')">刷新到期时间</a></li><li><a href="javascript:operation('delete')">删除域名</a></li><li role="separator" class="divider"></li><li><a href="javascript:operation('addrecord')">添加解析</a></li><li><a href="javascript:operation('editrecord')">修改解析</a></li></ul>
   </div>
   <a href="/domain/expirenotice" class="btn btn-default">到期提醒设置</a>{/if}
 </form>
@@ -535,6 +538,30 @@ function operation(action){
 		}, function(){
 			layer.close(confirmobj);
 		});
+	}else if(action == 'updateexpire'){
+		var confirmobj = layer.confirm('提交后将异步刷新所选域名的到期时间', {
+			btn: ['确定','取消']
+		}, function(){
+			var ii = layer.load(2);
+			$.ajax({
+				type : 'POST',
+				url : '/domain/op/act/updateexpire',
+				data : {ids: ids},
+				dataType : 'json',
+				success : function(data) {
+					layer.close(ii);
+					if(data.code == 0){
+						layer.closeAll();
+						layer.alert(data.msg, {icon: 1});
+						searchRefresh();
+					}else{
+						layer.alert(data.msg, {icon: 2});
+					}
+				}
+			});
+		}, function(){
+			layer.close(confirmobj);
+		});
 	}else{
 		var is_notice = action == 'opennotice' ? 1 : 0;
 		var ii = layer.load(2);

app/view/schedule/staskform.html

@@ -106,7 +106,7 @@
     <div class="form-group" v-show="set.switchtype==0">
         <label class="col-sm-3 control-label no-padding-right" is-required>记录值</label>
         <div class="col-sm-6">
-            <input type="text" name="value" v-model="set.value" placeholder="支持填写IPv4或CNAME地址" class="form-control" required>
+            <input type="text" name="value" v-model="set.value" placeholder="支持填写IP或CNAME地址" class="form-control" required>
         </div>
     </div>
     <div class="form-group" v-show="set.switchtype==0&&dnstype=='cloudflare'">