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

@@ -27,23 +27,23 @@ class Temp extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $data = UpdateLog::where('sort', 0)->get();
+        $data = UpdateLog::where('api_type', 'website_info')->get();
 
 
         foreach ($data as $item) {
         foreach ($data as $item) {
             $project_id = $item->project_id;
             $project_id = $item->project_id;
             $project = ProjectServer::useProject($project_id);
             $project = ProjectServer::useProject($project_id);
             if ($project) {
             if ($project) {
                 try {
                 try {
-                    DB::connection('custom_mysql')->statement("ALTER TABLE `gl_product_category` ADD COLUMN  `original_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '来源id'");
+                    DB::connection('custom_mysql')->statement("ALTER TABLE `gl_news_category` ADD COLUMN  `original_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '来源id'");
                 } catch (\Exception $e) {
                 } catch (\Exception $e) {
-                    echo $project_id . '已存在';
+                    echo $project_id . '已存在'.PHP_EOL;
                     continue;
                     continue;
                 }
                 }
             }
             }
             //关闭数据库
             //关闭数据库
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
 
 
-            echo $project_id.'成功';
+            echo $project_id.'成功'.PHP_EOL;
         }
         }
     }
     }
 }
 }

@@ -481,7 +481,7 @@ class ProjectUpdate extends Command
             return $task_id;
             return $task_id;
         }
         }
 
 
-        $task_list = UpdateLog::where('project_id', 543)->where('status', UpdateLog::STATUS_UN)->orderBy('project_id', 'asc')->orderBy('sort', 'asc')->limit(8)->get();
+        $task_list = UpdateLog::where('status', UpdateLog::STATUS_UN)->orderBy('project_id', 'asc')->orderBy('sort', 'asc')->limit(8)->get();
         if ($task_list->count() == 0) {
         if ($task_list->count() == 0) {
             return false;
             return false;
         }
         }