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

Lyh server



查看合并请求 !1682

@@ -1226,7 +1226,7 @@ public static function getCountryNameByAlpha3($alpha3) {
         if (array_key_exists($alpha3, $countries)) {
         if (array_key_exists($alpha3, $countries)) {
             return $countries[$alpha3];
             return $countries[$alpha3];
         } else {
         } else {
-            return false;
+            return 'no';
         }
         }
     }
     }
 
 

@@ -41,7 +41,7 @@ class GoogleSearchController extends BaseController
             if($this->param['type'] == 'country'){
             if($this->param['type'] == 'country'){
                 $country = [];
                 $country = [];
                 foreach ($data['list'] as $val){
                 foreach ($data['list'] as $val){
-                    $country[] = Country::getCountryNameByAlpha3($val['keys']);
+                    $country[] = Country::getCountryNameByAlpha3(strtoupper($val['keys']));
                 }
                 }
                 $zh_country = Translate::tran($country, 'zh');
                 $zh_country = Translate::tran($country, 'zh');
                 foreach ($data['list'] as $key => $val){
                 foreach ($data['list'] as $key => $val){

@@ -713,7 +713,7 @@ Route::middleware(['bloginauth'])->group(function () {
         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::prefix('gpt')->group(function () {
         Route::any('/sendMessage', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'sendMessage'])->name('gpt_sendMessage');
         Route::any('/sendMessage', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'sendMessage'])->name('gpt_sendMessage');
     });
     });
 });
 });