wmantly/mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Newtbot/MP

Browse Source
This commit is contained in:
newtbot 2023-12-28 20:57:41 +08:00
commit 97562e34be
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Sean/modules/mysql.js
View File

@ -1,6 +1,6 @@
const mysql = require("mysql2");
const path = require("path");
require('dotenv').config({ path: path.resolve(__dirname, '../../.env') })
require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
const fs = require('fs');
/*
const mysqlConfig = {
@ -21,15 +21,26 @@ connection.connect((err) => {
});
*/
/*
const connection = mysql.createConnection({
host: process.env.host,
user: process.env.DB_USER,
password: process.env.DB_PASS,
database: "eco_saver",
database: "database",
ssl: {
ca: fs.readFileSync(path.resolve(__dirname, '../../cert/DigiCertGlobalRootCA.crt.pem')),
}
});
*/
const connection = mysql.createConnection({
host: process.env.host,
user: process.env.DB_USER,
password: process.env.DB_PASS,
database: "adminusers",
});
module.exports = { connection };
module.exports = { connection };

2
Sean/server.js
View File

@ -1,6 +1,6 @@
const express = require("express");
const session = require("express-session");
const mysql = require("mysql2");
const mysql2 = require('mysql2');
const bodyParser = require("body-parser");
const bcrypt = require("bcrypt");
const crypto = require("crypto");