Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/rest/wechat/getZip.js
This commit is contained in:
aixianling
2022-05-24 09:30:55 +08:00

View File

@@ -17,7 +17,7 @@ module.exports = {
db.query(sql).then(() => setTimeout(() => {
response.send({code: 0})
}, 2000))
execute(`cd /root/node-service/dvcp_v2_wechat&&node bin/pages.js ${id}&&npm run build`)
execute(`cd /root/node-service/dvcp_v2_wechat&&npm run apps&&node bin/pages.js ${id}&&npm run build`)
.then(() => fse.emptyDir(`../wxmpZips/${id}/`))
.then(() => fse.copy('../dvcp_v2_wechat/dist/build/mp-weixin/', `../wxmpZips/${id}/`))
.then(() => fse.emptyDir('../dvcp_v2_wechat/dist/build'))