From a7ac2cee13ec973bc3b8f9b885fc73a8504fb322 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 22 Dec 2021 01:40:25 +0800
Subject: [PATCH] no message

---
 .github/workflows/electron.yml |  3 ++-
 electron/build.js              | 40 +++++++++++++++++++---------------
 electron/package.json          |  8 +++----
 package.json                   |  2 +-
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
index a9932c91..8d1649ff 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -38,7 +38,8 @@ jobs:
         os: [macos-11]
         platform: [
             build-mac,
-            build-mac-arm
+            build-mac-arm,
+            build-win
         ]
 
     if: startsWith(github.event.ref, 'refs/tags/v')
diff --git a/electron/build.js b/electron/build.js
index b23a3ef7..9d47cd87 100644
--- a/electron/build.js
+++ b/electron/build.js
@@ -131,7 +131,7 @@ function step2(data, publish) {
     packageString = packageString.replace(/"name":\s*"(.*?)"/, `"name": "${data.name}"`);
     packageString = packageString.replace(/"appId":\s*"(.*?)"/, `"appId": "${data.id}"`);
     packageString = packageString.replace(/"version":\s*"(.*?)"/, `"version": "${config.version}"`);
-    packageString = packageString.replace(/"artifactName":\s*"(.*?)"/g, '"artifactName": "' + getDomain(data.url) + '-${version}-${os}-${arch}.${ext}"');
+    packageString = packageString.replace(/"artifactName":\s*"(.*?)"/g, '"artifactName": "' + getDomain(data.url) + '-v${version}-${os}-${arch}.${ext}"');
     fs.writeFileSync(packageFile, packageString, 'utf8');
     //
     child_process.spawnSync("npm", ["run", data.platform + (publish === true ? "-publish" : "")], {stdio: "inherit", cwd: "electron"});
@@ -143,7 +143,7 @@ function step3() {
     let packageString = fs.readFileSync(packageFile, 'utf8');
     packageString = packageString.replace(/"name":\s*"(.*?)"/, `"name": "${config.name}"`);
     packageString = packageString.replace(/"appId":\s*"(.*?)"/, `"appId": "${config.app.id}"`);
-    packageString = packageString.replace(/"artifactName":\s*"(.*?)"/g, '"artifactName": "${productName}-${version}-${os}-${arch}.${ext}"');
+    packageString = packageString.replace(/"artifactName":\s*"(.*?)"/g, '"artifactName": "${productName}-v${version}-${os}-${arch}.${ext}"');
     fs.writeFileSync(packageFile, packageString, 'utf8');
 }
 
@@ -188,26 +188,30 @@ if (["build", "prod"].includes(argv[2])) {
     ];
     inquirer.prompt(questions).then(answers => {
         step1();
-        answers.platform.forEach(platform => {
-            step2({
-                "name": config.name,
-                "id": config.app.id,
-                "url": answers.website,
-                "platform": platform
-            }, false)
-        });
-        step3();
+        setTimeout(() => {
+            answers.platform.forEach(platform => {
+                step2({
+                    "name": config.name,
+                    "id": config.app.id,
+                    "url": answers.website,
+                    "platform": platform
+                }, false)
+            });
+            step3();
+        }, 3000)
     });
 } else if (platform.includes(argv[2])) {
     // 自动编译
     step1();
-    config.app.sites.forEach((data) => {
-        if (data.name && data.id && data.url) {
-            data.platform = argv[2];
-            step2(data, true)
-        }
-    })
-    step3();
+    setTimeout(() => {
+        config.app.sites.forEach((data) => {
+            if (data.name && data.id && data.url) {
+                data.platform = argv[2];
+                step2(data)
+            }
+        })
+        step3();
+    }, 3000);
 } else {
     // 开发模式
     fs.writeFileSync(devloadCachePath, formatUrl("127.0.0.1:" + env.parsed.APP_PORT), 'utf8');
diff --git a/electron/package.json b/electron/package.json
index aeb9574b..c595af6b 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "description": "DooTask is task management system.",
     "main": "main.js",
     "license": "MIT",
@@ -45,9 +45,9 @@
     },
     "build": {
         "appId": "com.dootask.task",
-        "artifactName": "${productName}-${version}-${os}-${arch}.${ext}",
+        "artifactName": "${productName}-v${version}-${os}-${arch}.${ext}",
         "files": [
-            "public/**/*",
+            "public",
             "main.js",
             "preload.js"
         ],
@@ -63,7 +63,7 @@
         },
         "nsis": {
             "oneClick": false,
-            "artifactName": "${productName}-${version}-${os}-${arch}.${ext}",
+            "artifactName": "${productName}-v${version}-${os}-${arch}.${ext}",
             "allowToChangeInstallationDirectory": true
         }
     },
diff --git a/package.json b/package.json
index c1660d88..d0ff4357 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "description": "DooTask is task management system.",
     "scripts": {
         "start": "./cmd dev",