github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-04-24 02:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-04-18 08:12:07 +08:00
parent a066fc7eae
commit b4bd635dbb
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/IndexController.php
View File

@ -65,7 +65,8 @@ class IndexController extends InvokeController
]; ];
if (is_array($package['app'])) { if (is_array($package['app'])) {
foreach ($package['app'] as $item) { 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']; $array['publish'] = $item['publish'];
} }
} }

18
app/Module/Base.php
View File

@ -717,24 +717,20 @@ class Base
/** /**
* 判断两个地址域名是否相同 * 判断两个地址域名是否相同
* @param string $var1 * @param string $var1
* @param string $var2 * @param string|array $var2
* @return bool * @return bool
*/ */
public static function hostContrast($var1, $var2) public static function hostContrast($var1, $var2)
{ {
$arr1 = parse_url($var1); $arr1 = parse_url($var1);
$arr2 = parse_url($var2); $host1 = $arr1['host'] ?? $var1;
// //
$host1 = $var1; $host2 = [];
if (isset($arr1['host'])) { foreach (is_array($var2) ? $var2 : [$var2] as $url) {
$host1 = $arr1['host']; $arr2 = parse_url($url);
$host2[] = $arr2['host'] ?? $url;
} }
// return in_array($host1, $host2);
$host2 = $var2;
if (isset($arr2['host'])) {
$host2 = $arr2['host'];
}
return $host1 == $host2;
} }
/** /**

2
electron/build.js vendored
View File

@ -68,6 +68,8 @@ function genericPublish(url, version) {
uploadOra.succeed(`${filename} upload successful`) uploadOra.succeed(`${filename} upload successful`)
}).catch(_ => { }).catch(_ => {
uploadOra.fail(`${filename} upload fail`) uploadOra.fail(`${filename} upload fail`)
}).finally(_ => {
fs.unlinkSync(localFile)
}) })
} }
} }

8
package.json
View File

@ -12,6 +12,10 @@
"name": "DooTask", "name": "DooTask",
"id": "com.dootask.task", "id": "com.dootask.task",
"url": "https://dootask.com/", "url": "https://dootask.com/",
"urls": [
"https://dootask.com/",
"https://www.dootask.com/"
],
"publish": { "publish": {
"provider": "github", "provider": "github",
"owner": "kuaifan", "owner": "kuaifan",
@ -22,6 +26,10 @@
"name": "DooTask", "name": "DooTask",
"id": "com.dootask.task", "id": "com.dootask.task",
"url": "https://dootask.com/", "url": "https://dootask.com/",
"urls": [
"https://dootask.com/",
"https://www.dootask.com/"
],
"publish": { "publish": {
"provider": "generic", "provider": "generic",
"url": "https://dootask.com/desktop/publish" "url": "https://dootask.com/desktop/publish"