|
|
@ -465,8 +465,11 @@ ipcMain.on('toggleWin', function(event, allwaysShow) { |
|
|
|
// Proxy
|
|
|
|
// Proxy
|
|
|
|
if ( config.get('proxy') ) { |
|
|
|
if ( config.get('proxy') ) { |
|
|
|
app.commandLine.appendSwitch('proxy-server', 'http://'+config.get('proxyHost')+':'+config.get('proxyPort')); |
|
|
|
app.commandLine.appendSwitch('proxy-server', 'http://'+config.get('proxyHost')+':'+config.get('proxyPort')); |
|
|
|
|
|
|
|
console.info('test2') |
|
|
|
app.on('login', (event, webContents, request, authInfo, callback) => { |
|
|
|
app.on('login', (event, webContents, request, authInfo, callback) => { |
|
|
|
|
|
|
|
if(!authInfo.isProxy) |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
event.preventDefault() |
|
|
|
event.preventDefault() |
|
|
|
callback(config.get('proxyLogin'), config.get('proxyPassword')) |
|
|
|
callback(config.get('proxyLogin'), config.get('proxyPassword')) |
|
|
|
}) |
|
|
|
}) |
|
|
|