gx

@@ -297,11 +297,21 @@ class HtmlLanguageSpecialCollect extends Command
             ) {
                 $source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
                 if (!$source) {
-                    return [
-                        'download' => true,
-                        'url' => $url,
-                        'url_complete' => ($scheme ?: 'https') . '://' . ($host ?: $domain) . $path . ($query ? '?' . $query : '')
-                    ];
+                    $new_url = str_replace($web_url_domain, $home_url, $url);
+                    $source_new = CollectSource::where('project_id', $project_id)->where('origin', $new_url)->first();
+                    if (!$source_new) {
+                        return [
+                            'download' => true,
+                            'url' => $url,
+                            'url_complete' => ($scheme ?: 'https') . '://' . $home_url . $path . ($query ? '?' . $query : '')
+                        ];
+                    } else {
+                        return [
+                            'download' => false,
+                            'url' => $url,
+                            'url_complete' => $source_new['target']
+                        ];
+                    }
                 } else {
                     return [
                         'download' => false,

@@ -32,7 +32,7 @@ class ProjectReset extends Command
         if ($project) {
             try {
                 DB::connection('custom_mysql')->statement("DELETE FROM `gl_collect_source`  WHERE `origin` LIKE '%.css%' OR `origin` LIKE '%.js%'");
-                DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0");
+                DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''");
             } catch (\Exception $e) {
                 echo $project_id . '，重置失败' . PHP_EOL;
             }

@@ -55,8 +55,10 @@ class UpdateRoute extends Command
     public function handle(){
 //        $projectModel = new Project();
 //        $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]);
+
 //        foreach ($list as $v){
             ProjectServer::useProject(197);
+            $this->getProduct();
             $this->setProductKeyword();
             DB::disconnect('custom_mysql');
 //        }
@@ -83,6 +85,24 @@ class UpdateRoute extends Command
                     $routeModel = new RouteMap();
                     $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
                     $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    echo date('Y-m-d H:i:s') . 'end'.$v['id'] . PHP_EOL;
+                }
+            }
+        }
+    }
+
+    public function getProduct(){
+        $productModel = new Product();
+        $lists = $productModel->list(['status'=>1]);
+        if(!empty($lists)){
+            foreach ($lists as $v){
+                $tag = "-product";
+                if (!(substr($v['route'], -strlen($tag)) === $tag)) {
+                    echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
+                    $route = $v['route'].$tag;
+                    // 如果不是以 '-product' 结尾，则拼接上 '-product'
+                    $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
+                    $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
             }
         }
@@ -105,8 +125,7 @@ class UpdateRoute extends Command
                     if (!(substr($v['route'], -strlen($tag)) === $tag)) {
                         $route = $v['route'].$tag;
                         // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-                        $routeModel = new RouteMap();
-                        $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
+                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
                         $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
                 }else{
@@ -114,10 +133,11 @@ class UpdateRoute extends Command
                     $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
                     $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
-                echo date('Y-m-d H:i:s') . 'end :'.$route . PHP_EOL;
+                echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
             }
         }
     }
+
     /**
      * @remark :删除路由通知C端
      * @name   :curlDelRoute