feat: 上线前安全加固与发布工程化；appmall 由插件迁移为独立应用
安全（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（市场 / 开发者中心 / 审核 / 分润）
This commit is contained in:
yangwx committed
1 parent
1d49e6f5ee
commit
18101cf11a
636 files changed
+58517
-9519
No files matched your search
@@ -0,0 +1,163 @@
|
||||
<?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\articles\service;
|
||||
|
||||
/**
|
||||
* 正文渲染服务（输出期增强，不改动入库内容）
|
||||
*
|
||||
* 三件事：
|
||||
* 1. 图片懒加载：给 <img> 加 loading="lazy" decoding="async"
|
||||
* 2. WebP：浏览器支持时把站内图片替换为 .webp 副本（见 ImageService）
|
||||
* 3. 内链：把命中的关键词（如本文标签）替换为站内链接，利于收录与导流
|
||||
*
|
||||
* 全部基于 DOM 操作，不会破坏原有 HTML 结构；DOM 不可用时原样返回。
|
||||
*/
|
||||
class ContentRenderService
|
||||
{
|
||||
/** 单篇文章最多生成的内链数 */
|
||||
const MAX_LINKS = 5;
|
||||
|
||||
/**
|
||||
* 渲染正文
|
||||
*
|
||||
* @param string $html 已净化的正文
|
||||
* @param array $linkKeywords [关键词 => 链接地址]
|
||||
* @param bool $useWebp 是否启用 WebP 替换
|
||||
*/
|
||||
public static function render(string $html, array $linkKeywords = [], bool $useWebp = false): string
|
||||
{
|
||||
$html = trim($html);
|
||||
if ($html === '' || !class_exists('DOMDocument')) {
|
||||
return $html;
|
||||
}
|
||||
|
||||
$prev = libxml_use_internal_errors(true);
|
||||
$doc = new \DOMDocument('1.0', 'UTF-8');
|
||||
$loaded = $doc->loadHTML('<?xml encoding="UTF-8">' . $html);
|
||||
libxml_clear_errors();
|
||||
libxml_use_internal_errors($prev);
|
||||
|
||||
if (!$loaded) {
|
||||
return $html;
|
||||
}
|
||||
|
||||
$body = $doc->getElementsByTagName('body')->item(0);
|
||||
if (!$body) {
|
||||
return $html;
|
||||
}
|
||||
|
||||
self::enhanceImages($doc, $useWebp);
|
||||
|
||||
if (!empty($linkKeywords)) {
|
||||
self::linkKeywords($doc, $linkKeywords);
|
||||
}
|
||||
|
||||
$out = '';
|
||||
foreach ($body->childNodes as $child) {
|
||||
$out .= $doc->saveHTML($child);
|
||||
}
|
||||
|
||||
return trim($out);
|
||||
}
|
||||
|
||||
/**
|
||||
* 图片增强：懒加载 + WebP
|
||||
*/
|
||||
private static function enhanceImages(\DOMDocument $doc, bool $useWebp): void
|
||||
{
|
||||
$images = [];
|
||||
foreach ($doc->getElementsByTagName('img') as $img) {
|
||||
$images[] = $img;
|
||||
}
|
||||
|
||||
foreach ($images as $img) {
|
||||
$img->setAttribute('loading', 'lazy');
|
||||
$img->setAttribute('decoding', 'async');
|
||||
|
||||
if (!$useWebp) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$src = (string) $img->getAttribute('src');
|
||||
$webp = ImageService::webpUrl($src);
|
||||
if ($webp !== '') {
|
||||
$img->setAttribute('src', $webp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 内链替换（跳过已在 <a> 内的文本，避免链接套链接）
|
||||
*/
|
||||
private static function linkKeywords(\DOMDocument $doc, array $keywords): void
|
||||
{
|
||||
$xpath = new \DOMXPath($doc);
|
||||
$nodes = $xpath->query('//text()[not(ancestor::a)]');
|
||||
if (!$nodes || $nodes->length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 先快照，避免替换过程中结构变化影响遍历
|
||||
$list = [];
|
||||
foreach ($nodes as $node) {
|
||||
$list[] = $node;
|
||||
}
|
||||
|
||||
$used = [];
|
||||
$count = 0;
|
||||
|
||||
foreach ($list as $node) {
|
||||
if ($count >= self::MAX_LINKS) {
|
||||
break;
|
||||
}
|
||||
|
||||
$text = (string) $node->nodeValue;
|
||||
if (mb_strlen(trim($text), 'UTF-8') < 2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($keywords as $kw => $url) {
|
||||
$kw = (string) $kw;
|
||||
if ($count >= self::MAX_LINKS || isset($used[$kw]) || mb_strlen($kw, 'UTF-8') < 2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$pos = mb_stripos($text, $kw, 0, 'UTF-8');
|
||||
if ($pos === false) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$before = mb_substr($text, 0, $pos, 'UTF-8');
|
||||
$after = mb_substr($text, $pos + mb_strlen($kw, 'UTF-8'), null, 'UTF-8');
|
||||
|
||||
$a = $doc->createElement('a', htmlspecialchars($kw, ENT_QUOTES, 'UTF-8'));
|
||||
$a->setAttribute('href', (string) $url);
|
||||
$a->setAttribute('class', 'article-inner-link');
|
||||
|
||||
$frag = $doc->createDocumentFragment();
|
||||
$frag->appendChild($doc->createTextNode($before));
|
||||
$frag->appendChild($a);
|
||||
$frag->appendChild($doc->createTextNode($after));
|
||||
|
||||
$parent = $node->parentNode;
|
||||
if (!$parent) {
|
||||
continue;
|
||||
}
|
||||
$parent->replaceChild($frag, $node);
|
||||
|
||||
$used[$kw] = true;
|
||||
$count++;
|
||||
|
||||
break; // 每个文本节点只处理一个关键词
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
<?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\articles\service;
|
||||
|
||||
use addon\articles\model\Article;
|
||||
use addon\articles\model\ArticleFavorite;
|
||||
|
||||
/**
|
||||
* 收藏服务
|
||||
*/
|
||||
class FavoriteService
|
||||
{
|
||||
/**
|
||||
* 收藏 / 取消收藏
|
||||
*
|
||||
* @return array ['favorited' => bool]
|
||||
*/
|
||||
public static function toggle(int $uid, int $articleId): array
|
||||
{
|
||||
if ($uid <= 0 || $articleId <= 0) {
|
||||
return ['favorited' => false];
|
||||
}
|
||||
|
||||
// 只能收藏已发布且未删除的文章
|
||||
$exists = Article::where('id', $articleId)->where('status', 1)->where('delete_at', 0)->count();
|
||||
if (!$exists) {
|
||||
return ['favorited' => false];
|
||||
}
|
||||
|
||||
$record = ArticleFavorite::where('uid', $uid)->where('aid', $articleId)->find();
|
||||
if ($record) {
|
||||
$record->delete();
|
||||
return ['favorited' => false];
|
||||
}
|
||||
|
||||
ArticleFavorite::create([
|
||||
'uid' => $uid,
|
||||
'aid' => $articleId,
|
||||
'create_at' => time(),
|
||||
]);
|
||||
|
||||
return ['favorited' => true];
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否已收藏
|
||||
*/
|
||||
public static function isFavorited(int $uid, int $articleId): bool
|
||||
{
|
||||
if ($uid <= 0 || $articleId <= 0) {
|
||||
return false;
|
||||
}
|
||||
return (bool) ArticleFavorite::where('uid', $uid)->where('aid', $articleId)->count();
|
||||
}
|
||||
|
||||
/**
|
||||
* 我的收藏文章ID（按收藏时间倒序）
|
||||
*/
|
||||
public static function articleIds(int $uid, int $limit = 0): array
|
||||
{
|
||||
if ($uid <= 0) {
|
||||
return [];
|
||||
}
|
||||
$query = ArticleFavorite::where('uid', $uid)->order('id', 'desc');
|
||||
if ($limit > 0) {
|
||||
$query->limit($limit);
|
||||
}
|
||||
return $query->column('aid');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
<?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\articles\service;
|
||||
|
||||
/**
|
||||
* 图片服务（WebP 副本生成）
|
||||
*
|
||||
* 策略：**不覆盖原图**，只在同目录生成 `原文件名.webp` 副本；
|
||||
* 浏览器 Accept 含 image/webp 时才使用副本，否则回落原图。
|
||||
* 依赖 GD（imagewebp）；不支持时自动回落，不影响页面。
|
||||
*/
|
||||
class ImageService
|
||||
{
|
||||
/** WebP 输出质量 */
|
||||
const QUALITY = 80;
|
||||
|
||||
/**
|
||||
* 取 WebP 版本地址（无副本且 GD 可用时现场生成）
|
||||
*
|
||||
* @param string $src 站内相对路径（如 /upload/2026/01/a.jpg）
|
||||
* @return string WebP 地址；不可用返回空串（调用方应回落到原图）
|
||||
*/
|
||||
public static function webpUrl(string $src): string
|
||||
{
|
||||
// 只处理站内相对路径，跳过站外 URL、data:、已是 webp 的图
|
||||
if ($src === '' || strpos($src, '/') !== 0) {
|
||||
return '';
|
||||
}
|
||||
if (preg_match('#^data:#i', $src) || preg_match('#\.webp($|\?)#i', $src)) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$root = rtrim((string) public_path(), DIRECTORY_SEPARATOR);
|
||||
$srcFile = $root . $src;
|
||||
$dst = $src . '.webp';
|
||||
$dstFile = $root . $dst;
|
||||
|
||||
// 副本已存在直接用
|
||||
if (is_file($dstFile)) {
|
||||
return $dst;
|
||||
}
|
||||
if (!is_file($srcFile) || !function_exists('imagewebp')) {
|
||||
return '';
|
||||
}
|
||||
|
||||
return self::convert($srcFile, $dstFile) ? $dst : '';
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换一张图为 WebP
|
||||
*/
|
||||
private static function convert(string $srcFile, string $dstFile): bool
|
||||
{
|
||||
$info = @getimagesize($srcFile);
|
||||
if (!is_array($info) || empty($info['mime'])) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$im = null;
|
||||
switch ($info['mime']) {
|
||||
case 'image/jpeg':
|
||||
$im = @imagecreatefromjpeg($srcFile);
|
||||
break;
|
||||
case 'image/png':
|
||||
$im = @imagecreatefrompng($srcFile);
|
||||
if ($im) {
|
||||
imagepalettetotruecolor($im);
|
||||
imagealphablending($im, true);
|
||||
imagesavealpha($im, true);
|
||||
}
|
||||
break;
|
||||
case 'image/gif':
|
||||
$im = @imagecreatefromgif($srcFile);
|
||||
break;
|
||||
case 'image/webp':
|
||||
$im = @imagecreatefromwebp($srcFile);
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$im) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$dir = dirname($dstFile);
|
||||
if (!is_dir($dir)) {
|
||||
@mkdir($dir, 0755, true);
|
||||
}
|
||||
|
||||
$ok = @imagewebp($im, $dstFile, self::QUALITY);
|
||||
imagedestroy($im);
|
||||
|
||||
return $ok && is_file($dstFile);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
<?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\articles\service;
|
||||
|
||||
use addon\articles\model\Article;
|
||||
use addon\articles\model\ArticleComment;
|
||||
use addon\articles\model\ArticleLike;
|
||||
use think\facade\Db;
|
||||
|
||||
/**
|
||||
* 点赞服务（文章 / 评论）
|
||||
*
|
||||
* 规则：
|
||||
* - 必须登录（游客不允许点赞，避免刷量）
|
||||
* - 同一用户对同一目标只能赞一次（唯一键保证），再次调用即取消
|
||||
* - 计数冗余在目标表的 like_count，取消时用 dec 并保证不为负
|
||||
*/
|
||||
class LikeService
|
||||
{
|
||||
/**
|
||||
* 文章点赞/取消
|
||||
*
|
||||
* @return array ['liked' => bool, 'count' => int]
|
||||
*/
|
||||
public static function toggleArticle(int $uid, int $articleId): array
|
||||
{
|
||||
if ($uid <= 0 || $articleId <= 0) {
|
||||
return ['liked' => false, 'count' => 0];
|
||||
}
|
||||
|
||||
// 文章必须存在且已发布
|
||||
$exists = Article::where('id', $articleId)->where('status', 1)->where('delete_at', 0)->count();
|
||||
if (!$exists) {
|
||||
return ['liked' => false, 'count' => 0];
|
||||
}
|
||||
|
||||
return self::toggle($uid, $articleId, ArticleLike::TYPE_ARTICLE, 'articles_article', $articleId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 评论点赞/取消
|
||||
*
|
||||
* @return array ['liked' => bool, 'count' => int]
|
||||
*/
|
||||
public static function toggleComment(int $uid, int $commentId): array
|
||||
{
|
||||
if ($uid <= 0 || $commentId <= 0) {
|
||||
return ['liked' => false, 'count' => 0];
|
||||
}
|
||||
|
||||
$exists = ArticleComment::where('id', $commentId)->where('delete_at', 0)->count();
|
||||
if (!$exists) {
|
||||
return ['liked' => false, 'count' => 0];
|
||||
}
|
||||
|
||||
return self::toggle($uid, $commentId, ArticleLike::TYPE_COMMENT, 'articles_comment', $commentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否已点赞
|
||||
*/
|
||||
public static function isLiked(int $uid, int $targetId, int $type): bool
|
||||
{
|
||||
if ($uid <= 0) {
|
||||
return false;
|
||||
}
|
||||
return (bool) ArticleLike::where('uid', $uid)
|
||||
->where('target_id', $targetId)
|
||||
->where('type', $type)
|
||||
->count();
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量判断文章是否已赞（列表/详情页用，避免 N+1）
|
||||
*
|
||||
* @param array $ids 文章ID数组
|
||||
* @return array 已赞的文章ID => true
|
||||
*/
|
||||
public static function likedArticleMap(int $uid, array $ids): array
|
||||
{
|
||||
if ($uid <= 0 || empty($ids)) {
|
||||
return [];
|
||||
}
|
||||
$rows = ArticleLike::where('uid', $uid)
|
||||
->where('type', ArticleLike::TYPE_ARTICLE)
|
||||
->whereIn('target_id', $ids)
|
||||
->column('target_id');
|
||||
|
||||
$map = [];
|
||||
foreach ($rows as $id) {
|
||||
$map[(int) $id] = true;
|
||||
}
|
||||
return $map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 通用切换逻辑
|
||||
*/
|
||||
private static function toggle(int $uid, int $targetId, int $type, string $countTable, int $targetKey): array
|
||||
{
|
||||
$record = ArticleLike::where('uid', $uid)
|
||||
->where('target_id', $targetId)
|
||||
->where('type', $type)
|
||||
->find();
|
||||
|
||||
if ($record) {
|
||||
// 已赞 → 取消
|
||||
$record->delete();
|
||||
Db::name($countTable)->where('id', $targetKey)
|
||||
->where('like_count', '>', 0)
|
||||
->dec('like_count')
|
||||
->update();
|
||||
|
||||
return ['liked' => false, 'count' => self::count($countTable, $targetKey)];
|
||||
}
|
||||
|
||||
ArticleLike::create([
|
||||
'uid' => $uid,
|
||||
'target_id' => $targetId,
|
||||
'type' => $type,
|
||||
'create_at' => time(),
|
||||
]);
|
||||
Db::name($countTable)->where('id', $targetKey)->inc('like_count')->update();
|
||||
|
||||
return ['liked' => true, 'count' => self::count($countTable, $targetKey)];
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取最新计数
|
||||
*/
|
||||
private static function count(string $table, int $id): int
|
||||
{
|
||||
return (int) Db::name($table)->where('id', $id)->value('like_count');
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user