From 8cbd546f31aaed944700da5356e93e643050bd84 Mon Sep 17 00:00:00 2001 From: iamxz Date: Tue, 8 Jul 2014 16:47:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E6=94=BE=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/args.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/args.coffee b/src/args.coffee index 92affe2..05d99d1 100644 --- a/src/args.coffee +++ b/src/args.coffee @@ -2,7 +2,7 @@ localStorage = window.localStorage util = require 'util' fs = require 'fs' -guiconfigFilename = fs.realpathSync(process.execPath + '/..') + '/gui-config.json' +guiconfigFilename = __dirname + '/gui-config.json' loadFromJSON = -> # Windows users are happy to see a config file within their shadowsocks-gui folder @@ -41,6 +41,8 @@ publicConfig = password: '$#HAL9000!' method: 'aes-256-cfb' timeout: 600 + localProxy: '172.17.18.84' + localPort:8080 defaultConfig = server_port: 8388 From b47e182e558eb0ab9aa37b5ec23507549e472199 Mon Sep 17 00:00:00 2001 From: iamxz Date: Tue, 8 Jul 2014 17:01:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/args.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/args.coffee b/src/args.coffee index 05d99d1..9ce1ef6 100644 --- a/src/args.coffee +++ b/src/args.coffee @@ -41,8 +41,8 @@ publicConfig = password: '$#HAL9000!' method: 'aes-256-cfb' timeout: 600 - localProxy: '172.17.18.84' - localPort:8080 + client_proxy: '' + client_port: 8080 defaultConfig = server_port: 8388 From 043b315c33e646f168d80c96fa5de0a3d6f654ec Mon Sep 17 00:00:00 2001 From: iamxz Date: Tue, 8 Jul 2014 17:18:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?add=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- args.js | 6 ++++-- index.html | 35 ++++++++++++++++++++++++++++------- package.json | 6 +++--- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/args.js b/args.js index 5bf50d4..65b4aed 100644 --- a/args.js +++ b/args.js @@ -8,7 +8,7 @@ fs = require('fs'); - guiconfigFilename = fs.realpathSync(process.execPath + '/..') + '/gui-config.json'; + guiconfigFilename = __dirname + '/gui-config.json'; loadFromJSON = function() { var data, e, temp; @@ -56,7 +56,9 @@ local_port: 1080, password: '$#HAL9000!', method: 'aes-256-cfb', - timeout: 600 + timeout: 600, + client_proxy: '', + client_port: 8080 }; defaultConfig = { diff --git a/index.html b/index.html index de5d305..d774b26 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,7 @@ + Shadowsocks GUI