合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3102

@@ -251,7 +251,6 @@ class InquiryController extends BaseController
         $data = $data['list'] ?? [];
         $data = $data['list'] ?? [];
         foreach ($data as &$item){
         foreach ($data as &$item){
             //非正常登录的
             //非正常登录的
-
             if(($this->user['login_source']??0) != 2 && ($this->user['login_source']??0) != 3){
             if(($this->user['login_source']??0) != 2 && ($this->user['login_source']??0) != 3){
                 if(!empty($item['email']) && (strpos($item['email'], '@') !== false)){
                 if(!empty($item['email']) && (strpos($item['email'], '@') !== false)){
                     $item['email'] = email_desensitize($item['email']);
                     $item['email'] = email_desensitize($item['email']);
@@ -259,9 +258,7 @@ class InquiryController extends BaseController
                 //脱敏
                 //脱敏
                 !empty($item['phone']) && $item['phone'] = substr($item['phone'], 0, -4) . '****';
                 !empty($item['phone']) && $item['phone'] = substr($item['phone'], 0, -4) . '****';
             }
             }
-
             $item['ip_address'] = "{$item['country']}({$item['ip']})";
             $item['ip_address'] = "{$item['country']}({$item['ip']})";
-
             if(!empty($this->param['form_id'])){
             if(!empty($this->param['form_id'])){
                 $item = array_merge($item, $item['data']);
                 $item = array_merge($item, $item['data']);
             }
             }

@@ -8,6 +8,7 @@
 namespace App\Models\Geo;
 namespace App\Models\Geo;
 
 
 use App\Models\Base;
 use App\Models\Base;
+use App\Models\Project\Project;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
 
 
 /**
 /**
@@ -42,8 +43,23 @@ class GeoConfirm extends Base
     public static function typeMapping()
     public static function typeMapping()
     {
     {
         return [
         return [
-            self::TYPE_TITLE => '确认标题',
-            self::TYPE_KEYWORD => '确认关键词'
+            self::TYPE_TITLE => '核心关键词问题已整理，请查看并确认',
+            self::TYPE_KEYWORD => '文章标题已整理，请查看并确认'
+        ];
+    }
+
+    /**
+     * @remark :确认返回数据
+     * @name   :typeDesc
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/31 10:10
+     */
+    public static function typeDesc()
+    {
+        return [
+            self::TYPE_TITLE => '需选择确认10个文章标题，后续根据您确认的文章标题整理文章内容；如有补充展会、资质证书等资料，可一并提供。',
+            self::TYPE_KEYWORD => '需选择确认10个核心关键词问题，后续根据您确认的核心关键词问题整理文章标题；建议提供展会、资质证书等资料。'
         ];
         ];
     }
     }
 
 
@@ -98,9 +114,12 @@ class GeoConfirm extends Base
         $type = MessagePush::TYPE_GEO_CONFIRM;
         $type = MessagePush::TYPE_GEO_CONFIRM;
         $token = uniqid().$friend_id;
         $token = uniqid().$friend_id;
         $created_at = $updated_at = now();
         $created_at = $updated_at = now();
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);
+        $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择';
         $content_array = [
         $content_array = [
-            'title' => self::typeMapping()[$data->type],
-            'desc' => self::typeMapping()[$data->type],
+            'title' => "【{$projectInfo['company']} {$seo_plan}】".self::typeMapping()[$data->type],
+            'desc' => self::typeDesc()[$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\Project;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\Workchat\MessagePush;
 use App\Models\Workchat\MessagePush;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Crypt;
@@ -90,10 +91,13 @@ class GeoWritings extends Base
             'project_id' => $project_id,
             'project_id' => $project_id,
             'send_at' => time()
             'send_at' => time()
         ];
         ];
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$project_id],['company','seo_plan']);
+        $seo_plan = ($projectModel::seoMap()[$projectInfo['seo_plan']]) ?? '无选择';
         $token = Crypt::encrypt($param);
         $token = Crypt::encrypt($param);
         $content_array = [
         $content_array = [
-            'title' => "确认核心文章",
-            'desc' => '确认核心文章',
+            'title' => "【{$projectInfo['company']} {$seo_plan}】核心文章已整理，请查看并确认",
+            'desc' => '需选择确认10篇文章，后续根据您确认的文章进行外链发布。',
             'size' => 0,
             'size' => 0,
             'thumbSize' => 0,
             'thumbSize' => 0,
             'thumbUrl' => 'https://hub.globalso.com/logocm.png',
             'thumbUrl' => 'https://hub.globalso.com/logocm.png',