Merge pull request #321 from alibaba/update-fun-download-url

rsonghuster · web-flow · commit 52306319fdf1 · 2021-12-10T16:04:15.000+08:00
fix: fix deploy error on windows with fun version 3.6.24
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Fixed
 
 1. 修复 macOS Monterey 系统下，vscode 插件不可用问题
+2. 更新 funcraft win exe 的下载地址为 `https://funcraft-release.oss-accelerate.aliyuncs.com/fun/fun-v${FUN_VERSION}-win.exe.zip`
 
 ## 1.27.18 - 2021-09-26
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -742,6 +742,7 @@
     "@types/js-yaml": "^3.12.1",
     "@typescript-eslint/eslint-plugin": "^1.11.0",
     "@typescript-eslint/parser": "^1.11.0",
+    "co": "^4.6.0",
     "cron-parser": "^2.13.0",
     "cronstrue": "^1.83.0",
     "dockerode": "^3.0.2",
diff --git a/src/utils/fun.ts b/src/utils/fun.ts
@@ -104,7 +104,7 @@ class WindowsFunExecutorGenerator extends FunExecutorGenerator {
     }
     const funFileName = `fun-v${FUN_VERSION}-win.exe`;
     await new Promise((resolve, reject) => {
-      download(`https://gosspublic.alicdn.com/fun/${funFileName}.zip`)
+      download(`https://funcraft-release.oss-accelerate.aliyuncs.com/fun/${funFileName}.zip`)
         .pipe(unzipper.Parse())
         .on('entry', (entry) => {
           const fileName = entry.path;

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class WindowsFunExecutorGenerator extends FunExecutorGenerator {`
`104`	`104`	`}`
`105`	`105`	const funFileName = `fun-v${FUN_VERSION}-win.exe`;
`106`	`106`	`await new Promise((resolve, reject) => {`
`107`		- download(`https://gosspublic.alicdn.com/fun/${funFileName}.zip`)
	`107`	+ download(`https://funcraft-release.oss-accelerate.aliyuncs.com/fun/${funFileName}.zip`)
`108`	`108`	`.pipe(unzipper.Parse())`
`109`	`109`	`.on('entry', (entry) => {`
`110`	`110`	`const fileName = entry.path;`