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

@@ -9,6 +9,8 @@
 
 
 namespace App\Console\Commands\DayCount;
 namespace App\Console\Commands\DayCount;
 
 
+use App\Models\ASide\APublicModel;
+use App\Models\Channel\Channel;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RankData\RankDataLog;
 use App\Models\RankData\RankDataLog;
@@ -130,10 +132,18 @@ class AfterDayCount extends Command
                 ->where('gl_project.is_remain_today',1)
                 ->where('gl_project.is_remain_today',1)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4,6])
                 ->whereIn('gl_project.type',[2,4,6])
+                ->leftJoin('gl_project_payment', 'gl_project.id', '=', 'gl_project_payment.project_id')
+                ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
+                ->leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
                 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
                 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+                ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
                 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
                 ->whereRaw("FIND_IN_SET('2', gl_project.level) = 0 AND FIND_IN_SET('3', gl_project.level) = 0")
                 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
                 ->whereRaw("FIND_IN_SET('7', gl_project_deploy_optimize.special) = 0 AND FIND_IN_SET('8', gl_project_deploy_optimize.special) = 0")
-                ->select(['gl_project.title','gl_project.finish_remain_day','gl_project_deploy_optimize.start_date'])->get()->toArray();
+                ->select($this->selectParam())->get()->toArray();
+            foreach ($data as $k=>$val){
+                $this->handleParam($val);
+                $data[$k] = $val;
+            }
             $saveData[] = [
             $saveData[] = [
                 'date'=>date('Y-m-d'),
                 'date'=>date('Y-m-d'),
                 'type'=> $key,
                 'type'=> $key,
@@ -149,4 +159,91 @@ class AfterDayCount extends Command
         return $saveData;
         return $saveData;
     }
     }
 
 
+
+    public function selectParam(){
+        $select = [
+            'gl_project.id AS id',
+            'gl_project.title AS title',
+            'gl_project.level AS level',
+            'gl_project.channel AS channel',
+            'gl_project.company AS company',
+            'gl_project.type AS type',
+            'gl_project.created_at AS created_at',
+            'gl_project.is_language AS is_language',
+            'gl_project.cooperate_date AS cooperate_date',
+            'gl_project.finish_remain_day AS finish_remain_day',
+            'gl_project.is_remain_today AS is_remain_today',
+            'gl_project.remain_day AS remain_day',
+            'gl_project.seo_remain_day AS seo_remain_day',
+            'gl_project.robots AS robots',
+            'gl_project.is_minor_languages AS is_minor_languages',
+            'gl_project.is_translate AS is_translate',
+            'gl_project.is_translate_tag AS is_translate_tag',
+            'gl_project.is_upgrade AS is_upgrade',
+            'gl_project.site_status AS site_status',
+            'gl_project_online_check.id AS online_check_id',
+            'gl_project_online_check.question AS question',
+            'gl_project_online_check.go_question AS go_question',
+            'gl_project_online_check.optimist_status AS optimist_status',
+            'gl_project_online_check.qa_status AS qa_status',
+            'gl_project_online_check.updated_at AS online_updated_at',
+            'gl_project_payment.amount AS amount',
+            'gl_project_deploy_build.dept_id AS dept_id',
+            'gl_project_deploy_build.keyword_num AS key',
+            'gl_project_deploy_build.service_duration AS day',
+            'gl_project_deploy_build.leader_mid AS leader_mid',
+            'gl_project_deploy_build.manager_mid AS manager_mid',
+            'gl_project_deploy_build.designer_mid AS designer_mid',
+            'gl_project_deploy_build.tech_mid AS tech_mid',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project_deploy_build.plan AS plan',
+            'gl_project_deploy_build.seo_plan AS seo_plan',
+            'gl_project_deploy_optimize.dept_id AS optimize_dept_id',
+            'gl_project_deploy_optimize.manager_mid AS optimize_manager_mid',
+            'gl_project_deploy_optimize.optimist_mid AS optimize_optimist_mid',
+            'gl_project_deploy_optimize.assist_mid AS optimize_assist_mid',
+            'gl_project_deploy_optimize.tech_mid AS optimize_tech_mid',
+            'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_deploy_optimize.tech_leader AS tech_leader',
+            'gl_project_deploy_optimize.quality_mid AS quality_mid',
+            'gl_project_deploy_optimize.design_mid AS design_mid',
+            'gl_project_deploy_optimize.start_date AS start_date',
+            'gl_project_deploy_optimize.backlink AS backlink',
+            'gl_project_deploy_optimize.ai_video AS ai_video',
+            'gl_project_deploy_optimize.api_no AS api_no',
+            'gl_project_deploy_optimize.first_compliance_time AS first_compliance_time',
+            'gl_domain_info.amp_status AS amp_status',
+            'gl_domain_info.domain AS domain',
+        ];
+        return $select;
+    }
+
+    public function handleParam(&$item){
+        $data = APublicModel::getNumByProjectId($item['id']);
+        $manageModel = new ManageHr();
+        $plan = Project::planMap();
+        $seo_plan = Project::seoMap();
+        $item['plan'] = $plan[$item['plan']] ?? $seo_plan[1];
+        $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
+        $item['build_leader'] = $manageModel->getName($item['leader_mid']);
+        $item['build_manager'] = $manageModel->getName($item['manager_mid']);
+        $item['build_designer'] = $manageModel->getName($item['designer_mid']);
+        $item['build_tech'] = $manageModel->getName($item['tech_mid']);
+        $item['optimize_manager'] = $manageModel->getName($item['optimize_manager_mid']);
+        $item['optimize_optimist'] = $manageModel->getName($item['optimize_optimist_mid']);
+        $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']);
+        $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']);
+        $item['quality_mid_name'] = $manageModel->getName($item['quality_mid']);
+        $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date']));
+        $item['autologin_code'] = getAutoLoginCode($item['id']);
+        $item['domain'] = 'https://'.$item['domain'].'/';
+        if(!empty($item['domain']) && $item['amp_status'] == 1){
+            $item['amp_domain'] = str_replace('www','m',$item['domain']);
+        }
+        $item['product_num'] = $data['product'] ?? 0;
+        $item['keyword_num'] = $item['key'] ?? 0;
+        $item['inquiry_num'] = $data['inquiry'] ?? 0;
+        $item['autologin_code'] = getAutoLoginCode($item['id']);
+        return $item;
+    }
 }
 }

@@ -54,7 +54,7 @@ class LyhImportTest extends Command
     public function handle(){
     public function handle(){
         ProjectServer::useProject(2140);
         ProjectServer::useProject(2140);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
-        $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/2025-16.csv',2140);
+        $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-05/daoru.csv',2140);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
@@ -487,22 +487,30 @@ class LyhImportTest extends Command
                 $customContentModel->edit(['category_id'=>$categoryId],['id'=>$contentId]);
                 $customContentModel->edit(['category_id'=>$categoryId],['id'=>$contentId]);
             }
             }
             $saveData = [
             $saveData = [
-                ['key'=>'pd_extended_field_10', 'type'=>1, 'values'=>$item[3], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[3], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
                 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
                 ['key'=>'pd_extended_field_2', 'type'=>1, 'values'=>$item[4], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_1', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-//                ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-//                ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-//                ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_3', 'type'=>1, 'values'=>$item[5], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_4', 'type'=>1, 'values'=>$item[6], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_5', 'type'=>1, 'values'=>$item[7], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_6', 'type'=>1, 'values'=>$item[8]??'', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_7', 'type'=>1, 'values'=>$item[9], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_8', 'type'=>1, 'values'=>$item[10], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_9', 'type'=>1, 'values'=>$item[11], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_10', 'type'=>1, 'values'=>$item[12], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_11', 'type'=>1, 'values'=>$item[13], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_12', 'type'=>1, 'values'=>$item[14] ?? '', 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_13', 'type'=>1, 'values'=>$item[15], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_14', 'type'=>1, 'values'=>$item[16], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_15', 'type'=>1, 'values'=>$item[17], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_16', 'type'=>1, 'values'=>$item[18], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_17', 'type'=>1, 'values'=>$item[19], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_18', 'type'=>1, 'values'=>$item[20], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_19', 'type'=>1, 'values'=>$item[21], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_20', 'type'=>1, 'values'=>$item[22], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_21', 'type'=>1, 'values'=>$item[23], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_22', 'type'=>1, 'values'=>$item[24], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_23', 'type'=>1, 'values'=>$item[25], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
+                ['key'=>'pd_extended_field_24', 'type'=>1, 'values'=>$item[26], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>7, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
             ];
             ];
             $customExtendContentTModel->insert($saveData);
             $customExtendContentTModel->insert($saveData);
 //            }catch (\Exception $e){
 //            }catch (\Exception $e){

@@ -30,6 +30,7 @@ use App\Models\Workchat\MessagePush;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -50,6 +51,7 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
+        dd(111);
         $projectModel = new Project();
         $projectModel = new Project();
         $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
         $lists = $projectModel->list(['delete_status' => 0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
         foreach ($lists as $val) {
         foreach ($lists as $val) {
@@ -125,4 +127,61 @@ class lyhDemo extends Command
         return $aiSettingInfo;
         return $aiSettingInfo;
     }
     }
 
 
+
+    public function _actions() {
+        echo '开始执行...' . PHP_EOL;
+        ProjectServer::useProject(565);
+        $table = 'gl_product_category';
+        $connection = DB::connection('custom_mysql');
+        $dbName = $connection->getDatabaseName();
+        $brandsStr = 'Trimos,insize,Fowler,Mahr,Starrett,Tesa,Mitutoyo,Wixey,Shars,Fisso,Spi,Grizzly,Accumaster,Accuremote,Baker,Sharpe,Compac,Earth,Etalon,Federal,Fell,Fisso,Fowler,Gem,Grizzly,Husky,iGaging,Insize,Kanetec,Magnetics,Mighty,Mitutoyo,Noga,Pittsburgh,Procheck,Saker,Scherr Tumico,Shars,Shinwa,SPI,Starrett,Tesa,Technidea,Trimos,Verdict,Wyler,Wixey';
+        $brands = array_unique(array_map('trim', explode(',', $brandsStr)));
+        // 获取文本字段
+        $columns = $connection->table('information_schema.columns')
+            ->where('table_schema', $dbName)
+            ->where('table_name', $table)
+            ->whereIn('data_type', ['varchar', 'text', 'mediumtext', 'longtext'])
+            ->pluck('column_name')
+            ->toArray();
+        if (empty($columns)) {
+            echo "未找到文本字段，退出。" . PHP_EOL;
+            return;
+        }
+        foreach ($columns as $field) {
+            $sqlField = "`$field`";
+            // 构造第一轮REPLACE表达式（原样品牌）
+            $replaceExprRaw = $sqlField;
+            foreach ($brands as $brand) {
+                $safeBrand = addslashes($brand);
+                $replaceExprRaw = "REPLACE(REPLACE($replaceExprRaw, '$safeBrand-', ''), '$safeBrand', '')";
+            }
+            // 构造第二轮REPLACE表达式（小写品牌）
+            $lowerBrands = array_map('strtolower', $brands);
+            $replaceExprLower = $sqlField;
+            foreach ($lowerBrands as $brand) {
+                $safeBrand = addslashes($brand);
+                $replaceExprLower = "REPLACE(REPLACE($replaceExprLower, '$safeBrand-', ''), '$safeBrand', '')";
+            }
+            // 先执行原样品牌替换
+            $sqlRaw = "UPDATE `$table` SET $sqlField = $replaceExprRaw WHERE $sqlField IS NOT NULL AND $sqlField != ''";
+            echo "执行字段（品牌原样替换）：$field" . PHP_EOL;
+            try {
+                $connection->update($sqlRaw);
+            } catch (\Exception $e) {
+                echo "字段 $field 原样替换出错：" . $e->getMessage() . PHP_EOL;
+            }
+            // 再执行小写品牌替换
+            $sqlLower = "UPDATE `$table` SET $sqlField = $replaceExprLower WHERE $sqlField IS NOT NULL AND $sqlField != ''";
+            echo "执行字段（品牌小写替换）：$field" . PHP_EOL;
+            try {
+                $connection->update($sqlLower);
+            } catch (\Exception $e) {
+                echo "字段 $field 小写替换出错：" . $e->getMessage() . PHP_EOL;
+            }
+        }
+
+        echo '执行结束' . PHP_EOL;
+
+        DB::disconnect('custom_mysql');
+    }
 }
 }

@@ -159,7 +159,7 @@ class NoticeController extends BaseController
 
 
         //新增重定向任务
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
         $redirect_model = new DomainRedirectTask();
-        $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id']);
+        $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id','status']);
         if(!$task_redirect_info){
         if(!$task_redirect_info){
             $redirect_model->add([
             $redirect_model->add([
                 'origin_domain'=> $origin_domain,
                 'origin_domain'=> $origin_domain,
@@ -167,7 +167,9 @@ class NoticeController extends BaseController
                 'target_domain' => $target_domain
                 'target_domain' => $target_domain
             ]);
             ]);
         }else{
         }else{
-            $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN],['id'=>$task_redirect_info['id']]);
+            if($task_redirect_info['status'] == DomainRedirectTask::STATUS_FAL){
+                $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN,'error_msg'=>null],['id'=>$task_redirect_info['id']]);
+            }
         }
         }
 
 
         return $this->success();
         return $this->success();

@@ -340,13 +340,17 @@ class DomainInfoLogic extends BaseLogic
         //新增重定向任务
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
         $redirect_model = new DomainRedirectTask();
         if($domain_301){
         if($domain_301){
-            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301]);
+            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301],['id','status']);
             if(!$task_redirect_info){
             if(!$task_redirect_info){
                 $redirect_model->add([
                 $redirect_model->add([
                     'origin_domain'=> $domain_301,
                     'origin_domain'=> $domain_301,
                     'other_domain' => json_encode([]),
                     'other_domain' => json_encode([]),
                     'target_domain' => $info['domain']
                     'target_domain' => $info['domain']
                 ]);
                 ]);
+            }else{
+                if($task_redirect_info['status'] == DomainRedirectTask::STATUS_FAL){
+                    $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN,'error_msg'=>null],['id'=>$task_redirect_info['id']]);
+                }
             }
             }
         }
         }
 
 

@@ -25,7 +25,7 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $lists = $this->model->list($map,$order,$filed,'desc',20);
+        $lists = $this->model->list($map,$order,$filed,'desc',12);
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
                 if(empty($v['source_country'])){
                 if(empty($v['source_country'])){
@@ -55,7 +55,7 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getIpPvCount(){
     public function getIpPvCount(){
         $count = new Count();
         $count = new Count();
-        $startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0)));
+        $startTime = date("Y-m-d", strtotime("-11 months", mktime(0, 0, 0)));
         $ensTime = date('Y-m-d',time());
         $ensTime = date('Y-m-d',time());
         $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
         $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
         $groupedData = [];
         $groupedData = [];

@@ -42,6 +42,7 @@ class LinkDataLogic extends BaseLogic
             $data[] = [
             $data[] = [
                 'url'=>$v['url'],
                 'url'=>$v['url'],
                 'da_values'=>$v['da_values'],
                 'da_values'=>$v['da_values'],
+                'send_time'=>$v['send_time'] ?? date('Y-m-d H:i:s')
             ];
             ];
         }
         }
         if(!empty($data)){
         if(!empty($data)){