coder-xiaomo/tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity GitHub Gitee

添加 assistant 助手；其他调整（大调整）

Browse Source
This commit is contained in:
小墨
2022-10-29 00:16:36 +08:00
parent ddde1b28f9
commit ce20720c60
21 changed files with 973 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
utils/dbPoolUtils.js
View File

@@ -65,62 +65,63 @@ async function query(sql, params) {
});
}
// sqlParamsEntities = { sql: "", params: [], callback: function(可选) }
async function transaction(sqlParamsEntities) {
let connection;
try {
connection = await new Promise((resolve, reject) => {
pool.getConnection(function (err, connection) {
if (err) {
reject(err);
}
resolve(connection);
});
});
} catch (err) {
console.error("获取事务connection失败", err);
return;
}
// // sqlParamsEntities = { sql: "", params: [], callback: function(可选) }
// async function transaction(sqlParamsEntities) {
// let connection;
// try {
// connection = await new Promise((resolve, reject) => {
// pool.getConnection(function (err, connection) {
// if (err) {
// reject(err);
// }
// resolve(connection);
// });
// });
// } catch (err) {
// console.error("获取事务connection失败", err);
// return;
// }
try {
return await new Promise((resolve, reject) => {
// 开启事务
connection.beginTransaction(function (err) {
if (err) {
reject(err);
}
// try {
// return await new Promise((resolve, reject) => {
// // 开启事务
// connection.beginTransaction(function (err) {
// if (err) {
// reject(err);
// }
// 开始执行SQL语句
console.log("开始执行transaction，共执行" + sqlParamsEntities.length + "条数据");
sqlParamsEntities.forEach((entity) => {
connection.query(entity.sql, entity.param, function (tErr, data) {
if (tErr) {
reject(tErr);
}
if (typeof entity.callback === 'function')
return entity.callback(data);
})
});
// // 开始执行SQL语句
// console.log("开始执行transaction，共执行" + sqlParamsEntities.length + "条数据");
// sqlParamsEntities.forEach((entity) => {
// console.log(entity.sql);
// connection.query(entity.sql, entity.param, function (tErr, data) {
// if (tErr) {
// reject(tErr);
// }
// if (typeof entity.callback === 'function')
// return entity.callback(data);
// })
// });
// 执行完毕，提交事务
connection.commit(function (tErr, info) {
console.log("transaction info: " + JSON.stringify(info));
if (tErr) {
reject(tErr);
}
resolve(info);
})
});
});
} catch (err) {
console.error("事务执行失败，开始回滚");
connection.rollback(function () {
console.log("transaction error: " + err);
});
} finally {
connection.release();
}
}
// // 执行完毕，提交事务
// connection.commit(function (tErr, info) {
// console.log("transaction info: " + JSON.stringify(info));
// if (tErr) {
// reject(tErr);
// }
// resolve(info);
// })
// });
// });
// } catch (err) {
// console.error("事务执行失败，开始回滚", err);
// connection.rollback(function () {
// console.log("transaction error: " + err);
// });
// } finally {
// connection.release();
// }
// }
async function close() {
await new Promise((resolve, reject) => {
@@ -135,6 +136,6 @@ async function close() {
module.exports = {
create,
query,
transaction,
// transaction,
close,
}

2
utils/requestUtils.js
View File

@@ -45,7 +45,7 @@ async function getRedirectUrl(url) {
reject(err);
}
// console.log(res.headers.location);
resolve(res.headers.location);
resolve(res?.headers?.location);
});
});
}