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

Lyh server



查看合并请求 !2480

@@ -12,7 +12,6 @@ namespace App\Console\Commands\Ai;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
-use App\Models\WebSetting\WebSetting;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;

@@ -9,6 +9,7 @@
 
 
 namespace App\Console\Commands\LyhTest;
 namespace App\Console\Commands\LyhTest;
 
 
+use App\Helper\OaGlobalsoApi;
 use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiBlog;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
@@ -44,25 +45,9 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'id'=>3659,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
-        foreach ($lists as $val){
-            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $val['id'] . PHP_EOL;
-            ProjectServer::useProject($val['id']);
-            $settingModel = new WebSetting();
-            $info = $settingModel->read(['project_id'=>$val['id']]);
-            if($info === false){
-                echo '跳过当前数据'.PHP_EOL;
-                continue;
-            }
-            if(empty($info['anchor_setting'])){
-                $settingModel->edit(['anchor_setting'=>["5","3","4"]],['project_id'=>$val['id']]);
-            }else{
-                echo '已有数据'.PHP_EOL;
-            }
-            DB::disconnect('custom_mysql');
-            echo date('Y-m-d H:i:s') . '结束--项目的id:'. $val['id'] . PHP_EOL;
-        }
+        $api = new OaGlobalsoApi();
+        $data = $api->order_info('12551');
+        dd($data);
     }
     }
 
 
     /**
     /**

@@ -202,7 +202,8 @@ class SyncProject extends Command
      * @param  :version:7->v7版本（升级项目默认为v7）
      * @param  :version:7->v7版本（升级项目默认为v7）
      */
      */
     public function sync($param,$is_update = 0){
     public function sync($param,$is_update = 0){
-        $version = (($is_update == 1) ? Project::VERSION_SEVEN : ($param['version'] ?? Project::VERSION_ZERO));
+        //TODO::4月12日 之前的项目都是v6
+        $version = (($is_update == 1) ? Project::VERSION_SIX : (empty($param['version']) ? Project::VERSION_SEVEN : $param['version']));
         $title = date('Ymd') . '-' . $param['company_name'];
         $title = date('Ymd') . '-' . $param['company_name'];
         $data = [
         $data = [
             'project'=>[
             'project'=>[

@@ -63,11 +63,12 @@ class AiVideoLogic extends BaseLogic
      * @detail :status=1/待执行
      * @detail :status=1/待执行
      */
      */
     public function sendTask(){
     public function sendTask(){
+        $aiVideoTaskModel = new AiVideoTask();
         $aiVideoService = new AiVideoService($this->user['project_id']);
         $aiVideoService = new AiVideoService($this->user['project_id']);
-        $result = $aiVideoService->createTask($this->param['title'],$this->param['description'],$this->param['images'],$this->param['anchor'] ?? []);
+        $storage = $aiVideoTaskModel->videoSetting()[$this->user['video_setting'] ?? 1];
+        $result = $aiVideoService->createTask($this->param['title'],$this->param['description'],$this->param['images'],$this->param['anchor'] ?? [],$storage);
         if($result['status'] == 200){
         if($result['status'] == 200){
-            $aiVideoTaskModel = new AiVideoTask();
-            $aiVideoTaskModel->addReturnId(['task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id']]);
+            $aiVideoTaskModel->addReturnId(['task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],'storage'=>$storage]);
             $id = $this->model->addReturnId(['title'=>$this->param['title'],'task_id'=>$result['data']['task_id'],'description'=>$this->param['description'],'project_id'=>$this->user['project_id'],'images'=>json_encode($this->param['images'],true),'anchor'=>json_encode($this->param['anchor'] ?? [],true)]);
             $id = $this->model->addReturnId(['title'=>$this->param['title'],'task_id'=>$result['data']['task_id'],'description'=>$this->param['description'],'project_id'=>$this->user['project_id'],'images'=>json_encode($this->param['images'],true),'anchor'=>json_encode($this->param['anchor'] ?? [],true)]);
             return $this->success(['id'=>$id]);
             return $this->success(['id'=>$id]);
         }
         }

@@ -277,6 +277,7 @@ class UserLoginLogic
         $info['main_lang_id'] = $project['main_lang_id'];
         $info['main_lang_id'] = $project['main_lang_id'];
         $info['is_ai_blog'] = $project['is_ai_blog'] ?? 0;
         $info['is_ai_blog'] = $project['is_ai_blog'] ?? 0;
         $info['is_ai_video'] = $project['is_ai_video'] ?? 0;
         $info['is_ai_video'] = $project['is_ai_video'] ?? 0;
+        $info['video_setting'] = $project['deploy_optimize']['video_setting'] ?? 1;
         $info['image_max'] = $project['image_max'];
         $info['image_max'] = $project['image_max'];
         $info['is_del_inquiry'] = $project['is_del_inquiry'] ?? 0;
         $info['is_del_inquiry'] = $project['is_del_inquiry'] ?? 0;
         $info['uptime_type'] = $this->getHistory($project);
         $info['uptime_type'] = $this->getHistory($project);

@@ -20,4 +20,18 @@ class AiVideoTask extends Base
      */
      */
     const STATUS_RUNNING = 1;
     const STATUS_RUNNING = 1;
     const STATUS_FINISH = 2;
     const STATUS_FINISH = 2;
+
+    /**
+     * @remark :视频设置
+     * @name   :videoSetting
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/1 17:17
+     */
+    public function videoSetting(){
+        return [
+            1 => 'CDN',
+            2 => 'YOUTUBE'
+        ];
+    }
 }
 }

@@ -55,9 +55,9 @@ class AiVideoService
      * @method :post
      * @method :post
      * @time   :2025/4/29 17:59
      * @time   :2025/4/29 17:59
      */
      */
-    public function createTask($title,$description,$images = [],$anchor = []){
+    public function createTask($title,$description,$images = [],$anchor = [],$storage = 'CDN'){
         $request_url = $this->url.'api/video/create';
         $request_url = $this->url.'api/video/create';
-        $param = ['title'=>$title, 'description'=>$description, 'images'=>$images,'anchor'=>$anchor];
+        $param = ['title'=>$title, 'description'=>$description, 'images'=>$images,'anchor'=>$anchor,'storage'=>$storage];
         $param['mch_id'] = $this->mch_id;
         $param['mch_id'] = $this->mch_id;
         $this->sign = $this->generateSign($param,$this->key);
         $this->sign = $this->generateSign($param,$this->key);
         $param['sign'] = $this->sign;
         $param['sign'] = $this->sign;