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

Lyh server



查看合并请求 !2112

@@ -57,26 +57,19 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $str = '3671,955,752,1270,439,2674,3588,2388,1271,1543,738,624,552,1417,1237,651,1143,817,1556,1234,1350,650,538,491,631,2059,1845,866,1194,1699,546,684,905,1805,1728,2811,952,2972,2827,983,812,3081,554,741,1349,980';
-        $arr = explode(',',$str);
-        $model = new TranslateBigProject();
-        foreach ($arr as $val){
-            $model->addReturnId(['project_id'=>$val]);
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
+        foreach ($lists as $item){
+//            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
+            ProjectServer::useProject($item['id']);
+            $webSettingModel = new WebSetting();
+            $info = $webSettingModel->read(['project_id'=>$item['id']]);
+            if($info === false){
+                $webSettingModel->addReturnId(['project_id'=>$item['id']]);
+                echo '当前数据为空：'.$item['id'].PHP_EOL;
+            }
+            DB::disconnect('custom_mysql');
         }
         }
-        return true;
-//        $projectModel = new Project();
-//        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
-//        foreach ($lists as $item){
-////            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
-//            ProjectServer::useProject($item['id']);
-//            $webSettingModel = new WebSetting();
-//            $info = $webSettingModel->read(['project_id'=>$item['id']]);
-//            if($info === false){
-//                $webSettingModel->addReturnId(['project_id'=>$item['id']]);
-//                echo '当前数据为空：'.$item['id'].PHP_EOL;
-//            }
-//            DB::disconnect('custom_mysql');
-//        }
     }
     }
 
 
     public function _actionTemplateMain(){
     public function _actionTemplateMain(){

@@ -175,6 +175,9 @@ class NewsLogic extends BaseLogic
                     RouteMap::delRoute(RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
                     RouteMap::delRoute(RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
                     $this->delRoute($id);
                     $this->delRoute($id);
                     $this->model->del(['id' => $id]);
                     $this->model->del(['id' => $id]);
+                    //删除扩展字段
+                    $extendInfoModel = new NewsExtendInfo();
+                    $extendInfoModel->del(['news_id'=>$id]);
                 }
                 }
             }
             }
             DB::commit();
             DB::commit();