Merge remote-tracking branch 'origin/master' into akun

@@ -112,12 +112,13 @@ class GeoController extends BaseController
         }
         }
         $content = explode("\n", $data->content);
         $content = explode("\n", $data->content);
         $confirm = explode("\n", $data->confirm);
         $confirm = explode("\n", $data->confirm);
+        $max_num = $data->max_num;
         $type = $data->type;
         $type = $data->type;
         $status = $data->status;
         $status = $data->status;
         $projectModel = new Project();
         $projectModel = new Project();
         $projectInfo = $projectModel->read(['id' => $data->project_id],['title','version']);
         $projectInfo = $projectModel->read(['id' => $data->project_id],['title','version']);
         $project_title = $projectInfo['title'] ?? '';
         $project_title = $projectInfo['title'] ?? '';
-        $result = compact('content', 'confirm', 'type', 'status', 'project_title');
+        $result = compact('content', 'confirm', 'type', 'status', 'project_title','max_num');
         $this->response('success',Code::SUCCESS,$result);
         $this->response('success',Code::SUCCESS,$result);
     }
     }
 
 

@@ -273,6 +273,9 @@ class InquiryController extends BaseController
                 if (Str::startsWith($item[$field], '=')) {
                 if (Str::startsWith($item[$field], '=')) {
                     $item[$field] = "'" . $item[$field];
                     $item[$field] = "'" . $item[$field];
                 }
                 }
+                if(is_numeric($item[$field])){
+                    $item[$field] = $item[$field] ."\t";
+                }
             }
             }
         }
         }
 
 

@@ -71,9 +71,6 @@ class GeoConfirmLogic extends BaseLogic
         if($data === false){
         if($data === false){
             return $this->success();
             return $this->success();
         }
         }
-        if(empty($data['confirm'])){
-            $data['confirm']  = $data['content'];
-        }
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 

@@ -12,6 +12,7 @@ use App\Models\Project\Project;
 use App\Models\Scoring\ScoringSystem;
 use App\Models\Scoring\ScoringSystem;
 use App\Models\Sms\SmsLog;
 use App\Models\Sms\SmsLog;
 use App\Models\User\User;
 use App\Models\User\User;
+use App\Models\WorkOrder\TicketProject;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 
 
 class UserLoginLogic
 class UserLoginLogic
@@ -257,6 +258,9 @@ class UserLoginLogic
      * @time   :2024/11/5 16:51
      * @time   :2024/11/5 16:51
      */
      */
     public function handleInfo($info,$project){
     public function handleInfo($info,$project){
+        //根据项目获取工单uuid
+        $ticketProjectModel = new TicketProject();
+        $info['ticket_uuid'] = $ticketProjectModel->getValue(['project_cate'=>2,'table_id'=>$project['id']],'uuid') ?? '';
         $info['title'] = $project['title'] ?? '';
         $info['title'] = $project['title'] ?? '';
         $info['company'] = $project['company'] ?? '';
         $info['company'] = $project['company'] ?? '';
         $info['from_order_id'] = $project['from_order_id'] ?? '';
         $info['from_order_id'] = $project['from_order_id'] ?? '';

@@ -45,9 +45,9 @@ class SyncImageFileJob implements ShouldQueue
 
 
     public function synchronizationFile($path_name){
     public function synchronizationFile($path_name){
         //同步到大文件
         //同步到大文件
-        $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
-        $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
-        $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php';
+//        $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
+//        $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
+        $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
         echo date('Y-m-d H:i:s') . ' | ' . $cmd . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' | ' . $cmd . PHP_EOL;
         return shell_exec($cmd);
         return shell_exec($cmd);
     }
     }

@@ -8,6 +8,7 @@
 namespace App\Models\Geo;
 namespace App\Models\Geo;
 
 
 use App\Models\Base;
 use App\Models\Base;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
 
 
@@ -55,11 +56,11 @@ class GeoConfirm extends Base
      * @method :post
      * @method :post
      * @time   :2025/10/31 10:10
      * @time   :2025/10/31 10:10
      */
      */
-    public static function typeDesc()
+    public static function typeDesc($num = 10)
     {
     {
         return [
         return [
-            self::TYPE_TITLE => '需选择确认10个文章标题，后续根据您确认的文章标题整理文章内容；如有补充展会、资质证书等资料，可一并提供。',
-            self::TYPE_KEYWORD => '需选择确认10个核心关键词问题，后续根据您确认的核心关键词问题整理文章标题；建议提供展会、资质证书等资料。'
+            self::TYPE_TITLE => '需选择确认'.$num.'个文章标题，后续根据您确认的文章标题整理文章内容；如有补充展会、资质证书等资料，可一并提供。',
+            self::TYPE_KEYWORD => '需选择确认'.$num.'个核心关键词问题，后续根据您确认的核心关键词问题整理文章标题；建议提供展会、资质证书等资料。'
         ];
         ];
     }
     }
 
 
@@ -115,11 +116,11 @@ class GeoConfirm extends Base
         $token = uniqid().$friend_id;
         $token = uniqid().$friend_id;
         $created_at = $updated_at = now();
         $created_at = $updated_at = now();
         $projectModel = new Project();
         $projectModel = new Project();
-        $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);
-        $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择';
+        $company = $projectModel->getValue(['id'=>$project_id],'company');
+        $seo_plan_name =  'GEO';
         $content_array = [
         $content_array = [
-            'title' => "【{$projectInfo['company']} {$seo_plan}】".self::typeMapping()[$data->type],
-            'desc' => self::typeDesc()[$data->type],
+            'title' => "【{$company} {$seo_plan_name}】".self::typeMapping()[$data->type],
+            'desc' => self::typeDesc($data->max_num)[$data->type],
             'size' => 0,
             'size' => 0,
             'thumbSize' => 0,
             'thumbSize' => 0,
             'thumbUrl' => 'https://hub.globalso.com/logocm.png',
             'thumbUrl' => 'https://hub.globalso.com/logocm.png',

@@ -8,6 +8,7 @@
 namespace App\Models\Geo;
 namespace App\Models\Geo;
 
 
 use App\Models\Base;
 use App\Models\Base;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
@@ -92,12 +93,12 @@ class GeoWritings extends Base
             'send_at' => time()
             'send_at' => time()
         ];
         ];
         $projectModel = new Project();
         $projectModel = new Project();
-        $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);
-        $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择';
+        $company = $projectModel->getValue(['id'=>$project_id],'company');
+        $seo_plan_name =  'GEO';
         $token = Crypt::encrypt($param);
         $token = Crypt::encrypt($param);
         $content_array = [
         $content_array = [
-            'title' => "【{$projectInfo['company']} {$seo_plan}】核心文章已整理，请查看并确认",
-            'desc' => '需选择确认10篇文章，后续根据您确认的文章进行外链发布。',
+            'title' => "【{$company} {$seo_plan_name}】核心文章已整理，请查看并确认",
+            'desc' => '需选择确认文章，后续根据您确认的文章进行外链发布。',
             'size' => 0,
             'size' => 0,
             'thumbSize' => 0,
             'thumbSize' => 0,
             'thumbUrl' => 'https://hub.globalso.com/logocm.png',
             'thumbUrl' => 'https://hub.globalso.com/logocm.png',

@@ -528,6 +528,20 @@ class SyncSubmitTaskService
             throw new InquiryFilterException( '被刷数据');
             throw new InquiryFilterException( '被刷数据');
         }
         }
 
 
+        //4572 汉得利 ip 荷兰|俄罗斯 访问页面是首页 关杰
+        if($project_id == 4572 && in_array($data['country']??'', ['荷兰', '俄罗斯']))
+        {
+            $path = parse_url($data['data']['globalso-domain_host_url"'], PHP_URL_PATH);
+            if(!$path || $path == '/'){
+                throw new InquiryFilterException( '被刷数据');
+            }
+        }
+        //1968 河南影刻软件 荷兰和俄罗斯来的都屏蔽掉
+        if($project_id == 1968 && in_array($data['country']??'', ['荷兰', '俄罗斯']))
+        {
+            throw new InquiryFilterException( '被刷数据');
+        }
+
         //数据都是空的
         //数据都是空的
         $is_all_empty = true;
         $is_all_empty = true;
         foreach ($data['data'] as $item){
         foreach ($data['data'] as $item){