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

Lyh server



查看合并请求 !2424

@@ -21,6 +21,7 @@ use App\Models\Project\ProjectWhiteHatAffix;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Models\Template\TemplateTypeMain;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
+use App\Services\Geo\GeoService;
 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;
@@ -53,22 +54,25 @@ class lyhDemo extends Command
      * @time   :2025/7/22 15:14
      * @time   :2025/7/22 15:14
      */
      */
     public function _actionRoute(){
     public function _actionRoute(){
-        $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
-        $data = [];
-        foreach ($lists as $item){
-            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
-            ProjectServer::useProject($item['id']);
-            $aiBlogModel = new AiBlog();
-            $info = $aiBlogModel->read(['route'=>null],['id']);
-            if($info !== false){
-                echo '项目id:'.$item['id'].PHP_EOL;
-                $data[] = $item['id'];
-            }
-            dd($data);
-            echo 'end';
-            DB::disconnect('custom_mysql');
-        }
+        $geo_service = new GeoService();
+        $data = $geo_service->getDeepSeekResult("创贸总共多少人？",'gpt-4o-mini');
+        dd($data);
+//        $projectModel = new Project();
+//        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
+//        $data = [];
+//        foreach ($lists as $item){
+//            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
+//            ProjectServer::useProject($item['id']);
+//            $aiBlogModel = new AiBlog();
+//            $info = $aiBlogModel->read(['route'=>null],['id']);
+//            if($info !== false){
+//                echo '项目id:'.$item['id'].PHP_EOL;
+//                $data[] = $item['id'];
+//            }
+//            dd($data);
+//            echo 'end';
+//            DB::disconnect('custom_mysql');
+//        }
     }
     }
 
 
     public function _actionTemplateMain(){
     public function _actionTemplateMain(){

@@ -78,6 +78,17 @@ class GeoService
      */
      */
     public function getDeepSeekResult($content,$model = 'deepseek-r1'){
     public function getDeepSeekResult($content,$model = 'deepseek-r1'){
         $url = $this->api_url . 'v1/chat';
         $url = $this->api_url . 'v1/chat';
+        switch ($model){
+            case 'deepseek-r1':
+                $supplier = 'bailian';
+                break;
+            case 'gpt-4o-mini':
+                $supplier = 'azure';
+                break;
+            default:
+                $supplier = '';
+                break;
+        }
         $header = [
         $header = [
             'accept: application/json',
             'accept: application/json',
             'X-CmerApi-Host: llm-chat.p.cmer.com',
             'X-CmerApi-Host: llm-chat.p.cmer.com',
@@ -92,7 +103,7 @@ class GeoService
                 ],
                 ],
             ],
             ],
             'model' => $model,
             'model' => $model,
-            "supplier"=> "bailian",
+            "supplier"=> $supplier,
             'security_check' => true
             'security_check' => true
         ];
         ];
         $data = http_post($url,json_encode($message,true),$header);
         $data = http_post($url,json_encode($message,true),$header);