diff --git a/cores/middleware/AllowCrossDomain.php b/cores/middleware/AllowCrossDomain.php deleted file mode 100644 index 7590234..0000000 --- a/cores/middleware/AllowCrossDomain.php +++ /dev/null @@ -1,100 +0,0 @@ - -// +---------------------------------------------------------------------- -declare (strict_types=1); - -namespace cores\middleware; - -use Closure; -use think\Config; -use think\Request; -use think\Response; - -/** - * 跨域请求支持 - * Class AllowCrossDomain - * @package cores\middleware - */ -class AllowCrossDomain -{ - // cookie的所属域名 - protected $cookieDomain; - - /** - * 构造方法 - * AllowCrossDomain constructor. - * @param Config $config - */ - public function __construct(Config $config) - { - $this->cookieDomain = $config->get('cookie.domain', ''); - } - - /** - * 获取允许跨域的header参数 [自定义] - * @return array - */ - private function getCustomHeader(): array - { - return [ - 'Access-Token', - 'storeId', - 'platform', - ]; - } - - /** - * 获取允许跨域的header参数 - * @return array - */ - private function getHeader(): array - { - $headers = array_merge([ - 'Authorization', 'Content-Type', 'X-CSRF-TOKEN', 'X-Requested-With', - 'If-Match', 'If-Modified-Since', 'If-None-Match', 'If-Unmodified-Since' - ], $this->getCustomHeader()); - - return [ - // 允许所有域名访问 - 'Access-Control-Allow-Origin' => '*', - // 允许cookie跨域访问 - 'Access-Control-Allow-Credentials' => 'true', - // 预检请求的有效期 - 'Access-Control-Max-Age' => 1800, - // 允许跨域的方法 - 'Access-Control-Allow-Methods' => 'GET, POST, PATCH, PUT, DELETE, OPTIONS', - // 跨域请求header头 - 'Access-Control-Allow-Headers' => implode(',', $headers), - ]; - } - - /** - * 允许跨域请求 - * @access public - * @param Request $request - * @param Closure $next - * @param array|null $header - * @return Response - */ - public function handle(Request $request, Closure $next, ?array $header = []): Response - { - $header = !empty($header) ? array_merge($this->getHeader(), $header) : $this->getHeader(); - if (!isset($header['Access-Control-Allow-Origin'])) { - $origin = $request->header('origin'); - - if ($origin && ('' == $this->cookieDomain || strpos($origin, $this->cookieDomain))) { - $header['Access-Control-Allow-Origin'] = $origin; - } else { - $header['Access-Control-Allow-Origin'] = '*'; - } - } - return $next($request)->header($header); - } -} diff --git a/cores/middleware/AppLog.php b/cores/middleware/AppLog.php deleted file mode 100644 index 72077bb..0000000 --- a/cores/middleware/AppLog.php +++ /dev/null @@ -1,66 +0,0 @@ - -// +---------------------------------------------------------------------- -declare (strict_types=1); - -namespace cores\middleware; - -use think\Response; -use think\facade\Log as FacadeLog; -use app\common\library\Log; - -/** - * 中间件:应用日志 - */ -class AppLog -{ - // 访问日志 - private static string $beginLog = ''; - - /** - * 前置中间件 - * @param \think\Request $request - * @param \Closure $next - * @return mixed - */ - public function handle(\think\Request $request, \Closure $next) - { - // 记录访问日志 - if (env('begin_log')) { - $log = $this->getVisitor($request); - $log .= "\r\n" . '[ header ] ' . print_r($request->header(), true); - $log .= "" . '[ param ] ' . print_r($request->param(), true); - $log .= '--------------------------------------------------------------------------------------------'; - static::$beginLog = $log; - } - return $next($request); - } - - /** - * 记录访问日志 - * @param Response $response - */ - public function end(Response $response) - { - FacadeLog::record(static::$beginLog, 'begin'); - Log::end(); - } - - /** - * 获取请求路径信息 - * @param \think\Request $request - * @return string - */ - private function getVisitor(\think\Request $request): string - { - $data = [$request->ip(), $request->method(), $request->url(true)]; - return implode(' ', $data); - } -} \ No newline at end of file