feat: 新增阿里云OSS适配器及分类图标优化
- 新增阿里云OSS SDK核心类库文件 - 新增OSS插件配置文件及钩子监听 - 新增分类图标SVG资源并优化为轻量化格式 - 替换定位接口为天地图逆地理编码接口 - 新增OSS图片缩略处理工具方法
这个提交包含在:
@@ -82,6 +82,16 @@ class Category extends Backend
|
||||
if (empty($r['image']) && !empty($r['icon_key'])) {
|
||||
$r['image'] = $this->resolveImageFromKey($r['icon_key']);
|
||||
}
|
||||
// 确保图片路径与域名完整性:
|
||||
// 本地静态资源 (/static/...) 保持本地绝对路径;附件系统 (/uploads/...) 走 OSS CDN 域名并挂 160px 缩略
|
||||
$rawImg = isset($r['image']) ? (string)$r['image'] : '';
|
||||
if ($rawImg !== '' && preg_match('/^\/uploads\//i', $rawImg)) {
|
||||
$r['image'] = cdnurl($rawImg, true);
|
||||
if ((strpos($r['image'], 'aliyuncs.com') !== false || strpos($r['image'], 'oss-') !== false) && strpos($r['image'], 'x-oss-process') === false) {
|
||||
$sep = strpos($r['image'], '?') !== false ? '&' : '?';
|
||||
$r['image'] .= $sep . 'x-oss-process=image/resize,m_fill,w_160,h_160/quality,q_85';
|
||||
}
|
||||
}
|
||||
if ($pid === 0) {
|
||||
$tops[] = $r;
|
||||
} else {
|
||||
@@ -218,6 +228,19 @@ class Category extends Backend
|
||||
if (empty($row['image']) && !empty($row['icon_key'])) {
|
||||
$row['image'] = $this->resolveImageFromKey($row['icon_key']);
|
||||
}
|
||||
$rawImage = isset($row['image']) ? (string)$row['image'] : '';
|
||||
$iconKey = isset($row['icon_key']) ? (string)$row['icon_key'] : '';
|
||||
$displayImage = $rawImage;
|
||||
if (preg_match('/^\/uploads\//i', $rawImage)) {
|
||||
$displayImage = cdnurl($rawImage, true);
|
||||
if ((strpos($displayImage, 'aliyuncs.com') !== false || strpos($displayImage, 'oss-') !== false) && strpos($displayImage, 'x-oss-process') === false) {
|
||||
$sep = strpos($displayImage, '?') !== false ? '&' : '?';
|
||||
$displayImage .= $sep . 'x-oss-process=image/resize,m_fill,w_160,h_160/quality,q_85';
|
||||
}
|
||||
} elseif ($rawImage === '' && $iconKey === '') {
|
||||
$displayImage = '/static/categories/cat-job.svg';
|
||||
}
|
||||
$row['display_image'] = $displayImage;
|
||||
$this->view->assign("row", $row);
|
||||
return $this->view->fetch();
|
||||
}
|
||||
@@ -278,16 +301,23 @@ class Category extends Backend
|
||||
{
|
||||
$iconKey = trim((string)$iconKey);
|
||||
if ($iconKey === '') {
|
||||
return '/static/icons/cat-service.png';
|
||||
return '/static/categories/cat-job.svg';
|
||||
}
|
||||
if (preg_match('/^(\/uploads\/|\/static\/|https?:\/\/)/i', $iconKey)) {
|
||||
return $iconKey;
|
||||
}
|
||||
// 优先匹配高质感矢量 SVG 图标
|
||||
if (is_file(ROOT_PATH . 'public/static/categories/' . $iconKey . '.svg')) {
|
||||
return '/static/categories/' . $iconKey . '.svg';
|
||||
}
|
||||
$file = strpos($iconKey, '.') !== false ? $iconKey : ($iconKey . '.png');
|
||||
if (is_file(ROOT_PATH . 'public/static/categories/' . $file)) {
|
||||
return '/static/categories/' . $file;
|
||||
}
|
||||
return '/static/icons/' . $file;
|
||||
if (is_file(ROOT_PATH . 'public/static/icons/' . $file)) {
|
||||
return '/static/icons/' . $file;
|
||||
}
|
||||
return '/static/categories/cat-job.svg';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
在新工单中引用
屏蔽一个用户