安全(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(市场 / 开发者中心 / 审核 / 分润)
96 lines
3.4 KiB
PHP
96 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>
|
||
// +----------------------------------------------------------------------
|
||
|
||
declare(strict_types=1);
|
||
|
||
namespace addon\iot\controller\api;
|
||
|
||
use think\facade\Db;
|
||
use addon\iot\service\DeviceService;
|
||
use addon\iot\service\ShareService;
|
||
use addon\iot\service\OtaService;
|
||
|
||
/**
|
||
* App 端 OTA 域 API(需框架会员 JWT 登录)
|
||
* 路由前缀:/iot/api/ota/...(OTA 域;旧 /iot/api/client/* 兼容别名迁移期保留)
|
||
*
|
||
* 覆盖:固件查询与升级指令下发。
|
||
*/
|
||
class Ota extends ClientBase
|
||
{
|
||
/**
|
||
* 我的设备可用的固件
|
||
* GET /iot/api/ota/otaList?uuid=xxx(不传 uuid 返回全部设备)
|
||
* 返回:{ device, ota|null },App 端比对影子里的 version 判断是否有新版本
|
||
*/
|
||
public function otaList()
|
||
{
|
||
$uid = $this->memberId();
|
||
if ($uid <= 0) {
|
||
return $this->result->apiError('未登录');
|
||
}
|
||
$uuid = trim((string) $this->request->get('uuid', ''));
|
||
// OTA 列表只用设备行(model 等),不需要位置配置:false 省掉 2 条 SQL 与响应体积
|
||
$devices = DeviceService::visibleDevices($uid, false);
|
||
if ($uuid !== '') {
|
||
$devices = array_values(array_filter($devices, fn($d) => $d['uuid'] === $uuid));
|
||
}
|
||
$cache = [];
|
||
$list = [];
|
||
foreach ($devices as $d) {
|
||
$model = (string) $d['model'];
|
||
if ($model === '') {
|
||
$list[] = ['device' => $d, 'ota' => null];
|
||
continue;
|
||
}
|
||
if (!isset($cache[$model])) {
|
||
$cache[$model] = Db::name('iot_ota')
|
||
->where('model', $model)->where('status', 1)
|
||
->order('id', 'desc')->find();
|
||
}
|
||
$list[] = ['device' => $d, 'ota' => $cache[$model] ?: null];
|
||
}
|
||
return $this->result->apiSuccess(['list' => $list, 'total' => count($list)]);
|
||
}
|
||
|
||
/**
|
||
* 我的设备 OTA 升级
|
||
* POST /iot/api/ota/publishOta
|
||
* param: ota_id, uuid
|
||
*/
|
||
public function publishOta()
|
||
{
|
||
$uid = $this->memberId();
|
||
if ($uid <= 0) {
|
||
return $this->result->apiError('未登录');
|
||
}
|
||
$otaId = (int) $this->request->post('ota_id', 0);
|
||
$uuid = trim((string) $this->request->post('uuid', ''));
|
||
if (!$otaId) {
|
||
return $this->result->apiError('固件不能为空');
|
||
}
|
||
if ($uuid === '') {
|
||
return $this->result->apiError('设备uuid不能为空');
|
||
}
|
||
$dev = DeviceService::findByUuid($uuid);
|
||
if (!$dev) {
|
||
return $this->result->apiError('设备不存在');
|
||
}
|
||
if (!ShareService::canAccess($uuid, $uid, ShareService::PERM_CTRL)) {
|
||
return $this->result->apiError('无权控制该设备');
|
||
}
|
||
try {
|
||
$n = OtaService::publish($otaId, [$uuid]);
|
||
} catch (\Throwable $e) {
|
||
return $this->result->apiError($e->getMessage());
|
||
}
|
||
return $this->result->apiSuccess(['affected' => $n, 'uuid' => $uuid]);
|
||
}
|
||
}
|