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

@@ -345,16 +345,25 @@ class UpdateSeoTdk extends Command
     }
     }
 
 
     /**
     /**
-     * @remark :获取公司名称
+     * @remark :获取公司英文名称
      * @name   :companyName
      * @name   :companyName
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/10/30 11:22
      * @time   :2023/10/30 11:22
      */
      */
-    public function companyName($project_id){
+    public function companyName($key,$project_id){
+        $data = [
+            'news_remark',
+            'blog_remark',
+            'product_long_description'
+        ];
         $projectOptimizeModel = new DeployOptimize();
         $projectOptimizeModel = new DeployOptimize();
-        $info = $projectOptimizeModel->read(['project_id'=>$project_id],['id','company_en_name']);
-        return $info['company_en_name'];
+        $info = $projectOptimizeModel->read(['project_id'=>$project_id],['id','company_en_name','company_en_description']);
+        if(in_array($key,$data)){
+            return $info['company_en_description'];
+        }else{
+            return $info['company_en_name'];
+        }
     }
     }
 
 
     /**
     /**

@@ -48,10 +48,19 @@ class AiCommandController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/10/30 11:22
      * @time   :2023/10/30 11:22
      */
      */
-    public function companyName($project_id){
+    public function companyName($key,$project_id){
+        $data = [
+            'news_remark',
+            'blog_remark',
+            'product_long_description'
+        ];
         $projectOptimizeModel = new DeployOptimize();
         $projectOptimizeModel = new DeployOptimize();
-        $info = $projectOptimizeModel->read(['project_id'=>$project_id],['id','company_en_name']);
-        return $info['company_en_name'];
+        $info = $projectOptimizeModel->read(['project_id'=>$project_id],['id','company_en_name','company_en_description']);
+        if(in_array($key,$data)){
+            return $info['company_en_description'];
+        }else{
+            return $info['company_en_name'];
+        }
     }
     }
 
 
     /**
     /**