合并分支 'develop' 到 'master'

lyh 合并请求



查看合并请求 !331

@@ -55,7 +55,7 @@ class InitProject extends Command
                     $project = Project::find($item['data']['project_id']);
                     $project = Project::find($item['data']['project_id']);
                     $project_logic = new ProjectLogic();
                     $project_logic = new ProjectLogic();
                     //初始化数据库
                     //初始化数据库
-                    if(!empty($project['mysql_id'])){
+                    if(!empty($project['mysql_id']) && ($project['type'] == 1)){
                         $project_logic->initializationMysql($project['id']);
                         $project_logic->initializationMysql($project['id']);
                     }
                     }
                     //初始账号
                     //初始账号

@@ -12,6 +12,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\Com\UpdateLog;
+use App\Models\Com\UpdateOldInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -75,9 +76,25 @@ class UpdateController extends BaseController
             $this->fail('非升级无法进行采集操作');
             $this->fail('非升级无法进行采集操作');
         }
         }
 
 
+        if ($this->param['test_domain']) {
+            $test_domain_arr = parse_url($this->param['test_domain']);
+            $this->param['test_domain'] = $test_domain_arr['host'] ?? '';
+        }
+
+        //查看项目是否已上线
+        $domain_info = DomainInfo::where('project_id', $this->param['project_id'])->first();
+
+        if ($domain_info && !$this->param['test_domain']) {
+            $this->fail('已上线项目需填写采集的测试站域名');
+        }
+
         try {
         try {
             DB::connection('custom_mysql')->statement("DELETE FROM `gl_collect_source`  WHERE `origin` LIKE '%.css%' OR `origin` LIKE '%.js%'");
             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 WHERE `language` = ''");
+            if ($domain_info) {
+                DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0,`domain` = '" . $this->param['test_domain'] . "' WHERE `language` = ''");
+            } else {
+                DB::connection('custom_mysql')->statement("UPDATE `gl_collect_task` SET `status` = 0 WHERE `language` = ''");
+            }
         } catch (\Exception $e) {
         } catch (\Exception $e) {
             errorLog('重新采集升级项目数据', $this->param, $e);
             errorLog('重新采集升级项目数据', $this->param, $e);
 
 
@@ -87,9 +104,6 @@ class UpdateController extends BaseController
         //关闭数据库
         //关闭数据库
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
 
 
-        //查看项目是否已上线
-        $domain_info = DomainInfo::where('project_id', $this->param['project_id'])->first();
-
         $update = ['collect_status' => 0];
         $update = ['collect_status' => 0];
         if ($this->param['type'] == 2 && !$domain_info) {
         if ($this->param['type'] == 2 && !$domain_info) {
             $update['status'] = 0;
             $update['status'] = 0;

@@ -212,8 +212,8 @@ class ProofreadingController extends BaseController
             $data[] = $trimmedString;
             $data[] = $trimmedString;
         }
         }
         $data = array_values($data);
         $data = array_values($data);
-        $uniqueArray = array_unique($data);
-        $data = array_values($uniqueArray);
+//        $uniqueArray = array_unique($data);
+//        $data = array_values($uniqueArray);
         return $data;
         return $data;
     }
     }
 
 

@@ -105,7 +105,7 @@ class ProjectServer
         $created_at = date('Y-m-d H:i:s');
         $created_at = date('Y-m-d H:i:s');
         self::initGroup($project_id,$created_at);
         self::initGroup($project_id,$created_at);
         //初始化单页
         //初始化单页
-        self::init404Page($project_id);
+        self::init404Page($project_id,$created_at);
         //初始化模块数据
         //初始化模块数据
         self::initModule($project_id);
         self::initModule($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
@@ -172,7 +172,7 @@ class ProjectServer
      * @method :post
      * @method :post
      * @time   :2023/12/29 9:32
      * @time   :2023/12/29 9:32
      */
      */
-    public function init404Page($project_id){
+    public function init404Page($project_id,$created_at){
         $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first();
         $info = DB::connection('custom_mysql')->table('gl_web_custom_template')->first();
         if(empty($info)) {
         if(empty($info)) {
             $main_404_html = '<main>
             $main_404_html = '<main>
@@ -208,7 +208,10 @@ class ProjectServer
                 'status' => 1,
                 'status' => 1,
                 'url' => BCustomTemplate::NOT_FOUND_PAGE_URL,
                 'url' => BCustomTemplate::NOT_FOUND_PAGE_URL,
                 'html' => $main_404_html,
                 'html' => $main_404_html,
-                'html_style' => '<style id="globalsojs-styles"></style>','title' => '404-Page not found', 'description' => 'Sorry. The page has either moved or cannot be found.', 'created_at' => $created_at, 'updated_at' => $created_at];
+                'html_style' => '<style id="globalsojs-styles"></style>',
+                'title' => '404-Page not found',
+                'description' => 'Sorry. The page has either moved or cannot be found.',
+                'created_at' => $created_at, 'updated_at' => $created_at];
             $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
             $id = DB::connection('custom_mysql')->table('gl_web_custom_template')->insertGetId($data);
             //路由
             //路由
             $info = DB::connection('custom_mysql')->table('gl_route_map')->first();
             $info = DB::connection('custom_mysql')->table('gl_route_map')->first();