diff --git a/src/websocket/custom/getZip.js b/src/websocket/custom/getZip.js index 1ee120e..f0acc47 100644 --- a/src/websocket/custom/getZip.js +++ b/src/websocket/custom/getZip.js @@ -62,16 +62,15 @@ const handleZip = (id, ws) => { const progress = new counter(`正在处理 ${info.name} 的打包工作...`) if (info.type == 'web') { const {name, version, dist} = info - const deploy = dist?.trim() || `${name}_v${version}` + const deploy = dist?.trim() || `${name}v${version}` const buildConfig = { web: {task: "devops-web", token: 'fLeOGSVIRs405Me'}, }[info.type] startUpdateSql() .then(() => progress.set(30, id)) .then(() => fse.emptyDir(dist || `../zips/${deploy}`)) - .then(() => http.get(`/view/devops/job/${buildConfig.task}/buildWithParameters`, - {params: {token: buildConfig.token, pid: id, deploy}})) - .then(() => http.get(`/view/devops/job/${buildConfig.task}/api/json`).then(res => res.data?.lastBuild.number || 1)) + .then(() => http.get(`/view/devops/job/${buildConfig.task}/buildWithParameters`, {params: {token: buildConfig.token, pid: id, dist:deploy}})) + .then(() => http.get(`/view/devops/job/${buildConfig.task}/api/json`).then(res => res.data?.id || 1)) .then(currentJob => new Promise((resolve, reject) => { jobs[id] = {task: buildConfig.task, build: currentJob} const timer = setInterval(() => { @@ -126,7 +125,6 @@ const handleZip = (id, ws) => { console.log(err) }) } - module.exports = { action: "/custom/getZip", execute: (ws, request) => { const {id, cid} = request