github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-06-08 00:18:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2023-03-20 01:53:19 +08:00
parent 2b36fdb4e3
commit ea5a6f4878
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/SystemController.php
View File

@ -1149,14 +1149,16 @@ class SystemController extends AbstractController
$package = Base::getPackage(); $package = Base::getPackage();
$array = [ $array = [
'version' => Base::getVersion(), 'version' => Base::getVersion(),
'publish' => Arr::get($package, 'app.0.publish'), 'publish' => [],
]; ];
if (is_array($package['app'])) { if (is_array($package['app'])) {
$i = 0;
foreach ($package['app'] as $item) { foreach ($package['app'] as $item) {
$urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url']; $urls = $item['urls'] && is_array($item['urls']) ? $item['urls'] : $item['url'];
if (is_array($item['publish']) && Base::hostContrast($url, $urls)) { if (is_array($item['publish']) && ($i === 0 || Base::hostContrast($url, $urls))) {
$array['publish'] = $item['publish']; $array['publish'] = $item['publish'];
} }
$i++;
} }
} }
return $array; return $array;

6
electron/build.js vendored
View File

@ -161,6 +161,7 @@ function startBuild(data, publish, release) {
fse.copySync(packageFile, packageBakFile) fse.copySync(packageFile, packageBakFile)
// package.json Generated // package.json Generated
const econfig = require('./package.json') const econfig = require('./package.json')
let npmArg = data.platform
let appName = utils.getDomain(data.url) let appName = utils.getDomain(data.url)
if (appName === "public") appName = "DooTask" if (appName === "public") appName = "DooTask"
econfig.name = data.name; econfig.name = data.name;
@ -184,16 +185,17 @@ function startBuild(data, publish, release) {
"owner": repository[0], "owner": repository[0],
"repo": repository[1] "repo": repository[1]
} }
npmArg = `${npmArg}-publish`
} }
fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 2), 'utf8'); fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 2), 'utf8');
// build // build
child_process.spawnSync("npm" + comSuffix, ["run", data.platform], {stdio: "inherit", cwd: "electron"}); child_process.spawnSync("npm" + comSuffix, ["run", npmArg], {stdio: "inherit", cwd: "electron"});
// package.json Recovery // package.json Recovery
fse.copySync(packageBakFile, packageFile) fse.copySync(packageBakFile, packageFile)
// publish generic method // publish generic method
if (publish === true && process.env.DP_KEY) { if (publish === true && process.env.DP_KEY) {
genericPublish({ genericPublish({
url: data.publish, url: data.publish.url,
key: process.env.DP_KEY, key: process.env.DP_KEY,
version: config.version, version: config.version,
output: econfig.build.directories.output output: econfig.build.directories.output

10
package.json
View File

@ -71,7 +71,15 @@
"id": "com.dootask.task", "id": "com.dootask.task",
"name": "DooTask", "name": "DooTask",
"url": "http://public/", "url": "http://public/",
"publish": "https://www.dootask.com/desktop/publish" "urls": [
"https://dootask.com/",
"https://www.dootask.com/",
"https://t.hitosea.com/"
],
"publish": {
"provider": "generic",
"url": "https://www.dootask.com/desktop/publish"
}
} }
] ]
} }