Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -339,10 +339,17 @@ class CustomModuleContentLogic extends BaseLogic
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             foreach ($this->param['id'] as $id) {
             foreach ($this->param['id'] as $id) {
-                //删除当前扩展字段
-                $this->delRoute($id);
-                $this->delContentExtend($id);
-                $this->model->del(['id' => $id]);
+                $info = $this->model->read(['id' => $id], ['id']);
+                if($info !== false){
+                    if($info['status'] != 2){
+                        $this->model->edit(['status' => 2],['id' => $id]);
+                    }else{
+                        //删除当前扩展字段
+                        $this->delRoute($id);
+                        $this->delContentExtend($id);
+                        $this->model->del(['id' => $id]);
+                    }
+                }
             }
             }
             DB::commit();
             DB::commit();
         } catch (Exception $e) {
         } catch (Exception $e) {

@@ -57,7 +57,6 @@ Route::any('get_external_link_by_domain', [\App\Http\Controllers\Api\PrivateCont
 Route::any('get_project_detail', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByDomain'])->name('api.project_detail');
 Route::any('get_project_detail', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectByDomain'])->name('api.project_detail');
 // 获取项目产品信息
 // 获取项目产品信息
 Route::any('get_project_product', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectProduct'])->name('api.project_product');
 Route::any('get_project_product', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectProduct'])->name('api.project_product');
-// --------------------- 站群服务 ------------------------------------------
 // --------------------- 监控服务 ------------------------------------------
 // --------------------- 监控服务 ------------------------------------------
 Route::any('get_project_online', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectOnline'])->name('api.get_project_online');
 Route::any('get_project_online', [\App\Http\Controllers\Api\PrivateController::class, 'getProjectOnline'])->name('api.get_project_online');
 // 将项目标记为广告状态
 // 将项目标记为广告状态