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

gx



查看合并请求 !1680

@@ -37,15 +37,17 @@ class GoogleSearchController extends BaseController
         $searchDetailModel = new GoogleSearchDetail();
         $searchDetailModel = new GoogleSearchDetail();
         $this->map['project_id']= $this->user['project_id'];
         $this->map['project_id']= $this->user['project_id'];
         $data = $searchDetailModel->lists($this->map,$this->page,$this->row);
         $data = $searchDetailModel->lists($this->map,$this->page,$this->row);
-        if($this->param['type'] == 'country'){
-            $country = [];
-            foreach ($data as $val){
-                $country[] = Country::getCountryNameByAlpha3($val['keys']);
-            }
-            $zh_country = Translate::tran($country, 'zh');
-            foreach ($data as $key => $val){
-                $val['zh_country'] = $zh_country[$key];
-                $data[$key] = $val;
+        if(!empty($data)){
+            if($this->param['type'] == 'country'){
+                $country = [];
+                foreach ($data as $val){
+                    $country[] = Country::getCountryNameByAlpha3($val['keys']);
+                }
+                $zh_country = Translate::tran($country, 'zh');
+                foreach ($data as $key => $val){
+                    $val['zh_country'] = $zh_country[$key];
+                    $data[$key] = $val;
+                }
             }
             }
         }
         }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -712,6 +712,10 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/getEnterProduct', [\App\Http\Controllers\Bside\SeoSetting\EnterpriseProductController::class, 'getEnterProduct'])->name('enterprise_product_getEnterProduct');
         Route::any('/getEnterProduct', [\App\Http\Controllers\Bside\SeoSetting\EnterpriseProductController::class, 'getEnterProduct'])->name('enterprise_product_getEnterProduct');
         Route::any('/del', [\App\Http\Controllers\Bside\SeoSetting\EnterpriseProductController::class, 'del'])->name('enterprise_product_del');
         Route::any('/del', [\App\Http\Controllers\Bside\SeoSetting\EnterpriseProductController::class, 'del'])->name('enterprise_product_del');
     });
     });
+    //大模型会话
+    Route::prefix('grt')->group(function () {
+        Route::any('/sendMessage', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'sendMessage'])->name('gpt_sendMessage');
+    });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {