安全(P0) - 发布包签名:新增 scripts/package_keygen.php、scripts/package_verify.php、 ywxapp\service\PackageVerifier;FrameworkService::apply() 解压前强制验签 (ywxapp.framework_package_verify,默认开启) - JWT 收紧:config/jwt.php 移除公开默认密钥,JwtService::assertStrongSecret() 校验非空 / 长度≥32 / 已知弱值;.env.production.example 键名由 JWT_SECRET_KEY 修正为 JWT_SECRET - /api/v1/Article:免登录白名单收窄为只读接口,写操作字段白名单 + assertOwner() 越权校验 - 开发者令牌:查找接口不再回显明文、统一失败文案 + 限流 - TemplateInstaller:文件名白名单 + realpath 归一化 + 目录内断言,修复 Zip Slip;补 use ZipArchive - 后台登录:接入验证码、失败锁定与登录限流(config/ratelimit.php) - 缓存 / Session 驱动可由 .env 覆盖(CACHE_DRIVER / SESSION_TYPE),集群部署改 redis - paycenter 支付日志开关改为 PAY_LOG,不再跟随 APP_DEBUG 工程化 / 交付 - 新增 CHANGELOG.md 与 .env.production.example;composer.lock 入库锁定依赖版本 - 插件离线安装 CLI 增加 --uid,后台上传安装透传 uid,付费插件授权校验可通过 - 授权拒绝文案区分「未携带 uid」与「未找到有效授权」,便于排障 - .gitignore 放行 .env.production.example / .env.addon.example / .gitattributes / public/.htaccess 结构 - appmall 由 addon/appmall 迁移为独立应用 app/appmall(市场 / 开发者中心 / 审核 / 分润)
112 lines
3.4 KiB
PHP
112 lines
3.4 KiB
PHP
<?php
|
|
// +----------------------------------------------------------------------
|
|
// | YwxApp [ WE CAN DO IT JUST THINK ]
|
|
// +----------------------------------------------------------------------
|
|
// | Copyright (c) 2026-2036 http://ywxapp.cn All rights reserved.
|
|
// +----------------------------------------------------------------------
|
|
// | Author: ywxapp<admin@ywxapp.cn>
|
|
// +----------------------------------------------------------------------
|
|
|
|
namespace ywxapp\handler;
|
|
|
|
use Throwable;
|
|
use think\Response;
|
|
use think\exception\Handle;
|
|
use think\exception\HttpException;
|
|
use think\exception\ValidateException;
|
|
use think\exception\HttpResponseException;
|
|
use think\db\exception\DataNotFoundException;
|
|
use think\db\exception\ModelNotFoundException;
|
|
|
|
/**
|
|
* 应用异常处理类.
|
|
*/
|
|
class ExceptionHandle extends Handle
|
|
{
|
|
/**
|
|
* 不需要记录信息(日志)的异常类列表.
|
|
*
|
|
* @var array
|
|
*/
|
|
protected $ignoreReport = [
|
|
HttpException::class,
|
|
HttpResponseException::class,
|
|
ModelNotFoundException::class,
|
|
DataNotFoundException::class,
|
|
ValidateException::class,
|
|
];
|
|
|
|
/**
|
|
* 记录异常信息(包括日志或者其它方式记录).
|
|
*
|
|
* @param Throwable $exception
|
|
*
|
|
* @return void
|
|
*/
|
|
public function report(Throwable $exception): void
|
|
{
|
|
event('app_exception_report', ['exception'=>$exception,'ignoreReport'=>$this->ignoreReport]);
|
|
// 使用内置的方式记录异常日志
|
|
parent::report($exception);
|
|
}
|
|
|
|
/**
|
|
* Render an exception into an HTTP response.
|
|
*
|
|
* @param \think\Request $request
|
|
* @param Throwable $e
|
|
*
|
|
* @return Response
|
|
*/
|
|
public function render($request, Throwable $e): Response
|
|
{
|
|
event('app_exception', $e);
|
|
|
|
// 显式响应异常($this->result->error() 等主动抛出)原样返回
|
|
if ($e instanceof HttpResponseException) {
|
|
return $e->getResponse();
|
|
}
|
|
|
|
// API / Ajax 请求:统一 JSON 输出;生产环境隐藏内部异常细节
|
|
if ($this->shouldReturnJson($request)) {
|
|
$httpCode = ($e instanceof HttpException && $e->getStatusCode()) ? $e->getStatusCode() : 500;
|
|
$isDebug = $this->app->isDebug();
|
|
|
|
$payload = [
|
|
'code' => $httpCode,
|
|
'message' => $isDebug ? $e->getMessage() : '系统繁忙,请稍后重试',
|
|
'timestamp' => time(),
|
|
];
|
|
if ($isDebug) {
|
|
$payload['debug'] = [
|
|
'exception' => get_class($e),
|
|
'file' => $e->getFile() . ':' . $e->getLine(),
|
|
'trace' => explode("\n", $e->getTraceAsString()),
|
|
];
|
|
}
|
|
|
|
return Response::create($payload, 'json', $httpCode);
|
|
}
|
|
|
|
// 其他错误(页面请求)交给系统处理
|
|
return parent::render($request, $e);
|
|
}
|
|
|
|
/**
|
|
* 是否应以 JSON 输出异常:api 应用、Ajax 请求,
|
|
* 或应用未解析时按 pathinfo 前缀兜底。
|
|
*/
|
|
protected function shouldReturnJson($request): bool
|
|
{
|
|
if ($request->isAjax()) {
|
|
return true;
|
|
}
|
|
if ($this->app->http->getName() === 'api') {
|
|
return true;
|
|
}
|
|
$path = strtolower($request->pathinfo());
|
|
|
|
return str_starts_with($path, 'api/') || $path === 'api';
|
|
}
|
|
}
|