github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-16 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2025-05-09 10:22:40 +08:00
parent 9ac3fd3615
commit efab4fb41b
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/Module/Apps/Apps.php
View File

@ -258,12 +258,12 @@ class Apps
if (file_exists($baseDir . '/config.yml')) { if (file_exists($baseDir . '/config.yml')) {
$configData = Yaml::parseFile($baseDir . '/config.yml'); $configData = Yaml::parseFile($baseDir . '/config.yml');
// 处理基础字段 // 处理名称
if (isset($configData['name'])) { if (isset($configData['name'])) {
$info['name'] = $configData['name']; $info['name'] = self::getMultiLanguageField($configData['name']) ?: $appName;
} }
// 处理描述（支持多语言） // 处理描述
if (isset($configData['description'])) { if (isset($configData['description'])) {
$info['description'] = self::getMultiLanguageField($configData['description']); $info['description'] = self::getMultiLanguageField($configData['description']);
} }
@ -287,20 +287,10 @@ class Apps
'name' => $field['name'], 'name' => $field['name'],
'type' => $field['type'] ?? 'text', 'type' => $field['type'] ?? 'text',
'default' => $field['default'] ?? '', 'default' => $field['default'] ?? '',
'label' => [], 'label' => self::getMultiLanguageField($field['label']),
'placeholder' => [], 'placeholder' => self::getMultiLanguageField($field['placeholder']),
]; ];
// 处理label（支持多语言）
if (isset($field['label'])) {
$normalizedField['label'] = self::getMultiLanguageField($field['label']);
}
// 处理placeholder（支持多语言）
if (isset($field['placeholder'])) {
$normalizedField['placeholder'] = self::getMultiLanguageField($field['placeholder']);
}
// 处理其他属性 // 处理其他属性
foreach ($field as $key => $value) { foreach ($field as $key => $value) {
if (!in_array($key, ['name', 'type', 'default', 'label', 'placeholder'])) { if (!in_array($key, ['name', 'type', 'default', 'label', 'placeholder'])) {
@ -324,7 +314,7 @@ class Apps
$requireUninstalls[] = [ $requireUninstalls[] = [
'version' => $matches[2], 'version' => $matches[2],
'operator' => $matches[1] ?: '=', 'operator' => $matches[1] ?: '=',
'reason' => $item['reason'] ? self::getMultiLanguageField($item['reason']) : '' 'reason' => self::getMultiLanguageField($item['reason'])
]; ];
} }
} else { } else {
@ -377,21 +367,10 @@ class Apps
$normalizedEntry = [ $normalizedEntry = [
'location' => $entry['location'], 'location' => $entry['location'],
'url' => $entry['url'], 'url' => $entry['url'],
'icon' => '', 'icon' => self::processAppIcon($appName, [$entry['icon']]),
'label' => self::getMultiLanguageField($entry['label']),
]; ];
// 处理图标
if (isset($entry['icon'])) {
$normalizedEntry['icon'] = self::processAppIcon($appName, [$entry['icon']]);
}
// 处理label（支持多语言）
if (isset($entry['label'])) {
$normalizedEntry['label'] = self::getMultiLanguageField($entry['label']);
} else {
$normalizedEntry['label'] = '';
}
// 处理可选的UI配置 // 处理可选的UI配置
foreach (['transparent', 'keepAlive'] as $option) { foreach (['transparent', 'keepAlive'] as $option) {
if (isset($entry[$option])) { if (isset($entry[$option])) {
@ -590,7 +569,7 @@ class Apps
// 空数组检查 // 空数组检查
if (empty($field)) { if (empty($field)) {
return null; return "";
} }
$lang = Base::headerOrInput('language'); $lang = Base::headerOrInput('language');
@ -609,28 +588,36 @@ class Apps
private static function processAppIcon(string $appName, array $iconFiles): string private static function processAppIcon(string $appName, array $iconFiles): string
{ {
$baseDir = base_path('docker/apps/' . $appName); $baseDir = base_path('docker/apps/' . $appName);
$iconDir = public_path('uploads/file/apps/' . $appName);
foreach ($iconFiles as $iconFile) { foreach ($iconFiles as $iconFile) {
// 如果图标为空，则跳过
if (empty($iconFile)) {
continue;
}
// 检查是否为URL方式（以http或https开头） // 检查是否为URL方式（以http或https开头）
if (preg_match('/^https?:\/\//i', $iconFile)) { if (preg_match('/^https?:\/\//i', $iconFile)) {
return $iconFile; return $iconFile;
} }
// 处理图标文件路径
$iconFile = preg_replace('/^\/|^(\.\.\/)+|\.\//i', '', $iconFile);
$iconPath = $baseDir . '/' . $iconFile; $iconPath = $baseDir . '/' . $iconFile;
if (file_exists($iconPath)) { if (file_exists($iconPath)) {
// 创建目标目录、路径 // 创建目标目录、路径
$targetDir = public_path('uploads/file/apps/' . $appName); $targetName = str_replace(['/', '\\'], '_', $iconFile);
$iconName = str_replace(['/', '\\'], '_', $iconFile); $targetFile = $iconDir . '/' . $targetName;
$targetFile = $targetDir . '/' . $iconName;
// 判断目标文件是否存在，或源文件是否比目标文件新 // 判断目标文件是否存在，或源文件是否比目标文件新
if (!file_exists($targetFile) || filemtime($iconPath) > filemtime($targetFile)) { if (!file_exists($targetFile) || filemtime($iconPath) > filemtime($targetFile)) {
Base::makeDir($targetDir); Base::makeDir($iconDir);
copy($iconPath, $targetFile); copy($iconPath, $targetFile);
} }
// 返回图标URL // 返回图标URL
return Base::fillUrl('uploads/file/apps/' . $appName . '/' . $iconName); return Base::fillUrl('uploads/file/apps/' . $appName . '/' . $targetName);
} }
} }