Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -63,7 +63,8 @@ class ProjectController extends BaseController
             ->where('gl_project.delete_status',Project::TYPE_ZERO)
             ->where('gl_project.extend_type',Project::TYPE_ZERO);
         $query = $this->searchParam($query);
-        $lists = $query->orderBy('gl_project.id', 'desc')->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
+        $query = $this->orderByList($query);
+        $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
                 $v = $this->handleParam($v);
@@ -74,6 +75,18 @@ class ProjectController extends BaseController
     }
 
     /**
+     * @remark :排序
+     * @name   :orderByList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/29 17:14
+     */
+    public function orderByList($query){
+        $query = $query->orderBy('gl_project.uptime', 'desc')->orderBy('gl_project.id', 'desc');
+        return $query;
+    }
+
+    /**
      * @remark :搜索参数处理
      * @name   :searchParam
      * @author :lyh

@@ -39,7 +39,7 @@ class DomainInfoLogic extends BaseLogic
             $this->param['domain'] = trim($domain['host']);
         }
         //验证域名
-        $this->verifyDomain($this->param['domain'],isset($this->param['id']) ?? '');
+        $this->verifyDomain($this->param['domain'],$this->param['id'] ?? '');
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         }else{