From 60902457bb19d755c45e8a6d3c5857d87cd060a0 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 19 Jul 2021 15:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=A8=E5=9F=9F=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/common.php b/application/common.php
index fdf1b6c7..2d4eb4d0 100755
--- a/application/common.php
+++ b/application/common.php
@@ -3,6 +3,8 @@
 // 公共助手函数
 
 use Symfony\Component\VarExporter\VarExporter;
+use think\exception\HttpResponseException;
+use think\Response;
 
 if (!function_exists('__')) {
 
@@ -431,7 +433,7 @@ if (!function_exists('check_cors_request')) {
             if (in_array("*", $domainArr) || in_array($_SERVER['HTTP_ORIGIN'], $domainArr) || (isset($info['host']) && in_array($info['host'], $domainArr))) {
                 header("Access-Control-Allow-Origin: " . $_SERVER['HTTP_ORIGIN']);
             } else {
-                $response = Response::create('cors 检测无效', 'html', 403);
+                $response = Response::create('跨域检测无效', 'html', 403);
                 throw new HttpResponseException($response);
             }
 
@@ -445,7 +447,7 @@ if (!function_exists('check_cors_request')) {
                 if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
                     header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
                 }
-                $response = Response::create('', 'json');
+                $response = Response::create('', 'html');
                 throw new HttpResponseException($response);
             }
         }
@@ -474,7 +476,7 @@ if (!function_exists('check_ip_allowed')) {
         $forbiddenipArr = !$forbiddenipArr ? [] : $forbiddenipArr;
         $forbiddenipArr = is_array($forbiddenipArr) ? $forbiddenipArr : array_filter(explode("\n", str_replace("\r\n", "\n", $forbiddenipArr)));
         if ($forbiddenipArr && \Symfony\Component\HttpFoundation\IpUtils::checkIp($ip, $forbiddenipArr)) {
-            $response = Response::create('ip 无权访问', 'html', 403);
+            $response = Response::create('请求无权访问', 'html', 403);
             throw new HttpResponseException($response);
         }
     }