合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1084

@@ -11,7 +11,10 @@ namespace App\Console\Commands\Project;
 
 
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\WebSetting\WebSettingSeo;
+use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 
@@ -31,15 +34,36 @@ class DownloadProject extends Command
      */
      */
     protected $description = '导出项目数据';
     protected $description = '导出项目数据';
 
 
+//    public function handle(){
+//        $projectModel = new Project();
+//        $data = $projectModel->formatQuery(['channel'=>['like','%"channel_id": "57"%'],'delete_status'=>0])->with(['deploy_optimize'])->get()->toArray();
+//        if(!empty($data)){
+//            $result = $this->exportData($data);
+//        }
+//        echo date('Y-m-d H:i:s') . ' ' . json_encode($result) . PHP_EOL;
+//        return $result;
+//
+//    }
+
     public function handle(){
     public function handle(){
+        $data = [];
         $projectModel = new Project();
         $projectModel = new Project();
-        $data = $projectModel->formatQuery(['channel'=>['like','%"channel_id": "57"%'],'delete_status'=>0])->with(['deploy_optimize'])->get()->toArray();
-        if(!empty($data)){
-            $result = $this->exportData($data);
+        $projectList = $projectModel->list(['delete_status'=>0,'type'=>['in',[2,3]]],'id',['id','status','title']);
+        foreach ($projectList as $v){
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+            ProjectServer::useProject($v['id']);
+            $seoModel = new WebSettingSeo();
+            $seoInfo = $seoModel->read(['project_id'=>$v['id']]);
+            if($seoInfo === false){
+                $data[] = $v;
+            }else{
+                if(empty($seoInfo['single_page_suffix'])){
+                    $data[] = $v;
+                }
+            }
+            DB::disconnect('custom_mysql');
+            return $this->exportData($data);
         }
         }
-        echo date('Y-m-d H:i:s') . ' ' . json_encode($result) . PHP_EOL;
-        return $result;
-
     }
     }
 
 
     public function exportData($data){
     public function exportData($data){

@@ -36,6 +36,9 @@ class ComController extends BaseController
         }else{
         }else{
             $this->map = $this->getAdminMenuCondition();
             $this->map = $this->getAdminMenuCondition();
         }
         }
+        if(!isset($this->map['type'])){//默认获取6.0菜单
+            $this->map['type'] = 0;
+        }
         $lists = $projectMenuModel->list($this->map,'sort');
         $lists = $projectMenuModel->list($this->map,'sort');
         $menu = array();
         $menu = array();
         foreach ($lists as $k => $v){
         foreach ($lists as $k => $v){