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

@@ -143,7 +143,6 @@ class Count extends Command
                 }
                 }
             }
             }
         }
         }
-
         //加上其他询盘
         //加上其他询盘
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $arr['inquiry_num'] += InquiryFormData::getCount();
         $arr['inquiry_num'] += InquiryFormData::getCount();
@@ -155,8 +154,6 @@ class Count extends Command
                 $countryArr[$v1['country']] = $v1['count'];
                 $countryArr[$v1['country']] = $v1['count'];
             }
             }
         }
         }
-
-
         arsort($countryArr);
         arsort($countryArr);
         $top20 = array_slice($countryArr, 0, 20, true);
         $top20 = array_slice($countryArr, 0, 20, true);
         $arr['country'] = json_encode($top20);
         $arr['country'] = json_encode($top20);

@@ -153,10 +153,9 @@ if (!function_exists('curl_get')) {
  * @time   :2024/6/5 10:38
  * @time   :2024/6/5 10:38
  */
  */
 function contains_russian($text) {
 function contains_russian($text) {
-    // 正则表达式匹配俄语字符
-    $pattern = '/[А-Яа-яЁё]/u';
-    // 使用 preg_match 检查字符串是否匹配正则表达式
-    return preg_match($pattern, $text);
+    // 使用正则表达式检查是否包含俄语字符
+    return preg_match('/[\x{0400}-\x{04FF}]/u', $text) > 0;
+
 }
 }
 
 
 if (!function_exists('curl_c')) {
 if (!function_exists('curl_c')) {

@@ -87,6 +87,7 @@ class MonthReportController extends BaseController
             ])->count();
             ])->count();
         $info['service_duration'] = $this->user['service_duration'];//服务天数
         $info['service_duration'] = $this->user['service_duration'];//服务天数
         $info['ip_total'] = (new Visit())->count();//ip总数
         $info['ip_total'] = (new Visit())->count();//ip总数
+
         $info['remain_day'] = $this->user['remain_day'];//剩余服务天数
         $info['remain_day'] = $this->user['remain_day'];//剩余服务天数
         $info['speed'] = round((0.3 + mt_rand()/mt_getrandmax() * (1-0.3)),2);
         $info['speed'] = round((0.3 + mt_rand()/mt_getrandmax() * (1-0.3)),2);
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);