mirror of
https://github.com/louislam/uptime-kuma.git
synced 2025-02-25 13:05:55 +00:00
Merge branch 'master' into add-xml-support-to-http-monitors
This commit is contained in:
commit
873c7fae57
4 changed files with 20 additions and 61 deletions
|
@ -1,47 +0,0 @@
|
||||||
CREATE TABLE [temp_user](
|
|
||||||
[id] INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
||||||
[username] VARCHAR(255) NOT NULL UNIQUE COLLATE NOCASE,
|
|
||||||
[password] VARCHAR(255),
|
|
||||||
[active] BOOLEAN NOT NULL DEFAULT 1,
|
|
||||||
[timezone] VARCHAR(150),
|
|
||||||
twofa_secret VARCHAR(64),
|
|
||||||
twofa_status BOOLEAN default 0 NOT NULL,
|
|
||||||
twofa_last_token VARCHAR(6)
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO [temp_user] SELECT
|
|
||||||
[id],
|
|
||||||
[username],
|
|
||||||
[password],
|
|
||||||
[active],
|
|
||||||
[timezone],
|
|
||||||
twofa_secret,
|
|
||||||
twofa_status,
|
|
||||||
twofa_last_token
|
|
||||||
FROM user;
|
|
||||||
|
|
||||||
DROP TABLE user;
|
|
||||||
|
|
||||||
CREATE TABLE [user](
|
|
||||||
[id] INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
||||||
[username] VARCHAR(255) NOT NULL UNIQUE COLLATE NOCASE,
|
|
||||||
[password] VARCHAR(255),
|
|
||||||
[active] BOOLEAN NOT NULL DEFAULT 1,
|
|
||||||
[timezone] VARCHAR(150),
|
|
||||||
twofa_secret VARCHAR(64),
|
|
||||||
twofa_status BOOLEAN default 0 NOT NULL,
|
|
||||||
twofa_last_token VARCHAR(6)
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO [user] SELECT
|
|
||||||
[id],
|
|
||||||
[username],
|
|
||||||
[password],
|
|
||||||
[active],
|
|
||||||
[timezone],
|
|
||||||
twofa_secret,
|
|
||||||
twofa_status,
|
|
||||||
twofa_last_token
|
|
||||||
FROM [temp_user];
|
|
||||||
|
|
||||||
DROP TABLE [temp_user];
|
|
|
@ -15,7 +15,7 @@ exports.login = async function (username, password) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
let user = await R.findOne("user", " username = ? AND active = 1", [
|
let user = await R.findOne("user", " username = ? AND active = 1 ", [
|
||||||
username,
|
username,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
@ -244,6 +244,8 @@ module.exports.maintenanceSocketHandler = (socket) => {
|
||||||
socket.userID,
|
socket.userID,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
apicache.clear();
|
||||||
|
|
||||||
callback({
|
callback({
|
||||||
ok: true,
|
ok: true,
|
||||||
msg: "Deleted Successfully.",
|
msg: "Deleted Successfully.",
|
||||||
|
@ -269,6 +271,8 @@ module.exports.maintenanceSocketHandler = (socket) => {
|
||||||
maintenanceID,
|
maintenanceID,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
apicache.clear();
|
||||||
|
|
||||||
callback({
|
callback({
|
||||||
ok: true,
|
ok: true,
|
||||||
msg: "Paused Successfully.",
|
msg: "Paused Successfully.",
|
||||||
|
@ -294,6 +298,8 @@ module.exports.maintenanceSocketHandler = (socket) => {
|
||||||
maintenanceID,
|
maintenanceID,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
apicache.clear();
|
||||||
|
|
||||||
callback({
|
callback({
|
||||||
ok: true,
|
ok: true,
|
||||||
msg: "Resume Successfully",
|
msg: "Resume Successfully",
|
||||||
|
|
|
@ -248,19 +248,19 @@ exports.dnsResolve = function (hostname, resolverServer, resolverPort, rrtype) {
|
||||||
* @param {string} query The query to validate the database with
|
* @param {string} query The query to validate the database with
|
||||||
* @returns {Promise<(string[]|Object[]|Object)>}
|
* @returns {Promise<(string[]|Object[]|Object)>}
|
||||||
*/
|
*/
|
||||||
exports.mssqlQuery = function (connectionString, query) {
|
exports.mssqlQuery = async function (connectionString, query) {
|
||||||
return new Promise((resolve, reject) => {
|
let pool;
|
||||||
mssql.connect(connectionString).then(pool => {
|
try {
|
||||||
return pool.request()
|
pool = new mssql.ConnectionPool(connectionString);
|
||||||
.query(query);
|
await pool.connect();
|
||||||
}).then(result => {
|
await pool.request().query(query);
|
||||||
resolve(result);
|
pool.close();
|
||||||
}).catch(err => {
|
} catch (e) {
|
||||||
reject(err);
|
if (pool) {
|
||||||
}).finally(() => {
|
pool.close();
|
||||||
mssql.close();
|
}
|
||||||
});
|
throw e;
|
||||||
});
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue