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

@@ -23,6 +23,9 @@ define('HTTP_OPENAI_URL', 'http://openai.waimaoq.com/');
 if (!function_exists('generateRoute')) {
 if (!function_exists('generateRoute')) {
     function generateRoute($string)
     function generateRoute($string)
     {
     {
+        if(is_array($string)){
+            $string = $string[0];
+        }
         return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
         return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
     }
     }
 }
 }

@@ -152,7 +152,10 @@ class LoginController extends BaseController
         ],[
         ],[
             'str.required' => '翻译字符串不能为空',
             'str.required' => '翻译字符串不能为空',
         ]);
         ]);
-        $str = Translate::tran($this->param['str'], 'en');
+        $str = Translate::tran($this->param['str'], 'en') ?? '';
+        if(is_array($str)){
+            $str = $str[0];
+        }
         $this->response('success',Code::SUCCESS,strtolower($str));
         $this->response('success',Code::SUCCESS,strtolower($str));
     }
     }