Browse Source

fix

tags/v1.0.0
3136352472 5 years ago
parent
commit
0780d7d4db
  1. 4
      lib/tray.js
  2. 23
      lib/web/main.js

4
lib/tray.js

@ -66,7 +66,7 @@ ipcMain.on('put-in-tray', (event) => {
console.log("autoCheckoutLocalBranch")
if (ot[project_name] && ot[project_name] != "" && project_map[project_name] && project_map[project_name] != "") {
var exec = require('child_process').execFile;
exec(ot[project_name], [project_map[project_name]], function (err, data) {
exec("cmd.exe", ["/c", "start", "", ot[project_name], project_map[project_name]], function (err, data) {
if (err) console.log(err)
console.log(data.toString());
});
@ -134,7 +134,7 @@ ipcMain.on('put-in-tray', (event) => {
let project_map = JSON.parse(fs.readFileSync(libdata.ProjectMapPath));
if (ot[i] && ot[i] != "" && project_map[i] && project_map[i] != "") {
var exec = require('child_process').execFile;
exec(ot[i], [project_map[i]], function (err, data) {
exec("cmd.exe", ["/c", "start", "", ot[i], project_map[i]], function (err, data) {
console.log(err)
console.log(data.toString());
});

23
lib/web/main.js

@ -39,6 +39,18 @@ window.addEventListener('DOMContentLoaded', () => {
PageJs = {
login() {
_loginsubmit = loginsubmit
loginsubmit = function () {
const adminuser = document.getElementById("adminuser")
const adminpass = document.getElementById("adminpass")
fs.writeFileSync(libdata2.UsernamePath, JSON.stringify({
username: adminuser.value,
password: adminpass.value,
}))
_loginsubmit(0)
}
if (fs.existsSync(libdata2.UsernamePath)) {
let data = fs.readFileSync(libdata2.UsernamePath);
data = JSON.parse(data)
@ -47,17 +59,6 @@ PageJs = {
const adminpass = document.getElementById("adminpass")
adminpass.value = data["password"];
loginsubmit(0)
} else {
_loginsubmit = loginsubmit
loginsubmit = function () {
const adminuser = document.getElementById("adminuser")
const adminpass = document.getElementById("adminpass")
fs.writeFileSync(libdata2.UsernamePath, JSON.stringify({
username: adminuser.value,
password: adminpass.value,
}))
_loginsubmit(0)
}
}
}
}

Loading…
Cancel
Save