diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 37cef916b..477e9b402 100755 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -65,7 +65,8 @@ class IndexController extends InvokeController ]; if (is_array($package['app'])) { foreach ($package['app'] as $item) { - if (is_array($item['publish']) && Base::hostContrast($url, $item['url'])) { + $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url']; + if (is_array($item['publish']) && Base::hostContrast($url, $urls)) { $array['publish'] = $item['publish']; } } diff --git a/app/Module/Base.php b/app/Module/Base.php index 2c3644c12..52a873808 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -717,24 +717,20 @@ class Base /** * 判断两个地址域名是否相同 * @param string $var1 - * @param string $var2 + * @param string|array $var2 * @return bool */ public static function hostContrast($var1, $var2) { $arr1 = parse_url($var1); - $arr2 = parse_url($var2); + $host1 = $arr1['host'] ?? $var1; // - $host1 = $var1; - if (isset($arr1['host'])) { - $host1 = $arr1['host']; + $host2 = []; + foreach (is_array($var2) ? $var2 : [$var2] as $url) { + $arr2 = parse_url($url); + $host2[] = $arr2['host'] ?? $url; } - // - $host2 = $var2; - if (isset($arr2['host'])) { - $host2 = $arr2['host']; - } - return $host1 == $host2; + return in_array($host1, $host2); } /** diff --git a/electron/build.js b/electron/build.js index 9424bc62d..b5aaa4ef0 100644 --- a/electron/build.js +++ b/electron/build.js @@ -68,6 +68,8 @@ function genericPublish(url, version) { uploadOra.succeed(`${filename} upload successful`) }).catch(_ => { uploadOra.fail(`${filename} upload fail`) + }).finally(_ => { + fs.unlinkSync(localFile) }) } } diff --git a/package.json b/package.json index 8ddf6134b..7cf8527f1 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,10 @@ "name": "DooTask", "id": "com.dootask.task", "url": "https://dootask.com/", + "urls": [ + "https://dootask.com/", + "https://www.dootask.com/" + ], "publish": { "provider": "github", "owner": "kuaifan", @@ -22,6 +26,10 @@ "name": "DooTask", "id": "com.dootask.task", "url": "https://dootask.com/", + "urls": [ + "https://dootask.com/", + "https://www.dootask.com/" + ], "publish": { "provider": "generic", "url": "https://dootask.com/desktop/publish"