Merge branch 'master' into lms

@@ -243,10 +243,12 @@ class HtmlCollect extends Command
             $path = $arr['path'] ?? '';
             $path = $arr['path'] ?? '';
             $query = $arr['query'] ?? '';
             $query = $arr['query'] ?? '';
 
 
+            $path_arr = explode('.', $path);
             if (
             if (
                 (empty($host) || $host == $web_url_domain || $host == $home_url)
                 (empty($host) || $host == $web_url_domain || $host == $home_url)
                 && $path
                 && $path
                 && (strpos($path, '.') !== false)
                 && (strpos($path, '.') !== false)
+                && (end($path_arr) != 'html')
             ) {
             ) {
                 $source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
                 $source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
                 if (!$source) {
                 if (!$source) {

@@ -250,10 +250,12 @@ class HtmlLanguageCollect extends Command
             $path = $arr['path'] ?? '';
             $path = $arr['path'] ?? '';
             $query = $arr['query'] ?? '';
             $query = $arr['query'] ?? '';
 
 
+            $path_arr = explode('.', $path);
             if (
             if (
                 (empty($host) || $host == $web_url_domain || $host == $home_url)
                 (empty($host) || $host == $web_url_domain || $host == $home_url)
                 && $path
                 && $path
                 && (strpos($path, '.') !== false)
                 && (strpos($path, '.') !== false)
+                && (end($path_arr) != 'html')
             ) {
             ) {
                 $source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
                 $source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
                 if (!$source) {
                 if (!$source) {

@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Aside\Com;
 
 
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
+use App\Models\Com\UpdateLog;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -41,4 +42,20 @@ class UpdateController extends BaseController
         ProjectUpdateTdk::add_task($this->param['project_id']);
         ProjectUpdateTdk::add_task($this->param['project_id']);
         $this->response('任务添加成功');
         $this->response('任务添加成功');
     }
     }
+
+    /**
+     * 采集项目所有内容
+     * @author Akun
+     * @date 2023/11/24 11:33
+     */
+    public function dataCollect(){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => 'project_id不能为空',
+        ]);
+
+        UpdateLog::updateLog($this->param['project_id']);
+        $this->response('任务添加成功');
+    }
 }
 }

@@ -33,10 +33,32 @@ class UpdateLog extends Model
             $log->project_id = $project_id;
             $log->project_id = $project_id;
             $log->api_type = $type;
             $log->api_type = $type;
             $log->api_url = $url;
             $log->api_url = $url;
-            $log->sort = $type == 'category' ? 0 :1;
+            $log->sort = $type == 'category' ? 0 : 1;
             $log->collect_status = ($type == 'category' || $type == 'website_info') ? 1 : 0;
             $log->collect_status = ($type == 'category' || $type == 'website_info') ? 1 : 0;
             return $log->save();
             return $log->save();
         }
         }
         return true;
         return true;
     }
     }
+
+    /**
+     * 重置更新日志
+     * @param $project_id
+     * @return bool
+     * @author Akun
+     * @date 2023/11/24 11:43
+     */
+    public static function updateLog($project_id)
+    {
+        $logs = self::where('project_id', $project_id)->get();
+
+        foreach ($logs as $log) {
+            $log->status = 0;
+            if (!in_array($log->api_type, ['website_info', 'category'])) {
+                $log->collect_status = 0;
+            }
+            $log->save();
+        }
+        
+        return true;
+    }
 }
 }

@@ -182,6 +182,8 @@ Route::middleware(['aloginauth'])->group(function () {
         });
         });
         //更新项目tdk
         //更新项目tdk
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');
         Route::any('/updateSeoTdk', [Aside\Com\UpdateController::class, 'updateSeoTdk'])->name('admin.project_updateSeoTdk');
+        //项目内容采集
+        Route::any('/dataCollect', [Aside\Com\UpdateController::class, 'dataCollect'])->name('admin.project_dataCollect');
     });
     });
 
 
     //续费
     //续费